[Upgrade] Go-Ethereum release v1.10.0

accounts/abi/bind/auth.go

@@ -22,6 +22,7 @@ import (
 	"io"
 	"io/ioutil"
 	"math/big"
+	"reflect"
 
 	"github.com/ethereum/go-ethereum/accounts"
 	"github.com/ethereum/go-ethereum/accounts/external"
@@ -133,6 +134,7 @@ func NewKeyStoreTransactorWithChainID(keystore *keystore.KeyStore, account accou
 		return nil, ErrNoChainID
 	}
 	latestSigner := types.LatestSignerForChainID(chainID)
+	log.Info("NewKeyStoreTransactorWithChainID", "latestSigner", reflect.TypeOf(latestSigner))
 	return &TransactOpts{
 		From: account.Address,
 		Signer: func(address common.Address, tx *types.Transaction) (*types.Transaction, error) {
@@ -192,6 +194,7 @@ func NewClefTransactor(clef *external.ExternalSigner, account accounts.Account)
 			if address != account.Address {
 				return nil, ErrNotAuthorized
 			}
+			log.Info("Signing with NewClefTransactor")
 			return clef.SignTx(account, transaction, transaction.ChainId()) // Clef enforces its own chain id
 		},
 	}
@@ -201,14 +204,18 @@ func NewClefTransactor(clef *external.ExternalSigner, account accounts.Account)
 //
 // NewWalletTransactor is a utility method to easily create a transaction signer
 // from a wallet account
-func NewWalletTransactor(w accounts.Wallet, account accounts.Account) *TransactOpts {
+func NewWalletTransactor(w accounts.Wallet, account accounts.Account, chainId *big.Int) *TransactOpts {
 	return &TransactOpts{
 		From: account.Address,
 		Signer: func(address common.Address, transaction *types.Transaction) (*types.Transaction, error) {
 			if address != account.Address {
 				return nil, errors.New("not authorized to sign this account")
 			}
-			return w.SignTx(account, transaction, transaction.ChainId())
+			if transaction.ChainId() == nil {
+				chainId = transaction.ChainId()
+			}
+
+			return w.SignTx(account, transaction, chainId)
 		},
 	}
 }

extension/backend.go

@@ -5,6 +5,7 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
+	"github.com/ethereum/go-ethereum/params"
 	"math/big"
 	"sync"
 
@@ -34,7 +35,8 @@ type PrivacyService struct {
 	mu           sync.Mutex
 	psiContracts map[types.PrivateStateIdentifier]map[common.Address]*ExtensionContract
 
-	node *node.Node
+	node   *node.Node
+	config *params.ChainConfig
 }
 
 var (
@@ -74,7 +76,7 @@ func (service *PrivacyService) subscribeStopEvent() (chan stopEvent, event.Subsc
 	return c, s
 }
 
-func New(stack *node.Node, ptm private.PrivateTransactionManager, manager *accounts.Manager, handler DataHandler, fetcher *StateFetcher, apiBackendHelper APIBackendHelper) (*PrivacyService, error) {
+func New(stack *node.Node, ptm private.PrivateTransactionManager, manager *accounts.Manager, handler DataHandler, fetcher *StateFetcher, apiBackendHelper APIBackendHelper, config *params.ChainConfig) (*PrivacyService, error) {
 	service := &PrivacyService{
 		psiContracts:     make(map[types.PrivateStateIdentifier]map[common.Address]*ExtensionContract),
 		ptm:              ptm,
@@ -83,6 +85,7 @@ func New(stack *node.Node, ptm private.PrivateTransactionManager, manager *accou
 		accountManager:   manager,
 		apiBackendHelper: apiBackendHelper,
 		node:             stack,
+		config:           config,
 	}
 
 	var err error
@@ -384,7 +387,7 @@ func (service *PrivacyService) GenerateTransactOptions(txa ethapi.SendTxArgs) (*
 
 	//Find the account we plan to send the transaction from
 
-	txArgs := bind.NewWalletTransactor(wallet, from)
+	txArgs := bind.NewWalletTransactor(wallet, from, service.config.ChainID)
 	txArgs.PrivateFrom = txa.PrivateFrom
 	txArgs.PrivateFor = txa.PrivateFor
 	txArgs.GasLimit = defaultGasLimit

extension/services_factory.go

@@ -30,7 +30,7 @@ func NewServicesFactory(stack *node.Node, ptm private.PrivateTransactionManager,
 	factory.dataHandler = NewJsonFileDataHandler(stack.InstanceDir())
 	factory.stateFetcher = NewStateFetcher(ethService.BlockChain())
 
-	backendService, err := New(stack, ptm, factory.AccountManager(), factory.DataHandler(), factory.StateFetcher(), ethService.APIBackend)
+	backendService, err := New(stack, ptm, factory.AccountManager(), factory.DataHandler(), factory.StateFetcher(), ethService.APIBackend, ethService.BlockChain().Config())
 	if err != nil {
 		return nil, err
 	}

permission/backend.go

@@ -270,7 +270,7 @@ func (p *PermissionCtrl) getTxParams(txa ethapi.SendTxArgs) (*bind.TransactOpts,
 		return nil, ptype.ErrInvalidAccount
 	}
 	fromAcct := accounts.Account{Address: txa.From}
-	transactOpts := bind.NewWalletTransactor(w, fromAcct)
+	transactOpts := bind.NewWalletTransactor(w, fromAcct, p.chainID)
 
 	transactOpts.GasPrice = defaultGasPrice
 	if txa.GasPrice != nil {