@requestnetwork/smart-contracts 0.29.1-next.1857 → 0.29.1-next.1860
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/hardhat.config.d.ts.map +1 -1
- package/dist/hardhat.config.js +13 -1
- package/dist/hardhat.config.js.map +1 -1
- package/dist/scripts/conversion-proxy.d.ts +1 -0
- package/dist/scripts/conversion-proxy.d.ts.map +1 -1
- package/dist/scripts/conversion-proxy.js +1 -0
- package/dist/scripts/conversion-proxy.js.map +1 -1
- package/dist/scripts/test-deploy-main-payments.js +1 -1
- package/dist/scripts/test-deploy-main-payments.js.map +1 -1
- package/dist/scripts/test-deploy_chainlink_contract.js +2 -2
- package/dist/scripts/test-deploy_chainlink_contract.js.map +1 -1
- package/dist/scripts/utils.d.ts.map +1 -1
- package/dist/scripts/utils.js +1 -0
- package/dist/scripts/utils.js.map +1 -1
- package/dist/scripts-create2/constructor-args.d.ts.map +1 -1
- package/dist/scripts-create2/constructor-args.js +8 -4
- package/dist/scripts-create2/constructor-args.js.map +1 -1
- package/dist/scripts-create2/contract-setup/adminTasks.d.ts +7 -0
- package/dist/scripts-create2/contract-setup/adminTasks.d.ts.map +1 -1
- package/dist/scripts-create2/contract-setup/adminTasks.js +24 -11
- package/dist/scripts-create2/contract-setup/adminTasks.js.map +1 -1
- package/dist/scripts-create2/contract-setup/index.d.ts +5 -0
- package/dist/scripts-create2/contract-setup/index.d.ts.map +1 -1
- package/dist/scripts-create2/contract-setup/index.js +11 -1
- package/dist/scripts-create2/contract-setup/index.js.map +1 -1
- package/dist/scripts-create2/contract-setup/setupChainlinkConversionPath.d.ts +8 -0
- package/dist/scripts-create2/contract-setup/setupChainlinkConversionPath.d.ts.map +1 -0
- package/dist/scripts-create2/contract-setup/setupChainlinkConversionPath.js +36 -0
- package/dist/scripts-create2/contract-setup/setupChainlinkConversionPath.js.map +1 -0
- package/dist/scripts-create2/contract-setup/setupERC20SwapToPay.d.ts +8 -0
- package/dist/scripts-create2/contract-setup/setupERC20SwapToPay.d.ts.map +1 -0
- package/dist/scripts-create2/contract-setup/setupERC20SwapToPay.js +30 -0
- package/dist/scripts-create2/contract-setup/setupERC20SwapToPay.js.map +1 -0
- package/dist/scripts-create2/contract-setup/setupETHConversionProxy.d.ts.map +1 -1
- package/dist/scripts-create2/contract-setup/setupETHConversionProxy.js +8 -0
- package/dist/scripts-create2/contract-setup/setupETHConversionProxy.js.map +1 -1
- package/dist/scripts-create2/deploy.d.ts.map +1 -1
- package/dist/scripts-create2/deploy.js +15 -8
- package/dist/scripts-create2/deploy.js.map +1 -1
- package/dist/scripts-create2/utils.js +6 -6
- package/dist/scripts-create2/utils.js.map +1 -1
- package/dist/scripts-create2/verify.d.ts.map +1 -1
- package/dist/scripts-create2/verify.js +2 -0
- package/dist/scripts-create2/verify.js.map +1 -1
- package/dist/scripts-create2/xdeployer.d.ts.map +1 -1
- package/dist/scripts-create2/xdeployer.js +3 -9
- package/dist/scripts-create2/xdeployer.js.map +1 -1
- package/dist/src/lib/artifacts/ERC20SwapToPay/0.2.0.json +208 -0
- package/dist/src/lib/artifacts/ERC20SwapToPay/index.d.ts.map +1 -1
- package/dist/src/lib/artifacts/ERC20SwapToPay/index.js +58 -13
- package/dist/src/lib/artifacts/ERC20SwapToPay/index.js.map +1 -1
- package/dist/src/types/ChainlinkConversionPath.d.ts +34 -0
- package/dist/src/types/ERC20SwapToPay.d.ts +57 -46
- package/dist/src/types/EthConversionProxy.d.ts +34 -0
- package/dist/src/types/factories/BatchConversionPayments__factory.d.ts +1 -1
- package/dist/src/types/factories/BatchConversionPayments__factory.js +1 -1
- package/dist/src/types/factories/BatchNoConversionPayments__factory.d.ts +1 -1
- package/dist/src/types/factories/BatchNoConversionPayments__factory.js +1 -1
- package/dist/src/types/factories/ChainlinkConversionPath__factory.d.ts +3 -3
- package/dist/src/types/factories/ChainlinkConversionPath__factory.d.ts.map +1 -1
- package/dist/src/types/factories/ChainlinkConversionPath__factory.js +23 -5
- package/dist/src/types/factories/ChainlinkConversionPath__factory.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/ERC20SwapToPay__factory.d.ts +3 -3
- package/dist/src/types/factories/ERC20SwapToPay__factory.d.ts.map +1 -1
- package/dist/src/types/factories/ERC20SwapToPay__factory.js +36 -26
- package/dist/src/types/factories/ERC20SwapToPay__factory.js.map +1 -1
- package/dist/src/types/factories/Erc20ConversionProxy__factory.d.ts +1 -1
- package/dist/src/types/factories/Erc20ConversionProxy__factory.js +1 -1
- package/dist/src/types/factories/EthConversionProxy__factory.d.ts +3 -3
- package/dist/src/types/factories/EthConversionProxy__factory.d.ts.map +1 -1
- package/dist/src/types/factories/EthConversionProxy__factory.js +23 -5
- package/dist/src/types/factories/EthConversionProxy__factory.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +5 -5
- package/types/ChainlinkConversionPath.d.ts +34 -0
- package/types/ERC20SwapToPay.d.ts +57 -46
- package/types/EthConversionProxy.d.ts +34 -0
- package/types/factories/BatchConversionPayments__factory.d.ts +1 -1
- package/types/factories/BatchConversionPayments__factory.js +1 -1
- package/types/factories/BatchNoConversionPayments__factory.d.ts +1 -1
- package/types/factories/BatchNoConversionPayments__factory.js +1 -1
- package/types/factories/ChainlinkConversionPath__factory.d.ts +3 -3
- package/types/factories/ChainlinkConversionPath__factory.d.ts.map +1 -1
- package/types/factories/ChainlinkConversionPath__factory.js +23 -5
- package/types/factories/ChainlinkConversionPath__factory.js.map +1 -1
- package/types/factories/ERC20SwapToConversion__factory.d.ts +1 -1
- package/types/factories/ERC20SwapToConversion__factory.js +1 -1
- package/types/factories/ERC20SwapToPay__factory.d.ts +3 -3
- package/types/factories/ERC20SwapToPay__factory.d.ts.map +1 -1
- package/types/factories/ERC20SwapToPay__factory.js +36 -26
- package/types/factories/ERC20SwapToPay__factory.js.map +1 -1
- package/types/factories/Erc20ConversionProxy__factory.d.ts +1 -1
- package/types/factories/Erc20ConversionProxy__factory.js +1 -1
- package/types/factories/EthConversionProxy__factory.d.ts +3 -3
- package/types/factories/EthConversionProxy__factory.d.ts.map +1 -1
- package/types/factories/EthConversionProxy__factory.js +23 -5
- package/types/factories/EthConversionProxy__factory.js.map +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hardhat.config.d.ts","sourceRoot":"","sources":["../hardhat.config.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,CAAC;AAC5B,OAAO,2BAA2B,CAAC;AACnC,OAAO,4BAA4B,CAAC;AACpC,OAAO,8BAA8B,CAAC;AACtC,OAAO,2BAA2B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6CnC,
|
|
1
|
+
{"version":3,"file":"hardhat.config.d.ts","sourceRoot":"","sources":["../hardhat.config.ts"],"names":[],"mappings":"AAAA,OAAO,oBAAoB,CAAC;AAC5B,OAAO,2BAA2B,CAAC;AACnC,OAAO,4BAA4B,CAAC;AACpC,OAAO,8BAA8B,CAAC;AACtC,OAAO,2BAA2B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6CnC,wBAkKE"}
|
package/dist/hardhat.config.js
CHANGED
|
@@ -185,7 +185,19 @@ exports.default = {
|
|
|
185
185
|
signer: process.env.ADMIN_PRIVATE_KEY,
|
|
186
186
|
networks: process.env.NETWORK
|
|
187
187
|
? [process.env.NETWORK]
|
|
188
|
-
: [
|
|
188
|
+
: [
|
|
189
|
+
'mainnet',
|
|
190
|
+
'matic',
|
|
191
|
+
'bsc',
|
|
192
|
+
'celo',
|
|
193
|
+
'xdai',
|
|
194
|
+
'fuse',
|
|
195
|
+
'arbitrum-one',
|
|
196
|
+
'fantom',
|
|
197
|
+
'avalanche',
|
|
198
|
+
'optimism',
|
|
199
|
+
'moonbeam',
|
|
200
|
+
],
|
|
189
201
|
gasLimit: undefined,
|
|
190
202
|
deployerAddress: requestDeployer,
|
|
191
203
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hardhat.config.js","sourceRoot":"","sources":["../hardhat.config.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"hardhat.config.js","sourceRoot":"","sources":["../hardhat.config.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ export declare function deployERC20ConversionProxy(args: {
|
|
|
8
8
|
export declare function deployEthConversionProxy(args: {
|
|
9
9
|
chainlinkConversionPathAddress?: string;
|
|
10
10
|
ethFeeProxyAddress?: string;
|
|
11
|
+
owner: string;
|
|
11
12
|
nonceCondition?: number;
|
|
12
13
|
version?: string;
|
|
13
14
|
}, hre: HardhatRuntimeEnvironment): Promise<import("./deploy-one").DeploymentResult<import("ethers").Contract> | undefined>;
|
|
@@ -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,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,
|
|
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,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,EACD,GAAG,EAAE,yBAAyB,2FAyC/B"}
|
|
@@ -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;;;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,
|
|
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,IAMC,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;gBACf,IAAI,CAAC,KAAK;aACX;YACD,QAAQ,EAAE,2BAAqB;YAC/B,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC,CAAC;;CACJ;AAjDD,4DAiDC"}
|
|
@@ -49,7 +49,7 @@ function deploy(args, hre) {
|
|
|
49
49
|
yield testERC20Instance.transfer(FakeSwapRouterAddress, '10000000000000000000000000000');
|
|
50
50
|
// SwapToPay
|
|
51
51
|
const { address: ERC20SwapToPayAddress } = yield (0, deploy_one_1.deployOne)(args, hre, 'ERC20SwapToPay', {
|
|
52
|
-
constructorArguments: [FakeSwapRouterAddress,
|
|
52
|
+
constructorArguments: [FakeSwapRouterAddress, deployer.address],
|
|
53
53
|
});
|
|
54
54
|
// FIXME SwapToPay deployed without approbation for router and proxy
|
|
55
55
|
console.log('SwapToPay Contract deployed: ' + ERC20SwapToPayAddress);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-deploy-main-payments.js","sourceRoot":"","sources":["../../scripts/test-deploy-main-payments.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"test-deploy-main-payments.js","sourceRoot":"","sources":["../../scripts/test-deploy-main-payments.ts"],"names":[],"mappings":";;;AAAA,qCAAmC;AAEnC,sDAAkD;AAElD,gCAAgC;AAChC,SAA8B,MAAM,CAAC,IAAS,EAAE,GAA8B;;QAC5E,IAAI;YACF,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YAEjD,OAAO,CAAC,GAAG,CACT,+BAA+B,QAAQ,CAAC,OAAO,mBAAmB,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,GAAG,CACrH,CAAC;YAEF,MAAM,YAAY,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;YAEtE,4BAA4B;YAC5B,MAAM,iBAAiB,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,iCAAiC,CAAC,CAAC;YAEvF,8BAA8B;YAC9B,MAAM,yBAAyB,GAAG,MAAM,CACtC,MAAM,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAClD,CAAC,MAAM,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,CAAC,gCAAgC,GAAG,yBAAyB,CAAC,OAAO,CAAC,CAAC;YAElF,sCAAsC;YACtC,MAAM,iBAAiB,CAAC,OAAO,CAAC,yBAAyB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YACxE,MAAM,yBAAyB,CAAC,yBAAyB,CACvD,iBAAiB,CAAC,OAAO,EACzB,4CAA4C,EAC5C,GAAG,EACH,oBAAoB,CACrB,CAAC;YACF,MAAM,yBAAyB,CAAC,yBAAyB,CACvD,iBAAiB,CAAC,OAAO,EACzB,4CAA4C,EAC5C,EAAE,EACF,oBAAoB,CACrB,CAAC;YAEF,4BAA4B;YAC5B,MAAM,EAAE,OAAO,EAAE,oBAAoB,EAAE,GAAG,MAAM,IAAA,sBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,eAAe,CAAC,CAAC;YACtF,OAAO,CAAC,GAAG,CAAC,mCAAmC,GAAG,oBAAoB,CAAC,CAAC;YAExE,kCAAkC;YAClC,MAAM,EAAE,OAAO,EAAE,oBAAoB,EAAE,GAAG,MAAM,IAAA,sBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,eAAe,CAAC,CAAC;YACtF,OAAO,CAAC,GAAG,CAAC,mCAAmC,GAAG,oBAAoB,CAAC,CAAC;YAExE,+BAA+B;YAC/B,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,MAAM,IAAA,sBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,UAAU,EAAE;gBAC1E,oBAAoB,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;aACnD,CAAC,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,8BAA8B,GAAG,eAAe,CAAC,CAAC;YAE9D,8BAA8B;YAC9B,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,GAAG,MAAM,IAAA,sBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;YAC9E,OAAO,CAAC,GAAG,CAAC,+BAA+B,GAAG,gBAAgB,CAAC,CAAC;YAEhE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,GAAG,MAAM,IAAA,sBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;YAChF,OAAO,CAAC,GAAG,CAAC,gCAAgC,GAAG,iBAAiB,CAAC,CAAC;YAElE,MAAM,EAAE,OAAO,EAAE,oBAAoB,EAAE,GAAG,MAAM,IAAA,sBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,eAAe,CAAC,CAAC;YACtF,OAAO,CAAC,GAAG,CAAC,mCAAmC,GAAG,oBAAoB,CAAC,CAAC;YAExE,MAAM,WAAW,GAAG,MAAM,CACxB,MAAM,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,aAAa,EAAE,QAAQ,CAAC,CAC7D,CAAC,MAAM,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,CAAC,iCAAiC,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;YAErE,gCAAgC;YAChC,uBAAuB;YACvB,MAAM,kBAAkB,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,uCAAuC,CAAC,CAAC;YAC9F,qBAAqB;YACrB,MAAM,EAAE,OAAO,EAAE,qBAAqB,EAAE,GAAG,MAAM,IAAA,sBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAC;YACxF,oBAAoB;YACpB,MAAM,kBAAkB,CAAC,QAAQ,CAAC,qBAAqB,EAAE,+BAA+B,CAAC,CAAC;YAC1F,MAAM,iBAAiB,CAAC,QAAQ,CAAC,qBAAqB,EAAE,+BAA+B,CAAC,CAAC;YACzF,YAAY;YACZ,MAAM,EAAE,OAAO,EAAE,qBAAqB,EAAE,GAAG,MAAM,IAAA,sBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,gBAAgB,EAAE;gBACtF,oBAAoB,EAAE,CAAC,qBAAqB,EAAE,QAAQ,CAAC,OAAO,CAAC;aAChE,CAAC,CAAC;YACH,oEAAoE;YACpE,OAAO,CAAC,GAAG,CAAC,+BAA+B,GAAG,qBAAqB,CAAC,CAAC;YACrE,gEAAgE;YAChE,MAAM,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YAExD,gCAAgC;YAChC,MAAM,EAAE,OAAO,EAAE,uBAAuB,EAAE,GAAG,MAAM,IAAA,sBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,kBAAkB,CAAC,CAAC;YAC5F,OAAO,CAAC,GAAG,CAAC,sCAAsC,GAAG,uBAAuB,CAAC,CAAC;YAE9E,qCAAqC;YACrC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;YAClC,OAAO,CAAC,GAAG,CAAC;kCACkB,iBAAiB,CAAC,OAAO;kCACzB,yBAAyB,CAAC,OAAO;kCACjC,oBAAoB;kCACpB,uBAAuB;kCACvB,oBAAoB;kCACpB,eAAe;kCACf,gBAAgB;kCAChB,iBAAiB;kCACjB,oBAAoB;kCACpB,WAAW,CAAC,OAAO;kCACnB,kBAAkB,CAAC,OAAO;kCAC1B,qBAAqB;kCACrB,qBAAqB;KAClD,CAAC,CAAC;YACH,OAAO;gBACL,UAAU,EAAE,kBAAkB,CAAC,OAAO;gBACtC,oBAAoB,EAAE,oBAAoB;gBAC1C,gBAAgB,EAAE,iBAAiB,CAAC,OAAO;gBAC3C,kBAAkB,EAAE,uBAAuB;aAC5C,CAAC;SACH;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAClB;IACH,CAAC;CAAA;AA9GD,yBA8GC"}
|
|
@@ -39,7 +39,7 @@ function deploy(args, hre, mainPaymentAddresses) {
|
|
|
39
39
|
const DAI_address = mainPaymentAddresses.DAIAddress;
|
|
40
40
|
const USDT_address = USDT_fake_address;
|
|
41
41
|
console.log(`USDT address: ${USDT_address}`);
|
|
42
|
-
const conversionPathInstance = yield (yield hre.ethers.getContractFactory('ChainlinkConversionPath', deployer)).deploy(ETH_hash);
|
|
42
|
+
const conversionPathInstance = yield (yield hre.ethers.getContractFactory('ChainlinkConversionPath', deployer)).deploy(ETH_hash, deployer.address);
|
|
43
43
|
// all these aggregators are for test purposes
|
|
44
44
|
yield conversionPathInstance.updateAggregatorsList([DAI_address, EUR_hash, ETH_hash, USDT_address], [USD_hash, USD_hash, USD_hash, ETH_hash], [AggDAI_USD_address, AggEUR_USD_address, AggETH_USD_address, AggUSDT_ETH_address]);
|
|
45
45
|
console.log('AggregatorsList updated.');
|
|
@@ -63,7 +63,7 @@ function deploy(args, hre, mainPaymentAddresses) {
|
|
|
63
63
|
yield erc20SwapConversion.approvePaymentProxyToSpend(mainPaymentAddresses.DAIAddress, ERC20Conversion.address);
|
|
64
64
|
yield erc20SwapConversion.approveRouterToSpend(mainPaymentAddresses.ERC20TestAddress);
|
|
65
65
|
// EthConversion
|
|
66
|
-
const ethConversionProxyAddress = (_b = (_a = (yield (0, conversion_proxy_1.deployEthConversionProxy)(Object.assign(Object.assign({}, args), { chainlinkConversionPathAddress: conversionPathInstance.address, ethFeeProxyAddress: mainPaymentAddresses.ETHFeeProxyAddress,
|
|
66
|
+
const ethConversionProxyAddress = (_b = (_a = (yield (0, conversion_proxy_1.deployEthConversionProxy)(Object.assign(Object.assign({}, args), { chainlinkConversionPathAddress: conversionPathInstance.address, ethFeeProxyAddress: mainPaymentAddresses.ETHFeeProxyAddress, owner: deployer.address }), hre))) === null || _a === void 0 ? void 0 : _a.address) !== null && _b !== void 0 ? _b : '(missing)';
|
|
67
67
|
// ----------------------------------
|
|
68
68
|
console.log('Contracts deployed');
|
|
69
69
|
console.log(`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-deploy_chainlink_contract.js","sourceRoot":"","sources":["../../scripts/test-deploy_chainlink_contract.ts"],"names":[],"mappings":";;;;AAAA,qCAAmC;AACnC,uDAA2D;AAE3D,yDAA0F;AAC1F,yEAAkE;AAClE,6CAAyC;AACzC,mCAAmC;AAEtB,QAAA,cAAc,GAAG,SAAW,CAAC;AAC7B,QAAA,YAAY,GAAG,kBAAS,CAAC,IAAI,CAAC,GAAG,GAAG,sBAAc,CAAC,CAAC;AACpD,QAAA,YAAY,GAAG,kBAAS,CAAC,IAAI,CAAC,GAAG,GAAG,sBAAc,CAAC,CAAC;AACpD,QAAA,YAAY,GAAG,kBAAS,CAAC,IAAI,CAAC,IAAI,GAAG,sBAAc,CAAC,CAAC;AACrD,QAAA,aAAa,GAAG,kBAAS,CAAC,IAAI,CAAC,KAAK,GAAG,mBAAyB,CAAC,CAAC;AAE/E,SAA8B,MAAM,CAClC,IAAS,EACT,GAA8B,EAC9B,oBAAyB;;;QAEzB,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QACjD,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,GAAG,MAAM,IAAA,sBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,gBAAgB,EAAE;YACnF,oBAAoB,EAAE,CAAC,oBAAY,EAAE,CAAC,EAAE,EAAE,CAAC;SAC5C,CAAC,CAAC;QACH,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,GAAG,MAAM,IAAA,sBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,gBAAgB,EAAE;YACnF,oBAAoB,EAAE,CAAC,oBAAY,EAAE,CAAC,EAAE,EAAE,CAAC;SAC5C,CAAC,CAAC;QACH,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,GAAG,MAAM,IAAA,sBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,gBAAgB,EAAE;YACnF,oBAAoB,EAAE,CAAC,oBAAY,EAAE,CAAC,EAAE,EAAE,CAAC;SAC5C,CAAC,CAAC;QACH,MAAM,EAAE,OAAO,EAAE,mBAAmB,EAAE,GAAG,MAAM,IAAA,sBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,gBAAgB,EAAE;YACpF,oBAAoB,EAAE,CAAC,qBAAa,EAAE,EAAE,EAAE,EAAE,CAAC;SAC9C,CAAC,CAAC;QACH,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,GAAG,MAAM,IAAA,sBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;QAE9E,MAAM,eAAe,GAAG,0BAAe,CAAC,UAAU,EAAE,CAAC;QACrD,4CAA4C;QAC5C,MAAM,QAAQ,GAAG,eAAe,CAAC,UAAU,CAAC,KAAK,CAAE,CAAC,IAAI,CAAC;QACzD,MAAM,QAAQ,GAAG,eAAe,CAAC,UAAU,CAAC,KAAK,CAAE,CAAC,IAAI,CAAC;QACzD,MAAM,QAAQ,GAAG,eAAe,CAAC,UAAU,CAAC,KAAK,CAAE,CAAC,IAAI,CAAC;QAEzD,kCAAkC;QAClC,MAAM,WAAW,GAAG,oBAAoB,CAAC,UAAU,CAAC;QAEpD,MAAM,YAAY,GAAG,iBAAiB,CAAC;QAEvC,OAAO,CAAC,GAAG,CAAC,iBAAiB,YAAY,EAAE,CAAC,CAAC;QAE7C,MAAM,sBAAsB,GAAG,MAAM,CACnC,MAAM,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,yBAAyB,EAAE,QAAQ,CAAC,CACzE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"test-deploy_chainlink_contract.js","sourceRoot":"","sources":["../../scripts/test-deploy_chainlink_contract.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,
|
|
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,CAuB3D,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,SAAgB,GAAG,OAAO,yBAAyB,SAAS,MAAM,kBAezF,CAAC;AAEF,mFAAmF;AACnF,eAAO,IAAI,aAAa,QAAI,CAAC;AAE7B;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,gBACnB,MAAM,mBACF,MAAM,2BACE,MAAM,KAC9B,IAMF,CAAC"}
|
package/dist/scripts/utils.js
CHANGED
|
@@ -10,6 +10,7 @@ exports.uniswapV2RouterAddresses = {
|
|
|
10
10
|
mainnet: '0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D',
|
|
11
11
|
ropsten: '0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D',
|
|
12
12
|
rinkeby: '0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D',
|
|
13
|
+
goerli: '0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D',
|
|
13
14
|
kovan: '0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D',
|
|
14
15
|
private: '0x4E72770760c011647D4873f60A3CF6cDeA896CD8',
|
|
15
16
|
bsctest: '0x10ED43C718714eb63d5aA57B78B54704E256024E',
|
|
@@ -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,GAAG,EAAE,4CAA4C;IACjD,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;IACvD,mBAAmB;IACnB,QAAQ,EAAE,4CAA4C;IACtD,QAAQ,EAAE,4CAA4C;CACvD,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;AAEF,mFAAmF;AACxE,QAAA,aAAa,GAAG,CAAC,CAAC;AAE7B;;;;;GAKG;AACI,MAAM,qBAAqB,GAAG,CACnC,WAAmB,EACnB,eAAuB,EACvB,uBAA+B,EACzB,EAAE;IACR,IAAI,eAAe,KAAK,uBAAuB,EAAE;QAC/C,qBAAa,IAAI,CAAC,CAAC;QACnB,MAAM,GAAG,GAAG,GAAG,WAAW,gBAAgB,eAAe,wCAAwC,uBAAuB,2CAA2C,CAAC;QACpK,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;KAClB;AACH,CAAC,CAAC;AAVW,QAAA,qBAAqB,yBAUhC"}
|
|
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,MAAM,EAAE,4CAA4C;IACpD,KAAK,EAAE,4CAA4C;IACnD,OAAO,EAAE,4CAA4C;IACrD,OAAO,EAAE,4CAA4C;IACrD,GAAG,EAAE,4CAA4C;IACjD,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;IACvD,mBAAmB;IACnB,QAAQ,EAAE,4CAA4C;IACtD,QAAQ,EAAE,4CAA4C;CACvD,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;AAEF,mFAAmF;AACxE,QAAA,aAAa,GAAG,CAAC,CAAC;AAE7B;;;;;GAKG;AACI,MAAM,qBAAqB,GAAG,CACnC,WAAmB,EACnB,eAAuB,EACvB,uBAA+B,EACzB,EAAE;IACR,IAAI,eAAe,KAAK,uBAAuB,EAAE;QAC/C,qBAAa,IAAI,CAAC,CAAC;QACnB,MAAM,GAAG,GAAG,GAAG,WAAW,gBAAgB,eAAe,wCAAwC,uBAAuB,2CAA2C,CAAC;QACpK,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;KAClB;AACH,CAAC,CAAC;AAVW,QAAA,qBAAqB,yBAUhC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constructor-args.d.ts","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,kBAAkB,aAAc,MAAM,mCAAqB,MAAM,
|
|
1
|
+
{"version":3,"file":"constructor-args.d.ts","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,kBAAkB,aAAc,MAAM,mCAAqB,MAAM,EAsD7E,CAAC"}
|
|
@@ -10,6 +10,9 @@ const getAdminWalletAddress = (contract) => {
|
|
|
10
10
|
};
|
|
11
11
|
const getConstructorArgs = (contract, network) => {
|
|
12
12
|
switch (contract) {
|
|
13
|
+
case 'ChainlinkConversionPath': {
|
|
14
|
+
return ['0x0000000000000000000000000000000000000000', getAdminWalletAddress(contract)];
|
|
15
|
+
}
|
|
13
16
|
case 'Erc20ConversionProxy': {
|
|
14
17
|
return [
|
|
15
18
|
'0x0000000000000000000000000000000000000000',
|
|
@@ -21,12 +24,13 @@ const getConstructorArgs = (contract, network) => {
|
|
|
21
24
|
return [
|
|
22
25
|
'0x0000000000000000000000000000000000000000',
|
|
23
26
|
'0x0000000000000000000000000000000000000000',
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
// These functions needs to be implemented in the contract before it can deployed using xdeployer
|
|
27
|
-
'0x39e19aa5b69466dfdc313c7cda37cb2a599015cd',
|
|
27
|
+
'0x0000000000000000000000000000000000000000',
|
|
28
|
+
getAdminWalletAddress(contract),
|
|
28
29
|
];
|
|
29
30
|
}
|
|
31
|
+
case 'ERC20SwapToPay': {
|
|
32
|
+
return ['0x0000000000000000000000000000000000000000', getAdminWalletAddress(contract)];
|
|
33
|
+
}
|
|
30
34
|
case 'ERC20SwapToConversion': {
|
|
31
35
|
return [getAdminWalletAddress(contract)];
|
|
32
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constructor-args.js","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":";;;AAAA,wCAAwC;AAExC,MAAM,qBAAqB,GAAG,CAAC,QAAgB,EAAU,EAAE;IACzD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE;QACrC,MAAM,IAAI,KAAK,CAAC,6DAA6D,QAAQ,EAAE,CAAC,CAAC;KAC1F;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;AAC1C,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAG,CAAC,QAAgB,EAAE,OAAgB,EAAY,EAAE;IACjF,QAAQ,QAAQ,EAAE;QAChB,KAAK,sBAAsB,CAAC,CAAC;YAC3B,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,qBAAqB,CAAC,QAAQ,CAAC;aAChC,CAAC;SACH;QACD,KAAK,oBAAoB,CAAC,CAAC;YACzB,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,
|
|
1
|
+
{"version":3,"file":"constructor-args.js","sourceRoot":"","sources":["../../scripts-create2/constructor-args.ts"],"names":[],"mappings":";;;AAAA,wCAAwC;AAExC,MAAM,qBAAqB,GAAG,CAAC,QAAgB,EAAU,EAAE;IACzD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE;QACrC,MAAM,IAAI,KAAK,CAAC,6DAA6D,QAAQ,EAAE,CAAC,CAAC;KAC1F;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;AAC1C,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAG,CAAC,QAAgB,EAAE,OAAgB,EAAY,EAAE;IACjF,QAAQ,QAAQ,EAAE;QAChB,KAAK,yBAAyB,CAAC,CAAC;YAC9B,OAAO,CAAC,4CAA4C,EAAE,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;SACxF;QACD,KAAK,sBAAsB,CAAC,CAAC;YAC3B,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,qBAAqB,CAAC,QAAQ,CAAC;aAChC,CAAC;SACH;QACD,KAAK,oBAAoB,CAAC,CAAC;YACzB,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,4CAA4C;gBAC5C,qBAAqB,CAAC,QAAQ,CAAC;aAChC,CAAC;SACH;QACD,KAAK,gBAAgB,CAAC,CAAC;YACrB,OAAO,CAAC,4CAA4C,EAAE,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;SACxF;QACD,KAAK,uBAAuB,CAAC,CAAC;YAC5B,OAAO,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;SAC1C;QACD,KAAK,kBAAkB,CAAC,CAAC;YACvB,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,IAAI,KAAK,CACb,oFAAoF,CACrF,CAAC;aACH;YACD,MAAM,aAAa,GAAG,SAAS,CAAC,qBAAqB,CAAC;YACtD,MAAM,oBAAoB,GAAG,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC/D,OAAO,CAAC,oBAAoB,EAAE,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;SAChE;QACD,KAAK,yBAAyB,CAAC,CAAC;YAC9B,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,IAAI,KAAK,CACb,kMAAkM,CACnM,CAAC;aACH;YACD,OAAO;gBACL,4CAA4C;gBAC5C,4CAA4C;gBAC5C,4CAA4C;gBAC5C,4CAA4C;gBAC5C,4CAA4C;gBAC5C,qBAAqB,CAAC,QAAQ,CAAC;aAChC,CAAC;SACH;QACD;YACE,OAAO,EAAE,CAAC;KACb;AACH,CAAC,CAAC;AAtDW,QAAA,kBAAkB,sBAsD7B"}
|
|
@@ -50,6 +50,13 @@ export declare const updateBatchConversionProxy: (contract: any, network: string
|
|
|
50
50
|
* @param txOverrides information related to gas fees. Increase their values if needed.
|
|
51
51
|
*/
|
|
52
52
|
export declare const updateNativeAndUSDAddress: (contract: any, NativeAddress: string, USDAddress: string, txOverrides: Overrides) => Promise<void>;
|
|
53
|
+
/**
|
|
54
|
+
* Update the native token hash used by a contract.
|
|
55
|
+
* @param contract contract to be updated.
|
|
56
|
+
* @param nativeTokenHash The address of native token, eg: ETH.
|
|
57
|
+
* @param txOverrides information related to gas fees. Increase their values if needed.
|
|
58
|
+
*/
|
|
59
|
+
export declare const updateNativeTokenHash: (contractType: string, contract: any, nativeTokenHash: string, txOverrides: Overrides) => Promise<void>;
|
|
53
60
|
/**
|
|
54
61
|
* Gets the signer and gas fees information.
|
|
55
62
|
* @param network The network used.
|
|
@@ -1 +1 @@
|
|
|
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;AACtD,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,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;AACtD,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAU7D,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,CAQd,CAAC;AAEF,eAAO,MAAM,qBAAqB,aACtB,GAAG,eACA,SAAS,KACrB,QAAQ,IAAI,CASd,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;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,iBAClB,MAAM,YACV,GAAG,mBACI,MAAM,eACV,SAAS,KACrB,QAAQ,IAAI,CASd,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;EAkBF,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
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;
|
|
3
|
+
exports.getSignerAndGasFees = exports.updateNativeTokenHash = 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");
|
|
@@ -34,9 +34,11 @@ const updateChainlinkConversionPath = (contract, network, txOverrides, version)
|
|
|
34
34
|
exports.updateChainlinkConversionPath = updateChainlinkConversionPath;
|
|
35
35
|
const updateSwapRouter = (contract, network, txOverrides) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
36
36
|
const currentSwapRouter = yield contract.swapRouter();
|
|
37
|
-
|
|
38
|
-
|
|
37
|
+
const expectedRouter = utils_1.uniswapV2RouterAddresses[network];
|
|
38
|
+
if (expectedRouter && currentSwapRouter !== expectedRouter) {
|
|
39
|
+
const tx = yield contract.setRouter(expectedRouter, txOverrides);
|
|
39
40
|
yield tx.wait(1);
|
|
41
|
+
console.log(`Swap router address set to ${expectedRouter}`);
|
|
40
42
|
}
|
|
41
43
|
});
|
|
42
44
|
exports.updateSwapRouter = updateSwapRouter;
|
|
@@ -45,7 +47,7 @@ const updateRequestSwapFees = (contract, txOverrides) => (0, tslib_1.__awaiter)(
|
|
|
45
47
|
if (!currentFees.eq(exports.REQUEST_SWAP_FEES)) {
|
|
46
48
|
const tx = yield contract.updateRequestSwapFees(exports.REQUEST_SWAP_FEES, txOverrides);
|
|
47
49
|
yield tx.wait(1);
|
|
48
|
-
console.log(`currentFees: ${currentFees.
|
|
50
|
+
console.log(`currentFees: ${currentFees.toNumber() / 10}%, new fees: ${exports.REQUEST_SWAP_FEES / 10}%`);
|
|
49
51
|
}
|
|
50
52
|
});
|
|
51
53
|
exports.updateRequestSwapFees = updateRequestSwapFees;
|
|
@@ -167,6 +169,21 @@ const updateNativeAndUSDAddress = (contract, NativeAddress, USDAddress, txOverri
|
|
|
167
169
|
}
|
|
168
170
|
});
|
|
169
171
|
exports.updateNativeAndUSDAddress = updateNativeAndUSDAddress;
|
|
172
|
+
/**
|
|
173
|
+
* Update the native token hash used by a contract.
|
|
174
|
+
* @param contract contract to be updated.
|
|
175
|
+
* @param nativeTokenHash The address of native token, eg: ETH.
|
|
176
|
+
* @param txOverrides information related to gas fees. Increase their values if needed.
|
|
177
|
+
*/
|
|
178
|
+
const updateNativeTokenHash = (contractType, contract, nativeTokenHash, txOverrides) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
179
|
+
const currentNativeTokenHash = (yield contract.nativeTokenHash()).toLocaleLowerCase();
|
|
180
|
+
if (currentNativeTokenHash !== nativeTokenHash.toLocaleLowerCase()) {
|
|
181
|
+
const tx = yield contract.updateNativeTokenHash(nativeTokenHash, txOverrides);
|
|
182
|
+
yield tx.wait(1);
|
|
183
|
+
console.log(`${contractType}: the current NativeTokenHash: ${currentNativeTokenHash}, have been replaced by: ${nativeTokenHash}`);
|
|
184
|
+
}
|
|
185
|
+
});
|
|
186
|
+
exports.updateNativeTokenHash = updateNativeTokenHash;
|
|
170
187
|
/**
|
|
171
188
|
* Gets the signer and gas fees information.
|
|
172
189
|
* @param network The network used.
|
|
@@ -184,13 +201,9 @@ const getSignerAndGasFees = (network, hre) => (0, tslib_1.__awaiter)(void 0, voi
|
|
|
184
201
|
provider = (0, utils_3.getDefaultProvider)(network);
|
|
185
202
|
}
|
|
186
203
|
const signer = new hre.ethers.Wallet(hre.config.xdeploy.signer).connect(provider);
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
}
|
|
191
|
-
catch (err) {
|
|
192
|
-
txOverrides = {};
|
|
193
|
-
}
|
|
204
|
+
const txOverrides = (yield (0, utils_3.isEip1559Supported)(provider))
|
|
205
|
+
? yield (0, utils_3.estimateGasFees)({ provider })
|
|
206
|
+
: {};
|
|
194
207
|
return {
|
|
195
208
|
signer,
|
|
196
209
|
txOverrides,
|
|
@@ -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,mCAAsD;AAEtD,4CAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"adminTasks.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/adminTasks.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,7 @@
|
|
|
1
|
+
export { setupChainlinkConversionPath } from './setupChainlinkConversionPath';
|
|
2
|
+
export { setupErc20ConversionProxy } from './setupErc20ConversionProxy';
|
|
3
|
+
export { setupETHConversionProxy } from './setupETHConversionProxy';
|
|
4
|
+
export { setupERC20SwapToPay } from './setupERC20SwapToPay';
|
|
1
5
|
export { setupERC20SwapToConversion } from './setupERC20SwapToConversion';
|
|
6
|
+
export { setupBatchConversionPayments } from './setupBatchConversionPayments';
|
|
2
7
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC"}
|
|
@@ -1,6 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.setupERC20SwapToConversion = void 0;
|
|
3
|
+
exports.setupBatchConversionPayments = exports.setupERC20SwapToConversion = exports.setupERC20SwapToPay = exports.setupETHConversionProxy = exports.setupErc20ConversionProxy = exports.setupChainlinkConversionPath = void 0;
|
|
4
|
+
var setupChainlinkConversionPath_1 = require("./setupChainlinkConversionPath");
|
|
5
|
+
Object.defineProperty(exports, "setupChainlinkConversionPath", { enumerable: true, get: function () { return setupChainlinkConversionPath_1.setupChainlinkConversionPath; } });
|
|
6
|
+
var setupErc20ConversionProxy_1 = require("./setupErc20ConversionProxy");
|
|
7
|
+
Object.defineProperty(exports, "setupErc20ConversionProxy", { enumerable: true, get: function () { return setupErc20ConversionProxy_1.setupErc20ConversionProxy; } });
|
|
8
|
+
var setupETHConversionProxy_1 = require("./setupETHConversionProxy");
|
|
9
|
+
Object.defineProperty(exports, "setupETHConversionProxy", { enumerable: true, get: function () { return setupETHConversionProxy_1.setupETHConversionProxy; } });
|
|
10
|
+
var setupERC20SwapToPay_1 = require("./setupERC20SwapToPay");
|
|
11
|
+
Object.defineProperty(exports, "setupERC20SwapToPay", { enumerable: true, get: function () { return setupERC20SwapToPay_1.setupERC20SwapToPay; } });
|
|
4
12
|
var setupERC20SwapToConversion_1 = require("./setupERC20SwapToConversion");
|
|
5
13
|
Object.defineProperty(exports, "setupERC20SwapToConversion", { enumerable: true, get: function () { return setupERC20SwapToConversion_1.setupERC20SwapToConversion; } });
|
|
14
|
+
var setupBatchConversionPayments_1 = require("./setupBatchConversionPayments");
|
|
15
|
+
Object.defineProperty(exports, "setupBatchConversionPayments", { enumerable: true, get: function () { return setupBatchConversionPayments_1.setupBatchConversionPayments; } });
|
|
6
16
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/index.ts"],"names":[],"mappings":";;;AAAA,2EAA0E;AAAjE,wIAAA,0BAA0B,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/index.ts"],"names":[],"mappings":";;;AAAA,+EAA8E;AAArE,4IAAA,4BAA4B,OAAA;AACrC,yEAAwE;AAA/D,sIAAA,yBAAyB,OAAA;AAClC,qEAAoE;AAA3D,kIAAA,uBAAuB,OAAA;AAChC,6DAA4D;AAAnD,0HAAA,mBAAmB,OAAA;AAC5B,2EAA0E;AAAjE,wIAAA,0BAA0B,OAAA;AACnC,+EAA8E;AAArE,4IAAA,4BAA4B,OAAA"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { HardhatRuntimeEnvironmentExtended } from '../types';
|
|
2
|
+
/**
|
|
3
|
+
* Setup the chainlinkConversionPath values once deployed
|
|
4
|
+
* @param contractAddress address of the ChainlinkConversionPath contract
|
|
5
|
+
* @param hre Hardhat runtime environment
|
|
6
|
+
*/
|
|
7
|
+
export declare const setupChainlinkConversionPath: (contractAddress: string, hre: HardhatRuntimeEnvironmentExtended) => Promise<void>;
|
|
8
|
+
//# sourceMappingURL=setupChainlinkConversionPath.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"setupChainlinkConversionPath.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupChainlinkConversionPath.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAG7D;;;;GAIG;AACH,eAAO,MAAM,4BAA4B,oBACtB,MAAM,OAClB,iCAAiC,KACrC,QAAQ,IAAI,CA+Bd,CAAC"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.setupChainlinkConversionPath = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const currency_1 = require("@requestnetwork/currency");
|
|
6
|
+
const types_1 = require("@requestnetwork/types");
|
|
7
|
+
const lib_1 = require("../../src/lib");
|
|
8
|
+
const adminTasks_1 = require("./adminTasks");
|
|
9
|
+
/**
|
|
10
|
+
* Setup the chainlinkConversionPath values once deployed
|
|
11
|
+
* @param contractAddress address of the ChainlinkConversionPath contract
|
|
12
|
+
* @param hre Hardhat runtime environment
|
|
13
|
+
*/
|
|
14
|
+
const setupChainlinkConversionPath = (contractAddress, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
15
|
+
// Setup contract parameters
|
|
16
|
+
const ChainlinkConversionPathContract = new hre.ethers.Contract(contractAddress, lib_1.chainlinkConversionPath.getContractAbi());
|
|
17
|
+
yield Promise.all(hre.config.xdeploy.networks.map((network) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
18
|
+
var _a;
|
|
19
|
+
try {
|
|
20
|
+
const { signer, txOverrides } = yield (0, adminTasks_1.getSignerAndGasFees)(network, hre);
|
|
21
|
+
const nativeTokenHash = (_a = currency_1.CurrencyManager.getDefault().getNativeCurrency(types_1.RequestLogicTypes.CURRENCY.ETH, network)) === null || _a === void 0 ? void 0 : _a.hash;
|
|
22
|
+
if (!nativeTokenHash) {
|
|
23
|
+
throw new Error(`Could not guess native token hash for network ${network}`);
|
|
24
|
+
}
|
|
25
|
+
const ChainlinkConversionPathConnected = ChainlinkConversionPathContract.connect(signer);
|
|
26
|
+
yield (0, adminTasks_1.updateNativeTokenHash)('ChainlinkConversionPath', ChainlinkConversionPathConnected, nativeTokenHash, txOverrides);
|
|
27
|
+
console.log(`Setup of ChainlinkConversionPath successful on ${network}`);
|
|
28
|
+
}
|
|
29
|
+
catch (err) {
|
|
30
|
+
console.warn(`An error occurred during the setup of ChainlinkConversionPath on ${network}`);
|
|
31
|
+
console.warn(err);
|
|
32
|
+
}
|
|
33
|
+
})));
|
|
34
|
+
});
|
|
35
|
+
exports.setupChainlinkConversionPath = setupChainlinkConversionPath;
|
|
36
|
+
//# sourceMappingURL=setupChainlinkConversionPath.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"setupChainlinkConversionPath.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupChainlinkConversionPath.ts"],"names":[],"mappings":";;;;AAAA,uDAA2D;AAC3D,iDAA0D;AAC1D,uCAAwD;AAExD,6CAA0E;AAE1E;;;;GAIG;AACI,MAAM,4BAA4B,GAAG,CAC1C,eAAuB,EACvB,GAAsC,EACvB,EAAE;IACjB,4BAA4B;IAC5B,MAAM,+BAA+B,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAC7D,eAAe,EACf,6BAAuB,CAAC,cAAc,EAAE,CACzC,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,eAAe,GAAG,MAAA,0BAAe,CAAC,UAAU,EAAE,CAAC,iBAAiB,CACpE,yBAAiB,CAAC,QAAQ,CAAC,GAAG,EAC9B,OAAO,CACR,0CAAE,IAAI,CAAC;YACR,IAAI,CAAC,eAAe,EAAE;gBACpB,MAAM,IAAI,KAAK,CAAC,iDAAiD,OAAO,EAAE,CAAC,CAAC;aAC7E;YACD,MAAM,gCAAgC,GAAG,+BAA+B,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACzF,MAAM,IAAA,kCAAqB,EACzB,yBAAyB,EACzB,gCAAgC,EAChC,eAAe,EACf,WAAW,CACZ,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,kDAAkD,OAAO,EAAE,CAAC,CAAC;SAC1E;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,oEAAoE,OAAO,EAAE,CAAC,CAAC;YAC5F,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB;IACH,CAAC,CAAA,CAAC,CACH,CAAC;AACJ,CAAC,CAAA,CAAC;AAlCW,QAAA,4BAA4B,gCAkCvC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { HardhatRuntimeEnvironmentExtended } from '../types';
|
|
2
|
+
/**
|
|
3
|
+
* Once deployed, setup the values of the ERC20SwapToPay contract
|
|
4
|
+
* @param contractAddress address of the ERC20SwapToPay Proxy
|
|
5
|
+
* @param hre Hardhat runtime environment
|
|
6
|
+
*/
|
|
7
|
+
export declare const setupERC20SwapToPay: (contractAddress: string, hre: HardhatRuntimeEnvironmentExtended) => Promise<void>;
|
|
8
|
+
//# sourceMappingURL=setupERC20SwapToPay.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"setupERC20SwapToPay.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupERC20SwapToPay.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAG7D;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,oBACb,MAAM,OAClB,iCAAiC,KACrC,QAAQ,IAAI,CAqBd,CAAC"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.setupERC20SwapToPay = void 0;
|
|
4
|
+
const tslib_1 = require("tslib");
|
|
5
|
+
const lib_1 = require("../../src/lib");
|
|
6
|
+
const adminTasks_1 = require("./adminTasks");
|
|
7
|
+
/**
|
|
8
|
+
* Once deployed, setup the values of the ERC20SwapToPay contract
|
|
9
|
+
* @param contractAddress address of the ERC20SwapToPay Proxy
|
|
10
|
+
* @param hre Hardhat runtime environment
|
|
11
|
+
*/
|
|
12
|
+
const setupERC20SwapToPay = (contractAddress, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
13
|
+
// Setup contract parameters
|
|
14
|
+
const ERC20SwapToPayContract = new hre.ethers.Contract(contractAddress, lib_1.erc20SwapToPayArtifact.getContractAbi());
|
|
15
|
+
yield Promise.all(hre.config.xdeploy.networks.map((network) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
16
|
+
try {
|
|
17
|
+
const { signer, txOverrides } = yield (0, adminTasks_1.getSignerAndGasFees)(network, hre);
|
|
18
|
+
const ERC20SwapToPayConnected = yield ERC20SwapToPayContract.connect(signer);
|
|
19
|
+
yield (0, adminTasks_1.updateSwapRouter)(ERC20SwapToPayConnected, network, txOverrides);
|
|
20
|
+
yield (0, adminTasks_1.updateRequestSwapFees)(ERC20SwapToPayConnected, txOverrides);
|
|
21
|
+
console.log(`Setup of ERC20SwapToPay successful on ${network}`);
|
|
22
|
+
}
|
|
23
|
+
catch (err) {
|
|
24
|
+
console.warn(`An error occurred during the setup of ERC20SwapToPay on ${network}`);
|
|
25
|
+
console.warn(err);
|
|
26
|
+
}
|
|
27
|
+
})));
|
|
28
|
+
});
|
|
29
|
+
exports.setupERC20SwapToPay = setupERC20SwapToPay;
|
|
30
|
+
//# sourceMappingURL=setupERC20SwapToPay.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"setupERC20SwapToPay.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupERC20SwapToPay.ts"],"names":[],"mappings":";;;;AAAA,uCAAuD;AAEvD,6CAA4F;AAE5F;;;;GAIG;AACI,MAAM,mBAAmB,GAAG,CACjC,eAAuB,EACvB,GAAsC,EACvB,EAAE;IACjB,4BAA4B;IAC5B,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CACpD,eAAe,EACf,4BAAsB,CAAC,cAAc,EAAE,CACxC,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,uBAAuB,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAE7E,MAAM,IAAA,6BAAgB,EAAC,uBAAuB,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;YACtE,MAAM,IAAA,kCAAqB,EAAC,uBAAuB,EAAE,WAAW,CAAC,CAAC;YAClE,OAAO,CAAC,GAAG,CAAC,yCAAyC,OAAO,EAAE,CAAC,CAAC;SACjE;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,IAAI,CAAC,2DAA2D,OAAO,EAAE,CAAC,CAAC;YACnF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACnB;IACH,CAAC,CAAA,CAAC,CACH,CAAC;AACJ,CAAC,CAAA,CAAC;AAxBW,QAAA,mBAAmB,uBAwB9B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupETHConversionProxy.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupETHConversionProxy.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setupETHConversionProxy.d.ts","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupETHConversionProxy.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iCAAiC,EAAE,MAAM,UAAU,CAAC;AAQ7D;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,oBACjB,MAAM,OAClB,iCAAiC,KACrC,QAAQ,IAAI,CAsCd,CAAC"}
|
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.setupETHConversionProxy = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
+
const currency_1 = require("@requestnetwork/currency");
|
|
6
|
+
const types_1 = require("@requestnetwork/types");
|
|
5
7
|
const lib_1 = require("../../src/lib");
|
|
6
8
|
const adminTasks_1 = require("./adminTasks");
|
|
7
9
|
/**
|
|
@@ -13,11 +15,17 @@ const setupETHConversionProxy = (contractAddress, hre) => (0, tslib_1.__awaiter)
|
|
|
13
15
|
// Setup contract parameters
|
|
14
16
|
const EthConversionProxyContract = new hre.ethers.Contract(contractAddress, lib_1.ethConversionArtifact.getContractAbi());
|
|
15
17
|
yield Promise.all(hre.config.xdeploy.networks.map((network) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
18
|
+
var _a;
|
|
16
19
|
try {
|
|
17
20
|
const { signer, txOverrides } = yield (0, adminTasks_1.getSignerAndGasFees)(network, hre);
|
|
21
|
+
const nativeTokenHash = (_a = currency_1.CurrencyManager.getDefault().getNativeCurrency(types_1.RequestLogicTypes.CURRENCY.ETH, network)) === null || _a === void 0 ? void 0 : _a.hash;
|
|
22
|
+
if (!nativeTokenHash) {
|
|
23
|
+
throw new Error(`Could not guess native token hash for network ${network}`);
|
|
24
|
+
}
|
|
18
25
|
const EthConversionProxyConnected = EthConversionProxyContract.connect(signer);
|
|
19
26
|
yield (0, adminTasks_1.updatePaymentFeeProxyAddress)(EthConversionProxyConnected, network, txOverrides, 'native');
|
|
20
27
|
yield (0, adminTasks_1.updateChainlinkConversionPath)(EthConversionProxyConnected, network, txOverrides);
|
|
28
|
+
yield (0, adminTasks_1.updateNativeTokenHash)('EthConversionProxy', EthConversionProxyConnected, nativeTokenHash, txOverrides);
|
|
21
29
|
console.log(`Setup of EthConversionProxy successful on ${network}`);
|
|
22
30
|
}
|
|
23
31
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupETHConversionProxy.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupETHConversionProxy.ts"],"names":[],"mappings":";;;;AAAA,uCAAsD;AAEtD,
|
|
1
|
+
{"version":3,"file":"setupETHConversionProxy.js","sourceRoot":"","sources":["../../../scripts-create2/contract-setup/setupETHConversionProxy.ts"],"names":[],"mappings":";;;;AAAA,uDAA2D;AAC3D,iDAA0D;AAC1D,uCAAsD;AAEtD,6CAKsB;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,eAAe,GAAG,MAAA,0BAAe,CAAC,UAAU,EAAE,CAAC,iBAAiB,CACpE,yBAAiB,CAAC,QAAQ,CAAC,GAAG,EAC9B,OAAO,CACR,0CAAE,IAAI,CAAC;YACR,IAAI,CAAC,eAAe,EAAE;gBACpB,MAAM,IAAI,KAAK,CAAC,iDAAiD,OAAO,EAAE,CAAC,CAAC;aAC7E;YACD,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,MAAM,IAAA,kCAAqB,EACzB,oBAAoB,EACpB,2BAA2B,EAC3B,eAAe,EACf,WAAW,CACZ,CAAC;YACF,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;AAzCW,QAAA,uBAAuB,2BAyClC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../scripts-create2/deploy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,iCAAiC,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../scripts-create2/deploy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,iCAAiC,EAAE,MAAM,SAAS,CAAC;AAa5D,eAAO,MAAM,oBAAoB,qBACb,iBAAiB,OAC9B,iCAAiC,KACrC,QAAQ,MAAM,CAkChB,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAC/B,iCAAiC,KACrC,QAAQ,IAAI,CA0Dd,CAAC"}
|