TLE Evaluation changes, including mute comment etc

Author: chenchanglew

ecc_go/chaincode/enclave_go/tle_stub.go

@@ -10,7 +10,6 @@ import (
 	"bytes"
 	"context"
 	"crypto/sha256"
-	"log"
 
 	"google.golang.org/grpc"
 
@@ -87,7 +86,7 @@ func (s *TleStubInterface) GetMeta(key string) ([]byte, error) {
 	}
 	response, err := client.GetMeta(context.Background(), request)
 	if err != nil {
-		log.Fatalf("Failed to call GetMeta: %v", err)
+		logger.Errorf("Failed to call GetMeta: %v", err)
 		return nil, err
 	}
 

tle_go/Dockerfile

@@ -44,6 +44,7 @@ COPY client ${CC_PATH}/client
 WORKDIR ${CC_PATH}
 EXPOSE ${CAAS_PORT}
 EXPOSE 50051
+EXPOSE 6060
 
 CMD ["tle"]
 # CMD ["sleep", "infinity"]

tle_go/enclave.json

@@ -2,7 +2,7 @@
  "exe": "tle",
  "key": "private.pem",
  "debug": true,
- "heapSize": 512,
+ "heapSize": 1024,
  "productID": 1,
  "securityVersion": 1,
  "mounts": [

tle_go/go.mod

@@ -14,7 +14,7 @@ require (
 )
 
 // replace github.com/hyperledger/fabric => ../../fabric
-replace github.com/hyperledger/fabric => github.com/Flamewind97/fabric v0.0.0-20230727155655-d2a858c57147
+replace github.com/hyperledger/fabric => github.com/Flamewind97/fabric v0.0.0-20230809115753-2bd56f3b43c3
 
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect

tle_go/go.sum

@@ -6,8 +6,8 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/DataDog/zstd v1.4.0 h1:vhoV+DUHnRZdKW1i5UMjAk2G4JY8wN4ayRfYDNdEhwo=
 github.com/DataDog/zstd v1.4.0/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
-github.com/Flamewind97/fabric v0.0.0-20230727155655-d2a858c57147 h1:tAlIoR8J3cboeUzHH7zCS2yTB78WKk+CYz/C8GT3xac=
-github.com/Flamewind97/fabric v0.0.0-20230727155655-d2a858c57147/go.mod h1:RTJcHdhOrpiAqZLNkpVSoz/yaxW/Wiy7sCw/zYO4LjY=
+github.com/Flamewind97/fabric v0.0.0-20230809115753-2bd56f3b43c3 h1:gPfELpLOzEzc5etlPSRgqpPNOmfK8SCsz8Sn9ml8bew=
+github.com/Flamewind97/fabric v0.0.0-20230809115753-2bd56f3b43c3/go.mod h1:RTJcHdhOrpiAqZLNkpVSoz/yaxW/Wiy7sCw/zYO4LjY=
 github.com/Knetic/govaluate v3.0.0+incompatible h1:7o6+MAPhYTCF0+fdvoz1xDedhRb4f6s9Tn1Tt7/WTEg=
 github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
 github.com/Microsoft/go-winio v0.4.12 h1:xAfWHN1IrQ0NJ9TBC0KBZoqLjzDTr1ML+4MywiUOryc=

tle_go/listener/listener.go

@@ -72,16 +72,15 @@ func (r *deliverClient) readUntilClose(blockChan chan cb.Block) {
 			fmt.Println("Got status ", t)
 			return
 		case *ab.DeliverResponse_Block:
-			fmt.Println("Received block: ", t.Block.Header.Number)
-			blockChan <- *t.Block
-
 			if !r.quiet {
+				fmt.Println("Received block: ", t.Block.Header.Number)
 				fmt.Scanln() // wait for Enter Key
 				err := protolator.DeepMarshalJSON(os.Stdout, t.Block)
 				if err != nil {
 					fmt.Printf("  Error pretty printing block: %s", err)
 				}
 			}
+			blockChan <- *t.Block
 		}
 	}
 }

tle_go/main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"os"
 	"path/filepath"
 
@@ -37,8 +36,6 @@ func main() {
 	}
 	blockListener := listener.NewOrdererBlockGetter(channelID, serverAddr, caCertPath)
 	// blockListener := listener.NewFileBlockGetter()
-	fmt.Scanln()
-
 	// fmt.Println("--- in TLE_go main.go start to create grpc server.---")
 
 	readConfig()

tle_go/tlecore/server.go

@@ -18,7 +18,7 @@ type TleServer struct {
 func (s *TleServer) GetMeta(ctx context.Context, req *pb.MetaRequest) (*pb.MetaResponse, error) {
 	namespace := req.Namespace
 	key := req.Key
-	fmt.Printf("--- tle_go/server.go getMeta, namespace = %s, key = %s ---\n", namespace, key)
+	// fmt.Printf("--- tle_go/server.go getMeta, namespace = %s, key = %s ---\n", namespace, key)
 
 	data, err := s.tleState.GetMeta(namespace, key)
 	if err != nil {
@@ -30,7 +30,7 @@ func (s *TleServer) GetMeta(ctx context.Context, req *pb.MetaRequest) (*pb.MetaR
 }
 
 func (s *TleServer) GetSession(ctx context.Context, req *pb.Empty) (*pb.MetaResponse, error) {
-	fmt.Printf("--- tle_go/server.go getSession ---\n")
+	// fmt.Printf("--- tle_go/server.go getSession ---\n")
 	data := []byte("")
 	lastCommitHash := []byte("Sample Commit Hash")
 	return &pb.MetaResponse{Data: data, LastCommitHash: lastCommitHash}, nil

tle_go/tlecore/tle_peer.go

@@ -4,6 +4,7 @@ import (
 	"crypto/sha256"
 	"encoding/base64"
 	"fmt"
+	"time"
 
 	"github.com/hyperledger/fabric-protos-go/common"
 	"github.com/hyperledger/fabric/common/policies"
@@ -72,9 +73,9 @@ func (p *TlePeer) UpdateState(block *common.Block) error {
 	for tIdx := range block.Data.Data {
 		// TODO: continue if current txn is invalid.
 		txsfltr := ValidationFlags(block.Metadata.Metadata[common.BlockMetadataIndex_TRANSACTIONS_FILTER])
-		fmt.Printf("blockNum %d, tIdx: %d, validationCode: %v\n", tIdx, block.Header.Number, txsfltr.Flag(tIdx))
+		// fmt.Printf("blockNum %d, tIdx: %d, validationCode: %v\n", block.Header.Number, tIdx, txsfltr.Flag(tIdx))
 		if txsfltr.IsInvalid(tIdx) {
-			fmt.Println("The current txn is not valid!")
+			fmt.Printf("blockNum %d, tIdx: %d, validationCode: %v, current txn is not valid!\n", block.Header.Number, tIdx, txsfltr.Flag(tIdx))
 			continue
 		}
 
@@ -91,15 +92,15 @@ func (p *TlePeer) UpdateState(block *common.Block) error {
 		}
 
 		for _, nsRWSet := range rwset.NsRwSets {
-			fmt.Printf("namespace: %v, read: %v, writes: %v\n", nsRWSet.NameSpace, nsRWSet.KvRwSet.Reads, nsRWSet.KvRwSet.Writes)
+			// fmt.Printf("namespace: %v, read: %v, writes: %v\n", nsRWSet.NameSpace, nsRWSet.KvRwSet.Reads, nsRWSet.KvRwSet.Writes)
 
 			// Q: can we use Metadata?
 			// metadataWriteSet := nsRwset.KvRwSet.MetadataWrites
 
 			for _, kvWrite := range nsRWSet.KvRwSet.Writes {
 				metaData := sha256.Sum256(kvWrite.Value)
 
-				fmt.Printf("Saving namespace: %v, key: %v, metadata: %x\n", nsRWSet.NameSpace, kvWrite.Key, metaData)
+				// fmt.Printf("Saving namespace: %v, key: %v, metadata: %x\n", nsRWSet.NameSpace, kvWrite.Key, metaData)
 
 				// Update tleState using PutMeta
 				err := p.tleState.PutMeta(nsRWSet.NameSpace, kvWrite.Key, metaData[:])
@@ -112,7 +113,10 @@ func (p *TlePeer) UpdateState(block *common.Block) error {
 	return nil
 }
 
+var totalVerifyTime time.Duration
+
 func (p *TlePeer) ProcessBlock(block *common.Block, blockNum int) error {
+	tStart := time.Now()
 	err := VerifyBlock(p.policyMgr, []byte(p.channelName), uint64(blockNum), block)
 	if err != nil {
 		return err
@@ -127,6 +131,8 @@ func (p *TlePeer) ProcessBlock(block *common.Block, blockNum int) error {
 	if err != nil {
 		return err
 	}
+	totalVerifyTime += time.Since(tStart)
+	fmt.Println("total verify time:", totalVerifyTime)
 
 	// update state
 	return p.UpdateState(block)
@@ -162,6 +168,7 @@ func (p *TlePeer) InitFabricPart(genesisBlock *common.Block) func() {
 }
 
 func (p *TlePeer) Start() {
+	totalVerifyTime = 0 * time.Second
 	genesisBlock, err := p.blockListener.GetNextBlock()
 	sDec, _ := base64.StdEncoding.DecodeString("AA==")
 	genesisBlock.Metadata.Metadata[2] = sDec

tle_go/tlecore/validator.go

@@ -30,7 +30,7 @@ import (
 )
 
 func VerifyBlock(channelPolicyManagerGetter policies.ChannelPolicyManagerGetter, chainID common.ChannelID, seqNum uint64, block *pcommon.Block) error {
-	fmt.Println("start verifyBlock")
+	// fmt.Println("start verifyBlock")
 	if block.Header == nil {
 		return fmt.Errorf("Invalid Block on channel [%s]. Header must be different from nil.", chainID)
 	}
@@ -77,7 +77,9 @@ func VerifyBlock(channelPolicyManagerGetter policies.ChannelPolicyManagerGetter,
 	// Get block validation policy
 	policy, ok := cpm.GetPolicy(policies.BlockValidation)
 	// ok is true if it was the policy requested, or false if it is the default policy
-	fmt.Printf("Got block validation policy for channel [%s] with flag [%t], policy [%s]\n", channelID, ok, policy)
+	if !ok {
+		fmt.Printf("Got block validation policy for channel [%s] with flag [%t], policy [%s]\n", channelID, ok, policy)
+	}
 
 	// - Prepare SignedData
 	signatureSet := []*protoutil.SignedData{}
@@ -97,7 +99,7 @@ func VerifyBlock(channelPolicyManagerGetter policies.ChannelPolicyManagerGetter,
 	}
 
 	// - Evaluate policy
-	fmt.Println("Start evaluateSignedData")
+	// fmt.Println("Start evaluateSignedData")
 	// if len(signatureSet) > 0 {
 	// 	fmt.Printf("signatureSet[0].Identity = [%x]\n", signatureSet[0].Identity)
 	// 	fmt.Printf("signatureSet[0].Data = [%x]\n", signatureSet[0].Data)