From 49543b7f02d9543b4c744dc8b8153921cf178ad9 Mon Sep 17 00:00:00 2001 From: Uladzislau Hubar Date: Mon, 17 Jun 2024 17:45:00 +0200 Subject: [PATCH 1/6] Added Base Sepolia Dev/Test and Base Mainnet envs to the config, deployed test tokens on Base Sepolia --- deployments/base_sepolia_dev_contracts.json | 8 +++ deployments/base_sepolia_test_contracts.json | 8 +++ deployments/parameters.json | 76 ++++++++++---------- hardhat.config.ts | 23 ++++++ package.json | 6 +- 5 files changed, 80 insertions(+), 41 deletions(-) create mode 100644 deployments/base_sepolia_dev_contracts.json create mode 100644 deployments/base_sepolia_test_contracts.json diff --git a/deployments/base_sepolia_dev_contracts.json b/deployments/base_sepolia_dev_contracts.json new file mode 100644 index 00000000..5c31e157 --- /dev/null +++ b/deployments/base_sepolia_dev_contracts.json @@ -0,0 +1,8 @@ +{ + "contracts": { + "Token": { + "deployed": true, + "evmAddress": "0x4ead53ee0aaeB0bE5920DC2DAA7AD93F11cA5207" + } + } +} diff --git a/deployments/base_sepolia_test_contracts.json b/deployments/base_sepolia_test_contracts.json new file mode 100644 index 00000000..5b6460e6 --- /dev/null +++ b/deployments/base_sepolia_test_contracts.json @@ -0,0 +1,8 @@ +{ + "contracts": { + "Token": { + "deployed": true, + "evmAddress": "0x9b17032749aa066a2DeA40b746AA6aa09CdE67d9" + } + } +} diff --git a/deployments/parameters.json b/deployments/parameters.json index 5a086b85..eb4106fb 100644 --- a/deployments/parameters.json +++ b/deployments/parameters.json @@ -166,14 +166,14 @@ }, "devnet": { "overrides": { - "gnosis_chiado_dev": { + "otp_devnet": { "CommitManagerV1": { "reqs": [ { - "desiredValue": false, + "desiredValue": true, "getterArgs": [0], "setter": "setReq", - "setterArgs": [0, false] + "setterArgs": [0, true] }, { "desiredValue": false, @@ -198,10 +198,10 @@ "CommitManagerV1U1": { "reqs": [ { - "desiredValue": false, + "desiredValue": true, "getterArgs": [0], "setter": "setReq", - "setterArgs": [0, false] + "setterArgs": [0, true] }, { "desiredValue": false, @@ -210,10 +210,10 @@ "setterArgs": [1, false] }, { - "desiredValue": false, + "desiredValue": true, "getterArgs": [2], "setter": "setReq", - "setterArgs": [2, false] + "setterArgs": [2, true] }, { "desiredValue": false, @@ -240,10 +240,10 @@ "CommitManagerV1": { "reqs": [ { - "desiredValue": true, + "desiredValue": false, "getterArgs": [0], "setter": "setReq", - "setterArgs": [0, true] + "setterArgs": [0, false] }, { "desiredValue": false, @@ -268,10 +268,10 @@ "CommitManagerV1U1": { "reqs": [ { - "desiredValue": true, + "desiredValue": false, "getterArgs": [0], "setter": "setReq", - "setterArgs": [0, true] + "setterArgs": [0, false] }, { "desiredValue": false, @@ -280,10 +280,10 @@ "setterArgs": [1, false] }, { - "desiredValue": true, + "desiredValue": false, "getterArgs": [2], "setter": "setReq", - "setterArgs": [2, true] + "setterArgs": [2, false] }, { "desiredValue": false, @@ -404,13 +404,18 @@ "testnet": { "overrides": { "gnosis_chiado_test": { + "LinearSum": { + "w2": "50" + } + }, + "otp_testnet": { "CommitManagerV1": { "reqs": [ { - "desiredValue": false, + "desiredValue": true, "getterArgs": [0], "setter": "setReq", - "setterArgs": [0, false] + "setterArgs": [0, true] }, { "desiredValue": false, @@ -435,10 +440,10 @@ "CommitManagerV1U1": { "reqs": [ { - "desiredValue": false, + "desiredValue": true, "getterArgs": [0], "setter": "setReq", - "setterArgs": [0, false] + "setterArgs": [0, true] }, { "desiredValue": false, @@ -471,19 +476,16 @@ "setterArgs": [5, false] } ] - }, - "LinearSum": { - "w2": "50" } } }, "CommitManagerV1": { "reqs": [ { - "desiredValue": true, + "desiredValue": false, "getterArgs": [0], "setter": "setReq", - "setterArgs": [0, true] + "setterArgs": [0, false] }, { "desiredValue": false, @@ -508,10 +510,10 @@ "CommitManagerV1U1": { "reqs": [ { - "desiredValue": true, + "desiredValue": false, "getterArgs": [0], "setter": "setReq", - "setterArgs": [0, true] + "setterArgs": [0, false] }, { "desiredValue": false, @@ -644,19 +646,13 @@ "mainnet": { "overrides": { "otp_mainnet": { - "ParametersStorage": { - "stakeWithdrawalDelay": "300", - "updateCommitWindowDuration": "3600" - } - }, - "gnosis_mainnet": { "CommitManagerV1": { "reqs": [ { - "desiredValue": false, + "desiredValue": true, "getterArgs": [0], "setter": "setReq", - "setterArgs": [0, false] + "setterArgs": [0, true] }, { "desiredValue": false, @@ -681,10 +677,10 @@ "CommitManagerV1U1": { "reqs": [ { - "desiredValue": false, + "desiredValue": true, "getterArgs": [0], "setter": "setReq", - "setterArgs": [0, false] + "setterArgs": [0, true] }, { "desiredValue": false, @@ -717,16 +713,20 @@ "setterArgs": [5, false] } ] + }, + "ParametersStorage": { + "stakeWithdrawalDelay": "300", + "updateCommitWindowDuration": "3600" } } }, "CommitManagerV1": { "reqs": [ { - "desiredValue": true, + "desiredValue": false, "getterArgs": [0], "setter": "setReq", - "setterArgs": [0, true] + "setterArgs": [0, false] }, { "desiredValue": false, @@ -751,10 +751,10 @@ "CommitManagerV1U1": { "reqs": [ { - "desiredValue": true, + "desiredValue": false, "getterArgs": [0], "setter": "setReq", - "setterArgs": [0, true] + "setterArgs": [0, false] }, { "desiredValue": false, diff --git a/hardhat.config.ts b/hardhat.config.ts index a329ab0b..38b6e967 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -90,6 +90,29 @@ config.networks = { accounts: accounts('gnosis_mainnet'), saveDeployments: false, }, + base_sepolia_dev: { + environment: 'devnet', + chainId: 84532, + url: rpc('base_sepolia_dev'), + gasPrice: 1_000_000_000, + accounts: accounts('base_sepolia_dev'), + saveDeployments: false, + }, + base_sepolia_test: { + environment: 'testnet', + chainId: 84532, + url: rpc('base_sepolia_test'), + gasPrice: 1_000_000_000, + accounts: accounts('base_sepolia_test'), + saveDeployments: false, + }, + base_mainnet: { + environment: 'mainnet', + chainId: 8453, + url: rpc('base_mainnet'), + accounts: accounts('base_mainnet'), + saveDeployments: false, + }, }; config.typechain = { diff --git a/package.json b/package.json index edc49a57..03881917 100644 --- a/package.json +++ b/package.json @@ -81,15 +81,15 @@ "compile:size": "hardhat size-contracts", "compile": "hardhat compile --config hardhat.node.config.ts", "coverage": "cross-env COVERAGE_REPORT=true HARDHAT_DEPLOY_FIXTURE=true hardhat coverage --network hardhat --solcoverjs ./.solcover.js --temp artifacts --testfiles './test/**/*.test.ts'", - "deploy:v1:gnosis_chiado_dev": "hardhat deploy --network gnosis_chiado_dev --tags v1", - "deploy:v1:gnosis_chiado_test": "hardhat deploy --network gnosis_chiado_test --tags v1", - "deploy:v1:gnosis_mainnet": "hardhat deploy --network gnosis_mainnet --tags v1", "deploy:v1:localhost": "hardhat deploy --network hardhat --tags v1", "deploy:v1:otp_alphanet": "hardhat deploy --network otp_alphanet --tags v1", "deploy:v1:otp_devnet": "hardhat deploy --network otp_devnet --tags v1", "deploy:v1:otp_mainnet": "hardhat deploy --network otp_mainnet --tags v1", "deploy:v1:otp_testnet": "hardhat deploy --network otp_testnet --tags v1", "deploy:v1": "hardhat deploy --tags v1", + "deploy:v2:base_sepolia_dev": "hardhat deploy --network base_sepolia_dev --tags v1,v2", + "deploy:v2:base_sepolia_test": "hardhat deploy --network base_sepolia_test --tags v1,v2", + "deploy:v2:base_mainnet": "hardhat deploy --network base_mainnet --tags v1,v2", "deploy:v2:gnosis_chiado_dev": "hardhat deploy --network gnosis_chiado_dev --tags v1,v2", "deploy:v2:gnosis_chiado_test": "hardhat deploy --network gnosis_chiado_test --tags v1,v2", "deploy:v2:gnosis_mainnet": "hardhat deploy --network gnosis_mainnet --tags v1,v2", From 9d8fc7cc92fe9ee1e7e9cb815b98793eb1204908 Mon Sep 17 00:00:00 2001 From: Uladzislau Hubar Date: Wed, 19 Jun 2024 11:31:15 +0200 Subject: [PATCH 2/6] Deployed contracts on Base Sepolia for Devnet/Testnet envs --- contracts/v2/CommitManagerV1.sol | 4 +- contracts/v2/CommitManagerV1U1.sol | 4 +- deployments/base_mainnet_contracts.json | 0 deployments/base_sepolia_dev_contracts.json | 315 +++++++++++++++++++ deployments/base_sepolia_test_contracts.json | 315 +++++++++++++++++++ 5 files changed, 636 insertions(+), 2 deletions(-) create mode 100644 deployments/base_mainnet_contracts.json diff --git a/contracts/v2/CommitManagerV1.sol b/contracts/v2/CommitManagerV1.sol index 4d4bd8ad..00396322 100644 --- a/contracts/v2/CommitManagerV1.sol +++ b/contracts/v2/CommitManagerV1.sol @@ -51,7 +51,9 @@ contract CommitManagerV2 is Named, Versioned, ContractStatusV2, Initializable { constructor(address hubAddress) ContractStatusV2(hubAddress) {} function initialize() public onlyHubOwner { - log2pldsf = Log2PLDSF(hub.getContractAddress("Log2PLDSF")); + try hub.getContractAddress("Log2PLDSF") returns (address log2PLDSFAddress) { + log2pldsf = Log2PLDSF(log2PLDSFAddress); + } catch {} linearSum = LinearSum(hub.getContractAddress("LinearSum")); identityStorage = IdentityStorageV2(hub.getContractAddress("IdentityStorage")); parametersStorage = ParametersStorage(hub.getContractAddress("ParametersStorage")); diff --git a/contracts/v2/CommitManagerV1U1.sol b/contracts/v2/CommitManagerV1U1.sol index fd533844..ee884d7c 100644 --- a/contracts/v2/CommitManagerV1U1.sol +++ b/contracts/v2/CommitManagerV1U1.sol @@ -68,7 +68,9 @@ contract CommitManagerV2U1 is Named, Versioned, ContractStatusV2, Initializable constructor(address hubAddress) ContractStatusV2(hubAddress) {} function initialize() public onlyHubOwner { - log2pldsf = Log2PLDSF(hub.getContractAddress("Log2PLDSF")); + try hub.getContractAddress("Log2PLDSF") returns (address log2PLDSFAddress) { + log2pldsf = Log2PLDSF(log2PLDSFAddress); + } catch {} linearSum = LinearSum(hub.getContractAddress("LinearSum")); contentAssetStorage = ContentAssetStorageV2(hub.getAssetStorageAddress("ContentAssetStorage")); identityStorage = IdentityStorageV2(hub.getContractAddress("IdentityStorage")); diff --git a/deployments/base_mainnet_contracts.json b/deployments/base_mainnet_contracts.json new file mode 100644 index 00000000..e69de29b diff --git a/deployments/base_sepolia_dev_contracts.json b/deployments/base_sepolia_dev_contracts.json index 5c31e157..ad1fa6c9 100644 --- a/deployments/base_sepolia_dev_contracts.json +++ b/deployments/base_sepolia_dev_contracts.json @@ -3,6 +3,321 @@ "Token": { "deployed": true, "evmAddress": "0x4ead53ee0aaeB0bE5920DC2DAA7AD93F11cA5207" + }, + "Hub": { + "evmAddress": "0x6C861Cb69300C34DfeF674F7C00E734e840C29C0", + "version": "2.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509009, + "deploymentTimestamp": 1718786310217, + "deployed": true + }, + "HubController": { + "evmAddress": "0xB675eaB1D77FA5c904b0Ae8141eF8788b7a2afd2", + "version": "1.0.2", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509012, + "deploymentTimestamp": 1718786316270, + "deployed": true + }, + "ParametersStorage": { + "evmAddress": "0x5911140A8FF3903ffFb675516F5b17ddd8892c88", + "version": "1.1.1", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509018, + "deploymentTimestamp": 1718786328961, + "deployed": true + }, + "WhitelistStorage": { + "evmAddress": "0x114A8730b59f595A4062f2094bAA6a4D9B434487", + "version": "1.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509024, + "deploymentTimestamp": 1718786340029, + "deployed": true + }, + "HashingProxy": { + "evmAddress": "0x954e51CB8f2903C4880563b4E3888E7C51909fb0", + "version": "1.0.1", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509027, + "deploymentTimestamp": 1718786346311, + "deployed": true + }, + "SHA256": { + "evmAddress": "0x9dc20405e91DB4a5AdAa4A69F352DDDeABE26104", + "version": null, + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509030, + "deploymentTimestamp": 1718786352304, + "deployed": true + }, + "ScoringProxy": { + "evmAddress": "0xacBbc5f560c89086808E4900Ae96a6A416343a57", + "version": "2.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509033, + "deploymentTimestamp": 1718786358676, + "deployed": true + }, + "LinearSum": { + "evmAddress": "0xA9F9Eda473cc312d434Af04826Bb1d712902A877", + "version": null, + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509036, + "deploymentTimestamp": 1718786365159, + "deployed": true + }, + "AssertionStorage": { + "evmAddress": "0xFEA686bC23e644C6A482444A774cBE3f05F6BA96", + "version": "1.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509040, + "deploymentTimestamp": 1718786372919, + "deployed": true + }, + "IdentityStorage": { + "evmAddress": "0x95803028c8D7f82aAbFbD6442dc9806c2Ea329CC", + "version": "2.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509043, + "deploymentTimestamp": 1718786379236, + "deployed": true + }, + "ShardingTableStorage": { + "evmAddress": "0xF315aDEdd9D7f4F1677D311987a0ACf6692ff193", + "version": "2.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509047, + "deploymentTimestamp": 1718786385562, + "deployed": true + }, + "StakingStorage": { + "evmAddress": "0xfd43D22EB2764ff5cb3Bcf2Ab6F7befc84d5Cd9d", + "version": "1.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509050, + "deploymentTimestamp": 1718786392030, + "deployed": true + }, + "ProfileStorage": { + "evmAddress": "0x40ABdDf95e3fe2DD5E71aF2DffdA39542c9Da7F7", + "version": "1.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509053, + "deploymentTimestamp": 1718786398923, + "deployed": true + }, + "ServiceAgreementStorageV1": { + "evmAddress": "0x7f0bB8F2de271eF24Ba8F3FF39d5EaB89863C793", + "version": "1.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509057, + "deploymentTimestamp": 1718786405869, + "deployed": true + }, + "ServiceAgreementStorageV1U1": { + "evmAddress": "0xad4AbF7010CDA319Db9a964f406bDDe8e5E83264", + "version": "1.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509060, + "deploymentTimestamp": 1718786412557, + "deployed": true + }, + "ServiceAgreementStorageProxy": { + "evmAddress": "0x96dd87694fc4A2295AD0b904CD6bBaF6841a22EE", + "version": "1.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509063, + "deploymentTimestamp": 1718786418834, + "deployed": true + }, + "ContentAssetStorage": { + "evmAddress": "0xBe08A25dcF2B68af88501611e5456571f50327B4", + "version": "2.0.1", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509067, + "deploymentTimestamp": 1718786425292, + "deployed": true + }, + "UnfinalizedStateStorage": { + "evmAddress": "0x7934E41295Ada01A5BD318790400ddf65eCAB799", + "version": "1.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509070, + "deploymentTimestamp": 1718786431514, + "deployed": true + }, + "ParanetsRegistry": { + "evmAddress": "0xbCfe2f8c6f975d9CcaFb37BA7d605C49aACD8244", + "version": "2.1.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509073, + "deploymentTimestamp": 1718786437788, + "deployed": true + }, + "ParanetServicesRegistry": { + "evmAddress": "0x3A784AaCFB549c2E49FfB05e7151FA85a9519FDd", + "version": "2.1.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509076, + "deploymentTimestamp": 1718786444077, + "deployed": true + }, + "ParanetKnowledgeAssetsRegistry": { + "evmAddress": "0xAE20FD3FC2496ceD7462dac021cEE917607d210d", + "version": "2.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509079, + "deploymentTimestamp": 1718786450453, + "deployed": true + }, + "ParanetKnowledgeMinersRegistry": { + "evmAddress": "0x5aa636F7727eB4aeE5f5FFb52Ef549C86A7d7825", + "version": "2.0.1", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509082, + "deploymentTimestamp": 1718786456710, + "deployed": true + }, + "Assertion": { + "evmAddress": "0xea90bb22418cf9Ea696b76B5595a80313e76F923", + "version": "1.0.1", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509085, + "deploymentTimestamp": 1718786463053, + "deployed": true + }, + "Identity": { + "evmAddress": "0x23DbA4833F75dA530B9858d1ec8Bb43527613bB2", + "version": "1.1.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509089, + "deploymentTimestamp": 1718786469382, + "deployed": true + }, + "ShardingTable": { + "evmAddress": "0x6a5837c76c0F0b97872a3290B1b2cDc5A62d1521", + "version": "2.0.1", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509092, + "deploymentTimestamp": 1718786476034, + "deployed": true + }, + "NodeOperatorFeesStorage": { + "evmAddress": "0xcE1e7fd926Ff8344E5Bb0Ea6A038e8EF5fa3E056", + "version": "2.0.2", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509095, + "deploymentTimestamp": 1718786483011, + "deployed": true + }, + "Staking": { + "evmAddress": "0xd4847eF7c0BF7d223a33339DA4f4194DC1DC7f8c", + "version": "2.1.1", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509099, + "deploymentTimestamp": 1718786489842, + "deployed": true + }, + "Profile": { + "evmAddress": "0x2Ff4C4CAc001CBcC1893620Ef2a261071dB2498A", + "version": "1.2.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509102, + "deploymentTimestamp": 1718786496153, + "deployed": true + }, + "CommitManagerV1": { + "evmAddress": "0xa77dA735178c4f18F3C2A5f900e803c005241b18", + "version": "2.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510433, + "deploymentTimestamp": 1718789158349, + "deployed": true + }, + "CommitManagerV1U1": { + "evmAddress": "0x10c6351CcffE569D71Faa0F1C46C7eE25eA66f4a", + "version": "2.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510437, + "deploymentTimestamp": 1718789165893, + "deployed": true + }, + "ProofManagerV1": { + "evmAddress": "0x28EFFC5C07814EfB8cD3C511A1d370F73027a07D", + "version": "1.0.3", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509113, + "deploymentTimestamp": 1718786518115, + "deployed": true + }, + "ProofManagerV1U1": { + "evmAddress": "0x81f60E2894302bB1E6cBa5516eB7a7369A517385", + "version": "1.0.3", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509117, + "deploymentTimestamp": 1718786525468, + "deployed": true + }, + "ServiceAgreementV1": { + "evmAddress": "0x99311a8AEef36581720D50BfEbC7645a07761bA5", + "version": "1.1.1", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509120, + "deploymentTimestamp": 1718786532883, + "deployed": true + }, + "ContentAsset": { + "evmAddress": "0xe9Eb12Fef30762915caD2bBDD93Cc614a1134944", + "version": "2.1.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509124, + "deploymentTimestamp": 1718786539237, + "deployed": true + }, + "Paranet": { + "evmAddress": "0x9c0A7cE70D94dAFBA3d5fe15C84AD2e1013ED645", + "version": "2.1.3", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11509127, + "deploymentTimestamp": 1718786545806, + "deployed": true } } } diff --git a/deployments/base_sepolia_test_contracts.json b/deployments/base_sepolia_test_contracts.json index 5b6460e6..d460a92f 100644 --- a/deployments/base_sepolia_test_contracts.json +++ b/deployments/base_sepolia_test_contracts.json @@ -3,6 +3,321 @@ "Token": { "deployed": true, "evmAddress": "0x9b17032749aa066a2DeA40b746AA6aa09CdE67d9" + }, + "Hub": { + "evmAddress": "0x144eDa5cbf8926327cb2cceef168A121F0E4A299", + "version": "2.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510449, + "deploymentTimestamp": 1718789190774, + "deployed": true + }, + "HubController": { + "evmAddress": "0xeD19e9E1bBd5ffAe09C40d2e8873B1c6b1F0eaF4", + "version": "1.0.2", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510452, + "deploymentTimestamp": 1718789196801, + "deployed": true + }, + "ParametersStorage": { + "evmAddress": "0x6684c0B2b09eBDc3417649bCAd09e68A86a6377a", + "version": "1.1.1", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510459, + "deploymentTimestamp": 1718789209558, + "deployed": true + }, + "WhitelistStorage": { + "evmAddress": "0xC7B142dE4CfdE7CFDb181cf83A009A93be6CC211", + "version": "1.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510464, + "deploymentTimestamp": 1718789220718, + "deployed": true + }, + "HashingProxy": { + "evmAddress": "0xB5Ef1A9137e0466EA4a5C9A4ae52DB9a05568134", + "version": "1.0.1", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510467, + "deploymentTimestamp": 1718789226970, + "deployed": true + }, + "SHA256": { + "evmAddress": "0xD508F02487970FB4e9d756A8845475a43B85a2f4", + "version": null, + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510470, + "deploymentTimestamp": 1718789232946, + "deployed": true + }, + "ScoringProxy": { + "evmAddress": "0x5403133B5B29F102E6d27130625E470687e6fa43", + "version": "2.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510474, + "deploymentTimestamp": 1718789239295, + "deployed": true + }, + "LinearSum": { + "evmAddress": "0x288afa63B03Eb952e214a40623a718E0744aDbd6", + "version": null, + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510477, + "deploymentTimestamp": 1718789245705, + "deployed": true + }, + "AssertionStorage": { + "evmAddress": "0x90C73C8F6f03576b9277D59F47F6559beA72B5ed", + "version": "1.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510480, + "deploymentTimestamp": 1718789253751, + "deployed": true + }, + "IdentityStorage": { + "evmAddress": "0x42Da9B93e2B31077365E7FF324f52093e99de55d", + "version": "2.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510484, + "deploymentTimestamp": 1718789260267, + "deployed": true + }, + "ShardingTableStorage": { + "evmAddress": "0x9D34Af88a67369b93A66E0588f54bafA21Bbc733", + "version": "2.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510487, + "deploymentTimestamp": 1718789266607, + "deployed": true + }, + "StakingStorage": { + "evmAddress": "0xbFB9e8164440562A7b297ab68418e4Dde28adD3F", + "version": "1.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510490, + "deploymentTimestamp": 1718789272911, + "deployed": true + }, + "ProfileStorage": { + "evmAddress": "0x2705782F7C247870b24517A511C648b58C448Ed8", + "version": "1.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510494, + "deploymentTimestamp": 1718789279171, + "deployed": true + }, + "ServiceAgreementStorageV1": { + "evmAddress": "0xA9a0f14c4d48204148e551D0788013Ac063f6b29", + "version": "1.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510497, + "deploymentTimestamp": 1718789285490, + "deployed": true + }, + "ServiceAgreementStorageV1U1": { + "evmAddress": "0x8466cDF2F87b3442C04c3ba0C37cf9E90e1F7Ddc", + "version": "1.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510500, + "deploymentTimestamp": 1718789291701, + "deployed": true + }, + "ServiceAgreementStorageProxy": { + "evmAddress": "0x912E7200266c1132f1fa26a912e5d5eCd8117De8", + "version": "1.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510503, + "deploymentTimestamp": 1718789298072, + "deployed": true + }, + "ContentAssetStorage": { + "evmAddress": "0x9e3071Dc0730CB6dd0ce42969396D716Ea33E7e1", + "version": "2.0.1", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510506, + "deploymentTimestamp": 1718789304402, + "deployed": true + }, + "UnfinalizedStateStorage": { + "evmAddress": "0x9DD432f676b0E79D41F95c18f2ec6eAe255cD7Da", + "version": "1.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510509, + "deploymentTimestamp": 1718789310978, + "deployed": true + }, + "ParanetsRegistry": { + "evmAddress": "0x8268d80Beb76A4566764B2679b99B6fE5eF0afB6", + "version": "2.1.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510513, + "deploymentTimestamp": 1718789318100, + "deployed": true + }, + "ParanetServicesRegistry": { + "evmAddress": "0x6C0cCC8ADa325F9CB98a53df50F80aBB43bb4B5d", + "version": "2.1.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510516, + "deploymentTimestamp": 1718789324569, + "deployed": true + }, + "ParanetKnowledgeAssetsRegistry": { + "evmAddress": "0x7E5BC33148f13f26e4AAEe947cEFb9Ba516f4A6F", + "version": "2.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510519, + "deploymentTimestamp": 1718789330860, + "deployed": true + }, + "ParanetKnowledgeMinersRegistry": { + "evmAddress": "0x9B923C74A928E2f98e4EAE8F614449067EC4C2Ae", + "version": "2.0.1", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510523, + "deploymentTimestamp": 1718789337119, + "deployed": true + }, + "Assertion": { + "evmAddress": "0x6ee356CB1aF85CA6D49b9C8A769c78542795790A", + "version": "1.0.1", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510525, + "deploymentTimestamp": 1718789343453, + "deployed": true + }, + "Identity": { + "evmAddress": "0x79Fe6392892bE72106DB555e136E9f9717D55A59", + "version": "1.1.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510529, + "deploymentTimestamp": 1718789350080, + "deployed": true + }, + "ShardingTable": { + "evmAddress": "0x6cAe059E31a02759e1A3210E9644828C7973478A", + "version": "2.0.1", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510532, + "deploymentTimestamp": 1718789356852, + "deployed": true + }, + "NodeOperatorFeesStorage": { + "evmAddress": "0x47522F86067C85Fb0a7e2ABFDe0154973EE652fB", + "version": "2.0.2", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510536, + "deploymentTimestamp": 1718789363934, + "deployed": true + }, + "Staking": { + "evmAddress": "0x6d206b6834fE82811C3c659e7a6A6deeB076fe0B", + "version": "2.1.1", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510539, + "deploymentTimestamp": 1718789370362, + "deployed": true + }, + "Profile": { + "evmAddress": "0x9f30f197eD4B2BB3fE140452E7518A52BF1Ed738", + "version": "1.2.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510542, + "deploymentTimestamp": 1718789376823, + "deployed": true + }, + "CommitManagerV1": { + "evmAddress": "0x98367A2a147b173b7Aae9d41a17167cd62bc8b81", + "version": "2.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510546, + "deploymentTimestamp": 1718789383500, + "deployed": true + }, + "CommitManagerV1U1": { + "evmAddress": "0x630A19886E9A426c732E8bce4580378C58Fa7e19", + "version": "2.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510550, + "deploymentTimestamp": 1718789391124, + "deployed": true + }, + "ProofManagerV1": { + "evmAddress": "0xD357eE1069135C04C60fd60165076717d6FB84cd", + "version": "1.0.3", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510553, + "deploymentTimestamp": 1718789398998, + "deployed": true + }, + "ProofManagerV1U1": { + "evmAddress": "0xcDDdcbFb24BC82762D48b2D1523eb9A98C0867e1", + "version": "1.0.3", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510557, + "deploymentTimestamp": 1718789406477, + "deployed": true + }, + "ServiceAgreementV1": { + "evmAddress": "0x9a6C2479320DeaE5D89db893F3E18D8A731781b5", + "version": "1.1.1", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510561, + "deploymentTimestamp": 1718789413895, + "deployed": true + }, + "ContentAsset": { + "evmAddress": "0xA02DB908723f4306c1FF2eD4984192325785ad0D", + "version": "2.1.0", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510564, + "deploymentTimestamp": 1718789420271, + "deployed": true + }, + "Paranet": { + "evmAddress": "0x994E07810bD8a312531D00E7B0E733517C571bCa", + "version": "2.1.3", + "gitBranch": "feature/base", + "gitCommitHash": "49543b7f02d9543b4c744dc8b8153921cf178ad9", + "deploymentBlock": 11510567, + "deploymentTimestamp": 1718789426637, + "deployed": true } } } From 5367df7adae30f6ef29acda33c88e46b35b01168 Mon Sep 17 00:00:00 2001 From: Uladzislau Hubar Date: Wed, 19 Jun 2024 11:38:03 +0200 Subject: [PATCH 3/6] Added TRAC address on Base Mainnet --- deployments/base_mainnet_contracts.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/deployments/base_mainnet_contracts.json b/deployments/base_mainnet_contracts.json index e69de29b..a0565a86 100644 --- a/deployments/base_mainnet_contracts.json +++ b/deployments/base_mainnet_contracts.json @@ -0,0 +1,8 @@ +{ + "contracts": { + "Token": { + "deployed": true, + "evmAddress": "0xa81a52b4dda010896cdd386c7fbdc5cdc835ba23" + } + } +} From d3eab3d1a0fde48db522b16b49654558eed07dc3 Mon Sep 17 00:00:00 2001 From: Uladzislau Hubar Date: Mon, 24 Jun 2024 11:28:32 +0200 Subject: [PATCH 4/6] Set R2 to 15 on Base Sepolia Dev --- deployments/parameters.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/deployments/parameters.json b/deployments/parameters.json index 024febeb..49559093 100644 --- a/deployments/parameters.json +++ b/deployments/parameters.json @@ -235,6 +235,11 @@ } ] } + }, + "base_sepolia_dev": { + "ParametersStorage": { + "r2": 15 + } } }, "CommitManagerV1": { From e44e82f24a33c6e25d09301ca38c454a52252179 Mon Sep 17 00:00:00 2001 From: Uladzislau Hubar Date: Wed, 26 Jun 2024 16:11:05 +0200 Subject: [PATCH 5/6] Deployed contract on Base Mainnet --- deployments/base_mainnet_contracts.json | 315 ++++++++++++++++++++++++ 1 file changed, 315 insertions(+) diff --git a/deployments/base_mainnet_contracts.json b/deployments/base_mainnet_contracts.json index a0565a86..9ae96b83 100644 --- a/deployments/base_mainnet_contracts.json +++ b/deployments/base_mainnet_contracts.json @@ -3,6 +3,321 @@ "Token": { "deployed": true, "evmAddress": "0xa81a52b4dda010896cdd386c7fbdc5cdc835ba23" + }, + "Hub": { + "evmAddress": "0xaBfcf2ad1718828E7D3ec20435b0d0b5EAfbDf2c", + "version": "2.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310628, + "deploymentTimestamp": 1719410606574, + "deployed": true + }, + "HubController": { + "evmAddress": "0x6b9cfFB2CB5b8835880Ab455329E7ca2a0989d17", + "version": "1.0.2", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310631, + "deploymentTimestamp": 1719410613045, + "deployed": true + }, + "ParametersStorage": { + "evmAddress": "0x3c556Ae354bDcE25537661169206B2099DA588E2", + "version": "1.1.1", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310638, + "deploymentTimestamp": 1719410626851, + "deployed": true + }, + "WhitelistStorage": { + "evmAddress": "0x5975BA918a9F686D8a30B21cC5214909B86A45d4", + "version": "1.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310643, + "deploymentTimestamp": 1719410638633, + "deployed": true + }, + "HashingProxy": { + "evmAddress": "0x9c86fAdDf5FF1c3b3c831ad84ddc2F1758C46671", + "version": "1.0.1", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310647, + "deploymentTimestamp": 1719410646218, + "deployed": true + }, + "SHA256": { + "evmAddress": "0xBF6d121c60160326a009998d3BBB7F0603E5563e", + "version": null, + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310651, + "deploymentTimestamp": 1719410653950, + "deployed": true + }, + "ScoringProxy": { + "evmAddress": "0x030cA97435fb416fa0531EB28c7a24CA08ecAEcD", + "version": "2.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310655, + "deploymentTimestamp": 1719410660590, + "deployed": true + }, + "LinearSum": { + "evmAddress": "0x4a6ee029c21840BdE7Cdb08fbC0cda5058E515C3", + "version": null, + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310658, + "deploymentTimestamp": 1719410667086, + "deployed": true + }, + "AssertionStorage": { + "evmAddress": "0x77aAEDb38Fb9fBba8C86232Fc3F9193e602b0B79", + "version": "1.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310662, + "deploymentTimestamp": 1719410674934, + "deployed": true + }, + "IdentityStorage": { + "evmAddress": "0xD40c74f5D1Ee382deb63Fa92d7ff5bC65415bBEE", + "version": "2.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310665, + "deploymentTimestamp": 1719410681735, + "deployed": true + }, + "ShardingTableStorage": { + "evmAddress": "0x61FFE2Ed44A2bbd9E225DB8ecA09E9480899a166", + "version": "2.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310669, + "deploymentTimestamp": 1719410688588, + "deployed": true + }, + "StakingStorage": { + "evmAddress": "0x56ff4982Be0703456Dcc232fbA5ED90C68952BDe", + "version": "1.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310672, + "deploymentTimestamp": 1719410695509, + "deployed": true + }, + "ProfileStorage": { + "evmAddress": "0xC07a4a352de680788497aF20f7D66964D08E31D2", + "version": "1.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310676, + "deploymentTimestamp": 1719410702392, + "deployed": true + }, + "ServiceAgreementStorageV1": { + "evmAddress": "0x855e7bb3cC680B231f50A24257BCf5b920a9Bf76", + "version": "1.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310679, + "deploymentTimestamp": 1719410709319, + "deployed": true + }, + "ServiceAgreementStorageV1U1": { + "evmAddress": "0xebB3C4f89e59Bd905dBF2967B1833fB2c0Ff6c74", + "version": "1.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310682, + "deploymentTimestamp": 1719410716133, + "deployed": true + }, + "ServiceAgreementStorageProxy": { + "evmAddress": "0x015547c73AF2D581A39C47959EF57E74E7e2f7B9", + "version": "1.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310686, + "deploymentTimestamp": 1719410728068, + "deployed": true + }, + "ContentAssetStorage": { + "evmAddress": "0x3bdfA81079B2bA53a25a6641608E5E1E6c464597", + "version": "2.0.1", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310692, + "deploymentTimestamp": 1719410735086, + "deployed": true + }, + "UnfinalizedStateStorage": { + "evmAddress": "0xca5c9A170d4acC694F7730f1Bb841553278fF24B", + "version": "1.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310695, + "deploymentTimestamp": 1719410741786, + "deployed": true + }, + "ParanetsRegistry": { + "evmAddress": "0x4382835340c91811800a54B4e3Af2878c7968A24", + "version": "2.1.0", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310699, + "deploymentTimestamp": 1719410748480, + "deployed": true + }, + "ParanetServicesRegistry": { + "evmAddress": "0x3f3AD359f79B8987Ac0f642e309B2c195D458199", + "version": "2.1.0", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310702, + "deploymentTimestamp": 1719410755220, + "deployed": true + }, + "ParanetKnowledgeAssetsRegistry": { + "evmAddress": "0xA85cb8367dca370F2E26b28E3597c67427F37ee3", + "version": "2.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310705, + "deploymentTimestamp": 1719410761987, + "deployed": true + }, + "ParanetKnowledgeMinersRegistry": { + "evmAddress": "0xB0b91AD1E1f6646Ee503D7750552A656e12eAE04", + "version": "2.0.1", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310709, + "deploymentTimestamp": 1719410768720, + "deployed": true + }, + "Assertion": { + "evmAddress": "0xD3cb63419506df9F5bddA800B136dBCA75B2dD59", + "version": "1.0.1", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310712, + "deploymentTimestamp": 1719410775477, + "deployed": true + }, + "Identity": { + "evmAddress": "0x14DFd7E7D324677aB7749Bc532f04358B53877fc", + "version": "1.1.0", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310716, + "deploymentTimestamp": 1719410782268, + "deployed": true + }, + "ShardingTable": { + "evmAddress": "0x71DD0069EFd6bfaB5B8b3988dCC114F4C6b7A274", + "version": "2.0.1", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310719, + "deploymentTimestamp": 1719410789276, + "deployed": true + }, + "NodeOperatorFeesStorage": { + "evmAddress": "0x5bE77Ee0FF0FA692d12898ad7B7582BcA6a1A97b", + "version": "2.0.2", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310723, + "deploymentTimestamp": 1719410796546, + "deployed": true + }, + "Staking": { + "evmAddress": "0x174FD3a9dbC2562F2360C9797d7dbF21f3bD6824", + "version": "2.1.1", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310726, + "deploymentTimestamp": 1719410803582, + "deployed": true + }, + "Profile": { + "evmAddress": "0x41F7274fC5981eb7001dDE2A97Efa9CEcC9b1a01", + "version": "1.2.0", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310730, + "deploymentTimestamp": 1719410810611, + "deployed": true + }, + "CommitManagerV1": { + "evmAddress": "0xCAFF55d5a22C0b58452420f642ef22a8c5DB4500", + "version": "2.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310733, + "deploymentTimestamp": 1719410817652, + "deployed": true + }, + "CommitManagerV1U1": { + "evmAddress": "0x411d7ddF4164f8bD57f2462d86bA3C1d55005144", + "version": "2.0.0", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310737, + "deploymentTimestamp": 1719410825678, + "deployed": true + }, + "ProofManagerV1": { + "evmAddress": "0x53d5337d63f404D60df0D019cb1D834d1Ee179D6", + "version": "1.0.3", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310741, + "deploymentTimestamp": 1719410834106, + "deployed": true + }, + "ProofManagerV1U1": { + "evmAddress": "0xdF1fdDEa77D33068eA0CBAA0d4A220c9Ba848C75", + "version": "1.0.3", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310745, + "deploymentTimestamp": 1719410841930, + "deployed": true + }, + "ServiceAgreementV1": { + "evmAddress": "0xfbAa8010Bb9cD37f86a2c2D9589cD9ead62355f4", + "version": "1.1.1", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310749, + "deploymentTimestamp": 1719410849698, + "deployed": true + }, + "ContentAsset": { + "evmAddress": "0xFAC3F90a2b3719bF39058a98b6cc58Aabddc611a", + "version": "2.1.0", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310753, + "deploymentTimestamp": 1719410856427, + "deployed": true + }, + "Paranet": { + "evmAddress": "0x78b4173d25e30C0B52A855FE522EF2B3FB95c8C7", + "version": "2.1.3", + "gitBranch": "feature/base", + "gitCommitHash": "d3eab3d1a0fde48db522b16b49654558eed07dc3", + "deploymentBlock": 16310756, + "deploymentTimestamp": 1719410863148, + "deployed": true } } } From 05b7da7f30cfcdb9668b6eccbfa12f838e1a3094 Mon Sep 17 00:00:00 2001 From: Uladzislau Hubar Date: Wed, 26 Jun 2024 16:11:51 +0200 Subject: [PATCH 6/6] Added check if voters are registered while calculating voter reward in the Incentives Pool contract --- contracts/v2/paranets/ParanetNeuroIncentivesPool.sol | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contracts/v2/paranets/ParanetNeuroIncentivesPool.sol b/contracts/v2/paranets/ParanetNeuroIncentivesPool.sol index 81b8ed36..de332580 100644 --- a/contracts/v2/paranets/ParanetNeuroIncentivesPool.sol +++ b/contracts/v2/paranets/ParanetNeuroIncentivesPool.sol @@ -27,7 +27,7 @@ contract ParanetNeuroIncentivesPool is Named, Versioned { event ParanetIncentivizationProposalVoterRewardClaimed(address indexed voter, uint256 amount); string private constant _NAME = "ParanetNeuroIncentivesPool"; - string private constant _VERSION = "2.1.2"; + string private constant _VERSION = "2.1.3"; HubV2 public hub; ParanetsRegistry public paranetsRegistry; @@ -518,6 +518,10 @@ contract ParanetNeuroIncentivesPool is Named, Versioned { } function getClaimableProposalVoterRewardAmount() public view returns (uint256) { + if (voters.length == 0 || voters[votersIndexes[msg.sender]].addr != msg.sender) { + return 0; + } + uint256 neuroReward = getTotalProposalVoterIncentiveEstimation(); uint256 voterRewardLimit = ((((address(this).balance +