Remove call to Arbitrum gas helper contract (#176)

Author: hazim-j

internal/start/private.go

@@ -59,7 +59,7 @@ func PrivateMode() {
 
 	ov := gas.NewDefaultOverhead()
 	if chain.Cmp(config.ArbitrumOneChainID) == 0 || chain.Cmp(config.ArbitrumGoerliChainID) == 0 {
-		ov.SetCalcPreVerificationGasFunc(gas.CalcArbitrumPVGWithEthClient(rpc))
+		ov.SetCalcPreVerificationGasFunc(gas.CalcArbitrumPVGWithEthClient(rpc, conf.SupportedEntryPoints[0]))
 	}
 
 	mem, err := mempool.New(db)

pkg/arbitrum/nodeinterface/constants.go

@@ -3,6 +3,5 @@ package nodeinterface
 import "github.com/ethereum/go-ethereum/common"
 
 var (
-	ERC4337GasHelperAddress = common.HexToAddress("0x559e3c6A74678FDBE1Fcc54153A8D7Dd7049FBCA")
-	PrecompileAddress       = common.HexToAddress("0x00000000000000000000000000000000000000C8")
+	PrecompileAddress = common.HexToAddress("0x00000000000000000000000000000000000000C8")
 )

pkg/gas/pvg.go

@@ -29,6 +29,7 @@ func calcPVGFuncNoop() CalcPreVerificationGasFunc {
 // https://medium.com/offchainlabs/understanding-arbitrum-2-dimensional-fees-fd1d582596c9.
 func CalcArbitrumPVGWithEthClient(
 	rpc *rpc.Client,
+	entryPoint common.Address,
 ) CalcPreVerificationGasFunc {
 	pk, _ := crypto.GenerateKey()
 	dummy, _ := signer.New(hexutil.Encode(crypto.FromECDSA(pk))[2:])
@@ -48,7 +49,7 @@ func CalcArbitrumPVGWithEthClient(
 			create = true
 		}
 		ge, err := nodeinterface.GasEstimateL1ComponentMethod.Inputs.Pack(
-			nodeinterface.ERC4337GasHelperAddress,
+			entryPoint,
 			create,
 			append(methods.HandleOpsMethod.ID, ho...),
 		)