Merge branch 'master' of https://github.com/joeqian10/neo3-gogogo

README.md

@@ -207,6 +207,28 @@ func main() {
 }
 ```
 
+#### 2.2.3 Convert base64 encoded script hash to standard address
+
+```golang
+package demo
+
+import (
+	"github.com/joeqian10/neo3-gogogo/crypto"
+	"github.com/joeqian10/neo3-gogogo/helper"
+)
+
+func main()  {
+	bs, err := crypto.Base64Decode("4rZTInKT6ZxPKQbVNVOrtKZy34Y=")
+	if err != nil {
+		// do something...
+    }
+	u := helper.UInt160FromBytes(bs)
+	a := crypto.ScriptHashToAddress(u, helper.DefaultAddressVersion)
+	// "a" is NgaiKFjurmNmiRzDRQGs44yzByXuSkdGPF
+}
+
+```
+
 ## 3. Modules Introduction
 
 ### 3.1 "block" module

crypto/helper_test.go

@@ -25,3 +25,11 @@ func TestScriptHashToAddress(t *testing.T) {
 	a := ScriptHashToAddress(u, helper.DefaultAddressVersion)
 	assert.Equal(t, "NdtB8RXRmJ7Nhw1FPTm7E6HoDZGnDw37nf", a)
 }
+
+func TestConvert(t *testing.T)  {
+	bs, err := Base64Decode("4rZTInKT6ZxPKQbVNVOrtKZy34Y=")
+	assert.Nil(t, err)
+	u := helper.UInt160FromBytes(bs)
+	a := ScriptHashToAddress(u, helper.DefaultAddressVersion)
+	assert.Equal(t, "NgaiKFjurmNmiRzDRQGs44yzByXuSkdGPF", a)
+}

wallet/walletHelper.go

@@ -567,7 +567,7 @@ func (w *WalletHelper) Transfer(assetHash *helper.UInt160, toAddress string, amo
 	}
 	balancesGas := make([]AccountAndBalance, 0)
 	if assetHash.Equals(tx.GasToken) {
-		balancesGas = FindRemainingAccountAndBalance(balancesUsed, balances)
+		balancesGas = balances
 	} else {
 		balancesGas, err = w.GetAccountAndBalance(tx.GasToken)
 		if err != nil {