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.

Sign up for GitHub

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

Deploy Arb-Sepolia - Remove Arb-Goerli #439

Merged
merged 4 commits into from
Dec 15, 2023
Merged

Deploy Arb-Sepolia - Remove Arb-Goerli #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e7764d
update configs for sepolia
codenamejason Dec 14, 2023
5fa3844
deploy arb-sepolia/remove goerli
codenamejason Dec 14, 2023
2f5fb4c
some cleanup/update for sepolia
codenamejason Dec 14, 2023
4c78526
remove unused config
codenamejason Dec 14, 2023
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
32 changes: 16 additions & 16 deletions .openzeppelin/arbitrum-goerli.json → .openzeppelin/unknown-421614.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
"manifestVersion": "3.2",
"admin": {
"address": "0x758b87af7fdB4783f848a1dDEa1F025dC48B9858",
"txHash": "0x9b9ce5caed01b0905473ced3aaaa6e4b5093c453866dd4b835849efbc9edbc78"
"txHash": "0xec8e0372c0f14b3794932dde9f3d9964fdaa541462734cdba52f49a9aacc8150"
},
"proxies": [
{
"address": "0x4AAcca72145e1dF2aeC137E1f3C5E3D75DB8b5f3",
"txHash": "0x125f95b4f24bea5f4cb2f9b25944fd1f7469a853c03665e0eb316bdd584f308d",
"txHash": "0x969679f626259c5e09b5e9f1e8b7ecad4c98f7ae60a452baef541b1656b75a60",
"kind": "transparent"
},
{
"address": "0x1133eA7Af70876e64665ecD07C0A0476d09465a1",
"txHash": "0xe4441c5d2979945326d17e472df30611fbf5ccb8e3f037617c16d4628a2c9af7",
"txHash": "0x67bc70f90351539484b84d70679f8e70f28966744a22727b60f4d4cffb9fdb9d",
"kind": "transparent"
}
],
"impls": {
"c8a36c32648ffb1ecf549d2c1c13794cf3d75c72b0d5df6665048ff25d70df3d": {
"62af8c1a762b45e4ea55fa439b7ab16bd58ecd45aebe6136de7eb0ba20db7d0a": {
"address": "0xA3Fd7042F83960398De6ceddbf513F8cac877cbE",
"txHash": "0xdde69c3a50e2035024fcb6040f3b1eb13d601d19bb3d60d79f74aae55201bc22",
"txHash": "0xf10eb03e1363ac8cd4cb023948e31bc9ca241f8e6de042e2fa51a17ae2dac97b",
"layout": {
"solcVersion": "0.8.19",
"storage": [
Expand Down Expand Up @@ -60,7 +60,7 @@
"label": "_roles",
"offset": 0,
"slot": "101",
"type": "t_mapping(t_bytes32,t_struct(RoleData)19425_storage)",
"type": "t_mapping(t_bytes32,t_struct(RoleData)21565_storage)",
"contract": "AccessControlUpgradeable",
"src": "lib/openzeppelin-contracts-upgradeable/contracts/access/AccessControlUpgradeable.sol:62"
},
Expand Down Expand Up @@ -134,15 +134,15 @@
"label": "mapping(bytes32 => struct IRegistry.Profile)",
"numberOfBytes": "32"
},
"t_mapping(t_bytes32,t_struct(RoleData)19425_storage)": {
"t_mapping(t_bytes32,t_struct(RoleData)21565_storage)": {
"label": "mapping(bytes32 => struct AccessControlUpgradeable.RoleData)",
"numberOfBytes": "32"
},
"t_string_storage": {
"label": "string",
"numberOfBytes": "32"
},
"t_struct(Metadata)3095_storage": {
"t_struct(Metadata)3098_storage": {
"label": "struct Metadata",
"members": [
{
Expand Down Expand Up @@ -183,7 +183,7 @@
},
{
"label": "metadata",
"type": "t_struct(Metadata)3095_storage",
"type": "t_struct(Metadata)3098_storage",
"offset": 0,
"slot": "3"
},
Expand All @@ -202,7 +202,7 @@
],
"numberOfBytes": "224"
},
"t_struct(RoleData)19425_storage": {
"t_struct(RoleData)21565_storage": {
"label": "struct AccessControlUpgradeable.RoleData",
"members": [
{
Expand Down Expand Up @@ -234,7 +234,7 @@
},
"6451c555e01f2d700e5782c78ee5ddb2ebbcc880b492e7b87ea2a6dd2f0b92b4": {
"address": "0xB087535DB0df98fC4327136e897A5985E5Cfbd66",
"txHash": "0x3959f42ab4bcccf13fbd55094bb14c8eadd5d5957d16ddaff6ec51aa01a00a06",
"txHash": "0x59279a32f00caeeee2ee9fffd68e6125e4e917010ec448ddcd93f1d8020d2910",
"layout": {
"solcVersion": "0.8.19",
"storage": [
Expand Down Expand Up @@ -275,7 +275,7 @@
"label": "_roles",
"offset": 0,
"slot": "101",
"type": "t_mapping(t_bytes32,t_struct(RoleData)19425_storage)",
"type": "t_mapping(t_bytes32,t_struct(RoleData)21565_storage)",
"contract": "AccessControlUpgradeable",
"src": "lib/openzeppelin-contracts-upgradeable/contracts/access/AccessControlUpgradeable.sol:62"
},
Expand Down Expand Up @@ -409,7 +409,7 @@
"label": "mapping(address => uint256)",
"numberOfBytes": "32"
},
"t_mapping(t_bytes32,t_struct(RoleData)19425_storage)": {
"t_mapping(t_bytes32,t_struct(RoleData)21565_storage)": {
"label": "mapping(bytes32 => struct AccessControlUpgradeable.RoleData)",
"numberOfBytes": "32"
},
Expand All @@ -421,7 +421,7 @@
"label": "string",
"numberOfBytes": "32"
},
"t_struct(Metadata)3095_storage": {
"t_struct(Metadata)3098_storage": {
"label": "struct Metadata",
"members": [
{
Expand Down Expand Up @@ -462,7 +462,7 @@
},
{
"label": "metadata",
"type": "t_struct(Metadata)3095_storage",
"type": "t_struct(Metadata)3098_storage",
"offset": 0,
"slot": "3"
},
Expand All @@ -481,7 +481,7 @@
],
"numberOfBytes": "224"
},
"t_struct(RoleData)19425_storage": {
"t_struct(RoleData)21565_storage": {
"label": "struct AccessControlUpgradeable.RoleData",
"members": [
{
Expand Down
2 changes: 1 addition & 1 deletion contracts/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
| Celo | 42220 |
| Celo Alfajores | 44787 |
| Arbitrum | 42161 |
| Arbitrum Goerli | 4216134 |
| Arbitrum Sepolia| 421614 |



Expand Down
4 changes: 2 additions & 2 deletions docs/DEPLOY_STEPS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ All the deploy scripts will expect network param to know which network the contr
| `sepolia` | `11155111` | Sepolia PoS Testnet |
| `base-testnet` | `84531` | Base Testnet |
| `polygon-mumbai` | `80001` | Polygon Mumbai Testnet |
| `arbitrum-goerli` | `421613` | Arbitrum Goerli Testnet |
| `arbitrum-sepolia`| `421614` | Arbitrum Sepolia Testnet |
| `celo-alfajores` | `44787` | Celo Alfajores Testnet |
| `optimism-goerli` | `420` | Optimism Goerli Testnet |
| `pgn-testnet` | `58008` | |
Expand All @@ -49,7 +49,7 @@ foundryup

1. Compile Contracts
```shell
bun compile
bun run build
```

1. Running Tests
Expand Down
29 changes: 15 additions & 14 deletions hardhat.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const chainIds = {
"fantom-testnet": 4002,
"pgn-sepolia": 58008,
"celo-testnet": 44787,
"arbitrum-goerli": 421613,
"arbitrum-sepolia": 421614,
"base-testnet": 84531,
mumbai: 80001,

Expand All @@ -51,7 +51,8 @@ if (!deployPrivateKey) {
const infuraIdKey = process.env.INFURA_RPC_ID as string;
const alchemyIdKey = process.env.ALCHEMY_RPC_ID as string;
const DEFENDER_TEAM_API_KEY = process.env.DEFENDER_TEAM_API_KEY as string;
const DEFENDER_TEAM_API_SECRET_KEY = process.env.DEFENDER_TEAM_API_SECRET_KEY as string;
const DEFENDER_TEAM_API_SECRET_KEY = process.env
.DEFENDER_TEAM_API_SECRET_KEY as string;

/**
* Reads the remappings.txt file and returns an array of arrays.
Expand Down Expand Up @@ -150,11 +151,11 @@ const config: HardhatUserConfig = {
},
"arbitrum-mainnet": createMainnetConfig(
"arbitrum-mainnet",
`https://arb-mainnet.g.alchemy.com/v2/${alchemyIdKey}`,
`https://arb-mainnet.g.alchemy.com/v2/${alchemyIdKey}`
),
"fantom-mainnet": createMainnetConfig(
"fantom-mainnet",
"https://rpc.ftm.tools",
"https://rpc.ftm.tools"
),
"pgn-mainnet": {
...createMainnetConfig("pgn-mainnet"),
Expand All @@ -178,19 +179,19 @@ const config: HardhatUserConfig = {
// Test Networks
goerli: createTestnetConfig(
"goerli",
`https://eth-goerli.g.alchemy.com/v2/${alchemyIdKey}`,
`https://eth-goerli.g.alchemy.com/v2/${alchemyIdKey}`
),
sepolia: createTestnetConfig(
"sepolia",
`https://eth-sepolia.g.alchemy.com/v2/${alchemyIdKey}`,
`https://eth-sepolia.g.alchemy.com/v2/${alchemyIdKey}`
),
"arbitrum-goerli": createTestnetConfig(
"arbitrum-goerli",
`https://arb-goerli.g.alchemy.com/v2/${alchemyIdKey}`,
"arbitrum-sepolia": createTestnetConfig(
"arbitrum-sepolia",
`https://arb-sepolia.g.alchemy.com/v2/${alchemyIdKey}`
),
ftmTestnet: createTestnetConfig(
"fantom-testnet",
"https://rpc.testnet.fantom.network/",
"https://rpc.testnet.fantom.network/"
),
"optimism-goerli": {
...createTestnetConfig("optimism-goerli"),
Expand Down Expand Up @@ -262,7 +263,7 @@ const config: HardhatUserConfig = {
// @ts-ignore
"arbitrum-mainnet": process.env.ARBITRUMSCAN_API_KEY,
// @ts-ignore
"arbitrum-goerli": process.env.ARBITRUMSCAN_API_KEY,
"arbitrum-sepolia": process.env.ARBITRUMSCAN_API_KEY,
},
customChains: [
{
Expand Down Expand Up @@ -338,10 +339,10 @@ const config: HardhatUserConfig = {
},
},
{
network: "arbitrum-goerli",
chainId: chainIds["arbitrum-goerli"],
network: "arbitrum-sepolia",
chainId: chainIds["arbitrum-sepolia"],
urls: {
apiURL: "https://api-goerli.arbiscan.io/api",
apiURL: "https://api-sepolia.arbiscan.io/api",
browserURL: "https://arbiscan.io",
},
},
Expand Down
18 changes: 18 additions & 0 deletions reports/deployment-logs/core/deploy.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,3 +161,21 @@
20231106_123515 - Deployment finished with 0 error(s)
20231106_123525 - Executing: bun hardhat run scripts/strategies/deployImpactStream.ts --no-compile --network celo-mainnet | tee ./reports/deployment-logs/strategies/deployImpactStream/celo-mainnet/20231106_123525/deploy-20231106_123525.log
20231106_123619 - Deployment finished with 0 error(s)
20231214_142629 - Executing: bun hardhat run scripts/core/deployRegistry.ts --no-compile --network arbitrum-sepolia | tee ./reports/deployment-logs/core/deployRegistry/arbitrum-sepolia/20231214_142629/deploy-20231214_142629.log
20231214_142827 - Deployment finished with 0 error(s)
20231214_142854 - Executing: bun hardhat run scripts/core/deployContractFactory.ts --no-compile --network arbitrum-sepolia | tee ./reports/deployment-logs/core/deployContractFactory/arbitrum-sepolia/20231214_142854/deploy-20231214_142854.log
20231214_143021 - Deployment finished with 0 error(s)
20231214_143055 - Executing: bun hardhat run scripts/core/deployAllo.ts --no-compile --network arbitrum-sepolia | tee ./reports/deployment-logs/core/deployAllo/arbitrum-sepolia/20231214_143055/deploy-20231214_143055.log
20231214_143340 - Deployment finished with 0 error(s)
20231214_143634 - Executing: bun hardhat run scripts/core/transferProxyAdminOwnership.ts --no-compile --network arbitrum-sepolia | tee ./reports/deployment-logs/core/transferProxyAdminOwnership/arbitrum-sepolia/20231214_143634/deploy-20231214_143634.log
20231214_143637 - Deployment finished with 0 error(s)
20231214_143646 - Executing: bun hardhat run scripts/strategies/deployDonationVotingMerkleDistributionDirect.ts --no-compile --network arbitrum-sepolia | tee ./reports/deployment-logs/strategies/deployDonationVotingMerkleDistributionDirect/arbitrum-sepolia/20231214_143646/deploy-20231214_143646.log
20231214_143734 - Deployment finished with 0 error(s)
20231214_143820 - Executing: bun hardhat run scripts/strategies/deployDonationVotingMerkleDistributionVault.ts --no-compile --network arbitrum-sepolia | tee ./reports/deployment-logs/strategies/deployDonationVotingMerkleDistributionVault/arbitrum-sepolia/20231214_143820/deploy-20231214_143820.log
20231214_143902 - Deployment finished with 0 error(s)
20231214_143957 - Executing: bun hardhat run scripts/strategies/deployRFPCommittee.ts --no-compile --network arbitrum-sepolia | tee ./reports/deployment-logs/strategies/deployRFPCommittee/arbitrum-sepolia/20231214_143957/deploy-20231214_143957.log
20231214_144046 - Deployment finished with 0 error(s)
20231214_144100 - Executing: bun hardhat run scripts/strategies/deployRFPSimple.ts --no-compile --network arbitrum-sepolia | tee ./reports/deployment-logs/strategies/deployRFPSimple/arbitrum-sepolia/20231214_144100/deploy-20231214_144100.log
20231214_144149 - Deployment finished with 0 error(s)
20231214_144933 - Executing: bun hardhat run scripts/strategies/deployQVSimple.ts --no-compile --network arbitrum-sepolia | tee ./reports/deployment-logs/strategies/deployQVSimple/arbitrum-sepolia/20231214_144933/deploy-20231214_144933.log
20231214_145020 - Deployment finished with 0 error(s)
63 changes: 63 additions & 0 deletions ...ployment-logs/core/deployAllo/arbitrum-sepolia/20231214_143055/deploy-20231214_143055.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
WARNING: You are currently using Node.js v21.1.0, which is not supported by Hardhat. This can lead to unexpected behavior. See https://hardhat.org/nodejs-versions



////////////////////////////////////////////////////
Deploys Allo.sol on arbitrum-sepolia
////////////////////////////////////////////////////

┌─────────────────┬──────────────────────────────────────────────┐
│ (index) │ Values │
├─────────────────┼──────────────────────────────────────────────┤
│ contract │ 'Deploy Allo.sol' │
│ chainId │ 421614 │
│ network │ 'arbitrum-sepolia' │
│ owner │ '0x8C180840fcBb90CE8464B4eCd12ab0f840c6647C' │
│ registry │ '0x4AAcca72145e1dF2aeC137E1f3C5E3D75DB8b5f3' │
│ treasury │ '0x8C180840fcBb90CE8464B4eCd12ab0f840c6647C' │
│ percentFee │ 0 │
│ baseFee │ 0 │
│ deployerAddress │ '0x8C180840fcBb90CE8464B4eCd12ab0f840c6647C' │
│ balance │ '2.9996047402' │
└─────────────────┴──────────────────────────────────────────────┘
Deploying Allo.sol...
Allo Proxy deployed to: 0x1133eA7Af70876e64665ecD07C0A0476d09465a1
Registry implementation deployed to: 0xB087535DB0df98fC4327136e897A5985E5Cfbd66
Proxy Admin: 0x758b87af7fdB4783f848a1dDEa1F025dC48B9858
Proxy Admin Owner: 0x8C180840fcBb90CE8464B4eCd12ab0f840c6647C

Verifying contract...
Verifying implementation: 0xB087535DB0df98fC4327136e897A5985E5Cfbd66
Successfully submitted source code for contract
contracts/core/Allo.sol:Allo at 0xB087535DB0df98fC4327136e897A5985E5Cfbd66
for verification on the block explorer. Waiting for verification result...

Successfully verified contract Allo on the block explorer.
https://arbiscan.io/address/0xB087535DB0df98fC4327136e897A5985E5Cfbd66#code
Verifying proxy: 0x1133eA7Af70876e64665ecD07C0A0476d09465a1
Contract at 0x1133eA7Af70876e64665ecD07C0A0476d09465a1 already verified.
Linking proxy 0x1133eA7Af70876e64665ecD07C0A0476d09465a1 with implementation
Successfully linked proxy to implementation.
Verifying proxy admin: 0x758b87af7fdB4783f848a1dDEa1F025dC48B9858
Contract at 0x758b87af7fdB4783f848a1dDEa1F025dC48B9858 already verified.

Proxy fully verified.

Verifying contract...
The contract 0xB087535DB0df98fC4327136e897A5985E5Cfbd66 has already been verified.
https://arbiscan.io/address/0xB087535DB0df98fC4327136e897A5985E5Cfbd66#code

Validating getRegistry() == 0x4AAcca72145e1dF2aeC137E1f3C5E3D75DB8b5f3
 ✅ PASSED with Result: 0x4AAcca72145e1dF2aeC137E1f3C5E3D75DB8b5f3

Validating getTreasury() == 0x8C180840fcBb90CE8464B4eCd12ab0f840c6647C
 ✅ PASSED with Result: 0x8C180840fcBb90CE8464B4eCd12ab0f840c6647C

Validating getPercentFee() == 0
 ✅ PASSED with Result: 0

Validating getBaseFee() == 0
 ✅ PASSED with Result: 0

Validating owner() == 0x8C180840fcBb90CE8464B4eCd12ab0f840c6647C
 ✅ PASSED with Result: 0x8C180840fcBb90CE8464B4eCd12ab0f840c6647C
30 changes: 30 additions & 0 deletions ...gs/core/deployContractFactory/arbitrum-sepolia/20231214_142854/deploy-20231214_142854.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
WARNING: You are currently using Node.js v21.1.0, which is not supported by Hardhat. This can lead to unexpected behavior. See https://hardhat.org/nodejs-versions



////////////////////////////////////////////////////
Deploys ContractFactory.sol on arbitrum-sepolia
////////////////////////////////////////////////////

┌─────────────────┬──────────────────────────────────────────────┐
│ (index) │ Values │
├─────────────────┼──────────────────────────────────────────────┤
│ contract │ 'Deploy ContractFactory.sol' │
│ chainId │ 421614 │
│ network │ 'arbitrum-sepolia' │
│ deployerAddress │ '0x8C180840fcBb90CE8464B4eCd12ab0f840c6647C' │
│ balance │ '2.9996402726' │
└─────────────────┴──────────────────────────────────────────────┘
Deploying ContractFactory.sol...
ContractFactory deployed to: 0xE195743480D1591B79106FF9B296A0cD38aDa807

Verifying contract...
Successfully submitted source code for contract
contracts/factory/ContractFactory.sol:ContractFactory at 0xE195743480D1591B79106FF9B296A0cD38aDa807
for verification on the block explorer. Waiting for verification result...

Successfully verified contract ContractFactory on the block explorer.
https://arbiscan.io/address/0xE195743480D1591B79106FF9B296A0cD38aDa807#code

Validating isDeployer(0x8C180840fcBb90CE8464B4eCd12ab0f840c6647C) == true
 ✅ PASSED with Result: true
Loading