fix ntor retry sync

Author: joeqian10

backups/testnet/N3_test.json

@@ -0,0 +1 @@
+{"name":null,"version":"1.0","scrypt":{"n":16384,"r":8,"p":8},"accounts":[{"address":"NeWfKfigfYXmEbi7SwbiSS8DtaVexCnsdN","label":null,"isDefault":false,"lock":false,"key":"6PYW3MNVdLsYt1SyMarsvU7pyBdokvSBsNMkhZ1tXW2Um3y9fRHdCNe7Bq","contract":{"script":"DCECGYb5CyWWMiyfaBxCgUI3VVcyQR6MUXEAxwK5HNQE8JBBVuezJw==","parameters":[{"name":"signature","type":"Signature"}],"deployed":false},"extra":null}],"extra":null}

main.go

@@ -27,7 +27,7 @@ func setupApp() *cli.App {
 	app := cli.NewApp()
 	app.Usage = "NEO Relayer"
 	app.Action = startSync
-	app.Copyright = "Copyright in 2020 The NEO Project"
+	app.Copyright = "Copyright in 2021 The NEO Project"
 	app.Flags = []cli.Flag{
 		cmd.LogLevelFlag,
 		cmd.ConfigPathFlag,

service/ntorMethods.go

@@ -98,19 +98,25 @@ func (this *SyncService) syncProofToRelay(key string, height uint32) error {
 
 	// get state root
 	srGot := false
+	var height2 uint32
 	stateRoot := mpt.StateRoot{}
-	height2 := height
+	if height >= this.neoStateRootHeight {
+		height2 = height
+	} else {
+		height2 = this.neoStateRootHeight
+	}
 	for !srGot {
 		res2 := this.neoSdk.GetStateRoot(height2)
 		if res2.HasError() {
 			this.db.PutRetry(sink.Bytes())
 			return fmt.Errorf("[syncProofToRelay] neoSdk.GetStateRootByIndex error: %s", res2.Error.Message)
 		}
 		stateRoot = res2.Result
-		if len(stateRoot.Witnesses) == 0 {
+		if len(stateRoot.Witnesses) == 0 { // no witness
 			height2++
 		} else {
 			srGot = true
+			this.neoStateRootHeight = height2 // next tx can start from this height to get state root
 		}
 	}
 	buff := io.NewBufBinaryWriter()
@@ -135,6 +141,12 @@ func (this *SyncService) syncProofToRelay(key string, height uint32) error {
 	}
 	log.Info("proof: %s", helper.BytesToHex(proof))
 
+	// following for testing only
+	//id, k, proofs, err := mpt.ResolveProof(proof)
+	//root, _ := helper.UInt256FromString(stateRoot.RootHash)
+	//value, err := mpt.VerifyProof(root, id, k, proofs)
+	//log.Infof("value: %s", helper.BytesToHex(value))
+
 	//sending SyncProof transaction to Relay Chain
 	txHash, err := this.relaySdk.Native.Ccm.ImportOuterTransfer(this.config.NeoChainID, nil, height, proof, this.relayAccount.Address[:], crossChainMsg, this.relayAccount)
 	if err != nil {
@@ -170,11 +182,22 @@ func (this *SyncService) retrySyncProofToRelay(v []byte) error {
 	}
 
 	// get state root
-	res2 := this.neoSdk.GetStateRoot(retry.Height)
-	if res2.HasError() {
-		return fmt.Errorf("[retrySyncProofToRelay] neoSdk.GetStateRootByIndex error: %s", res2.Error.Message)
+	srGot := false
+	stateRoot := mpt.StateRoot{}
+	height2 := retry.Height
+	for !srGot {
+		res2 := this.neoSdk.GetStateRoot(height2)
+		if res2.HasError() {
+			// try once, log error
+			return fmt.Errorf("[retrySyncProofToRelay] neoSdk.GetStateRootByIndex error: %s", res2.Error.Message)
+		}
+		stateRoot = res2.Result
+		if len(stateRoot.Witnesses) == 0 {
+			height2++
+		} else {
+			srGot = true
+		}
 	}
-	stateRoot := res2.Result
 	buff := io.NewBufBinaryWriter()
 	stateRoot.Serialize(buff.BinaryWriter)
 	crossChainMsg := buff.Bytes()
@@ -216,7 +239,7 @@ func (this *SyncService) retrySyncProofToRelay(v []byte) error {
 }
 
 func (this *SyncService) waitForRelayBlock() {
-	_, err := this.relaySdk.WaitForGenerateBlock(30*time.Second, 3)
+	_, err := this.relaySdk.WaitForGenerateBlock(60*time.Second, 3)
 	if err != nil {
 		log.Errorf("[waitForRelayBlock] error: %s", err)
 	}

service/ntorService.go

@@ -98,7 +98,6 @@ func (this *SyncService) neoToRelay(m, n uint32) error {
 					// this loop confirm tx is a cross chain tx
 					for _, notification := range execution.Notifications {
 						u, _ := helper.UInt160FromString(notification.Contract)
-
 						if "0x"+u.String() == this.config.NeoCCMC && notification.EventName == "CrossChainLockEvent" {
 							if notification.State.Type != "Array" {
 								return fmt.Errorf("[neoToRelay] notification.State.Type error: Type is not Array")
@@ -142,6 +141,7 @@ func (this *SyncService) neoToRelay(m, n uint32) error {
 							} else {
 								passed = currentRelayChainSyncHeight
 							}
+							log.Infof("now process neo tx: " + tx.Hash)
 							err = this.syncProofToRelay(key, passed)
 							if err != nil {
 								log.Errorf("--------------------------------------------------")

service/syncService.go

@@ -17,10 +17,11 @@ type SyncService struct {
 	relaySyncHeight uint32
 	relayPubKeys    [][]byte
 
-	nwh              *wallet.WalletHelper
-	neoSdk           *rpc.RpcClient
-	neoSyncHeight    uint32
-	neoNextConsensus string
+	nwh                *wallet.WalletHelper
+	neoSdk             *rpc.RpcClient
+	neoSyncHeight      uint32
+	neoNextConsensus   string
+	neoStateRootHeight uint32
 
 	db     *db.BoltDB
 	config *config.Config
@@ -37,12 +38,13 @@ func NewSyncService(acct *rsdk.Account, relaySdk *rsdk.PolySdk, neoAccount *wall
 		os.Exit(1)
 	}
 	syncSvr := &SyncService{
-		relayAccount: acct,
-		relaySdk:     relaySdk,
-		neoSdk:       client,
-		nwh:          neoAccount,
-		db:           boltDB,
-		config:       config.DefConfig,
+		relayAccount:       acct,
+		relaySdk:           relaySdk,
+		neoSdk:             client,
+		neoStateRootHeight: 0,
+		nwh:                neoAccount,
+		db:                 boltDB,
+		config:             config.DefConfig,
 	}
 	return syncSvr
 }