@requestnetwork/smart-contracts 0.28.1-next.1689 → 0.28.1-next.1691
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/README.md +2 -10
- package/dist/scripts/conversion-proxy.d.ts.map +1 -1
- package/dist/scripts/conversion-proxy.js +6 -1
- package/dist/scripts/conversion-proxy.js.map +1 -1
- package/dist/scripts/deploy-payments.d.ts.map +1 -1
- package/dist/scripts/deploy-payments.js +67 -40
- package/dist/scripts/deploy-payments.js.map +1 -1
- package/dist/scripts/utils.d.ts.map +1 -1
- package/dist/scripts/utils.js +7 -5
- package/dist/scripts/utils.js.map +1 -1
- package/dist/scripts-create2/compute-one-address.d.ts.map +1 -1
- package/dist/scripts-create2/compute-one-address.js +5 -1
- package/dist/scripts-create2/compute-one-address.js.map +1 -1
- package/dist/scripts-create2/constructor-args.d.ts +2 -0
- package/dist/scripts-create2/constructor-args.d.ts.map +1 -0
- package/dist/scripts-create2/constructor-args.js +21 -0
- package/dist/scripts-create2/constructor-args.js.map +1 -0
- package/dist/scripts-create2/deploy-one.d.ts.map +1 -1
- package/dist/scripts-create2/deploy-one.js +24 -26
- package/dist/scripts-create2/deploy-one.js.map +1 -1
- package/dist/scripts-create2/utils.d.ts.map +1 -1
- package/dist/scripts-create2/utils.js +5 -1
- package/dist/scripts-create2/utils.js.map +1 -1
- package/dist/scripts-create2/verify-one.d.ts.map +1 -1
- package/dist/scripts-create2/verify-one.js +6 -2
- package/dist/scripts-create2/verify-one.js.map +1 -1
- package/dist/scripts-create2/xdeployer.d.ts.map +1 -1
- package/dist/scripts-create2/xdeployer.js +3 -2
- package/dist/scripts-create2/xdeployer.js.map +1 -1
- package/dist/src/lib/artifacts/ChainlinkConversionPath/index.d.ts.map +1 -1
- package/dist/src/lib/artifacts/ChainlinkConversionPath/index.js +9 -0
- package/dist/src/lib/artifacts/ChainlinkConversionPath/index.js.map +1 -1
- package/dist/src/lib/artifacts/Erc20ConversionProxy/0.1.2.json +257 -0
- package/dist/src/lib/artifacts/Erc20ConversionProxy/index.d.ts.map +1 -1
- package/dist/src/lib/artifacts/Erc20ConversionProxy/index.js +33 -4
- package/dist/src/lib/artifacts/Erc20ConversionProxy/index.js.map +1 -1
- package/dist/src/lib/artifacts/EthConversionProxy/index.d.ts.map +1 -1
- package/dist/src/lib/artifacts/EthConversionProxy/index.js +4 -5
- package/dist/src/lib/artifacts/EthConversionProxy/index.js.map +1 -1
- package/dist/src/types/factories/ERC20SwapToConversion__factory.d.ts +1 -1
- package/dist/src/types/factories/ERC20SwapToConversion__factory.js +1 -1
- package/dist/src/types/factories/Erc20ConversionProxy__factory.d.ts +3 -3
- package/dist/src/types/factories/Erc20ConversionProxy__factory.d.ts.map +1 -1
- package/dist/src/types/factories/Erc20ConversionProxy__factory.js +10 -5
- package/dist/src/types/factories/Erc20ConversionProxy__factory.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +5 -5
- package/types/factories/ERC20SwapToConversion__factory.d.ts +1 -1
- package/types/factories/ERC20SwapToConversion__factory.js +1 -1
- package/types/factories/Erc20ConversionProxy__factory.d.ts +3 -3
- package/types/factories/Erc20ConversionProxy__factory.d.ts.map +1 -1
- package/types/factories/Erc20ConversionProxy__factory.js +10 -5
- package/types/factories/Erc20ConversionProxy__factory.js.map +1 -1
package/README.md
CHANGED
|
@@ -126,16 +126,6 @@ yarn hardhat deploy-live-payments --network private --force
|
|
|
126
126
|
yarn hardhat deploy-live-payments --network private --force --dry-run
|
|
127
127
|
```
|
|
128
128
|
|
|
129
|
-
### Payment preparation (Beta)
|
|
130
|
-
|
|
131
|
-
**FIXME: only configured for rinkeby and private networks.**
|
|
132
|
-
|
|
133
|
-
Environment variables needed: `ADMIN_PRIVATE_KEY`
|
|
134
|
-
|
|
135
|
-
```bash
|
|
136
|
-
yarn hardhat prepare-live-payments --network private
|
|
137
|
-
```
|
|
138
|
-
|
|
139
129
|
### Deployment through request deployer
|
|
140
130
|
|
|
141
131
|
The request deployer enables multichain deployment of several smart contracts at predefined address. It is based on https://github.com/pcaversaccio/xdeployer
|
|
@@ -144,6 +134,8 @@ The deployer contract should be deployed at `0xE99Ab70a5FAE59551544FA326fA048f7B
|
|
|
144
134
|
|
|
145
135
|
Be sure to run `yarn build:sol` before deploying the deployer or a contract.
|
|
146
136
|
|
|
137
|
+
The contracts implemented are listed in the array `create2ContractDeploymentList` in [Utils](./scripts-create2/utils.ts).
|
|
138
|
+
|
|
147
139
|
#### Deploy the request deployer
|
|
148
140
|
|
|
149
141
|
Environment variables needed: `DEPLOYER_MASTER_KEY`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversion-proxy.d.ts","sourceRoot":"","sources":["../../scripts/conversion-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAG1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AASzE,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE;IACJ,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,EACD,GAAG,EAAE,yBAAyB,
|
|
1
|
+
{"version":3,"file":"conversion-proxy.d.ts","sourceRoot":"","sources":["../../scripts/conversion-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAG1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AASzE,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE;IACJ,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB,EACD,GAAG,EAAE,yBAAyB,sFA2B/B;AAED,wBAAsB,wBAAwB,CAC5C,IAAI,EAAE;IACJ,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,EACD,GAAG,EAAE,yBAAyB,2FAwC/B"}
|
|
@@ -7,6 +7,7 @@ const deploy_one_1 = require("./deploy-one");
|
|
|
7
7
|
const currency_1 = require("@requestnetwork/currency");
|
|
8
8
|
const types_1 = require("@requestnetwork/types");
|
|
9
9
|
function deployERC20ConversionProxy(args, hre) {
|
|
10
|
+
var _a;
|
|
10
11
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
11
12
|
const contractName = 'Erc20ConversionProxy';
|
|
12
13
|
if (!args.chainlinkConversionPathAddress) {
|
|
@@ -20,7 +21,11 @@ function deployERC20ConversionProxy(args, hre) {
|
|
|
20
21
|
return undefined;
|
|
21
22
|
}
|
|
22
23
|
return (0, deploy_one_1.deployOne)(args, hre, contractName, {
|
|
23
|
-
constructorArguments: [
|
|
24
|
+
constructorArguments: [
|
|
25
|
+
args.erc20FeeProxyAddress,
|
|
26
|
+
args.chainlinkConversionPathAddress,
|
|
27
|
+
(_a = process.env.ADMIN_WALLET_ADDRESS) !== null && _a !== void 0 ? _a : (yield (yield hre.ethers.getSigners())[0].getAddress()),
|
|
28
|
+
],
|
|
24
29
|
artifact: lib_1.erc20ConversionProxy,
|
|
25
30
|
nonceCondition: args.nonceCondition,
|
|
26
31
|
version: '0.1.1',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversion-proxy.js","sourceRoot":"","sources":["../../scripts/conversion-proxy.ts"],"names":[],"mappings":";;;;AAIA,oCAGoB;AACpB,6CAAyC;AACzC,uDAA2D;AAC3D,iDAA0D;AAE1D,SAAsB,0BAA0B,CAC9C,IAIC,EACD,GAA8B
|
|
1
|
+
{"version":3,"file":"conversion-proxy.js","sourceRoot":"","sources":["../../scripts/conversion-proxy.ts"],"names":[],"mappings":";;;;AAIA,oCAGoB;AACpB,6CAAyC;AACzC,uDAA2D;AAC3D,iDAA0D;AAE1D,SAAsB,0BAA0B,CAC9C,IAIC,EACD,GAA8B;;;QAE9B,MAAM,YAAY,GAAG,sBAAsB,CAAC;QAE5C,IAAI,CAAC,IAAI,CAAC,8BAA8B,EAAE;YACxC,mEAAmE;YACnE,OAAO,CAAC,KAAK,CACX,sCAAsC,GAAG,CAAC,OAAO,CAAC,IAAI,mBAAmB,YAAY,GAAG,CACzF,CAAC;YACF,OAAO,SAAS,CAAC;SAClB;QACD,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;YAC9B,mEAAmE;YACnE,OAAO,CAAC,KAAK,CAAC,4BAA4B,GAAG,CAAC,OAAO,CAAC,IAAI,mBAAmB,YAAY,GAAG,CAAC,CAAC;YAC9F,OAAO,SAAS,CAAC;SAClB;QAED,OAAO,IAAA,sBAAS,EAAuB,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE;YAC9D,oBAAoB,EAAE;gBACpB,IAAI,CAAC,oBAAoB;gBACzB,IAAI,CAAC,8BAA8B;gBACnC,MAAA,OAAO,CAAC,GAAG,CAAC,oBAAoB,mCAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;aAC5F;YACD,QAAQ,EAAE,0BAA4B;YACtC,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;;CACJ;AAjCD,gEAiCC;AAED,SAAsB,wBAAwB,CAC5C,IAKC,EACD,GAA8B;;;QAE9B,MAAM,YAAY,GAAG,oBAAoB,CAAC;QAE1C,IAAI,CAAC,IAAI,CAAC,8BAA8B,EAAE;YACxC,mEAAmE;YACnE,OAAO,CAAC,KAAK,CACX,sCAAsC,GAAG,CAAC,OAAO,CAAC,IAAI,mBAAmB,YAAY,GAAG,CACzF,CAAC;YACF,OAAO;SACR;QACD,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;YAC5B,mEAAmE;YACnE,OAAO,CAAC,KAAK,CAAC,0BAA0B,GAAG,CAAC,OAAO,CAAC,IAAI,mBAAmB,YAAY,GAAG,CAAC,CAAC;YAC5F,OAAO;SACR;QAED,0DAA0D;QAC1D,MAAM,kBAAkB,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC;QACzF,MAAM,eAAe,GAAG,MAAA,0BAAe,CAAC,UAAU,EAAE,CAAC,iBAAiB,CACpE,yBAAiB,CAAC,QAAQ,CAAC,GAAG,EAC9B,kBAAkB,CACnB,0CAAE,IAAI,CAAC;QACR,IAAI,CAAC,eAAe,EAAE;YACpB,OAAO,CAAC,KAAK,CACX,qCAAqC,GAAG,CAAC,OAAO,CAAC,IAAI,mBAAmB,YAAY,GAAG,CACxF,CAAC;YACF,OAAO;SACR;QAED,OAAO,IAAA,sBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,YAAY,EAAE;YACxC,oBAAoB,EAAE;gBACpB,IAAI,CAAC,kBAAkB;gBACvB,IAAI,CAAC,8BAA8B;gBACnC,eAAe;aAChB;YACD,QAAQ,EAAE,2BAAqB;YAC/B,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC,CAAC;;CACJ;AA/CD,4DA+CC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-payments.d.ts","sourceRoot":"","sources":["../../scripts/deploy-payments.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy-payments.d.ts","sourceRoot":"","sources":["../../scripts/deploy-payments.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AAuBnC,OAAO,EAAE,iCAAiC,EAAE,MAAM,0BAA0B,CAAC;AAG7E;;;;;;;;;;;;;GAaG;AACH,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,GAAG,EACT,GAAG,EAAE,iCAAiC,GACrC,OAAO,CAAC,IAAI,CAAC,CAsZf"}
|
|
@@ -76,6 +76,18 @@ function deployAllPaymentContracts(args, hre) {
|
|
|
76
76
|
simulationSuccess = simulationSuccess !== null && simulationSuccess !== void 0 ? simulationSuccess : true;
|
|
77
77
|
}
|
|
78
78
|
};
|
|
79
|
+
/* Returns true if the nonce is <= targetNonce, and switches to simulation if != targetNonce */
|
|
80
|
+
const nonceReady = (targetNonce) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
81
|
+
const currentNonce = yield deployer.getTransactionCount();
|
|
82
|
+
if (currentNonce !== targetNonce && currentNonce > 17) {
|
|
83
|
+
console.warn(`Warning: got nonce ${currentNonce} instead of ${targetNonce}`);
|
|
84
|
+
switchToSimulation();
|
|
85
|
+
}
|
|
86
|
+
if (currentNonce === targetNonce) {
|
|
87
|
+
return true;
|
|
88
|
+
}
|
|
89
|
+
return false;
|
|
90
|
+
});
|
|
79
91
|
// #endregion
|
|
80
92
|
// #region BATCH DEFINITIONS
|
|
81
93
|
/*
|
|
@@ -126,7 +138,8 @@ function deployAllPaymentContracts(args, hre) {
|
|
|
126
138
|
throw new Error('Chainlink was deployed but no ADMIN_WALLET_ADDRESS was provided, cannot addWhitelistAdmin.');
|
|
127
139
|
}
|
|
128
140
|
if (args.simulate === false) {
|
|
129
|
-
yield chainlinkInstance.addWhitelistAdmin(process.env.ADMIN_WALLET_ADDRESS);
|
|
141
|
+
const tx = yield chainlinkInstance.addWhitelistAdmin(process.env.ADMIN_WALLET_ADDRESS);
|
|
142
|
+
yield tx.wait(1);
|
|
130
143
|
}
|
|
131
144
|
else {
|
|
132
145
|
console.log('[i] Simulating addWhitelistAdmin to chainlinkInstance');
|
|
@@ -142,7 +155,7 @@ function deployAllPaymentContracts(args, hre) {
|
|
|
142
155
|
switchToSimulation();
|
|
143
156
|
}
|
|
144
157
|
}
|
|
145
|
-
return chainlinkInstance;
|
|
158
|
+
return { chainlinkInstance, ethConversionResult };
|
|
146
159
|
});
|
|
147
160
|
/*
|
|
148
161
|
* Batch 5
|
|
@@ -150,8 +163,8 @@ function deployAllPaymentContracts(args, hre) {
|
|
|
150
163
|
* - 5.b ERC20ConversionProxy.transferOwnership
|
|
151
164
|
* - 5.c ERC20SwapConversion.setPaymentProxy
|
|
152
165
|
*/
|
|
153
|
-
const runDeploymentBatch_5 = (chainlinkInstance, erc20FeeProxyAddress, erc20SwapConversionInstance) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
154
|
-
const NONCE_BATCH_5 =
|
|
166
|
+
const runDeploymentBatch_5 = (chainlinkInstance, erc20FeeProxyAddress, erc20SwapConversionInstance, ethConversionResultInstance) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
167
|
+
const NONCE_BATCH_5 = 15;
|
|
155
168
|
yield (0, utils_1.jumpToNonce)(args, hre, NONCE_BATCH_5);
|
|
156
169
|
let chainlinkConversionPathAddress = chainlinkInstance === null || chainlinkInstance === void 0 ? void 0 : chainlinkInstance.address;
|
|
157
170
|
if (!chainlinkConversionPathAddress) {
|
|
@@ -163,48 +176,64 @@ function deployAllPaymentContracts(args, hre) {
|
|
|
163
176
|
erc20FeeProxyAddress, nonceCondition: NONCE_BATCH_5 }), hre);
|
|
164
177
|
addToResult(erc20ConversionResult);
|
|
165
178
|
// 5.b ERC20ConversionProxy.transferOwnership
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
179
|
+
if (yield nonceReady(NONCE_BATCH_5 + 1)) {
|
|
180
|
+
if (erc20ConversionResult) {
|
|
181
|
+
if (!process.env.ADMIN_WALLET_ADDRESS) {
|
|
182
|
+
throw new Error('ADMIN_WALLET_ADDRESS missing for: ERC20ConversionProxy.transferOwnership');
|
|
183
|
+
}
|
|
184
|
+
if (args.simulate === false) {
|
|
185
|
+
yield erc20ConversionResult.instance.transferOwnership(process.env.ADMIN_WALLET_ADDRESS);
|
|
186
|
+
}
|
|
187
|
+
else {
|
|
188
|
+
console.log('[i] Simulating transferOwnership to ERC20ConversionProxy');
|
|
189
|
+
}
|
|
174
190
|
}
|
|
175
191
|
else {
|
|
176
|
-
console.log('[i] Simulating transferOwnership to ERC20ConversionProxy');
|
|
177
|
-
}
|
|
178
|
-
}
|
|
179
|
-
else {
|
|
180
|
-
if (currentNonce < erc20ConversionAdminNonce) {
|
|
181
|
-
console.warn(`Warning: got nonce ${currentNonce} instead of ${erc20ConversionAdminNonce}`);
|
|
182
|
-
switchToSimulation();
|
|
183
|
-
}
|
|
184
|
-
else if (!erc20ConversionResult) {
|
|
185
192
|
console.warn(`Warning: the ERC20ConversionProxy contract instance is not ready, consider retrying.`);
|
|
186
193
|
switchToSimulation();
|
|
187
194
|
}
|
|
188
195
|
}
|
|
189
196
|
// 5.c ERC20SwapConversion.setPaymentProxy
|
|
190
|
-
|
|
191
|
-
const
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
197
|
+
// Ignore if the ERC20 conversion proxy is already live and used, until it gets deprecated
|
|
198
|
+
const IGNORE_SET_PAYMENT_PROXY = true;
|
|
199
|
+
console.warn(`DOUBLE-CHECK: ${IGNORE_SET_PAYMENT_PROXY ? '' : 'not '}ignoring erc20SwapConversionInstance.setPaymentProxy on ${erc20SwapConversionInstance.address}`);
|
|
200
|
+
if (!IGNORE_SET_PAYMENT_PROXY) {
|
|
201
|
+
if (yield nonceReady(NONCE_BATCH_5 + 2)) {
|
|
202
|
+
if (erc20ConversionResult) {
|
|
203
|
+
if (args.simulate === false) {
|
|
204
|
+
yield erc20SwapConversionInstance.setPaymentProxy(erc20ConversionResult === null || erc20ConversionResult === void 0 ? void 0 : erc20ConversionResult.address);
|
|
205
|
+
}
|
|
206
|
+
else {
|
|
207
|
+
console.log('[i] Simulating setPaymentProxy to ERC20SwapConversion');
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
else {
|
|
211
|
+
console.warn(`Warning: the ERC20ConversionProxy contract instance is not ready for ERC20SwapConversion update, consider retrying.`);
|
|
212
|
+
switchToSimulation();
|
|
213
|
+
}
|
|
198
214
|
}
|
|
199
215
|
}
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
216
|
+
const ethConversionAdminNonce = NONCE_BATCH_5 + 3;
|
|
217
|
+
yield (0, utils_1.jumpToNonce)(args, hre, ethConversionAdminNonce);
|
|
218
|
+
// 5.d ETHConversion.transferOwnership
|
|
219
|
+
if (yield nonceReady(ethConversionAdminNonce)) {
|
|
220
|
+
if (ethConversionResultInstance) {
|
|
221
|
+
if (!process.env.ADMIN_WALLET_ADDRESS) {
|
|
222
|
+
throw new Error('ADMIN_WALLET_ADDRESS missing, cannot addWhitelistAdmin on ETHConversion.');
|
|
223
|
+
}
|
|
224
|
+
if (args.simulate === false) {
|
|
225
|
+
const tx = yield ethConversionResultInstance.addWhitelistAdmin(process.env.ADMIN_WALLET_ADDRESS);
|
|
226
|
+
yield tx.wait(1);
|
|
227
|
+
}
|
|
228
|
+
else {
|
|
229
|
+
console.log(`[i] Simulating addWhitelistAdmin to ETHConversion at ${ethConversionResultInstance.address}`);
|
|
230
|
+
}
|
|
204
231
|
}
|
|
205
|
-
else
|
|
206
|
-
|
|
207
|
-
|
|
232
|
+
else {
|
|
233
|
+
if (!ethConversionResultInstance) {
|
|
234
|
+
console.warn(`Warning: the ETHConversion contract instance is not ready for ETHConversion update, consider retrying.`);
|
|
235
|
+
switchToSimulation();
|
|
236
|
+
}
|
|
208
237
|
}
|
|
209
238
|
}
|
|
210
239
|
});
|
|
@@ -231,9 +260,9 @@ function deployAllPaymentContracts(args, hre) {
|
|
|
231
260
|
// Compute EthereumFeeProxy address (CREATE2)
|
|
232
261
|
const ethFeeProxyAddress = yield (0, compute_one_address_1.computeCreate2DeploymentAddress)({ contract: 'EthereumFeeProxy' }, hre);
|
|
233
262
|
// Batch 4
|
|
234
|
-
const chainlinkInstance = yield runDeploymentBatch_4(ethFeeProxyAddress);
|
|
263
|
+
const { chainlinkInstance, ethConversionResult } = yield runDeploymentBatch_4(ethFeeProxyAddress);
|
|
235
264
|
// Batch 5
|
|
236
|
-
yield runDeploymentBatch_5(chainlinkInstance, erc20FeeProxyAddress, swapConversionResult.instance);
|
|
265
|
+
yield runDeploymentBatch_5(chainlinkInstance, erc20FeeProxyAddress, swapConversionResult.instance, ethConversionResult === null || ethConversionResult === void 0 ? void 0 : ethConversionResult.instance);
|
|
237
266
|
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
|
238
267
|
// Add future batches above this line
|
|
239
268
|
console.log('Done deploying.');
|
|
@@ -260,8 +289,6 @@ function deployAllPaymentContracts(args, hre) {
|
|
|
260
289
|
`* CRITICAL: update src/lib/artifacts files, and push changes NOW !`,
|
|
261
290
|
`* IMPORTANT: execute updateAggregatorsList() on conversionPaths`,
|
|
262
291
|
`* : then update the lib with chainlinkPath util in toolbox and push changes`,
|
|
263
|
-
`* OTHER: run \`yarn hardhat prepare-live-payments --network ${hre.network.name}\``,
|
|
264
|
-
`* OTHER: execute administration tasks: approveRouterToSpend(), approvePaymentProxyToSpend() on swaps`,
|
|
265
292
|
`* OTHER: deploy subgraphes where needed`,
|
|
266
293
|
].join('\r\n'));
|
|
267
294
|
if (verificationPromises.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-payments.js","sourceRoot":"","sources":["../../scripts/deploy-payments.ts"],"names":[],"mappings":";;;;AAAA,qCAAmC;AACnC,oCAKoB;AACpB,yEAAkE;AAClE,yDAA0F;AAC1F,6CAA2D;AAC3D,mCAAgE;
|
|
1
|
+
{"version":3,"file":"deploy-payments.js","sourceRoot":"","sources":["../../scripts/deploy-payments.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../scripts/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAE1D;;;GAGG;AACH,eAAO,MAAM,wBAAwB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAkB3D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,SAAgB,GAAG,OAAO,yBAAyB,SAAS,MAAM,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../scripts/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAE1D;;;GAGG;AACH,eAAO,MAAM,wBAAwB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAkB3D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,SAAgB,GAAG,OAAO,yBAAyB,SAAS,MAAM,kBAezF,CAAC"}
|
package/dist/scripts/utils.js
CHANGED
|
@@ -31,16 +31,18 @@ exports.uniswapV2RouterAddresses = {
|
|
|
31
31
|
*/
|
|
32
32
|
const jumpToNonce = (args, hre, nonce) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
33
33
|
const [deployer] = yield hre.ethers.getSigners();
|
|
34
|
+
let nextNonce = yield deployer.getTransactionCount();
|
|
34
35
|
if (args.simulate) {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
console.log(`Simulating a jump to nonce ${nonce} (current: ${currentNonce})`);
|
|
36
|
+
if (nextNonce < nonce) {
|
|
37
|
+
console.log(`Simulating a jump to nonce ${nonce} (current: ${nextNonce})`);
|
|
38
38
|
}
|
|
39
39
|
return;
|
|
40
40
|
}
|
|
41
|
-
while (
|
|
41
|
+
while (nextNonce < nonce) {
|
|
42
42
|
// Atificially increase nonce if needed
|
|
43
|
-
yield deployer.sendTransaction({ to: deployer.address });
|
|
43
|
+
const tx = yield deployer.sendTransaction({ to: deployer.address, nonce: nextNonce });
|
|
44
|
+
yield tx.wait(1);
|
|
45
|
+
nextNonce = yield deployer.getTransactionCount();
|
|
44
46
|
}
|
|
45
47
|
});
|
|
46
48
|
exports.jumpToNonce = jumpToNonce;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../scripts/utils.ts"],"names":[],"mappings":";;;;AAEA;;;GAGG;AACU,QAAA,wBAAwB,GAA2B;IAC9D,OAAO,EAAE,4CAA4C;IACrD,OAAO,EAAE,4CAA4C;IACrD,OAAO,EAAE,4CAA4C;IACrD,KAAK,EAAE,4CAA4C;IACnD,OAAO,EAAE,4CAA4C;IACrD,OAAO,EAAE,4CAA4C;IACrD,IAAI,EAAE,4CAA4C;IAClD,kDAAkD;IAClD,MAAM,EAAE,4CAA4C;IACpD,8CAA8C;IAC9C,KAAK,EAAE,4CAA4C;IACnD,iCAAiC;IACjC,IAAI,EAAE,4CAA4C;IAClD,mBAAmB;IACnB,kBAAkB,EAAE,4CAA4C;IAChE,cAAc,EAAE,4CAA4C;IAC5D,SAAS,EAAE,4CAA4C;CACxD,CAAC;AAEF;;;GAGG;AACI,MAAM,WAAW,GAAG,CAAO,IAAS,EAAE,GAA8B,EAAE,KAAa,EAAE,EAAE;IAC5F,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;IACjD,IAAI,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../scripts/utils.ts"],"names":[],"mappings":";;;;AAEA;;;GAGG;AACU,QAAA,wBAAwB,GAA2B;IAC9D,OAAO,EAAE,4CAA4C;IACrD,OAAO,EAAE,4CAA4C;IACrD,OAAO,EAAE,4CAA4C;IACrD,KAAK,EAAE,4CAA4C;IACnD,OAAO,EAAE,4CAA4C;IACrD,OAAO,EAAE,4CAA4C;IACrD,IAAI,EAAE,4CAA4C;IAClD,kDAAkD;IAClD,MAAM,EAAE,4CAA4C;IACpD,8CAA8C;IAC9C,KAAK,EAAE,4CAA4C;IACnD,iCAAiC;IACjC,IAAI,EAAE,4CAA4C;IAClD,mBAAmB;IACnB,kBAAkB,EAAE,4CAA4C;IAChE,cAAc,EAAE,4CAA4C;IAC5D,SAAS,EAAE,4CAA4C;CACxD,CAAC;AAEF;;;GAGG;AACI,MAAM,WAAW,GAAG,CAAO,IAAS,EAAE,GAA8B,EAAE,KAAa,EAAE,EAAE;IAC5F,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;IACjD,IAAI,SAAS,GAAG,MAAM,QAAQ,CAAC,mBAAmB,EAAE,CAAC;IACrD,IAAI,IAAI,CAAC,QAAQ,EAAE;QACjB,IAAI,SAAS,GAAG,KAAK,EAAE;YACrB,OAAO,CAAC,GAAG,CAAC,8BAA8B,KAAK,cAAc,SAAS,GAAG,CAAC,CAAC;SAC5E;QACD,OAAO;KACR;IACD,OAAO,SAAS,GAAG,KAAK,EAAE;QACxB,uCAAuC;QACvC,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,QAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QACtF,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,SAAS,GAAG,MAAM,QAAQ,CAAC,mBAAmB,EAAE,CAAC;KAClD;AACH,CAAC,CAAA,CAAC;AAfW,QAAA,WAAW,eAetB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compute-one-address.d.ts","sourceRoot":"","sources":["../../scripts-create2/compute-one-address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,iCAAiC,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"compute-one-address.d.ts","sourceRoot":"","sources":["../../scripts-create2/compute-one-address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,iCAAiC,EAAE,MAAM,SAAS,CAAC;AAM/E,wBAAsB,+BAA+B,CACnD,gBAAgB,EAAE,iBAAiB,EACnC,GAAG,EAAE,iCAAiC,GACrC,OAAO,CAAC,MAAM,CAAC,CAkCjB;AAED,eAAO,MAAM,yCAAyC,QAC/C,iCAAiC,KACrC,QAAQ,IAAI,CAmBd,CAAC"}
|
|
@@ -4,6 +4,7 @@ exports.computeCreate2DeploymentAddressesFromList = exports.computeCreate2Deploy
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const lib_1 = require("../src/lib");
|
|
6
6
|
const utils_1 = require("./utils");
|
|
7
|
+
const constructor_args_1 = require("./constructor-args");
|
|
7
8
|
// Deploys, set up the contracts
|
|
8
9
|
function computeCreate2DeploymentAddress(deploymentParams, hre) {
|
|
9
10
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
@@ -42,9 +43,12 @@ const computeCreate2DeploymentAddressesFromList = (hre) => (0, tslib_1.__awaiter
|
|
|
42
43
|
switch (contract) {
|
|
43
44
|
case 'EthereumProxy':
|
|
44
45
|
case 'EthereumFeeProxy':
|
|
45
|
-
|
|
46
|
+
case 'Erc20ConversionProxy': {
|
|
47
|
+
const constructorArgs = (0, constructor_args_1.getConstructorArgs)(contract);
|
|
48
|
+
address = yield computeCreate2DeploymentAddress({ contract, constructorArgs }, hre);
|
|
46
49
|
console.log(`${contract.padEnd(36, ' ')}${address}`);
|
|
47
50
|
break;
|
|
51
|
+
}
|
|
48
52
|
// Other cases to add when necessary
|
|
49
53
|
default:
|
|
50
54
|
throw new Error(`The contrat ${contract} is not to be deployed using the CREATE2 scheme`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compute-one-address.js","sourceRoot":"","sources":["../../scripts-create2/compute-one-address.ts"],"names":[],"mappings":";;;;AACA,oCAA6C;AAC7C,mCAAwD;AAExD,gCAAgC;AAChC,SAAsB,+BAA+B,CACnD,gBAAmC,EACnC,GAAsC;;QAEtC,IAAI;YACF,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE;gBAC5B,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;aACjC;YAED,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE;gBACvC,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;aAC7C;YAED,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,CACvD,uCAAuC,CACxC,CAAC;YACF,MAAM,eAAe,GAAG,qBAAe,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YACvE,MAAM,gBAAgB,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YACxF,IAAI,QAAQ,CAAC;YACb,IAAI,gBAAgB,CAAC,eAAe,EAAE;gBACpC,QAAQ,GAAG,MAAM,gBAAgB,CAAC,oBAAoB,CAAC,GAAG,gBAAgB,CAAC,eAAe,CAAC,CAAC;aAC7F;iBAAM;gBACL,QAAQ,GAAG,MAAM,gBAAgB,CAAC,oBAAoB,EAAE,CAAC;aAC1D;YAED,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;gBAC/B,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;aACzE;YACD,MAAM,eAAe,GAAG,MAAM,eAAe,CAAC,0BAA0B,CACtE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAC5C,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EACzC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CACnC,CAAC;YACF,OAAO,eAAe,CAAC;SACxB;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC/B;IACH,CAAC;CAAA;AArCD,0EAqCC;AAEM,MAAM,yCAAyC,GAAG,CACvD,GAAsC,EACvB,EAAE;IACjB,MAAM,OAAO,CAAC,GAAG,CACf,qCAA6B,CAAC,GAAG,CAAC,CAAO,QAAQ,EAAE,EAAE;QACnD,IAAI,OAAe,CAAC;QACpB,QAAQ,QAAQ,EAAE;YAChB,KAAK,eAAe,CAAC;YACrB,KAAK,kBAAkB;
|
|
1
|
+
{"version":3,"file":"compute-one-address.js","sourceRoot":"","sources":["../../scripts-create2/compute-one-address.ts"],"names":[],"mappings":";;;;AACA,oCAA6C;AAC7C,mCAAwD;AACxD,yDAAwD;AAExD,gCAAgC;AAChC,SAAsB,+BAA+B,CACnD,gBAAmC,EACnC,GAAsC;;QAEtC,IAAI;YACF,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE;gBAC5B,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;aACjC;YAED,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE;gBACvC,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;aAC7C;YAED,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,eAAe,CACvD,uCAAuC,CACxC,CAAC;YACF,MAAM,eAAe,GAAG,qBAAe,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YACvE,MAAM,gBAAgB,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YACxF,IAAI,QAAQ,CAAC;YACb,IAAI,gBAAgB,CAAC,eAAe,EAAE;gBACpC,QAAQ,GAAG,MAAM,gBAAgB,CAAC,oBAAoB,CAAC,GAAG,gBAAgB,CAAC,eAAe,CAAC,CAAC;aAC7F;iBAAM;gBACL,QAAQ,GAAG,MAAM,gBAAgB,CAAC,oBAAoB,EAAE,CAAC;aAC1D;YAED,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;gBAC/B,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;aACzE;YACD,MAAM,eAAe,GAAG,MAAM,eAAe,CAAC,0BAA0B,CACtE,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAC5C,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EACzC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CACnC,CAAC;YACF,OAAO,eAAe,CAAC;SACxB;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC/B;IACH,CAAC;CAAA;AArCD,0EAqCC;AAEM,MAAM,yCAAyC,GAAG,CACvD,GAAsC,EACvB,EAAE;IACjB,MAAM,OAAO,CAAC,GAAG,CACf,qCAA6B,CAAC,GAAG,CAAC,CAAO,QAAQ,EAAE,EAAE;QACnD,IAAI,OAAe,CAAC;QACpB,QAAQ,QAAQ,EAAE;YAChB,KAAK,eAAe,CAAC;YACrB,KAAK,kBAAkB,CAAC;YACxB,KAAK,sBAAsB,CAAC,CAAC;gBAC3B,MAAM,eAAe,GAAG,IAAA,qCAAkB,EAAC,QAAQ,CAAC,CAAC;gBACrD,OAAO,GAAG,MAAM,+BAA+B,CAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;gBACpF,OAAO,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,OAAO,EAAE,CAAC,CAAC;gBACrD,MAAM;aACP;YACD,oCAAoC;YACpC;gBACE,MAAM,IAAI,KAAK,CAAC,eAAe,QAAQ,iDAAiD,CAAC,CAAC;SAC7F;IACH,CAAC,CAAA,CAAC,CACH,CAAC;AACJ,CAAC,CAAA,CAAC;AArBW,QAAA,yCAAyC,6CAqBpD"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"constructor-args.d.ts","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,kBAAkB,aAAc,MAAM,aAelD,CAAC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getConstructorArgs = void 0;
|
|
4
|
+
const getConstructorArgs = (contract) => {
|
|
5
|
+
switch (contract) {
|
|
6
|
+
case 'Erc20ConversionProxy': {
|
|
7
|
+
if (!process.env.ADMIN_WALLET_ADDRESS) {
|
|
8
|
+
throw new Error(`ADMIN_WALLET_ADDRESS missing to get constructor args for: ${contract}`);
|
|
9
|
+
}
|
|
10
|
+
return [
|
|
11
|
+
'0x0000000000000000000000000000000000000000',
|
|
12
|
+
'0x0000000000000000000000000000000000000000',
|
|
13
|
+
process.env.ADMIN_WALLET_ADDRESS,
|
|
14
|
+
];
|
|
15
|
+
}
|
|
16
|
+
default:
|
|
17
|
+
return [];
|
|
18
|
+
}
|
|
19
|
+
};
|
|
20
|
+
exports.getConstructorArgs = getConstructorArgs;
|
|
21
|
+
//# sourceMappingURL=constructor-args.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"constructor-args.js","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":";;;AAAO,MAAM,kBAAkB,GAAG,CAAC,QAAgB,EAAE,EAAE;IACrD,QAAQ,QAAQ,EAAE;QAChB,KAAK,sBAAsB,CAAC,CAAC;YAC3B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE;gBACrC,MAAM,IAAI,KAAK,CAAC,6DAA6D,QAAQ,EAAE,CAAC,CAAC;aAC1F;YACD,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,OAAO,CAAC,GAAG,CAAC,oBAAoB;aACjC,CAAC;SACH;QACD;YACE,OAAO,EAAE,CAAC;KACb;AACH,CAAC,CAAC;AAfW,QAAA,kBAAkB,sBAe7B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-one.d.ts","sourceRoot":"","sources":["../../scripts-create2/deploy-one.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,iCAAiC,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy-one.d.ts","sourceRoot":"","sources":["../../scripts-create2/deploy-one.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,iCAAiC,EAAE,MAAM,SAAS,CAAC;AAK5D,eAAO,MAAM,oBAAoB,qBACb,iBAAiB,OAC9B,iCAAiC,KACrC,QAAQ,MAAM,CAkChB,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAC/B,iCAAiC,KACrC,QAAQ,IAAI,CAed,CAAC"}
|
|
@@ -4,41 +4,36 @@ exports.deployWithCreate2FromList = exports.deployOneWithCreate2 = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const utils_1 = require("./utils");
|
|
6
6
|
const xdeployer_1 = require("./xdeployer");
|
|
7
|
+
const constructor_args_1 = require("./constructor-args");
|
|
7
8
|
// Deploys, set up the contracts and returns the address
|
|
8
9
|
const deployOneWithCreate2 = (deploymentParams, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
10
|
+
if (!hre.config.xdeploy.networks || hre.config.xdeploy.networks.length === 0) {
|
|
11
|
+
throw new Error('Invalid networks');
|
|
12
|
+
}
|
|
13
|
+
// Deploy the contract on several network through xdeployer
|
|
14
|
+
const deploymentResult = yield (0, xdeployer_1.xdeploy)(deploymentParams, hre);
|
|
15
|
+
for (let i = 0; i < hre.config.xdeploy.networks.length; i++) {
|
|
16
|
+
if (deploymentResult[i].deployed) {
|
|
17
|
+
console.log(`${deploymentParams.contract} succesffuly deployed:`);
|
|
18
|
+
console.log(` On network: ${hre.config.xdeploy.networks[i]}`);
|
|
19
|
+
console.log(` At address: ${deploymentResult[i].address}`);
|
|
20
|
+
console.log(` At block: ${deploymentResult[i].receipt.blockNumber}`);
|
|
13
21
|
}
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
if (deploymentResult[i].deployed) {
|
|
18
|
-
console.log(`${deploymentParams.contract} succesffuly deployed:`);
|
|
22
|
+
else {
|
|
23
|
+
if ((0, utils_1.isContractDeployed)(deploymentParams.contract, hre.config.xdeploy.networks[i], deploymentResult[i].address)) {
|
|
24
|
+
console.log(`${deploymentParams.contract} already deployed:`);
|
|
19
25
|
console.log(` On network: ${hre.config.xdeploy.networks[i]}`);
|
|
20
26
|
console.log(` At address: ${deploymentResult[i].address}`);
|
|
21
|
-
console.log(` At block: ${deploymentResult[i].receipt.blockNumber}`);
|
|
22
27
|
}
|
|
23
28
|
else {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
}
|
|
29
|
-
else {
|
|
30
|
-
console.log(`${deploymentParams.contract} has not been deployed:`);
|
|
31
|
-
console.log(` On network: ${hre.config.xdeploy.networks[i]}`);
|
|
32
|
-
console.log(` Error: ${(_a = deploymentResult[i].error) === null || _a === void 0 ? void 0 : _a.message}`);
|
|
33
|
-
console.log(` Hint: Check that your artefacts are up to date`);
|
|
34
|
-
}
|
|
29
|
+
console.log(`${deploymentParams.contract} has not been deployed:`);
|
|
30
|
+
console.log(` On network: ${hre.config.xdeploy.networks[i]}`);
|
|
31
|
+
console.log(` Error: ${deploymentResult[i].error}`);
|
|
32
|
+
console.log(` Hint: Check admin wallet balance and that your artifacts are up to date`);
|
|
35
33
|
}
|
|
36
34
|
}
|
|
37
|
-
return deploymentResult[0].address;
|
|
38
|
-
}
|
|
39
|
-
catch (e) {
|
|
40
|
-
throw new Error(e.toString());
|
|
41
35
|
}
|
|
36
|
+
return deploymentResult[0].address;
|
|
42
37
|
});
|
|
43
38
|
exports.deployOneWithCreate2 = deployOneWithCreate2;
|
|
44
39
|
const deployWithCreate2FromList = (hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
@@ -46,8 +41,11 @@ const deployWithCreate2FromList = (hre) => (0, tslib_1.__awaiter)(void 0, void 0
|
|
|
46
41
|
switch (contract) {
|
|
47
42
|
case 'EthereumProxy':
|
|
48
43
|
case 'EthereumFeeProxy':
|
|
49
|
-
|
|
44
|
+
case 'Erc20ConversionProxy': {
|
|
45
|
+
const constructorArgs = (0, constructor_args_1.getConstructorArgs)(contract);
|
|
46
|
+
yield (0, exports.deployOneWithCreate2)({ contract, constructorArgs }, hre);
|
|
50
47
|
break;
|
|
48
|
+
}
|
|
51
49
|
// Other cases to add when necessary
|
|
52
50
|
default:
|
|
53
51
|
throw new Error(`The contrat ${contract} is not to be deployed using the CREATE2 scheme`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-one.js","sourceRoot":"","sources":["../../scripts-create2/deploy-one.ts"],"names":[],"mappings":";;;;AAAA,mCAA4E;AAG5E,2CAAsC;
|
|
1
|
+
{"version":3,"file":"deploy-one.js","sourceRoot":"","sources":["../../scripts-create2/deploy-one.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../scripts-create2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AAExC;;GAEG;AACH,eAAO,MAAM,6BAA6B,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../scripts-create2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AAExC;;GAEG;AACH,eAAO,MAAM,6BAA6B,UAIzC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,aAAc,MAAM,KAAG,UAAU,gBAAgB,CAAC,QAAQ,CA2BjF,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,aACnB,MAAM,WACP,MAAM,mBACE,MAAM,KACtB,OAIF,CAAC"}
|
|
@@ -5,7 +5,11 @@ const artifacts = require("../src/lib");
|
|
|
5
5
|
/**
|
|
6
6
|
* List of smart contract that we deploy using the CREATE2 scheme thourhg the Request Deployer contract
|
|
7
7
|
*/
|
|
8
|
-
exports.create2ContractDeploymentList = [
|
|
8
|
+
exports.create2ContractDeploymentList = [
|
|
9
|
+
'EthereumProxy',
|
|
10
|
+
'EthereumFeeProxy',
|
|
11
|
+
'Erc20ConversionProxy',
|
|
12
|
+
];
|
|
9
13
|
/**
|
|
10
14
|
* Returns the artifact of the specified contract
|
|
11
15
|
* @param contract name of the contract
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../scripts-create2/utils.ts"],"names":[],"mappings":";;;AACA,wCAAwC;AAExC;;GAEG;AACU,QAAA,6BAA6B,GAAG,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../scripts-create2/utils.ts"],"names":[],"mappings":";;;AACA,wCAAwC;AAExC;;GAEG;AACU,QAAA,6BAA6B,GAAG;IAC3C,eAAe;IACf,kBAAkB;IAClB,sBAAsB;CACvB,CAAC;AAEF;;;GAGG;AACI,MAAM,WAAW,GAAG,CAAC,QAAgB,EAAwC,EAAE;IACpF,QAAQ,QAAQ,EAAE;QAChB,KAAK,oBAAoB;YACvB,OAAO,SAAS,CAAC,0BAA0B,CAAC;QAC9C,KAAK,0BAA0B;YAC7B,OAAO,SAAS,CAAC,4BAA4B,CAAC;QAChD,KAAK,YAAY;YACf,OAAO,SAAS,CAAC,kBAAkB,CAAC;QACtC,KAAK,eAAe;YAClB,OAAO,SAAS,CAAC,qBAAqB,CAAC;QACzC,KAAK,eAAe;YAClB,OAAO,SAAS,CAAC,qBAAqB,CAAC;QACzC,KAAK,kBAAkB;YACrB,OAAO,SAAS,CAAC,wBAAwB,CAAC;QAC5C,KAAK,yBAAyB;YAC5B,OAAO,SAAS,CAAC,uBAAuB,CAAC;QAC3C,KAAK,sBAAsB;YACzB,OAAO,SAAS,CAAC,oBAAoB,CAAC;QACxC,KAAK,oBAAoB;YACvB,OAAO,SAAS,CAAC,qBAAqB,CAAC;QACzC,KAAK,gBAAgB;YACnB,OAAO,SAAS,CAAC,sBAAsB,CAAC;QAC1C,KAAK,uBAAuB;YAC1B,OAAO,SAAS,CAAC,2BAA2B,CAAC;QAC/C;YACE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;KACvC;AACH,CAAC,CAAC;AA3BW,QAAA,WAAW,eA2BtB;AAEF;;;;;;GAMG;AACI,MAAM,kBAAkB,GAAG,CAChC,QAAgB,EAChB,OAAe,EACf,eAAuB,EACd,EAAE;IACX,MAAM,gBAAgB,GAAG,IAAA,mBAAW,EAAC,QAAQ,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,gBAAgB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAC5D,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,eAAe,CAAC,CAAC;AAC9D,CAAC,CAAC;AARW,QAAA,kBAAkB,sBAQ7B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verify-one.d.ts","sourceRoot":"","sources":["../../scripts-create2/verify-one.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"verify-one.d.ts","sourceRoot":"","sources":["../../scripts-create2/verify-one.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iCAAiC,EAAE,MAAM,SAAS,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAG5C,eAAO,MAAM,SAAS,oBACH,MAAM,oBACL,iBAAiB,OAC9B,iCAAiC,KACrC,QAAQ,IAAI,CASd,CAAC;AAEF,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,iCAAiC,GAAG,OAAO,CAAC,IAAI,CAAC,CAyBjG"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.VerifyCreate2FromList = exports.verifyOne = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const compute_one_address_1 = require("./compute-one-address");
|
|
6
|
+
const constructor_args_1 = require("./constructor-args");
|
|
6
7
|
const utils_1 = require("./utils");
|
|
7
8
|
const verifyOne = (contractAddress, deploymentParams, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
8
9
|
try {
|
|
@@ -24,9 +25,12 @@ function VerifyCreate2FromList(hre) {
|
|
|
24
25
|
switch (contract) {
|
|
25
26
|
case 'EthereumProxy':
|
|
26
27
|
case 'EthereumFeeProxy':
|
|
27
|
-
|
|
28
|
-
|
|
28
|
+
case 'Erc20ConversionProxy': {
|
|
29
|
+
const constructorArgs = (0, constructor_args_1.getConstructorArgs)(contract);
|
|
30
|
+
address = yield (0, compute_one_address_1.computeCreate2DeploymentAddress)({ contract, constructorArgs }, hre);
|
|
31
|
+
yield (0, exports.verifyOne)(address, { contract, constructorArgs }, hre);
|
|
29
32
|
break;
|
|
33
|
+
}
|
|
30
34
|
// Other cases to add when necessary
|
|
31
35
|
default:
|
|
32
36
|
throw new Error(`The contrat ${contract} is not to be deployed using the CREATE2 scheme`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verify-one.js","sourceRoot":"","sources":["../../scripts-create2/verify-one.ts"],"names":[],"mappings":";;;;AAAA,+DAAwE;
|
|
1
|
+
{"version":3,"file":"verify-one.js","sourceRoot":"","sources":["../../scripts-create2/verify-one.ts"],"names":[],"mappings":";;;;AAAA,+DAAwE;AACxE,yDAAwD;AAGxD,mCAAwD;AAEjD,MAAM,SAAS,GAAG,CACvB,eAAuB,EACvB,gBAAmC,EACnC,GAAsC,EACvB,EAAE;IACjB,IAAI;QACF,MAAM,GAAG,CAAC,GAAG,CAAC,eAAe,EAAE;YAC7B,OAAO,EAAE,eAAe;YACxB,oBAAoB,EAAE,gBAAgB,CAAC,eAAe;SACvD,CAAC,CAAC;KACJ;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;KAClB;AACH,CAAC,CAAA,CAAC;AAbW,QAAA,SAAS,aAapB;AAEF,SAAsB,qBAAqB,CAAC,GAAsC;;QAChF,IAAI;YACF,IAAI,OAAe,CAAC;YACpB,MAAM,OAAO,CAAC,GAAG,CACf,qCAA6B,CAAC,GAAG,CAAC,CAAO,QAAQ,EAAE,EAAE;gBACnD,QAAQ,QAAQ,EAAE;oBAChB,KAAK,eAAe,CAAC;oBACrB,KAAK,kBAAkB,CAAC;oBACxB,KAAK,sBAAsB,CAAC,CAAC;wBAC3B,MAAM,eAAe,GAAG,IAAA,qCAAkB,EAAC,QAAQ,CAAC,CAAC;wBACrD,OAAO,GAAG,MAAM,IAAA,qDAA+B,EAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;wBACpF,MAAM,IAAA,iBAAS,EAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;wBAC7D,MAAM;qBACP;oBACD,oCAAoC;oBACpC;wBACE,MAAM,IAAI,KAAK,CACb,eAAe,QAAQ,iDAAiD,CACzE,CAAC;iBACL;YACH,CAAC,CAAA,CAAC,CACH,CAAC;SACH;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAClB;IACH,CAAC;CAAA;AAzBD,sDAyBC"}
|
|
@@ -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;AAOlG,eAAO,MAAM,OAAO,qBACA,iBAAiB,OAC9B,iCAAiC,KACrC,QAAQ,MAAM,iBAAiB,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,CAiGlC,CAAC"}
|
|
@@ -8,7 +8,7 @@ const lib_1 = require("../src/lib");
|
|
|
8
8
|
const ZERO_ETH_INPUT = 0;
|
|
9
9
|
const xdeploy = (deploymentParams, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
10
10
|
const { contract, constructorArgs } = deploymentParams;
|
|
11
|
-
console.log(`Deployment of ${contract} through xdeployer starting now
|
|
11
|
+
console.log(`Deployment of ${contract} through xdeployer starting now, with ${new hre.ethers.Wallet(hre.config.xdeploy.signer).address}`);
|
|
12
12
|
yield hre.run('compile');
|
|
13
13
|
if (!hre.config.xdeploy.networks) {
|
|
14
14
|
throw new Error('Bad network configuration');
|
|
@@ -29,6 +29,7 @@ const xdeploy = (deploymentParams, hre) => (0, tslib_1.__awaiter)(void 0, void 0
|
|
|
29
29
|
initcode = yield Contract.getDeployTransaction();
|
|
30
30
|
}
|
|
31
31
|
for (const network of hre.config.xdeploy.networks) {
|
|
32
|
+
console.log(`... on ${network}`);
|
|
32
33
|
let provider;
|
|
33
34
|
if (network === 'celo') {
|
|
34
35
|
provider = new ethers_1.ethers.providers.JsonRpcProvider('https://forno.celo.org');
|
|
@@ -63,7 +64,7 @@ const xdeploy = (deploymentParams, hre) => (0, tslib_1.__awaiter)(void 0, void 0
|
|
|
63
64
|
}
|
|
64
65
|
result.push({
|
|
65
66
|
network,
|
|
66
|
-
contract
|
|
67
|
+
contract,
|
|
67
68
|
address: computedContractAddress,
|
|
68
69
|
receipt,
|
|
69
70
|
deployed,
|