diff --git a/chainConfig.ts b/chainConfig.ts index a7cd345a..b207bdd7 100644 --- a/chainConfig.ts +++ b/chainConfig.ts @@ -17,43 +17,43 @@ export type ChainConfig = { }; export const chainConfig: { [chain: string]: ChainConfig } = { - "31337": { -chainSlug: 31337, - chainName: "hardhat", - timeout: 7200, - rpc: "http://127.0.0.1:8545/", - transmitterAddress: "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", - executorAddress: "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", - watcherAddress: "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", - feeUpdaterAddress: "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", - ownerAddress: "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", - msgValueMaxThreshold: 10000000000000000, - overrides: { -type: 1, + "31337": { + chainSlug: 31337, + chainName: "hardhat", + timeout: 7200, + rpc: "http://127.0.0.1:8545/", + transmitterAddress: "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + executorAddress: "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + watcherAddress: "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + feeUpdaterAddress: "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + ownerAddress: "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + msgValueMaxThreshold: 10000000000000000, + overrides: { + type: 1, gasLimit: 20000000, gasPrice: 1000000000000, - }, - }, - "421614": { -chainSlug: 421614, - chainName: "arbitrum_sepolia", - timeout: 7200, - rpc: "https://broken-tame-morning.arbitrum-sepolia.quiknode.pro/317a841dd4460bed62d6b16b6b6e9c4fe0f77e39/", - transmitterAddress: "0xC0641472b9b12c6FE7369bd83e991a716F6E8faB", - executorAddress: "0xC0641472b9b12c6FE7369bd83e991a716F6E8faB", - watcherAddress: "0xC0641472b9b12c6FE7369bd83e991a716F6E8faB", - feeUpdaterAddress: "0xC0641472b9b12c6FE7369bd83e991a716F6E8faB", - ownerAddress: "0xC0641472b9b12c6FE7369bd83e991a716F6E8faB", - }, - "647": { -chainSlug: 647, - chainName: "sxn_testnet", - timeout: 7200, - rpc: "https://rpc.toronto.sx.technology/", - transmitterAddress: "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", - executorAddress: "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", - watcherAddress: "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", - feeUpdaterAddress: "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", - ownerAddress: "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", - }, + }, + }, + "421614": { + chainSlug: 421614, + chainName: "arbitrum_sepolia", + timeout: 7200, + rpc: "https://broken-tame-morning.arbitrum-sepolia.quiknode.pro/317a841dd4460bed62d6b16b6b6e9c4fe0f77e39/", + transmitterAddress: "0xC0641472b9b12c6FE7369bd83e991a716F6E8faB", + executorAddress: "0xC0641472b9b12c6FE7369bd83e991a716F6E8faB", + watcherAddress: "0xC0641472b9b12c6FE7369bd83e991a716F6E8faB", + feeUpdaterAddress: "0xC0641472b9b12c6FE7369bd83e991a716F6E8faB", + ownerAddress: "0xC0641472b9b12c6FE7369bd83e991a716F6E8faB", + }, + "647": { + chainSlug: 647, + chainName: "sxn_testnet", + timeout: 7200, + rpc: "https://rpc.toronto.sx.technology/", + transmitterAddress: "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + executorAddress: "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + watcherAddress: "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + feeUpdaterAddress: "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + ownerAddress: "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", + }, }; diff --git a/deployments/dev_addresses.json b/deployments/dev_addresses.json index 94f28918..e5068bc2 100644 --- a/deployments/dev_addresses.json +++ b/deployments/dev_addresses.json @@ -226,6 +226,13 @@ "switchboard": "0x7E7735e77574228C4F55d4B2F96Fe586dF10104e" } }, + "421614": { + "FAST2": { + "capacitor": "0xbaca184513985B8556F71A1BBE4780e8d56919F2", + "decapacitor": "0xA972BDb36ed45Ab415e82E715c94b32b5cdb56Fe", + "switchboard": "0x7E7735e77574228C4F55d4B2F96Fe586dF10104e" + } + }, "11155111": { "FAST": { "capacitor": "0xe78Cd3CEb8873fA9D6C567a8b2283A26e665a7f3", diff --git a/deployments/dev_verification.json b/deployments/dev_verification.json index 056886e2..b176eed6 100644 --- a/deployments/dev_verification.json +++ b/deployments/dev_verification.json @@ -4,9 +4,7 @@ "0x1eaf2ee60D952ECc5D1397F8D94a950DA632B29c", "SocketBatcher", "contracts/socket/SocketBatcher.sol", - [ - "0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa" - ] + ["0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa"] ], [ "0xD2F16F574c7B4022192C53af9570b4b3C9B42f73", @@ -26,9 +24,7 @@ "0xc07216D0e55044572d6E3C08d8a8a86BD3D909e3", "SocketBatcher", "contracts/socket/SocketBatcher.sol", - [ - "0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa" - ] + ["0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa"] ] ], "647": [ @@ -36,17 +32,13 @@ "0x2a754670Ed76F892568EE6Ff690fc56ee38a2DC9", "Counter", "contracts/examples/Counter.sol", - [ - "0x78E9EcA8889A6b6016CE5b56cD872bfB6F1Ba41f" - ] + ["0x78E9EcA8889A6b6016CE5b56cD872bfB6F1Ba41f"] ], [ "0xf47103263296eFebc7B8DD4d5410e15d7B59FceF", "SocketBatcher", "contracts/socket/SocketBatcher.sol", - [ - "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B" - ] + ["0xdE7f7a699F8504641eceF544B0fbc0740C37E69B"] ], [ "0xF6bc9bC110464f7544507B574bEC357403171156", @@ -110,42 +102,31 @@ "0xF4E477308ab2f30330cD3233e9b71Dc5d636EEe0", "CapacitorFactory", "contracts/CapacitorFactory.sol", - [ - "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", - 10 - ] + ["0xdE7f7a699F8504641eceF544B0fbc0740C37E69B", 10] ], [ "0x08f47Af4FB9Ab119e6Dd2C43994B9131E2AA91e2", "Hasher", "contracts/utils/Hasher.sol", - [ - "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B" - ] + ["0xdE7f7a699F8504641eceF544B0fbc0740C37E69B"] ], [ "0xE19cC72ad60d0aE127E2c8d7C016cf67e15c5493", "SignatureVerifier", "contracts/utils/SignatureVerifier.sol", - [ - "0xdE7f7a699F8504641eceF544B0fbc0740C37E69B" - ] + ["0xdE7f7a699F8504641eceF544B0fbc0740C37E69B"] ], [ "0x9A4f5494d48581472619ec3f1aD8d323eA71b754", "Counter", "contracts/examples/Counter.sol", - [ - "0x7539351956f3271CdaF1fb1a440CA9BE2BfbF2ED" - ] + ["0x7539351956f3271CdaF1fb1a440CA9BE2BfbF2ED"] ], [ "0x87E54C7AF2Ed4f9e12a358484C03B3667A417a80", "SocketBatcher", "contracts/socket/SocketBatcher.sol", - [ - "0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa" - ] + ["0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa"] ], [ "0xd0580065858313f0300eBb6e7970cD3699323985", @@ -209,26 +190,19 @@ "0x5bA62006442bC42e28E3E5147A5221Be723ca1DE", "CapacitorFactory", "contracts/CapacitorFactory.sol", - [ - "0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa", - 10 - ] + ["0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa", 10] ], [ "0xb515E9E6E6aBA44bBEC72FBF6B1a18DDB6bec68e", "Hasher", "contracts/utils/Hasher.sol", - [ - "0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa" - ] + ["0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa"] ], [ "0x320Cd79c54927Fe130427bD4492b6c6068D075E3", "SignatureVerifier", "contracts/utils/SignatureVerifier.sol", - [ - "0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa" - ] + ["0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa"] ] ], "901": [ @@ -236,9 +210,7 @@ "0x6F1912DC9631E8aFC89e7D95Afd7e467845FF6F2", "SocketBatcher", "contracts/socket/SocketBatcher.sol", - [ - "0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa" - ] + ["0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa"] ], [ "0x501fCBa3e6F92b2D1d89038FeD56EdacaaF5f7c2", @@ -258,9 +230,7 @@ "0xB08C44cF4b4cD0Cb343e73f3A7f0be20cCF0517D", "SocketBatcher", "contracts/socket/SocketBatcher.sol", - [ - "0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa" - ] + ["0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa"] ] ], "421613": [ @@ -268,9 +238,7 @@ "0xcf1A2FD5428f6f48f9170fcb81E41B13ab67AF9d", "SocketBatcher", "contracts/socket/SocketBatcher.sol", - [ - "0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa" - ] + ["0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa"] ] ], "421614": [ @@ -278,17 +246,13 @@ "0xd278B4D863f0E32B619780e306d50202594fFDE1", "Counter", "contracts/examples/Counter.sol", - [ - "0xeC1cF3fFA98b5DA112480F10789434824C2977fC" - ] + ["0xeC1cF3fFA98b5DA112480F10789434824C2977fC"] ], [ "0xf42614B3a3e7aCE2BbbF462F8Bb90261972d2c4F", "SocketBatcher", "contracts/socket/SocketBatcher.sol", - [ - "0xC0641472b9b12c6FE7369bd83e991a716F6E8faB" - ] + ["0xC0641472b9b12c6FE7369bd83e991a716F6E8faB"] ], [ "0xf0dFfCf087B788DA204F9a4A7b297Dd1066A1425", @@ -352,26 +316,19 @@ "0x92b15AB85798aDEef92Eb155c9B2EC6088838204", "CapacitorFactory", "contracts/CapacitorFactory.sol", - [ - "0xC0641472b9b12c6FE7369bd83e991a716F6E8faB", - 10 - ] + ["0xC0641472b9b12c6FE7369bd83e991a716F6E8faB", 10] ], [ "0x58d64874Dba301eD9769662b3462ab1AB816225b", "Hasher", "contracts/utils/Hasher.sol", - [ - "0xC0641472b9b12c6FE7369bd83e991a716F6E8faB" - ] + ["0xC0641472b9b12c6FE7369bd83e991a716F6E8faB"] ], [ "0x83DA69b61e4bB71AB1AC940028b295adA3E17C2F", "SignatureVerifier", "contracts/utils/SignatureVerifier.sol", - [ - "0xC0641472b9b12c6FE7369bd83e991a716F6E8faB" - ] + ["0xC0641472b9b12c6FE7369bd83e991a716F6E8faB"] ] ], "11155112": [ @@ -379,9 +336,7 @@ "0xd42DbD058bE3F4230E8b5d51e7548fb4E082acC5", "SocketBatcher", "contracts/socket/SocketBatcher.sol", - [ - "0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa" - ] + ["0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa"] ] ], "1399904803": [ @@ -389,17 +344,13 @@ "0xE593288228d17a6D057D9a61a35F32166A6B4191", "Counter", "contracts/examples/Counter.sol", - [ - "0x6F1912DC9631E8aFC89e7D95Afd7e467845FF6F2" - ] + ["0x6F1912DC9631E8aFC89e7D95Afd7e467845FF6F2"] ], [ "0xBc3Ff3923b36F1590C16363b09c4759654d7B6d4", "SocketBatcher", "contracts/socket/SocketBatcher.sol", - [ - "0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa" - ] + ["0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa"] ], [ "0xd84fabe06806270Fb2dDFC2255102206e3B36865", @@ -463,42 +414,31 @@ "0x501fCBa3e6F92b2D1d89038FeD56EdacaaF5f7c2", "CapacitorFactory", "contracts/CapacitorFactory.sol", - [ - "0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa", - 10 - ] + ["0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa", 10] ], [ "0x6E6BC965FA8897b7531322461A65f016E8Be1c30", "Hasher", "contracts/utils/Hasher.sol", - [ - "0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa" - ] + ["0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa"] ], [ "0xF90462427f6fB8948483D06d90a0324E9A6eFF2E", "SignatureVerifier", "contracts/utils/SignatureVerifier.sol", - [ - "0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa" - ] + ["0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa"] ], [ "0x30DaDbc1D9EdF62f5E7491439c78bD6502c6c22B", "Counter", "contracts/examples/Counter.sol", - [ - "0xAE9bE0eA6DD7B53C88665Cb2EFf7d40dFD51cf91" - ] + ["0xAE9bE0eA6DD7B53C88665Cb2EFf7d40dFD51cf91"] ], [ "0x918ECe20236B9d8C2AA1742540246D6F9a9eB081", "SocketBatcher", "contracts/socket/SocketBatcher.sol", - [ - "0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa" - ] + ["0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa"] ], [ "0xA53185E856916228505372F1E3333BbbB4AC2063", @@ -562,26 +502,19 @@ "0xEDF6dB2f3BC8deE014762e0141EE4CA19d685dBd", "CapacitorFactory", "contracts/CapacitorFactory.sol", - [ - "0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa", - 10 - ] + ["0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa", 10] ], [ "0xB9EDe9aaEaA40e35033ABBC872D141950d08cc4d", "Hasher", "contracts/utils/Hasher.sol", - [ - "0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa" - ] + ["0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa"] ], [ "0x85778A90ec60249f10d7AEe06484ffC290d5Efd8", "SignatureVerifier", "contracts/utils/SignatureVerifier.sol", - [ - "0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa" - ] + ["0x752B38FA38F53dF7fa60e6113CFd9094b7e040Aa"] ] ] } diff --git a/scripts/deploy/scripts/configureSocket.ts b/scripts/deploy/scripts/configureSocket.ts index f67335e3..8f0cd5db 100644 --- a/scripts/deploy/scripts/configureSocket.ts +++ b/scripts/deploy/scripts/configureSocket.ts @@ -146,17 +146,17 @@ export const configureExecutionManager = async ( ); if (requests.length === 0) return; - socketBatcherContract = ( - await getInstance("SocketBatcher", socketBatcherAddress) - ).connect(socketSigner); - - let tx = await socketBatcherContract.setExecutionFeesBatch( - emAddress!, - requests, - { ...overrides[chain] } - ); - console.log(chain, tx.hash); - await tx.wait(); + // socketBatcherContract = ( + // await getInstance("SocketBatcher", socketBatcherAddress) + // ).connect(socketSigner); + + // let tx = await socketBatcherContract.setExecutionFeesBatch( + // emAddress!, + // requests, + // { ...overrides[chain] } + // ); + // console.log(chain, tx.hash); + // await tx.wait(); } catch (error) { console.log("error while configuring execution manager: ", error); } diff --git a/scripts/deploy/single-click-deploy/addChain.ts b/scripts/deploy/single-click-deploy/addChain.ts index 9a3234cb..22a869bf 100644 --- a/scripts/deploy/single-click-deploy/addChain.ts +++ b/scripts/deploy/single-click-deploy/addChain.ts @@ -21,9 +21,7 @@ import { deployedAddressPath, storeAllAddresses } from "../utils"; import { chainConfig } from "../../../chainConfig"; const chain = ChainSlug.ARBITRUM_SEPOLIA; -const siblings = [ - ChainSlug.OPTIMISM_GOERLI, -]; +const siblings = [ChainSlug.OPTIMISM_GOERLI]; export const main = async () => { const addresses = await deployForChains([chain]); diff --git a/scripts/deploy/single-click-deploy/configureChain.ts b/scripts/deploy/single-click-deploy/configureChain.ts index de3029e8..3510a42b 100644 --- a/scripts/deploy/single-click-deploy/configureChain.ts +++ b/scripts/deploy/single-click-deploy/configureChain.ts @@ -23,12 +23,8 @@ import { getProviderFromChainSlug } from "../../constants"; import { deployedAddressPath, storeAllAddresses } from "../utils"; import { chainConfig } from "../../../chainConfig"; -const chain = ChainSlug.SX_NETWORK_TESTNET; -const filterChains = [ - ChainSlug.POLYGON_MUMBAI, - ChainSlug.GOERLI, - ChainSlug.ARBITRUM_GOERLI, -]; +const chain = ChainSlug.ARBITRUM_SEPOLIA; +const filterChains = [ChainSlug.OPTIMISM_GOERLI]; export const main = async () => { const addresses: DeploymentAddresses = JSON.parse( diff --git a/src/chain-types.ts b/src/chain-types.ts index 54a3299b..43931b60 100644 --- a/src/chain-types.ts +++ b/src/chain-types.ts @@ -49,7 +49,6 @@ export enum ChainId { XAI_TESTNET = 47279324479, SX_NETWORK_TESTNET = 647, ARBITRUM_SEPOLIA = 421614, - } export enum ChainSlug {