@requestnetwork/smart-contracts 0.28.1-next.1743 → 0.28.1-next.1751

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.js

@@ -43,7 +43,7 @@ const computeCreate2DeploymentAddressesFromList = (hre) => (0, tslib_1.__awaiter
         switch (contract) {
             case 'EthereumProxy':
             case 'EthereumFeeProxy':
-            case 'ETHConversionProxy':
+            case 'EthConversionProxy':
             case 'ERC20FeeProxy':
             case 'Erc20ConversionProxy':
             case 'ERC20EscrowToPay':

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

@@ -4,5 +4,5 @@ import { HardhatRuntimeEnvironmentExtended } from '../types';
  * @param contractAddress address of the BatchPayments Proxy
  * @param hre Hardhat runtime environment
  */
-export declare const setupEthConversionProxy: (contractAddress: string, hre: HardhatRuntimeEnvironmentExtended) => Promise<void>;
+export declare const setupETHConversionProxy: (contractAddress: string, hre: HardhatRuntimeEnvironmentExtended) => Promise<void>;
 //# sourceMappingURL=setupETHConversionProxy.d.ts.map

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupEthConversionProxy = void 0;
+exports.setupETHConversionProxy = void 0;
 const tslib_1 = require("tslib");
 const lib_1 = require("../../src/lib");
 const utils_1 = require("@requestnetwork/utils");
@@ -10,7 +10,7 @@ const adminTasks_1 = require("./adminTasks");
  * @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* () {
+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* () {
@@ -34,5 +34,5 @@ const setupEthConversionProxy = (contractAddress, hre) => (0, tslib_1.__awaiter)
     })));
     console.log('Setup for EthConversionProxy successful');
 });
-exports.setupEthConversionProxy = setupEthConversionProxy;
+exports.setupETHConversionProxy = setupETHConversionProxy;
 //# sourceMappingURL=setupETHConversionProxy.js.map

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 BatchPayments, 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.d.ts.map

@@ -1 +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;AA0I7D;;;;;GAKG;AACH,eAAO,MAAM,aAAa,oBACP,MAAM,OAClB,iCAAiC,gBACxB,MAAM,KACnB,QAAQ,IAAI,CAmBd,CAAC"}
+{"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

@@ -2,116 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupContract = void 0;
 const tslib_1 = require("tslib");
-const lib_1 = require("../../src/lib");
-const lib_2 = require("../../src/lib");
-const utils_1 = require("@requestnetwork/utils");
-const adminTasks_1 = require("./adminTasks");
+const setupETHConversionProxy_1 = require("./setupETHConversionProxy");
+const setupBatchPayments_1 = require("./setupBatchPayments");
+const setupERC20SwapToConversion_1 = require("./setupERC20SwapToConversion");
 /**
- * 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 setupBatchPayments = (contractAddress, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
-    // Setup contract parameters
-    const batchPaymentContract = new hre.ethers.Contract(contractAddress, lib_2.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 batchPaymentConnected = yield batchPaymentContract.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.updateBatchPaymentFees)(batchPaymentConnected, adminNonce, gasPrice.mul(2)),
-            (0, adminTasks_1.updatePaymentErc20FeeProxy)(batchPaymentConnected, network, adminNonce + 1, gasPrice.mul(2)),
-            (0, adminTasks_1.updatePaymentEthFeeProxy)(batchPaymentConnected, network, adminNonce + 2, gasPrice.mul(2)),
-        ]);
-    })));
-    console.log('Setup for setupBatchPayment successful');
-});
-/**
- * Updates the values of the chainlinkConversionPath and swap router of the ERC20SwapToConversion contract, if needed
- * @param contractAddress address of the ERC20SwapToConversion Proxy
- * @param hre Hardhat runtime environment
- */
-const setupERC20SwapToConversion = (contractAddress, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
-    // Setup contract parameters
-    const ERC20SwapToConversionContract = new hre.ethers.Contract(contractAddress, lib_1.erc20SwapConversionArtifact.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 ERC20SwapToConversionConnected = yield ERC20SwapToConversionContract.connect(signer);
-        const adminNonce = yield signer.getTransactionCount();
-        const gasPrice = yield provider.getGasPrice();
-        yield Promise.all([
-            (0, adminTasks_1.updateChainlinkConversionPath)(ERC20SwapToConversionConnected, network, adminNonce, gasPrice),
-            (0, adminTasks_1.updateSwapRouter)(ERC20SwapToConversionConnected, network, adminNonce + 1, gasPrice),
-            (0, adminTasks_1.updateRequestSwapFees)(ERC20SwapToConversionConnected, adminNonce + 2, gasPrice),
-        ]);
-    })));
-    console.log('Setup for ERC20SwapToConversion successfull');
-});
-/**
- * Updates the values of the EthConversionProxy contract, 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* () {
-    // Setup contract parameters
-    const EthConversionProxyContract = new hre.ethers.Contract(contractAddress, lib_2.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');
-});
-/**
- * Updates the values of either BatchPayments, EthConversionProxy, or ERC20SwapToConversion contract, if needed
+ * 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 setupEthConversionProxy(contractAddress, hre);
+        case 'ETHConversionProxy': {
+            yield (0, setupETHConversionProxy_1.setupETHConversionProxy)(contractAddress, hre);
             break;
         }
         case 'ERC20SwapToConversion': {
-            yield setupERC20SwapToConversion(contractAddress, hre);
+            yield (0, setupERC20SwapToConversion_1.setupERC20SwapToConversion)(contractAddress, hre);
             break;
         }
         case 'BatchPayments': {
-            yield setupBatchPayments(contractAddress, hre);
+            yield (0, setupBatchPayments_1.setupBatchPayments)(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":"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"}
+{"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.js

@@ -43,7 +43,7 @@ const deployWithCreate2FromList = (hre) => (0, tslib_1.__awaiter)(void 0, void 0
         switch (contract) {
             case 'EthereumProxy':
             case 'EthereumFeeProxy':
-            case 'ETHConversionProxy':
+            case 'EthConversionProxy':
             case 'ERC20FeeProxy':
             case 'Erc20ConversionProxy': {
                 const constructorArgs = (0, constructor_args_1.getConstructorArgs)(contract);

package/dist/scripts-create2/utils.js

@@ -10,7 +10,7 @@ const artifacts = require("../src/lib");
 exports.create2ContractDeploymentList = [
     'EthereumProxy',
     'EthereumFeeProxy',
-    'ETHConversionProxy',
+    'EthConversionProxy',
     'ERC20FeeProxy',
     'Erc20ConversionProxy',
     'ERC20SwapToConversion',
@@ -39,7 +39,7 @@ const getArtifact = (contract) => {
             return artifacts.chainlinkConversionPath;
         case 'Erc20ConversionProxy':
             return artifacts.erc20ConversionProxy;
-        case 'EthConversionProxy':
+        case 'ETHConversionProxy':
             return artifacts.ethConversionArtifact;
         case 'ERC20SwapToPay':
             return artifacts.erc20SwapToPayArtifact;

package/dist/scripts-create2/verify.js

@@ -25,7 +25,7 @@ function VerifyCreate2FromList(hre) {
                 switch (contract) {
                     case 'EthereumProxy':
                     case 'EthereumFeeProxy':
-                    case 'ETHConversionProxy':
+                    case 'EthConversionProxy':
                     case 'ERC20FeeProxy':
                     case 'ERC20SwapToConversion':
                     case 'Erc20ConversionProxy': {

package/dist/src/lib/artifacts/ChainlinkConversionPath/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/lib/artifacts/ChainlinkConversionPath/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAK1D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AAEtF,eAAO,MAAM,uBAAuB,2CA2GnC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/lib/artifacts/ChainlinkConversionPath/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAK1D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AAEtF,eAAO,MAAM,uBAAuB,2CA+GnC,CAAC"}

package/dist/src/lib/artifacts/ChainlinkConversionPath/index.js

@@ -70,6 +70,10 @@ exports.chainlinkConversionPath = new ContractArtifact_1.ContractArtifact({
                 address: '0x0818Ad7016138f0A40DFAe30F64a923c2A8F61bA',
                 creationBlockNumber: 10023414,
             },
+            goerli: {
+                address: '0x70bE16E6B7F465bED2237Cf609341A29C019B3bf',
+                creationBlockNumber: 7108894,
+            },
             fantom: {
                 address: '0x0818Ad7016138f0A40DFAe30F64a923c2A8F61bA',
                 creationBlockNumber: 28548259,

package/dist/src/lib/artifacts/ChainlinkConversionPath/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/lib/artifacts/ChainlinkConversionPath/index.ts"],"names":[],"mappings":";;;AAAA,6DAA0D;AAE1D,8CAAgD;AAChD,8CAAgD;AAInC,QAAA,uBAAuB,GAAG,IAAI,mCAAgB,CACzD;IACE,OAAO,EAAE;QACP,GAAG,EAAE,iBAAS;QACd,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,CAAC;aACvB;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,KAAK,EAAE;gBACL,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,GAAG,EAAE;gBACH,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,kBAAkB,EAAE;gBAClB,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;SACF;KACF;IACD,OAAO,EAAE;QACP,GAAG,EAAE,iBAAS;QACd,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,CAAC;aACvB;YACD,oDAAoD;YACpD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,cAAc,EAAE;gBACd,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,SAAS,EAAE;gBACT,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,KAAK,EAAE;gBACL,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,GAAG,EAAE;gBACH,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;SACF;KACF;CACF;AACD,uHAAuH;AACvH;;;;;;;;;;EAUE;AACF,OAAO,CACR,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/lib/artifacts/ChainlinkConversionPath/index.ts"],"names":[],"mappings":";;;AAAA,6DAA0D;AAE1D,8CAAgD;AAChD,8CAAgD;AAInC,QAAA,uBAAuB,GAAG,IAAI,mCAAgB,CACzD;IACE,OAAO,EAAE;QACP,GAAG,EAAE,iBAAS;QACd,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,CAAC;aACvB;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,KAAK,EAAE;gBACL,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,GAAG,EAAE;gBACH,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,kBAAkB,EAAE;gBAClB,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;SACF;KACF;IACD,OAAO,EAAE;QACP,GAAG,EAAE,iBAAS;QACd,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,CAAC;aACvB;YACD,oDAAoD;YACpD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,cAAc,EAAE;gBACd,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,SAAS,EAAE;gBACT,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,KAAK,EAAE;gBACL,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,GAAG,EAAE;gBACH,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;SACF;KACF;CACF;AACD,uHAAuH;AACvH;;;;;;;;;;EAUE;AACF,OAAO,CACR,CAAC"}

package/dist/src/lib/artifacts/ERC20EscrowToPay/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/lib/artifacts/ERC20EscrowToPay/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAM1D,eAAO,MAAM,wBAAwB,uBAqDpC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/lib/artifacts/ERC20EscrowToPay/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAM1D,eAAO,MAAM,wBAAwB,uBAiCpC,CAAC"}

package/dist/src/lib/artifacts/ERC20EscrowToPay/index.js

@@ -12,44 +12,24 @@ exports.erc20EscrowToPayArtifact = new ContractArtifact_1.ContractArtifact({
                 creationBlockNumber: 0,
             },
             mainnet: {
-                address: '0xa015c141C02996EcE6410646DA3D07d70091c577',
-                creationBlockNumber: 14884007,
+                address: '0x7DfD5955a1Ed6Bf74ccF8e24FF53E0a9A7e9F477',
+                creationBlockNumber: 15146972,
             },
             rinkeby: {
-                address: '0xEbe28A2B7336670Ba752bfEad4a121D2c4FF2464',
-                creationBlockNumber: 10461945,
+                address: '0x2b487A3251aCC34ae95E4f5aA7fdcD2C7447B42e',
+                creationBlockNumber: 11028247,
             },
             goerli: {
-                address: '0xEbe28A2B7336670Ba752bfEad4a121D2c4FF2464',
-                creationBlockNumber: 10461945,
+                address: '0xd2777001fD7D89331D8E87eC439f78079179322b',
+                creationBlockNumber: 7230322,
             },
             matic: {
-                address: '0xc7f471F5A8f8b33F131049b1e9A43941CbE31792',
-                creationBlockNumber: 29821569,
+                address: '0x937Db37ffb67083242fbC6AdD472146bF10E01ec',
+                creationBlockNumber: 30751595,
             },
             fuse: {
-                address: '0xa015c141C02996EcE6410646DA3D07d70091c577',
-                creationBlockNumber: 17328459,
-            },
-            celo: {
-                address: '0xa015c141C02996EcE6410646DA3D07d70091c577',
-                creationBlockNumber: 13299808,
-            },
-            xdai: {
-                address: '0xa015c141C02996EcE6410646DA3D07d70091c577',
-                creationBlockNumber: 22438806,
-            },
-            'arbitrum-one': {
-                address: '0xa015c141C02996EcE6410646DA3D07d70091c577',
-                creationBlockNumber: 13417262,
-            },
-            fantom: {
-                address: '0xa015c141C02996EcE6410646DA3D07d70091c577',
-                creationBlockNumber: 39534777,
-            },
-            bsc: {
-                address: '0xc7f471F5A8f8b33F131049b1e9A43941CbE31792',
-                creationBlockNumber: 18877277,
+                address: '0x4BA012eae4d64da79Bd6bcdBa366803fCe701A4C',
+                creationBlockNumber: 18086337,
             },
         },
     },

package/dist/src/lib/artifacts/ERC20EscrowToPay/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/lib/artifacts/ERC20EscrowToPay/index.ts"],"names":[],"mappings":";;;AAAA,6DAA0D;AAE1D,8CAAgD;AAInC,QAAA,wBAAwB,GAAG,IAAI,mCAAgB,CAC1D;IACE,OAAO,EAAE;QACP,GAAG,EAAE,iBAAS;QACd,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,CAAC;aACvB;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,KAAK,EAAE;gBACL,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,cAAc,EAAE;gBACd,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,GAAG,EAAE;gBACH,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;SACF;KACF;CACF,EACD,OAAO,CACR,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/lib/artifacts/ERC20EscrowToPay/index.ts"],"names":[],"mappings":";;;AAAA,6DAA0D;AAE1D,8CAAgD;AAInC,QAAA,wBAAwB,GAAG,IAAI,mCAAgB,CAC1D;IACE,OAAO,EAAE;QACP,GAAG,EAAE,iBAAS;QACd,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,CAAC;aACvB;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,KAAK,EAAE;gBACL,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;SACF;KACF;CACF,EACD,OAAO,CACR,CAAC"}

package/dist/src/lib/artifacts/ERC20FeeProxy/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/lib/artifacts/ERC20FeeProxy/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAI1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,eAAO,MAAM,qBAAqB,iCAuIjC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/lib/artifacts/ERC20FeeProxy/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAI1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,eAAO,MAAM,qBAAqB,iCA2IjC,CAAC"}

package/dist/src/lib/artifacts/ERC20FeeProxy/index.js

@@ -65,6 +65,10 @@ exports.erc20FeeProxyArtifact = new ContractArtifact_1.ContractArtifact({
                 address: '0xda46309973bFfDdD5a10cE12c44d2EE266f45A44',
                 creationBlockNumber: 7118080,
             },
+            goerli: {
+                address: '0x399F5EE127ce7432E4921a61b8CF52b0af52cbfE',
+                creationBlockNumber: 7091472,
+            },
             matic: {
                 address: '0x0DfbEe143b42B41eFC5A6F87bFD1fFC78c2f0aC9',
                 creationBlockNumber: 17427742,

package/dist/src/lib/artifacts/ERC20FeeProxy/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/lib/artifacts/ERC20FeeProxy/index.ts"],"names":[],"mappings":";;;AAAA,6DAA0D;AAE1D,8CAAgD;AAInC,QAAA,qBAAqB,GAAG,IAAI,mCAAgB,CACvD;IACE,OAAO,EAAE;QACP,GAAG,EAAE,iBAAS;QACd,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,CAAC;aACvB;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,KAAK,EAAE;gBACL,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,SAAS,EAAE;gBACT,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,iCAAiC;YACjC,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;SACF;KACF;IACD,OAAO,EAAE;QACP,GAAG,EAAE,iBAAS;QACd,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,CAAC;aACvB;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,KAAK,EAAE;gBACL,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,SAAS,EAAE;gBACT,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,GAAG,EAAE;gBACH,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,kBAAkB,EAAE;gBAClB,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,cAAc,EAAE;gBACd,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,SAAS,EAAE;gBACT,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;SACF;KACF;IACD,uHAAuH;IACvH;;;;;;;;;;;;;;;;;;MAkBE;CACH,EACD,OAAO,CACR,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/lib/artifacts/ERC20FeeProxy/index.ts"],"names":[],"mappings":"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"}

package/dist/src/lib/artifacts/ERC20SwapToPay/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/lib/artifacts/ERC20SwapToPay/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAI1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAEpE,eAAO,MAAM,sBAAsB,kCAkFlC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/lib/artifacts/ERC20SwapToPay/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAI1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAEpE,eAAO,MAAM,sBAAsB,kCAsFlC,CAAC"}

package/dist/src/lib/artifacts/ERC20SwapToPay/index.js

@@ -40,6 +40,10 @@ exports.erc20SwapToPayArtifact = new ContractArtifact_1.ContractArtifact({
                 address: '0x1B5077Ca852d39CDDeDaF45FAF1235841854420b',
                 creationBlockNumber: 7408086,
             },
+            goerli: {
+                address: '0x0Ef49176A87Adcc88bD5125126C6a6c23a28303C',
+                creationBlockNumber: 7109102,
+            },
             bsc: {
                 address: '0x75740D9b5cA3BCCb356CA7f0D0dB71aBE427a835',
                 creationBlockNumber: 16165020,

package/dist/src/lib/artifacts/ERC20SwapToPay/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/lib/artifacts/ERC20SwapToPay/index.ts"],"names":[],"mappings":";;;AAAA,6DAA0D;AAE1D,8CAAgD;AAInC,QAAA,sBAAsB,GAAG,IAAI,mCAAgB,CACxD;IACE,OAAO,EAAE;QACP,GAAG,EAAE,iBAAS;QACd,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,CAAC;aACvB;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;SACF;KACF;IACD,OAAO,EAAE;QACP,GAAG,EAAE,iBAAS;QACd,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,CAAC;aACvB;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,GAAG,EAAE;gBACH,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,KAAK,EAAE;gBACL,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,cAAc,EAAE;gBACd,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,SAAS,EAAE;gBACT,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;SACF;KACF;CACF;AACD,uHAAuH;AACvH;;;;;;;;;;EAUE;AACF,OAAO,CACR,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/lib/artifacts/ERC20SwapToPay/index.ts"],"names":[],"mappings":";;;AAAA,6DAA0D;AAE1D,8CAAgD;AAInC,QAAA,sBAAsB,GAAG,IAAI,mCAAgB,CACxD;IACE,OAAO,EAAE;QACP,GAAG,EAAE,iBAAS;QACd,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,CAAC;aACvB;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;SACF;KACF;IACD,OAAO,EAAE;QACP,GAAG,EAAE,iBAAS;QACd,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,CAAC;aACvB;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,GAAG,EAAE;gBACH,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,KAAK,EAAE;gBACL,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,cAAc,EAAE;gBACd,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,SAAS,EAAE;gBACT,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;SACF;KACF;CACF;AACD,uHAAuH;AACvH;;;;;;;;;;EAUE;AACF,OAAO,CACR,CAAC"}

package/dist/src/lib/artifacts/EthConversionProxy/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/lib/artifacts/EthConversionProxy/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAK1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAE5E,eAAO,MAAM,qBAAqB,sCA8EjC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/lib/artifacts/EthConversionProxy/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAK1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAE5E,eAAO,MAAM,qBAAqB,sCAkFjC,CAAC"}

package/dist/src/lib/artifacts/EthConversionProxy/index.js

@@ -53,6 +53,10 @@ exports.ethConversionArtifact = new ContractArtifact_1.ContractArtifact({
                 address: '0x7Ebf48a26253810629C191b56C3212Fd0D211c26',
                 creationBlockNumber: 10023415,
             },
+            goerli: {
+                address: '0xED250D9219EB93098Bb67aEbc992963172B9c8DA',
+                creationBlockNumber: 7108896,
+            },
             fantom: {
                 address: '0x7Ebf48a26253810629C191b56C3212Fd0D211c26',
                 creationBlockNumber: 28552915,

package/dist/src/lib/artifacts/EthConversionProxy/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/lib/artifacts/EthConversionProxy/index.ts"],"names":[],"mappings":";;;AAAA,6DAA0D;AAE1D,8CAAgD;AAChD,8CAAgD;AAInC,QAAA,qBAAqB,GAAG,IAAI,mCAAgB,CACvD;IACE,OAAO,EAAE;QACP,GAAG,EAAE,iBAAS;QACd,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,CAAC;aACvB;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,KAAK,EAAE;gBACL,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;SACF;KACF;IACD,OAAO,EAAE;QACP,GAAG,EAAE,iBAAS;QACd,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,CAAC;aACvB;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,cAAc,EAAE;gBACd,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,SAAS,EAAE;gBACT,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,KAAK,EAAE;gBACL,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,GAAG,EAAE;gBACH,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;SACF;KACF;CACF,EACD,OAAO,CACR,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/lib/artifacts/EthConversionProxy/index.ts"],"names":[],"mappings":";;;AAAA,6DAA0D;AAE1D,8CAAgD;AAChD,8CAAgD;AAInC,QAAA,qBAAqB,GAAG,IAAI,mCAAgB,CACvD;IACE,OAAO,EAAE;QACP,GAAG,EAAE,iBAAS;QACd,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,CAAC;aACvB;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,KAAK,EAAE;gBACL,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;SACF;KACF;IACD,OAAO,EAAE;QACP,GAAG,EAAE,iBAAS;QACd,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,CAAC;aACvB;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,cAAc,EAAE;gBACd,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,SAAS,EAAE;gBACT,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,KAAK,EAAE;gBACL,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,GAAG,EAAE;gBACH,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;SACF;KACF;CACF,EACD,OAAO,CACR,CAAC"}

package/dist/src/lib/artifacts/EthereumFeeProxy/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/lib/artifacts/EthereumFeeProxy/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAI1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,eAAO,MAAM,wBAAwB,oCAsGpC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/lib/artifacts/EthereumFeeProxy/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAI1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,eAAO,MAAM,wBAAwB,oCA0GpC,CAAC"}

package/dist/src/lib/artifacts/EthereumFeeProxy/index.js

@@ -64,6 +64,10 @@ exports.ethereumFeeProxyArtifact = new ContractArtifact_1.ContractArtifact({
                 address: '0xfCFBcfc4f5A421089e3Df45455F7f4985FE2D6a8',
                 creationBlockNumber: 10307582,
             },
+            goerli: {
+                address: '0xe11BF2fDA23bF0A98365e1A4c04A87C9339e8687',
+                creationBlockNumber: 7091386,
+            },
             fantom: {
                 address: '0xfCFBcfc4f5A421089e3Df45455F7f4985FE2D6a8',
                 creationBlockNumber: 33495801,

package/dist/src/lib/artifacts/EthereumFeeProxy/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/lib/artifacts/EthereumFeeProxy/index.ts"],"names":[],"mappings":";;;AAAA,6DAA0D;AAE1D,8CAAgD;AAInC,QAAA,wBAAwB,GAAG,IAAI,mCAAgB,CAC1D;IACE,OAAO,EAAE;QACP,GAAG,EAAE,iBAAS;QACd,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,CAAC;aACvB;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,KAAK,EAAE;gBACL,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,kBAAkB,EAAE;gBAClB,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,cAAc,EAAE;gBACd,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,SAAS,EAAE;gBACT,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,GAAG,EAAE;gBACH,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;SACF;KACF;IACD,OAAO,EAAE;QACP,GAAG,EAAE,iBAAS;QACd,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,CAAC;aACvB;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,SAAS,EAAE;gBACT,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,KAAK,EAAE;gBACL,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,cAAc,EAAE;gBACd,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,GAAG,EAAE;gBACH,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;SACF;KACF;CACF,EACD,OAAO,CACR,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/lib/artifacts/EthereumFeeProxy/index.ts"],"names":[],"mappings":";;;AAAA,6DAA0D;AAE1D,8CAAgD;AAInC,QAAA,wBAAwB,GAAG,IAAI,mCAAgB,CAC1D;IACE,OAAO,EAAE;QACP,GAAG,EAAE,iBAAS;QACd,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,CAAC;aACvB;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,KAAK,EAAE;gBACL,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,kBAAkB,EAAE;gBAClB,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,cAAc,EAAE;gBACd,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,SAAS,EAAE;gBACT,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,GAAG,EAAE;gBACH,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;SACF;KACF;IACD,OAAO,EAAE;QACP,GAAG,EAAE,iBAAS;QACd,UAAU,EAAE;YACV,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,CAAC;aACvB;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,MAAM,EAAE;gBACN,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,SAAS,EAAE;gBACT,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,KAAK,EAAE;gBACL,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,cAAc,EAAE;gBACd,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,OAAO;aAC7B;YACD,GAAG,EAAE;gBACH,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,OAAO,EAAE;gBACP,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;YACD,IAAI,EAAE;gBACJ,OAAO,EAAE,4CAA4C;gBACrD,mBAAmB,EAAE,QAAQ;aAC9B;SACF;KACF;CACF,EACD,OAAO,CACR,CAAC"}

package/dist/src/lib/artifacts/EthereumProxy/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/lib/artifacts/EthereumProxy/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAI1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,eAAO,MAAM,qBAAqB,iCA4KjC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/lib/artifacts/EthereumProxy/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAI1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,eAAO,MAAM,qBAAqB,iCAgLjC,CAAC"}

package/dist/src/lib/artifacts/EthereumProxy/index.js

@@ -133,6 +133,10 @@ exports.ethereumProxyArtifact = new ContractArtifact_1.ContractArtifact({
                 address: '0x322F0037d272E980984F89E94Aae43BD0FC065E6',
                 creationBlockNumber: 10307566,
             },
+            goerli: {
+                address: '0x171Ee0881407d4c0C11eA1a2FB7D5b4cdED71e6e',
+                creationBlockNumber: 7069045,
+            },
             fantom: {
                 address: '0x322F0037d272E980984F89E94Aae43BD0FC065E6',
                 creationBlockNumber: 33496209,

package/dist/src/lib/artifacts/EthereumProxy/index.js.map

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