From 67263b81a716b8f6ef418b5154d83c91cabc2160 Mon Sep 17 00:00:00 2001 From: Andlyn Date: Thu, 18 Apr 2024 12:33:00 +0800 Subject: [PATCH] Prepare redstone mainnet deploy. --- contracts/src/libraries/ChainHelper.sol | 10 ++++++++-- crates/core/src/utils/mod.rs | 2 ++ crates/dal/sqlite/src/lib.rs | 16 +++++++++++----- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/contracts/src/libraries/ChainHelper.sol b/contracts/src/libraries/ChainHelper.sol index 8e10288b..ad194cc3 100644 --- a/contracts/src/libraries/ChainHelper.sol +++ b/contracts/src/libraries/ChainHelper.sol @@ -11,6 +11,8 @@ library ChainHelper { uint256 public constant OP_DEVNET_L2_CHAIN_ID = 901; uint256 public constant BASE_MAINNET_CHAIN_ID = 8453; uint256 public constant BASE_SEPOLIA_TESTNET_CHAIN_ID = 84532; + uint256 public constant REDSTONE_MAINNET_CHAIN_ID = 690; + uint256 public constant REDSTONE_GARNET_TESTNET_CHAIN_ID = 17069; uint256 public constant REDSTONE_HOLESKY_TESTNET_CHAIN_ID = 17001; uint256 public constant LOOT_MAINNET_CHAIN_ID = 5151706; uint256 public constant LOOT_GOERLI_TESTNET_CHAIN_ID = 9088912; @@ -25,7 +27,8 @@ library ChainHelper { if ( chainId == OP_MAINNET_CHAIN_ID || chainId == OP_SEPOLIA_TESTNET_CHAIN_ID || chainId == OP_DEVNET_L2_CHAIN_ID || chainId == BASE_MAINNET_CHAIN_ID || chainId == BASE_SEPOLIA_TESTNET_CHAIN_ID - || chainId == REDSTONE_HOLESKY_TESTNET_CHAIN_ID + || chainId == REDSTONE_HOLESKY_TESTNET_CHAIN_ID || chainId == REDSTONE_MAINNET_CHAIN_ID + || chainId == REDSTONE_GARNET_TESTNET_CHAIN_ID ) { return 2; } else if (chainId == OP_DEVNET_L1_CHAIN_ID || chainId == TAIKO_KATLA_TEST_CHAIN_ID) { @@ -43,6 +46,7 @@ library ChainHelper { if ( chainId == OP_MAINNET_CHAIN_ID || chainId == OP_SEPOLIA_TESTNET_CHAIN_ID || chainId == OP_DEVNET_L2_CHAIN_ID || chainId == BASE_MAINNET_CHAIN_ID || chainId == BASE_SEPOLIA_TESTNET_CHAIN_ID + || chainId == REDSTONE_MAINNET_CHAIN_ID || chainId == REDSTONE_GARNET_TESTNET_CHAIN_ID ) { return IOPGasPriceOracle(OP_GAS_PRICE_ORACLE_ADDR).getL1Fee(msg.data); } @@ -53,7 +57,8 @@ library ChainHelper { uint256 chainId = block.chainid; if ( chainId == OP_MAINNET_CHAIN_ID || chainId == OP_SEPOLIA_TESTNET_CHAIN_ID || chainId == OP_DEVNET_L2_CHAIN_ID - || chainId == BASE_MAINNET_CHAIN_ID || chainId == BASE_SEPOLIA_TESTNET_CHAIN_ID + || chainId == BASE_MAINNET_CHAIN_ID || chainId == BASE_SEPOLIA_TESTNET_CHAIN_ID + || chainId == REDSTONE_MAINNET_CHAIN_ID || chainId == REDSTONE_GARNET_TESTNET_CHAIN_ID ) { try IOPGasPriceOracle(OP_GAS_PRICE_ORACLE_ADDR).isEcotone() returns (bool isEcotone) { if (isEcotone) { @@ -79,6 +84,7 @@ library ChainHelper { if ( chainId == OP_MAINNET_CHAIN_ID || chainId == OP_SEPOLIA_TESTNET_CHAIN_ID || chainId == OP_DEVNET_L2_CHAIN_ID || chainId == BASE_MAINNET_CHAIN_ID || chainId == BASE_SEPOLIA_TESTNET_CHAIN_ID + || chainId == REDSTONE_MAINNET_CHAIN_ID || chainId == REDSTONE_GARNET_TESTNET_CHAIN_ID ) { return BASIC_FULFILLMENT_L1_GAS_USED + groupSize * FULFILLMENT_GAS_PER_PARTICIPANT; } diff --git a/crates/core/src/utils/mod.rs b/crates/core/src/utils/mod.rs index 58de04fc..b4f79d32 100644 --- a/crates/core/src/utils/mod.rs +++ b/crates/core/src/utils/mod.rs @@ -13,6 +13,8 @@ pub const BASE_MAINNET_CHAIN_ID: usize = 8453; pub const BASE_GOERLI_TESTNET_CHAIN_ID: usize = 84531; pub const BASE_SEPOLIA_TESTNET_CHAIN_ID: usize = 84532; pub const REDSTONE_HOLESKY_TESTNET_CHAIN_ID: usize = 17001; +pub const REDSTONE_MAINNET_CHAIN_ID: usize = 690; +pub const REDSTONE_GARNET_TESTNET_CHAIN_ID: usize = 17069; pub const LOOT_MAINNET_CHAIN_ID: usize = 5151706; pub const LOOT_TESTNET_CHAIN_ID: usize = 9088912; pub const TAIKO_KATLA_TEST_CHAIN_ID: usize = 167008; diff --git a/crates/dal/sqlite/src/lib.rs b/crates/dal/sqlite/src/lib.rs index a6be4fce..47ba4e82 100644 --- a/crates/dal/sqlite/src/lib.rs +++ b/crates/dal/sqlite/src/lib.rs @@ -24,6 +24,8 @@ use arpa_core::OP_GOERLI_TESTNET_CHAIN_ID; use arpa_core::OP_MAINNET_CHAIN_ID; use arpa_core::OP_SEPOLIA_TESTNET_CHAIN_ID; use arpa_core::REDSTONE_HOLESKY_TESTNET_CHAIN_ID; +use arpa_core::REDSTONE_MAINNET_CHAIN_ID; +use arpa_core::REDSTONE_GARNET_TESTNET_CHAIN_ID; use arpa_core::TAIKO_KATLA_TEST_CHAIN_ID; use arpa_dal::cache::RandomnessResultCache; use arpa_dal::error::DataAccessError; @@ -111,10 +113,12 @@ impl SqliteDB { | BASE_GOERLI_TESTNET_CHAIN_ID | BASE_SEPOLIA_TESTNET_CHAIN_ID => { Ok(Box::new(self.get_base_bls_tasks_client::())) - } - REDSTONE_HOLESKY_TESTNET_CHAIN_ID => Ok(Box::new( - self.get_redstone_bls_tasks_client::(), - )), + }, + REDSTONE_HOLESKY_TESTNET_CHAIN_ID + | REDSTONE_MAINNET_CHAIN_ID + | REDSTONE_GARNET_TESTNET_CHAIN_ID => { + Ok(Box::new(self.get_redstone_bls_tasks_client::())) + }, LOOT_MAINNET_CHAIN_ID | LOOT_TESTNET_CHAIN_ID => { Ok(Box::new(self.get_loot_bls_tasks_client::())) }, @@ -140,7 +144,9 @@ impl SqliteDB { | BASE_SEPOLIA_TESTNET_CHAIN_ID => { Ok(Box::new(self.get_base_randomness_result_client().await?)) } - REDSTONE_HOLESKY_TESTNET_CHAIN_ID => Ok(Box::new( + REDSTONE_HOLESKY_TESTNET_CHAIN_ID + | REDSTONE_MAINNET_CHAIN_ID + | REDSTONE_GARNET_TESTNET_CHAIN_ID => Ok(Box::new( self.get_redstone_randomness_result_client().await?, )), LOOT_MAINNET_CHAIN_ID | LOOT_TESTNET_CHAIN_ID => {