Add eip-1559 (#198)

* Add eip-1559

* Update changelog

* Fix encoding issue

Author: ferranbt

CHANGELOG.md

@@ -1,6 +1,7 @@
 
 # 0.1.2 (Unreleased)
 
+- Add option in `contract` to send transactions with EIP-1559 [[GH-198](https://github.com/umbracle/ethgo/issues/198)]
 - Add custom `TxnOpts` to send a transaction in `contract` [[GH-195](https://github.com/umbracle/ethgo/issues/195)]
 - Add `ens resolve` command to resolve an ENS name [[GH-196](https://github.com/umbracle/ethgo/issues/196)]
 - Fix signing of typed transactions [[GH-197](https://github.com/umbracle/ethgo/issues/197)]

contract/contract.go

@@ -18,7 +18,8 @@ type Provider interface {
 }
 
 type jsonRPCNodeProvider struct {
-	client *jsonrpc.Eth
+	client  *jsonrpc.Eth
+	eip1559 bool
 }
 
 func (j *jsonRPCNodeProvider) Call(addr ethgo.Address, input []byte, opts *CallOpts) ([]byte, error) {
@@ -42,24 +43,26 @@ func (j *jsonRPCNodeProvider) Call(addr ethgo.Address, input []byte, opts *CallO
 
 func (j *jsonRPCNodeProvider) Txn(addr ethgo.Address, key ethgo.Key, input []byte) (Txn, error) {
 	txn := &jsonrpcTransaction{
-		opts:   &TxnOpts{},
-		input:  input,
-		client: j.client,
-		key:    key,
-		to:     addr,
+		opts:    &TxnOpts{},
+		input:   input,
+		client:  j.client,
+		key:     key,
+		to:      addr,
+		eip1559: j.eip1559,
 	}
 	return txn, nil
 }
 
 type jsonrpcTransaction struct {
-	to     ethgo.Address
-	input  []byte
-	hash   ethgo.Hash
-	opts   *TxnOpts
-	key    ethgo.Key
-	client *jsonrpc.Eth
-	txn    *ethgo.Transaction
-	txnRaw []byte
+	to      ethgo.Address
+	input   []byte
+	hash    ethgo.Hash
+	opts    *TxnOpts
+	key     ethgo.Key
+	client  *jsonrpc.Eth
+	txn     *ethgo.Transaction
+	txnRaw  []byte
+	eip1559 bool
 }
 
 func (j *jsonrpcTransaction) Hash() ethgo.Hash {
@@ -75,7 +78,7 @@ func (j *jsonrpcTransaction) Build() error {
 	from := j.key.Address()
 
 	// estimate gas price
-	if j.opts.GasPrice == 0 {
+	if j.opts.GasPrice == 0 && !j.eip1559 {
 		j.opts.GasPrice, err = j.client.GasPrice()
 		if err != nil {
 			return err
@@ -124,6 +127,19 @@ func (j *jsonrpcTransaction) Build() error {
 	if j.to != ethgo.ZeroAddress {
 		rawTxn.To = &j.to
 	}
+
+	if j.eip1559 {
+		rawTxn.Type = ethgo.TransactionDynamicFee
+
+		// use gas price as fee data
+		gasPrice, err := j.client.GasPrice()
+		if err != nil {
+			return err
+		}
+		rawTxn.MaxFeePerGas = new(big.Int).SetUint64(gasPrice)
+		rawTxn.MaxPriorityFeePerGas = new(big.Int).SetUint64(gasPrice)
+	}
+
 	j.txn = rawTxn
 	return nil
 }
@@ -185,6 +201,7 @@ type Opts struct {
 	JsonRPCClient   *jsonrpc.Eth
 	Provider        Provider
 	Sender          ethgo.Key
+	EIP1559         bool
 }
 
 type ContractOption func(*Opts)
@@ -213,6 +230,12 @@ func WithSender(sender ethgo.Key) ContractOption {
 	}
 }
 
+func WithEIP1559() ContractOption {
+	return func(o *Opts) {
+		o.EIP1559 = true
+	}
+}
+
 func DeployContract(abi *abi.ABI, bin []byte, args []interface{}, opts ...ContractOption) (Txn, error) {
 	a := NewContract(ethgo.Address{}, abi, opts...)
 	a.bin = bin
@@ -231,10 +254,10 @@ func NewContract(addr ethgo.Address, abi *abi.ABI, opts ...ContractOption) *Cont
 	if opt.Provider != nil {
 		provider = opt.Provider
 	} else if opt.JsonRPCClient != nil {
-		provider = &jsonRPCNodeProvider{client: opt.JsonRPCClient}
+		provider = &jsonRPCNodeProvider{client: opt.JsonRPCClient, eip1559: opt.EIP1559}
 	} else {
 		client, _ := jsonrpc.NewClient(opt.JsonRPCEndpoint)
-		provider = &jsonRPCNodeProvider{client: client.Eth()}
+		provider = &jsonRPCNodeProvider{client: client.Eth(), eip1559: opt.EIP1559}
 	}
 
 	a := &Contract{

contract/contract_test.go

@@ -262,3 +262,40 @@ func TestContract_SendValueContractCall(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, found, balance)
 }
+
+func TestContract_EIP1559(t *testing.T) {
+	s := testutil.NewTestServer(t, nil)
+	defer s.Close()
+
+	key, _ := wallet.GenerateKey()
+	s.Fund(key.Address())
+
+	cc := &testutil.Contract{}
+	cc.AddOutputCaller("example")
+
+	artifact, addr := s.DeployContract(cc)
+
+	abi, err := abi.NewABI(artifact.Abi)
+	assert.NoError(t, err)
+
+	client, _ := jsonrpc.NewClient(s.HTTPAddr())
+	contract := NewContract(addr, abi, WithJsonRPC(client.Eth()), WithSender(key), WithEIP1559())
+
+	txn, err := contract.Txn("example")
+	assert.NoError(t, err)
+
+	err = txn.Do()
+	assert.NoError(t, err)
+
+	_, err = txn.Wait()
+	assert.NoError(t, err)
+
+	// get transaction from rpc endpoint
+	txnObj, err := client.Eth().GetTransactionByHash(txn.Hash())
+	assert.NoError(t, err)
+
+	assert.NotZero(t, txnObj.Gas)
+	assert.NotZero(t, txnObj.GasPrice)
+	assert.NotZero(t, txnObj.MaxFeePerGas)
+	assert.NotZero(t, txnObj.MaxPriorityFeePerGas)
+}

structs_unmarshal.go

@@ -197,17 +197,17 @@ func (t *Transaction) unmarshalJSON(v *fastjson.Value) error {
 		}
 	}
 
+	if t.Gas, err = decodeUint(v, "gas"); err != nil {
+		return err
+	}
+
 	if typ == TransactionDynamicFee {
 		if t.MaxPriorityFeePerGas, err = decodeBigInt(t.MaxPriorityFeePerGas, v, "maxPriorityFeePerGas"); err != nil {
 			return err
 		}
 		if t.MaxFeePerGas, err = decodeBigInt(t.MaxFeePerGas, v, "maxFeePerGas"); err != nil {
 			return err
 		}
-	} else {
-		if t.Gas, err = decodeUint(v, "gas"); err != nil {
-			return err
-		}
 	}
 
 	// Check if the block hash field is set

testsuite/transaction-eip1159.json

@@ -4,6 +4,7 @@
     "input": "0x00",
     "value": "0x0",
     "gasPrice": "0x0",
+    "gas": "0x10",
     "maxPriorityFeePerGas": "0x10",
     "maxFeePerGas": "0x10",
     "nonce": "0x10",

website/components/eip.jsx

@@ -0,0 +1,6 @@
+
+import Link from 'next/link'
+
+export default function EIPLink({children, num}) {
+    return <Link href={`https://github.com/ethereum/EIPs/blob/master/EIPS/eip-${num}.md`}>{children}</Link>
+}

website/pages/contract.mdx

@@ -1,5 +1,6 @@
 
 import GoDocLink from '../components/godoc'
+import EIPLink from '../components/eip'
 import {Address, ABI} from '../components/primitives'
 
 # Contract
@@ -27,6 +28,7 @@ Besides `addr` and `abi`, you can use the option pattern to parametrize the cont
 - <GoDocLink href="contract#WithJsonRPCClient">WithJsonRPCClient</GoDocLink>: [`JsonRPC`](/jsonrpc) object to make rpc calls. It takes preference over an address from `WithAddress`.
 - <GoDocLink href="contract#WithSigner">WithSigner</GoDocLink>: [`Signer`](/signers/signer) object to send transactions or use a custom `from` address.
 - <GoDocLink href="contract#WithProvider">WithProvider</GoDocLink>: Custom <GoDocLink href="contract#NodeProvider">NodeProvider</GoDocLink> implementation to resolve calls and transactions.
+- <GoDocLink href="contract#WithEIP1559">WithEIP1559</GoDocLink>: Send transactions with EIP-1559 pricing.
 
 ## Examples