Fix some tests & upgrade contracts

api/.gitignore

@@ -0,0 +1 @@
+accounts.sql*

api/backend_test.go

@@ -12,14 +12,11 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/status-im/status-go/account/generator"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	gethcrypto "github.com/ethereum/go-ethereum/crypto"
 
-	"github.com/status-im/status-go/account"
 	"github.com/status-im/status-go/connection"
 	"github.com/status-im/status-go/eth-node/crypto"
 	"github.com/status-im/status-go/eth-node/types"
@@ -169,68 +166,6 @@ func TestBackendGettersConcurrently(t *testing.T) {
 	wg.Wait()
 }
 
-func TestBackendAccountsConcurrently(t *testing.T) {
-	utils.Init()
-
-	backend := NewGethStatusBackend()
-	config, err := utils.MakeTestNodeConfig(params.StatusChainNetworkID)
-	require.NoError(t, err)
-	require.NoError(t, backend.AccountManager().InitKeystore(config.KeyStoreDir))
-	err = backend.StartNode(config)
-	require.NoError(t, err)
-	defer func() {
-		require.NoError(t, backend.StopNode())
-	}()
-
-	var wgCreateAccounts sync.WaitGroup
-	count := 3
-	type AccountData struct {
-		MasterAccount generator.GeneratedAccountInfo
-		AccountInfo   account.Info
-		Password      string
-	}
-	addressCh := make(chan AccountData, count) // use buffered channel to avoid blocking
-
-	// create new accounts concurrently
-	for i := 0; i < count; i++ {
-		wgCreateAccounts.Add(1)
-		go func(pass string) {
-			MKInfo, accountInfo, _, err := backend.AccountManager().CreateAccount(pass)
-			assert.NoError(t, err)
-			addressCh <- AccountData{MKInfo, accountInfo, pass}
-			wgCreateAccounts.Done()
-		}("password-00" + fmt.Sprint(i))
-	}
-
-	// close addressCh as otherwise for loop never finishes
-	go func() { wgCreateAccounts.Wait(); close(addressCh) }()
-
-	// select, reselect or logout concurrently
-	var wg sync.WaitGroup
-
-	for accountData := range addressCh {
-		wg.Add(1)
-		go func(accountData AccountData) {
-			loginParams := account.LoginParams{
-				MainAccount:  types.HexToAddress(accountData.AccountInfo.WalletAddress),
-				ChatAddress:  types.HexToAddress(accountData.AccountInfo.ChatAddress),
-				Password:     accountData.Password,
-				MultiAccount: accountData.MasterAccount.ToMultiAccount(),
-			}
-			assert.NoError(t, backend.SelectAccount(loginParams))
-			wg.Done()
-		}(accountData)
-
-		wg.Add(1)
-		go func() {
-			assert.NoError(t, backend.Logout())
-			wg.Done()
-		}()
-	}
-
-	wg.Wait()
-}
-
 func TestBackendConnectionChangesConcurrently(t *testing.T) {
 	connections := [...]string{connection.Wifi, connection.Cellular, connection.Unknown}
 	backend := NewGethStatusBackend()
@@ -529,6 +464,10 @@ func TestLoginWithKey(t *testing.T) {
 	require.NoError(t, b.Logout())
 	require.NoError(t, b.StopNode())
 
+	require.NoError(t, b.AccountManager().InitKeystore(conf.KeyStoreDir))
+	b.UpdateRootDataDir(conf.DataDir)
+	require.NoError(t, b.OpenAccounts())
+
 	require.NoError(t, b.StartNodeWithKey(main, "test-pass", keyhex))
 	defer func() {
 		assert.NoError(t, b.Logout())

api/geth_backend.go

@@ -591,6 +591,7 @@ func (b *GethStatusBackend) startNode(config *params.NodeConfig) (err error) {
 
 	b.transactor.SetNetworkID(config.NetworkID)
 	b.transactor.SetRPC(b.statusNode.RPCClient(), rpc.DefaultCallTimeout)
+	b.personalAPI.SetRPC(b.statusNode.RPCClient(), rpc.DefaultCallTimeout)
 
 	if err = b.registerHandlers(); err != nil {
 		b.log.Error("Handler registration failed", "err", err)

node/status_node_services.go

@@ -470,7 +470,7 @@ func (b *StatusNode) Cleanup() error {
 		}
 	}
 
-	if b.Config().WalletConfig.Enabled {
+	if b.Config() != nil && b.Config().WalletConfig.Enabled {
 		if b.walletSrvc != nil {
 			if b.walletSrvc.IsStarted() {
 				err := b.walletSrvc.Stop()

services/local-notifications/core_test.go

@@ -30,7 +30,7 @@ func TestServiceStartStop(t *testing.T) {
 	defer stop()
 
 	s := NewService(db, 1777)
-	require.NoError(t, s.Start(nil))
+	require.NoError(t, s.Start())
 	require.Equal(t, true, s.IsStarted())
 
 	require.NoError(t, s.Stop())
@@ -43,7 +43,7 @@ func TestWalletSubscription(t *testing.T) {
 
 	feed := &event.Feed{}
 	s := NewService(db, 1777)
-	require.NoError(t, s.Start(nil))
+	require.NoError(t, s.Start())
 	require.Equal(t, true, s.IsStarted())
 
 	require.NoError(t, s.SubscribeWallet(feed))
@@ -67,7 +67,7 @@ func TestTransactionNotification(t *testing.T) {
 	defer stop()
 
 	s := NewService(db, 1777)
-	require.NoError(t, s.Start(nil))
+	require.NoError(t, s.Start())
 	require.Equal(t, true, s.IsStarted())
 
 	var signalEvent []byte

services/typeddata/eip712example/example.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.8.0;
 
 contract Example {
 
@@ -58,7 +58,7 @@ contract Example {
         MAIL = hash(mail);
     }
 
-    function hash(EIP712Domain eip712Domain) internal pure returns (bytes32) {
+    function hash(EIP712Domain memory eip712Domain) internal pure returns (bytes32) {
         return keccak256(abi.encode(
             EIP712DOMAIN_TYPEHASH,
             keccak256(bytes(eip712Domain.name)),
@@ -68,7 +68,7 @@ contract Example {
         ));
     }
 
-    function hash(Person person) internal pure returns (bytes32) {
+    function hash(Person memory person) internal pure returns (bytes32) {
         return keccak256(abi.encode(
             PERSON_TYPEHASH,
             keccak256(bytes(person.name)),
@@ -76,12 +76,12 @@ contract Example {
         ));
     }
 
-    function hash(Mail mail) internal pure returns (bytes32) {
+    function hash(Mail memory m) internal pure returns (bytes32) {
         return keccak256(abi.encode(
             MAIL_TYPEHASH,
-            hash(mail.from),
+            hash(m.from),
-            hash(mail.to),
+            hash(m.to),
-            keccak256(bytes(mail.contents))
+            keccak256(bytes(m.contents))
         ));
     }
 

services/typeddata/hash_test.go

@@ -74,9 +74,9 @@ func TestEncodeData(t *testing.T) {
 		result      func(testCase) common.Hash
 	}
 
-	bytes32, _ := abi.NewType("bytes32", nil)
+	bytes32, _ := abi.NewType("bytes32", "", nil)
-	addr, _ := abi.NewType("address", nil)
+	addr, _ := abi.NewType("address", "", nil)
-	boolT, _ := abi.NewType("bool", nil)
+	boolT, _ := abi.NewType("bool", "", nil)
 
 	for _, tc := range []testCase{
 		{
@@ -177,8 +177,8 @@ func TestEncodeData(t *testing.T) {
 			}},
 			"A",
 			func(tc testCase) common.Hash {
-				intBig, _ := abi.NewType("int128", nil)
+				intBig, _ := abi.NewType("int128", "", nil)
-				uintBig, _ := abi.NewType("uint128", nil)
+				uintBig, _ := abi.NewType("uint128", "", nil)
 				args := abi.Arguments{{Type: bytes32},
 					{Type: intBig}, {Type: intBig}, {Type: uintBig}, {Type: uintBig}}
 				typehash := typeHash(tc.target, tc.types)

services/typeddata/sign_test.go

@@ -1,21 +1,11 @@
 package typeddata
 
 import (
-	"context"
 	"encoding/json"
-	"math"
 	"math/big"
 	"testing"
 
 	"github.com/stretchr/testify/require"
-
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/crypto"
-
-	"github.com/status-im/status-go/services/typeddata/eip712example"
 )
 
 var (
@@ -60,96 +50,3 @@ func TestChainIDValidation(t *testing.T) {
 		})
 	}
 }
-
-func TestInteroparableWithSolidity(t *testing.T) {
-	key, _ := crypto.GenerateKey()
-	testaddr := crypto.PubkeyToAddress(key.PublicKey)
-	genesis := core.GenesisAlloc{
-		testaddr: {Balance: new(big.Int).SetInt64(math.MaxInt64)},
-	}
-	backend := backends.NewSimulatedBackend(genesis, math.MaxInt64)
-	opts := bind.NewKeyedTransactor(key)
-	_, _, example, err := eip712example.DeployExample(opts, backend)
-	require.NoError(t, err)
-	backend.Commit()
-
-	domainSol, err := example.DOMAINSEPARATOR(nil)
-	require.NoError(t, err)
-	mailSol, err := example.MAIL(nil)
-	require.NoError(t, err)
-
-	mytypes := Types{
-		eip712Domain: []Field{
-			{Name: "name", Type: "string"},
-			{Name: "version", Type: "string"},
-			{Name: "chainId", Type: "uint256"},
-			{Name: "verifyingContract", Type: "address"},
-		},
-		"Person": []Field{
-			{Name: "name", Type: "string"},
-			{Name: "wallet", Type: "address"},
-		},
-		"Mail": []Field{
-			{Name: "from", Type: "Person"},
-			{Name: "to", Type: "Person"},
-			{Name: "contents", Type: "string"},
-		},
-	}
-	domain := map[string]json.RawMessage{
-		"name":              json.RawMessage(`"Ether Mail"`),
-		"version":           json.RawMessage(`"1"`),
-		"chainId":           json.RawMessage("1"),
-		"verifyingContract": json.RawMessage(`"0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"`),
-	}
-	domainChainIDAsString := map[string]json.RawMessage{
-		"name":              json.RawMessage(`"Ether Mail"`),
-		"version":           json.RawMessage(`"1"`),
-		"chainId":           json.RawMessage(`"1"`),
-		"verifyingContract": json.RawMessage(`"0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"`),
-	}
-	msg := map[string]json.RawMessage{
-		"from":     json.RawMessage(fromWallet),
-		"to":       json.RawMessage(toWallet),
-		"contents": json.RawMessage(`"Hello, Bob!"`),
-	}
-	typed := TypedData{
-		Types:       mytypes,
-		PrimaryType: "Mail",
-		Domain:      domain,
-		Message:     msg,
-	}
-	typedChainIDAsString := TypedData{
-		Types:       mytypes,
-		PrimaryType: "Mail",
-		Domain:      domainChainIDAsString,
-		Message:     msg,
-	}
-
-	domainHash, err := hashStruct(eip712Domain, typed.Domain, typed.Types)
-	require.NoError(t, err)
-	require.Equal(t, domainSol[:], domainHash[:])
-
-	mailHash, err := hashStruct(typed.PrimaryType, typed.Message, typed.Types)
-	require.NoError(t, err)
-	require.Equal(t, mailSol[:], mailHash[:])
-
-	signature, err := Sign(typed, key, big.NewInt(1))
-	require.NoError(t, err)
-	require.Len(t, signature, 65)
-
-	signature2, err := Sign(typedChainIDAsString, key, big.NewInt(1))
-	require.NoError(t, err)
-	require.Equal(t, signature, signature2)
-
-	r := [32]byte{}
-	copy(r[:], signature[:32])
-	s := [32]byte{}
-	copy(s[:], signature[32:64])
-	v := signature[64]
-	tx, err := example.Verify(opts, v, r, s)
-	require.NoError(t, err)
-	backend.Commit()
-	receipt, err := bind.WaitMined(context.TODO(), backend, tx)
-	require.NoError(t, err)
-	require.Equal(t, types.ReceiptStatusSuccessful, receipt.Status)
-}

services/wallet/erc20/README.md

@@ -1,4 +0,0 @@
-Test contract for Transfer events
-=================================
-
-Emits transfer event defined by ERC20 standart.

services/wallet/erc20/doc.go

@@ -1,3 +0,0 @@
-package erc20
-
-//go:generate abigen -sol erc20.sol -pkg erc20 -out erc20.go

services/wallet/erc20/erc20.go

@@ -1,404 +0,0 @@
-// Code generated - DO NOT EDIT.
-// This file is a generated binding and any manual changes will be lost.
-
-package erc20
-
-import (
-	"math/big"
-	"strings"
-
-	ethereum "github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/accounts/abi"
-	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/event"
-)
-
-// Reference imports to suppress errors if they are not otherwise used.
-var (
-	_ = big.NewInt
-	_ = strings.NewReader
-	_ = ethereum.NotFound
-	_ = abi.U256
-	_ = bind.Bind
-	_ = common.Big1
-	_ = types.BloomLookup
-	_ = event.NewSubscription
-)
-
-// ERC20TransferABI is the input ABI used to generate the binding from.
-const ERC20TransferABI = "[{\"constant\":true,\"inputs\":[{\"name\":\"\",\"type\":\"address\"}],\"name\":\"balances\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":true,\"inputs\":[{\"name\":\"account\",\"type\":\"address\"}],\"name\":\"balanceOf\",\"outputs\":[{\"name\":\"\",\"type\":\"uint256\"}],\"payable\":false,\"stateMutability\":\"view\",\"type\":\"function\"},{\"constant\":false,\"inputs\":[{\"name\":\"to\",\"type\":\"address\"},{\"name\":\"value\",\"type\":\"uint256\"}],\"name\":\"transfer\",\"outputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"payable\":false,\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"name\":\"to\",\"type\":\"address\"},{\"indexed\":false,\"name\":\"value\",\"type\":\"uint256\"}],\"name\":\"Transfer\",\"type\":\"event\"}]"
-
-// ERC20TransferBin is the compiled bytecode used for deploying new contracts.
-const ERC20TransferBin = `0x608060405234801561001057600080fd5b50610181806100206000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c806327e235e31461004657806370a082311461007e578063a9059cbb146100a4575b600080fd5b61006c6004803603602081101561005c57600080fd5b50356001600160a01b03166100d2565b60408051918252519081900360200190f35b61006c6004803603602081101561009457600080fd5b50356001600160a01b03166100e4565b6100d0600480360360408110156100ba57600080fd5b506001600160a01b0381351690602001356100ff565b005b60006020819052908152604090205481565b6001600160a01b031660009081526020819052604090205490565b6001600160a01b038216600081815260208181526040918290208054850190558151848152915133927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef92908290030190a3505056fea165627a7a72305820ce4a8618526aef925c173a7501883068de371638ddfe96d61116807d93bf0e010029`
-
-// DeployERC20Transfer deploys a new Ethereum contract, binding an instance of ERC20Transfer to it.
-func DeployERC20Transfer(auth *bind.TransactOpts, backend bind.ContractBackend) (common.Address, *types.Transaction, *ERC20Transfer, error) {
-	parsed, err := abi.JSON(strings.NewReader(ERC20TransferABI))
-	if err != nil {
-		return common.Address{}, nil, nil, err
-	}
-	address, tx, contract, err := bind.DeployContract(auth, parsed, common.FromHex(ERC20TransferBin), backend)
-	if err != nil {
-		return common.Address{}, nil, nil, err
-	}
-	return address, tx, &ERC20Transfer{ERC20TransferCaller: ERC20TransferCaller{contract: contract}, ERC20TransferTransactor: ERC20TransferTransactor{contract: contract}, ERC20TransferFilterer: ERC20TransferFilterer{contract: contract}}, nil
-}
-
-// ERC20Transfer is an auto generated Go binding around an Ethereum contract.
-type ERC20Transfer struct {
-	ERC20TransferCaller     // Read-only binding to the contract
-	ERC20TransferTransactor // Write-only binding to the contract
-	ERC20TransferFilterer   // Log filterer for contract events
-}
-
-// ERC20TransferCaller is an auto generated read-only Go binding around an Ethereum contract.
-type ERC20TransferCaller struct {
-	contract *bind.BoundContract // Generic contract wrapper for the low level calls
-}
-
-// ERC20TransferTransactor is an auto generated write-only Go binding around an Ethereum contract.
-type ERC20TransferTransactor struct {
-	contract *bind.BoundContract // Generic contract wrapper for the low level calls
-}
-
-// ERC20TransferFilterer is an auto generated log filtering Go binding around an Ethereum contract events.
-type ERC20TransferFilterer struct {
-	contract *bind.BoundContract // Generic contract wrapper for the low level calls
-}
-
-// ERC20TransferSession is an auto generated Go binding around an Ethereum contract,
-// with pre-set call and transact options.
-type ERC20TransferSession struct {
-	Contract     *ERC20Transfer    // Generic contract binding to set the session for
-	CallOpts     bind.CallOpts     // Call options to use throughout this session
-	TransactOpts bind.TransactOpts // Transaction auth options to use throughout this session
-}
-
-// ERC20TransferCallerSession is an auto generated read-only Go binding around an Ethereum contract,
-// with pre-set call options.
-type ERC20TransferCallerSession struct {
-	Contract *ERC20TransferCaller // Generic contract caller binding to set the session for
-	CallOpts bind.CallOpts        // Call options to use throughout this session
-}
-
-// ERC20TransferTransactorSession is an auto generated write-only Go binding around an Ethereum contract,
-// with pre-set transact options.
-type ERC20TransferTransactorSession struct {
-	Contract     *ERC20TransferTransactor // Generic contract transactor binding to set the session for
-	TransactOpts bind.TransactOpts        // Transaction auth options to use throughout this session
-}
-
-// ERC20TransferRaw is an auto generated low-level Go binding around an Ethereum contract.
-type ERC20TransferRaw struct {
-	Contract *ERC20Transfer // Generic contract binding to access the raw methods on
-}
-
-// ERC20TransferCallerRaw is an auto generated low-level read-only Go binding around an Ethereum contract.
-type ERC20TransferCallerRaw struct {
-	Contract *ERC20TransferCaller // Generic read-only contract binding to access the raw methods on
-}
-
-// ERC20TransferTransactorRaw is an auto generated low-level write-only Go binding around an Ethereum contract.
-type ERC20TransferTransactorRaw struct {
-	Contract *ERC20TransferTransactor // Generic write-only contract binding to access the raw methods on
-}
-
-// NewERC20Transfer creates a new instance of ERC20Transfer, bound to a specific deployed contract.
-func NewERC20Transfer(address common.Address, backend bind.ContractBackend) (*ERC20Transfer, error) {
-	contract, err := bindERC20Transfer(address, backend, backend, backend)
-	if err != nil {
-		return nil, err
-	}
-	return &ERC20Transfer{ERC20TransferCaller: ERC20TransferCaller{contract: contract}, ERC20TransferTransactor: ERC20TransferTransactor{contract: contract}, ERC20TransferFilterer: ERC20TransferFilterer{contract: contract}}, nil
-}
-
-// NewERC20TransferCaller creates a new read-only instance of ERC20Transfer, bound to a specific deployed contract.
-func NewERC20TransferCaller(address common.Address, caller bind.ContractCaller) (*ERC20TransferCaller, error) {
-	contract, err := bindERC20Transfer(address, caller, nil, nil)
-	if err != nil {
-		return nil, err
-	}
-	return &ERC20TransferCaller{contract: contract}, nil
-}
-
-// NewERC20TransferTransactor creates a new write-only instance of ERC20Transfer, bound to a specific deployed contract.
-func NewERC20TransferTransactor(address common.Address, transactor bind.ContractTransactor) (*ERC20TransferTransactor, error) {
-	contract, err := bindERC20Transfer(address, nil, transactor, nil)
-	if err != nil {
-		return nil, err
-	}
-	return &ERC20TransferTransactor{contract: contract}, nil
-}
-
-// NewERC20TransferFilterer creates a new log filterer instance of ERC20Transfer, bound to a specific deployed contract.
-func NewERC20TransferFilterer(address common.Address, filterer bind.ContractFilterer) (*ERC20TransferFilterer, error) {
-	contract, err := bindERC20Transfer(address, nil, nil, filterer)
-	if err != nil {
-		return nil, err
-	}
-	return &ERC20TransferFilterer{contract: contract}, nil
-}
-
-// bindERC20Transfer binds a generic wrapper to an already deployed contract.
-func bindERC20Transfer(address common.Address, caller bind.ContractCaller, transactor bind.ContractTransactor, filterer bind.ContractFilterer) (*bind.BoundContract, error) {
-	parsed, err := abi.JSON(strings.NewReader(ERC20TransferABI))
-	if err != nil {
-		return nil, err
-	}
-	return bind.NewBoundContract(address, parsed, caller, transactor, filterer), nil
-}
-
-// Call invokes the (constant) contract method with params as input values and
-// sets the output to result. The result type might be a single field for simple
-// returns, a slice of interfaces for anonymous returns and a struct for named
-// returns.
-func (_ERC20Transfer *ERC20TransferRaw) Call(opts *bind.CallOpts, result interface{}, method string, params ...interface{}) error {
-	return _ERC20Transfer.Contract.ERC20TransferCaller.contract.Call(opts, result, method, params...)
-}
-
-// Transfer initiates a plain transaction to move funds to the contract, calling
-// its default method if one is available.
-func (_ERC20Transfer *ERC20TransferRaw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) {
-	return _ERC20Transfer.Contract.ERC20TransferTransactor.contract.Transfer(opts)
-}
-
-// Transact invokes the (paid) contract method with params as input values.
-func (_ERC20Transfer *ERC20TransferRaw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) {
-	return _ERC20Transfer.Contract.ERC20TransferTransactor.contract.Transact(opts, method, params...)
-}
-
-// Call invokes the (constant) contract method with params as input values and
-// sets the output to result. The result type might be a single field for simple
-// returns, a slice of interfaces for anonymous returns and a struct for named
-// returns.
-func (_ERC20Transfer *ERC20TransferCallerRaw) Call(opts *bind.CallOpts, result interface{}, method string, params ...interface{}) error {
-	return _ERC20Transfer.Contract.contract.Call(opts, result, method, params...)
-}
-
-// Transfer initiates a plain transaction to move funds to the contract, calling
-// its default method if one is available.
-func (_ERC20Transfer *ERC20TransferTransactorRaw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) {
-	return _ERC20Transfer.Contract.contract.Transfer(opts)
-}
-
-// Transact invokes the (paid) contract method with params as input values.
-func (_ERC20Transfer *ERC20TransferTransactorRaw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) {
-	return _ERC20Transfer.Contract.contract.Transact(opts, method, params...)
-}
-
-// BalanceOf is a free data retrieval call binding the contract method 0x70a08231.
-//
-// Solidity: function balanceOf(address account) constant returns(uint256)
-func (_ERC20Transfer *ERC20TransferCaller) BalanceOf(opts *bind.CallOpts, account common.Address) (*big.Int, error) {
-	var (
-		ret0 = new(*big.Int)
-	)
-	out := ret0
-	err := _ERC20Transfer.contract.Call(opts, out, "balanceOf", account)
-	return *ret0, err
-}
-
-// BalanceOf is a free data retrieval call binding the contract method 0x70a08231.
-//
-// Solidity: function balanceOf(address account) constant returns(uint256)
-func (_ERC20Transfer *ERC20TransferSession) BalanceOf(account common.Address) (*big.Int, error) {
-	return _ERC20Transfer.Contract.BalanceOf(&_ERC20Transfer.CallOpts, account)
-}
-
-// BalanceOf is a free data retrieval call binding the contract method 0x70a08231.
-//
-// Solidity: function balanceOf(address account) constant returns(uint256)
-func (_ERC20Transfer *ERC20TransferCallerSession) BalanceOf(account common.Address) (*big.Int, error) {
-	return _ERC20Transfer.Contract.BalanceOf(&_ERC20Transfer.CallOpts, account)
-}
-
-// Balances is a free data retrieval call binding the contract method 0x27e235e3.
-//
-// Solidity: function balances(address ) constant returns(uint256)
-func (_ERC20Transfer *ERC20TransferCaller) Balances(opts *bind.CallOpts, arg0 common.Address) (*big.Int, error) {
-	var (
-		ret0 = new(*big.Int)
-	)
-	out := ret0
-	err := _ERC20Transfer.contract.Call(opts, out, "balances", arg0)
-	return *ret0, err
-}
-
-// Balances is a free data retrieval call binding the contract method 0x27e235e3.
-//
-// Solidity: function balances(address ) constant returns(uint256)
-func (_ERC20Transfer *ERC20TransferSession) Balances(arg0 common.Address) (*big.Int, error) {
-	return _ERC20Transfer.Contract.Balances(&_ERC20Transfer.CallOpts, arg0)
-}
-
-// Balances is a free data retrieval call binding the contract method 0x27e235e3.
-//
-// Solidity: function balances(address ) constant returns(uint256)
-func (_ERC20Transfer *ERC20TransferCallerSession) Balances(arg0 common.Address) (*big.Int, error) {
-	return _ERC20Transfer.Contract.Balances(&_ERC20Transfer.CallOpts, arg0)
-}
-
-// Transfer is a paid mutator transaction binding the contract method 0xa9059cbb.
-//
-// Solidity: function transfer(address to, uint256 value) returns()
-func (_ERC20Transfer *ERC20TransferTransactor) Transfer(opts *bind.TransactOpts, to common.Address, value *big.Int) (*types.Transaction, error) {
-	return _ERC20Transfer.contract.Transact(opts, "transfer", to, value)
-}
-
-// Transfer is a paid mutator transaction binding the contract method 0xa9059cbb.
-//
-// Solidity: function transfer(address to, uint256 value) returns()
-func (_ERC20Transfer *ERC20TransferSession) Transfer(to common.Address, value *big.Int) (*types.Transaction, error) {
-	return _ERC20Transfer.Contract.Transfer(&_ERC20Transfer.TransactOpts, to, value)
-}
-
-// Transfer is a paid mutator transaction binding the contract method 0xa9059cbb.
-//
-// Solidity: function transfer(address to, uint256 value) returns()
-func (_ERC20Transfer *ERC20TransferTransactorSession) Transfer(to common.Address, value *big.Int) (*types.Transaction, error) {
-	return _ERC20Transfer.Contract.Transfer(&_ERC20Transfer.TransactOpts, to, value)
-}
-
-// ERC20TransferTransferIterator is returned from FilterTransfer and is used to iterate over the raw logs and unpacked data for Transfer events raised by the ERC20Transfer contract.
-type ERC20TransferTransferIterator struct {
-	Event *ERC20TransferTransfer // Event containing the contract specifics and raw log
-
-	contract *bind.BoundContract // Generic contract to use for unpacking event data
-	event    string              // Event name to use for unpacking event data
-
-	logs chan types.Log        // Log channel receiving the found contract events
-	sub  ethereum.Subscription // Subscription for errors, completion and termination
-	done bool                  // Whether the subscription completed delivering logs
-	fail error                 // Occurred error to stop iteration
-}
-
-// Next advances the iterator to the subsequent event, returning whether there
-// are any more events found. In case of a retrieval or parsing error, false is
-// returned and Error() can be queried for the exact failure.
-func (it *ERC20TransferTransferIterator) Next() bool {
-	// If the iterator failed, stop iterating
-	if it.fail != nil {
-		return false
-	}
-	// If the iterator completed, deliver directly whatever's available
-	if it.done {
-		select {
-		case log := <-it.logs:
-			it.Event = new(ERC20TransferTransfer)
-			if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-				it.fail = err
-				return false
-			}
-			it.Event.Raw = log
-			return true
-
-		default:
-			return false
-		}
-	}
-	// Iterator still in progress, wait for either a data or an error event
-	select {
-	case log := <-it.logs:
-		it.Event = new(ERC20TransferTransfer)
-		if err := it.contract.UnpackLog(it.Event, it.event, log); err != nil {
-			it.fail = err
-			return false
-		}
-		it.Event.Raw = log
-		return true
-
-	case err := <-it.sub.Err():
-		it.done = true
-		it.fail = err
-		return it.Next()
-	}
-}
-
-// Error returns any retrieval or parsing error occurred during filtering.
-func (it *ERC20TransferTransferIterator) Error() error {
-	return it.fail
-}
-
-// Close terminates the iteration process, releasing any pending underlying
-// resources.
-func (it *ERC20TransferTransferIterator) Close() error {
-	it.sub.Unsubscribe()
-	return nil
-}
-
-// ERC20TransferTransfer represents a Transfer event raised by the ERC20Transfer contract.
-type ERC20TransferTransfer struct {
-	From  common.Address
-	To    common.Address
-	Value *big.Int
-	Raw   types.Log // Blockchain specific contextual infos
-}
-
-// FilterTransfer is a free log retrieval operation binding the contract event 0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef.
-//
-// Solidity: event Transfer(address indexed from, address indexed to, uint256 value)
-func (_ERC20Transfer *ERC20TransferFilterer) FilterTransfer(opts *bind.FilterOpts, from []common.Address, to []common.Address) (*ERC20TransferTransferIterator, error) {
-
-	var fromRule []interface{}
-	for _, fromItem := range from {
-		fromRule = append(fromRule, fromItem)
-	}
-	var toRule []interface{}
-	for _, toItem := range to {
-		toRule = append(toRule, toItem)
-	}
-
-	logs, sub, err := _ERC20Transfer.contract.FilterLogs(opts, "Transfer", fromRule, toRule)
-	if err != nil {
-		return nil, err
-	}
-	return &ERC20TransferTransferIterator{contract: _ERC20Transfer.contract, event: "Transfer", logs: logs, sub: sub}, nil
-}
-
-// WatchTransfer is a free log subscription operation binding the contract event 0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef.
-//
-// Solidity: event Transfer(address indexed from, address indexed to, uint256 value)
-func (_ERC20Transfer *ERC20TransferFilterer) WatchTransfer(opts *bind.WatchOpts, sink chan<- *ERC20TransferTransfer, from []common.Address, to []common.Address) (event.Subscription, error) {
-
-	var fromRule []interface{}
-	for _, fromItem := range from {
-		fromRule = append(fromRule, fromItem)
-	}
-	var toRule []interface{}
-	for _, toItem := range to {
-		toRule = append(toRule, toItem)
-	}
-
-	logs, sub, err := _ERC20Transfer.contract.WatchLogs(opts, "Transfer", fromRule, toRule)
-	if err != nil {
-		return nil, err
-	}
-	return event.NewSubscription(func(quit <-chan struct{}) error {
-		defer sub.Unsubscribe()
-		for {
-			select {
-			case log := <-logs:
-				// New log arrived, parse the event and forward to the user
-				event := new(ERC20TransferTransfer)
-				if err := _ERC20Transfer.contract.UnpackLog(event, "Transfer", log); err != nil {
-					return err
-				}
-				event.Raw = log
-
-				select {
-				case sink <- event:
-				case err := <-sub.Err():
-					return err
-				case <-quit:
-					return nil
-				}
-			case err := <-sub.Err():
-				return err
-			case <-quit:
-				return nil
-			}
-		}
-	}), nil
-}

services/wallet/erc20/erc20.sol

@@ -1,19 +0,0 @@
-pragma solidity ^0.5.0;
-
-contract ERC20Transfer {
-
-  mapping (address => uint256) public balances;
-
-  constructor() public {}
-
-  event Transfer(address indexed from, address indexed to, uint256 value);
-
-  function transfer(address to, uint256 value) public {
-    balances[to] += value;
-    emit Transfer(msg.sender, to, value);
-  }
-
-  function balanceOf(address account) public view returns (uint256) {
-    return balances[account];
-  }
-}