@requestnetwork/smart-contracts 0.29.1-next.1845 → 0.29.1-next.1847
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.
- package/dist/scripts-create2/contract-setup/adminTasks.d.ts +28 -17
- package/dist/scripts-create2/contract-setup/adminTasks.d.ts.map +1 -1
- package/dist/scripts-create2/contract-setup/adminTasks.js +35 -39
- package/dist/scripts-create2/contract-setup/adminTasks.js.map +1 -1
- package/dist/scripts-create2/contract-setup/setupBatchConversionPayments.d.ts.map +1 -1
- package/dist/scripts-create2/contract-setup/setupBatchConversionPayments.js +9 -11
- package/dist/scripts-create2/contract-setup/setupBatchConversionPayments.js.map +1 -1
- package/dist/scripts-create2/contract-setup/setupERC20SwapToConversion.js +4 -4
- package/dist/scripts-create2/contract-setup/setupERC20SwapToConversion.js.map +1 -1
- package/dist/scripts-create2/contract-setup/setupETHConversionProxy.js +3 -3
- package/dist/scripts-create2/contract-setup/setupETHConversionProxy.js.map +1 -1
- package/dist/scripts-create2/contract-setup/setupErc20ConversionProxy.js +3 -3
- package/dist/scripts-create2/contract-setup/setupErc20ConversionProxy.js.map +1 -1
- package/dist/scripts-create2/xdeployer.d.ts.map +1 -1
- package/dist/scripts-create2/xdeployer.js +9 -2
- package/dist/scripts-create2/xdeployer.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +5 -5
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BigNumber, Wallet } from 'ethers';
|
|
1
|
+
import { BigNumber, Overrides, 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: BigNumber;
|
|
@@ -7,51 +7,62 @@ export declare const BATCH_FEE: BigNumber;
|
|
|
7
7
|
* @param contract A contract using chainlink:
|
|
8
8
|
* Erc20ConversionProxy | EthConversionProxy | ERC20SwapToConversion.
|
|
9
9
|
* @param network The network used.
|
|
10
|
-
* @param
|
|
10
|
+
* @param txOverrides information related to gas fees. Increase their values if needed.
|
|
11
11
|
* @param version The version of the chainlink proxy to use, the last one by default.
|
|
12
12
|
*/
|
|
13
|
-
export declare const updateChainlinkConversionPath: (contract: any, network: string,
|
|
14
|
-
export declare const updateSwapRouter: (contract: any, network: string,
|
|
15
|
-
export declare const updateRequestSwapFees: (contract: any,
|
|
13
|
+
export declare const updateChainlinkConversionPath: (contract: any, network: string, txOverrides: Overrides, version?: string | undefined) => Promise<void>;
|
|
14
|
+
export declare const updateSwapRouter: (contract: any, network: string, txOverrides: Overrides) => Promise<void>;
|
|
15
|
+
export declare const updateRequestSwapFees: (contract: any, txOverrides: Overrides) => Promise<void>;
|
|
16
16
|
/**
|
|
17
17
|
* Updates the batchFee applied by the batch conversion proxy.
|
|
18
18
|
* @param contract BatchConversionPayments contract.
|
|
19
|
-
* @param
|
|
19
|
+
* @param txOverrides information related to gas fees. Increase their values if needed.
|
|
20
20
|
*/
|
|
21
|
-
export declare const updateBatchPaymentFees: (contract: any,
|
|
21
|
+
export declare const updateBatchPaymentFees: (contract: any, txOverrides: Overrides) => Promise<void>;
|
|
22
22
|
/**
|
|
23
23
|
* Updates the feeAMountUSDLimit of the batch conversion proxy.
|
|
24
24
|
* @param contract BatchConversionPayments contract.
|
|
25
|
-
* @param
|
|
25
|
+
* @param txOverrides information related to gas fees. Increase their values if needed.
|
|
26
26
|
*/
|
|
27
|
-
export declare const updateBatchPaymentFeeAmountUSDLimit: (contract: any,
|
|
27
|
+
export declare const updateBatchPaymentFeeAmountUSDLimit: (contract: any, txOverrides: Overrides) => Promise<void>;
|
|
28
28
|
/**
|
|
29
29
|
* Updates the address of a Native or ERC20 fee proxy stored within a Native or ERC20 fee conversion contract.
|
|
30
30
|
* @param contract A contract using chainlink: EthConversionProxy | Erc20ConversionProxy.
|
|
31
31
|
* @param network The network used.
|
|
32
|
-
* @param
|
|
32
|
+
* @param txOverrides information related to gas fees. Increase their values if needed.
|
|
33
33
|
* @param proxyType The type of the proxy fee.
|
|
34
34
|
* @param version The version of the fee proxy to use, the last one by default.
|
|
35
35
|
*/
|
|
36
|
-
export declare const updatePaymentFeeProxyAddress: (contract: any, network: string,
|
|
36
|
+
export declare const updatePaymentFeeProxyAddress: (contract: any, network: string, txOverrides: Overrides, proxyType: 'native' | 'erc20', version?: string | undefined) => Promise<void>;
|
|
37
37
|
/**
|
|
38
38
|
* Update the address of a proxy used by batch conversion contract.
|
|
39
39
|
* @param contract BatchConversionPayments contract.
|
|
40
40
|
* @param network The network used.
|
|
41
|
-
* @param
|
|
41
|
+
* @param txOverrides information related to gas fees. Increase their values if needed.
|
|
42
42
|
* @param proxyName The name of the fee proxy to update.
|
|
43
43
|
*/
|
|
44
|
-
export declare const updateBatchConversionProxy: (contract: any, network: string,
|
|
44
|
+
export declare const updateBatchConversionProxy: (contract: any, network: string, txOverrides: Overrides, proxyName: 'native' | 'nativeConversion' | 'erc20' | 'erc20Conversion' | 'chainlinkConversionPath') => Promise<void>;
|
|
45
45
|
/**
|
|
46
46
|
* Update the native and the USD addresses used by batch conversion contract.
|
|
47
47
|
* @param contract BatchConversionPayments contract.
|
|
48
48
|
* @param NativeAddress The address of native token, eg: ETH.
|
|
49
49
|
* @param USDAddress The address of USD token.
|
|
50
|
-
* @param
|
|
50
|
+
* @param txOverrides information related to gas fees. Increase their values if needed.
|
|
51
51
|
*/
|
|
52
|
-
export declare const updateNativeAndUSDAddress: (contract: any, NativeAddress: string, USDAddress: string,
|
|
53
|
-
|
|
52
|
+
export declare const updateNativeAndUSDAddress: (contract: any, NativeAddress: string, USDAddress: string, txOverrides: Overrides) => Promise<void>;
|
|
53
|
+
/**
|
|
54
|
+
* Gets the signer and gas fees information.
|
|
55
|
+
* @param network The network used.
|
|
56
|
+
* @param hre Hardhat runtime environment.
|
|
57
|
+
* @returns An object:
|
|
58
|
+
* - The signer
|
|
59
|
+
* - txOverrides, with gas fee information
|
|
60
|
+
*/
|
|
61
|
+
export declare const getSignerAndGasFees: (network: string, hre: HardhatRuntimeEnvironmentExtended) => Promise<{
|
|
54
62
|
signer: Wallet;
|
|
55
|
-
|
|
63
|
+
txOverrides: {
|
|
64
|
+
maxFeePerGas?: BigNumber;
|
|
65
|
+
maxPriorityFeePerGas?: BigNumber;
|
|
66
|
+
};
|
|
56
67
|
}>;
|
|
57
68
|
//# sourceMappingURL=adminTasks.d.ts.map
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"adminTasks.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEtD,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAI7D,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAEnC,eAAO,MAAM,SAAS,WAAqB,CAAC;AAI5C;;;;;;;GAOG;AACH,eAAO,MAAM,6BAA6B,aAC9B,GAAG,WACJ,MAAM,eACF,SAAS,mCAErB,QAAQ,IAAI,CAad,CAAC;AAEF,eAAO,MAAM,gBAAgB,aACjB,GAAG,WACJ,MAAM,eACF,SAAS,KACrB,QAAQ,IAAI,CAMd,CAAC;AAEF,eAAO,MAAM,qBAAqB,aACtB,GAAG,eACA,SAAS,KACrB,QAAQ,IAAI,CAOd,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,aACvB,GAAG,eACA,SAAS,KACrB,QAAQ,IAAI,CAOd,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,mCAAmC,aACpC,GAAG,eACA,SAAS,KACrB,QAAQ,IAAI,CASd,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,4BAA4B,aAC7B,GAAG,WACJ,MAAM,eACF,SAAS,aACX,QAAQ,GAAG,OAAO,mCAE5B,QAAQ,IAAI,CAkBd,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,0BAA0B,aAC3B,GAAG,WACJ,MAAM,eACF,SAAS,aAElB,QAAQ,GACR,kBAAkB,GAClB,OAAO,GACP,iBAAiB,GACjB,yBAAyB,KAC5B,QAAQ,IAAI,CAuCd,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,yBAAyB,aAC1B,GAAG,iBACE,MAAM,cACT,MAAM,eACL,SAAS,KACrB,QAAQ,IAAI,CAgBd,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,mBAAmB,YACrB,MAAM,OACV,iCAAiC;YAE9B,MAAM;iBACD;QACX,YAAY,CAAC,EAAE,SAAS,CAAC;QACzB,oBAAoB,CAAC,EAAE,SAAS,CAAC;KAClC;EAeF,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.getSignerAndGasFees = exports.updateNativeAndUSDAddress = exports.updateBatchConversionProxy = exports.updatePaymentFeeProxyAddress = exports.updateBatchPaymentFeeAmountUSDLimit = exports.updateBatchPaymentFees = exports.updateRequestSwapFees = exports.updateSwapRouter = exports.updateChainlinkConversionPath = exports.BATCH_FEE = exports.REQUEST_SWAP_FEES = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const lib_1 = require("../../src/lib");
|
|
6
6
|
const utils_1 = require("../../scripts/utils");
|
|
@@ -19,35 +19,31 @@ const BATCH_FEE_AMOUNT_USD_LIMIT = (0, utils_3.parseUnits)('150', 8);
|
|
|
19
19
|
* @param contract A contract using chainlink:
|
|
20
20
|
* Erc20ConversionProxy | EthConversionProxy | ERC20SwapToConversion.
|
|
21
21
|
* @param network The network used.
|
|
22
|
-
* @param
|
|
22
|
+
* @param txOverrides information related to gas fees. Increase their values if needed.
|
|
23
23
|
* @param version The version of the chainlink proxy to use, the last one by default.
|
|
24
24
|
*/
|
|
25
|
-
const updateChainlinkConversionPath = (contract, network,
|
|
25
|
+
const updateChainlinkConversionPath = (contract, network, txOverrides, version) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
26
26
|
const currentChainlinkAddress = yield contract.chainlinkConversionPath();
|
|
27
27
|
const chainlinkConversionPathAddress = lib_1.chainlinkConversionPath.getAddress(network, version);
|
|
28
28
|
if (currentChainlinkAddress !== chainlinkConversionPathAddress) {
|
|
29
|
-
const tx = yield contract.updateConversionPathAddress(chainlinkConversionPathAddress,
|
|
30
|
-
gasPrice: gasPrice,
|
|
31
|
-
});
|
|
29
|
+
const tx = yield contract.updateConversionPathAddress(chainlinkConversionPathAddress, txOverrides);
|
|
32
30
|
yield tx.wait(1);
|
|
33
31
|
console.log(`chainlink: the current address ${currentChainlinkAddress} has been replaced by: ${chainlinkConversionPathAddress}`);
|
|
34
32
|
}
|
|
35
33
|
});
|
|
36
34
|
exports.updateChainlinkConversionPath = updateChainlinkConversionPath;
|
|
37
|
-
const updateSwapRouter = (contract, network,
|
|
35
|
+
const updateSwapRouter = (contract, network, txOverrides) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
38
36
|
const currentSwapRouter = yield contract.swapRouter();
|
|
39
37
|
if (currentSwapRouter !== utils_1.uniswapV2RouterAddresses[network]) {
|
|
40
|
-
const tx = yield contract.setRouter(utils_1.uniswapV2RouterAddresses[network],
|
|
41
|
-
gasPrice: gasPrice,
|
|
42
|
-
});
|
|
38
|
+
const tx = yield contract.setRouter(utils_1.uniswapV2RouterAddresses[network], txOverrides);
|
|
43
39
|
yield tx.wait(1);
|
|
44
40
|
}
|
|
45
41
|
});
|
|
46
42
|
exports.updateSwapRouter = updateSwapRouter;
|
|
47
|
-
const updateRequestSwapFees = (contract,
|
|
43
|
+
const updateRequestSwapFees = (contract, txOverrides) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
48
44
|
const currentFees = yield contract.requestSwapFees();
|
|
49
45
|
if (!currentFees.eq(exports.REQUEST_SWAP_FEES)) {
|
|
50
|
-
const tx = yield contract.updateRequestSwapFees(exports.REQUEST_SWAP_FEES,
|
|
46
|
+
const tx = yield contract.updateRequestSwapFees(exports.REQUEST_SWAP_FEES, txOverrides);
|
|
51
47
|
yield tx.wait(1);
|
|
52
48
|
console.log(`currentFees: ${currentFees.toString()}, new fees: ${exports.REQUEST_SWAP_FEES}`);
|
|
53
49
|
}
|
|
@@ -56,12 +52,12 @@ exports.updateRequestSwapFees = updateRequestSwapFees;
|
|
|
56
52
|
/**
|
|
57
53
|
* Updates the batchFee applied by the batch conversion proxy.
|
|
58
54
|
* @param contract BatchConversionPayments contract.
|
|
59
|
-
* @param
|
|
55
|
+
* @param txOverrides information related to gas fees. Increase their values if needed.
|
|
60
56
|
*/
|
|
61
|
-
const updateBatchPaymentFees = (contract,
|
|
57
|
+
const updateBatchPaymentFees = (contract, txOverrides) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
62
58
|
const currentFees = yield contract.batchFee();
|
|
63
59
|
if (!exports.BATCH_FEE.eq(currentFees)) {
|
|
64
|
-
const tx = yield contract.setBatchFee(exports.BATCH_FEE,
|
|
60
|
+
const tx = yield contract.setBatchFee(exports.BATCH_FEE, txOverrides);
|
|
65
61
|
yield tx.wait(1);
|
|
66
62
|
console.log(`Batch: currentFees: ${currentFees.toString()}, new fees: ${exports.BATCH_FEE.toString()}`);
|
|
67
63
|
}
|
|
@@ -70,14 +66,12 @@ exports.updateBatchPaymentFees = updateBatchPaymentFees;
|
|
|
70
66
|
/**
|
|
71
67
|
* Updates the feeAMountUSDLimit of the batch conversion proxy.
|
|
72
68
|
* @param contract BatchConversionPayments contract.
|
|
73
|
-
* @param
|
|
69
|
+
* @param txOverrides information related to gas fees. Increase their values if needed.
|
|
74
70
|
*/
|
|
75
|
-
const updateBatchPaymentFeeAmountUSDLimit = (contract,
|
|
71
|
+
const updateBatchPaymentFeeAmountUSDLimit = (contract, txOverrides) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
76
72
|
const currentFeeAmountUSDLimit = yield contract.batchFeeAmountUSDLimit();
|
|
77
73
|
if (!currentFeeAmountUSDLimit.eq(BATCH_FEE_AMOUNT_USD_LIMIT)) {
|
|
78
|
-
const tx = yield contract.setBatchFeeAmountUSDLimit(BATCH_FEE_AMOUNT_USD_LIMIT,
|
|
79
|
-
gasPrice: gasPrice,
|
|
80
|
-
});
|
|
74
|
+
const tx = yield contract.setBatchFeeAmountUSDLimit(BATCH_FEE_AMOUNT_USD_LIMIT, txOverrides);
|
|
81
75
|
yield tx.wait(1);
|
|
82
76
|
console.log(`Batch: the current fee amount in USD limit: ${currentFeeAmountUSDLimit.toString()}, have been replaced by: ${BATCH_FEE_AMOUNT_USD_LIMIT.toString()}. ($1 = 1e8)`);
|
|
83
77
|
}
|
|
@@ -87,11 +81,11 @@ exports.updateBatchPaymentFeeAmountUSDLimit = updateBatchPaymentFeeAmountUSDLimi
|
|
|
87
81
|
* Updates the address of a Native or ERC20 fee proxy stored within a Native or ERC20 fee conversion contract.
|
|
88
82
|
* @param contract A contract using chainlink: EthConversionProxy | Erc20ConversionProxy.
|
|
89
83
|
* @param network The network used.
|
|
90
|
-
* @param
|
|
84
|
+
* @param txOverrides information related to gas fees. Increase their values if needed.
|
|
91
85
|
* @param proxyType The type of the proxy fee.
|
|
92
86
|
* @param version The version of the fee proxy to use, the last one by default.
|
|
93
87
|
*/
|
|
94
|
-
const updatePaymentFeeProxyAddress = (contract, network,
|
|
88
|
+
const updatePaymentFeeProxyAddress = (contract, network, txOverrides, proxyType, version) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
95
89
|
let proxyAddress;
|
|
96
90
|
let currentAddress;
|
|
97
91
|
if (proxyType === 'native') {
|
|
@@ -103,9 +97,7 @@ const updatePaymentFeeProxyAddress = (contract, network, gasPrice, proxyType, ve
|
|
|
103
97
|
currentAddress = yield contract.paymentProxy();
|
|
104
98
|
}
|
|
105
99
|
if (currentAddress.toLocaleLowerCase() !== proxyAddress.toLocaleLowerCase()) {
|
|
106
|
-
const tx = yield contract.updateConversionProxyAddress(proxyAddress,
|
|
107
|
-
gasPrice: gasPrice,
|
|
108
|
-
});
|
|
100
|
+
const tx = yield contract.updateConversionProxyAddress(proxyAddress, txOverrides);
|
|
109
101
|
yield tx.wait();
|
|
110
102
|
console.log(`${proxyType} conversion proxy: the current address ${currentAddress} has been replaced by: ${proxyAddress}`);
|
|
111
103
|
}
|
|
@@ -115,10 +107,10 @@ exports.updatePaymentFeeProxyAddress = updatePaymentFeeProxyAddress;
|
|
|
115
107
|
* Update the address of a proxy used by batch conversion contract.
|
|
116
108
|
* @param contract BatchConversionPayments contract.
|
|
117
109
|
* @param network The network used.
|
|
118
|
-
* @param
|
|
110
|
+
* @param txOverrides information related to gas fees. Increase their values if needed.
|
|
119
111
|
* @param proxyName The name of the fee proxy to update.
|
|
120
112
|
*/
|
|
121
|
-
const updateBatchConversionProxy = (contract, network,
|
|
113
|
+
const updateBatchConversionProxy = (contract, network, txOverrides, proxyName) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
122
114
|
let proxyAddress;
|
|
123
115
|
let batchSetProxy;
|
|
124
116
|
let currentAddress;
|
|
@@ -150,9 +142,7 @@ const updateBatchConversionProxy = (contract, network, gasPrice, proxyName) => (
|
|
|
150
142
|
break;
|
|
151
143
|
}
|
|
152
144
|
if (currentAddress.toLocaleLowerCase() !== proxyAddress.toLocaleLowerCase()) {
|
|
153
|
-
const tx = yield batchSetProxy(proxyAddress,
|
|
154
|
-
gasPrice: gasPrice,
|
|
155
|
-
});
|
|
145
|
+
const tx = yield batchSetProxy(proxyAddress, txOverrides);
|
|
156
146
|
yield tx.wait(1);
|
|
157
147
|
console.log(`${proxyName}: the current address ${currentAddress} has been replaced by: ${proxyAddress}`);
|
|
158
148
|
}
|
|
@@ -163,23 +153,29 @@ exports.updateBatchConversionProxy = updateBatchConversionProxy;
|
|
|
163
153
|
* @param contract BatchConversionPayments contract.
|
|
164
154
|
* @param NativeAddress The address of native token, eg: ETH.
|
|
165
155
|
* @param USDAddress The address of USD token.
|
|
166
|
-
* @param
|
|
156
|
+
* @param txOverrides information related to gas fees. Increase their values if needed.
|
|
167
157
|
*/
|
|
168
|
-
const updateNativeAndUSDAddress = (contract, NativeAddress, USDAddress,
|
|
158
|
+
const updateNativeAndUSDAddress = (contract, NativeAddress, USDAddress, txOverrides) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
169
159
|
const currentUSDAddress = (yield contract.USDAddress()).toLocaleLowerCase();
|
|
170
160
|
const currentNativeAddress = (yield contract.NativeAddress()).toLocaleLowerCase();
|
|
171
161
|
if (currentNativeAddress !== NativeAddress.toLocaleLowerCase() ||
|
|
172
162
|
currentUSDAddress !== USDAddress.toLocaleLowerCase()) {
|
|
173
|
-
const tx = yield contract.setNativeAndUSDAddress(NativeAddress, USDAddress,
|
|
174
|
-
gasPrice: gasPrice,
|
|
175
|
-
});
|
|
163
|
+
const tx = yield contract.setNativeAndUSDAddress(NativeAddress, USDAddress, txOverrides);
|
|
176
164
|
yield tx.wait(1);
|
|
177
165
|
console.log(`Batch: the current NativeAddress: ${currentNativeAddress}, have been replaced by: ${NativeAddress}`);
|
|
178
166
|
console.log(`Batch: the current USDAddress: ${currentUSDAddress}, have been replaced by: ${USDAddress}`);
|
|
179
167
|
}
|
|
180
168
|
});
|
|
181
169
|
exports.updateNativeAndUSDAddress = updateNativeAndUSDAddress;
|
|
182
|
-
|
|
170
|
+
/**
|
|
171
|
+
* Gets the signer and gas fees information.
|
|
172
|
+
* @param network The network used.
|
|
173
|
+
* @param hre Hardhat runtime environment.
|
|
174
|
+
* @returns An object:
|
|
175
|
+
* - The signer
|
|
176
|
+
* - txOverrides, with gas fee information
|
|
177
|
+
*/
|
|
178
|
+
const getSignerAndGasFees = (network, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
183
179
|
let provider;
|
|
184
180
|
if (network === 'celo') {
|
|
185
181
|
provider = utils_2.default.getCeloProvider();
|
|
@@ -188,11 +184,11 @@ const getSignerAndGasPrice = (network, hre) => (0, tslib_1.__awaiter)(void 0, vo
|
|
|
188
184
|
provider = utils_2.default.getDefaultProvider(network);
|
|
189
185
|
}
|
|
190
186
|
const signer = new hre.ethers.Wallet(hre.config.xdeploy.signer).connect(provider);
|
|
191
|
-
const
|
|
187
|
+
const txOverrides = yield utils_2.default.estimateGasFees({ provider });
|
|
192
188
|
return {
|
|
193
189
|
signer,
|
|
194
|
-
|
|
190
|
+
txOverrides,
|
|
195
191
|
};
|
|
196
192
|
});
|
|
197
|
-
exports.
|
|
193
|
+
exports.getSignerAndGasFees = getSignerAndGasFees;
|
|
198
194
|
//# sourceMappingURL=adminTasks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adminTasks.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":";;;;AAAA,uCAAwD;AACxD,+CAA+D;AAC/D,2CAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"adminTasks.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupBatchConversionPayments.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupBatchConversionPayments.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAW7D;;;;GAIG;AACH,eAAO,MAAM,4BAA4B,oBACtB,MAAM,OAClB,iCAAiC,KACrC,QAAQ,IAAI,
|
|
1
|
+
{"version":3,"file":"setupBatchConversionPayments.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupBatchConversionPayments.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAW7D;;;;GAIG;AACH,eAAO,MAAM,4BAA4B,oBACtB,MAAM,OAClB,iCAAiC,KACrC,QAAQ,IAAI,CAoEd,CAAC"}
|
|
@@ -20,18 +20,16 @@ const setupBatchConversionPayments = (contractAddress, hre) => (0, tslib_1.__awa
|
|
|
20
20
|
console.log(`Setup BatchConversionPayments on ${network}`);
|
|
21
21
|
const NativeAddress = currencyManager.getNativeCurrency(types_1.RequestLogicTypes.CURRENCY.ETH, network).hash;
|
|
22
22
|
const USDAddress = currencyManager.fromSymbol('USD').hash;
|
|
23
|
-
const { signer,
|
|
23
|
+
const { signer, txOverrides } = yield (0, adminTasks_1.getSignerAndGasFees)(network, hre);
|
|
24
24
|
const batchConversionPaymentConnected = batchConversionPaymentContract.connect(signer);
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
yield (0, adminTasks_1.
|
|
28
|
-
yield (0, adminTasks_1.
|
|
29
|
-
yield (0, adminTasks_1.updateBatchConversionProxy)(batchConversionPaymentConnected, network,
|
|
30
|
-
yield (0, adminTasks_1.updateBatchConversionProxy)(batchConversionPaymentConnected, network,
|
|
31
|
-
yield (0, adminTasks_1.updateBatchConversionProxy)(batchConversionPaymentConnected, network,
|
|
32
|
-
yield (0, adminTasks_1.
|
|
33
|
-
yield (0, adminTasks_1.updateBatchConversionProxy)(batchConversionPaymentConnected, network, gasPrice.mul(gasCoef), 'chainlinkConversionPath');
|
|
34
|
-
yield (0, adminTasks_1.updateNativeAndUSDAddress)(batchConversionPaymentConnected, NativeAddress, USDAddress, gasPrice.mul(gasCoef));
|
|
25
|
+
yield (0, adminTasks_1.updateBatchPaymentFees)(batchConversionPaymentConnected, txOverrides);
|
|
26
|
+
yield (0, adminTasks_1.updateBatchPaymentFeeAmountUSDLimit)(batchConversionPaymentConnected, txOverrides);
|
|
27
|
+
yield (0, adminTasks_1.updateBatchConversionProxy)(batchConversionPaymentConnected, network, txOverrides, 'erc20');
|
|
28
|
+
yield (0, adminTasks_1.updateBatchConversionProxy)(batchConversionPaymentConnected, network, txOverrides, 'native');
|
|
29
|
+
yield (0, adminTasks_1.updateBatchConversionProxy)(batchConversionPaymentConnected, network, txOverrides, 'erc20Conversion');
|
|
30
|
+
yield (0, adminTasks_1.updateBatchConversionProxy)(batchConversionPaymentConnected, network, txOverrides, 'nativeConversion');
|
|
31
|
+
yield (0, adminTasks_1.updateBatchConversionProxy)(batchConversionPaymentConnected, network, txOverrides, 'chainlinkConversionPath');
|
|
32
|
+
yield (0, adminTasks_1.updateNativeAndUSDAddress)(batchConversionPaymentConnected, NativeAddress, USDAddress, txOverrides);
|
|
35
33
|
});
|
|
36
34
|
for (const network of hre.config.xdeploy.networks) {
|
|
37
35
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupBatchConversionPayments.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupBatchConversionPayments.ts"],"names":[],"mappings":";;;;AAAA,uCAAgE;AAEhE,6CAMsB;AACtB,uDAA2D;AAC3D,iDAA0D;AAE1D;;;;GAIG;AACI,MAAM,4BAA4B,GAAG,CAC1C,eAAuB,EACvB,GAAsC,EACvB,EAAE;IACjB,4BAA4B;IAC5B,MAAM,8BAA8B,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAC5D,eAAe,EACf,qCAA+B,CAAC,cAAc,EAAE,CACjD,CAAC;IACF,qDAAqD;IACrD,MAAM,eAAe,GAAG,0BAAe,CAAC,UAAU,EAAE,CAAC;IAErD,MAAM,YAAY,GAAG,CAAO,OAAe,EAAE,EAAE;QAC7C,OAAO,CAAC,GAAG,CAAC,oCAAoC,OAAO,EAAE,CAAC,CAAC;QAE3D,MAAM,aAAa,GAAG,eAAe,CAAC,iBAAiB,CACrD,yBAAiB,CAAC,QAAQ,CAAC,GAAG,EAC9B,OAAO,CACP,CAAC,IAAI,CAAC;QACR,MAAM,UAAU,GAAG,eAAe,CAAC,UAAU,CAAC,KAAK,CAAE,CAAC,IAAI,CAAC;QAE3D,MAAM,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"setupBatchConversionPayments.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupBatchConversionPayments.ts"],"names":[],"mappings":";;;;AAAA,uCAAgE;AAEhE,6CAMsB;AACtB,uDAA2D;AAC3D,iDAA0D;AAE1D;;;;GAIG;AACI,MAAM,4BAA4B,GAAG,CAC1C,eAAuB,EACvB,GAAsC,EACvB,EAAE;IACjB,4BAA4B;IAC5B,MAAM,8BAA8B,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAC5D,eAAe,EACf,qCAA+B,CAAC,cAAc,EAAE,CACjD,CAAC;IACF,qDAAqD;IACrD,MAAM,eAAe,GAAG,0BAAe,CAAC,UAAU,EAAE,CAAC;IAErD,MAAM,YAAY,GAAG,CAAO,OAAe,EAAE,EAAE;QAC7C,OAAO,CAAC,GAAG,CAAC,oCAAoC,OAAO,EAAE,CAAC,CAAC;QAE3D,MAAM,aAAa,GAAG,eAAe,CAAC,iBAAiB,CACrD,yBAAiB,CAAC,QAAQ,CAAC,GAAG,EAC9B,OAAO,CACP,CAAC,IAAI,CAAC;QACR,MAAM,UAAU,GAAG,eAAe,CAAC,UAAU,CAAC,KAAK,CAAE,CAAC,IAAI,CAAC;QAE3D,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,IAAA,gCAAmB,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QACxE,MAAM,+BAA+B,GAAG,8BAA8B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACvF,MAAM,IAAA,mCAAsB,EAAC,+BAA+B,EAAE,WAAW,CAAC,CAAC;QAC3E,MAAM,IAAA,gDAAmC,EAAC,+BAA+B,EAAE,WAAW,CAAC,CAAC;QACxF,MAAM,IAAA,uCAA0B,EAC9B,+BAA+B,EAC/B,OAAO,EACP,WAAW,EACX,OAAO,CACR,CAAC;QACF,MAAM,IAAA,uCAA0B,EAC9B,+BAA+B,EAC/B,OAAO,EACP,WAAW,EACX,QAAQ,CACT,CAAC;QACF,MAAM,IAAA,uCAA0B,EAC9B,+BAA+B,EAC/B,OAAO,EACP,WAAW,EACX,iBAAiB,CAClB,CAAC;QACF,MAAM,IAAA,uCAA0B,EAC9B,+BAA+B,EAC/B,OAAO,EACP,WAAW,EACX,kBAAkB,CACnB,CAAC;QACF,MAAM,IAAA,uCAA0B,EAC9B,+BAA+B,EAC/B,OAAO,EACP,WAAW,EACX,yBAAyB,CAC1B,CAAC;QACF,MAAM,IAAA,sCAAyB,EAC7B,+BAA+B,EAC/B,aAAa,EACb,UAAU,EACV,WAAW,CACZ,CAAC;IACJ,CAAC,CAAA,CAAC;IACF,KAAK,MAAM,OAAO,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;QACjD,IAAI;YACF,MAAM,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;SAC9C;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,4DAA4D,OAAO,EAAE,CAAC,CAAC;YACpF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB;KACF;IACD,OAAO,CAAC,GAAG,CAAC,mDAAmD,CAAC,CAAC;AACnE,CAAC,CAAA,CAAC;AAvEW,QAAA,4BAA4B,gCAuEvC"}
|
|
@@ -14,11 +14,11 @@ const setupERC20SwapToConversion = (contractAddress, hre) => (0, tslib_1.__await
|
|
|
14
14
|
const ERC20SwapToConversionContract = new hre.ethers.Contract(contractAddress, lib_1.erc20SwapConversionArtifact.getContractAbi());
|
|
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
|
-
const { signer,
|
|
17
|
+
const { signer, txOverrides } = yield (0, adminTasks_1.getSignerAndGasFees)(network, hre);
|
|
18
18
|
const ERC20SwapToConversionConnected = yield ERC20SwapToConversionContract.connect(signer);
|
|
19
|
-
yield (0, adminTasks_1.updateChainlinkConversionPath)(ERC20SwapToConversionConnected, network,
|
|
20
|
-
yield (0, adminTasks_1.updateSwapRouter)(ERC20SwapToConversionConnected, network,
|
|
21
|
-
yield (0, adminTasks_1.updateRequestSwapFees)(ERC20SwapToConversionConnected,
|
|
19
|
+
yield (0, adminTasks_1.updateChainlinkConversionPath)(ERC20SwapToConversionConnected, network, txOverrides);
|
|
20
|
+
yield (0, adminTasks_1.updateSwapRouter)(ERC20SwapToConversionConnected, network, txOverrides);
|
|
21
|
+
yield (0, adminTasks_1.updateRequestSwapFees)(ERC20SwapToConversionConnected, txOverrides);
|
|
22
22
|
console.log(`Setup of Erc20SwapToConversion successful on ${network}`);
|
|
23
23
|
}
|
|
24
24
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupERC20SwapToConversion.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupERC20SwapToConversion.ts"],"names":[],"mappings":";;;;AAAA,uCAA4D;AAE5D,6CAKsB;AAEtB;;;;GAIG;AACI,MAAM,0BAA0B,GAAG,CACxC,eAAuB,EACvB,GAAsC,EACvB,EAAE;IACjB,4BAA4B;IAC5B,MAAM,6BAA6B,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAC3D,eAAe,EACf,iCAA2B,CAAC,cAAc,EAAE,CAC7C,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,
|
|
1
|
+
{"version":3,"file":"setupERC20SwapToConversion.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupERC20SwapToConversion.ts"],"names":[],"mappings":";;;;AAAA,uCAA4D;AAE5D,6CAKsB;AAEtB;;;;GAIG;AACI,MAAM,0BAA0B,GAAG,CACxC,eAAuB,EACvB,GAAsC,EACvB,EAAE;IACjB,4BAA4B;IAC5B,MAAM,6BAA6B,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAC3D,eAAe,EACf,iCAA2B,CAAC,cAAc,EAAE,CAC7C,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,WAAW,EAAE,GAAG,MAAM,IAAA,gCAAmB,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YACxE,MAAM,8BAA8B,GAAG,MAAM,6BAA6B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAE3F,MAAM,IAAA,0CAA6B,EAAC,8BAA8B,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;YAC1F,MAAM,IAAA,6BAAgB,EAAC,8BAA8B,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;YAC7E,MAAM,IAAA,kCAAqB,EAAC,8BAA8B,EAAE,WAAW,CAAC,CAAC;YACzE,OAAO,CAAC,GAAG,CAAC,gDAAgD,OAAO,EAAE,CAAC,CAAC;SACxE;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,kEAAkE,OAAO,EAAE,CAAC,CAAC;YAC1F,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB;IACH,CAAC,CAAA,CAAC,CACH,CAAC;AACJ,CAAC,CAAA,CAAC;AAzBW,QAAA,0BAA0B,8BAyBrC"}
|
|
@@ -14,10 +14,10 @@ const setupETHConversionProxy = (contractAddress, hre) => (0, tslib_1.__awaiter)
|
|
|
14
14
|
const EthConversionProxyContract = new hre.ethers.Contract(contractAddress, lib_1.ethConversionArtifact.getContractAbi());
|
|
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
|
-
const { signer,
|
|
17
|
+
const { signer, txOverrides } = yield (0, adminTasks_1.getSignerAndGasFees)(network, hre);
|
|
18
18
|
const EthConversionProxyConnected = EthConversionProxyContract.connect(signer);
|
|
19
|
-
yield (0, adminTasks_1.updatePaymentFeeProxyAddress)(EthConversionProxyConnected, network,
|
|
20
|
-
yield (0, adminTasks_1.updateChainlinkConversionPath)(EthConversionProxyConnected, network,
|
|
19
|
+
yield (0, adminTasks_1.updatePaymentFeeProxyAddress)(EthConversionProxyConnected, network, txOverrides, 'native');
|
|
20
|
+
yield (0, adminTasks_1.updateChainlinkConversionPath)(EthConversionProxyConnected, network, txOverrides);
|
|
21
21
|
console.log(`Setup of EthConversionProxy successful on ${network}`);
|
|
22
22
|
}
|
|
23
23
|
catch (err) {
|
|
@@ -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,
|
|
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,WAAW,EAAE,GAAG,MAAM,IAAA,gCAAmB,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YACxE,MAAM,2BAA2B,GAAG,0BAA0B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAC/E,MAAM,IAAA,yCAA4B,EAChC,2BAA2B,EAC3B,OAAO,EACP,WAAW,EACX,QAAQ,CACT,CAAC;YACF,MAAM,IAAA,0CAA6B,EAAC,2BAA2B,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;YACvF,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"}
|
|
@@ -15,10 +15,10 @@ const setupErc20ConversionProxy = (contractAddress, hre) => (0, tslib_1.__awaite
|
|
|
15
15
|
const Erc20ConversionProxyContract = new hre.ethers.Contract(contractAddress, lib_1.erc20ConversionProxy.getContractAbi(ERC20ConversionVersion));
|
|
16
16
|
yield Promise.all(hre.config.xdeploy.networks.map((network) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
17
17
|
try {
|
|
18
|
-
const { signer,
|
|
18
|
+
const { signer, txOverrides } = yield (0, adminTasks_1.getSignerAndGasFees)(network, hre);
|
|
19
19
|
const Erc20ConversionProxyConnected = Erc20ConversionProxyContract.connect(signer);
|
|
20
|
-
yield (0, adminTasks_1.updatePaymentFeeProxyAddress)(Erc20ConversionProxyConnected, network,
|
|
21
|
-
yield (0, adminTasks_1.updateChainlinkConversionPath)(Erc20ConversionProxyConnected, network,
|
|
20
|
+
yield (0, adminTasks_1.updatePaymentFeeProxyAddress)(Erc20ConversionProxyConnected, network, txOverrides, 'erc20');
|
|
21
|
+
yield (0, adminTasks_1.updateChainlinkConversionPath)(Erc20ConversionProxyConnected, network, txOverrides);
|
|
22
22
|
console.log(`Setup of Erc20ConversionProxy successful on ${network}`);
|
|
23
23
|
}
|
|
24
24
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupErc20ConversionProxy.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupErc20ConversionProxy.ts"],"names":[],"mappings":";;;;AAAA,uCAAqD;AAErD,6CAIsB;AAEtB,MAAM,sBAAsB,GAAG,OAAO,CAAC;AAEvC;;;;GAIG;AACI,MAAM,yBAAyB,GAAG,CACvC,eAAuB,EACvB,GAAsC,EACvB,EAAE;IACjB,4BAA4B;IAC5B,MAAM,4BAA4B,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAC1D,eAAe,EACf,0BAAoB,CAAC,cAAc,CAAC,sBAAsB,CAAC,CAC5D,CAAC;IACF,MAAM,OAAO,CAAC,GAAG,CACf,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAO,OAAO,EAAE,EAAE;QAChD,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"setupErc20ConversionProxy.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupErc20ConversionProxy.ts"],"names":[],"mappings":";;;;AAAA,uCAAqD;AAErD,6CAIsB;AAEtB,MAAM,sBAAsB,GAAG,OAAO,CAAC;AAEvC;;;;GAIG;AACI,MAAM,yBAAyB,GAAG,CACvC,eAAuB,EACvB,GAAsC,EACvB,EAAE;IACjB,4BAA4B;IAC5B,MAAM,4BAA4B,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAC1D,eAAe,EACf,0BAAoB,CAAC,cAAc,CAAC,sBAAsB,CAAC,CAC5D,CAAC;IACF,MAAM,OAAO,CAAC,GAAG,CACf,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAO,OAAO,EAAE,EAAE;QAChD,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,IAAA,gCAAmB,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YACxE,MAAM,6BAA6B,GAAG,4BAA4B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACnF,MAAM,IAAA,yCAA4B,EAChC,6BAA6B,EAC7B,OAAO,EACP,WAAW,EACX,OAAO,CACR,CAAC;YACF,MAAM,IAAA,0CAA6B,EAAC,6BAA6B,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;YACzF,OAAO,CAAC,GAAG,CAAC,+CAA+C,OAAO,EAAE,CAAC,CAAC;SACvE;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,iEAAiE,OAAO,EAAE,CAAC,CAAC;YACzF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB;IACH,CAAC,CAAA,CAAC,CACH,CAAC;AACJ,CAAC,CAAA,CAAC;AA5BW,QAAA,yBAAyB,6BA4BpC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xdeployer.d.ts","sourceRoot":"","sources":["../../scripts-create2/xdeployer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"xdeployer.d.ts","sourceRoot":"","sources":["../../scripts-create2/xdeployer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAOlG,eAAO,MAAM,OAAO,qBACA,iBAAiB,OAC9B,iCAAiC,KACrC,QAAQ,MAAM,iBAAiB,CAAC,CAgGlC,CAAC"}
|
|
@@ -49,9 +49,16 @@ const xdeploy = (deploymentParams, hre) => (0, tslib_1.__awaiter)(void 0, void 0
|
|
|
49
49
|
let receipt = undefined;
|
|
50
50
|
let deployed = false;
|
|
51
51
|
let error = undefined;
|
|
52
|
-
const
|
|
52
|
+
const txOverrides = yield utils_1.default.estimateGasFees({ provider });
|
|
53
53
|
try {
|
|
54
|
-
const
|
|
54
|
+
const gasLimit = hre.config.xdeploy.gasLimit;
|
|
55
|
+
txOverrides.gasLimit = gasLimit;
|
|
56
|
+
}
|
|
57
|
+
catch (e) {
|
|
58
|
+
console.log('Cannot estimate gasLimit');
|
|
59
|
+
}
|
|
60
|
+
try {
|
|
61
|
+
const createReceipt = yield (yield create2Deployer.deploy(ZERO_ETH_INPUT, hre.ethers.utils.id(hre.config.xdeploy.salt), initcode.data, txOverrides)).wait();
|
|
55
62
|
receipt = createReceipt;
|
|
56
63
|
deployed = true;
|
|
57
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xdeployer.js","sourceRoot":"","sources":["../../scripts-create2/xdeployer.ts"],"names":[],"mappings":";;;;AACA,iDAA0C;AAC1C,oCAA6C;
|
|
1
|
+
{"version":3,"file":"xdeployer.js","sourceRoot":"","sources":["../../scripts-create2/xdeployer.ts"],"names":[],"mappings":"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"}
|