Skip to content
This repository has been archived by the owner on Oct 20, 2024. It is now read-only.

Add ENVAR to support Arbstack #392

Merged
merged 2 commits into from
Apr 8, 2024
Merged

Add ENVAR to support Arbstack #392

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
429a8d2
add envar support for arbstack
NickSolante Apr 7, 2024
04e99a5
cleanup conditional
NickSolante Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions internal/config/values.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ type Values struct {
// Rollup related variables.
IsOpStackNetwork bool
IsRIP7212Supported bool
IsArbStackNetwork bool

// Undocumented variables.
DebugMode bool
Expand Down Expand Up @@ -99,6 +100,7 @@ func GetValues() *Values {
viper.SetDefault("erc4337_bundler_blocks_in_the_future", 6)
viper.SetDefault("erc4337_bundler_otel_insecure_mode", false)
viper.SetDefault("erc4337_bundler_is_op_stack_network", false)
viper.SetDefault("erc4337_bundler_is_arb_stack_network", false)
viper.SetDefault("erc4337_bundler_is_rip7212_supported", false)
viper.SetDefault("erc4337_bundler_debug_mode", false)
viper.SetDefault("erc4337_bundler_gin_mode", gin.ReleaseMode)
Expand Down Expand Up @@ -138,6 +140,7 @@ func GetValues() *Values {
_ = viper.BindEnv("erc4337_bundler_alt_mempool_ipfs_gateway")
_ = viper.BindEnv("erc4337_bundler_alt_mempool_ids")
_ = viper.BindEnv("erc4337_bundler_is_op_stack_network")
_ = viper.BindEnv("erc4337_bundler_is_arb_stack_network")
_ = viper.BindEnv("erc4337_bundler_is_rip7212_supported")
_ = viper.BindEnv("erc4337_bundler_debug_mode")
_ = viper.BindEnv("erc4337_bundler_gin_mode")
Expand Down Expand Up @@ -200,6 +203,7 @@ func GetValues() *Values {
altMempoolIPFSGateway := viper.GetString("erc4337_bundler_alt_mempool_ipfs_gateway")
altMempoolIds := envArrayToStringSlice(viper.GetString("erc4337_bundler_alt_mempool_ids"))
isOpStackNetwork := viper.GetBool("erc4337_bundler_is_op_stack_network")
isArbStackNetwork := viper.GetBool("erc4337_bundler_is_arb_stack_network")
isRIP7212Supported := viper.GetBool("erc4337_bundler_is_rip7212_supported")
debugMode := viper.GetBool("erc4337_bundler_debug_mode")
ginMode := viper.GetString("erc4337_bundler_gin_mode")
Expand All @@ -226,6 +230,7 @@ func GetValues() *Values {
AltMempoolIPFSGateway: altMempoolIPFSGateway,
AltMempoolIds: altMempoolIds,
IsOpStackNetwork: isOpStackNetwork,
IsArbStackNetwork: isArbStackNetwork,
IsRIP7212Supported: isRIP7212Supported,
DebugMode: debugMode,
GinMode: ginMode,
Expand Down
2 changes: 1 addition & 1 deletion internal/start/private.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func PrivateMode() {
}

ov := gas.NewDefaultOverhead()
if chain.Cmp(config.ArbitrumOneChainID) == 0 ||
if conf.IsArbStackNetwork || chain.Cmp(config.ArbitrumOneChainID) == 0 ||
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: one condition per line

chain.Cmp(config.ArbitrumGoerliChainID) == 0 ||
chain.Cmp(config.ArbitrumSepoliaChainID) == 0 {
ov.SetCalcPreVerificationGasFunc(gas.CalcArbitrumPVGWithEthClient(rpc, conf.SupportedEntryPoints[0]))
Expand Down
Loading