From ba9423cbf748f7b0536b283661a7012a9404495a Mon Sep 17 00:00:00 2001 From: Aleksandr Kuperman Date: Wed, 17 Jul 2024 11:55:27 +0100 Subject: [PATCH 1/4] doc: adding OLAS address on Celo --- docs/olas_bridging.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/olas_bridging.md b/docs/olas_bridging.md index bf82c5a6..e000760d 100644 --- a/docs/olas_bridging.md +++ b/docs/olas_bridging.md @@ -10,4 +10,5 @@ In a table below one can find OLAS token addresses on corresponding chains and b | Solana | [Ez3nzG9ofodYCvEmw73XhQ87LWNYVRM2s7diB5tBZPyM](https://solscan.io/token/Ez3nzG9ofodYCvEmw73XhQ87LWNYVRM2s7diB5tBZPyM) | [Wormhole Portal](https://portalbridge.com/advanced-tools/#/transfer) | | Arbitrum | [0x064f8b858c2a603e1b106a2039f5446d32dc81c1](https://arbiscan.io/token/0x064f8b858c2a603e1b106a2039f5446d32dc81c1) | [Arbitrum Bridge](https://bridge.arbitrum.io) | | Optimism | [0xFC2E6e6BCbd49ccf3A5f029c79984372DcBFE527](https://optimistic.etherscan.io/token/0xFC2E6e6BCbd49ccf3A5f029c79984372DcBFE527) | [Optimism Bridge](https://app.optimism.io/bridge/deposit) | -| Base | [0x54330d28ca3357F294334BDC454a032e7f353416](https://basescan.org/token/0x54330d28ca3357F294334BDC454a032e7f353416) | [Base Bridge](https://bridge.base.org/deposit) | \ No newline at end of file +| Base | [0x54330d28ca3357F294334BDC454a032e7f353416](https://basescan.org/token/0x54330d28ca3357F294334BDC454a032e7f353416) | [Base Bridge](https://bridge.base.org/deposit) | +| Celo | [0xaCFfAe8e57Ec6E394Eb1b41939A8CF7892DbDc51](https://celoscan.io/token/0xacffae8e57ec6e394eb1b41939a8cf7892dbdc51) | [Wormhole Portal](https://portalbridge.com/advanced-tools/#/transfer) | From 4c142e987f5f2528a567c57f6de0258e5007548c Mon Sep 17 00:00:00 2001 From: Aleksandr Kuperman Date: Mon, 22 Jul 2024 11:44:23 +0100 Subject: [PATCH 2/4] chore: adding contract addresses --- docs/configuration.json | 5 +++++ scripts/deployment/globals_mainnet.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/configuration.json b/docs/configuration.json index 84a82575..dca9c5ae 100644 --- a/docs/configuration.json +++ b/docs/configuration.json @@ -33,6 +33,11 @@ "artifact": "abis/0.8.20/GovernorOLAS.json", "address": "0x8e84b5055492901988b831817e4ace5275a3b401" }, + { + "name": "VoteWeighting", + "artifact": "abis/0.8.25/VoteWeighting.json", + "address": "0x95418b46d5566D3d1ea62C12Aea91227E566c5c1" + }, { "name": "GuardCM", "artifact": "abis/0.8.23/GuardCM.json", diff --git a/scripts/deployment/globals_mainnet.json b/scripts/deployment/globals_mainnet.json index 8252f6d2..2c580ea5 100644 --- a/scripts/deployment/globals_mainnet.json +++ b/scripts/deployment/globals_mainnet.json @@ -1 +1 @@ -{"contractVerification":true,"useLedger":true,"valoryMultisig":"0x87cc0d34f6111c8A7A4Bdf758a9a715A3675f941","derivationPath":"m/44'/60'/2'/0/0","CM":"0x04C06323Fe3D53Deb7364c0055E1F68458Cc2570","providerName":"mainnet","olasSaltString":"0xeb2a22b27c7ad5eee424fd90b376c745e60f914e25fe2b399268300038939d65","timelockMinDelay":"13091","veOlasSaltString":"0xeb2a22b27c7ad5eee424fd90b376c745e60f914e8c4b6f56e64f24010eba714f","initialVotingDelay":"13091","initialVotingPeriod":"19636","initialProposalThreshold":"5000000000000000000000","quorum":"3","initSupply":"526500000000000000000000000","timelockSupply":"100000000000000000000000000","saleSupply":"292874580000000000000000000","valorySupply":"133625420000000000000000000","GnosisSafe":"0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552","GnosisSafeProxyFactory":"0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2","MultiSendCallOnly":"0x40A2aCCbd92BCA938b02010E17A5b8929b49130D","deploymentFactory":"0x9338b5153AE39BB89f50468E608eD9d764B755fD","olasAddress":"0x0001A500A6B18995B03f44bb040A5fFc28E45CB0","timelockAddress":"0x3C1fF68f5aa342D296d4DEe4Bb1cACCA912D95fE","veOLASAddress":"0x7e01A500805f8A52Fad229b3015AD130A332B7b3","governorAddress":"0x34C895f302D0b5cf52ec0Edd3945321EB0f83dd5","buOLASAddress":"0xb09CcF0Dbf0C178806Aaee28956c74bd66d21f73","wveOLASAddress":"0x4039B809E0C0Ad04F6Fc880193366b251dDf4B40","governorTwoAddress":"0x8E84B5055492901988B831817e4Ace5275A3b401","treasuryAddress":"0xa0DA53447C0f6C4987964d8463da7e6628B30f82","guardCMAddress":"0x7bB7998b210cFfE10ca1e41f16341Abe53f76f3a","depositoryAddress":"0xfF8697d8d2998d6AA2e09B405795C6F4BEeB0C81","bridgedERC20Address":"0x06512E620A8317da51a73690A596Aca97287b31D","fxRootAddress":"0xfe5e5D361b2ad62c541bAb87C45a0B9B018389a2","childTokenAddress":"0x62309056c759c36879Cde93693E7903bF415E4Bc","checkpointManagerAddress":"0x86E4Dc95c7FBdBf52e33D563BbDB00823894C287","fxERC20RootTunnelAddress":"0x1737408def992AF04b29C8Ba4BBcD7397B08c930", "fxERC20ChildTunnelAddress": "0x1fe74A08ac89300B102AdCd474C721AE8764E850"} \ No newline at end of file +{"contractVerification":true,"useLedger":true,"valoryMultisig":"0x87cc0d34f6111c8A7A4Bdf758a9a715A3675f941","derivationPath":"m/44'/60'/2'/0/0","CM":"0x04C06323Fe3D53Deb7364c0055E1F68458Cc2570","providerName":"mainnet","olasSaltString":"0xeb2a22b27c7ad5eee424fd90b376c745e60f914e25fe2b399268300038939d65","timelockMinDelay":"13091","veOlasSaltString":"0xeb2a22b27c7ad5eee424fd90b376c745e60f914e8c4b6f56e64f24010eba714f","initialVotingDelay":"13091","initialVotingPeriod":"19636","initialProposalThreshold":"5000000000000000000000","quorum":"3","initSupply":"526500000000000000000000000","timelockSupply":"100000000000000000000000000","saleSupply":"292874580000000000000000000","valorySupply":"133625420000000000000000000","GnosisSafe":"0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552","GnosisSafeProxyFactory":"0xa6B71E26C5e0845f74c812102Ca7114b6a896AB2","MultiSendCallOnly":"0x40A2aCCbd92BCA938b02010E17A5b8929b49130D","deploymentFactory":"0x9338b5153AE39BB89f50468E608eD9d764B755fD","olasAddress":"0x0001A500A6B18995B03f44bb040A5fFc28E45CB0","timelockAddress":"0x3C1fF68f5aa342D296d4DEe4Bb1cACCA912D95fE","veOLASAddress":"0x7e01A500805f8A52Fad229b3015AD130A332B7b3","governorAddress":"0x34C895f302D0b5cf52ec0Edd3945321EB0f83dd5","buOLASAddress":"0xb09CcF0Dbf0C178806Aaee28956c74bd66d21f73","wveOLASAddress":"0x4039B809E0C0Ad04F6Fc880193366b251dDf4B40","governorTwoAddress":"0x8E84B5055492901988B831817e4Ace5275A3b401","treasuryAddress":"0xa0DA53447C0f6C4987964d8463da7e6628B30f82","guardCMAddress":"0x7bB7998b210cFfE10ca1e41f16341Abe53f76f3a","depositoryAddress":"0xfF8697d8d2998d6AA2e09B405795C6F4BEeB0C81","bridgedERC20Address":"0x06512E620A8317da51a73690A596Aca97287b31D","fxRootAddress":"0xfe5e5D361b2ad62c541bAb87C45a0B9B018389a2","childTokenAddress":"0x62309056c759c36879Cde93693E7903bF415E4Bc","checkpointManagerAddress":"0x86E4Dc95c7FBdBf52e33D563BbDB00823894C287","fxERC20RootTunnelAddress":"0x1737408def992AF04b29C8Ba4BBcD7397B08c930","fxERC20ChildTunnelAddress":"0x1fe74A08ac89300B102AdCd474C721AE8764E850","voteWeightingAddress":"0x95418b46d5566d3d1ea62c12aea91227e566c5c1"} \ No newline at end of file From 47e55ba9406eaf28c9fac4bb1b7d864d9988a30b Mon Sep 17 00:00:00 2001 From: Aleksandr Kuperman Date: Mon, 22 Jul 2024 11:47:26 +0100 Subject: [PATCH 3/4] chore: gitleaksignore --- .gitleaksignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitleaksignore b/.gitleaksignore index e34077c3..75e4d9b5 100644 --- a/.gitleaksignore +++ b/.gitleaksignore @@ -53,3 +53,5 @@ c91f775ec4afeb1737af25b8325201c090d48c23:scripts/deployment/globals_mainnet.json 52a1209b5f91ae48f0c44a0ca968f69a6461d6a8:scripts/proposals/proposal_04_CM_guard_goerli.js:generic-api-key:14 52a1209b5f91ae48f0c44a0ca968f69a6461d6a8:scripts/proposals/proposal_04_CM_guard_goerli.js:generic-api-key:18 fa17ac186753911eb9d2ae0a4ab59db5f7e8e563:scripts/deployment/bridges/solana/test/sepolia/timelock_set_upgrade_authority.js:generic-api-key:40 +3745c02b978469a88fd31ccaf0ab09fa91c41b19:scripts/deployment/globals_mainnet.json:generic-api-key:1 +3745c02b978469a88fd31ccaf0ab09fa91c41b19:scripts/deployment/globals_mainnet.json:generic-api-key:2 From 47fdabffff7094b84478f28e452a61cdf10449f3 Mon Sep 17 00:00:00 2001 From: Aleksandr Kuperman Date: Mon, 22 Jul 2024 12:00:39 +0100 Subject: [PATCH 4/4] chore: gitleaksignore --- .gitleaksignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitleaksignore b/.gitleaksignore index 75e4d9b5..1e0948a9 100644 --- a/.gitleaksignore +++ b/.gitleaksignore @@ -55,3 +55,5 @@ c91f775ec4afeb1737af25b8325201c090d48c23:scripts/deployment/globals_mainnet.json fa17ac186753911eb9d2ae0a4ab59db5f7e8e563:scripts/deployment/bridges/solana/test/sepolia/timelock_set_upgrade_authority.js:generic-api-key:40 3745c02b978469a88fd31ccaf0ab09fa91c41b19:scripts/deployment/globals_mainnet.json:generic-api-key:1 3745c02b978469a88fd31ccaf0ab09fa91c41b19:scripts/deployment/globals_mainnet.json:generic-api-key:2 +4c142e987f5f2528a567c57f6de0258e5007548c:scripts/deployment/globals_mainnet.json:generic-api-key:1 +4c142e987f5f2528a567c57f6de0258e5007548c:scripts/deployment/globals_mainnet.json:generic-api-key:2