updated batch job

Author: aalavandhan

contracts/_utilities/ChainBridgeBatchRebaseReport.sol

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

sdk/ampleforth.js

@@ -4,10 +4,10 @@ const BigNumber = require('bignumber.js');
 const AMPL_DECIMALS = 9;
 
 const toAmplFloatingPt = (ample) =>
-  ethers.utils.formatUnits(`${ample}`, AMPL_DECIMALS);
+  ethers.utils.formatUnits(`${ample.toFixed ? ample.toFixed(AMPL_DECIMALS) : ample}`, AMPL_DECIMALS);
 
 const toAmplFixedPt = (ample) =>
-  ethers.utils.parseUnits(`${ample.toFixed(AMPL_DECIMALS)}`, 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;

sdk/deployments/ropstenBaseChain.json

@@ -321,11 +321,11 @@
     "blockNumber": 10165259
   },
   "chainBridge/batchRebaseReporter": {
-    "address": "0xCCc7bB32f2c693edd8bBE5326ebf676F1ad86Eec",
+    "address": "0xeeC0f9370732fD0ccD374d1c9fFB6C818E5d03bb",
     "abi": [
-      "function execute(address policy, address bridge, uint8[] destinationChainIDs, bytes32 resourceID)"
+      "function execute(address policy, address bridge, uint8[] destinationChainIDs, bytes32 resourceID, uint128 bridgeFee) payable"
     ],
-    "hash": "0x4d7c68d2ef06e6f222be9c4b5da94305d6a7ac5a59d6ce163043b1c5d487ff3a",
-    "blockNumber": 10165257
+    "hash": "0x56395e830441701c7145c78d0327de9a6d6232c050f8f85cf39b26ed5ba60d34",
+    "blockNumber": 10235930
   }
 }

tasks/ops/rebase.js

@@ -104,13 +104,15 @@ txTask(
     }
 
     console.log('Initiating cross-chain rebase', satelliteChainIDs);
+    const fee = await baseChainBridge._fee();
     const tx = await batchRebaseReporter
       .connect(sender)
       .execute(
         policy.address,
         baseChainBridge.address,
         satelliteChainIDs,
         XC_REBASE_RESOURCE_ID,
+        fee,
       );
 
     const txR = await tx.wait();