Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump github.com/0xPolygonHermez/zkevm-node from 0.5.0-RC18 to 0.6.8-RC8 #626

Merged
merged 2 commits into from
May 22, 2024
Merged

Bump github.com/0xPolygonHermez/zkevm-node from 0.5.0-RC18 to 0.6.8-RC8 #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f3a518
Bump github.com/0xPolygonHermez/zkevm-node from 0.5.0-RC18 to 0.6.8-RC8
dependabot[bot] May 7, 2024
e630706
fixes
ARR552 May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions etherman/etherman_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"github.com/0xPolygonHermez/zkevm-node/etherman/smartcontracts/polygonzkevm"
"github.com/0xPolygonHermez/zkevm-node/etherman/smartcontracts/polygonzkevmbridge"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethclient/simulated"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand All @@ -24,7 +24,7 @@ func init() {
}

// This function prepare the blockchain, the wallet with funds and deploy the smc
func newTestingEnv() (*Client, *backends.SimulatedBackend, *bind.TransactOpts, common.Address, *polygonzkevmbridge.Polygonzkevmbridge, *polygonzkevm.Polygonzkevm) {
func newTestingEnv() (*Client, *simulated.Backend, *bind.TransactOpts, common.Address, *polygonzkevmbridge.Polygonzkevmbridge, *polygonzkevm.Polygonzkevm) {
privateKey, err := crypto.GenerateKey()
if err != nil {
log.Fatal(err)
Expand Down Expand Up @@ -91,7 +91,7 @@ func TestBridgeEvents(t *testing.T) {
require.NoError(t, err)
assert.Equal(t, DepositsOrder, order[block[0].BlockHash][0].Name)
assert.Equal(t, GlobalExitRootsOrder, order[block[0].BlockHash][1].Name)
assert.Equal(t, uint64(4), block[0].BlockNumber)
assert.Equal(t, uint64(8), block[0].BlockNumber)
assert.Equal(t, big.NewInt(9000000000000000000), block[0].Deposits[0].Amount)
assert.Equal(t, uint(destNetwork), block[0].Deposits[0].DestinationNetwork)
assert.Equal(t, destinationAddr, block[0].Deposits[0].DestinationAddress)
Expand Down Expand Up @@ -122,14 +122,14 @@ func TestBridgeEvents(t *testing.T) {
assert.Equal(t, TokensOrder, order[block[0].BlockHash][0].Name)
assert.Equal(t, ClaimsOrder, order[block[0].BlockHash][1].Name)
assert.Equal(t, big.NewInt(1000000000000000000), block[0].Claims[0].Amount)
assert.Equal(t, uint64(5), block[0].BlockNumber)
assert.Equal(t, uint64(9), block[0].BlockNumber)
assert.NotEqual(t, common.Address{}, block[0].Claims[0].OriginalAddress)
assert.Equal(t, auth.From, block[0].Claims[0].DestinationAddress)
assert.Equal(t, uint(34), block[0].Claims[0].Index)
assert.Equal(t, uint64(0), block[0].Claims[0].RollupIndex)
assert.Equal(t, true, block[0].Claims[0].MainnetFlag)
assert.Equal(t, uint(0), block[0].Claims[0].OriginalNetwork)
assert.Equal(t, uint64(5), block[0].Claims[0].BlockNumber)
assert.Equal(t, uint64(9), block[0].Claims[0].BlockNumber)
}

func TestDecodeGlobalIndex(t *testing.T) {
Expand Down Expand Up @@ -200,7 +200,11 @@ func TestVerifyBatchEvent(t *testing.T) {
ForcedTimestamp: 0,
Transactions: common.Hex2Bytes(rawTxs),
}
_, err = zkevm.SequenceBatches(auth, []polygonzkevm.PolygonRollupBaseEtrogBatchData{tx}, auth.From)
var (
maxSequenceTimestamp uint64 = 1
initSequencedBatch uint64 = 1
)
_, err = zkevm.SequenceBatches(auth, []polygonzkevm.PolygonRollupBaseEtrogBatchData{tx}, maxSequenceTimestamp, initSequencedBatch, auth.From)
require.NoError(t, err)

// Mine the tx in a block
Expand All @@ -219,7 +223,7 @@ func TestVerifyBatchEvent(t *testing.T) {
blocks, order, err := etherman.GetRollupInfoByBlockRange(ctx, initBlock.NumberU64(), &finalBlockNumber)
require.NoError(t, err)
t.Logf("Blocks: %+v, \nOrder: %+v", blocks, order)
assert.Equal(t, uint64(5), blocks[0].BlockNumber)
assert.Equal(t, uint64(9), blocks[0].BlockNumber)
assert.Equal(t, uint64(1), blocks[0].VerifiedBatches[0].BatchNumber)
assert.NotEqual(t, common.Address{}, blocks[0].VerifiedBatches[0].Aggregator)
assert.NotEqual(t, common.Hash{}, blocks[0].VerifiedBatches[0].TxHash)
Expand Down
38 changes: 21 additions & 17 deletions etherman/simulated.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ import (
"github.com/0xPolygonHermez/zkevm-node/etherman/smartcontracts/polygonzkevmglobalexitroot"
"github.com/0xPolygonHermez/zkevm-node/etherman/smartcontracts/proxy"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethclient/simulated"
)

// NewSimulatedEtherman creates an etherman that uses a simulated blockchain. It's important to notice that the ChainID of the auth
// must be 1337. The address that holds the auth will have an initial balance of 10 ETH
func NewSimulatedEtherman(cfg Config, auth *bind.TransactOpts) (*Client, *backends.SimulatedBackend, common.Address, *polygonzkevmbridge.Polygonzkevmbridge, *polygonzkevm.Polygonzkevm, error) {
func NewSimulatedEtherman(cfg Config, auth *bind.TransactOpts) (*Client, *simulated.Backend, common.Address, *polygonzkevmbridge.Polygonzkevmbridge, *polygonzkevm.Polygonzkevm, error) {
if auth == nil {
// read only client
return &Client{}, nil, common.Address{}, nil, nil, nil
Expand All @@ -38,21 +38,21 @@ func NewSimulatedEtherman(cfg Config, auth *bind.TransactOpts) (*Client, *backen
},
}
blockGasLimit := uint64(999999999999999999) //nolint:gomnd
client := backends.NewSimulatedBackend(genesisAlloc, blockGasLimit)
client := simulated.NewBackend(genesisAlloc, simulated.WithBlockGasLimit(blockGasLimit))

// Deploy contracts
const polDecimalPlaces = 18
totalSupply, _ := new(big.Int).SetString("10000000000000000000000000000", 10) //nolint:gomnd
polAddr, _, polContract, err := pol.DeployPol(auth, client, "Pol Token", "POL", polDecimalPlaces, totalSupply)
polAddr, _, polContract, err := pol.DeployPol(auth, client.Client(), "Pol Token", "POL", polDecimalPlaces, totalSupply)
if err != nil {
log.Error("error: ", err)
return nil, nil, common.Address{}, nil, nil, err
}
rollupVerifierAddr, _, _, err := mockverifier.DeployMockverifier(auth, client)
rollupVerifierAddr, _, _, err := mockverifier.DeployMockverifier(auth, client.Client())
if err != nil {
return nil, nil, common.Address{}, nil, nil, err
}
nonce, err := client.PendingNonceAt(context.TODO(), auth.From)
nonce, err := client.Client().PendingNonceAt(context.TODO(), auth.From)
if err != nil {
log.Error("error: ", err)
return nil, nil, common.Address{}, nil, nil, err
Expand All @@ -62,28 +62,29 @@ func NewSimulatedEtherman(cfg Config, auth *bind.TransactOpts) (*Client, *backen
const posRollupManager = 4
calculatedRollupManagerAddr := crypto.CreateAddress(auth.From, nonce+posRollupManager)
genesis := common.HexToHash("0xfd3434cd8f67e59d73488a2b8da242dd1f02849ea5dd99f0ca22c836c3d5b4a9") // Random value. Needs to be different to 0x0
exitManagerAddr, _, globalExitRoot, err := polygonzkevmglobalexitroot.DeployPolygonzkevmglobalexitroot(auth, client, calculatedRollupManagerAddr, calculatedBridgeAddr)
exitManagerAddr, _, globalExitRoot, err := polygonzkevmglobalexitroot.DeployPolygonzkevmglobalexitroot(auth, client.Client(), calculatedRollupManagerAddr, calculatedBridgeAddr)
if err != nil {
log.Error("error: ", err)
return nil, nil, common.Address{}, nil, nil, err
}
implementationBridgeAddr, _, _, err := mockbridge.DeployPolygonzkevmbridge(auth, client)
implementationBridgeAddr, _, _, err := mockbridge.DeployPolygonzkevmbridge(auth, client.Client())
if err != nil {
log.Error("error: ", err)
return nil, nil, common.Address{}, nil, nil, err
}

implementationMockRollupManagerAddr, _, _, err := mockpolygonrollupmanager.DeployMockpolygonrollupmanager(auth, client, exitManagerAddr, polAddr, calculatedBridgeAddr)
implementationMockRollupManagerAddr, _, _, err := mockpolygonrollupmanager.DeployMockpolygonrollupmanager(auth, client.Client(), exitManagerAddr, polAddr, calculatedBridgeAddr)
if err != nil {
log.Error("error: ", err)
return nil, nil, common.Address{}, nil, nil, err
}
bridgeAddr, _, _, err := proxy.DeployProxy(auth, client, implementationBridgeAddr, implementationBridgeAddr, []byte{})
client.Commit()
bridgeAddr, _, _, err := proxy.DeployProxy(auth, client.Client(), implementationBridgeAddr, implementationBridgeAddr, []byte{})
if err != nil {
log.Error("error: ", err)
return nil, nil, common.Address{}, nil, nil, err
}
mockRollupManagerAddr, _, _, err := proxy.DeployProxy(auth, client, implementationMockRollupManagerAddr, implementationMockRollupManagerAddr, []byte{})
mockRollupManagerAddr, _, _, err := proxy.DeployProxy(auth, client.Client(), implementationMockRollupManagerAddr, implementationMockRollupManagerAddr, []byte{})
if err != nil {
log.Error("error: ", err)
return nil, nil, common.Address{}, nil, nil, err
Expand All @@ -92,31 +93,34 @@ func NewSimulatedEtherman(cfg Config, auth *bind.TransactOpts) (*Client, *backen
return nil, nil, common.Address{}, nil, nil, fmt.Errorf("RollupManagerAddr (%s) is different from the expected contract address (%s)",
mockRollupManagerAddr.String(), calculatedRollupManagerAddr.String())
}
initZkevmAddr, _, _, err := polygonzkevm.DeployPolygonzkevm(auth, client, exitManagerAddr, polAddr, bridgeAddr, mockRollupManagerAddr)
initZkevmAddr, _, _, err := polygonzkevm.DeployPolygonzkevm(auth, client.Client(), exitManagerAddr, polAddr, bridgeAddr, mockRollupManagerAddr)
if err != nil {
log.Error("error: ", err)
return nil, nil, common.Address{}, nil, nil, err
}
mockRollupManager, err := mockpolygonrollupmanager.NewMockpolygonrollupmanager(mockRollupManagerAddr, client)
mockRollupManager, err := mockpolygonrollupmanager.NewMockpolygonrollupmanager(mockRollupManagerAddr, client.Client())
if err != nil {
log.Error("error: ", err)
return nil, nil, common.Address{}, nil, nil, err
}
br, err := polygonzkevmbridge.NewPolygonzkevmbridge(bridgeAddr, client)
br, err := polygonzkevmbridge.NewPolygonzkevmbridge(bridgeAddr, client.Client())
if err != nil {
log.Error("error: ", err)
return nil, nil, common.Address{}, nil, nil, err
}
client.Commit()
_, err = br.Initialize(auth, 0, common.Address{}, 0, exitManagerAddr, mockRollupManagerAddr, []byte{})
if err != nil {
log.Error("error: ", err)
return nil, nil, common.Address{}, nil, nil, err
}
client.Commit()
_, err = mockRollupManager.Initialize(auth, auth.From, 10000, 10000, auth.From, auth.From, auth.From, common.Address{}, common.Address{}, 0, 0) //nolint:gomnd
if err != nil {
log.Error("error: ", err)
return nil, nil, common.Address{}, nil, nil, err
}
client.Commit()
_, err = mockRollupManager.AddNewRollupType(auth, initZkevmAddr, rollupVerifierAddr, 6, 0, genesis, "PolygonZkEvm Rollup") //nolint:gomnd
if err != nil {
log.Error("error: ", err)
Expand Down Expand Up @@ -154,13 +158,13 @@ func NewSimulatedEtherman(cfg Config, auth *bind.TransactOpts) (*Client, *backen
bridgeAddr.String(), calculatedBridgeAddr.String())
}

rollupManager, err := polygonrollupmanager.NewPolygonrollupmanager(mockRollupManagerAddr, client)
rollupManager, err := polygonrollupmanager.NewPolygonrollupmanager(mockRollupManagerAddr, client.Client())
if err != nil {
log.Error("error: ", err)
return nil, nil, common.Address{}, nil, nil, err
}

trueZkevm, err := polygonzkevm.NewPolygonzkevm(zkevmAddr, client) //nolint
trueZkevm, err := polygonzkevm.NewPolygonzkevm(zkevmAddr, client.Client()) //nolint
if err != nil {
log.Error("error: ", err)
return nil, nil, common.Address{}, nil, nil, err
Expand All @@ -186,5 +190,5 @@ func NewSimulatedEtherman(cfg Config, auth *bind.TransactOpts) (*Client, *backen
}

client.Commit()
return &Client{EtherClient: client, PolygonBridge: br, PolygonZkEVMGlobalExitRoot: globalExitRoot, PolygonRollupManager: rollupManager, SCAddresses: []common.Address{exitManagerAddr, bridgeAddr, mockRollupManagerAddr}}, client, polAddr, br, trueZkevm, nil
return &Client{EtherClient: client.Client(), PolygonBridge: br, PolygonZkEVMGlobalExitRoot: globalExitRoot, PolygonRollupManager: rollupManager, SCAddresses: []common.Address{exitManagerAddr, bridgeAddr, mockRollupManagerAddr}}, client, polAddr, br, trueZkevm, nil
}
22 changes: 16 additions & 6 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/0xPolygonHermez/zkevm-bridge-service
go 1.21

require (
github.com/0xPolygonHermez/zkevm-node v0.5.0-RC18
github.com/0xPolygonHermez/zkevm-node v0.6.8-RC8
github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df
github.com/ethereum/go-ethereum v1.13.8
github.com/ethereum/go-ethereum v1.13.11
github.com/gobuffalo/packr/v2 v2.8.3
github.com/google/go-cmp v0.6.0
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1
Expand All @@ -30,7 +30,7 @@ require (

require (
dario.cat/mergo v1.0.0 // indirect
github.com/0xPolygonHermez/zkevm-data-streamer v0.1.18 // indirect
github.com/0xPolygonHermez/zkevm-data-streamer v0.2.3-0.20240426122934-6f47d2485fc1 // indirect
github.com/DataDog/zstd v1.5.2 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
Expand Down Expand Up @@ -63,6 +63,7 @@ require (
github.com/dop251/goja v0.0.0-20230806174421-c933cf95e127 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/ethereum/c-kzg-4844 v0.4.0 // indirect
github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect
github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 // indirect
Expand All @@ -71,19 +72,22 @@ require (
github.com/go-git/go-billy/v5 v5.5.0 // indirect
github.com/go-git/go-git/v5 v5.11.0 // indirect
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
github.com/gobuffalo/logger v1.0.7 // indirect
github.com/gobuffalo/packd v1.0.2 // indirect
github.com/gofrs/flock v0.8.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/websocket v1.5.1 // indirect
github.com/hashicorp/go-bexpr v0.1.10 // indirect
github.com/hashicorp/hcl v1.0.1-0.20180906183839-65a6292f0157 // indirect
github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 // indirect
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
github.com/holiman/uint256 v1.2.4 // indirect
github.com/huin/goupnp v1.3.0 // indirect
Expand All @@ -108,20 +112,24 @@ require (
github.com/markbates/errx v1.1.0 // indirect
github.com/markbates/oncer v1.0.0 // indirect
github.com/markbates/safe v1.0.1 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/mitchellh/pointerstructure v1.2.0 // indirect
github.com/mmcloughlin/addchain v0.4.0 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.17.0 // indirect
github.com/prometheus/client_golang v1.18.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/rs/cors v1.7.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
Expand Down Expand Up @@ -154,10 +162,12 @@ require (
golang.org/x/sys v0.20.0 // indirect
golang.org/x/term v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.15.0 // indirect
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
rsc.io/tmplfunc v0.0.3 // indirect
Expand Down
Loading
Loading