Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update all configs to mainnet #551

Merged
merged 2 commits into from
Dec 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions bridge/standard/cmd/user_cli/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ var (
Name: "l1-contract-addr",
Usage: "address of the L1 gateway contract",
EnvVars: []string{"L1_CONTRACT_ADDR"},
Value: config.HoleskyContracts.L1Gateway,
Value: config.EthereumContracts.L1Gateway,
}
optionSettlementContractAddr = &cli.StringFlag{
Name: "settlement-contract-addr",
Usage: "address of the settlement gateway contract",
EnvVars: []string{"SETTLEMENT_CONTRACT_ADDR"},
Value: config.TestnetContracts.SettlementGateway,
Value: config.MainnetContracts.SettlementGateway,
}
optionSilent = &cli.BoolFlag{
Name: "silent",
Expand Down
17 changes: 17 additions & 0 deletions contracts-abi/config/config.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package config

type Contracts struct {
BidderRegistry string
ProviderRegistry string
PreconfManager string
Oracle string
BlockTracker string
SettlementGateway string
}

type L1Contracts struct {
ValidatorOptInRouter string
VanillaRegistry string
MevCommitAVS string
L1Gateway string
}
17 changes: 17 additions & 0 deletions contracts-abi/config/mainnet.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package config

var MainnetContracts = Contracts{
Copy link
Contributor

Choose a reason for hiding this comment

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

Calling these "mainnet contracts" is confusing imo. They're not deployed to mainnet ethereum (L1), they're deployed on mev-commit chain

BidderRegistry: "0xC973D09e51A20C9Ab0214c439e4B34Dbac52AD67",
ProviderRegistry: "0xb772Add4718E5BD6Fe57Fb486A6f7f008E52167E",
PreconfManager: "0x9fF03b7Ca0767f069e7AA811E383752267cc47Ec",
Oracle: "0xa1aaCA1e4583dB498D47f3D5901f2B2EB49Bd8f6",
BlockTracker: "0x0DA2a367C51f2a34465ACd6AE5d8A48385e9cB03",
SettlementGateway: "0x138c60599946280e5a2DCc1f553B8f0cC0554E03",
}

var EthereumContracts = L1Contracts{
ValidatorOptInRouter: "0x821798d7b9d57dF7Ed7616ef9111A616aB19ed64",
VanillaRegistry: "0x47afdcB2B089C16CEe354811EA1Bbe0DB7c335E9",
MevCommitAVS: "0xBc77233855e3274E1903771675Eb71E602D9DC2e",
L1Gateway: "0xDBf24cafF1470a6D08bF2FF2c6875bafC60Cf881",
}
19 changes: 0 additions & 19 deletions contracts-abi/config/testnet.go
Original file line number Diff line number Diff line change
@@ -1,25 +1,6 @@
package config

type Contracts struct {
BidderRegistry string
ProviderRegistry string
PreconfManager string
Oracle string
BlockTracker string
SettlementGateway string
}

type L1Contracts struct {
ValidatorOptInRouter string
VanillaRegistry string
MevCommitAVS string
L1Gateway string
}

var TestnetContracts = Contracts{
// If these addresses change for a testnet deployment,
// please also update snippets/testnet-addresses.mdx
// in https://github.com/primev/mev-commit-docs
BidderRegistry: "0x948eCD70FaeF6746A30a00F30f8b9fB2659e4062",
ProviderRegistry: "0x1C2a592950E5dAd49c0E2F3A402DCF496bdf7b67",
PreconfManager: "0xa254D1A10777e358B0c2e945343664c7309A0D9d",
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/nomad/playbooks/variables/environments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ environments:
profile: "{{ profile }}"
version: "{{ version }}"
secrets: fetch
genesis_timestamp: "0x676d7ae2"
genesis_timestamp: "0x6772e470"
domain: mev-commit.xyz
2 changes: 1 addition & 1 deletion launchmevcommit
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ BINARY_PATH="${ROOT_PATH}/mev-commit"

# Default mev-commit configuration values.
NODE_TYPE="bidder"
DOMAIN="testnet.mev-commit.xyz"
DOMAIN="mev-commit.xyz"
RPC_URL="wss://chainrpc-wss.${DOMAIN}"
FAUCET_URL="https://faucet.${DOMAIN}"
BOOTNODE="/dnsaddr/bootnode.${DOMAIN}"
Expand Down
18 changes: 9 additions & 9 deletions oracle/cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,35 +124,35 @@ var (
Name: "oracle-contract-addr",
Usage: "address of the oracle contract",
EnvVars: []string{"MEV_ORACLE_ORACLE_CONTRACT_ADDR"},
Value: contracts.TestnetContracts.Oracle,
Value: contracts.MainnetContracts.Oracle,
})

optionPreconfContractAddr = altsrc.NewStringFlag(&cli.StringFlag{
Name: "preconf-contract-addr",
Usage: "address of the preconf contract",
EnvVars: []string{"MEV_ORACLE_PRECONF_CONTRACT_ADDR"},
Value: contracts.TestnetContracts.PreconfManager,
Value: contracts.MainnetContracts.PreconfManager,
})

optionBlockTrackerContractAddr = altsrc.NewStringFlag(&cli.StringFlag{
Name: "blocktracker-contract-addr",
Usage: "address of the block tracker contract",
EnvVars: []string{"MEV_ORACLE_BLOCKTRACKER_CONTRACT_ADDR"},
Value: contracts.TestnetContracts.BlockTracker,
Value: contracts.MainnetContracts.BlockTracker,
})

optionBidderRegistryContractAddr = altsrc.NewStringFlag(&cli.StringFlag{
Name: "bidder-registry-contract-addr",
Usage: "address of the bidder registry contract",
EnvVars: []string{"MEV_ORACLE_BIDDERREGISTRY_CONTRACT_ADDR"},
Value: contracts.TestnetContracts.BidderRegistry,
Value: contracts.MainnetContracts.BidderRegistry,
})

optionProviderRegistryContractAddr = altsrc.NewStringFlag(&cli.StringFlag{
Name: "provider-registry-contract-addr",
Usage: "address of the provider registry contract",
EnvVars: []string{"MEV_ORACLE_PROVIDERREGISTRY_CONTRACT_ADDR"},
Value: contracts.TestnetContracts.ProviderRegistry,
Value: contracts.MainnetContracts.ProviderRegistry,
})

optionPgHost = altsrc.NewStringFlag(&cli.StringFlag{
Expand Down Expand Up @@ -249,10 +249,10 @@ var (
Usage: "URLs for relay",
EnvVars: []string{"MEV_ORACLE_RELAY_URLS"},
Value: cli.NewStringSlice(
"https://holesky.aestus.live",
"https://boost-relay-holesky.flashbots.net",
"https://bloxroute.holesky.blxrbdn.com",
"https://holesky.titanrelay.xyz",
"https://mainnet.aestus.live",
"https://mainnet.titanrelay.xyz",
"https://bloxroute.max-profit.blxrbdn.com",
"https://boost-relay.flashbots.net",
),
})
)
Expand Down
10 changes: 5 additions & 5 deletions p2p/cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ var (
Name: "bidder-registry-contract",
Usage: "Address of the bidder registry contract",
EnvVars: []string{"MEV_COMMIT_BIDDER_REGISTRY_ADDR"},
Value: contracts.TestnetContracts.BidderRegistry,
Value: contracts.MainnetContracts.BidderRegistry,
Action: func(ctx *cli.Context, s string) error {
if !common.IsHexAddress(s) {
return fmt.Errorf("invalid bidder registry address: %s", s)
Expand All @@ -238,7 +238,7 @@ var (
Name: "provider-registry-contract",
Usage: "Address of the provider registry contract",
EnvVars: []string{"MEV_COMMIT_PROVIDER_REGISTRY_ADDR"},
Value: contracts.TestnetContracts.ProviderRegistry,
Value: contracts.MainnetContracts.ProviderRegistry,
Action: func(ctx *cli.Context, s string) error {
if !common.IsHexAddress(s) {
return fmt.Errorf("invalid provider registry address: %s", s)
Expand All @@ -252,7 +252,7 @@ var (
Name: "preconf-contract",
Usage: "Address of the preconfirmation commitment store contract",
EnvVars: []string{"MEV_COMMIT_PRECONF_ADDR"},
Value: contracts.TestnetContracts.PreconfManager,
Value: contracts.MainnetContracts.PreconfManager,
Action: func(ctx *cli.Context, s string) error {
if !common.IsHexAddress(s) {
return fmt.Errorf("invalid preconfirmation commitment store address: %s", s)
Expand All @@ -266,7 +266,7 @@ var (
Name: "block-tracker-contract",
Usage: "Address of the block tracker contract",
EnvVars: []string{"MEV_COMMIT_BLOCK_TRACKER_ADDR"},
Value: contracts.TestnetContracts.BlockTracker,
Value: contracts.MainnetContracts.BlockTracker,
Action: func(ctx *cli.Context, s string) error {
if !common.IsHexAddress(s) {
return fmt.Errorf("invalid block tracker address: %s", s)
Expand All @@ -280,7 +280,7 @@ var (
Name: "validator-router-contract",
Usage: "Address of the validator router contract",
EnvVars: []string{"MEV_COMMIT_VALIDATOR_ROUTER_ADDR"},
Value: contracts.HoleskyContracts.ValidatorOptInRouter,
Value: contracts.EthereumContracts.ValidatorOptInRouter,
Action: func(ctx *cli.Context, s string) error {
if !common.IsHexAddress(s) {
return fmt.Errorf("invalid validator router address: %s", s)
Expand Down
10 changes: 5 additions & 5 deletions tools/dashboard/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,35 +97,35 @@ var (
Name: "oracle-contract-addr",
Usage: "address of the oracle contract",
EnvVars: []string{"DASHBOARD_ORACLE_CONTRACT_ADDR"},
Value: contracts.TestnetContracts.Oracle,
Value: contracts.MainnetContracts.Oracle,
}

optionPreconfContractAddr = &cli.StringFlag{
Name: "preconf-contract-addr",
Usage: "address of the preconf contract",
EnvVars: []string{"DASHBOARD_PRECONF_CONTRACT_ADDR"},
Value: contracts.TestnetContracts.PreconfManager,
Value: contracts.MainnetContracts.PreconfManager,
}

optionBlockTrackerContractAddr = &cli.StringFlag{
Name: "blocktracker-contract-addr",
Usage: "address of the block tracker contract",
EnvVars: []string{"DASHBOARD_BLOCKTRACKER_CONTRACT_ADDR"},
Value: contracts.TestnetContracts.BlockTracker,
Value: contracts.MainnetContracts.BlockTracker,
}

optionBidderRegistryContractAddr = &cli.StringFlag{
Name: "bidder-registry-contract-addr",
Usage: "address of the bidder registry contract",
EnvVars: []string{"DASHBOARD_BIDDERREGISTRY_CONTRACT_ADDR"},
Value: contracts.TestnetContracts.BidderRegistry,
Value: contracts.MainnetContracts.BidderRegistry,
}

optionProviderRegistryContractAddr = &cli.StringFlag{
Name: "provider-registry-contract-addr",
Usage: "address of the provider registry contract",
EnvVars: []string{"DASHBOARD_PROVIDERREGISTRY_CONTRACT_ADDR"},
Value: contracts.TestnetContracts.ProviderRegistry,
Value: contracts.MainnetContracts.ProviderRegistry,
}
)

Expand Down
Loading