patch(l2geth): revert back to latest upstream optimism master (#28)

* patch(l2geth): revert back to latest upstream optimism master * chore: disable android tests
ethereum-optimism · Apr 6, 2021 · 021d955 · 021d955
1 parent 5f2e00a
commit 021d955
Show file tree

Hide file tree

Showing 34 changed files with 74 additions and 661 deletions.
diff --git a/l2geth/.dockerignore b/l2geth/.dockerignore
diff --git a/l2geth/.gitattributes b/l2geth/.gitattributes
diff --git a/l2geth/.gitmodules b/l2geth/.gitmodules
diff --git a/l2geth/.mailmap b/l2geth/.mailmap
diff --git a/l2geth/Dockerfile b/l2geth/Dockerfile
diff --git a/l2geth/Dockerfile.alltools b/l2geth/Dockerfile.alltools
diff --git a/l2geth/Dockerfile.dev b/l2geth/Dockerfile.dev
diff --git a/l2geth/Dockerfile.test b/l2geth/Dockerfile.test
diff --git a/l2geth/Dockerfile.test.dockerignore b/l2geth/Dockerfile.test.dockerignore
diff --git a/l2geth/appveyor.yml b/l2geth/appveyor.yml
diff --git a/l2geth/circle.yml b/l2geth/circle.yml
diff --git a/l2geth/cmd/geth/consolecmd_test.go b/l2geth/cmd/geth/consolecmd_test.go
@@ -31,7 +31,7 @@ import (
 )
 
 const (
-	ipcAPIs  = "admin:1.0 debug:1.0 eth:1.0 ethash:1.0 miner:1.0 net:1.0 personal:1.0 rollup:1.0 rollup_personal:1.0 rpc:1.0 shh:1.0 txpool:1.0 web3:1.0"
+	ipcAPIs  = "admin:1.0 debug:1.0 eth:1.0 ethash:1.0 miner:1.0 net:1.0 personal:1.0 rollup:1.0 rpc:1.0 shh:1.0 txpool:1.0 web3:1.0"
 	httpAPIs = "eth:1.0 net:1.0 rpc:1.0 web3:1.0"
 )
 

diff --git a/l2geth/cmd/geth/main.go b/l2geth/cmd/geth/main.go
@@ -164,7 +164,6 @@ var (
 		utils.RollupStateDumpPathFlag,
 		utils.RollupDiffDbFlag,
 		utils.RollupMaxCalldataSizeFlag,
-		utils.RollupL1GasPriceFlag,
 	}
 
 	rpcFlags = []cli.Flag{

diff --git a/l2geth/cmd/geth/usage.go b/l2geth/cmd/geth/usage.go
@@ -78,7 +78,6 @@ var AppHelpFlagGroups = []flagGroup{
 			utils.RollupStateDumpPathFlag,
 			utils.RollupDiffDbFlag,
 			utils.RollupMaxCalldataSizeFlag,
-			utils.RollupL1GasPriceFlag,
 		},
 	},
 	{

diff --git a/l2geth/cmd/utils/flags.go b/l2geth/cmd/utils/flags.go
@@ -879,12 +879,6 @@ var (
 		Value:  eth.DefaultConfig.Rollup.MaxCallDataSize,
 		EnvVar: "ROLLUP_MAX_CALLDATA_SIZE",
 	}
-	RollupL1GasPriceFlag = BigFlag{
-		Name:   "rollup.l1gasprice",
-		Usage:  "The L1 gas price to use for the sequencer fees",
-		Value:  eth.DefaultConfig.Rollup.L1GasPrice,
-		EnvVar: "ROLLUP_L1_GASPRICE",
-	}
 )
 
 // MakeDataDir retrieves the currently requested data directory, terminating
@@ -1158,9 +1152,6 @@ func setRollup(ctx *cli.Context, cfg *rollup.Config) {
 	if ctx.GlobalIsSet(RollupTimstampRefreshFlag.Name) {
 		cfg.TimestampRefreshThreshold = ctx.GlobalDuration(RollupTimstampRefreshFlag.Name)
 	}
-	if ctx.GlobalIsSet(RollupL1GasPriceFlag.Name) {
-		cfg.L1GasPrice = GlobalBig(ctx, RollupL1GasPriceFlag.Name)
-	}
 }
 
 // setLes configures the les server and ultra light client settings from the command line flags.

diff --git a/l2geth/core/rollup_fee.go b/l2geth/core/rollup_fee.go
diff --git a/l2geth/core/rollup_fee_test.go b/l2geth/core/rollup_fee_test.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,7 @@ import ( @@
     )
     const (
-    	ipcAPIs  = "admin:1.0 debug:1.0 eth:1.0 ethash:1.0 miner:1.0 net:1.0 personal:1.0 rollup:1.0 rollup_personal:1.0 rpc:1.0 shh:1.0 txpool:1.0 web3:1.0"
+    	ipcAPIs  = "admin:1.0 debug:1.0 eth:1.0 ethash:1.0 miner:1.0 net:1.0 personal:1.0 rollup:1.0 rpc:1.0 shh:1.0 txpool:1.0 web3:1.0"
     	httpAPIs = "eth:1.0 net:1.0 rpc:1.0 web3:1.0"
     )
@@ Expand Down @@