From faf9597aa400a79ce407ca9ed84f4c5e1a014356 Mon Sep 17 00:00:00 2001 From: wuyachi Date: Fri, 24 Jun 2022 19:04:12 +0800 Subject: [PATCH] remove gasPrice para --- wallet/wallet.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/wallet/wallet.go b/wallet/wallet.go index 89c4286..1927624 100644 --- a/wallet/wallet.go +++ b/wallet/wallet.go @@ -36,7 +36,7 @@ import ( type Config struct { ChainId uint64 KeyStoreProviders []*KeyStoreProviderConfig - KeyProviders []string + KeyProviders []string Nodes []string // NEO wallet @@ -195,7 +195,7 @@ func (w *Wallet) sendWithAccount(dry bool, account accounts.Account, addr common return } if gasLimit == 0 { - msg := ethereum.CallMsg{From: account.Address, To: &addr, GasPrice: gasPrice, Value: amount, Data: data} + msg := ethereum.CallMsg{From: account.Address, To: &addr, Value: amount, Data: data} gasLimit, err = w.sdk.Node().EstimateGas(context.Background(), msg) if err != nil { nonces.Update(false) @@ -282,7 +282,7 @@ func (w *Wallet) EstimateGasWithAccount(account accounts.Account, addr common.Ad err = fmt.Errorf("Get gas price error %v", err) return } - msg := ethereum.CallMsg{From: account.Address, To: &addr, GasPrice: gasPrice, Value: amount, Data: data} + msg := ethereum.CallMsg{From: account.Address, To: &addr, Value: amount, Data: data} gasLimit, err = w.sdk.Node().EstimateGas(context.Background(), msg) if err != nil { err = fmt.Errorf("Estimate gas limit error %v, account %s", err, account.Address) @@ -291,7 +291,6 @@ func (w *Wallet) EstimateGasWithAccount(account accounts.Account, addr common.Ad return } - func (w *Wallet) SendWithMaxLimit(account accounts.Account, addr common.Address, amount *big.Int, maxLimit *big.Int, gasPrice *big.Int, gasPriceX *big.Float, data []byte) (hash string, err error) { if maxLimit == nil || maxLimit.Sign() <= 0 { err = fmt.Errorf("max limit is zero or missing") @@ -315,7 +314,7 @@ func (w *Wallet) SendWithMaxLimit(account accounts.Account, addr common.Address, } var gasLimit uint64 - msg := ethereum.CallMsg{From: account.Address, To: &addr, GasPrice: gasPrice, Value: amount, Data: data} + msg := ethereum.CallMsg{From: account.Address, To: &addr, Value: amount, Data: data} gasLimit, err = w.sdk.Node().EstimateGas(context.Background(), msg) if err != nil { nonces.Update(false)