@requestnetwork/smart-contracts 0.29.1-next.1825 → 0.29.1-next.1827

package/README.md

@@ -157,7 +157,10 @@ This command will output details about each contract deployment on each chain:
 
 ### Verify the contracts
 
-Verify and publish the contract code automatically to blockchain explorers, right after smart contracts compilation. You should first set the `ETHERSCAN_API_KEY` environment variable.
+Verify and publish the contract code automatically to blockchain explorers, right after smart contracts compilation.
+Environment variables needed: `ADMIN_...` key and wallet, `ETHERSCAN_API_KEY`, and `REQUEST_DEPLOYER_LIVE`.
+Depending on the contracts you're verifying you will need to set up `WEB3_PROVIDER_URL`.
+See `hardhat.config.ts`.
 
 ```bash
 yarn hardhat verify-contract-from-deployer --network <NETWORK>

package/dist/scripts-create2/compute-one-address.js

@@ -47,7 +47,7 @@ const computeCreate2DeploymentAddressesFromList = (hre) => (0, tslib_1.__awaiter
             case 'ERC20FeeProxy':
             case 'Erc20ConversionProxy':
             case 'ERC20EscrowToPay':
-            case 'BatchPayments':
+            case 'BatchConversionPayments':
             case 'ERC20SwapToConversion': {
                 try {
                     const constructorArgs = (0, constructor_args_1.getConstructorArgs)(contract, hre.network.name);

package/dist/scripts-create2/compute-one-address.js.map

@@ -1 +1 @@
-{"version":3,"file":"compute-one-address.js","sourceRoot":"","sources":["../../scripts-create2/compute-one-address.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compute-one-address.js","sourceRoot":"","sources":["../../scripts-create2/compute-one-address.ts"],"names":[],"mappings":"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"}

package/dist/scripts-create2/constructor-args.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constructor-args.d.ts","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,kBAAkB,aAAc,MAAM,mCAAqB,MAAM,EA+C7E,CAAC"}
+{"version":3,"file":"constructor-args.d.ts","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,kBAAkB,aAAc,MAAM,mCAAqB,MAAM,EAkD7E,CAAC"}

package/dist/scripts-create2/constructor-args.js

@@ -38,11 +38,14 @@ const getConstructorArgs = (contract, network) => {
             const erc20FeeProxyAddress = erc20FeeProxy.getAddress(network);
             return [erc20FeeProxyAddress, getAdminWalletAddress(contract)];
         }
-        case 'BatchPayments': {
+        case 'BatchConversionPayments': {
             if (!network) {
-                throw new Error('Batch contract requires network parameter to get correct address of erc20FeeProxy and ethereumFeeProxy');
+                throw new Error('Batch conversion contract requires network parameter to get correct address of erc20FeeProxy, erc20ConversionFeeProxy, ethereumFeeProxy, ethereumConversionFeeProxy, and chainlinkConversionPath');
             }
             return [
+                '0x0000000000000000000000000000000000000000',
+                '0x0000000000000000000000000000000000000000',
+                '0x0000000000000000000000000000000000000000',
                 '0x0000000000000000000000000000000000000000',
                 '0x0000000000000000000000000000000000000000',
                 getAdminWalletAddress(contract),

package/dist/scripts-create2/constructor-args.js.map

@@ -1 +1 @@
-{"version":3,"file":"constructor-args.js","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":";;;AAAA,wCAAwC;AAExC,MAAM,qBAAqB,GAAG,CAAC,QAAgB,EAAU,EAAE;IACzD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE;QACrC,MAAM,IAAI,KAAK,CAAC,6DAA6D,QAAQ,EAAE,CAAC,CAAC;KAC1F;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;AAC1C,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAG,CAAC,QAAgB,EAAE,OAAgB,EAAY,EAAE;IACjF,QAAQ,QAAQ,EAAE;QAChB,KAAK,sBAAsB,CAAC,CAAC;YAC3B,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,qBAAqB,CAAC,QAAQ,CAAC;aAChC,CAAC;SACH;QACD,KAAK,oBAAoB,CAAC,CAAC;YACzB,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,oFAAoF;gBACpF,2EAA2E;gBAC3E,wGAAwG;gBACxG,4CAA4C;aAC7C,CAAC;SACH;QACD,KAAK,uBAAuB,CAAC,CAAC;YAC5B,OAAO,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;SAC1C;QACD,KAAK,kBAAkB,CAAC,CAAC;YACvB,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,IAAI,KAAK,CACb,oFAAoF,CACrF,CAAC;aACH;YACD,MAAM,aAAa,GAAG,SAAS,CAAC,qBAAqB,CAAC;YACtD,MAAM,oBAAoB,GAAG,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC/D,OAAO,CAAC,oBAAoB,EAAE,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;SAChE;QACD,KAAK,eAAe,CAAC,CAAC;YACpB,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,IAAI,KAAK,CACb,wGAAwG,CACzG,CAAC;aACH;YACD,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,qBAAqB,CAAC,QAAQ,CAAC;aAChC,CAAC;SACH;QACD;YACE,OAAO,EAAE,CAAC;KACb;AACH,CAAC,CAAC;AA/CW,QAAA,kBAAkB,sBA+C7B"}
+{"version":3,"file":"constructor-args.js","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":";;;AAAA,wCAAwC;AAExC,MAAM,qBAAqB,GAAG,CAAC,QAAgB,EAAU,EAAE;IACzD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE;QACrC,MAAM,IAAI,KAAK,CAAC,6DAA6D,QAAQ,EAAE,CAAC,CAAC;KAC1F;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;AAC1C,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAG,CAAC,QAAgB,EAAE,OAAgB,EAAY,EAAE;IACjF,QAAQ,QAAQ,EAAE;QAChB,KAAK,sBAAsB,CAAC,CAAC;YAC3B,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,qBAAqB,CAAC,QAAQ,CAAC;aAChC,CAAC;SACH;QACD,KAAK,oBAAoB,CAAC,CAAC;YACzB,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,oFAAoF;gBACpF,2EAA2E;gBAC3E,wGAAwG;gBACxG,4CAA4C;aAC7C,CAAC;SACH;QACD,KAAK,uBAAuB,CAAC,CAAC;YAC5B,OAAO,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;SAC1C;QACD,KAAK,kBAAkB,CAAC,CAAC;YACvB,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,IAAI,KAAK,CACb,oFAAoF,CACrF,CAAC;aACH;YACD,MAAM,aAAa,GAAG,SAAS,CAAC,qBAAqB,CAAC;YACtD,MAAM,oBAAoB,GAAG,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC/D,OAAO,CAAC,oBAAoB,EAAE,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;SAChE;QACD,KAAK,yBAAyB,CAAC,CAAC;YAC9B,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,IAAI,KAAK,CACb,kMAAkM,CACnM,CAAC;aACH;YACD,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,4CAA4C;gBAC5C,4CAA4C;gBAC5C,4CAA4C;gBAC5C,qBAAqB,CAAC,QAAQ,CAAC;aAChC,CAAC;SACH;QACD;YACE,OAAO,EAAE,CAAC;KACb;AACH,CAAC,CAAC;AAlDW,QAAA,kBAAkB,sBAkD7B"}

package/dist/scripts-create2/contract-setup/adminTasks.d.ts

@@ -1,13 +1,55 @@
 import { BigNumber, Wallet } from 'ethers';
 import { HardhatRuntimeEnvironmentExtended } from '../types';
 export declare const REQUEST_SWAP_FEES = 5;
-export declare const BATCH_FEE = 3;
-export declare const updateChainlinkConversionPath: (contract: any, network: string, gasPrice: BigNumber, version?: undefined) => Promise<void>;
+export declare const BATCH_FEE: BigNumber;
+/**
+ * Updates the chainlink address used by the contract.
+ * @param contract A contract using chainlink:
+ *                 Erc20ConversionProxy | EthConversionProxy | ERC20SwapToConversion.
+ * @param network The network used.
+ * @param gasPrice The gas price used. Increase its value if needed.
+ * @param version The version of the chainlink proxy to use, the last one by default.
+ */
+export declare const updateChainlinkConversionPath: (contract: any, network: string, gasPrice: BigNumber, version?: string | undefined) => Promise<void>;
 export declare const updateSwapRouter: (contract: any, network: string, gasPrice: BigNumber) => Promise<void>;
 export declare const updateRequestSwapFees: (contract: any, gasPrice: BigNumber) => Promise<void>;
+/**
+ * Updates the batchFee applied by the batch conversion proxy.
+ * @param contract BatchConversionPayments contract.
+ * @param gasPrice The gas price used. Increase its value if needed.
+ */
 export declare const updateBatchPaymentFees: (contract: any, gasPrice: BigNumber) => Promise<void>;
-export declare const updatePaymentErc20FeeProxy: (contract: any, network: string, gasPrice: BigNumber) => Promise<void>;
-export declare const updatePaymentEthFeeProxy: (contract: any, network: string, gasPrice: BigNumber) => Promise<void>;
+/**
+ * Updates the feeAMountUSDLimit of the batch conversion proxy.
+ * @param contract BatchConversionPayments contract.
+ * @param gasPrice The gas price used. Increase its value if needed.
+ */
+export declare const updateBatchPaymentFeeAmountUSDLimit: (contract: any, gasPrice: BigNumber) => Promise<void>;
+/**
+ * Updates the address of a Native or ERC20 fee proxy stored within a Native or ERC20 fee conversion contract.
+ * @param contract A contract using chainlink: EthConversionProxy | Erc20ConversionProxy.
+ * @param network The network used.
+ * @param gasPrice The gas price used. Increase its value if needed.
+ * @param proxyType The type of the proxy fee.
+ * @param version The version of the fee proxy to use, the last one by default.
+ */
+export declare const updatePaymentFeeProxyAddress: (contract: any, network: string, gasPrice: BigNumber, proxyType: 'native' | 'erc20', version?: string | undefined) => Promise<void>;
+/**
+ * Update the address of a proxy used by batch conversion contract.
+ * @param contract BatchConversionPayments contract.
+ * @param network The network used.
+ * @param gasPrice The gas price used. Increase its value if needed.
+ * @param proxyName The name of the fee proxy to update.
+ */
+export declare const updateBatchConversionProxy: (contract: any, network: string, gasPrice: BigNumber, proxyName: 'native' | 'nativeConversion' | 'erc20' | 'erc20Conversion' | 'chainlinkConversionPath') => Promise<void>;
+/**
+ * Update the native and the USD addresses used by batch conversion contract.
+ * @param contract BatchConversionPayments contract.
+ * @param NativeAddress The address of native token, eg: ETH.
+ * @param USDAddress The address of USD token.
+ * @param gasPrice The gas price used. Increase its value if needed.
+ */
+export declare const updateNativeAndUSDAddress: (contract: any, NativeAddress: string, USDAddress: string, gasPrice: BigNumber) => Promise<void>;
 export declare const getSignerAndGasPrice: (network: string, hre: HardhatRuntimeEnvironmentExtended) => Promise<{
     signer: Wallet;
     gasPrice: BigNumber;

package/dist/scripts-create2/contract-setup/adminTasks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adminTasks.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE3C,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAG7D,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAEnC,eAAO,MAAM,SAAS,IAAI,CAAC;AAE3B,eAAO,MAAM,6BAA6B,aAC9B,GAAG,WACJ,MAAM,YACL,SAAS,0BAElB,QAAQ,IAAI,CASd,CAAC;AAEF,eAAO,MAAM,gBAAgB,aACjB,GAAG,WACJ,MAAM,YACL,SAAS,KAClB,QAAQ,IAAI,CAQd,CAAC;AAEF,eAAO,MAAM,qBAAqB,aAAoB,GAAG,YAAY,SAAS,KAAG,QAAQ,IAAI,CAO5F,CAAC;AAEF,eAAO,MAAM,sBAAsB,aAAoB,GAAG,YAAY,SAAS,KAAG,QAAQ,IAAI,CAQ7F,CAAC;AAEF,eAAO,MAAM,0BAA0B,aAC3B,GAAG,WACJ,MAAM,YACL,SAAS,KAClB,QAAQ,IAAI,CAUd,CAAC;AAEF,eAAO,MAAM,wBAAwB,aACzB,GAAG,WACJ,MAAM,YACL,SAAS,KAClB,QAAQ,IAAI,CAUd,CAAC;AAEF,eAAO,MAAM,oBAAoB,YACtB,MAAM,OACV,iCAAiC;YACnB,MAAM;cAAY,SAAS;EAc/C,CAAC"}
+{"version":3,"file":"adminTasks.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE3C,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAI7D,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAEnC,eAAO,MAAM,SAAS,WAAqB,CAAC;AAI5C;;;;;;;GAOG;AACH,eAAO,MAAM,6BAA6B,aAC9B,GAAG,WACJ,MAAM,YACL,SAAS,mCAElB,QAAQ,IAAI,CAYd,CAAC;AAEF,eAAO,MAAM,gBAAgB,aACjB,GAAG,WACJ,MAAM,YACL,SAAS,KAClB,QAAQ,IAAI,CAQd,CAAC;AAEF,eAAO,MAAM,qBAAqB,aAAoB,GAAG,YAAY,SAAS,KAAG,QAAQ,IAAI,CAO5F,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,aAAoB,GAAG,YAAY,SAAS,KAAG,QAAQ,IAAI,CAO7F,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,mCAAmC,aACpC,GAAG,YACH,SAAS,KAClB,QAAQ,IAAI,CAWd,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,4BAA4B,aAC7B,GAAG,WACJ,MAAM,YACL,SAAS,aACR,QAAQ,GAAG,OAAO,mCAE5B,QAAQ,IAAI,CAoBd,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,0BAA0B,aAC3B,GAAG,WACJ,MAAM,YACL,SAAS,aAEf,QAAQ,GACR,kBAAkB,GAClB,OAAO,GACP,iBAAiB,GACjB,yBAAyB,KAC5B,QAAQ,IAAI,CAyCd,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,yBAAyB,aAC1B,GAAG,iBACE,MAAM,cACT,MAAM,YACR,SAAS,KAClB,QAAQ,IAAI,CAkBd,CAAC;AAEF,eAAO,MAAM,oBAAoB,YACtB,MAAM,OACV,iCAAiC;YACnB,MAAM;cAAY,SAAS;EAc/C,CAAC"}

package/dist/scripts-create2/contract-setup/adminTasks.js

@@ -1,16 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSignerAndGasPrice = exports.updatePaymentEthFeeProxy = exports.updatePaymentErc20FeeProxy = exports.updateBatchPaymentFees = exports.updateRequestSwapFees = exports.updateSwapRouter = exports.updateChainlinkConversionPath = exports.BATCH_FEE = exports.REQUEST_SWAP_FEES = void 0;
+exports.getSignerAndGasPrice = exports.updateNativeAndUSDAddress = exports.updateBatchConversionProxy = exports.updatePaymentFeeProxyAddress = exports.updateBatchPaymentFeeAmountUSDLimit = exports.updateBatchPaymentFees = exports.updateRequestSwapFees = exports.updateSwapRouter = exports.updateChainlinkConversionPath = exports.BATCH_FEE = exports.REQUEST_SWAP_FEES = void 0;
 const tslib_1 = require("tslib");
 const lib_1 = require("../../src/lib");
 const utils_1 = require("../../scripts/utils");
 const artifacts = require("../../src/lib");
+const ethers_1 = require("ethers");
 const utils_2 = require("@requestnetwork/utils");
+const utils_3 = require("ethers/lib/utils");
 // Fees: 0.5%
 exports.REQUEST_SWAP_FEES = 5;
 // Batch Fees: .3%
-exports.BATCH_FEE = 3;
-const updateChainlinkConversionPath = (contract, network, gasPrice, version = undefined) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
+exports.BATCH_FEE = ethers_1.BigNumber.from(30);
+// Batch fee amount in USD Limit: 150 * 1e8 ($150)
+const BATCH_FEE_AMOUNT_USD_LIMIT = (0, utils_3.parseUnits)('150', 8);
+/**
+ * Updates the chainlink address used by the contract.
+ * @param contract A contract using chainlink:
+ *                 Erc20ConversionProxy | EthConversionProxy | ERC20SwapToConversion.
+ * @param network The network used.
+ * @param gasPrice The gas price used. Increase its value if needed.
+ * @param version The version of the chainlink proxy to use, the last one by default.
+ */
+const updateChainlinkConversionPath = (contract, network, gasPrice, version) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
     const currentChainlinkAddress = yield contract.chainlinkConversionPath();
     const chainlinkConversionPathAddress = lib_1.chainlinkConversionPath.getAddress(network, version);
     if (currentChainlinkAddress !== chainlinkConversionPathAddress) {
@@ -18,6 +30,7 @@ const updateChainlinkConversionPath = (contract, network, gasPrice, version = un
             gasPrice: gasPrice,
         });
         yield tx.wait(1);
+        console.log(`chainlink: the current address ${currentChainlinkAddress} has been replaced by: ${chainlinkConversionPathAddress}`);
     }
 });
 exports.updateChainlinkConversionPath = updateChainlinkConversionPath;
@@ -40,40 +53,132 @@ const updateRequestSwapFees = (contract, gasPrice) => (0, tslib_1.__awaiter)(voi
     }
 });
 exports.updateRequestSwapFees = updateRequestSwapFees;
+/**
+ * Updates the batchFee applied by the batch conversion proxy.
+ * @param contract BatchConversionPayments contract.
+ * @param gasPrice The gas price used. Increase its value if needed.
+ */
 const updateBatchPaymentFees = (contract, gasPrice) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
     const currentFees = yield contract.batchFee();
-    if (!currentFees.eq(exports.BATCH_FEE)) {
+    if (!exports.BATCH_FEE.eq(currentFees)) {
         const tx = yield contract.setBatchFee(exports.BATCH_FEE, { gasPrice: gasPrice });
         yield tx.wait(1);
-        // Log is useful to have a direct view on what is being updated
-        console.log(`currentFees: ${currentFees.toString()}, new fees: ${exports.BATCH_FEE}`);
+        console.log(`Batch: currentFees: ${currentFees.toString()}, new fees: ${exports.BATCH_FEE.toString()}`);
     }
 });
 exports.updateBatchPaymentFees = updateBatchPaymentFees;
-const updatePaymentErc20FeeProxy = (contract, network, gasPrice) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
-    const erc20FeeProxy = artifacts.erc20FeeProxyArtifact;
-    const erc20FeeProxyAddress = erc20FeeProxy.getAddress(network);
-    const currentAddress = yield contract.paymentErc20FeeProxy();
-    if (currentAddress !== erc20FeeProxyAddress) {
-        const tx = yield contract.setPaymentErc20FeeProxy(erc20FeeProxyAddress, {
+/**
+ * Updates the feeAMountUSDLimit of the batch conversion proxy.
+ * @param contract BatchConversionPayments contract.
+ * @param gasPrice The gas price used. Increase its value if needed.
+ */
+const updateBatchPaymentFeeAmountUSDLimit = (contract, gasPrice) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
+    const currentFeeAmountUSDLimit = yield contract.batchFeeAmountUSDLimit();
+    if (!currentFeeAmountUSDLimit.eq(BATCH_FEE_AMOUNT_USD_LIMIT)) {
+        const tx = yield contract.setBatchFeeAmountUSDLimit(BATCH_FEE_AMOUNT_USD_LIMIT, {
             gasPrice: gasPrice,
         });
         yield tx.wait(1);
+        console.log(`Batch: the current fee amount in USD limit: ${currentFeeAmountUSDLimit.toString()}, have been replaced by: ${BATCH_FEE_AMOUNT_USD_LIMIT.toString()}. ($1 = 1e8)`);
     }
 });
-exports.updatePaymentErc20FeeProxy = updatePaymentErc20FeeProxy;
-const updatePaymentEthFeeProxy = (contract, network, gasPrice) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
-    const ethereumFeeProxy = artifacts.ethereumFeeProxyArtifact;
-    const ethereumFeeProxyAddress = ethereumFeeProxy.getAddress(network);
-    const currentAddress = yield contract.paymentEthFeeProxy();
-    if (currentAddress !== ethereumFeeProxyAddress) {
-        const tx = yield contract.setPaymentEthFeeProxy(ethereumFeeProxyAddress, {
+exports.updateBatchPaymentFeeAmountUSDLimit = updateBatchPaymentFeeAmountUSDLimit;
+/**
+ * Updates the address of a Native or ERC20 fee proxy stored within a Native or ERC20 fee conversion contract.
+ * @param contract A contract using chainlink: EthConversionProxy | Erc20ConversionProxy.
+ * @param network The network used.
+ * @param gasPrice The gas price used. Increase its value if needed.
+ * @param proxyType The type of the proxy fee.
+ * @param version The version of the fee proxy to use, the last one by default.
+ */
+const updatePaymentFeeProxyAddress = (contract, network, gasPrice, proxyType, version) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
+    let proxyAddress;
+    let currentAddress;
+    if (proxyType === 'native') {
+        proxyAddress = artifacts.ethereumFeeProxyArtifact.getAddress(network, version);
+        currentAddress = yield contract.paymentProxy();
+    }
+    else {
+        proxyAddress = artifacts.erc20FeeProxyArtifact.getAddress(network, version);
+        currentAddress = yield contract.paymentProxy();
+    }
+    if (currentAddress.toLocaleLowerCase() !== proxyAddress.toLocaleLowerCase()) {
+        const tx = yield contract.updateConversionProxyAddress(proxyAddress, {
+            gasPrice: gasPrice,
+        });
+        yield tx.wait();
+        console.log(`${proxyType} conversion proxy: the current address ${currentAddress} has been replaced by: ${proxyAddress}`);
+    }
+});
+exports.updatePaymentFeeProxyAddress = updatePaymentFeeProxyAddress;
+/**
+ * Update the address of a proxy used by batch conversion contract.
+ * @param contract BatchConversionPayments contract.
+ * @param network The network used.
+ * @param gasPrice The gas price used. Increase its value if needed.
+ * @param proxyName The name of the fee proxy to update.
+ */
+const updateBatchConversionProxy = (contract, network, gasPrice, proxyName) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
+    let proxyAddress;
+    let batchSetProxy;
+    let currentAddress;
+    switch (proxyName) {
+        case 'native':
+            proxyAddress = artifacts.ethereumFeeProxyArtifact.getAddress(network);
+            batchSetProxy = yield contract.setPaymentNativeProxy;
+            currentAddress = yield contract.paymentNativeProxy();
+            break;
+        case 'nativeConversion':
+            proxyAddress = artifacts.ethConversionArtifact.getAddress(network);
+            batchSetProxy = yield contract.setPaymentNativeConversionProxy;
+            currentAddress = yield contract.paymentNativeConversionProxy();
+            break;
+        case 'erc20':
+            proxyAddress = artifacts.erc20FeeProxyArtifact.getAddress(network);
+            batchSetProxy = yield contract.setPaymentErc20Proxy;
+            currentAddress = yield contract.paymentErc20Proxy();
+            break;
+        case 'erc20Conversion':
+            proxyAddress = artifacts.erc20ConversionProxy.getAddress(network);
+            batchSetProxy = yield contract.setPaymentErc20ConversionProxy;
+            currentAddress = yield contract.paymentErc20ConversionProxy();
+            break;
+        case 'chainlinkConversionPath':
+            proxyAddress = artifacts.chainlinkConversionPath.getAddress(network);
+            batchSetProxy = yield contract.setChainlinkConversionPath;
+            currentAddress = yield contract.chainlinkConversionPath();
+            break;
+    }
+    if (currentAddress.toLocaleLowerCase() !== proxyAddress.toLocaleLowerCase()) {
+        const tx = yield batchSetProxy(proxyAddress, {
+            gasPrice: gasPrice,
+        });
+        yield tx.wait(1);
+        console.log(`${proxyName}: the current address ${currentAddress} has been replaced by: ${proxyAddress}`);
+    }
+});
+exports.updateBatchConversionProxy = updateBatchConversionProxy;
+/**
+ * Update the native and the USD addresses used by batch conversion contract.
+ * @param contract BatchConversionPayments contract.
+ * @param NativeAddress The address of native token, eg: ETH.
+ * @param USDAddress The address of USD token.
+ * @param gasPrice The gas price used. Increase its value if needed.
+ */
+const updateNativeAndUSDAddress = (contract, NativeAddress, USDAddress, gasPrice) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
+    const currentUSDAddress = (yield contract.USDAddress()).toLocaleLowerCase();
+    const currentNativeAddress = (yield contract.NativeAddress()).toLocaleLowerCase();
+    if (currentNativeAddress !== NativeAddress.toLocaleLowerCase() ||
+        currentUSDAddress !== USDAddress.toLocaleLowerCase()) {
+        const tx = yield contract.setNativeAndUSDAddress(NativeAddress, USDAddress, {
             gasPrice: gasPrice,
         });
         yield tx.wait(1);
+        console.log(`Batch: the current NativeAddress: ${currentNativeAddress}, have been replaced by: ${NativeAddress}`);
+        console.log(`Batch: the current USDAddress: ${currentUSDAddress}, have been replaced by: ${USDAddress}`);
     }
 });
-exports.updatePaymentEthFeeProxy = updatePaymentEthFeeProxy;
+exports.updateNativeAndUSDAddress = updateNativeAndUSDAddress;
 const getSignerAndGasPrice = (network, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
     let provider;
     if (network === 'celo') {

package/dist/scripts-create2/contract-setup/adminTasks.js.map

@@ -1 +1 @@
-{"version":3,"file":"adminTasks.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":";;;;AAAA,uCAAwD;AACxD,+CAA+D;AAC/D,2CAA2C;AAE3C,iDAA0C;AAG1C,aAAa;AACA,QAAA,iBAAiB,GAAG,CAAC,CAAC;AACnC,kBAAkB;AACL,QAAA,SAAS,GAAG,CAAC,CAAC;AAEpB,MAAM,6BAA6B,GAAG,CAC3C,QAAa,EACb,OAAe,EACf,QAAmB,EACnB,OAAO,GAAG,SAAS,EACJ,EAAE;IACjB,MAAM,uBAAuB,GAAG,MAAM,QAAQ,CAAC,uBAAuB,EAAE,CAAC;IACzE,MAAM,8BAA8B,GAAG,6BAAuB,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC5F,IAAI,uBAAuB,KAAK,8BAA8B,EAAE;QAC9D,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,2BAA2B,CAAC,8BAA8B,EAAE;YACpF,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;QACH,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAClB;AACH,CAAC,CAAA,CAAC;AAdW,QAAA,6BAA6B,iCAcxC;AAEK,MAAM,gBAAgB,GAAG,CAC9B,QAAa,EACb,OAAe,EACf,QAAmB,EACJ,EAAE;IACjB,MAAM,iBAAiB,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC;IACtD,IAAI,iBAAiB,KAAK,gCAAwB,CAAC,OAAO,CAAC,EAAE;QAC3D,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,gCAAwB,CAAC,OAAO,CAAC,EAAE;YACrE,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;QACH,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAClB;AACH,CAAC,CAAA,CAAC;AAZW,QAAA,gBAAgB,oBAY3B;AAEK,MAAM,qBAAqB,GAAG,CAAO,QAAa,EAAE,QAAmB,EAAiB,EAAE;IAC/F,MAAM,WAAW,GAAc,MAAM,QAAQ,CAAC,eAAe,EAAE,CAAC;IAChE,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,yBAAiB,CAAC,EAAE;QACtC,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,qBAAqB,CAAC,yBAAiB,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC3F,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,OAAO,CAAC,GAAG,CAAC,gBAAgB,WAAW,CAAC,QAAQ,EAAE,eAAe,yBAAiB,EAAE,CAAC,CAAC;KACvF;AACH,CAAC,CAAA,CAAC;AAPW,QAAA,qBAAqB,yBAOhC;AAEK,MAAM,sBAAsB,GAAG,CAAO,QAAa,EAAE,QAAmB,EAAiB,EAAE;IAChG,MAAM,WAAW,GAAc,MAAM,QAAQ,CAAC,QAAQ,EAAE,CAAC;IACzD,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,iBAAS,CAAC,EAAE;QAC9B,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC,iBAAS,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;QACzE,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,+DAA+D;QAC/D,OAAO,CAAC,GAAG,CAAC,gBAAgB,WAAW,CAAC,QAAQ,EAAE,eAAe,iBAAS,EAAE,CAAC,CAAC;KAC/E;AACH,CAAC,CAAA,CAAC;AARW,QAAA,sBAAsB,0BAQjC;AAEK,MAAM,0BAA0B,GAAG,CACxC,QAAa,EACb,OAAe,EACf,QAAmB,EACJ,EAAE;IACjB,MAAM,aAAa,GAAG,SAAS,CAAC,qBAAqB,CAAC;IACtD,MAAM,oBAAoB,GAAG,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAC/D,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,oBAAoB,EAAE,CAAC;IAC7D,IAAI,cAAc,KAAK,oBAAoB,EAAE;QAC3C,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,uBAAuB,CAAC,oBAAoB,EAAE;YACtE,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;QACH,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAClB;AACH,CAAC,CAAA,CAAC;AAdW,QAAA,0BAA0B,8BAcrC;AAEK,MAAM,wBAAwB,GAAG,CACtC,QAAa,EACb,OAAe,EACf,QAAmB,EACJ,EAAE;IACjB,MAAM,gBAAgB,GAAG,SAAS,CAAC,wBAAwB,CAAC;IAC5D,MAAM,uBAAuB,GAAG,gBAAgB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACrE,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,kBAAkB,EAAE,CAAC;IAC3D,IAAI,cAAc,KAAK,uBAAuB,EAAE;QAC9C,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,qBAAqB,CAAC,uBAAuB,EAAE;YACvE,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;QACH,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAClB;AACH,CAAC,CAAA,CAAC;AAdW,QAAA,wBAAwB,4BAcnC;AAEK,MAAM,oBAAoB,GAAG,CAClC,OAAe,EACf,GAAsC,EACY,EAAE;IACpD,IAAI,QAAQ,CAAC;IACb,IAAI,OAAO,KAAK,MAAM,EAAE;QACtB,QAAQ,GAAG,eAAK,CAAC,eAAe,EAAE,CAAC;KACpC;SAAM;QACL,QAAQ,GAAG,eAAK,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;KAC9C;IACD,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAClF,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC;IAE9C,OAAO;QACL,MAAM;QACN,QAAQ;KACT,CAAC;AACJ,CAAC,CAAA,CAAC;AAjBW,QAAA,oBAAoB,wBAiB/B"}
+{"version":3,"file":"adminTasks.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":"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"}

package/dist/scripts-create2/contract-setup/setupBatchConversionPayments.d.ts

@@ -0,0 +1,8 @@
+import { HardhatRuntimeEnvironmentExtended } from '../types';
+/**
+ * Updates the values of the batch fees of the BatchConversionPayments contract, if needed.
+ * @param contractAddress address of the BatchConversionPayments proxy.
+ * @param hre Hardhat runtime environment.
+ */
+export declare const setupBatchConversionPayments: (contractAddress: string, hre: HardhatRuntimeEnvironmentExtended) => Promise<void>;
+//# sourceMappingURL=setupBatchConversionPayments.d.ts.map

package/dist/scripts-create2/contract-setup/setupBatchConversionPayments.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"setupBatchConversionPayments.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupBatchConversionPayments.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAW7D;;;;GAIG;AACH,eAAO,MAAM,4BAA4B,oBACtB,MAAM,OAClB,iCAAiC,KACrC,QAAQ,IAAI,CA0Ed,CAAC"}

package/dist/scripts-create2/contract-setup/setupBatchConversionPayments.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupBatchConversionPayments = void 0;
+const tslib_1 = require("tslib");
+const lib_1 = require("../../src/lib");
+const adminTasks_1 = require("./adminTasks");
+const currency_1 = require("@requestnetwork/currency");
+const types_1 = require("@requestnetwork/types");
+/**
+ * Updates the values of the batch fees of the BatchConversionPayments contract, if needed.
+ * @param contractAddress address of the BatchConversionPayments proxy.
+ * @param hre Hardhat runtime environment.
+ */
+const setupBatchConversionPayments = (contractAddress, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
+    // Setup contract parameters
+    const batchConversionPaymentContract = new hre.ethers.Contract(contractAddress, lib_1.batchConversionPaymentsArtifact.getContractAbi());
+    // constants related to chainlink and conversion rate
+    const currencyManager = currency_1.CurrencyManager.getDefault();
+    const setUpActions = (network) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
+        console.log(`Setup BatchConversionPayments on ${network}`);
+        const NativeAddress = currencyManager.getNativeCurrency(types_1.RequestLogicTypes.CURRENCY.ETH, network).hash;
+        const USDAddress = currencyManager.fromSymbol('USD').hash;
+        const { signer, gasPrice } = yield (0, adminTasks_1.getSignerAndGasPrice)(network, hre);
+        const batchConversionPaymentConnected = batchConversionPaymentContract.connect(signer);
+        // start from the adminNonce, increase gasPrice if needed
+        const gasCoef = 2;
+        yield (0, adminTasks_1.updateBatchPaymentFees)(batchConversionPaymentConnected, gasPrice.mul(gasCoef));
+        yield (0, adminTasks_1.updateBatchPaymentFeeAmountUSDLimit)(batchConversionPaymentConnected, gasPrice.mul(gasCoef));
+        yield (0, adminTasks_1.updateBatchConversionProxy)(batchConversionPaymentConnected, network, gasPrice.mul(gasCoef), 'erc20');
+        yield (0, adminTasks_1.updateBatchConversionProxy)(batchConversionPaymentConnected, network, gasPrice.mul(gasCoef), 'native');
+        yield (0, adminTasks_1.updateBatchConversionProxy)(batchConversionPaymentConnected, network, gasPrice.mul(gasCoef), 'erc20Conversion');
+        yield (0, adminTasks_1.updateBatchConversionProxy)(batchConversionPaymentConnected, network, gasPrice.mul(gasCoef), 'nativeConversion');
+        yield (0, adminTasks_1.updateBatchConversionProxy)(batchConversionPaymentConnected, network, gasPrice.mul(gasCoef), 'chainlinkConversionPath');
+        yield (0, adminTasks_1.updateNativeAndUSDAddress)(batchConversionPaymentConnected, NativeAddress, USDAddress, gasPrice.mul(gasCoef));
+    });
+    for (const network of hre.config.xdeploy.networks) {
+        try {
+            yield Promise.resolve(setUpActions(network));
+        }
+        catch (err) {
+            console.warn(`An error occurred during the setup of BatchConversion on ${network}`);
+            console.warn(err);
+        }
+    }
+    console.log('Setup for setupBatchConversionPayment successfull');
+});
+exports.setupBatchConversionPayments = setupBatchConversionPayments;
+//# sourceMappingURL=setupBatchConversionPayments.js.map

package/dist/scripts-create2/contract-setup/setupBatchConversionPayments.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"setupBatchConversionPayments.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupBatchConversionPayments.ts"],"names":[],"mappings":";;;;AAAA,uCAAgE;AAEhE,6CAMsB;AACtB,uDAA2D;AAC3D,iDAA0D;AAE1D;;;;GAIG;AACI,MAAM,4BAA4B,GAAG,CAC1C,eAAuB,EACvB,GAAsC,EACvB,EAAE;IACjB,4BAA4B;IAC5B,MAAM,8BAA8B,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAC5D,eAAe,EACf,qCAA+B,CAAC,cAAc,EAAE,CACjD,CAAC;IACF,qDAAqD;IACrD,MAAM,eAAe,GAAG,0BAAe,CAAC,UAAU,EAAE,CAAC;IAErD,MAAM,YAAY,GAAG,CAAO,OAAe,EAAE,EAAE;QAC7C,OAAO,CAAC,GAAG,CAAC,oCAAoC,OAAO,EAAE,CAAC,CAAC;QAE3D,MAAM,aAAa,GAAG,eAAe,CAAC,iBAAiB,CACrD,yBAAiB,CAAC,QAAQ,CAAC,GAAG,EAC9B,OAAO,CACP,CAAC,IAAI,CAAC;QACR,MAAM,UAAU,GAAG,eAAe,CAAC,UAAU,CAAC,KAAK,CAAE,CAAC,IAAI,CAAC;QAE3D,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,iCAAoB,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QACtE,MAAM,+BAA+B,GAAG,8BAA8B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAEvF,yDAAyD;QACzD,MAAM,OAAO,GAAG,CAAC,CAAC;QAClB,MAAM,IAAA,mCAAsB,EAAC,+BAA+B,EAAE,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;QACrF,MAAM,IAAA,gDAAmC,EACvC,+BAA+B,EAC/B,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CACtB,CAAC;QACF,MAAM,IAAA,uCAA0B,EAC9B,+BAA+B,EAC/B,OAAO,EACP,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EACrB,OAAO,CACR,CAAC;QACF,MAAM,IAAA,uCAA0B,EAC9B,+BAA+B,EAC/B,OAAO,EACP,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EACrB,QAAQ,CACT,CAAC;QACF,MAAM,IAAA,uCAA0B,EAC9B,+BAA+B,EAC/B,OAAO,EACP,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EACrB,iBAAiB,CAClB,CAAC;QACF,MAAM,IAAA,uCAA0B,EAC9B,+BAA+B,EAC/B,OAAO,EACP,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EACrB,kBAAkB,CACnB,CAAC;QACF,MAAM,IAAA,uCAA0B,EAC9B,+BAA+B,EAC/B,OAAO,EACP,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EACrB,yBAAyB,CAC1B,CAAC;QACF,MAAM,IAAA,sCAAyB,EAC7B,+BAA+B,EAC/B,aAAa,EACb,UAAU,EACV,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CACtB,CAAC;IACJ,CAAC,CAAA,CAAC;IACF,KAAK,MAAM,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;QACjD,IAAI;YACF,MAAM,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;SAC9C;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,4DAA4D,OAAO,EAAE,CAAC,CAAC;YACpF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB;KACF;IACD,OAAO,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAAC;AACnE,CAAC,CAAA,CAAC;AA7EW,QAAA,4BAA4B,gCA6EvC"}

package/dist/scripts-create2/contract-setup/setupETHConversionProxy.d.ts

@@ -1,7 +1,7 @@
 import { HardhatRuntimeEnvironmentExtended } from '../types';
 /**
- * Updates the values of the batch fees of the BatchPayments contract, if needed
- * @param contractAddress address of the BatchPayments Proxy
+ * Updates the values of the chainlinkConversionPath and EthFeeProxy addresses if needed
+ * @param contractAddress address of the ETHConversion Proxy
  * @param hre Hardhat runtime environment
  */
 export declare const setupETHConversionProxy: (contractAddress: string, hre: HardhatRuntimeEnvironmentExtended) => Promise<void>;

package/dist/scripts-create2/contract-setup/setupETHConversionProxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setupETHConversionProxy.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupETHConversionProxy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAO7D;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,oBACjB,MAAM,OAClB,iCAAiC,KACrC,QAAQ,IAAI,CAqBd,CAAC"}
+{"version":3,"file":"setupETHConversionProxy.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupETHConversionProxy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAO7D;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,oBACjB,MAAM,OAClB,iCAAiC,KACrC,QAAQ,IAAI,CAyBd,CAAC"}

package/dist/scripts-create2/contract-setup/setupETHConversionProxy.js

@@ -5,8 +5,8 @@ const tslib_1 = require("tslib");
 const lib_1 = require("../../src/lib");
 const adminTasks_1 = require("./adminTasks");
 /**
- * Updates the values of the batch fees of the BatchPayments contract, if needed
- * @param contractAddress address of the BatchPayments Proxy
+ * Updates the values of the chainlinkConversionPath and EthFeeProxy addresses if needed
+ * @param contractAddress address of the ETHConversion Proxy
  * @param hre Hardhat runtime environment
  */
 const setupETHConversionProxy = (contractAddress, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
@@ -15,8 +15,8 @@ const setupETHConversionProxy = (contractAddress, hre) => (0, tslib_1.__awaiter)
     yield Promise.all(hre.config.xdeploy.networks.map((network) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
         try {
             const { signer, gasPrice } = yield (0, adminTasks_1.getSignerAndGasPrice)(network, hre);
-            const EthConversionProxyConnected = yield EthConversionProxyContract.connect(signer);
-            yield (0, adminTasks_1.updatePaymentEthFeeProxy)(EthConversionProxyConnected, network, gasPrice);
+            const EthConversionProxyConnected = EthConversionProxyContract.connect(signer);
+            yield (0, adminTasks_1.updatePaymentFeeProxyAddress)(EthConversionProxyConnected, network, gasPrice, 'native');
             yield (0, adminTasks_1.updateChainlinkConversionPath)(EthConversionProxyConnected, network, gasPrice);
             console.log(`Setup of EthConversionProxy successful on ${network}`);
         }

package/dist/scripts-create2/contract-setup/setupETHConversionProxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"setupETHConversionProxy.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupETHConversionProxy.ts"],"names":[],"mappings":";;;;AAAA,uCAAsD;AAEtD,6CAIsB;AAEtB;;;;GAIG;AACI,MAAM,uBAAuB,GAAG,CACrC,eAAuB,EACvB,GAAsC,EACvB,EAAE;IACjB,4BAA4B;IAC5B,MAAM,0BAA0B,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CACxD,eAAe,EACf,2BAAqB,CAAC,cAAc,EAAE,CACvC,CAAC;IACF,MAAM,OAAO,CAAC,GAAG,CACf,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAO,OAAO,EAAE,EAAE;QAChD,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,iCAAoB,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YACtE,MAAM,2BAA2B,GAAG,MAAM,0BAA0B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAErF,MAAM,IAAA,qCAAwB,EAAC,2BAA2B,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC/E,MAAM,IAAA,0CAA6B,EAAC,2BAA2B,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YACpF,OAAO,CAAC,GAAG,CAAC,6CAA6C,OAAO,EAAE,CAAC,CAAC;SACrE;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,+DAA+D,OAAO,EAAE,CAAC,CAAC;YACvF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB;IACH,CAAC,CAAA,CAAC,CACH,CAAC;AACJ,CAAC,CAAA,CAAC;AAxBW,QAAA,uBAAuB,2BAwBlC"}
+{"version":3,"file":"setupETHConversionProxy.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupETHConversionProxy.ts"],"names":[],"mappings":";;;;AAAA,uCAAsD;AAEtD,6CAIsB;AAEtB;;;;GAIG;AACI,MAAM,uBAAuB,GAAG,CACrC,eAAuB,EACvB,GAAsC,EACvB,EAAE;IACjB,4BAA4B;IAC5B,MAAM,0BAA0B,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CACxD,eAAe,EACf,2BAAqB,CAAC,cAAc,EAAE,CACvC,CAAC;IACF,MAAM,OAAO,CAAC,GAAG,CACf,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAO,OAAO,EAAE,EAAE;QAChD,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,iCAAoB,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YACtE,MAAM,2BAA2B,GAAG,0BAA0B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAC/E,MAAM,IAAA,yCAA4B,EAChC,2BAA2B,EAC3B,OAAO,EACP,QAAQ,EACR,QAAQ,CACT,CAAC;YACF,MAAM,IAAA,0CAA6B,EAAC,2BAA2B,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YACpF,OAAO,CAAC,GAAG,CAAC,6CAA6C,OAAO,EAAE,CAAC,CAAC;SACrE;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,+DAA+D,OAAO,EAAE,CAAC,CAAC;YACvF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB;IACH,CAAC,CAAA,CAAC,CACH,CAAC;AACJ,CAAC,CAAA,CAAC;AA5BW,QAAA,uBAAuB,2BA4BlC"}

package/dist/scripts-create2/contract-setup/setupErc20ConversionProxy.d.ts

@@ -1,7 +1,7 @@
 import { HardhatRuntimeEnvironmentExtended } from '../types';
 /**
  * Updates the values of the chainlinkConversionPath and ERC20FeeProxy addresses if needed
- * @param contractAddress address of the BatchPayments Proxy
+ * @param contractAddress address of the ERC20Conversion Proxy
  * @param hre Hardhat runtime environment
  */
 export declare const setupErc20ConversionProxy: (contractAddress: string, hre: HardhatRuntimeEnvironmentExtended) => Promise<void>;

package/dist/scripts-create2/contract-setup/setupErc20ConversionProxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setupErc20ConversionProxy.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupErc20ConversionProxy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAO7D;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,oBACnB,MAAM,OAClB,iCAAiC,KACrC,QAAQ,IAAI,CAqBd,CAAC"}
+{"version":3,"file":"setupErc20ConversionProxy.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupErc20ConversionProxy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAS7D;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,oBACnB,MAAM,OAClB,iCAAiC,KACrC,QAAQ,IAAI,CAyBd,CAAC"}

package/dist/scripts-create2/contract-setup/setupErc20ConversionProxy.js

@@ -4,19 +4,20 @@ exports.setupErc20ConversionProxy = void 0;
 const tslib_1 = require("tslib");
 const lib_1 = require("../../src/lib");
 const adminTasks_1 = require("./adminTasks");
+const ERC20ConversionVersion = '0.1.2';
 /**
  * Updates the values of the chainlinkConversionPath and ERC20FeeProxy addresses if needed
- * @param contractAddress address of the BatchPayments Proxy
+ * @param contractAddress address of the ERC20Conversion Proxy
  * @param hre Hardhat runtime environment
  */
 const setupErc20ConversionProxy = (contractAddress, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
     // Setup contract parameters
-    const Erc20ConversionProxyContract = new hre.ethers.Contract(contractAddress, lib_1.erc20ConversionProxy.getContractAbi());
+    const Erc20ConversionProxyContract = new hre.ethers.Contract(contractAddress, lib_1.erc20ConversionProxy.getContractAbi(ERC20ConversionVersion));
     yield Promise.all(hre.config.xdeploy.networks.map((network) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
         try {
             const { signer, gasPrice } = yield (0, adminTasks_1.getSignerAndGasPrice)(network, hre);
-            const Erc20ConversionProxyConnected = yield Erc20ConversionProxyContract.connect(signer);
-            yield (0, adminTasks_1.updatePaymentErc20FeeProxy)(Erc20ConversionProxyConnected, network, gasPrice);
+            const Erc20ConversionProxyConnected = Erc20ConversionProxyContract.connect(signer);
+            yield (0, adminTasks_1.updatePaymentFeeProxyAddress)(Erc20ConversionProxyConnected, network, gasPrice, 'erc20');
             yield (0, adminTasks_1.updateChainlinkConversionPath)(Erc20ConversionProxyConnected, network, gasPrice);
             console.log(`Setup of Erc20ConversionProxy successful on ${network}`);
         }

package/dist/scripts-create2/contract-setup/setupErc20ConversionProxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"setupErc20ConversionProxy.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupErc20ConversionProxy.ts"],"names":[],"mappings":";;;;AAAA,uCAAqD;AAErD,6CAIsB;AAEtB;;;;GAIG;AACI,MAAM,yBAAyB,GAAG,CACvC,eAAuB,EACvB,GAAsC,EACvB,EAAE;IACjB,4BAA4B;IAC5B,MAAM,4BAA4B,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAC1D,eAAe,EACf,0BAAoB,CAAC,cAAc,EAAE,CACtC,CAAC;IACF,MAAM,OAAO,CAAC,GAAG,CACf,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAO,OAAO,EAAE,EAAE;QAChD,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,iCAAoB,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YACtE,MAAM,6BAA6B,GAAG,MAAM,4BAA4B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAEzF,MAAM,IAAA,uCAA0B,EAAC,6BAA6B,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YACnF,MAAM,IAAA,0CAA6B,EAAC,6BAA6B,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YACtF,OAAO,CAAC,GAAG,CAAC,+CAA+C,OAAO,EAAE,CAAC,CAAC;SACvE;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,iEAAiE,OAAO,EAAE,CAAC,CAAC;YACzF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB;IACH,CAAC,CAAA,CAAC,CACH,CAAC;AACJ,CAAC,CAAA,CAAC;AAxBW,QAAA,yBAAyB,6BAwBpC"}
+{"version":3,"file":"setupErc20ConversionProxy.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupErc20ConversionProxy.ts"],"names":[],"mappings":";;;;AAAA,uCAAqD;AAErD,6CAIsB;AAEtB,MAAM,sBAAsB,GAAG,OAAO,CAAC;AAEvC;;;;GAIG;AACI,MAAM,yBAAyB,GAAG,CACvC,eAAuB,EACvB,GAAsC,EACvB,EAAE;IACjB,4BAA4B;IAC5B,MAAM,4BAA4B,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAC1D,eAAe,EACf,0BAAoB,CAAC,cAAc,CAAC,sBAAsB,CAAC,CAC5D,CAAC;IACF,MAAM,OAAO,CAAC,GAAG,CACf,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAO,OAAO,EAAE,EAAE;QAChD,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,iCAAoB,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YACtE,MAAM,6BAA6B,GAAG,4BAA4B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACnF,MAAM,IAAA,yCAA4B,EAChC,6BAA6B,EAC7B,OAAO,EACP,QAAQ,EACR,OAAO,CACR,CAAC;YACF,MAAM,IAAA,0CAA6B,EAAC,6BAA6B,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YACtF,OAAO,CAAC,GAAG,CAAC,+CAA+C,OAAO,EAAE,CAAC,CAAC;SACvE;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,iEAAiE,OAAO,EAAE,CAAC,CAAC;YACzF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB;IACH,CAAC,CAAA,CAAC,CACH,CAAC;AACJ,CAAC,CAAA,CAAC;AA5BW,QAAA,yBAAyB,6BA4BpC"}

package/dist/scripts-create2/contract-setup/setups.d.ts

@@ -1,6 +1,6 @@
 import { HardhatRuntimeEnvironmentExtended } from '../types';
 /**
- * Updates the values of either BatchPayments, ETHConversionProxy, or ERC20SwapToConversion contract, if needed
+ * Updates the values of either BatchConversionPayments, ETHConversionProxy, or ERC20SwapToConversion contract, if needed
  * @param contractAddress address of the proxy
  * @param hre Hardhat runtime environment
  * @param contractName name of the contract

package/dist/scripts-create2/contract-setup/setups.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupContract = void 0;
 const tslib_1 = require("tslib");
 const setupETHConversionProxy_1 = require("./setupETHConversionProxy");
-const setupBatchPayments_1 = require("./setupBatchPayments");
+const setupBatchConversionPayments_1 = require("./setupBatchConversionPayments");
 const setupERC20SwapToConversion_1 = require("./setupERC20SwapToConversion");
 /**
- * Updates the values of either BatchPayments, ETHConversionProxy, or ERC20SwapToConversion contract, if needed
+ * Updates the values of either BatchConversionPayments, ETHConversionProxy, or ERC20SwapToConversion contract, if needed
  * @param contractAddress address of the proxy
  * @param hre Hardhat runtime environment
  * @param contractName name of the contract
@@ -21,8 +21,8 @@ const setupContract = (contractAddress, hre, contractName) => (0, tslib_1.__awai
             yield (0, setupERC20SwapToConversion_1.setupERC20SwapToConversion)(contractAddress, hre);
             break;
         }
-        case 'BatchPayments': {
-            yield (0, setupBatchPayments_1.setupBatchPayments)(contractAddress, hre);
+        case 'BatchConversionPayments': {
+            yield (0, setupBatchConversionPayments_1.setupBatchConversionPayments)(contractAddress, hre);
             break;
         }
         default: {

package/dist/scripts-create2/contract-setup/setups.js.map

@@ -1 +1 @@
-{"version":3,"file":"setups.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setups.ts"],"names":[],"mappings":";;;;AACA,uEAAoE;AACpE,6DAA0D;AAC1D,6EAA0E;AAE1E;;;;;GAKG;AACI,MAAM,aAAa,GAAG,CAC3B,eAAuB,EACvB,GAAsC,EACtC,YAAoB,EACL,EAAE;IACjB,QAAQ,YAAY,EAAE;QACpB,KAAK,oBAAoB,CAAC,CAAC;YACzB,MAAM,IAAA,iDAAuB,EAAC,eAAe,EAAE,GAAG,CAAC,CAAC;YACpD,MAAM;SACP;QACD,KAAK,uBAAuB,CAAC,CAAC;YAC5B,MAAM,IAAA,uDAA0B,EAAC,eAAe,EAAE,GAAG,CAAC,CAAC;YACvD,MAAM;SACP;QACD,KAAK,eAAe,CAAC,CAAC;YACpB,MAAM,IAAA,uCAAkB,EAAC,eAAe,EAAE,GAAG,CAAC,CAAC;YAC/C,MAAM;SACP;QACD,OAAO,CAAC,CAAC;YACP,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;YACvC,MAAM;SACP;KACF;AACH,CAAC,CAAA,CAAC;AAvBW,QAAA,aAAa,iBAuBxB"}
+{"version":3,"file":"setups.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setups.ts"],"names":[],"mappings":";;;;AACA,uEAAoE;AACpE,iFAA8E;AAC9E,6EAA0E;AAE1E;;;;;GAKG;AACI,MAAM,aAAa,GAAG,CAC3B,eAAuB,EACvB,GAAsC,EACtC,YAAoB,EACL,EAAE;IACjB,QAAQ,YAAY,EAAE;QACpB,KAAK,oBAAoB,CAAC,CAAC;YACzB,MAAM,IAAA,iDAAuB,EAAC,eAAe,EAAE,GAAG,CAAC,CAAC;YACpD,MAAM;SACP;QACD,KAAK,uBAAuB,CAAC,CAAC;YAC5B,MAAM,IAAA,uDAA0B,EAAC,eAAe,EAAE,GAAG,CAAC,CAAC;YACvD,MAAM;SACP;QACD,KAAK,yBAAyB,CAAC,CAAC;YAC9B,MAAM,IAAA,2DAA4B,EAAC,eAAe,EAAE,GAAG,CAAC,CAAC;YACzD,MAAM;SACP;QACD,OAAO,CAAC,CAAC;YACP,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;YACvC,MAAM;SACP;KACF;AACH,CAAC,CAAA,CAAC;AAvBW,QAAA,aAAa,iBAuBxB"}

package/dist/scripts-create2/deploy.js

@@ -6,7 +6,7 @@ const utils_1 = require("./utils");
 const xdeployer_1 = require("./xdeployer");
 const constructor_args_1 = require("./constructor-args");
 const contract_setup_1 = require("./contract-setup");
-const setupBatchPayments_1 = require("./contract-setup/setupBatchPayments");
+const setupBatchConversionPayments_1 = require("./contract-setup/setupBatchConversionPayments");
 const setupETHConversionProxy_1 = require("./contract-setup/setupETHConversionProxy");
 const setupErc20ConversionProxy_1 = require("./contract-setup/setupErc20ConversionProxy");
 // Deploys, set up the contracts and returns the address
@@ -76,11 +76,11 @@ const deployWithCreate2FromList = (hre) => (0, tslib_1.__awaiter)(void 0, void 0
                 yield (0, exports.deployOneWithCreate2)({ contract, constructorArgs }, hre);
                 break;
             }
-            case 'BatchPayments': {
+            case 'BatchConversionPayments': {
                 const network = hre.config.xdeploy.networks[0];
                 const constructorArgs = (0, constructor_args_1.getConstructorArgs)(contract, network);
                 const address = yield (0, exports.deployOneWithCreate2)({ contract, constructorArgs }, hre);
-                yield (0, setupBatchPayments_1.setupBatchPayments)(address, hre);
+                yield (0, setupBatchConversionPayments_1.setupBatchConversionPayments)(address, hre);
                 break;
             }
             // Other cases to add when necessary