From 452499424b67447adae34cd1b89204fc18206e25 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Sat, 23 Sep 2023 08:40:42 +0200 Subject: [PATCH] Update testnode branch --- .gitmodules | 1 + arbnode/node.go | 4 ++-- nitro-testnode | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 444199c4ed..75e66a648c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,3 +20,4 @@ [submodule "nitro-testnode"] path = nitro-testnode url = https://github.com/OffchainLabs/nitro-testnode.git + branch = fee-token-support diff --git a/arbnode/node.go b/arbnode/node.go index 0509f17bb1..5e694898bd 100644 --- a/arbnode/node.go +++ b/arbnode/node.go @@ -104,8 +104,8 @@ func deployChallengeFactory(ctx context.Context, l1Reader *headerreader.HeaderRe } func deployRollupCreator(ctx context.Context, l1Reader *headerreader.HeaderReader, auth *bind.TransactOpts) (*rollupgen.RollupCreator, common.Address, common.Address, common.Address, error) { - fmt.Println("Deploying bridge creator...") - auth.GasLimit = uint64(14183487) + // deploying bridge creator takes ~14.2 million gas + auth.GasLimit = uint64(15000000) bridgeCreator, tx, _, err := rollupgen.DeployBridgeCreator(auth, l1Reader.Client()) err = andTxSucceeded(ctx, l1Reader, tx, err) if err != nil { diff --git a/nitro-testnode b/nitro-testnode index 7ad12c0f1b..441166624c 160000 --- a/nitro-testnode +++ b/nitro-testnode @@ -1 +1 @@ -Subproject commit 7ad12c0f1be75a72c7360d5258e0090f8225594e +Subproject commit 441166624c54857a11c0a880f12e19d7dbeebc69