updated info script

Author: aalavandhan

.gitignore

@@ -96,3 +96,6 @@ sdk/deployments/geth*.json
 console.js
 
 .DS_Store
+
+
+flattened

helpers/contracts.js

@@ -111,7 +111,7 @@ const upgradeProxyContract = async (
   deployedContractRef,
   signer,
   txParams,
-  force=false,
+  force = false,
 ) => {
   const proxyAdmin = await getDeployedContractInstance(
     network,
@@ -125,40 +125,68 @@ const upgradeProxyContract = async (
     ethers.provider,
   );
 
-  const currentImplAddr = await proxyAdmin.getProxyImplementation(proxy.address);
-  console.log(`Current implementation for ${contractName} is at`, currentImplAddr);
+  const currentImplAddr = await proxyAdmin.getProxyImplementation(
+    proxy.address,
+  );
+  console.log(
+    `Current implementation for ${contractName} is at`,
+    currentImplAddr,
+  );
 
   // deploy new implementation
-  let newImpl;
-  if(!force) {
+  let newImplAddress;
+  if (!force) {
     const Factory = await getCompiledContractFactory(ethers, contractName);
-    newImpl = await upgrades.prepareUpgrade(proxy.address, Factory);
+    newImplAddress = await upgrades.prepareUpgrade(
+      proxy.address,
+      Factory.connect(signer),
+    );
+    await sleep(180);
   } else {
-    console.log(`CAUTION: Skpping storage layout verification!`)
-    console.log(`CANCEL NOW to stop, this action is not reversable`)
+    console.log(`CAUTION: Skpping storage layout verification!`);
+    console.log(`CANCEL NOW to stop, this action is not reversable`);
     await sleep(10);
-    newImpl = await deployContract(
+    const newImpl = await deployContract(
       ethers,
       contractName,
       signer,
       [],
       txParams,
     );
+    newImplAddress = newImpl.address;
   }
-  console.log(`New implementation for ${contractName} is at`, newImpl.address);
+  console.log(`New implementation for ${contractName} is at`, newImplAddress);
 
   if ((await proxyAdmin.owner()) == (await signer.getAddress())) {
     await proxyAdmin
       .connect(signer)
-      .upgrade(proxy.address, newImpl.address, txParams);
+      .upgrade(proxy.address, newImplAddress, txParams);
+
+    await proxyAdmin
+      .connect(signer)
+      .upgrade(
+        proxy.address,
+        '0x82E415d7F43D2f56d431124c58221Faa249Ded42',
+        txParams,
+      );
   } else {
     console.log('Signer not proxy onwer, cant upgrade');
     console.log(
-      `Execute proxyAdmin.upgrade(${proxy.address}, ${newImpl.address})`,
+      `Execute proxyAdmin.upgrade(${proxy.address}, ${newImplAddress})`,
     );
   }
 
-  return newImpl;
+  const contractData = await readContractDeploymentData(
+    network,
+    deployedContractRef,
+  );
+  const impl = new ethers.Contract(
+    newImplAddress,
+    contractData.abi,
+    ethers.provider,
+  );
+  await impl.deployed();
+  return impl;
 };
 
 const getDeployedContractInstance = async (network, contractName, provider) => {

tasks/info/ampl.js

@@ -1,4 +1,8 @@
 const ethers = require('ethers');
+const {
+  getAdminAddress,
+  getImplementationAddress,
+} = require('@openzeppelin/upgrades-core');
 
 const { task } = require('../../helpers/tasks');
 const { getEthersProvider } = require('../../helpers/utils');
@@ -208,27 +212,35 @@ task(
         }
 
         console.log('ProxyAdmin:', proxyAdmin.address);
+        console.log('ProxyAdmin:onwer', await proxyAdmin.owner());
         console.log('XCAmple:', xcAmple.address);
+        console.log(
+          'XCAmple:proxyAdmin',
+          await getAdminAddress(provider, xcAmple.address),
+        );
         console.log(
           'XCAmple:implementation',
-          await proxyAdmin.getProxyImplementation(xcAmple.address),
+          await getImplementationAddress(provider, xcAmple.address),
         );
+
         console.log('XCAmple:owner:', await xcAmple.owner());
         console.log('XCAmple:controller:', await xcAmple.controller());
         console.log(
           'XCAmple:totalSupply:',
           toAmplFloatingPt(await xcAmple.totalSupply()),
         );
 
-        console.log('XCAmpleController:', xcAmple.address);
+        console.log('XCAmpleController:', xcAmpleController.address);
         console.log(
-          'XCAmpleController:implementation',
-          await proxyAdmin.getProxyImplementation(xcAmple.address),
+          'XCAmpleController:proxyAdmin',
+          await getAdminAddress(provider, xcAmpleController.address),
         );
         console.log(
-          'XCAmpleController:owner',
-          await xcAmpleController.owner(),
+          'XCAmpleController:implementation',
+          await getImplementationAddress(provider, xcAmpleController.address),
         );
+
+        console.log('XCAmpleController:owner', await xcAmpleController.owner());
         console.log(
           'XCAmpleController:xcAmple',
           await xcAmpleController.xcAmple(),

tasks/upgrade.js

@@ -1,38 +1,41 @@
 const { types } = require('hardhat/config');
 const { txTask, loadSignerSync, etherscanVerify } = require('../helpers/tasks');
-const { getDeployedContractInstance, upgradeProxyContract } = require('../helpers/contracts');
+const {
+  getDeployedContractInstance,
+  upgradeProxyContract,
+} = require('../helpers/contracts');
 
 txTask(
   'upgrade:xc_ample',
   'Uprades the implementation of the xc-ample ERC-20 contract',
 )
-.addParam('force', 'Skip storage layout verification', false, types.boolean)
-.setAction(async (args, hre) => {
-  const txParams = { gasPrice: args.gasPrice, gasLimit: args.gasLimit };
-  if (txParams.gasPrice == 0) {
-    txParams.gasPrice = await hre.ethers.provider.getGasPrice();
-  }
+  .addParam('force', 'Skip storage layout verification', false, types.boolean)
+  .setAction(async (args, hre) => {
+    const txParams = { gasPrice: args.gasPrice, gasLimit: args.gasLimit };
+    if (txParams.gasPrice == 0) {
+      txParams.gasPrice = await hre.ethers.provider.getGasPrice();
+    }
 
-  const deployer = await loadSignerSync(args, hre.ethers.provider);
-  const deployerAddress = await deployer.getAddress();
+    const deployer = await loadSignerSync(args, hre.ethers.provider);
+    const deployerAddress = await deployer.getAddress();
 
-  console.log('------------------------------------------------------------');
-  console.log('Deployer:', deployerAddress);
-  console.log(txParams);
+    console.log('------------------------------------------------------------');
+    console.log('Deployer:', deployerAddress);
+    console.log(txParams);
 
-  console.log('------------------------------------------------------------');
-  console.log('Upgrading xc-ample contract');
-  const newImpl = await upgradeProxyContract(
-    hre.ethers,
-    hre.network.name,
-    'XCAmple',
-    'xcAmple',
-    deployer,
-    txParams,
-    args.force
-  );
+    console.log('------------------------------------------------------------');
+    console.log('Upgrading xc-ample contract');
+    const newImpl = await upgradeProxyContract(
+      hre.ethers,
+      hre.network.name,
+      'XCAmple',
+      'xcAmple',
+      deployer,
+      txParams,
+      args.force,
+    );
 
-  console.log('------------------------------------------------------------');
-  console.log('Verify on etherscan');
-  await etherscanVerify(hre, newImpl.address);
-});
+    console.log('------------------------------------------------------------');
+    console.log('Verify on etherscan');
+    await etherscanVerify(hre, newImpl.address);
+  });