Separated CommitManagerV2/V2U1, reworked deployment scripts, updated …

…Staking parameters, added parameters for new Commit Managers
OriginTrail · Jan 26, 2024 · add3d33 · add3d33
1 parent 2d932a7
commit add3d33
Show file tree

Hide file tree

Showing 11 changed files with 302 additions and 52 deletions.
diff --git a/contracts/v1/storage/ParametersStorage.sol b/contracts/v1/storage/ParametersStorage.sol
@@ -42,7 +42,7 @@ contract ParametersStorage is Named, Versioned, HubDependent {
         // minimumStake
         args3[0] = 50_000 ether;
         // maximumStake
-        args3[1] = 5_000_000 ether;
+        args3[1] = 2_000_000 ether;
 
         r2 = 20;
         // r1
@@ -64,9 +64,9 @@ contract ParametersStorage is Named, Versioned, HubDependent {
         epochLength = 90 days;
 
         // stakeWithdrawalDelay
-        args4[0] = 5 minutes;
+        args4[0] = 28 days;
         // rewardWithdrawalDelay
-        args4[1] = 5 minutes;
+        args4[1] = 28 days;
         // slashingFreezeDuration
         args2[2] = 730 days;
 

diff --git a/contracts/v2/CommitManagerV1.sol → contracts/v2/CommitManagerV2.sol b/contracts/v2/CommitManagerV1.sol → contracts/v2/CommitManagerV2.sol
diff --git a/contracts/v2/CommitManagerV1U1.sol → contracts/v2/CommitManagerV2U1.sol b/contracts/v2/CommitManagerV1U1.sol → contracts/v2/CommitManagerV2U1.sol
diff --git a/deploy/032_deploy_commit_manager_v1.ts → deploy/031_deploy_commit_manager_v1.ts b/deploy/032_deploy_commit_manager_v1.ts → deploy/031_deploy_commit_manager_v1.ts
@@ -2,11 +2,7 @@ import { DeployFunction } from 'hardhat-deploy/types';
 import { HardhatRuntimeEnvironment } from 'hardhat/types';
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
-  if (
-    hre.helpers.isDeployed('CommitManagerV1') &&
-    (hre.helpers.contractDeployments.contracts['CommitManagerV1'].version === undefined ||
-      hre.helpers.contractDeployments.contracts['CommitManagerV1'].version?.startsWith('2.'))
-  ) {
+  if (hre.helpers.isDeployed('CommitManagerV2')) {
     return;
   }
 

diff --git a/deploy/034_deploy_commit_manager_v1_u1.ts → deploy/032_deploy_commit_manager_v1_u1.ts b/deploy/034_deploy_commit_manager_v1_u1.ts → deploy/032_deploy_commit_manager_v1_u1.ts
@@ -2,11 +2,7 @@ import { DeployFunction } from 'hardhat-deploy/types';
 import { HardhatRuntimeEnvironment } from 'hardhat/types';
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
-  if (
-    hre.helpers.isDeployed('CommitManagerV1U1') &&
-    (hre.helpers.contractDeployments.contracts['CommitManagerV1U1'].version === undefined ||
-      hre.helpers.contractDeployments.contracts['CommitManagerV1U1'].version?.startsWith('2.'))
-  ) {
+  if (hre.helpers.isDeployed('CommitManagerV2U1')) {
     return;
   }
 

diff --git a/deploy/031_deploy_commit_manager_v2.ts → deploy/033_deploy_commit_manager_v2.ts b/deploy/031_deploy_commit_manager_v2.ts → deploy/033_deploy_commit_manager_v2.ts
@@ -2,22 +2,13 @@ import { DeployFunction } from 'hardhat-deploy/types';
 import { HardhatRuntimeEnvironment } from 'hardhat/types';
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
-  if (
-    hre.helpers.isDeployed('CommitManagerV1') &&
-    (hre.helpers.contractDeployments.contracts['CommitManagerV1'].version === undefined ||
-      hre.helpers.contractDeployments.contracts['CommitManagerV1'].version?.startsWith('1.'))
-  ) {
-    return;
-  }
-
   console.log('Deploying CommitManager V2...');
 
-  const CommitManagerV1 = await hre.helpers.deploy({
+  const CommitManagerV2 = await hre.helpers.deploy({
     newContractName: 'CommitManagerV2',
-    newContractNameInHub: 'CommitManagerV1',
   });
 
-  await hre.helpers.updateContractParameters('CommitManagerV1', CommitManagerV1);
+  await hre.helpers.updateContractParameters('CommitManagerV2', CommitManagerV2);
 };
 
 export default func;

diff --git a/deploy/033_deploy_commit_manager_v2_u1.ts → deploy/034_deploy_commit_manager_v2_u1.ts b/deploy/033_deploy_commit_manager_v2_u1.ts → deploy/034_deploy_commit_manager_v2_u1.ts
@@ -2,22 +2,13 @@ import { DeployFunction } from 'hardhat-deploy/types';
 import { HardhatRuntimeEnvironment } from 'hardhat/types';
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
-  if (
-    hre.helpers.isDeployed('CommitManagerV1U1') &&
-    (hre.helpers.contractDeployments.contracts['CommitManagerV1U1'].version === undefined ||
-      hre.helpers.contractDeployments.contracts['CommitManagerV1U1'].version?.startsWith('1.'))
-  ) {
-    return;
-  }
-
   console.log('Deploying CommitManager V2U1...');
 
-  const CommitManagerV1U1 = await hre.helpers.deploy({
+  const CommitManagerV2U1 = await hre.helpers.deploy({
     newContractName: 'CommitManagerV2U1',
-    newContractNameInHub: 'CommitManagerV1U1',
   });
 
-  await hre.helpers.updateContractParameters('CommitManagerV1U1', CommitManagerV1U1);
+  await hre.helpers.updateContractParameters('CommitManagerV2U1', CommitManagerV2U1);
 };
 
 export default func;