Merge branch 'master' into test_batch_poster_dangerous_config

OffchainLabs · Jun 13, 2024 · 76d5c0a · 76d5c0a
2 parents 337bf43 + 5673881
commit 76d5c0a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/solgen/gen.go b/solgen/gen.go
@@ -68,7 +68,7 @@ func main() {
 	}
 	root := filepath.Dir(filename)
 	parent := filepath.Dir(root)
-	filePaths, err := filepath.Glob(filepath.Join(parent, "contracts", "build", "contracts", "src", "*", "*", "*.json"))
+	filePaths, err := filepath.Glob(filepath.Join(parent, "contracts", "build", "contracts", "src", "*", "*.sol", "*.json"))
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -105,7 +105,7 @@ func main() {
 		modInfo.addArtifact(artifact)
 	}
 
-	yulFilePaths, err := filepath.Glob(filepath.Join(parent, "contracts", "out", "yul", "*", "*.json"))
+	yulFilePaths, err := filepath.Glob(filepath.Join(parent, "contracts", "out", "*", "*.yul", "*.json"))
 	if err != nil {
 		log.Fatal(err)
 	}

diff --git a/staker/validatorwallet/contract.go b/staker/validatorwallet/contract.go
@@ -307,6 +307,7 @@ func (v *Contract) estimateGas(ctx context.Context, value *big.Int, data []byte)
 	if err != nil {
 		return 0, fmt.Errorf("getting suggested gas tip cap: %w", err)
 	}
+	gasFeeCap.Add(gasFeeCap, gasTipCap)
 	g, err := v.l1Reader.Client().EstimateGas(
 		ctx,
 		ethereum.CallMsg{