Merge pull request #50 from ampleforth/prod-deployment

Prod Deployment

Author: aalavandhan

contracts/_utilities/ChainBridgeBatchRebaseReport.sol

@@ -7,6 +7,8 @@ interface IBridge {
         bytes32 resourceID,
         bytes calldata data
     ) external payable;
+
+    function getFee(uint8 destinationChainID) external view returns (uint256);
 }
 
 interface IPolicy {
@@ -22,8 +24,7 @@ contract ChainBridgeBatchRebaseReport {
         address policy,
         address bridge,
         uint8[] memory destinationChainIDs,
-        bytes32 resourceID,
-        uint128 bridgeFee
+        bytes32 resourceID
     ) external payable {
         for (uint256 i = 0; i < destinationChainIDs.length; i++) {
             uint8 destinationChainID = destinationChainIDs[i];
@@ -33,7 +34,8 @@ contract ChainBridgeBatchRebaseReport {
             (epoch, totalSupply) = IPolicy(policy).globalAmpleforthEpochAndAMPLSupply();
 
             uint256 dataLen = 64;
-            IBridge(bridge).deposit{value:bridgeFee}(
+            uint256 bridgeFee = IBridge(bridge).getFee(destinationChainID);
+            IBridge(bridge).deposit{value: bridgeFee}(
                 destinationChainID,
                 resourceID,
                 abi.encode(dataLen, epoch, totalSupply)

hardhat.config.js

@@ -16,6 +16,7 @@ require('./tasks/ops/xc_transfer');
 require('./tasks/info/config');
 require('./tasks/info/ampl');
 require('./tasks/info/chain_bridge');
+require('./tasks/info/cb_ampl_tx');
 
 module.exports = {
   solidity: {
@@ -65,35 +66,31 @@ module.exports = {
   },
 
   networks: {
-    gethBaseChain: {
+    localGethBaseChain: {
       url: 'http://localhost:7545'
     },
-    gethSatChain1: {
+    localGethSatChain1: {
       url: 'http://localhost:7550'
     },
-    gethSatChain2: {
+    localGethSatChain2: {
       url: 'http://localhost:7555'
     },
 
-    ropstenBaseChain: {
+    devRopstenBaseChain: {
       url: 'https://eth-ropsten.alchemyapi.io/v2/' + process.env.ALCHEMY_SECRET
     },
-    bscTestnetSatChain: {
+    devBscTestnetSatChain: {
       url: 'https://data-seed-prebsc-1-s1.binance.org:8545'
     },
-    meterTestnetSatChain: {
+    devMeterTestnetSatChain: {
       url: 'http://s11.meter.io:8545'
     },
 
-    // rinkebyBaseChain: {
-    //   url: 'https://rinkeby.infura.io/v3/' + process.env.INFURA_SECRET
-    // },
-    // goerliSatChain: {
-    //   url: 'https://goerli.infura.io/v3/' + process.env.INFURA_SECRET
-    // },
-
-    // avaTestnetSatChain: {
-    //   url: 'https://api.avax-test.network/ext/bc/C/rpc'
-    // }
+    prodEthereumBaseChain: {
+      url: 'https://eth-mainnet.alchemyapi.io/v2/' + process.env.ALCHEMY_SECRET
+    },
+    prodBscSatChain: {
+      url: 'https://bsc-dataseed.binance.org/'
+    }
   }
 };

helpers/contracts.js

@@ -4,6 +4,8 @@ const { getAdminAddress } = require('@openzeppelin/upgrades-core');
 const DEPLOYMENT_CONFIG_PATH = __dirname + '/../sdk/deployments';
 const { getEthersProvider } = require('./utils');
 
+const BLOCKS_PER_SEC = 1 / 15;
+
 const ContractABIPaths = {
   // Openzepppelin
   ProxyAdmin: '@openzeppelin/upgrades/contracts/upgradeability',
@@ -157,6 +159,43 @@ const writeProxyDeploymentData = async (network, contractRef, contract) => {
   fs.writeFileSync(addressFile, JSON.stringify(chainAddresses, null, 2));
 };
 
+const filterContractEvents = async (
+  ethers,
+  provider,
+  address,
+  abi,
+  event,
+  startBlock,
+  endBlock,
+  timeFrameSec = 7 * 24 * 3600,
+) => {
+  endBlock = endBlock || (await provider.getBlockNumber());
+  const freq = timeFrameSec * BLOCKS_PER_SEC;
+
+  let logs = [];
+  for (let i = startBlock; i <= endBlock; i += freq) {
+    // console.log(i, startBlock, endBlock)
+    const _logs = await provider.getLogs({
+      address: address,
+      fromBlock: ethers.utils.hexlify(i),
+      toBlock: ethers.utils.hexlify(i + freq > endBlock ? endBlock : i + freq),
+    });
+    logs = logs.concat(_logs);
+  }
+
+  const contractInterface = new ethers.utils.Interface(abi);
+  const decodedEvents = logs.reduce((m, log) => {
+    try {
+      log.parsed = contractInterface.parseLog(log);
+      log.parsed.name == event ? m.push(log) : m;
+      return m;
+    } catch (e) {
+      return m;
+    }
+  }, []);
+  return decodedEvents;
+};
+
 module.exports = {
   readDeploymentData,
   readContractDeploymentData,
@@ -169,4 +208,6 @@ module.exports = {
   deployContract,
   deployProxyAdminContract,
   deployProxyContract,
+
+  filterContractEvents,
 };

helpers/deploy.js

@@ -211,12 +211,10 @@ async function deployChainBridgeContracts(
   };
 }
 
-async function deployChainBridgeBaseChainGatewayContracts(
-  { ampl, policy, bridge, genericHandler },
+async function deployTokenVault(
   ethers,
   deployer,
-  txParams = {},
-) {
+  txParams = {}) {
   const tokenVault = await deployContract(
     ethers,
     'TokenVault',
@@ -225,6 +223,15 @@ async function deployChainBridgeBaseChainGatewayContracts(
     txParams,
   );
 
+  return tokenVault;
+}
+
+async function deployChainBridgeBaseChainGatewayContracts(
+  { ampl, policy, bridge, genericHandler, tokenVault },
+  ethers,
+  deployer,
+  txParams = {},
+) {
   const rebaseGateway = await deployContract(
     ethers,
     'AMPLChainBridgeGateway',
@@ -240,11 +247,15 @@ async function deployChainBridgeBaseChainGatewayContracts(
     txParams,
   );
 
+  const deployerAddress = await deployer.getAddress();
+  const adminRole = await bridge.DEFAULT_ADMIN_ROLE();
+  const isAdmin = await bridge.hasRole(adminRole, deployerAddress);
+
   const reportRebaseFnSig = CB_FUNCTION_SIG_baseChainReportRebase(
     rebaseGateway,
   );
 
-  try {
+  if(isAdmin){
     await (
       await bridge
         .connect(deployer)
@@ -256,7 +267,7 @@ async function deployChainBridgeBaseChainGatewayContracts(
           txParams,
         )
     ).wait();
-  } catch (e) {
+  } else {
     console.log(
       'Failed adding generic resource to bridge, deployer key not bridge owner',
     );
@@ -270,7 +281,7 @@ async function deployChainBridgeBaseChainGatewayContracts(
   }
 
   const transferFnSig = CB_FUNCTION_SIG_baseChainTransfer(transferGateway);
-  try {
+  if(isAdmin) {
     await (
       await bridge
         .connect(deployer)
@@ -282,7 +293,7 @@ async function deployChainBridgeBaseChainGatewayContracts(
           txParams,
         )
     ).wait();
-  } catch (e) {
+  } else {
     console.log(
       'Failed adding generic resource to bridge, deployer key not bridge owner',
     );
@@ -295,9 +306,23 @@ async function deployChainBridgeBaseChainGatewayContracts(
     ]);
   }
 
-  await (await tokenVault.addBridgeGateway(transferGateway.address)).wait();
+  if(await tokenVault.owner() == deployerAddress){
+    await (
+      await tokenVault
+        .connect(deployer)
+        .addBridgeGateway(transferGateway.address)
+    ).wait();
+  } else {
+    console.log(
+      'Failed to add whitelist transfer gateway to vault as deployer not vault owner',
+    );
+    console.log('Execute the following on-chain');
+    console.log('addBridgeGateway', [
+      transferGateway.address,
+    ]);
+  }
 
-  return { tokenVault, rebaseGateway, transferGateway };
+  return { rebaseGateway, transferGateway };
 }
 
 async function deployChainBridgeSatelliteChainGatewayContracts(
@@ -333,10 +358,13 @@ async function deployChainBridgeSatelliteChainGatewayContracts(
       .addBridgeGateway(transferGateway.address, txParams)
   ).wait();
 
+  const adminRole = await bridge.DEFAULT_ADMIN_ROLE();
+  const isAdmin = await bridge.hasRole(adminRole, await deployer.getAddress());
+
   const reportRebaseFnSig = CB_FUNCTION_SIG_satelliteChainReportRebase(
     rebaseGateway,
   );
-  try {
+  if(isAdmin) {
     await (
       await bridge.adminSetGenericResource(
         genericHandler.address,
@@ -346,7 +374,7 @@ async function deployChainBridgeSatelliteChainGatewayContracts(
         txParams,
       )
     ).wait();
-  } catch (e) {
+  } else {
     console.log(
       'Failed adding generic resource to bridge, deployer key not bridge owner',
     );
@@ -360,7 +388,7 @@ async function deployChainBridgeSatelliteChainGatewayContracts(
   }
 
   const transferFnSig = CB_FUNCTION_SIG_satelliteChainTransfer(transferGateway);
-  try {
+  if(isAdmin) {
     await (
       await bridge.adminSetGenericResource(
         genericHandler.address,
@@ -370,7 +398,7 @@ async function deployChainBridgeSatelliteChainGatewayContracts(
         txParams,
       )
     ).wait();
-  } catch (e) {
+  } else {
     console.log(
       'Failed adding generic resource to bridge, deployer key not bridge owner',
     );
@@ -391,6 +419,7 @@ module.exports = {
   deployXCAmpleContracts,
   deployChainBridgeContracts,
   deployChainBridgeHelpers,
+  deployTokenVault,
   deployChainBridgeBaseChainGatewayContracts,
   deployChainBridgeSatelliteChainGatewayContracts,
 };

helpers/tasks.js

@@ -4,12 +4,7 @@ const { task } = require('hardhat/config');
 
 function txTask(name, desc) {
   return task(name, desc)
-    .addParam(
-      'gasPrice',
-      'Gas price for the transaction',
-      25000000000,
-      types.int,
-    )
+    .addParam('gasPrice', 'Gas price for the transaction', 0, types.int)
     .addParam('gasLimit', 'Gas limit for the transaction', 7000000, types.int)
     .addParam('txSleepSec', 'Time to wait between transactions', 2, types.int)
     .addParam('keyfile', 'The path to signer keyfile')

package.json

@@ -21,7 +21,7 @@
     "@openzeppelin/contracts": "^3.2.0",
     "@openzeppelin/contracts-upgradeable": "^3.3.0",
     "@openzeppelin/upgrades": "^2.8.0",
-    "chainbridge-solidity": "https://github.com/ChainSafe/chainbridge-solidity#a15727ad30bb359b4dfd0fb155f338d11ea80753",
+    "chainbridge-solidity": "https://github.com/meterio/chainbridge-solidity-v1.0.0-eth#6b02b0a52ce7e3967feeffbe6a6440a5b1006aec",
     "market-oracle": "https://github.com/ampleforth/market-oracle#v1.0.1",
     "uFragments": "https://github.com/ampleforth/uFragments#v1.1.0"
   },
@@ -38,6 +38,7 @@
     "bignumber.js": "^9.0.1",
     "chai": "^4.2.0",
     "commander": "^6.2.1",
+    "csv-writer": "^1.6.0",
     "eslint": "^4.19.1",
     "eslint-config-google": "^0.9.1",
     "eslint-config-mocha": "^0.0.0",
@@ -66,6 +67,7 @@
     "stochasm": "^0.5.0",
     "ts-node": "^9.0.0",
     "typechain": "^4.0.3",
-    "typescript": "^4.0.2"
+    "typescript": "^4.0.2",
+    "underscore": "^1.13.1"
   }
 }

sdk/ampleforth.js

@@ -4,10 +4,16 @@ const BigNumber = require('bignumber.js');
 const AMPL_DECIMALS = 9;
 
 const toAmplFloatingPt = (ample) =>
-  ethers.utils.formatUnits(`${ample.toFixed ? ample.toFixed(AMPL_DECIMALS) : ample}`, AMPL_DECIMALS);
+  ethers.utils.formatUnits(
+    `${ample.toFixed ? ample.toFixed(AMPL_DECIMALS) : ample}`,
+    AMPL_DECIMALS,
+  );
 
 const toAmplFixedPt = (ample) =>
-  ethers.utils.parseUnits(`${ample.toFixed ? ample.toFixed(AMPL_DECIMALS) : ample}`, AMPL_DECIMALS);
+  ethers.utils.parseUnits(
+    `${ample.toFixed ? ample.toFixed(AMPL_DECIMALS) : ample}`,
+    AMPL_DECIMALS,
+  );
 
 const INITIAL_SUPPLY = ethers.utils.parseUnits('50', 6 + AMPL_DECIMALS);
 const AMPL_ORACLE_DECIMALS = 18;