@requestnetwork/smart-contracts 0.29.1-next.1824 → 0.29.1-next.1826

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -2,11 +2,30 @@ import { BigNumber, Wallet } from 'ethers';
2
2
  import { HardhatRuntimeEnvironmentExtended } from '../types';
3
3
  export declare const REQUEST_SWAP_FEES = 5;
4
4
  export declare const BATCH_FEE = 3;
5
+ /**
6
+ * Updates the chainlink address used by the contract.
7
+ * @param contract A contract using chainlink:
8
+ * Erc20ConversionProxy | EthConversionProxy | ERC20SwapToConversion.
9
+ * @param network The network used.
10
+ * @param gasPrice The gas price used.Increase its value if needed.
11
+ * @param version The version of the chainlink proxy to use, the last one by default.
12
+ */
5
13
  export declare const updateChainlinkConversionPath: (contract: any, network: string, gasPrice: BigNumber, version?: undefined) => Promise<void>;
6
14
  export declare const updateSwapRouter: (contract: any, network: string, gasPrice: BigNumber) => Promise<void>;
7
15
  export declare const updateRequestSwapFees: (contract: any, gasPrice: BigNumber) => Promise<void>;
8
16
  export declare const updateBatchPaymentFees: (contract: any, gasPrice: BigNumber) => Promise<void>;
17
+ /**
18
+ * Updates the address of a Native or ERC20 fee proxy stored within a Native or ERC20 fee conversion contract
19
+ * @param contract A contract using chainlink: EthConversionProxy | Erc20ConversionProxy.
20
+ * @param network The network used.
21
+ * @param gasPrice The gas price used.Increase its value if needed.
22
+ * @param proxyType The type of the proxy fee.
23
+ * @param version The version of the fee proxy to use, the last one by default.
24
+ */
25
+ export declare const updatePaymentFeeProxyAddress: (contract: any, network: string, gasPrice: BigNumber, proxyType: 'native' | 'erc20', version?: undefined) => Promise<void>;
26
+ /** legacy from BatchPayment */
9
27
  export declare const updatePaymentErc20FeeProxy: (contract: any, network: string, gasPrice: BigNumber) => Promise<void>;
28
+ /** legacy from BatchPayment */
10
29
  export declare const updatePaymentEthFeeProxy: (contract: any, network: string, gasPrice: BigNumber) => Promise<void>;
11
30
  export declare const getSignerAndGasPrice: (network: string, hre: HardhatRuntimeEnvironmentExtended) => Promise<{
12
31
  signer: Wallet;
@@ -1 +1 @@
1
- {"version":3,"file":"adminTasks.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE3C,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAG7D,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAEnC,eAAO,MAAM,SAAS,IAAI,CAAC;AAE3B,eAAO,MAAM,6BAA6B,aAC9B,GAAG,WACJ,MAAM,YACL,SAAS,0BAElB,QAAQ,IAAI,CASd,CAAC;AAEF,eAAO,MAAM,gBAAgB,aACjB,GAAG,WACJ,MAAM,YACL,SAAS,KAClB,QAAQ,IAAI,CAQd,CAAC;AAEF,eAAO,MAAM,qBAAqB,aAAoB,GAAG,YAAY,SAAS,KAAG,QAAQ,IAAI,CAO5F,CAAC;AAEF,eAAO,MAAM,sBAAsB,aAAoB,GAAG,YAAY,SAAS,KAAG,QAAQ,IAAI,CAQ7F,CAAC;AAEF,eAAO,MAAM,0BAA0B,aAC3B,GAAG,WACJ,MAAM,YACL,SAAS,KAClB,QAAQ,IAAI,CAUd,CAAC;AAEF,eAAO,MAAM,wBAAwB,aACzB,GAAG,WACJ,MAAM,YACL,SAAS,KAClB,QAAQ,IAAI,CAUd,CAAC;AAEF,eAAO,MAAM,oBAAoB,YACtB,MAAM,OACV,iCAAiC;YACnB,MAAM;cAAY,SAAS;EAc/C,CAAC"}
1
+ {"version":3,"file":"adminTasks.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE3C,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAG7D,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAEnC,eAAO,MAAM,SAAS,IAAI,CAAC;AAE3B;;;;;;;GAOG;AACH,eAAO,MAAM,6BAA6B,aAC9B,GAAG,WACJ,MAAM,YACL,SAAS,0BAElB,QAAQ,IAAI,CAYd,CAAC;AAEF,eAAO,MAAM,gBAAgB,aACjB,GAAG,WACJ,MAAM,YACL,SAAS,KAClB,QAAQ,IAAI,CAQd,CAAC;AAEF,eAAO,MAAM,qBAAqB,aAAoB,GAAG,YAAY,SAAS,KAAG,QAAQ,IAAI,CAO5F,CAAC;AAEF,eAAO,MAAM,sBAAsB,aAAoB,GAAG,YAAY,SAAS,KAAG,QAAQ,IAAI,CAO7F,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,4BAA4B,aAC7B,GAAG,WACJ,MAAM,YACL,SAAS,aACR,QAAQ,GAAG,OAAO,0BAE5B,QAAQ,IAAI,CAoBd,CAAC;AAEF,+BAA+B;AAC/B,eAAO,MAAM,0BAA0B,aAC3B,GAAG,WACJ,MAAM,YACL,SAAS,KAClB,QAAQ,IAAI,CAUd,CAAC;AAEF,+BAA+B;AAC/B,eAAO,MAAM,wBAAwB,aACzB,GAAG,WACJ,MAAM,YACL,SAAS,KAClB,QAAQ,IAAI,CAUd,CAAC;AAEF,eAAO,MAAM,oBAAoB,YACtB,MAAM,OACV,iCAAiC;YACnB,MAAM;cAAY,SAAS;EAc/C,CAAC"}
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getSignerAndGasPrice = exports.updatePaymentEthFeeProxy = exports.updatePaymentErc20FeeProxy = exports.updateBatchPaymentFees = exports.updateRequestSwapFees = exports.updateSwapRouter = exports.updateChainlinkConversionPath = exports.BATCH_FEE = exports.REQUEST_SWAP_FEES = void 0;
3
+ exports.getSignerAndGasPrice = exports.updatePaymentEthFeeProxy = exports.updatePaymentErc20FeeProxy = exports.updatePaymentFeeProxyAddress = exports.updateBatchPaymentFees = exports.updateRequestSwapFees = exports.updateSwapRouter = exports.updateChainlinkConversionPath = exports.BATCH_FEE = exports.REQUEST_SWAP_FEES = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const lib_1 = require("../../src/lib");
6
6
  const utils_1 = require("../../scripts/utils");
@@ -10,6 +10,14 @@ const utils_2 = require("@requestnetwork/utils");
10
10
  exports.REQUEST_SWAP_FEES = 5;
11
11
  // Batch Fees: .3%
12
12
  exports.BATCH_FEE = 3;
13
+ /**
14
+ * Updates the chainlink address used by the contract.
15
+ * @param contract A contract using chainlink:
16
+ * Erc20ConversionProxy | EthConversionProxy | ERC20SwapToConversion.
17
+ * @param network The network used.
18
+ * @param gasPrice The gas price used.Increase its value if needed.
19
+ * @param version The version of the chainlink proxy to use, the last one by default.
20
+ */
13
21
  const updateChainlinkConversionPath = (contract, network, gasPrice, version = undefined) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
14
22
  const currentChainlinkAddress = yield contract.chainlinkConversionPath();
15
23
  const chainlinkConversionPathAddress = lib_1.chainlinkConversionPath.getAddress(network, version);
@@ -18,6 +26,7 @@ const updateChainlinkConversionPath = (contract, network, gasPrice, version = un
18
26
  gasPrice: gasPrice,
19
27
  });
20
28
  yield tx.wait(1);
29
+ console.log(`chainlink: the current address ${currentChainlinkAddress} has been replaced by: ${chainlinkConversionPathAddress}`);
21
30
  }
22
31
  });
23
32
  exports.updateChainlinkConversionPath = updateChainlinkConversionPath;
@@ -45,11 +54,39 @@ const updateBatchPaymentFees = (contract, gasPrice) => (0, tslib_1.__awaiter)(vo
45
54
  if (!currentFees.eq(exports.BATCH_FEE)) {
46
55
  const tx = yield contract.setBatchFee(exports.BATCH_FEE, { gasPrice: gasPrice });
47
56
  yield tx.wait(1);
48
- // Log is useful to have a direct view on what is being updated
49
57
  console.log(`currentFees: ${currentFees.toString()}, new fees: ${exports.BATCH_FEE}`);
50
58
  }
51
59
  });
52
60
  exports.updateBatchPaymentFees = updateBatchPaymentFees;
61
+ /**
62
+ * Updates the address of a Native or ERC20 fee proxy stored within a Native or ERC20 fee conversion contract
63
+ * @param contract A contract using chainlink: EthConversionProxy | Erc20ConversionProxy.
64
+ * @param network The network used.
65
+ * @param gasPrice The gas price used.Increase its value if needed.
66
+ * @param proxyType The type of the proxy fee.
67
+ * @param version The version of the fee proxy to use, the last one by default.
68
+ */
69
+ const updatePaymentFeeProxyAddress = (contract, network, gasPrice, proxyType, version = undefined) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
70
+ let proxyAddress;
71
+ let currentAddress;
72
+ if (proxyType === 'native') {
73
+ proxyAddress = artifacts.ethereumFeeProxyArtifact.getAddress(network, version);
74
+ currentAddress = yield contract.paymentProxy();
75
+ }
76
+ else {
77
+ proxyAddress = artifacts.erc20FeeProxyArtifact.getAddress(network, version);
78
+ currentAddress = yield contract.paymentProxy();
79
+ }
80
+ if (currentAddress.toLocaleLowerCase() !== proxyAddress.toLocaleLowerCase()) {
81
+ const tx = yield contract.updateConversionProxyAddress(proxyAddress, {
82
+ gasPrice: gasPrice,
83
+ });
84
+ yield tx.wait();
85
+ console.log(`${proxyType} conversion proxy: the current address ${currentAddress} has been replaced by: ${proxyAddress}`);
86
+ }
87
+ });
88
+ exports.updatePaymentFeeProxyAddress = updatePaymentFeeProxyAddress;
89
+ /** legacy from BatchPayment */
53
90
  const updatePaymentErc20FeeProxy = (contract, network, gasPrice) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
54
91
  const erc20FeeProxy = artifacts.erc20FeeProxyArtifact;
55
92
  const erc20FeeProxyAddress = erc20FeeProxy.getAddress(network);
@@ -62,6 +99,7 @@ const updatePaymentErc20FeeProxy = (contract, network, gasPrice) => (0, tslib_1.
62
99
  }
63
100
  });
64
101
  exports.updatePaymentErc20FeeProxy = updatePaymentErc20FeeProxy;
102
+ /** legacy from BatchPayment */
65
103
  const updatePaymentEthFeeProxy = (contract, network, gasPrice) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
66
104
  const ethereumFeeProxy = artifacts.ethereumFeeProxyArtifact;
67
105
  const ethereumFeeProxyAddress = ethereumFeeProxy.getAddress(network);
@@ -1 +1 @@
1
- {"version":3,"file":"adminTasks.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"adminTasks.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  import { HardhatRuntimeEnvironmentExtended } from '../types';
2
2
  /**
3
- * Updates the values of the batch fees of the BatchPayments contract, if needed
4
- * @param contractAddress address of the BatchPayments Proxy
3
+ * Updates the values of the chainlinkConversionPath and EthFeeProxy addresses if needed
4
+ * @param contractAddress address of the ETHConversion Proxy
5
5
  * @param hre Hardhat runtime environment
6
6
  */
7
7
  export declare const setupETHConversionProxy: (contractAddress: string, hre: HardhatRuntimeEnvironmentExtended) => Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"setupETHConversionProxy.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupETHConversionProxy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAO7D;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,oBACjB,MAAM,OAClB,iCAAiC,KACrC,QAAQ,IAAI,CAqBd,CAAC"}
1
+ {"version":3,"file":"setupETHConversionProxy.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupETHConversionProxy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAO7D;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,oBACjB,MAAM,OAClB,iCAAiC,KACrC,QAAQ,IAAI,CAyBd,CAAC"}
@@ -5,8 +5,8 @@ const tslib_1 = require("tslib");
5
5
  const lib_1 = require("../../src/lib");
6
6
  const adminTasks_1 = require("./adminTasks");
7
7
  /**
8
- * Updates the values of the batch fees of the BatchPayments contract, if needed
9
- * @param contractAddress address of the BatchPayments Proxy
8
+ * Updates the values of the chainlinkConversionPath and EthFeeProxy addresses if needed
9
+ * @param contractAddress address of the ETHConversion Proxy
10
10
  * @param hre Hardhat runtime environment
11
11
  */
12
12
  const setupETHConversionProxy = (contractAddress, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
@@ -15,8 +15,8 @@ const setupETHConversionProxy = (contractAddress, hre) => (0, tslib_1.__awaiter)
15
15
  yield Promise.all(hre.config.xdeploy.networks.map((network) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
16
16
  try {
17
17
  const { signer, gasPrice } = yield (0, adminTasks_1.getSignerAndGasPrice)(network, hre);
18
- const EthConversionProxyConnected = yield EthConversionProxyContract.connect(signer);
19
- yield (0, adminTasks_1.updatePaymentEthFeeProxy)(EthConversionProxyConnected, network, gasPrice);
18
+ const EthConversionProxyConnected = EthConversionProxyContract.connect(signer);
19
+ yield (0, adminTasks_1.updatePaymentFeeProxyAddress)(EthConversionProxyConnected, network, gasPrice, 'native');
20
20
  yield (0, adminTasks_1.updateChainlinkConversionPath)(EthConversionProxyConnected, network, gasPrice);
21
21
  console.log(`Setup of EthConversionProxy successful on ${network}`);
22
22
  }
@@ -1 +1 @@
1
- {"version":3,"file":"setupETHConversionProxy.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupETHConversionProxy.ts"],"names":[],"mappings":";;;;AAAA,uCAAsD;AAEtD,6CAIsB;AAEtB;;;;GAIG;AACI,MAAM,uBAAuB,GAAG,CACrC,eAAuB,EACvB,GAAsC,EACvB,EAAE;IACjB,4BAA4B;IAC5B,MAAM,0BAA0B,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CACxD,eAAe,EACf,2BAAqB,CAAC,cAAc,EAAE,CACvC,CAAC;IACF,MAAM,OAAO,CAAC,GAAG,CACf,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAO,OAAO,EAAE,EAAE;QAChD,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,iCAAoB,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YACtE,MAAM,2BAA2B,GAAG,MAAM,0BAA0B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAErF,MAAM,IAAA,qCAAwB,EAAC,2BAA2B,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC/E,MAAM,IAAA,0CAA6B,EAAC,2BAA2B,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YACpF,OAAO,CAAC,GAAG,CAAC,6CAA6C,OAAO,EAAE,CAAC,CAAC;SACrE;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,+DAA+D,OAAO,EAAE,CAAC,CAAC;YACvF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB;IACH,CAAC,CAAA,CAAC,CACH,CAAC;AACJ,CAAC,CAAA,CAAC;AAxBW,QAAA,uBAAuB,2BAwBlC"}
1
+ {"version":3,"file":"setupETHConversionProxy.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupETHConversionProxy.ts"],"names":[],"mappings":";;;;AAAA,uCAAsD;AAEtD,6CAIsB;AAEtB;;;;GAIG;AACI,MAAM,uBAAuB,GAAG,CACrC,eAAuB,EACvB,GAAsC,EACvB,EAAE;IACjB,4BAA4B;IAC5B,MAAM,0BAA0B,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CACxD,eAAe,EACf,2BAAqB,CAAC,cAAc,EAAE,CACvC,CAAC;IACF,MAAM,OAAO,CAAC,GAAG,CACf,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAO,OAAO,EAAE,EAAE;QAChD,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,iCAAoB,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YACtE,MAAM,2BAA2B,GAAG,0BAA0B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAC/E,MAAM,IAAA,yCAA4B,EAChC,2BAA2B,EAC3B,OAAO,EACP,QAAQ,EACR,QAAQ,CACT,CAAC;YACF,MAAM,IAAA,0CAA6B,EAAC,2BAA2B,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YACpF,OAAO,CAAC,GAAG,CAAC,6CAA6C,OAAO,EAAE,CAAC,CAAC;SACrE;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,+DAA+D,OAAO,EAAE,CAAC,CAAC;YACvF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB;IACH,CAAC,CAAA,CAAC,CACH,CAAC;AACJ,CAAC,CAAA,CAAC;AA5BW,QAAA,uBAAuB,2BA4BlC"}
@@ -1,7 +1,7 @@
1
1
  import { HardhatRuntimeEnvironmentExtended } from '../types';
2
2
  /**
3
3
  * Updates the values of the chainlinkConversionPath and ERC20FeeProxy addresses if needed
4
- * @param contractAddress address of the BatchPayments Proxy
4
+ * @param contractAddress address of the ERC20Conversion Proxy
5
5
  * @param hre Hardhat runtime environment
6
6
  */
7
7
  export declare const setupErc20ConversionProxy: (contractAddress: string, hre: HardhatRuntimeEnvironmentExtended) => Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"setupErc20ConversionProxy.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupErc20ConversionProxy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAO7D;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,oBACnB,MAAM,OAClB,iCAAiC,KACrC,QAAQ,IAAI,CAqBd,CAAC"}
1
+ {"version":3,"file":"setupErc20ConversionProxy.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupErc20ConversionProxy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAO7D;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,oBACnB,MAAM,OAClB,iCAAiC,KACrC,QAAQ,IAAI,CA0Bd,CAAC"}
@@ -6,7 +6,7 @@ const lib_1 = require("../../src/lib");
6
6
  const adminTasks_1 = require("./adminTasks");
7
7
  /**
8
8
  * Updates the values of the chainlinkConversionPath and ERC20FeeProxy addresses if needed
9
- * @param contractAddress address of the BatchPayments Proxy
9
+ * @param contractAddress address of the ERC20Conversion Proxy
10
10
  * @param hre Hardhat runtime environment
11
11
  */
12
12
  const setupErc20ConversionProxy = (contractAddress, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
@@ -16,7 +16,7 @@ const setupErc20ConversionProxy = (contractAddress, hre) => (0, tslib_1.__awaite
16
16
  try {
17
17
  const { signer, gasPrice } = yield (0, adminTasks_1.getSignerAndGasPrice)(network, hre);
18
18
  const Erc20ConversionProxyConnected = yield Erc20ConversionProxyContract.connect(signer);
19
- yield (0, adminTasks_1.updatePaymentErc20FeeProxy)(Erc20ConversionProxyConnected, network, gasPrice);
19
+ yield (0, adminTasks_1.updatePaymentFeeProxyAddress)(Erc20ConversionProxyConnected, network, gasPrice, 'erc20');
20
20
  yield (0, adminTasks_1.updateChainlinkConversionPath)(Erc20ConversionProxyConnected, network, gasPrice);
21
21
  console.log(`Setup of Erc20ConversionProxy successful on ${network}`);
22
22
  }
@@ -1 +1 @@
1
- {"version":3,"file":"setupErc20ConversionProxy.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupErc20ConversionProxy.ts"],"names":[],"mappings":";;;;AAAA,uCAAqD;AAErD,6CAIsB;AAEtB;;;;GAIG;AACI,MAAM,yBAAyB,GAAG,CACvC,eAAuB,EACvB,GAAsC,EACvB,EAAE;IACjB,4BAA4B;IAC5B,MAAM,4BAA4B,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAC1D,eAAe,EACf,0BAAoB,CAAC,cAAc,EAAE,CACtC,CAAC;IACF,MAAM,OAAO,CAAC,GAAG,CACf,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAO,OAAO,EAAE,EAAE;QAChD,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,iCAAoB,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YACtE,MAAM,6BAA6B,GAAG,MAAM,4BAA4B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAEzF,MAAM,IAAA,uCAA0B,EAAC,6BAA6B,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YACnF,MAAM,IAAA,0CAA6B,EAAC,6BAA6B,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YACtF,OAAO,CAAC,GAAG,CAAC,+CAA+C,OAAO,EAAE,CAAC,CAAC;SACvE;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,iEAAiE,OAAO,EAAE,CAAC,CAAC;YACzF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB;IACH,CAAC,CAAA,CAAC,CACH,CAAC;AACJ,CAAC,CAAA,CAAC;AAxBW,QAAA,yBAAyB,6BAwBpC"}
1
+ {"version":3,"file":"setupErc20ConversionProxy.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupErc20ConversionProxy.ts"],"names":[],"mappings":";;;;AAAA,uCAAqD;AAErD,6CAIsB;AAEtB;;;;GAIG;AACI,MAAM,yBAAyB,GAAG,CACvC,eAAuB,EACvB,GAAsC,EACvB,EAAE;IACjB,4BAA4B;IAC5B,MAAM,4BAA4B,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAC1D,eAAe,EACf,0BAAoB,CAAC,cAAc,EAAE,CACtC,CAAC;IACF,MAAM,OAAO,CAAC,GAAG,CACf,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAO,OAAO,EAAE,EAAE;QAChD,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAA,iCAAoB,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YACtE,MAAM,6BAA6B,GAAG,MAAM,4BAA4B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAEzF,MAAM,IAAA,yCAA4B,EAChC,6BAA6B,EAC7B,OAAO,EACP,QAAQ,EACR,OAAO,CACR,CAAC;YACF,MAAM,IAAA,0CAA6B,EAAC,6BAA6B,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;YACtF,OAAO,CAAC,GAAG,CAAC,+CAA+C,OAAO,EAAE,CAAC,CAAC;SACvE;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,iEAAiE,OAAO,EAAE,CAAC,CAAC;YACzF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB;IACH,CAAC,CAAA,CAAC,CACH,CAAC;AACJ,CAAC,CAAA,CAAC;AA7BW,QAAA,yBAAyB,6BA6BpC"}