Merge pull request #23062 from nfeignon/fix-abi-bind-ensure-context

accounts/abi/bind: call ensureContext on every context
ethereum · Jun 22, 2021 · fcd7bdc · fcd7bdc
2 parents 1e44c35 + c63c2d8
commit fcd7bdc
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go
@@ -229,13 +229,13 @@ func (c *BoundContract) transact(opts *TransactOpts, contract *common.Address, i
 	if opts.GasPrice != nil && (opts.GasFeeCap != nil || opts.GasTipCap != nil) {
 		return nil, errors.New("both gasPrice and (maxFeePerGas or maxPriorityFeePerGas) specified")
 	}
-	head, err := c.transactor.HeaderByNumber(opts.Context, nil)
+	head, err := c.transactor.HeaderByNumber(ensureContext(opts.Context), nil)
 	if err != nil {
 		return nil, err
 	}
 	if head.BaseFee != nil && opts.GasPrice == nil {
 		if opts.GasTipCap == nil {
-			tip, err := c.transactor.SuggestGasTipCap(opts.Context)
+			tip, err := c.transactor.SuggestGasTipCap(ensureContext(opts.Context))
 			if err != nil {
 				return nil, err
 			}
@@ -256,7 +256,7 @@ func (c *BoundContract) transact(opts *TransactOpts, contract *common.Address, i
 			return nil, errors.New("maxFeePerGas or maxPriorityFeePerGas specified but london is not active yet")
 		}
 		if opts.GasPrice == nil {
-			price, err := c.transactor.SuggestGasTipCap(opts.Context)
+			price, err := c.transactor.SuggestGasTipCap(ensureContext(opts.Context))
 			if err != nil {
 				return nil, err
 			}