fix internal state bug

fractalplatform · Jan 4, 2020 · 173c869 · 173c869
1 parent 8486b65
commit 173c869
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 19 deletions.
diff --git a/config.yaml b/config.yaml
@@ -1,12 +1,12 @@
 browser:
   mysql:
     user: root
-    password: 12345678
-    ip: localhost
+    password: Bochen@123
+    ip: 192.168.1.12
     port: 3306
-    database: ft
+    database: mft
   node:
-    rpcHost: http://192.168.1.12:11000
+    rpcHost: http://192.168.1.12:2201
   log:
     level: info #error info debug
     file:
@@ -15,7 +15,7 @@ browser:
       rotationTime: 1 #time.Duration 1:day 2:hour
       maxAge: 15 #day
     console: true
-    syncBlockShowNumber: 1
+    syncBlockShowNumber: 100
   tasks:
     - block
     - txs

diff --git a/data.txt b/data.txt
@@ -0,0 +1,4 @@
+t,u,ftoken,fractal.founder,fractal.account,mapping
+t,h,ftoken,mapping,support,fractal.founder,fractal.account
+c,u,fractal.asset,
+c,u,fractal.account,,fractal,fractal.founder
diff --git a/task/account.go b/task/account.go
@@ -278,7 +278,7 @@ func (a *AccountTask) analysisAccount(data *types.BlockAndResult, dbTx *sql.Tx)
 				if containsInternalTxs {
 					internalActions := detailTxs[i].InternalActions[j]
 					for _, iat := range internalActions.InternalLogs {
-						if iat.Error != "" {
+						if iat.Error == "" {
 							err := a.ActionToAccount(iat.Action, dbTx, data.Block, oldAccounts)
 							if err != nil {
 								ZapLog.Error("ActionToAccount error: ", zap.Error(err))
@@ -370,10 +370,12 @@ func (a *AccountTask) rollback(data *types.BlockAndResult, dbTx *sql.Tx) error {
 				if len(detailTxs) != 0 {
 					internalActions := detailTxs[i].InternalActions[j]
 					for _, iat := range internalActions.InternalLogs {
-						err := a.rollbackAccount(iat.Action, dbTx, deleteAccounts)
-						if err != nil {
-							ZapLog.Error("rollbackAccount error:", zap.Error(err))
-							return err
+						if iat.Error == ""{
+							err := a.rollbackAccount(iat.Action, dbTx, deleteAccounts)
+							if err != nil {
+								ZapLog.Error("rollbackAccount error:", zap.Error(err))
+								return err
+							}
 						}
 					}
 				}

diff --git a/task/balance.go b/task/balance.go
@@ -112,7 +112,7 @@ func (b *BalanceTask) analysisBalance(data *types.BlockAndResult, dbTx *sql.Tx)
 				if len(detailTxs) != 0 {
 					internalActions := detailTxs[i].InternalActions[j]
 					for _, iat := range internalActions.InternalLogs {
-						if iat.Error != "" {
+						if iat.Error == "" {
 							if iat.Action.From.String() != "" {
 								changeBalance(balanceChangedMap, iat.Action.From.String(), iat.Action.AssetID, iat.Action.Amount, false)
 							}
@@ -220,11 +220,13 @@ func (b *BalanceTask) rollback(data *types.BlockAndResult, dbTx *sql.Tx) error {
 				if len(detailTxs) != 0 {
 					internalActions := detailTxs[i].InternalActions[j]
 					for _, iat := range internalActions.InternalLogs {
-						if iat.Action.To.String() != "" {
-							changeBalance(balanceChangedMap, iat.Action.To.String(), iat.Action.AssetID, iat.Action.Amount, false)
-						}
-						if iat.Action.From.String() != "" {
-							changeBalance(balanceChangedMap, iat.Action.From.String(), iat.Action.AssetID, iat.Action.Amount, true)
+						if iat.Error == "" {
+							if iat.Action.To.String() != "" {
+								changeBalance(balanceChangedMap, iat.Action.To.String(), iat.Action.AssetID, iat.Action.Amount, false)
+							}
+							if iat.Action.From.String() != "" {
+								changeBalance(balanceChangedMap, iat.Action.From.String(), iat.Action.AssetID, iat.Action.Amount, true)
+							}
 						}
 					}
 				}

diff --git a/task/token.go b/task/token.go
@@ -96,7 +96,7 @@ func (t *TokenTask) analysisToken(block *TaskChanData) {
 		for _, action := range tx.InternalActions {
 			//if receipts[i].ActionResults[j].Status == types.ReceiptStatusSuccessful {
 			for _, internalLog := range action.InternalLogs {
-				if internalLog.Error != "" {
+				if internalLog.Error == "" {
 					if t.isTokenTxs(internalLog.Action.Type) {
 						isbackup := 0
 						if types.IssueAsset != internalLog.Action.Type {
@@ -135,8 +135,10 @@ func (t *TokenTask) rollback(block *TaskChanData) {
 		for j, action := range tx.InternalActions {
 			if receipts[i].ActionResults[j].Status == types.ReceiptStatusSuccessful {
 				for _, internalLog := range action.InternalLogs {
-					if t.isTokenTxs(internalLog.Action.Type) {
-						rollbackToken(block.Tx, internalLog.Action, block.Block.Block.Time, block.Block.Block.Number.Uint64())
+					if internalLog.Error == "" {
+						if t.isTokenTxs(internalLog.Action.Type) {
+							rollbackToken(block.Tx, internalLog.Action, block.Block.Block.Time, block.Block.Block.Number.Uint64())
+						}
 					}
 				}
 			}