Update testnode branch

OffchainLabs · Sep 23, 2023 · 4524994 · 4524994
1 parent e9751ab
commit 4524994
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
+3 −3		README.md
+40 −1		scripts/ethcommands.ts
+2 −0		scripts/index.ts
+1 −0		scripts/package.json
+2 −1		scripts/tsconfig.json
+5 −0		scripts/yarn.lock
+26 −9		test-node.bash