Skip to content

Commit bf0d74d

Browse files
roynalnarutoroynalnaruto
authored
Merge pull request #115 from renproject/feat/eip_1559
api updates for eip-1559 changes
2 parents 528bccd + d575511 commit bf0d74d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1334
-658
lines changed

‎.github/workflows/test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: go
2-
on: [push]
2+
on: [pull_request]
33
jobs:
44
test-solana:
55
runs-on: ubuntu-latest
@@ -1331,7 +1331,7 @@ jobs:
13311331
run: |
13321332
cd $GITHUB_WORKSPACE/infra
13331333
source .env
1334-
docker-compose up -d --build ethereum
1334+
docker-compose up -d --build goerli
13351335
13361336
- name: Sleep until the nodes are up
13371337
uses: jakejarvis/wait-action@master

‎chain/arbitrum/address.go

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
package arbitrum
22

33
import (
4-
"github.com/renproject/multichain/chain/ethereum"
4+
"github.com/renproject/multichain/chain/evm"
55
)
66

77
type (
8-
// AddressEncodeDecoder re-exports ethereum.AddressEncodeDecoder.
9-
AddressEncodeDecoder = ethereum.AddressEncodeDecoder
8+
// AddressEncodeDecoder re-exports evm.AddressEncodeDecoder.
9+
AddressEncodeDecoder = evm.AddressEncodeDecoder
1010

11-
// AddressEncoder re-exports ethereum.AddressEncoder.
12-
AddressEncoder = ethereum.AddressEncoder
11+
// AddressEncoder re-exports evm.AddressEncoder.
12+
AddressEncoder = evm.AddressEncoder
1313

14-
// AddressDecoder re-exports ethereum.AddressDecoder.
15-
AddressDecoder = ethereum.AddressDecoder
14+
// AddressDecoder re-exports evm.AddressDecoder.
15+
AddressDecoder = evm.AddressDecoder
1616

17-
// Address re-exports ethereum.Address.
18-
Address = ethereum.Address
17+
// Address re-exports evm.Address.
18+
Address = evm.Address
1919
)
2020

2121
var (
22-
// NewAddressEncodeDecoder re-exports ethereum.NewAddressEncodeDecoder.
23-
NewAddressEncodeDecoder = ethereum.NewAddressEncodeDecoder
22+
// NewAddressEncodeDecoder re-exports evm.NewAddressEncodeDecoder.
23+
NewAddressEncodeDecoder = evm.NewAddressEncodeDecoder
2424

25-
// NewAddressDecoder re-exports ethereum.NewAddressDecoder.
26-
NewAddressDecoder = ethereum.NewAddressDecoder
25+
// NewAddressDecoder re-exports evm.NewAddressDecoder.
26+
NewAddressDecoder = evm.NewAddressDecoder
2727

28-
// NewAddressEncoder re-exports ethereum.NewAddressEncoder.
29-
NewAddressEncoder = ethereum.NewAddressEncoder
28+
// NewAddressEncoder re-exports evm.NewAddressEncoder.
29+
NewAddressEncoder = evm.NewAddressEncoder
3030

31-
// NewAddressFromHex re-exports ethereum.NewAddressFromHex.
32-
NewAddressFromHex = ethereum.NewAddressFromHex
31+
// NewAddressFromHex re-exports evm.NewAddressFromHex.
32+
NewAddressFromHex = evm.NewAddressFromHex
3333
)

‎chain/arbitrum/address_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ package arbitrum_test
33
import (
44
"encoding/hex"
55
"encoding/json"
6+
"testing/quick"
7+
68
. "github.com/onsi/ginkgo"
79
. "github.com/onsi/gomega"
810
"github.com/renproject/multichain/chain/arbitrum"
911
"github.com/renproject/surge"
10-
"testing/quick"
1112
)
1213

1314
var _ = Describe("Address", func() {

‎chain/arbitrum/client.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package arbitrum
22

33
import (
4-
"github.com/renproject/multichain/chain/ethereum"
4+
"github.com/renproject/multichain/chain/evm"
55
)
66

77
const (
@@ -10,8 +10,8 @@ const (
1010
DefaultClientRPCURL = "http://127.0.0.1:8547"
1111
)
1212

13-
// Client re-exports ethereum.Client.
14-
type Client = ethereum.Client
13+
// Client re-exports evm.Client.
14+
type Client = evm.Client
1515

16-
// NewClient re-exports ethereum.NewClient.
17-
var NewClient = ethereum.NewClient
16+
// NewClient re-exports evm.NewClient.
17+
var NewClient = evm.NewClient

‎chain/arbitrum/encode.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package arbitrum
22

33
import (
4-
"github.com/renproject/multichain/chain/ethereum"
4+
"github.com/renproject/multichain/chain/evm"
55
)
66

7-
// Payload re-exports ethereum.Payload.
8-
type Payload = ethereum.Payload
7+
// Payload re-exports evm.Payload.
8+
type Payload = evm.Payload
99

10-
// Encode re-exports ethereum.Encode.
11-
var Encode = ethereum.Encode
10+
// Encode re-exports evm.Encode.
11+
var Encode = evm.Encode

‎chain/arbitrum/encode_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ package arbitrum_test
33
import (
44
"encoding/hex"
55
"fmt"
6-
"github.com/renproject/multichain/chain/arbitrum"
76
"math"
87
"testing/quick"
98

9+
"github.com/renproject/multichain/chain/arbitrum"
10+
1011
"github.com/renproject/pack"
1112

1213
. "github.com/onsi/ginkgo"

‎chain/arbitrum/gas.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package arbitrum
22

33
import (
4-
"github.com/renproject/multichain/chain/ethereum"
4+
"github.com/renproject/multichain/chain/evm"
55
)
66

7-
// GasEstimator re-exports ethereum.GasEstimator.
8-
type GasEstimator = ethereum.GasEstimator
7+
// GasEstimator re-exports evm.GasEstimator.
8+
type GasEstimator = evm.GasEstimator
99

10-
// NewGasEstimator re-exports ethereum.NewGasEstimator.
11-
var NewGasEstimator = ethereum.NewGasEstimator
10+
// NewGasEstimator re-exports evm.NewGasEstimator.
11+
var NewGasEstimator = evm.NewGasEstimator

‎chain/arbitrum/tx.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package arbitrum
22

33
import (
4-
"github.com/renproject/multichain/chain/ethereum"
4+
"github.com/renproject/multichain/chain/evm"
55
)
66

77
type (
8-
// TxBuilder re-exports ethereum.TxBuilder.
9-
TxBuilder = ethereum.TxBuilder
8+
// TxBuilder re-exports evm.TxBuilder.
9+
TxBuilder = evm.TxBuilder
1010

11-
// Tx re-exports ethereum.Tx.
12-
Tx = ethereum.Tx
11+
// Tx re-exports evm.Tx.
12+
Tx = evm.Tx
1313
)
1414

15-
// NewTxBuilder re-exports ethereum.NewTxBuilder.
16-
var NewTxBuilder = ethereum.NewTxBuilder
15+
// NewTxBuilder re-exports evm.NewTxBuilder.
16+
var NewTxBuilder = evm.NewTxBuilder

‎chain/avalanche/address.go

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
package avalanche
22

33
import (
4-
"github.com/renproject/multichain/chain/ethereum"
4+
"github.com/renproject/multichain/chain/evm"
55
)
66

77
type (
8-
// AddressEncodeDecoder re-exports ethereum.AddressEncodeDecoder.
9-
AddressEncodeDecoder = ethereum.AddressEncodeDecoder
8+
// AddressEncodeDecoder re-exports evm.AddressEncodeDecoder.
9+
AddressEncodeDecoder = evm.AddressEncodeDecoder
1010

11-
// AddressEncoder re-exports ethereum.AddressEncoder.
12-
AddressEncoder = ethereum.AddressEncoder
11+
// AddressEncoder re-exports evm.AddressEncoder.
12+
AddressEncoder = evm.AddressEncoder
1313

14-
// AddressDecoder re-exports ethereum.AddressDecoder.
15-
AddressDecoder = ethereum.AddressDecoder
14+
// AddressDecoder re-exports evm.AddressDecoder.
15+
AddressDecoder = evm.AddressDecoder
1616

17-
// Address re-exports ethereum.Address.
18-
Address = ethereum.Address
17+
// Address re-exports evm.Address.
18+
Address = evm.Address
1919
)
2020

2121
var (
22-
// NewAddressEncodeDecoder re-exports ethereum.NewAddressEncodeDecoder.
23-
NewAddressEncodeDecoder = ethereum.NewAddressEncodeDecoder
22+
// NewAddressEncodeDecoder re-exports evm.NewAddressEncodeDecoder.
23+
NewAddressEncodeDecoder = evm.NewAddressEncodeDecoder
2424

25-
// NewAddressDecoder re-exports ethereum.NewAddressDecoder.
26-
NewAddressDecoder = ethereum.NewAddressDecoder
25+
// NewAddressDecoder re-exports evm.NewAddressDecoder.
26+
NewAddressDecoder = evm.NewAddressDecoder
2727

28-
// NewAddressEncoder re-exports ethereum.NewAddressEncoder.
29-
NewAddressEncoder = ethereum.NewAddressEncoder
28+
// NewAddressEncoder re-exports evm.NewAddressEncoder.
29+
NewAddressEncoder = evm.NewAddressEncoder
3030

31-
// NewAddressFromHex re-exports ethereum.NewAddressFromHex.
32-
NewAddressFromHex = ethereum.NewAddressFromHex
31+
// NewAddressFromHex re-exports evm.NewAddressFromHex.
32+
NewAddressFromHex = evm.NewAddressFromHex
3333
)

‎chain/avalanche/address_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ package avalanche_test
33
import (
44
"encoding/hex"
55
"encoding/json"
6+
"testing/quick"
7+
68
. "github.com/onsi/ginkgo"
79
. "github.com/onsi/gomega"
810
"github.com/renproject/multichain/chain/avalanche"
911
"github.com/renproject/surge"
10-
"testing/quick"
1112
)
1213

1314
var _ = Describe("Address", func() {

‎chain/avalanche/client.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package avalanche
22

33
import (
4-
"github.com/renproject/multichain/chain/ethereum"
4+
"github.com/renproject/multichain/chain/evm"
55
)
66

77
const (
@@ -10,8 +10,8 @@ const (
1010
DefaultClientRPCURL = "http://127.0.0.1:9650/ext/bc/C/rpc"
1111
)
1212

13-
// Client re-exports ethereum.Client.
14-
type Client = ethereum.Client
13+
// Client re-exports evm.Client.
14+
type Client = evm.Client
1515

16-
// NewClient re-exports ethereum.NewClient.
17-
var NewClient = ethereum.NewClient
16+
// NewClient re-exports evm.NewClient.
17+
var NewClient = evm.NewClient

‎chain/avalanche/encode.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package avalanche
22

33
import (
4-
"github.com/renproject/multichain/chain/ethereum"
4+
"github.com/renproject/multichain/chain/evm"
55
)
66

7-
// Payload re-exports ethereum.Payload.
8-
type Payload = ethereum.Payload
7+
// Payload re-exports evm.Payload.
8+
type Payload = evm.Payload
99

10-
// Encode re-exports ethereum.Encode.
11-
var Encode = ethereum.Encode
10+
// Encode re-exports evm.Encode.
11+
var Encode = evm.Encode

‎chain/avalanche/encode_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ package avalanche_test
33
import (
44
"encoding/hex"
55
"fmt"
6-
"github.com/renproject/multichain/chain/avalanche"
76
"math"
87
"testing/quick"
98

9+
"github.com/renproject/multichain/chain/avalanche"
10+
1011
"github.com/renproject/pack"
1112

1213
. "github.com/onsi/ginkgo"

‎chain/avalanche/gas.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package avalanche
22

33
import (
4-
"github.com/renproject/multichain/chain/ethereum"
4+
"github.com/renproject/multichain/chain/evm"
55
)
66

7-
// GasEstimator re-exports ethereum.GasEstimator.
8-
type GasEstimator = ethereum.GasEstimator
7+
// GasEstimator re-exports evm.GasEstimator.
8+
type GasEstimator = evm.GasEstimator
99

10-
// NewGasEstimator re-exports ethereum.NewGasEstimator.
11-
var NewGasEstimator = ethereum.NewGasEstimator
10+
// NewGasEstimator re-exports evm.NewGasEstimator.
11+
var NewGasEstimator = evm.NewGasEstimator

‎chain/avalanche/tx.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package avalanche
22

33
import (
4-
"github.com/renproject/multichain/chain/ethereum"
4+
"github.com/renproject/multichain/chain/evm"
55
)
66

77
type (
8-
// TxBuilder re-exports ethereum.TxBuilder.
9-
TxBuilder = ethereum.TxBuilder
8+
// TxBuilder re-exports evm.TxBuilder.
9+
TxBuilder = evm.TxBuilder
1010

11-
// Tx re-exports ethereum.Tx.
12-
Tx = ethereum.Tx
11+
// Tx re-exports evm.Tx.
12+
Tx = evm.Tx
1313
)
1414

15-
// NewTxBuilder re-exports ethereum.NewTxBuilder.
16-
var NewTxBuilder = ethereum.NewTxBuilder
15+
// NewTxBuilder re-exports evm.NewTxBuilder.
16+
var NewTxBuilder = evm.NewTxBuilder

‎chain/bsc/address.go

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
package bsc
22

33
import (
4-
"github.com/renproject/multichain/chain/ethereum"
4+
"github.com/renproject/multichain/chain/evm"
55
)
66

77
type (
8-
// AddressEncodeDecoder re-exports ethereum.AddressEncodeDecoder.
9-
AddressEncodeDecoder = ethereum.AddressEncodeDecoder
8+
// AddressEncodeDecoder re-exports evm.AddressEncodeDecoder.
9+
AddressEncodeDecoder = evm.AddressEncodeDecoder
1010

11-
// AddressEncoder re-exports ethereum.AddressEncoder.
12-
AddressEncoder = ethereum.AddressEncoder
11+
// AddressEncoder re-exports evm.AddressEncoder.
12+
AddressEncoder = evm.AddressEncoder
1313

14-
// AddressDecoder re-exports ethereum.AddressDecoder.
15-
AddressDecoder = ethereum.AddressDecoder
14+
// AddressDecoder re-exports evm.AddressDecoder.
15+
AddressDecoder = evm.AddressDecoder
1616

17-
// Address re-exports ethereum.Address.
18-
Address = ethereum.Address
17+
// Address re-exports evm.Address.
18+
Address = evm.Address
1919
)
2020

2121
var (
22-
// NewAddressEncodeDecoder re-exports ethereum.NewAddressEncodeDecoder.
23-
NewAddressEncodeDecoder = ethereum.NewAddressEncodeDecoder
22+
// NewAddressEncodeDecoder re-exports evm.NewAddressEncodeDecoder.
23+
NewAddressEncodeDecoder = evm.NewAddressEncodeDecoder
2424

25-
// NewAddressDecoder re-exports ethereum.NewAddressDecoder.
26-
NewAddressDecoder = ethereum.NewAddressDecoder
25+
// NewAddressDecoder re-exports evm.NewAddressDecoder.
26+
NewAddressDecoder = evm.NewAddressDecoder
2727

28-
// NewAddressEncoder re-exports ethereum.NewAddressEncoder.
29-
NewAddressEncoder = ethereum.NewAddressEncoder
28+
// NewAddressEncoder re-exports evm.NewAddressEncoder.
29+
NewAddressEncoder = evm.NewAddressEncoder
3030

31-
// NewAddressFromHex re-exports ethereum.NewAddressFromHex.
32-
NewAddressFromHex = ethereum.NewAddressFromHex
31+
// NewAddressFromHex re-exports evm.NewAddressFromHex.
32+
NewAddressFromHex = evm.NewAddressFromHex
3333
)

‎chain/bsc/address_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ package bsc_test
33
import (
44
"encoding/hex"
55
"encoding/json"
6+
"testing/quick"
7+
68
. "github.com/onsi/ginkgo"
79
. "github.com/onsi/gomega"
810
"github.com/renproject/multichain/chain/bsc"
911
"github.com/renproject/surge"
10-
"testing/quick"
1112
)
1213

1314
var _ = Describe("Address", func() {

0 commit comments

Comments
 (0)