New staking - part 1 and 2 - SWIP-19 and 20 combined (#252)

ethersphere · Aug 26, 2024 · 1728975 · 1728975
1 parent f81aea4
commit 1728975
Show file tree

Hide file tree

Showing 18 changed files with 1,702 additions and 1,087 deletions.
diff --git a/deploy/local/003_deploy_staking.ts b/deploy/local/003_deploy_staking.ts
@@ -7,8 +7,9 @@ const func: DeployFunction = async function ({ deployments, getNamedAccounts, ne
   const swarmNetworkID = networkConfig[network.name]?.swarmNetworkId;
 
   const token = await get('TestToken');
+  const oracleAddress = (await get('PriceOracle')).address;
 
-  const args = [token.address, swarmNetworkID];
+  const args = [token.address, swarmNetworkID, oracleAddress];
   await deploy('StakeRegistry', {
     from: deployer,
     args: args,

diff --git a/deploy/main/003_deploy_staking.ts b/deploy/main/003_deploy_staking.ts
@@ -6,13 +6,15 @@ const func: DeployFunction = async function ({ deployments, getNamedAccounts, ne
   const { deployer } = await getNamedAccounts();
   const swarmNetworkID = networkConfig[network.name]?.swarmNetworkId;
   const token = await get('Token');
-  let staking = null;
+  const oracleAddress = (await get('PriceOracle')).address;
 
-  // We use legacy token that was migrated, until we deploy new one with this framework
-  if (!(staking = await get('StakeRegistry'))) {
-  } else {
-    log('Using already deployed Staking at', staking.address);
-  }
+  const args = [token.address, swarmNetworkID, oracleAddress];
+  await deploy('StakeRegistry', {
+    from: deployer,
+    args: args,
+    log: true,
+    waitConfirmations: networkConfig[network.name]?.blockConfirmations || 6,
+  });
 
   log('----------------------------------------------------');
 };

diff --git a/deploy/main/010_deploy_verify.ts b/deploy/main/010_deploy_verify.ts
@@ -27,7 +27,7 @@ const func: DeployFunction = async function ({ deployments, network }) {
 
     // Verify staking
     const staking = await get('StakeRegistry');
-    const argStaking = [token.address, swarmNetworkID];
+    const argStaking = [token.address, swarmNetworkID, priceOracle.address];
 
     log('Verifying...');
     await verify(staking.address, argStaking);

diff --git a/deploy/test/003_deploy_staking.ts b/deploy/test/003_deploy_staking.ts
@@ -6,8 +6,9 @@ const func: DeployFunction = async function ({ deployments, getNamedAccounts, ne
   const { deployer } = await getNamedAccounts();
   const swarmNetworkID = networkConfig[network.name]?.swarmNetworkId;
   const token = await get('TestToken');
+  const oracleAddress = (await get('PriceOracle')).address;
 
-  const args = [token.address, swarmNetworkID];
+  const args = [token.address, swarmNetworkID, oracleAddress];
   await deploy('StakeRegistry', {
     from: deployer,
     args: args,

diff --git a/deploy/test/010_deploy_verify.ts b/deploy/test/010_deploy_verify.ts
@@ -34,7 +34,7 @@ const func: DeployFunction = async function ({ deployments, network }) {
 
     // Verify staking
     const staking = await get('StakeRegistry');
-    const argStaking = [token.address, swarmNetworkID];
+    const argStaking = [token.address, swarmNetworkID, priceOracle.address];
 
     log('Staking');
     await verify(staking.address, argStaking);

diff --git a/deployments/testnet/Redistribution.json b/deployments/testnet/Redistribution.json