@requestnetwork/smart-contracts 0.28.1-next.1742 → 0.28.1-next.1749

package/README.md

@@ -79,9 +79,7 @@ The package stores the following smart contracts:
 - `ERC20SwapToPay` same as `ERC20FeeProxy` but allowing the payer to swap another token before paying
 - `ERC20SwapToConversion` same as `ERC20ConversionProxy` but allowing the payer to swap another token before paying
 
-## Smart contracts deployment
-
-### Local deployment
+## Local deployment
 
 The smart contracts can be deployed locally with the following commands:
 
@@ -102,29 +100,7 @@ And in another terminal, deploy the smart contracts locally with:
 yarn run deploy
 ```
 
-### Live deployment (Payment only)
-
-The goal of this script is to let all our payment contracts be deployed with the same sequence on every chain.
-
-The script also verify deployed contracts.
-
-**Be sure that artifacts are up-to-date with most recent deployments**
-
-Environment variables needed: `ETHERSCAN_API_KEY`, `ADMIN_WALLET_ADDRESS`, `DEPLOYMENT_PRIVATE_KEY`
-
-```bash
-# First check what will be done
-yarn hardhat deploy-live-payments --network matic --dry-run
-
-# Run
-yarn hardhat deploy-live-payments --network matic
-
-# To test locally
-yarn hardhat deploy-live-payments --network private --force
-yarn hardhat deploy-live-payments --network private --force --dry-run
-```
-
-### Deployment through request deployer
+## Live deployment
 
 The request deployer enables multichain deployment of several smart contracts at predefined address. It is based on https://github.com/pcaversaccio/xdeployer
 
@@ -134,7 +110,7 @@ Be sure to run `yarn build:sol` before deploying the deployer or a contract.
 
 The contracts implemented are listed in the array `create2ContractDeploymentList` in [Utils](./scripts-create2/utils.ts).
 
-#### Deploy the request deployer
+### Deploy the request deployer (once per chain)
 
 Environment variables needed: `DEPLOYER_MASTER_KEY`
 
@@ -142,7 +118,7 @@ Environment variables needed: `DEPLOYER_MASTER_KEY`
 yarn hardhat deploy-deployer-contract --network <NETWORK>
 ```
 
-#### Compute the contract addresses
+### Compute the contract addresses
 
 Run:
 
@@ -152,13 +128,21 @@ yarn hardhat compute-contract-addresses
 
 It will compute the addresses of the contracts to be deployed via the request deployer.
 
-#### Deploy the contracts
+### Deploy the contracts
 
 Depending on the xdeployer config, this script will deploy the smart contracts on several chain simultaneously
 Environment variables needed: `ADMIN_PRIVATE_KEY`
 You will need the request deployer to be deployed.
 Then run:
 
+To deploy all contracts to one network, use:
+
+```bash
+NETWORK=<NETWORK> yarn hardhat deploy-contracts-through-deployer
+```
+
+If you want to deploy all contracts on all networks:
+
 ```bash
 yarn hardhat deploy-contracts-through-deployer
 ```
@@ -171,17 +155,45 @@ This command will output details about each contract deployment on each chain:
 - If already deployed: the network, and the contract address
 - If an error occured: the said error
 
-#### Verify the contracts
+### Verify the contracts
 
-For each network the contract were deployed to run:
+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.
 
 ```bash
 yarn hardhat verify-contract-from-deployer --network <NETWORK>
 ```
 
-The associated `EXPLORER_API_KEY` is mandatory.
+#### Verify the contracts manually With Hardhat (legacy)
 
-### Tests
+A more generic way to verify any contract by setting constructor argments manually:
+
+```bash
+yarn hardhat verify --network NETWORK_NAME DEPLOYED_CONTRACT_ADDRESS "Constructor argument 1"
+```
+
+### Deprecated payment deployment scripts (legacy)
+
+The goal of this script is to let all our payment contracts be deployed with the same sequence on every chain.
+
+The script also verify deployed contracts.
+
+**Be sure that artifacts are up-to-date with most recent deployments**
+
+Environment variables needed: `ETHERSCAN_API_KEY`, `ADMIN_WALLET_ADDRESS`, `DEPLOYMENT_PRIVATE_KEY`
+
+```bash
+# First check what will be done
+yarn hardhat deploy-live-payments --network matic --dry-run
+
+# Run
+yarn hardhat deploy-live-payments --network matic
+
+# To test locally
+yarn hardhat deploy-live-payments --network private --force
+yarn hardhat deploy-live-payments --network private --force --dry-run
+```
+
+## Tests
 
 After a local deployment:
 
@@ -195,14 +207,6 @@ Networks and providers are configured in [hardhat.config.ts](hardhat.config.ts).
 
 Have a look at the [Hardhat documentation](https://hardhat.org/config/).
 
-## Contract verification with Hardhat
-
-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.
-
-```bash
-yarn hardhat verify --network NETWORK_NAME DEPLOYED_CONTRACT_ADDRESS "Constructor argument 1"
-```
-
 ## Contributing
 
 Pull requests are welcome. For major changes, please open an issue first to discuss what you would like to change.

package/dist/hardhat.config.d.ts

@@ -25,6 +25,11 @@ declare const _default: {
             chainId: number;
             accounts: string[] | undefined;
         };
+        goerli: {
+            url: string;
+            chainId: number;
+            accounts: string[] | undefined;
+        };
         matic: {
             url: string;
             chainId: number;
@@ -80,6 +85,7 @@ declare const _default: {
         apiKey: {
             mainnet: string | undefined;
             rinkeby: string | undefined;
+            goerli: string | undefined;
             bsc: string | undefined;
             bscTestnet: string | undefined;
             opera: string | undefined;

package/dist/hardhat.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hardhat.config.d.ts","sourceRoot":"","sources":["../hardhat.config.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,CAAC;AAC5B,OAAO,2BAA2B,CAAC;AACnC,OAAO,4BAA4B,CAAC;AACpC,OAAO,8BAA8B,CAAC;AACtC,OAAO,2BAA2B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6CnC,wBAkHE"}
+{"version":3,"file":"hardhat.config.d.ts","sourceRoot":"","sources":["../hardhat.config.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,CAAC;AAC5B,OAAO,2BAA2B,CAAC;AACnC,OAAO,4BAA4B,CAAC;AACpC,OAAO,8BAA8B,CAAC;AACtC,OAAO,2BAA2B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6CnC,wBAwHE"}

package/dist/hardhat.config.js

@@ -13,8 +13,8 @@ const deploy_payments_1 = require("./scripts/deploy-payments");
 const check_deployer_1 = require("./scripts-create2/check-deployer");
 const deploy_request_deployer_1 = require("./scripts-create2/deploy-request-deployer");
 const compute_one_address_1 = require("./scripts-create2/compute-one-address");
-const verify_one_1 = require("./scripts-create2/verify-one");
-const deploy_one_1 = require("./scripts-create2/deploy-one");
+const verify_1 = require("./scripts-create2/verify");
+const deploy_1 = require("./scripts-create2/deploy");
 const utils_1 = require("@requestnetwork/utils");
 (0, dotenv_1.config)();
 const accounts = process.env.DEPLOYMENT_PRIVATE_KEY
@@ -60,6 +60,11 @@ exports.default = {
             chainId: 4,
             accounts,
         },
+        goerli: {
+            url: process.env.WEB3_PROVIDER_URL || 'https://goerli.infura.io/v3/YOUR_API_KEY',
+            chainId: 5,
+            accounts,
+        },
         matic: {
             url: url('matic'),
             chainId: 137,
@@ -115,6 +120,7 @@ exports.default = {
         apiKey: {
             mainnet: process.env.ETHERSCAN_API_KEY,
             rinkeby: process.env.ETHERSCAN_API_KEY,
+            goerli: process.env.ETHERSCAN_API_KEY,
             // binance smart chain
             bsc: process.env.BSCSCAN_API_KEY,
             bscTestnet: process.env.BSCSCAN_API_KEY,
@@ -180,10 +186,10 @@ exports.default = {
 }));
 (0, config_1.task)('deploy-contracts-through-deployer', 'Deploy the contracts from the Create2DeploymentList using the create2 scheme').setAction((_args, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
     yield (0, check_deployer_1.checkCreate2Deployer)(hre);
-    yield (0, deploy_one_1.deployWithCreate2FromList)(hre);
+    yield (0, deploy_1.deployWithCreate2FromList)(hre);
 }));
 (0, config_1.task)('verify-contract-from-deployer', 'Verify the contracts from the Create2DeploymentList for a specific network').setAction((_args, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
-    yield (0, verify_one_1.VerifyCreate2FromList)(hre);
+    yield (0, verify_1.VerifyCreate2FromList)(hre);
 }));
 (0, config_1.subtask)(DEPLOYER_KEY_GUARD, 'prevent usage of the deployer master key').setAction(() => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
     if (accounts && accounts[0] === process.env.DEPLOYER_MASTER_KEY) {

package/dist/hardhat.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"hardhat.config.js","sourceRoot":"","sources":["../hardhat.config.ts"],"names":[],"mappings":";;;AAAA,8BAA4B;AAC5B,qCAAmC;AACnC,sCAAoC;AACpC,wCAAsC;AACtC,qCAAmC;AACnC,2CAA+C;AAC/C,mCAAgC;AAChC,+DAA2D;AAC3D,+DAAsE;AACtE,qEAAwE;AACxE,uFAA2E;AAE3E,+EAAkG;AAClG,6DAAqE;AACrE,6DAAyE;AACzE,iDAA0C;AAE1C,IAAA,eAAM,GAAE,CAAC;AAET,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB;IACjD,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC;IACtC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB;QACjC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;QACnC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB;YAC/B,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;YACjC,CAAC,CAAC,SAAS,CAAC;AAEd,IAAI,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE;IAC7C,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;CAC9C;AAED,MAAM,kBAAkB,GAAG,oBAAoB,CAAC;AAEhD,+CAA+C;AAC/C,MAAM,sBAAsB,GAAG,4CAA4C,CAAC;AAE5E,+CAA+C;AAC/C,MAAM,qBAAqB,GAAG,4CAA4C,CAAC;AAE3E,sEAAsE;AACtE,MAAM,YAAY,GAAG,oEAAoE,CAAC;AAE1F,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB;IACvD,CAAC,CAAC,qBAAqB;IACvB,CAAC,CAAC,sBAAsB,CAAC;AAE3B,MAAM,GAAG,GAAG,CAAC,OAAe,EAAU,EAAE,CACtC,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,eAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;AAE9D,kBAAe;IACb,QAAQ,EAAE,OAAO;IACjB,KAAK,EAAE;QACL,OAAO,EAAE,eAAe;QACxB,KAAK,EAAE,gBAAgB;QACvB,SAAS,EAAE,OAAO;KACnB;IACD,QAAQ,EAAE;QACR,OAAO,EAAE;YACP,GAAG,EAAE,uBAAuB;YAC5B,QAAQ,EAAE,SAAS;SACpB;QACD,OAAO,EAAE;YACP,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,2CAA2C;YACjF,OAAO,EAAE,CAAC;YACV,QAAQ;SACT;QACD,OAAO,EAAE;YACP,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,2CAA2C;YACjF,OAAO,EAAE,CAAC;YACV,QAAQ;SACT;QACD,KAAK,EAAE;YACL,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC;YACjB,OAAO,EAAE,GAAG;YACZ,QAAQ;SACT;QACD,IAAI,EAAE;YACJ,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC;YAChB,OAAO,EAAE,KAAK;YACd,QAAQ;SACT;QACD,OAAO,EAAE;YACP,GAAG,EAAE,GAAG,CAAC,SAAS,CAAC;YACnB,OAAO,EAAE,EAAE;YACX,QAAQ;SACT;QACD,GAAG,EAAE;YACH,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC;YACf,OAAO,EAAE,EAAE;YACX,QAAQ;SACT;QACD,IAAI,EAAE;YACJ,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC;YAChB,OAAO,EAAE,GAAG;YACZ,QAAQ;SACT;QACD,IAAI,EAAE;YACJ,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC;YAChB,OAAO,EAAE,GAAG;YACZ,QAAQ;SACT;QACD,MAAM,EAAE;YACN,GAAG,EAAE,GAAG,CAAC,QAAQ,CAAC;YAClB,OAAO,EAAE,GAAG;YACZ,QAAQ;SACT;QACD,cAAc,EAAE;YACd,GAAG,EAAE,GAAG,CAAC,cAAc,CAAC;YACxB,OAAO,EAAE,KAAK;YACd,QAAQ;SACT;QACD,kBAAkB,EAAE;YAClB,GAAG,EAAE,GAAG,CAAC,kBAAkB,CAAC;YAC5B,OAAO,EAAE,MAAM;YACf,QAAQ;SACT;QACD,SAAS,EAAE;YACT,GAAG,EAAE,GAAG,CAAC,WAAW,CAAC;YACrB,OAAO,EAAE,KAAK;YACd,QAAQ;SACT;KACF;IACD,SAAS,EAAE;QACT,MAAM,EAAE;YACN,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACtC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACtC,sBAAsB;YACtB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe;YAChC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe;YACvC,iBAAiB;YACjB,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe;YAClC,UAAU;YACV,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;YACxC,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;YAC9C,WAAW;YACX,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;YACzC,YAAY;YACZ,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACxC,2DAA2D;YAC3D,mDAAmD;YACnD,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,SAAS;YAChB,MAAM,EAAE,SAAS;YACjB,aAAa,EAAE,SAAS;SACzB;KACF;IACD,SAAS,EAAE;QACT,MAAM,EAAE,WAAW;QACnB,MAAM,EAAE,WAAW;QACnB,uBAAuB,EAAE,KAAK,EAAE,mHAAmH;KACpJ;IACD,KAAK,EAAE;QACL,OAAO,EAAE,KAAK,EAAE,2BAA2B;KAC5C;IACD,OAAO,EAAE;QACP,IAAI,EAAE,YAAY;QAClB,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;QACrC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO;YAC3B,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;YACvB,CAAC,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,WAAW,CAAC;QAC9F,QAAQ,EAAE,SAAS;QACnB,eAAe,EAAE,eAAe;KACjC;CACF,CAAC;AAEF,iFAAiF;AACjF,IAAA,aAAI,EAAC,kBAAkB,EAAE,4BAA4B,CAAC,CAAC,SAAS,CAAC,CAAO,IAAI,EAAE,GAAG,EAAE,EAAE;IACnF,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IAClB,MAAM,IAAA,yBAAkB,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACpC,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;AACpD,CAAC,CAAA,CAAC,CAAC;AAEH,IAAA,aAAI,EACF,sBAAsB,EACtB,+FAA+F,CAChG;KACE,OAAO,CAAC,QAAQ,EAAE,2BAA2B,CAAC;KAC9C,OAAO,CAAC,OAAO,EAAE,wBAAwB,CAAC;KAC1C,SAAS,CAAC,CAAO,IAAI,EAAE,GAAG,EAAE,EAAE;;IAC7B,IAAI,CAAC,KAAK,GAAG,MAAA,IAAI,CAAC,KAAK,mCAAI,KAAK,CAAC;IACjC,IAAI,CAAC,MAAM,GAAG,MAAA,IAAI,CAAC,MAAM,mCAAI,KAAK,CAAC;IACnC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC;IAC5B,MAAM,GAAG,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAClC,MAAM,IAAA,2CAAyB,EAAC,IAAI,EAAE,GAAwC,CAAC,CAAC;AAClF,CAAC,CAAA,CAAC,CAAC;AAEL,kDAAkD;AAClD,IAAA,aAAI,EACF,0BAA0B,EAC1B,2DAA2D,CAC5D,CAAC,SAAS,CAAC,CAAO,KAAK,EAAE,GAAG,EAAE,EAAE;IAC/B,MAAM,IAAA,wCAAc,EAAC,GAAG,CAAC,CAAC;AAC5B,CAAC,CAAA,CAAC,CAAC;AAEH,IAAA,aAAI,EACF,4BAA4B,EAC5B,wFAAwF,CACzF,CAAC,SAAS,CAAC,CAAO,KAAK,EAAE,GAAG,EAAE,EAAE;IAC/B,MAAM,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACzB,MAAM,IAAA,+DAAyC,EAAC,GAAwC,CAAC,CAAC;AAC5F,CAAC,CAAA,CAAC,CAAC;AAEH,IAAA,aAAI,EACF,mCAAmC,EACnC,8EAA8E,CAC/E,CAAC,SAAS,CAAC,CAAO,KAAK,EAAE,GAAG,EAAE,EAAE;IAC/B,MAAM,IAAA,qCAAoB,EAAC,GAAwC,CAAC,CAAC;IACrE,MAAM,IAAA,sCAAyB,EAAC,GAAwC,CAAC,CAAC;AAC5E,CAAC,CAAA,CAAC,CAAC;AAEH,IAAA,aAAI,EACF,+BAA+B,EAC/B,4EAA4E,CAC7E,CAAC,SAAS,CAAC,CAAO,KAAK,EAAE,GAAG,EAAE,EAAE;IAC/B,MAAM,IAAA,kCAAqB,EAAC,GAAwC,CAAC,CAAC;AACxE,CAAC,CAAA,CAAC,CAAC;AAEH,IAAA,gBAAO,EAAC,kBAAkB,EAAE,0CAA0C,CAAC,CAAC,SAAS,CAAC,GAAS,EAAE;IAC3F,IAAI,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE;QAC/D,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;KAC/E;AACH,CAAC,CAAA,CAAC,CAAC"}
+{"version":3,"file":"hardhat.config.js","sourceRoot":"","sources":["../hardhat.config.ts"],"names":[],"mappings":"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"}

package/dist/scripts/conversion-proxy.d.ts

@@ -5,7 +5,7 @@ export declare function deployERC20ConversionProxy(args: {
     erc20FeeProxyAddress?: string;
     nonceCondition?: number;
 }, hre: HardhatRuntimeEnvironment): Promise<import("./deploy-one").DeploymentResult<Erc20ConversionProxy> | undefined>;
-export declare function deployETHConversionProxy(args: {
+export declare function deployEthConversionProxy(args: {
     chainlinkConversionPathAddress?: string;
     ethFeeProxyAddress?: string;
     nonceCondition?: number;

package/dist/scripts/conversion-proxy.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deployETHConversionProxy = exports.deployERC20ConversionProxy = void 0;
+exports.deployEthConversionProxy = exports.deployERC20ConversionProxy = void 0;
 const tslib_1 = require("tslib");
 const lib_1 = require("../src/lib");
 const deploy_one_1 = require("./deploy-one");
@@ -33,7 +33,7 @@ function deployERC20ConversionProxy(args, hre) {
     });
 }
 exports.deployERC20ConversionProxy = deployERC20ConversionProxy;
-function deployETHConversionProxy(args, hre) {
+function deployEthConversionProxy(args, hre) {
     var _a;
     return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
         const contractName = 'EthConversionProxy';
@@ -66,5 +66,5 @@ function deployETHConversionProxy(args, hre) {
         });
     });
 }
-exports.deployETHConversionProxy = deployETHConversionProxy;
+exports.deployEthConversionProxy = deployEthConversionProxy;
 //# sourceMappingURL=conversion-proxy.js.map

package/dist/scripts/deploy-payments.js

@@ -113,7 +113,7 @@ function deployAllPaymentContracts(args, hre) {
             /*
              * Batch 4
              *   - ChainlinkConversionPath (+ addWhitelistAdmin())
-             *   - ETHConversionProxy
+             *   - EthConversionProxy
              */
             const runDeploymentBatch_4 = (ethFeeProxyAddress) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
                 const NONCE_BATCH_4 = 10;
@@ -126,7 +126,7 @@ function deployAllPaymentContracts(args, hre) {
                     nonceCondition: NONCE_BATCH_4,
                 });
                 // Deploy ETH Conversion
-                const ethConversionResult = yield (0, conversion_proxy_1.deployETHConversionProxy)(Object.assign(Object.assign({}, args), { chainlinkConversionPathAddress,
+                const ethConversionResult = yield (0, conversion_proxy_1.deployEthConversionProxy)(Object.assign(Object.assign({}, args), { chainlinkConversionPathAddress,
                     ethFeeProxyAddress, nonceCondition: NONCE_BATCH_4 + 1, version: '0.2.0' }), hre);
                 addToResult(ethConversionResult);
                 // Administrate again whitelist admins for nonce consistency (due to 1 failing tx on Fantom)
@@ -193,23 +193,23 @@ function deployAllPaymentContracts(args, hre) {
                 }
                 const ethConversionAdminNonce = NONCE_BATCH_5 + 3;
                 yield (0, utils_1.jumpToNonce)(args, hre, ethConversionAdminNonce);
-                // 5.d ETHConversion.transferOwnership
+                // 5.d EthConversion.transferOwnership
                 if (yield nonceReady(ethConversionAdminNonce)) {
                     if (ethConversionResultInstance) {
                         if (!process.env.ADMIN_WALLET_ADDRESS) {
-                            throw new Error('ADMIN_WALLET_ADDRESS missing, cannot addWhitelistAdmin on ETHConversion.');
+                            throw new Error('ADMIN_WALLET_ADDRESS missing, cannot addWhitelistAdmin on EthConversion.');
                         }
                         if (args.simulate === false) {
                             const tx = yield ethConversionResultInstance.addWhitelistAdmin(process.env.ADMIN_WALLET_ADDRESS);
                             yield tx.wait(1);
                         }
                         else {
-                            console.log(`[i] Simulating addWhitelistAdmin to ETHConversion at ${ethConversionResultInstance.address}`);
+                            console.log(`[i] Simulating addWhitelistAdmin to EthConversion at ${ethConversionResultInstance.address}`);
                         }
                     }
                     else {
                         if (!ethConversionResultInstance) {
-                            console.warn(`Warning: the ETHConversion contract instance is not ready for ETHConversion update, consider retrying.`);
+                            console.warn(`Warning: the EthConversion contract instance is not ready for EthConversion update, consider retrying.`);
                             switchToSimulation();
                         }
                     }

package/dist/scripts/test-deploy_chainlink_contract.js

@@ -56,7 +56,7 @@ function deploy(args, hre, mainPaymentAddresses) {
         yield erc20SwapConversion.approvePaymentProxyToSpend(mainPaymentAddresses.DAIAddress, ERC20Conversion.address);
         yield erc20SwapConversion.approveRouterToSpend(mainPaymentAddresses.ERC20TestAddress);
         // EthConversion
-        const ethConversionProxyAddress = (_b = (_a = (yield (0, conversion_proxy_1.deployETHConversionProxy)(Object.assign(Object.assign({}, args), { chainlinkConversionPathAddress: conversionPathInstance.address, ethFeeProxyAddress: mainPaymentAddresses.ETHFeeProxyAddress, nativeTokenHash: ETH_hash }), hre))) === null || _a === void 0 ? void 0 : _a.address) !== null && _b !== void 0 ? _b : '(missing)';
+        const ethConversionProxyAddress = (_b = (_a = (yield (0, conversion_proxy_1.deployEthConversionProxy)(Object.assign(Object.assign({}, args), { chainlinkConversionPathAddress: conversionPathInstance.address, ethFeeProxyAddress: mainPaymentAddresses.ETHFeeProxyAddress, nativeTokenHash: ETH_hash }), hre))) === null || _a === void 0 ? void 0 : _a.address) !== null && _b !== void 0 ? _b : '(missing)';
         // ----------------------------------
         console.log('Contracts deployed');
         console.log(`

package/dist/scripts-create2/compute-one-address.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compute-one-address.d.ts","sourceRoot":"","sources":["../../scripts-create2/compute-one-address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,iCAAiC,EAAE,MAAM,SAAS,CAAC;AAM/E,wBAAsB,+BAA+B,CACnD,gBAAgB,EAAE,iBAAiB,EACnC,GAAG,EAAE,iCAAiC,GACrC,OAAO,CAAC,MAAM,CAAC,CAkCjB;AAED,eAAO,MAAM,yCAAyC,QAC/C,iCAAiC,KACrC,QAAQ,IAAI,CAoBd,CAAC"}
+{"version":3,"file":"compute-one-address.d.ts","sourceRoot":"","sources":["../../scripts-create2/compute-one-address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,iCAAiC,EAAE,MAAM,SAAS,CAAC;AAM/E,wBAAsB,+BAA+B,CACnD,gBAAgB,EAAE,iBAAiB,EACnC,GAAG,EAAE,iCAAiC,GACrC,OAAO,CAAC,MAAM,CAAC,CAkCjB;AAED,eAAO,MAAM,yCAAyC,QAC/C,iCAAiC,KACrC,QAAQ,IAAI,CA4Bd,CAAC"}

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

@@ -43,11 +43,20 @@ const computeCreate2DeploymentAddressesFromList = (hre) => (0, tslib_1.__awaiter
         switch (contract) {
             case 'EthereumProxy':
             case 'EthereumFeeProxy':
+            case 'EthConversionProxy':
+            case 'ERC20FeeProxy':
             case 'Erc20ConversionProxy':
+            case 'ERC20EscrowToPay':
+            case 'BatchPayments':
             case 'ERC20SwapToConversion': {
-                const constructorArgs = (0, constructor_args_1.getConstructorArgs)(contract);
-                address = yield computeCreate2DeploymentAddress({ contract, constructorArgs }, hre);
-                console.log(`${contract.padEnd(36, ' ')}${address}`);
+                try {
+                    const constructorArgs = (0, constructor_args_1.getConstructorArgs)(contract, hre.network.name);
+                    address = yield computeCreate2DeploymentAddress({ contract, constructorArgs }, hre);
+                    console.log(`${contract.padEnd(36, ' ')}${address}`);
+                }
+                catch (e) {
+                    console.warn(`ERROR computing address of ${contract}: ${e}`);
+                }
                 break;
             }
             // Other cases to add when necessary

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":";;;;AACA,oCAA6C;AAC7C,mCAAwD;AACxD,yDAAwD;AAExD,gCAAgC;AAChC,SAAsB,+BAA+B,CACnD,gBAAmC,EACnC,GAAsC;;QAEtC,IAAI;YACF,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE;gBAC5B,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;aACjC;YAED,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE;gBACvC,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;aAC7C;YAED,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,CACvD,uCAAuC,CACxC,CAAC;YACF,MAAM,eAAe,GAAG,qBAAe,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YACvE,MAAM,gBAAgB,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YACxF,IAAI,QAAQ,CAAC;YACb,IAAI,gBAAgB,CAAC,eAAe,EAAE;gBACpC,QAAQ,GAAG,MAAM,gBAAgB,CAAC,oBAAoB,CAAC,GAAG,gBAAgB,CAAC,eAAe,CAAC,CAAC;aAC7F;iBAAM;gBACL,QAAQ,GAAG,MAAM,gBAAgB,CAAC,oBAAoB,EAAE,CAAC;aAC1D;YAED,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;gBAC/B,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;aACzE;YACD,MAAM,eAAe,GAAG,MAAM,eAAe,CAAC,0BAA0B,CACtE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAC5C,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EACzC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CACnC,CAAC;YACF,OAAO,eAAe,CAAC;SACxB;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC/B;IACH,CAAC;CAAA;AArCD,0EAqCC;AAEM,MAAM,yCAAyC,GAAG,CACvD,GAAsC,EACvB,EAAE;IACjB,MAAM,OAAO,CAAC,GAAG,CACf,qCAA6B,CAAC,GAAG,CAAC,CAAO,QAAQ,EAAE,EAAE;QACnD,IAAI,OAAe,CAAC;QACpB,QAAQ,QAAQ,EAAE;YAChB,KAAK,eAAe,CAAC;YACrB,KAAK,kBAAkB,CAAC;YACxB,KAAK,sBAAsB,CAAC;YAC5B,KAAK,uBAAuB,CAAC,CAAC;gBAC5B,MAAM,eAAe,GAAG,IAAA,qCAAkB,EAAC,QAAQ,CAAC,CAAC;gBACrD,OAAO,GAAG,MAAM,+BAA+B,CAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;gBACpF,OAAO,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,OAAO,EAAE,CAAC,CAAC;gBACrD,MAAM;aACP;YACD,oCAAoC;YACpC;gBACE,MAAM,IAAI,KAAK,CAAC,eAAe,QAAQ,iDAAiD,CAAC,CAAC;SAC7F;IACH,CAAC,CAAA,CAAC,CACH,CAAC;AACJ,CAAC,CAAA,CAAC;AAtBW,QAAA,yCAAyC,6CAsBpD"}
+{"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":"AAEA,eAAO,MAAM,kBAAkB,aAAc,MAAM,mCAAqB,MAAM,EAiD7E,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,EA6C7E,CAAC"}

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

@@ -2,46 +2,48 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getConstructorArgs = void 0;
 const artifacts = require("../src/lib");
+const getAdminWalletAddress = (contract) => {
+    if (!process.env.ADMIN_WALLET_ADDRESS) {
+        throw new Error(`ADMIN_WALLET_ADDRESS missing to get constructor args for: ${contract}`);
+    }
+    return process.env.ADMIN_WALLET_ADDRESS;
+};
 const getConstructorArgs = (contract, network) => {
     switch (contract) {
         case 'Erc20ConversionProxy': {
-            if (!process.env.ADMIN_WALLET_ADDRESS) {
-                throw new Error(`ADMIN_WALLET_ADDRESS missing to get constructor args for: ${contract}`);
-            }
             return [
                 '0x0000000000000000000000000000000000000000',
                 '0x0000000000000000000000000000000000000000',
-                process.env.ADMIN_WALLET_ADDRESS,
+                getAdminWalletAddress(contract),
             ];
         }
+        case 'ETHConversionProxy': {
+            return [
+                '0x0000000000000000000000000000000000000000',
+                '0x0000000000000000000000000000000000000000',
+                '0x39e19aa5b69466dfdc313c7cda37cb2a599015cd',
+            ];
+            // TODO setupETHConversionProxy
+        }
         case 'ERC20SwapToConversion': {
-            if (!process.env.ADMIN_WALLET_ADDRESS) {
-                throw new Error(`ADMIN_WALLET_ADDRESS missing to get constructor args for: ${contract}`);
-            }
-            return [process.env.ADMIN_WALLET_ADDRESS];
+            return [getAdminWalletAddress(contract)];
         }
         case 'ERC20EscrowToPay': {
-            if (!process.env.ADMIN_WALLET_ADDRESS) {
-                throw new Error(`ADMIN_WALLET_ADDRESS missing to get constructor args for: ${contract}`);
-            }
             if (!network) {
                 throw new Error('Escrow contract requires network parameter to get correct address of erc20FeeProxy');
             }
             const erc20FeeProxy = artifacts.erc20FeeProxyArtifact;
             const erc20FeeProxyAddress = erc20FeeProxy.getAddress(network);
-            return [erc20FeeProxyAddress, process.env.ADMIN_WALLET_ADDRESS];
+            return [erc20FeeProxyAddress, getAdminWalletAddress(contract)];
         }
         case 'BatchPayments': {
-            if (!process.env.ADMIN_WALLET_ADDRESS) {
-                throw new Error(`ADMIN_WALLET_ADDRESS missing to get constructor args for: ${contract}`);
-            }
             if (!network) {
                 throw new Error('Batch contract requires network parameter to get correct address of erc20FeeProxy and ethereumFeeProxy');
             }
             return [
                 '0x0000000000000000000000000000000000000000',
                 '0x0000000000000000000000000000000000000000',
-                process.env.ADMIN_WALLET_ADDRESS,
+                getAdminWalletAddress(contract),
             ];
         }
         default:

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;AAEjC,MAAM,kBAAkB,GAAG,CAAC,QAAgB,EAAE,OAAgB,EAAY,EAAE;IACjF,QAAQ,QAAQ,EAAE;QAChB,KAAK,sBAAsB,CAAC,CAAC;YAC3B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE;gBACrC,MAAM,IAAI,KAAK,CAAC,6DAA6D,QAAQ,EAAE,CAAC,CAAC;aAC1F;YACD,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,OAAO,CAAC,GAAG,CAAC,oBAAoB;aACjC,CAAC;SACH;QACD,KAAK,uBAAuB,CAAC,CAAC;YAC5B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE;gBACrC,MAAM,IAAI,KAAK,CAAC,6DAA6D,QAAQ,EAAE,CAAC,CAAC;aAC1F;YACD,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;SAC3C;QACD,KAAK,kBAAkB,CAAC,CAAC;YACvB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE;gBACrC,MAAM,IAAI,KAAK,CAAC,6DAA6D,QAAQ,EAAE,CAAC,CAAC;aAC1F;YACD,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,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;SACjE;QACD,KAAK,eAAe,CAAC,CAAC;YACpB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE;gBACrC,MAAM,IAAI,KAAK,CAAC,6DAA6D,QAAQ,EAAE,CAAC,CAAC;aAC1F;YACD,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,IAAI,KAAK,CACb,wGAAwG,CACzG,CAAC;aACH;YACD,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,OAAO,CAAC,GAAG,CAAC,oBAAoB;aACjC,CAAC;SACH;QACD;YACE,OAAO,EAAE,CAAC;KACb;AACH,CAAC,CAAC;AAjDW,QAAA,kBAAkB,sBAiD7B"}
+{"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,4CAA4C;aAC7C,CAAC;YACF,+BAA+B;SAChC;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;AA7CW,QAAA,kBAAkB,sBA6C7B"}

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

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

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

@@ -0,0 +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;AAI7D;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,oBACjB,MAAM,OAClB,iCAAiC,KACrC,QAAQ,IAAI,CAiCd,CAAC"}

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

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupETHConversionProxy = void 0;
+const tslib_1 = require("tslib");
+const lib_1 = require("../../src/lib");
+const utils_1 = require("@requestnetwork/utils");
+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
+ * @param hre Hardhat runtime environment
+ */
+const setupETHConversionProxy = (contractAddress, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
+    // Setup contract parameters
+    const EthConversionProxyContract = new hre.ethers.Contract(contractAddress, lib_1.batchPaymentsArtifact.getContractAbi());
+    yield Promise.all(hre.config.xdeploy.networks.map((network) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
+        let provider;
+        if (network === 'celo') {
+            provider = utils_1.default.getCeloProvider();
+        }
+        else {
+            provider = utils_1.default.getDefaultProvider(network);
+        }
+        const wallet = new hre.ethers.Wallet(hre.config.xdeploy.signer, provider);
+        const signer = wallet.connect(provider);
+        const EthConversionProxyConnected = yield EthConversionProxyContract.connect(signer);
+        const adminNonce = yield signer.getTransactionCount();
+        const gasPrice = yield provider.getGasPrice();
+        // start from the adminNonce, increase gasPrice if needed
+        yield Promise.all([
+            (0, adminTasks_1.updatePaymentErc20FeeProxy)(EthConversionProxyConnected, network, adminNonce, gasPrice),
+            (0, adminTasks_1.updateChainlinkConversionPath)(EthConversionProxyConnected, network, adminNonce + 1, gasPrice),
+        ]);
+    })));
+    console.log('Setup for EthConversionProxy successful');
+});
+exports.setupETHConversionProxy = setupETHConversionProxy;
+//# sourceMappingURL=setupETHConversionProxy.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"setupETHConversionProxy.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupETHConversionProxy.ts"],"names":[],"mappings":";;;;AAAA,uCAAsD;AAEtD,iDAA0C;AAC1C,6CAAyF;AAEzF;;;;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,QAAQ,CAAC;QACb,IAAI,OAAO,KAAK,MAAM,EAAE;YACtB,QAAQ,GAAG,eAAK,CAAC,eAAe,EAAE,CAAC;SACpC;aAAM;YACL,QAAQ,GAAG,eAAK,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;SAC9C;QACD,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC1E,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACxC,MAAM,2BAA2B,GAAG,MAAM,0BAA0B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACrF,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,mBAAmB,EAAE,CAAC;QACtD,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC;QAE9C,yDAAyD;QACzD,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,IAAA,uCAA0B,EAAC,2BAA2B,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC;YACtF,IAAA,0CAA6B,EAC3B,2BAA2B,EAC3B,OAAO,EACP,UAAU,GAAG,CAAC,EACd,QAAQ,CACT;SACF,CAAC,CAAC;IACL,CAAC,CAAA,CAAC,CACH,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;AACzD,CAAC,CAAA,CAAC;AApCW,QAAA,uBAAuB,2BAoClC"}

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

@@ -0,0 +1,9 @@
+import { HardhatRuntimeEnvironmentExtended } from '../types';
+/**
+ * Updates the values of either BatchPayments, ETHConversionProxy, or ERC20SwapToConversion contract, if needed
+ * @param contractAddress address of the proxy
+ * @param hre Hardhat runtime environment
+ * @param contractName name of the contract
+ */
+export declare const setupContract: (contractAddress: string, hre: HardhatRuntimeEnvironmentExtended, contractName: string) => Promise<void>;
+//# sourceMappingURL=setups.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"setups.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setups.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAK7D;;;;;GAKG;AACH,eAAO,MAAM,aAAa,oBACP,MAAM,OAClB,iCAAiC,gBACxB,MAAM,KACnB,QAAQ,IAAI,CAmBd,CAAC"}

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

@@ -0,0 +1,35 @@
+"use strict";
+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 setupERC20SwapToConversion_1 = require("./setupERC20SwapToConversion");
+/**
+ * Updates the values of either BatchPayments, ETHConversionProxy, or ERC20SwapToConversion contract, if needed
+ * @param contractAddress address of the proxy
+ * @param hre Hardhat runtime environment
+ * @param contractName name of the contract
+ */
+const setupContract = (contractAddress, hre, contractName) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
+    switch (contractName) {
+        case 'ETHConversionProxy': {
+            yield (0, setupETHConversionProxy_1.setupETHConversionProxy)(contractAddress, hre);
+            break;
+        }
+        case 'ERC20SwapToConversion': {
+            yield (0, setupERC20SwapToConversion_1.setupERC20SwapToConversion)(contractAddress, hre);
+            break;
+        }
+        case 'BatchPayments': {
+            yield (0, setupBatchPayments_1.setupBatchPayments)(contractAddress, hre);
+            break;
+        }
+        default: {
+            console.log('Contract name not found');
+            break;
+        }
+    }
+});
+exports.setupContract = setupContract;
+//# sourceMappingURL=setups.js.map

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

@@ -0,0 +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"}

package/dist/scripts-create2/deploy-request-deployer.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployDeployer = void 0;
 const tslib_1 = require("tslib");
-const verify_one_1 = require("./verify-one");
+const verify_1 = require("./verify");
 // Deploys, set up the contracts
 function deployDeployer(hre) {
     return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
@@ -11,7 +11,7 @@ function deployDeployer(hre) {
             // Deploy the contract RequestDeployer
             const RequestDeployer__factory = yield hre.ethers.getContractFactory('RequestDeployer', deployer);
             const RequestDeployer = yield RequestDeployer__factory.deploy();
-            yield (0, verify_one_1.verifyOne)(RequestDeployer.address, { contract: 'RequestDeployer' }, hre);
+            yield (0, verify_1.verifyOne)(RequestDeployer.address, { contract: 'RequestDeployer' }, hre);
             // ----------------------------------
             console.log('Contract deployed');
             console.log(`

package/dist/scripts-create2/deploy-request-deployer.js.map

@@ -1 +1 @@
-{"version":3,"file":"deploy-request-deployer.js","sourceRoot":"","sources":["../../scripts-create2/deploy-request-deployer.ts"],"names":[],"mappings":";;;;AAEA,6CAAyC;AAEzC,gCAAgC;AAChC,SAAsB,cAAc,CAAC,GAA8B;;QACjE,IAAI;YACF,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YAEjD,sCAAsC;YACtC,MAAM,wBAAwB,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAClE,iBAAiB,EACjB,QAAQ,CACT,CAAC;YACF,MAAM,eAAe,GAAG,MAAM,wBAAwB,CAAC,MAAM,EAAE,CAAC;YAChE,MAAM,IAAA,sBAAS,EACb,eAAe,CAAC,OAAO,EACvB,EAAE,QAAQ,EAAE,iBAAiB,EAAE,EAC/B,GAAwC,CACzC,CAAC;YAEF,qCAAqC;YACrC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;YACjC,OAAO,CAAC,GAAG,CAAC;gCACgB,eAAe,CAAC,OAAO;gCACvB,eAAe,CAAC,iBAAiB,CAAC,WAAW;OACtE,CAAC,CAAC;SACN;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAClB;IACH,CAAC;CAAA;AAzBD,wCAyBC"}
+{"version":3,"file":"deploy-request-deployer.js","sourceRoot":"","sources":["../../scripts-create2/deploy-request-deployer.ts"],"names":[],"mappings":";;;;AAEA,qCAAqC;AAErC,gCAAgC;AAChC,SAAsB,cAAc,CAAC,GAA8B;;QACjE,IAAI;YACF,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YAEjD,sCAAsC;YACtC,MAAM,wBAAwB,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAClE,iBAAiB,EACjB,QAAQ,CACT,CAAC;YACF,MAAM,eAAe,GAAG,MAAM,wBAAwB,CAAC,MAAM,EAAE,CAAC;YAChE,MAAM,IAAA,kBAAS,EACb,eAAe,CAAC,OAAO,EACvB,EAAE,QAAQ,EAAE,iBAAiB,EAAE,EAC/B,GAAwC,CACzC,CAAC;YAEF,qCAAqC;YACrC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;YACjC,OAAO,CAAC,GAAG,CAAC;gCACgB,eAAe,CAAC,OAAO;gCACvB,eAAe,CAAC,iBAAiB,CAAC,WAAW;OACtE,CAAC,CAAC;SACN;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAClB;IACH,CAAC;CAAA;AAzBD,wCAyBC"}

package/dist/scripts-create2/{deploy-one.d.ts → deploy.d.ts}

@@ -2,4 +2,4 @@ import { IDeploymentParams } from './types';
 import { HardhatRuntimeEnvironmentExtended } from './types';
 export declare const deployOneWithCreate2: (deploymentParams: IDeploymentParams, hre: HardhatRuntimeEnvironmentExtended) => Promise<string>;
 export declare const deployWithCreate2FromList: (hre: HardhatRuntimeEnvironmentExtended) => Promise<void>;
-//# sourceMappingURL=deploy-one.d.ts.map
+//# sourceMappingURL=deploy.d.ts.map

package/dist/scripts-create2/deploy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../scripts-create2/deploy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,iCAAiC,EAAE,MAAM,SAAS,CAAC;AAO5D,eAAO,MAAM,oBAAoB,qBACb,iBAAiB,OAC9B,iCAAiC,KACrC,QAAQ,MAAM,CAkChB,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAC/B,iCAAiC,KACrC,QAAQ,IAAI,CAoCd,CAAC"}