@requestnetwork/smart-contracts 0.28.1-next.1638 → 0.28.1-next.1643

package/dist/hardhat.config.js

@@ -113,6 +113,10 @@ const setExplorerApiKey = (hre) => {
             hre.config.etherscan.apiKey = process.env.FTMSCAN_API_KEY;
             return;
         }
+        case 'arbitrum-one': {
+            hre.config.etherscan.apiKey = process.env.ARBISCAN_API_KEY;
+            return;
+        }
     }
 };
 // FIXME: use deployAllPaymentContracts instead to test with the same deployments

package/dist/hardhat.config.js.map

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

package/dist/scripts/3_deploy_chainlink_contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"3_deploy_chainlink_contract.d.ts","sourceRoot":"","sources":["../../scripts/3_deploy_chainlink_contract.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AAEnC,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAK1D,wBAA8B,MAAM,CAClC,IAAI,EAAE,GAAG,EACT,GAAG,EAAE,yBAAyB,EAC9B,oBAAoB,EAAE,GAAG,iBA+F1B"}
+{"version":3,"file":"3_deploy_chainlink_contract.d.ts","sourceRoot":"","sources":["../../scripts/3_deploy_chainlink_contract.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AAEnC,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAK1D,wBAA8B,MAAM,CAClC,IAAI,EAAE,GAAG,EACT,GAAG,EAAE,yBAAyB,EAC9B,oBAAoB,EAAE,GAAG,iBAgG1B"}

package/dist/scripts/3_deploy_chainlink_contract.js

@@ -39,7 +39,7 @@ function deploy(args, hre, mainPaymentAddresses) {
         // erc20SwapConversion
         const erc20ConversionAddress = (_a = (yield (0, conversion_proxy_1.deployERC20ConversionProxy)(Object.assign(Object.assign({}, args), { chainlinkConversionPathAddress: conversionPathInstance.address, erc20FeeProxyAddress: mainPaymentAddresses.ERC20FeeProxyAddress }), hre))) === null || _a === void 0 ? void 0 : _a.address;
         const localSwapRouterAddress = '0x4E72770760c011647D4873f60A3CF6cDeA896CD8';
-        const { address: erc20SwapConversionAddress, instance: erc20SwapConversion, } = yield (0, erc20_swap_to_conversion_1.deploySwapConversion)(Object.assign(Object.assign({}, args), { conversionProxyAddress: erc20ConversionAddress, swapProxyAddress: localSwapRouterAddress }), hre);
+        const { address: erc20SwapConversionAddress, instance: erc20SwapConversion, } = yield (0, erc20_swap_to_conversion_1.deploySwapConversion)(Object.assign(Object.assign({}, args), { conversionProxyAddress: erc20ConversionAddress, swapProxyAddress: localSwapRouterAddress, chainlinkConversionPathAddress: conversionPathInstance.address }), hre);
         if (!erc20SwapConversion) {
             console.error('Deployment for erc20SwapConversion failed.');
             return;

package/dist/scripts/3_deploy_chainlink_contract.js.map

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

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

@@ -1,11 +1,13 @@
 import { HardhatRuntimeEnvironment } from 'hardhat/types';
-import { DeploymentResult } from './deploy-one';
+import { Erc20ConversionProxy } from '../src/types/Erc20ConversionProxy';
 export declare function deployERC20ConversionProxy(args: {
     chainlinkConversionPathAddress?: string;
     erc20FeeProxyAddress?: string;
-}, hre: HardhatRuntimeEnvironment): Promise<DeploymentResult | undefined>;
+    nonceCondition?: number;
+}, hre: HardhatRuntimeEnvironment): Promise<import("./deploy-one").DeploymentResult<Erc20ConversionProxy> | undefined>;
 export declare function deployETHConversionProxy(args: {
     chainlinkConversionPathAddress?: string;
     ethFeeProxyAddress?: string;
-}, hre: HardhatRuntimeEnvironment): Promise<DeploymentResult<import("ethers").Contract> | undefined>;
+    nonceCondition?: number;
+}, hre: HardhatRuntimeEnvironment): Promise<import("./deploy-one").DeploymentResult<import("ethers").Contract> | undefined>;
 //# sourceMappingURL=conversion-proxy.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"conversion-proxy.d.ts","sourceRoot":"","sources":["../../scripts/conversion-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAK1D,OAAO,EAAE,gBAAgB,EAAa,MAAM,cAAc,CAAC;AAI3D,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE;IAAE,8BAA8B,CAAC,EAAE,MAAM,CAAC;IAAC,oBAAoB,CAAC,EAAE,MAAM,CAAA;CAAE,EAChF,GAAG,EAAE,yBAAyB,GAC7B,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAoBvC;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE;IACJ,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,EACD,GAAG,EAAE,yBAAyB,oEAsC/B"}
+{"version":3,"file":"conversion-proxy.d.ts","sourceRoot":"","sources":["../../scripts/conversion-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAG1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AASzE,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE;IACJ,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,EACD,GAAG,EAAE,yBAAyB,sFAuB/B;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE;IACJ,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,EACD,GAAG,EAAE,yBAAyB,2FAuC/B"}

package/dist/scripts/conversion-proxy.js

@@ -22,6 +22,8 @@ function deployERC20ConversionProxy(args, hre) {
         return (0, deploy_one_1.deployOne)(args, hre, contractName, {
             constructorArguments: [args.erc20FeeProxyAddress, args.chainlinkConversionPathAddress],
             artifact: lib_1.erc20ConversionProxy,
+            nonceCondition: args.nonceCondition,
+            version: '0.1.1',
         });
     });
 }
@@ -54,6 +56,7 @@ function deployETHConversionProxy(args, hre) {
                 nativeTokenHash,
             ],
             artifact: lib_1.ethConversionArtifact,
+            nonceCondition: args.nonceCondition,
         });
     });
 }

package/dist/scripts/conversion-proxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"conversion-proxy.js","sourceRoot":"","sources":["../../scripts/conversion-proxy.ts"],"names":[],"mappings":";;;;AACA,oCAGoB;AACpB,6CAA2D;AAC3D,uDAA2D;AAC3D,iDAA0D;AAE1D,SAAsB,0BAA0B,CAC9C,IAAgF,EAChF,GAA8B;;QAE9B,MAAM,YAAY,GAAG,sBAAsB,CAAC;QAE5C,IAAI,CAAC,IAAI,CAAC,8BAA8B,EAAE;YACxC,mEAAmE;YACnE,OAAO,CAAC,KAAK,CACX,sCAAsC,GAAG,CAAC,OAAO,CAAC,IAAI,mBAAmB,YAAY,GAAG,CACzF,CAAC;YACF,OAAO,SAAS,CAAC;SAClB;QACD,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;YAC9B,mEAAmE;YACnE,OAAO,CAAC,KAAK,CAAC,4BAA4B,GAAG,CAAC,OAAO,CAAC,IAAI,mBAAmB,YAAY,GAAG,CAAC,CAAC;YAC9F,OAAO,SAAS,CAAC;SAClB;QAED,OAAO,IAAA,sBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE;YACxC,oBAAoB,EAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE,IAAI,CAAC,8BAA8B,CAAC;YACtF,QAAQ,EAAE,0BAA4B;SACvC,CAAC,CAAC;IACL,CAAC;CAAA;AAvBD,gEAuBC;AAED,SAAsB,wBAAwB,CAC5C,IAGC,EACD,GAA8B;;;QAE9B,MAAM,YAAY,GAAG,oBAAoB,CAAC;QAE1C,IAAI,CAAC,IAAI,CAAC,8BAA8B,EAAE;YACxC,mEAAmE;YACnE,OAAO,CAAC,KAAK,CACX,sCAAsC,GAAG,CAAC,OAAO,CAAC,IAAI,mBAAmB,YAAY,GAAG,CACzF,CAAC;YACF,OAAO;SACR;QACD,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;YAC5B,mEAAmE;YACnE,OAAO,CAAC,KAAK,CAAC,0BAA0B,GAAG,CAAC,OAAO,CAAC,IAAI,mBAAmB,YAAY,GAAG,CAAC,CAAC;YAC5F,OAAO;SACR;QAED,0DAA0D;QAC1D,MAAM,kBAAkB,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC;QACzF,MAAM,eAAe,GAAG,MAAA,0BAAe,CAAC,UAAU,EAAE,CAAC,iBAAiB,CACpE,yBAAiB,CAAC,QAAQ,CAAC,GAAG,EAC9B,kBAAkB,CACnB,0CAAE,IAAI,CAAC;QACR,IAAI,CAAC,eAAe,EAAE;YACpB,OAAO,CAAC,KAAK,CACX,qCAAqC,GAAG,CAAC,OAAO,CAAC,IAAI,mBAAmB,YAAY,GAAG,CACxF,CAAC;YACF,OAAO;SACR;QAED,OAAO,IAAA,sBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE;YACxC,oBAAoB,EAAE;gBACpB,IAAI,CAAC,kBAAkB;gBACvB,IAAI,CAAC,8BAA8B;gBACnC,eAAe;aAChB;YACD,QAAQ,EAAE,2BAAqB;SAChC,CAAC,CAAC;;CACJ;AA3CD,4DA2CC"}
+{"version":3,"file":"conversion-proxy.js","sourceRoot":"","sources":["../../scripts/conversion-proxy.ts"],"names":[],"mappings":";;;;AAIA,oCAGoB;AACpB,6CAAyC;AACzC,uDAA2D;AAC3D,iDAA0D;AAE1D,SAAsB,0BAA0B,CAC9C,IAIC,EACD,GAA8B;;QAE9B,MAAM,YAAY,GAAG,sBAAsB,CAAC;QAE5C,IAAI,CAAC,IAAI,CAAC,8BAA8B,EAAE;YACxC,mEAAmE;YACnE,OAAO,CAAC,KAAK,CACX,sCAAsC,GAAG,CAAC,OAAO,CAAC,IAAI,mBAAmB,YAAY,GAAG,CACzF,CAAC;YACF,OAAO,SAAS,CAAC;SAClB;QACD,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;YAC9B,mEAAmE;YACnE,OAAO,CAAC,KAAK,CAAC,4BAA4B,GAAG,CAAC,OAAO,CAAC,IAAI,mBAAmB,YAAY,GAAG,CAAC,CAAC;YAC9F,OAAO,SAAS,CAAC;SAClB;QAED,OAAO,IAAA,sBAAS,EAAuB,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE;YAC9D,oBAAoB,EAAE,CAAC,IAAI,CAAC,oBAAoB,EAAE,IAAI,CAAC,8BAA8B,CAAC;YACtF,QAAQ,EAAE,0BAA4B;YACtC,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;IACL,CAAC;CAAA;AA7BD,gEA6BC;AAED,SAAsB,wBAAwB,CAC5C,IAIC,EACD,GAA8B;;;QAE9B,MAAM,YAAY,GAAG,oBAAoB,CAAC;QAE1C,IAAI,CAAC,IAAI,CAAC,8BAA8B,EAAE;YACxC,mEAAmE;YACnE,OAAO,CAAC,KAAK,CACX,sCAAsC,GAAG,CAAC,OAAO,CAAC,IAAI,mBAAmB,YAAY,GAAG,CACzF,CAAC;YACF,OAAO;SACR;QACD,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;YAC5B,mEAAmE;YACnE,OAAO,CAAC,KAAK,CAAC,0BAA0B,GAAG,CAAC,OAAO,CAAC,IAAI,mBAAmB,YAAY,GAAG,CAAC,CAAC;YAC5F,OAAO;SACR;QAED,0DAA0D;QAC1D,MAAM,kBAAkB,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC;QACzF,MAAM,eAAe,GAAG,MAAA,0BAAe,CAAC,UAAU,EAAE,CAAC,iBAAiB,CACpE,yBAAiB,CAAC,QAAQ,CAAC,GAAG,EAC9B,kBAAkB,CACnB,0CAAE,IAAI,CAAC;QACR,IAAI,CAAC,eAAe,EAAE;YACpB,OAAO,CAAC,KAAK,CACX,qCAAqC,GAAG,CAAC,OAAO,CAAC,IAAI,mBAAmB,YAAY,GAAG,CACxF,CAAC;YACF,OAAO;SACR;QAED,OAAO,IAAA,sBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE;YACxC,oBAAoB,EAAE;gBACpB,IAAI,CAAC,kBAAkB;gBACvB,IAAI,CAAC,8BAA8B;gBACnC,eAAe;aAChB;YACD,QAAQ,EAAE,2BAAqB;YAC/B,cAAc,EAAE,IAAI,CAAC,cAAc;SACpC,CAAC,CAAC;;CACJ;AA7CD,4DA6CC"}

package/dist/scripts/deploy-one.d.ts

@@ -16,6 +16,7 @@ export interface DeploymentResult<TContract extends Contract | unknown = Contrac
  * @options
  *  - options.verify: set false to prevent verification on live networks
  *  - options.nonceCondition: only proceeds with the deployment if the nonce matches
+ *  - options.version: to deploy or map a version different from the last version
  * @returns a deployment result with address =
  *  - The address if the contract is deployed or attached
  *  - 'simulated' if args.simulate === true (no deployment/)
@@ -26,5 +27,6 @@ export declare function deployOne<TContract extends Contract>(args: any, hre: Ha
     artifact?: ContractArtifact<Contract>;
     verify?: boolean;
     nonceCondition?: number;
+    version?: string;
 }): Promise<DeploymentResult<TContract>>;
 //# sourceMappingURL=deploy-one.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"deploy-one.d.ts","sourceRoot":"","sources":["../../scripts/deploy-one.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AACnC,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,WAAW,gBAAgB,CAAC,SAAS,SAAS,QAAQ,GAAG,OAAO,GAAG,QAAQ;IAC/E,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,SAAS,CAAC;IACpB,oBAAoB,EAAE,GAAG,EAAE,CAAC;IAC5B,IAAI,EAAE,WAAW,GAAG,UAAU,GAAG,UAAU,GAAG,SAAS,CAAC;IACxD,mBAAmB,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;CACxC;AAkBD;;;;;;;;;;GAUG;AACH,wBAAsB,SAAS,CAAC,SAAS,SAAS,QAAQ,EACxD,IAAI,EAAE,GAAG,EACT,GAAG,EAAE,yBAAyB,EAC9B,YAAY,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE;IACR,oBAAoB,CAAC,EAAE,GAAG,EAAE,CAAC;IAC7B,QAAQ,CAAC,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IACtC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,GACA,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAwFtC"}
+{"version":3,"file":"deploy-one.d.ts","sourceRoot":"","sources":["../../scripts/deploy-one.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AACnC,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,WAAW,gBAAgB,CAAC,SAAS,SAAS,QAAQ,GAAG,OAAO,GAAG,QAAQ;IAC/E,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,SAAS,CAAC;IACpB,oBAAoB,EAAE,GAAG,EAAE,CAAC;IAC5B,IAAI,EAAE,WAAW,GAAG,UAAU,GAAG,UAAU,GAAG,SAAS,CAAC;IACxD,mBAAmB,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;CACxC;AAkBD;;;;;;;;;;;GAWG;AACH,wBAAsB,SAAS,CAAC,SAAS,SAAS,QAAQ,EACxD,IAAI,EAAE,GAAG,EACT,GAAG,EAAE,yBAAyB,EAC9B,YAAY,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE;IACR,oBAAoB,CAAC,EAAE,GAAG,EAAE,CAAC;IAC7B,QAAQ,CAAC,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IACtC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GACA,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CA4FtC"}

package/dist/scripts/deploy-one.js

@@ -23,6 +23,7 @@ const SKIPPED_DEPLOYMENT = {
  * @options
  *  - options.verify: set false to prevent verification on live networks
  *  - options.nonceCondition: only proceeds with the deployment if the nonce matches
+ *  - options.version: to deploy or map a version different from the last version
  * @returns a deployment result with address =
  *  - The address if the contract is deployed or attached
  *  - 'simulated' if args.simulate === true (no deployment/)
@@ -37,9 +38,9 @@ function deployOne(args, hre, contractName, options) {
         const constructorArguments = (_a = options === null || options === void 0 ? void 0 : options.constructorArguments) !== null && _a !== void 0 ? _a : [];
         if (options === null || options === void 0 ? void 0 : options.artifact) {
             try {
-                address = options.artifact.getAddress(hre.network.name);
+                address = options.artifact.getAddress(hre.network.name, options.version);
                 const action = args.force ? '(forcing deployment)' : '(skipping)';
-                console.log(`Found ${contractName} on ${hre.network.name} at address: ${address} ${action}`);
+                console.log(`Found ${contractName}${options.version ? ` v${options.version}` : ''} on ${hre.network.name} at address: ${address} ${action}`);
                 if (!args.force) {
                     return {
                         address,

package/dist/scripts/deploy-one.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"deploy-payments.d.ts","sourceRoot":"","sources":["../../scripts/deploy-payments.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AACnC,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAoB1D;;;;;;;;;;;;;GAaG;AACH,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,GAAG,EACT,GAAG,EAAE,yBAAyB,GAC7B,OAAO,CAAC,IAAI,CAAC,CA8Rf"}
+{"version":3,"file":"deploy-payments.d.ts","sourceRoot":"","sources":["../../scripts/deploy-payments.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AACnC,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAuB1D;;;;;;;;;;;;;GAaG;AACH,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,GAAG,EACT,GAAG,EAAE,yBAAyB,GAC7B,OAAO,CAAC,IAAI,CAAC,CA2Wf"}

package/dist/scripts/deploy-payments.js

@@ -29,10 +29,25 @@ function deployAllPaymentContracts(args, hre) {
     return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
         const deploymentResults = [];
         let simulationSuccess;
+        const logDeploymentMsg = (contractName, result, message) => {
+            const resultMsg = result
+                ? result.address === result.type
+                    ? result.address
+                    : `${result.address} (${result.type})`
+                : '';
+            const customMsg = message ? `(${message})` : '';
+            console.log(`${`      ${contractName}:`.padEnd(36, ' ')}${resultMsg}${customMsg}`);
+        };
+        const addToResult = (deployment) => {
+            if (deployment) {
+                deploymentResults.push(deployment);
+                logDeploymentMsg(deployment.contractName, deployment);
+            }
+        };
         try {
             simulationSuccess = args.simulate ? true : undefined;
             const [deployer] = yield hre.ethers.getSigners();
-            console.log(`*** Deploying with the account: ${deployer.address} on the network ${hre.network.name} (${hre.network.config.chainId}) ***`);
+            console.log(`*** Deploying with: ${deployer.address} on ${hre.network.name} (${hre.network.config.chainId}). Nonce = ${yield deployer.getTransactionCount()} ***`);
             // #region NATIVE TOKEN
             const nativeTokenNetwork = hre.network.name === 'private' ? 'mainnet' : hre.network.name;
             const nativeTokenHash = (_a = currency_1.CurrencyManager.getDefault().getNativeCurrency(types_1.RequestLogicTypes.CURRENCY.ETH, nativeTokenNetwork)) === null || _a === void 0 ? void 0 : _a.hash;
@@ -40,21 +55,18 @@ function deployAllPaymentContracts(args, hre) {
                 throw new Error(`Could not guess native token hash for network ${hre.network.name}`);
             }
             // #endregion
-            // #region EASY DEPLOYMENTS UTIL
+            // #region UTILS
             // Utility to run a straight-forward deployment with deployOne()
             const runEasyDeployment = (deployment) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
                 var _b;
                 deployment.constructorArguments = (_b = deployment.constructorArguments) !== null && _b !== void 0 ? _b : [];
                 const result = yield (0, deploy_one_1.deployOne)(args, hre, deployment.contractName, Object.assign({}, deployment));
-                deploymentResults.push(result);
-                console.log(`Contract ${deployment.contractName} ${result.type}: ${result.address}`);
+                addToResult(result);
                 if (result.type === 'skipped') {
                     switchToSimulation();
                 }
                 return result;
             });
-            // #endregion
-            // #region NON-EASY BATCHES DEFINITION
             const switchToSimulation = () => {
                 if (!args.simulate) {
                     console.log('[!] Switching to simulated mode');
@@ -62,73 +74,50 @@ function deployAllPaymentContracts(args, hre) {
                     simulationSuccess = simulationSuccess !== null && simulationSuccess !== void 0 ? simulationSuccess : true;
                 }
             };
+            // #endregion
+            // #region BATCH DEFINITIONS
             /*
              * Batch 2
-             *   - ERC20ConversionProxy
              *   - ERC20SwapToPay
-             *   - ERC20SwapToConversion
              */
-            const runDeploymentBatch_2 = (chainlinkInstance, erc20FeeProxyAddress) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
-                let chainlinkConversionPathAddress = chainlinkInstance === null || chainlinkInstance === void 0 ? void 0 : chainlinkInstance.address;
-                if (!chainlinkConversionPathAddress) {
-                    switchToSimulation();
-                    chainlinkConversionPathAddress = 'simulated';
-                }
-                // Deploy ERC20 Conversion
-                const erc20ConversionResult = yield (0, conversion_proxy_1.deployERC20ConversionProxy)(Object.assign(Object.assign({}, args), { chainlinkConversionPathAddress,
-                    erc20FeeProxyAddress }), hre);
-                deploymentResults.push(erc20ConversionResult);
-                const erc20ConversionAddress = erc20ConversionResult === null || erc20ConversionResult === void 0 ? void 0 : erc20ConversionResult.address;
-                // Add whitelist admin to chainlink path
-                const currentNonce = yield deployer.getTransactionCount();
-                if (chainlinkInstance && currentNonce === 4) {
-                    if (!process.env.ADMIN_WALLET_ADDRESS) {
-                        throw new Error('Chainlink was deployed but no ADMIN_WALLET_ADDRESS was provided.');
-                    }
-                    if (args.simulate === false) {
-                        yield chainlinkInstance.addWhitelistAdmin(process.env.ADMIN_WALLET_ADDRESS);
-                    }
-                    else {
-                        console.log('[i] Simulating addWhitelistAdmin to chainlinkInstance');
-                    }
-                }
-                // ERC20SwapToPay & ERC20SwapToConversion
-                const swapRouterAddress = utils_1.uniswapV2RouterAddresses[hre.network.name];
-                if (swapRouterAddress) {
-                    const swapRouterAddressResult = yield (0, deploy_one_1.deployOne)(args, hre, 'ERC20SwapToPay', {
-                        constructorArguments: [swapRouterAddress, erc20FeeProxyAddress],
-                        artifact: lib_1.erc20SwapToPayArtifact,
-                        nonceCondition: 5,
-                    });
-                    deploymentResults.push(swapRouterAddressResult);
-                    if (erc20ConversionAddress) {
-                        const swapConversionResult = yield (0, erc20_swap_to_conversion_1.deploySwapConversion)(Object.assign(Object.assign({}, args), { conversionProxyAddress: erc20ConversionAddress, swapProxyAddress: swapRouterAddress }), hre);
-                        deploymentResults.push(swapConversionResult);
-                    }
-                    else {
-                        console.log(`      ${'ERC20SwapToConversion:'.padEnd(30, ' ')}(ERC20 Conversion missing)`);
-                        switchToSimulation();
-                    }
-                }
-                else {
-                    console.log(`      ${'ERC20SwapToPay:'.padEnd(30, ' ')}(swap router missing)`);
-                    console.log(`      ${'ERC20SwapToConversion:'.padEnd(30, ' ')}(swap router missing)`);
-                    switchToSimulation();
-                    simulationSuccess = false;
+            const runDeploymentBatch_2 = (erc20FeeProxyAddress) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+                const nonceForBatch2 = 5;
+                yield (0, utils_1.jumpToNonce)(args, hre, nonceForBatch2);
+                // ERC20SwapToPay
+                let swapRouterAddress = utils_1.uniswapV2RouterAddresses[hre.network.name];
+                if (!swapRouterAddress) {
+                    logDeploymentMsg('ERC20SwapToPay:', undefined, 'swap router missing - can be administrated by deployer');
+                    swapRouterAddress = '0x0000000000000000000000000000000000000000';
                 }
+                const swapToPayResult = yield (0, deploy_one_1.deployOne)(args, hre, 'ERC20SwapToPay', {
+                    constructorArguments: [swapRouterAddress, erc20FeeProxyAddress],
+                    artifact: lib_1.erc20SwapToPayArtifact,
+                    nonceCondition: nonceForBatch2,
+                });
+                addToResult(swapToPayResult);
                 return deploymentResults;
             });
             /*
              * Batch 4
+             *   - ChainlinkConversionPath (+ addWhitelistAdmin())
              *   - ETHConversionProxy
              */
-            const runDeploymentBatch_4 = (chainlinkConversionPathAddress, ethFeeProxyAddress) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+            const runDeploymentBatch_4 = (ethFeeProxyAddress) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+                const NONCE_BATCH_4 = 10;
+                yield (0, utils_1.jumpToNonce)(args, hre, NONCE_BATCH_4);
+                // Deploy ChainlinkConversionPath
+                const { instance: chainlinkInstance, address: chainlinkConversionPathAddress, } = yield runEasyDeployment({
+                    contractName: 'ChainlinkConversionPath',
+                    constructorArguments: [nativeTokenHash],
+                    artifact: lib_1.chainlinkConversionPath,
+                    nonceCondition: NONCE_BATCH_4,
+                });
                 // Deploy ETH Conversion
                 const ethConversionResult = yield (0, conversion_proxy_1.deployETHConversionProxy)(Object.assign(Object.assign({}, args), { chainlinkConversionPathAddress,
-                    ethFeeProxyAddress }), hre);
-                deploymentResults.push(ethConversionResult);
+                    ethFeeProxyAddress, nonceCondition: NONCE_BATCH_4 + 1 }), hre);
+                addToResult(ethConversionResult);
                 // Administrate again whitelist admins for nonce consistency (due to 1 failing tx on Fantom)
-                const chainlinkAdminNonce = 12;
+                const chainlinkAdminNonce = NONCE_BATCH_4 + 2;
                 const currentNonce = yield deployer.getTransactionCount();
                 if (currentNonce === chainlinkAdminNonce && chainlinkInstance) {
                     if (!process.env.ADMIN_WALLET_ADDRESS) {
@@ -151,6 +140,70 @@ function deployAllPaymentContracts(args, hre) {
                         switchToSimulation();
                     }
                 }
+                return chainlinkInstance;
+            });
+            /*
+             * Batch 5
+             *   - 5.a ERC20ConversionProxy
+             *   - 5.b ERC20ConversionProxy.transferOwnership
+             *   - 5.c ERC20SwapConversion.setPaymentProxy
+             */
+            const runDeploymentBatch_5 = (chainlinkInstance, erc20FeeProxyAddress, erc20SwapConversionInstance) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+                const NONCE_BATCH_5 = 13;
+                let chainlinkConversionPathAddress = chainlinkInstance === null || chainlinkInstance === void 0 ? void 0 : chainlinkInstance.address;
+                if (!chainlinkConversionPathAddress) {
+                    switchToSimulation();
+                    chainlinkConversionPathAddress = 'simulated';
+                }
+                // 5.a ERC20ConversionProxy
+                const erc20ConversionResult = yield (0, conversion_proxy_1.deployERC20ConversionProxy)(Object.assign(Object.assign({}, args), { chainlinkConversionPathAddress,
+                    erc20FeeProxyAddress, nonceCondition: NONCE_BATCH_5 }), hre);
+                addToResult(erc20ConversionResult);
+                // 5.b ERC20ConversionProxy.transferOwnership
+                let currentNonce = yield deployer.getTransactionCount();
+                const erc20ConversionAdminNonce = NONCE_BATCH_5 + 1;
+                if (currentNonce === erc20ConversionAdminNonce && erc20ConversionResult) {
+                    if (!process.env.ADMIN_WALLET_ADDRESS) {
+                        throw new Error('ADMIN_WALLET_ADDRESS missing for: ERC20ConversionProxy.transferOwnership');
+                    }
+                    if (args.simulate === false) {
+                        yield erc20ConversionResult.instance.transferOwnership(process.env.ADMIN_WALLET_ADDRESS);
+                    }
+                    else {
+                        console.log('[i] Simulating transferOwnership to ERC20ConversionProxy');
+                    }
+                }
+                else {
+                    if (currentNonce < erc20ConversionAdminNonce) {
+                        console.warn(`Warning: got nonce ${currentNonce} instead of ${erc20ConversionAdminNonce}`);
+                        switchToSimulation();
+                    }
+                    else if (!erc20ConversionResult) {
+                        console.warn(`Warning: the ERC20ConversionProxy contract instance is not ready, consider retrying.`);
+                        switchToSimulation();
+                    }
+                }
+                // 5.c ERC20SwapConversion.setPaymentProxy
+                currentNonce = yield deployer.getTransactionCount();
+                const erc20SwapConversionAdminNonce = NONCE_BATCH_5 + 2;
+                if (currentNonce === erc20SwapConversionAdminNonce && erc20ConversionResult) {
+                    if (args.simulate === false) {
+                        yield erc20SwapConversionInstance.setPaymentProxy(erc20ConversionResult === null || erc20ConversionResult === void 0 ? void 0 : erc20ConversionResult.address);
+                    }
+                    else {
+                        console.log('[i] Simulating setPaymentProxy to ERC20SwapConversion');
+                    }
+                }
+                else {
+                    if (currentNonce < erc20SwapConversionAdminNonce) {
+                        console.warn(`Warning: got nonce ${currentNonce} instead of ${erc20SwapConversionAdminNonce}`);
+                        switchToSimulation();
+                    }
+                    else if (!erc20ConversionResult) {
+                        console.warn(`Warning: the ERC20ConversionProxy contract instance is not ready for ERC20SwapConversion update, consider retrying.`);
+                        switchToSimulation();
+                    }
+                }
             });
             // #endregion
             // #region MAIN - Deployments
@@ -165,47 +218,45 @@ function deployAllPaymentContracts(args, hre) {
                 artifact: lib_1.erc20FeeProxyArtifact,
                 nonceCondition: 1,
             });
+            // Batch 2
+            yield runDeploymentBatch_2(erc20FeeProxyAddress);
             // Batch 3
-            const nonceForBatch3 = 7;
-            yield (0, utils_1.jumpToNonce)(args, hre, nonceForBatch3);
+            const NONCE_BATCH_3 = 6;
+            // SwapToConversion
+            let swapRouterAddress = utils_1.uniswapV2RouterAddresses[hre.network.name];
+            if (!swapRouterAddress) {
+                logDeploymentMsg('ERC20SwapToConversion:', undefined, 'swap and chainlinkPath set to 0x000..000 - can be administrated by deployer');
+                swapRouterAddress = '0x0000000000000000000000000000000000000000';
+            }
+            const swapConversionResult = yield (0, erc20_swap_to_conversion_1.deploySwapConversion)(Object.assign(Object.assign({}, args), { conversionProxyAddress: '0x0000000000000000000000000000000000000000', chainlinkConversionPathAddress: '0x0000000000000000000000000000000000000000', swapProxyAddress: swapRouterAddress, nonceCondition: 6 }), hre);
+            addToResult(swapConversionResult);
+            // EthereumFeeProxy
             const { address: ethFeeProxyAddress } = yield runEasyDeployment({
                 contractName: 'EthereumFeeProxy',
                 artifact: lib_1.ethereumFeeProxyArtifact,
-                nonceCondition: nonceForBatch3,
+                nonceCondition: NONCE_BATCH_3 + 1,
             });
             // Batch 4
-            const nonceForBatch4 = 10;
-            yield (0, utils_1.jumpToNonce)(args, hre, nonceForBatch4);
-            const { instance: chainlinkInstance, address: chainlinkInstanceAddress, } = yield runEasyDeployment({
-                contractName: 'ChainlinkConversionPath',
-                constructorArguments: [nativeTokenHash],
-                artifact: lib_1.chainlinkConversionPath,
-                nonceCondition: nonceForBatch4,
-            });
-            yield runDeploymentBatch_4(chainlinkInstanceAddress, ethFeeProxyAddress);
-            if (!args.simulate) {
-                throw new Error('Missing implementation new version of ERC20 Conversion Proxy');
-            }
-            // Batch 2
-            yield runDeploymentBatch_2(chainlinkInstance, erc20FeeProxyAddress);
+            const chainlinkInstance = yield runDeploymentBatch_4(ethFeeProxyAddress);
+            // Batch 5
+            yield runDeploymentBatch_5(chainlinkInstance, erc20FeeProxyAddress, swapConversionResult.instance);
             // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
             // Add future batches above this line
-            console.log('Done deploying. Summary:');
-            deploymentResults
-                .filter((x) => !!x)
-                .forEach((res) => {
-                console.log(`      ${res.contractName.concat(':').padEnd(30, ' ')}${res.address}`);
-            });
+            console.log('Done deploying.');
             // #endregion
         }
         catch (e) {
             console.error(e);
         }
+        // #region MAIN - Conclusion and verification
+        console.log('Summary:');
+        deploymentResults
+            .filter((x) => !!x)
+            .forEach((res) => logDeploymentMsg(res.contractName, res));
         const nbDeployments = deploymentResults.filter((val) => (val === null || val === void 0 ? void 0 : val.type) === 'deployed').length;
         const verificationPromises = deploymentResults
             .map((val) => val === null || val === void 0 ? void 0 : val.verificationPromise)
             .filter(Boolean);
-        // #region MAIN - Conclusion and verification
         if (nbDeployments > 0) {
             console.log(`--- ${nbDeployments} deployements were made. ---`, hre.network.name === 'private'
                 ? ''

package/dist/scripts/deploy-payments.js.map

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

package/dist/scripts/erc20-swap-to-conversion.d.ts

@@ -1,8 +1,11 @@
 import { HardhatRuntimeEnvironment } from 'hardhat/types';
+import { ERC20SwapToConversion } from '../src/types/ERC20SwapToConversion';
 export declare function deploySwapConversion(args: {
     conversionProxyAddress?: string;
     swapProxyAddress?: string;
-}, hre: HardhatRuntimeEnvironment): Promise<import("./deploy-one").DeploymentResult<import("ethers").Contract>>;
+    chainlinkConversionPathAddress: string;
+    nonceCondition?: number;
+}, hre: HardhatRuntimeEnvironment): Promise<import("./deploy-one").DeploymentResult<ERC20SwapToConversion>>;
 /**
  * Prepares ERC20 approvals for the swap conversion contract.
  * */

package/dist/scripts/erc20-swap-to-conversion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"erc20-swap-to-conversion.d.ts","sourceRoot":"","sources":["../../scripts/erc20-swap-to-conversion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAO1D,wBAAsB,oBAAoB,CACxC,IAAI,EAAE;IAAE,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;CAAE,EACpE,GAAG,EAAE,yBAAyB,+EAoB/B;AAED;;KAEK;AACL,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,yBAAyB,EAC9B,oBAAoB,CAAC,EAAE,MAAM,mBA0B9B"}
+{"version":3,"file":"erc20-swap-to-conversion.d.ts","sourceRoot":"","sources":["../../scripts/erc20-swap-to-conversion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAG1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAO3E,wBAAsB,oBAAoB,CACxC,IAAI,EAAE;IACJ,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,8BAA8B,EAAE,MAAM,CAAC;IACvC,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,EACD,GAAG,EAAE,yBAAyB,2EAsB/B;AAED;;KAEK;AACL,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,yBAAyB,EAC9B,oBAAoB,CAAC,EAAE,MAAM,mBA0B9B"}

package/dist/scripts/erc20-swap-to-conversion.js

@@ -20,8 +20,10 @@ function deploySwapConversion(args, hre) {
             constructorArguments: [
                 (_a = utils_1.uniswapV2RouterAddresses[hre.network.name]) !== null && _a !== void 0 ? _a : args.swapProxyAddress,
                 args.conversionProxyAddress,
+                args.chainlinkConversionPathAddress,
             ],
             artifact: lib_1.erc20SwapConversionArtifact,
+            nonceCondition: args.nonceCondition,
         });
         return deployment;
     });

package/dist/scripts/erc20-swap-to-conversion.js.map

@@ -1 +1 @@
-{"version":3,"file":"erc20-swap-to-conversion.js","sourceRoot":"","sources":["../../scripts/erc20-swap-to-conversion.ts"],"names":[],"mappings":";;;;AACA,oCAAyD;AACzD,6CAAyC;AACzC,mCAAmD;AAEnD,MAAM,YAAY,GAAG,uBAAuB,CAAC;AAE7C,SAAsB,oBAAoB,CACxC,IAAoE,EACpE,GAA8B;;;QAE9B,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE;YAChC,mEAAmE;YACnE,OAAO,CAAC,KAAK,CACX,+BAA+B,GAAG,CAAC,OAAO,CAAC,IAAI,mBAAmB,YAAY,GAAG,CAClF,CAAC;SACH;QACD,IAAI,CAAC,gCAAwB,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YACzE,OAAO,CAAC,KAAK,CAAC,sCAAsC,YAAY,GAAG,CAAC,CAAC;SACtE;QACD,MAAM,UAAU,GAAG,MAAM,IAAA,sBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE;YAC1D,oBAAoB,EAAE;gBACpB,MAAA,gCAAwB,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,mCAAI,IAAI,CAAC,gBAAgB;gBACnE,IAAI,CAAC,sBAAsB;aAC5B;YACD,QAAQ,EAAE,iCAA2B;SACtC,CAAC,CAAC;QAEH,OAAO,UAAU,CAAC;;CACnB;AAtBD,oDAsBC;AAED;;KAEK;AACL,SAAsB,qBAAqB,CACzC,GAA8B,EAC9B,oBAA6B;;QAE7B,MAAM,CAAC,EAAE,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACjD,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,CAAC,IAAI,CAAC,+EAA+E,CAAC,CAAC;SAC/F;QAED,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAC9E,MAAM,aAAa,GAAG,oBAAoB;YACxC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,oBAAoB,CAAC;YAC1C,CAAC,CAAC,iCAA2B,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAClE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACpC,OAAO,CAAC,GAAG,CAAC,mCAAmC,YAAY,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;YACtF,OAAO,CAAC,CAAC;SACV;QACD,IAAI,aAAa,EAAE;YACjB,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;YAC7C,MAAM,uBAAuB,GAAG,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAO,YAAY,EAAE,EAAE;gBACzF,MAAM,aAAa,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;gBACvD,MAAM,aAAa,CAAC,0BAA0B,CAAC,YAAY,CAAC,CAAC;gBAC7D,OAAO,CAAC,GAAG,CAAC,aAAa,YAAY,EAAE,CAAC,CAAC;YAC3C,CAAC,CAAA,CAAC,CAAC;YACH,MAAM,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;YAC3C,OAAO,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;SAC/C;QACD,OAAO,CAAC,CAAC;IACX,CAAC;CAAA;AA5BD,sDA4BC;AAED;;;GAGG;AACH,MAAM,aAAa,GAAoC;IACrD,4CAA4C;IAC5C,OAAO,EAAE;QACP,aAAa;QACb,4CAA4C;QAC5C,YAAY;QACZ,4CAA4C;KAC7C;IACD,OAAO,EAAE;QACP,MAAM;QACN,4CAA4C;QAC5C,OAAO;QACP,4CAA4C;KAC7C;CACF,CAAC"}
+{"version":3,"file":"erc20-swap-to-conversion.js","sourceRoot":"","sources":["../../scripts/erc20-swap-to-conversion.ts"],"names":[],"mappings":"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"}

package/dist/scripts/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../scripts/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAE1D;;;GAGG;AACH,eAAO,MAAM,wBAAwB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAgB3D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,SAAgB,GAAG,OAAO,yBAAyB,SAAS,MAAM,kBAazF,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../scripts/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAE1D;;;GAGG;AACH,eAAO,MAAM,wBAAwB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAiB3D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,SAAgB,GAAG,OAAO,yBAAyB,SAAS,MAAM,kBAazF,CAAC"}

package/dist/scripts/utils.js

@@ -21,7 +21,8 @@ exports.uniswapV2RouterAddresses = {
     // https://app.ubeswap.org/#/swap
     celo: '0x7D28570135A2B1930F331c507F65039D4937f66c',
     // No swap v2 found
-    arbitrumtest: '0x0000000000000000000000000000000000000000',
+    'arbitrum-rinkeby': '0x0000000000000000000000000000000000000000',
+    'arbitrum-one': '0x0000000000000000000000000000000000000000',
 };
 /**
  * Executes as many empty transactions as needed for the nonce goes up to a certain target.

package/dist/scripts/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../scripts/utils.ts"],"names":[],"mappings":";;;;AAEA;;;GAGG;AACU,QAAA,wBAAwB,GAA2B;IAC9D,OAAO,EAAE,4CAA4C;IACrD,OAAO,EAAE,4CAA4C;IACrD,OAAO,EAAE,4CAA4C;IACrD,KAAK,EAAE,4CAA4C;IACnD,OAAO,EAAE,4CAA4C;IACrD,OAAO,EAAE,4CAA4C;IACrD,IAAI,EAAE,4CAA4C;IAClD,kDAAkD;IAClD,MAAM,EAAE,4CAA4C;IACpD,8CAA8C;IAC9C,KAAK,EAAE,4CAA4C;IACnD,iCAAiC;IACjC,IAAI,EAAE,4CAA4C;IAClD,mBAAmB;IACnB,YAAY,EAAE,4CAA4C;CAC3D,CAAC;AAEF;;;GAGG;AACI,MAAM,WAAW,GAAG,CAAO,IAAS,EAAE,GAA8B,EAAE,KAAa,EAAE,EAAE;IAC5F,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;IACjD,IAAI,IAAI,CAAC,QAAQ,EAAE;QACjB,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,mBAAmB,EAAE,CAAC;QAC1D,IAAI,YAAY,GAAG,KAAK,EAAE;YACxB,OAAO,CAAC,GAAG,CAAC,8BAA8B,KAAK,cAAc,YAAY,GAAG,CAAC,CAAC;SAC/E;QACD,OAAO;KACR;IACD,OAAO,CAAC,MAAM,QAAQ,CAAC,mBAAmB,EAAE,CAAC,GAAG,KAAK,EAAE;QACrD,uCAAuC;QACvC,MAAM,QAAQ,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;KAC1D;AACH,CAAC,CAAA,CAAC;AAbW,QAAA,WAAW,eAatB"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../scripts/utils.ts"],"names":[],"mappings":";;;;AAEA;;;GAGG;AACU,QAAA,wBAAwB,GAA2B;IAC9D,OAAO,EAAE,4CAA4C;IACrD,OAAO,EAAE,4CAA4C;IACrD,OAAO,EAAE,4CAA4C;IACrD,KAAK,EAAE,4CAA4C;IACnD,OAAO,EAAE,4CAA4C;IACrD,OAAO,EAAE,4CAA4C;IACrD,IAAI,EAAE,4CAA4C;IAClD,kDAAkD;IAClD,MAAM,EAAE,4CAA4C;IACpD,8CAA8C;IAC9C,KAAK,EAAE,4CAA4C;IACnD,iCAAiC;IACjC,IAAI,EAAE,4CAA4C;IAClD,mBAAmB;IACnB,kBAAkB,EAAE,4CAA4C;IAChE,cAAc,EAAE,4CAA4C;CAC7D,CAAC;AAEF;;;GAGG;AACI,MAAM,WAAW,GAAG,CAAO,IAAS,EAAE,GAA8B,EAAE,KAAa,EAAE,EAAE;IAC5F,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;IACjD,IAAI,IAAI,CAAC,QAAQ,EAAE;QACjB,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,mBAAmB,EAAE,CAAC;QAC1D,IAAI,YAAY,GAAG,KAAK,EAAE;YACxB,OAAO,CAAC,GAAG,CAAC,8BAA8B,KAAK,cAAc,YAAY,GAAG,CAAC,CAAC;SAC/E;QACD,OAAO;KACR;IACD,OAAO,CAAC,MAAM,QAAQ,CAAC,mBAAmB,EAAE,CAAC,GAAG,KAAK,EAAE;QACrD,uCAAuC;QACvC,MAAM,QAAQ,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;KAC1D;AACH,CAAC,CAAA,CAAC;AAbW,QAAA,WAAW,eAatB"}