only TriggerSmartContract check transaction contractRet

Author: zhiquan911

.gitignore

@@ -3,3 +3,4 @@ release
 .vscode
 .idea
 *.key
+openwtester/conf

openwtester/subscribe_test.go

@@ -58,11 +58,9 @@ func TestSubscribeAddress(t *testing.T) {
 	var (
 		endRunning = make(chan bool, 1)
 		symbol     = "TRX"
-		//accountID  = "CfRjWjct569qp7oygSA2LrsAoTrfEB8wRk3sHGUj9Erm"
-		accountID = "6msrcfed9rA7njVNDtY1Ppo9XQdX5p3SFPc1zxWgd8ut"
 		addrs     = map[string]string{
-			"TT44ohw23WGNv1jQCAUN3etUWND1KXN2Eq": accountID,
-			"TJLypjev8iLdQR3X63rSMeZK8GKwkeSH1Y": accountID,
+			"TEzdWXvMNE7sBxuQ2N98EX4kEJajQgz5rM": "sender",
+			"TRJJ9Mq4aMjdmKWpTDJAgbYNoY2P9Facg5": "receiver",
 		}
 	)
 
@@ -92,7 +90,7 @@ func TestSubscribeAddress(t *testing.T) {
 
 	//log.Debug("already got scanner:", assetsMgr)
 	scanner := assetsMgr.GetBlockScanner()
-	scanner.SetRescanBlockHeight(7848677)
+	scanner.SetRescanBlockHeight(10438073)
 
 	if scanner == nil {
 		log.Error(symbol, "is not support block scan")

openwtester/transaction_manager_test.go

@@ -130,24 +130,24 @@ func TestWalletManager_GetAssetsAccountTokenBalance(t *testing.T) {
 	//	Protocol: "trc20",
 	//}
 
-	//contract := openwallet.SmartContract{
-	//	Address:  "THvZvKPLHKLJhEFYKiyqj6j8G8nGgfg7ur",
-	//	Symbol:   "TRX",
-	//	Name:     "TRONdice",
-	//	Token:    "DICE",
-	//	Decimals: 6,
-	//	Protocol: "trc20",
-	//}
-
 	contract := openwallet.SmartContract{
-		Address:  "1002000",
+		Address:  "THvZvKPLHKLJhEFYKiyqj6j8G8nGgfg7ur",
 		Symbol:   "TRX",
-		Name:     "BitTorrent",
-		Token:    "BTT",
-		Decimals: 0,
-		Protocol: "trc10",
+		Name:     "TRONdice",
+		Token:    "DICE",
+		Decimals: 6,
+		Protocol: "trc20",
 	}
 
+	//contract := openwallet.SmartContract{
+	//	Address:  "1002000",
+	//	Symbol:   "TRX",
+	//	Name:     "BitTorrent",
+	//	Token:    "BTT",
+	//	Decimals: 0,
+	//	Protocol: "trc10",
+	//}
+
 	balance, err := tm.GetAssetsAccountTokenBalance(testApp, walletID, accountID, contract)
 	if err != nil {
 		log.Error("GetAssetsAccountTokenBalance failed, unexpected error:", err)

openwtester/transcation_assets_test.go

@@ -179,7 +179,7 @@ func TestTransfer_TRC20(t *testing.T) {
 
 	testGetAssetsAccountTokenBalance(tm, walletID, accountID, contract)
 
-	rawTx, err := testCreateTransactionStep(tm, walletID, accountID, to, "9.5", "", &contract)
+	rawTx, err := testCreateTransactionStep(tm, walletID, accountID, to, "1", "", &contract)
 	if err != nil {
 		return
 	}

tron/blockscanner.go

@@ -424,10 +424,16 @@ func (bs *TronBlockScanner) InitTronExtractResult(tx *Contract, result *ExtractR
 
 	status := "1"
 	reason := ""
-	if tx.ContractRet != SUCCESS {
-		status = "0"
-		reason = tx.ContractRet
+
+	//TRC20转账才需要判断ContractRet状态
+	if tx.Type == TriggerSmartContract {
+		if tx.ContractRet != SUCCESS {
+			status = "0"
+			reason = tx.ContractRet
+		}
 	}
+
+
 	amount := decimal.Zero
 	coin := openwallet.Coin{
 		Symbol:     bs.wm.Symbol(),

tron/blockscanner_test.go

@@ -110,7 +110,7 @@ func TestTron_GetGlobalMaxBlockHeight(t *testing.T) {
 
 func TestTron_GetTransaction(t *testing.T) {
 	bs := NewTronBlockScanner(tw)
-	txID := "d414c54f51792e9383e9b9a19b67f0f34e8a3eccf3059757b8ea9a1b5a7de86c"
+	txID := "003712cddc2be86184a6b6d396e726d4549975dc6938e5f88bfcb627960886b8"
 	height := uint64(7773685)
 	tx, err := bs.wm.GetTransaction(txID, "", height, 0)
 	if err != nil {

tron/manager_test.go

@@ -32,8 +32,6 @@ func init() {
 	tw = NewWalletManager()
 
 	//tw.Config.ServerAPI = "http://127.0.0.1:28090"
-	// tw.Config.ServerAPI = "http://127.0.0.1:18090"
-	//tw.Config.ServerAPI = "http://192.168.2.194:18090"
 	tw.Config.ServerAPI = "https://api.trongrid.io"
 	tw.Config.IsTestNet = false
 	// tw.Config.RpcUser = "walletUser"