@requestnetwork/smart-contracts 0.28.1-next.1636 → 0.28.1-next.1640
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 +13 -0
- package/dist/hardhat.config.d.ts.map +1 -1
- package/dist/hardhat.config.js +19 -8
- package/dist/hardhat.config.js.map +1 -1
- package/dist/scripts/2_deploy-main-payments.d.ts +1 -1
- package/dist/scripts/2_deploy-main-payments.d.ts.map +1 -1
- package/dist/scripts/2_deploy-main-payments.js +7 -1
- package/dist/scripts/2_deploy-main-payments.js.map +1 -1
- package/dist/scripts/3_deploy_chainlink_contract.d.ts +1 -1
- package/dist/scripts/3_deploy_chainlink_contract.d.ts.map +1 -1
- package/dist/scripts/3_deploy_chainlink_contract.js +7 -11
- package/dist/scripts/3_deploy_chainlink_contract.js.map +1 -1
- package/dist/scripts/5_deploy-all.d.ts +3 -0
- package/dist/scripts/5_deploy-all.d.ts.map +1 -0
- package/dist/scripts/5_deploy-all.js +18 -0
- package/dist/scripts/5_deploy-all.js.map +1 -0
- package/dist/scripts/conversion-proxy.d.ts +5 -3
- package/dist/scripts/conversion-proxy.d.ts.map +1 -1
- package/dist/scripts/conversion-proxy.js +3 -0
- package/dist/scripts/conversion-proxy.js.map +1 -1
- package/dist/scripts/deploy-one.d.ts +2 -0
- package/dist/scripts/deploy-one.d.ts.map +1 -1
- package/dist/scripts/deploy-one.js +3 -2
- package/dist/scripts/deploy-one.js.map +1 -1
- package/dist/scripts/deploy-payments.d.ts.map +1 -1
- package/dist/scripts/deploy-payments.js +134 -83
- package/dist/scripts/deploy-payments.js.map +1 -1
- package/dist/scripts/erc20-swap-to-conversion.d.ts +4 -1
- package/dist/scripts/erc20-swap-to-conversion.d.ts.map +1 -1
- package/dist/scripts/erc20-swap-to-conversion.js +2 -0
- package/dist/scripts/erc20-swap-to-conversion.js.map +1 -1
- package/dist/scripts/utils.d.ts.map +1 -1
- package/dist/scripts/utils.js +2 -1
- package/dist/scripts/utils.js.map +1 -1
- package/dist/src/lib/artifacts/ChainlinkConversionPath/index.d.ts.map +1 -1
- package/dist/src/lib/artifacts/ChainlinkConversionPath/index.js +4 -0
- package/dist/src/lib/artifacts/ChainlinkConversionPath/index.js.map +1 -1
- package/dist/src/lib/artifacts/ERC20FeeProxy/index.d.ts.map +1 -1
- package/dist/src/lib/artifacts/ERC20FeeProxy/index.js +4 -0
- package/dist/src/lib/artifacts/ERC20FeeProxy/index.js.map +1 -1
- package/dist/src/lib/artifacts/ERC20SwapToPay/index.d.ts.map +1 -1
- package/dist/src/lib/artifacts/ERC20SwapToPay/index.js +4 -0
- package/dist/src/lib/artifacts/ERC20SwapToPay/index.js.map +1 -1
- package/dist/src/lib/artifacts/Erc20ConversionProxy/0.1.1.json +252 -0
- package/dist/src/lib/artifacts/Erc20ConversionProxy/index.d.ts.map +1 -1
- package/dist/src/lib/artifacts/Erc20ConversionProxy/index.js +18 -13
- package/dist/src/lib/artifacts/Erc20ConversionProxy/index.js.map +1 -1
- package/dist/src/lib/artifacts/Erc20SwapConversion/0.1.0.json +5 -38
- package/dist/src/lib/artifacts/Erc20SwapConversion/index.d.ts.map +1 -1
- package/dist/src/lib/artifacts/Erc20SwapConversion/index.js +6 -2
- package/dist/src/lib/artifacts/Erc20SwapConversion/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 -0
- package/dist/src/lib/artifacts/EthConversionProxy/index.js.map +1 -1
- package/dist/src/lib/artifacts/EthereumFeeProxy/index.d.ts.map +1 -1
- package/dist/src/lib/artifacts/EthereumFeeProxy/index.js +4 -0
- package/dist/src/lib/artifacts/EthereumFeeProxy/index.js.map +1 -1
- package/dist/src/lib/artifacts/EthereumProxy/index.d.ts.map +1 -1
- package/dist/src/lib/artifacts/EthereumProxy/index.js +12 -0
- package/dist/src/lib/artifacts/EthereumProxy/index.js.map +1 -1
- package/dist/src/types/Erc20ConversionProxy.d.ts +152 -0
- package/dist/src/types/factories/ERC20SwapToConversion__factory.d.ts +3 -3
- package/dist/src/types/factories/ERC20SwapToConversion__factory.d.ts.map +1 -1
- package/dist/src/types/factories/ERC20SwapToConversion__factory.js +10 -5
- package/dist/src/types/factories/ERC20SwapToConversion__factory.js.map +1 -1
- package/dist/src/types/factories/Erc20ConversionProxy__factory.d.ts +1 -1
- package/dist/src/types/factories/Erc20ConversionProxy__factory.d.ts.map +1 -1
- package/dist/src/types/factories/Erc20ConversionProxy__factory.js +79 -1
- package/dist/src/types/factories/Erc20ConversionProxy__factory.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -4
- package/types/Erc20ConversionProxy.d.ts +152 -0
- package/types/factories/ERC20SwapToConversion__factory.d.ts +3 -3
- package/types/factories/ERC20SwapToConversion__factory.d.ts.map +1 -1
- package/types/factories/ERC20SwapToConversion__factory.js +10 -5
- package/types/factories/ERC20SwapToConversion__factory.js.map +1 -1
- package/types/factories/Erc20ConversionProxy__factory.d.ts +1 -1
- package/types/factories/Erc20ConversionProxy__factory.d.ts.map +1 -1
- package/types/factories/Erc20ConversionProxy__factory.js +79 -1
- package/types/factories/Erc20ConversionProxy__factory.js.map +1 -1
package/dist/hardhat.config.d.ts
CHANGED
|
@@ -55,6 +55,16 @@ declare const _default: {
|
|
|
55
55
|
chainId: number;
|
|
56
56
|
accounts: string[] | undefined;
|
|
57
57
|
};
|
|
58
|
+
'arbitrum-one': {
|
|
59
|
+
url: string;
|
|
60
|
+
chainId: number;
|
|
61
|
+
accounts: string[] | undefined;
|
|
62
|
+
};
|
|
63
|
+
'arbitrum-rinkeby': {
|
|
64
|
+
url: string;
|
|
65
|
+
chainId: number;
|
|
66
|
+
accounts: string[] | undefined;
|
|
67
|
+
};
|
|
58
68
|
};
|
|
59
69
|
etherscan: {
|
|
60
70
|
apiKey: string | undefined;
|
|
@@ -64,6 +74,9 @@ declare const _default: {
|
|
|
64
74
|
target: string;
|
|
65
75
|
alwaysGenerateOverloads: boolean;
|
|
66
76
|
};
|
|
77
|
+
mocha: {
|
|
78
|
+
timeout: number;
|
|
79
|
+
};
|
|
67
80
|
};
|
|
68
81
|
export default _default;
|
|
69
82
|
//# sourceMappingURL=hardhat.config.d.ts.map
|
|
@@ -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
|
|
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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqBnC,wBA2EE"}
|
package/dist/hardhat.config.js
CHANGED
|
@@ -8,12 +8,9 @@ require("@nomiclabs/hardhat-etherscan");
|
|
|
8
8
|
require("@nomiclabs/hardhat-ethers");
|
|
9
9
|
const config_1 = require("hardhat/config");
|
|
10
10
|
const dotenv_1 = require("dotenv");
|
|
11
|
-
const
|
|
12
|
-
const _2_deploy_main_payments_1 = require("./scripts/2_deploy-main-payments");
|
|
13
|
-
const _3_deploy_chainlink_contract_1 = require("./scripts/3_deploy_chainlink_contract");
|
|
11
|
+
const _5_deploy_all_1 = require("./scripts/5_deploy-all");
|
|
14
12
|
const deploy_payments_1 = require("./scripts/deploy-payments");
|
|
15
13
|
const prepare_payments_1 = require("./scripts/prepare-payments");
|
|
16
|
-
const _4_deploy_escrow_deployment_1 = require("./scripts/4_deploy-escrow-deployment");
|
|
17
14
|
(0, dotenv_1.config)();
|
|
18
15
|
const accounts = process.env.DEPLOYMENT_PRIVATE_KEY
|
|
19
16
|
? [process.env.DEPLOYMENT_PRIVATE_KEY]
|
|
@@ -75,6 +72,16 @@ exports.default = {
|
|
|
75
72
|
chainId: 250,
|
|
76
73
|
accounts,
|
|
77
74
|
},
|
|
75
|
+
'arbitrum-one': {
|
|
76
|
+
url: process.env.WEB3_PROVIDER_URL || 'https://arb1.arbitrum.io/rpc',
|
|
77
|
+
chainId: 42161,
|
|
78
|
+
accounts,
|
|
79
|
+
},
|
|
80
|
+
'arbitrum-rinkeby': {
|
|
81
|
+
url: process.env.WEB3_PROVIDER_URL || 'https://rinkeby.arbitrum.io/rpc',
|
|
82
|
+
chainId: 421611,
|
|
83
|
+
accounts,
|
|
84
|
+
},
|
|
78
85
|
},
|
|
79
86
|
etherscan: {
|
|
80
87
|
// Can be overridden according to the network (set-explorer-api-key)
|
|
@@ -85,6 +92,9 @@ exports.default = {
|
|
|
85
92
|
target: 'ethers-v5',
|
|
86
93
|
alwaysGenerateOverloads: false, // should overloads with full signatures like deposit(uint256) be generated always, even if there are no overloads?
|
|
87
94
|
},
|
|
95
|
+
mocha: {
|
|
96
|
+
timeout: 60000, // Usefull on test networks
|
|
97
|
+
},
|
|
88
98
|
};
|
|
89
99
|
// Override the default API key for non-Etherscan explorers
|
|
90
100
|
const setExplorerApiKey = (hre) => {
|
|
@@ -103,15 +113,16 @@ const setExplorerApiKey = (hre) => {
|
|
|
103
113
|
hre.config.etherscan.apiKey = process.env.FTMSCAN_API_KEY;
|
|
104
114
|
return;
|
|
105
115
|
}
|
|
116
|
+
case 'arbitrum-one': {
|
|
117
|
+
hre.config.etherscan.apiKey = process.env.ARBISCAN_API_KEY;
|
|
118
|
+
return;
|
|
119
|
+
}
|
|
106
120
|
}
|
|
107
121
|
};
|
|
108
122
|
// FIXME: use deployAllPaymentContracts instead to test with the same deployments
|
|
109
123
|
(0, config_1.task)('deploy-local-env', 'Deploy a local environment').setAction((args, hre) => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
110
124
|
args.force = true;
|
|
111
|
-
yield (0,
|
|
112
|
-
yield (0, _2_deploy_main_payments_1.default)(args, hre);
|
|
113
|
-
yield (0, _3_deploy_chainlink_contract_1.default)(args, hre);
|
|
114
|
-
yield (0, _4_deploy_escrow_deployment_1.deployEscrow)(hre);
|
|
125
|
+
yield (0, _5_deploy_all_1.default)(args, hre);
|
|
115
126
|
console.log('All contracts (re)deployed locally');
|
|
116
127
|
}));
|
|
117
128
|
(0, config_1.task)('deploy-live-payments', 'Deploy payment contracts on a live network. Make sure to update all artifacts before running.')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hardhat.config.js","sourceRoot":"","sources":["../hardhat.config.ts"],"names":[],"mappings":";;;AAAA,8BAA4B;AAC5B,qCAAmC;AACnC,sCAAoC;AACpC,wCAAsC;AACtC,qCAAmC;AACnC,2CAAsC;AACtC,mCAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"hardhat.config.js","sourceRoot":"","sources":["../hardhat.config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import '@nomiclabs/hardhat-ethers';
|
|
2
2
|
import { HardhatRuntimeEnvironment } from 'hardhat/types';
|
|
3
|
-
export default function deploy(args: any, hre: HardhatRuntimeEnvironment): Promise<
|
|
3
|
+
export default function deploy(args: any, hre: HardhatRuntimeEnvironment): Promise<any>;
|
|
4
4
|
//# sourceMappingURL=2_deploy-main-payments.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"2_deploy-main-payments.d.ts","sourceRoot":"","sources":["../../scripts/2_deploy-main-payments.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AACnC,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAI1D,wBAA8B,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,yBAAyB,
|
|
1
|
+
{"version":3,"file":"2_deploy-main-payments.d.ts","sourceRoot":"","sources":["../../scripts/2_deploy-main-payments.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AACnC,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAI1D,wBAA8B,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,yBAAyB,GAAG,OAAO,CAAC,GAAG,CAAC,CA8G5F"}
|
|
@@ -74,7 +74,13 @@ function deploy(args, hre) {
|
|
|
74
74
|
ERC20Alpha: ${erc20AlphaInstance.address}
|
|
75
75
|
FakeSwapRouter: ${FakeSwapRouterAddress}
|
|
76
76
|
SwapToPay: ${ERC20SwapToPayAddress}
|
|
77
|
-
|
|
77
|
+
`);
|
|
78
|
+
return {
|
|
79
|
+
DAIAddress: erc20AlphaInstance.address,
|
|
80
|
+
ERC20FeeProxyAddress: ERC20FeeProxyAddress,
|
|
81
|
+
ERC20TestAddress: testERC20Instance.address,
|
|
82
|
+
ETHFeeProxyAddress: EthereumFeeProxyAddress,
|
|
83
|
+
};
|
|
78
84
|
}
|
|
79
85
|
catch (e) {
|
|
80
86
|
console.error(e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"2_deploy-main-payments.js","sourceRoot":"","sources":["../../scripts/2_deploy-main-payments.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"2_deploy-main-payments.js","sourceRoot":"","sources":["../../scripts/2_deploy-main-payments.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import '@nomiclabs/hardhat-ethers';
|
|
2
2
|
import { HardhatRuntimeEnvironment } from 'hardhat/types';
|
|
3
|
-
export default function deploy(args: any, hre: HardhatRuntimeEnvironment): Promise<void>;
|
|
3
|
+
export default function deploy(args: any, hre: HardhatRuntimeEnvironment, mainPaymentAddresses: any): Promise<void>;
|
|
4
4
|
//# sourceMappingURL=3_deploy_chainlink_contract.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"3_deploy_chainlink_contract.d.ts","sourceRoot":"","sources":["../../scripts/3_deploy_chainlink_contract.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AAEnC,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAK1D,wBAA8B,MAAM,
|
|
1
|
+
{"version":3,"file":"3_deploy_chainlink_contract.d.ts","sourceRoot":"","sources":["../../scripts/3_deploy_chainlink_contract.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AAEnC,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAK1D,wBAA8B,MAAM,CAClC,IAAI,EAAE,GAAG,EACT,GAAG,EAAE,yBAAyB,EAC9B,oBAAoB,EAAE,GAAG,iBAgG1B"}
|
|
@@ -6,7 +6,7 @@ const currency_1 = require("@requestnetwork/currency");
|
|
|
6
6
|
const conversion_proxy_1 = require("./conversion-proxy");
|
|
7
7
|
const erc20_swap_to_conversion_1 = require("./erc20-swap-to-conversion");
|
|
8
8
|
const deploy_one_1 = require("./deploy-one");
|
|
9
|
-
function deploy(args, hre) {
|
|
9
|
+
function deploy(args, hre, mainPaymentAddresses) {
|
|
10
10
|
var _a, _b, _c;
|
|
11
11
|
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
12
12
|
const [deployer] = yield hre.ethers.getSigners();
|
|
@@ -29,8 +29,7 @@ function deploy(args, hre) {
|
|
|
29
29
|
const USD_hash = currencyManager.fromSymbol('USD').hash;
|
|
30
30
|
const EUR_hash = currencyManager.fromSymbol('EUR').hash;
|
|
31
31
|
// Cf. ERC20Alpha in TestERC20.sol
|
|
32
|
-
|
|
33
|
-
const DAI_address = '0x38cF23C52Bb4B13F051Aec09580a2dE845a7FA35';
|
|
32
|
+
const DAI_address = mainPaymentAddresses.DAIAddress;
|
|
34
33
|
const USDT_address = USDT_fake_address;
|
|
35
34
|
console.log(`USDT address: ${USDT_address}`);
|
|
36
35
|
const conversionPathInstance = yield (yield hre.ethers.getContractFactory('ChainlinkConversionPath', deployer)).deploy(ETH_hash);
|
|
@@ -38,20 +37,17 @@ function deploy(args, hre) {
|
|
|
38
37
|
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]);
|
|
39
38
|
console.log('AggregatorsList updated.');
|
|
40
39
|
// erc20SwapConversion
|
|
41
|
-
const erc20ConversionAddress = (_a = (yield (0, conversion_proxy_1.deployERC20ConversionProxy)(Object.assign(Object.assign({}, args), { chainlinkConversionPathAddress: conversionPathInstance.address, erc20FeeProxyAddress:
|
|
40
|
+
const erc20ConversionAddress = (_a = (yield (0, conversion_proxy_1.deployERC20ConversionProxy)(Object.assign(Object.assign({}, args), { chainlinkConversionPathAddress: conversionPathInstance.address, erc20FeeProxyAddress: mainPaymentAddresses.ERC20FeeProxyAddress }), hre))) === null || _a === void 0 ? void 0 : _a.address;
|
|
42
41
|
const localSwapRouterAddress = '0x4E72770760c011647D4873f60A3CF6cDeA896CD8';
|
|
43
|
-
const { address: erc20SwapConversionAddress, instance: erc20SwapConversion, } = yield (0, erc20_swap_to_conversion_1.deploySwapConversion)(Object.assign(Object.assign({}, args), { conversionProxyAddress: erc20ConversionAddress, swapProxyAddress: localSwapRouterAddress }), hre);
|
|
42
|
+
const { address: erc20SwapConversionAddress, instance: erc20SwapConversion, } = yield (0, erc20_swap_to_conversion_1.deploySwapConversion)(Object.assign(Object.assign({}, args), { conversionProxyAddress: erc20ConversionAddress, swapProxyAddress: localSwapRouterAddress, chainlinkConversionPathAddress: conversionPathInstance.address }), hre);
|
|
44
43
|
if (!erc20SwapConversion) {
|
|
45
44
|
console.error('Deployment for erc20SwapConversion failed.');
|
|
46
45
|
return;
|
|
47
46
|
}
|
|
48
|
-
yield erc20SwapConversion.approvePaymentProxyToSpend(
|
|
49
|
-
|
|
50
|
-
'0x38cF23C52Bb4B13F051Aec09580a2dE845a7FA35');
|
|
51
|
-
// FIXME: should try to retrieve information from artifacts instead
|
|
52
|
-
yield erc20SwapConversion.approveRouterToSpend('0x9FBDa871d559710256a2502A2517b794B482Db40');
|
|
47
|
+
yield erc20SwapConversion.approvePaymentProxyToSpend(mainPaymentAddresses.DAIAddress);
|
|
48
|
+
yield erc20SwapConversion.approveRouterToSpend(mainPaymentAddresses.ERC20TestAddress);
|
|
53
49
|
// EthConversion
|
|
54
|
-
const ethConversionProxyAddress = (_c = (_b = (yield (0, conversion_proxy_1.deployETHConversionProxy)(Object.assign(Object.assign({}, args), { chainlinkConversionPathAddress: conversionPathInstance.address, ethFeeProxyAddress:
|
|
50
|
+
const ethConversionProxyAddress = (_c = (_b = (yield (0, conversion_proxy_1.deployETHConversionProxy)(Object.assign(Object.assign({}, args), { chainlinkConversionPathAddress: conversionPathInstance.address, ethFeeProxyAddress: mainPaymentAddresses.ETHFeeProxyAddress, nativeTokenHash: ETH_hash }), hre))) === null || _b === void 0 ? void 0 : _b.address) !== null && _c !== void 0 ? _c : '(missing)';
|
|
55
51
|
// ----------------------------------
|
|
56
52
|
console.log('Contracts deployed');
|
|
57
53
|
console.log(`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"3_deploy_chainlink_contract.js","sourceRoot":"","sources":["../../scripts/3_deploy_chainlink_contract.ts"],"names":[],"mappings":";;;AAAA,qCAAmC;AACnC,uDAA2D;AAE3D,yDAA0F;AAC1F,yEAAkE;AAClE,6CAAyC;AAEzC,SAA8B,MAAM,
|
|
1
|
+
{"version":3,"file":"3_deploy_chainlink_contract.js","sourceRoot":"","sources":["../../scripts/3_deploy_chainlink_contract.ts"],"names":[],"mappings":";;;AAAA,qCAAmC;AACnC,uDAA2D;AAE3D,yDAA0F;AAC1F,yEAAkE;AAClE,6CAAyC;AAEzC,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,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC;SACzC,CAAC,CAAC;QACH,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,GAAG,MAAM,IAAA,sBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,gBAAgB,EAAE;YACnF,oBAAoB,EAAE,CAAC,WAAW,EAAE,CAAC,EAAE,EAAE,CAAC;SAC3C,CAAC,CAAC;QACH,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,GAAG,MAAM,IAAA,sBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,gBAAgB,EAAE;YACnF,oBAAoB,EAAE,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC;SACzC,CAAC,CAAC;QACH,MAAM,EAAE,OAAO,EAAE,mBAAmB,EAAE,GAAG,MAAM,IAAA,sBAAS,EAAC,IAAI,EAAE,GAAG,EAAE,gBAAgB,EAAE;YACpF,oBAAoB,EAAE,CAAC,gBAAgB,EAAE,EAAE,EAAE,EAAE,CAAC;SACjD,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;QAEnB,8CAA8C;QAC9C,MAAM,sBAAsB,CAAC,qBAAqB,CAChD,CAAC,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,CAAC,EAC/C,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,EACxC,CAAC,kBAAkB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,mBAAmB,CAAC,CAClF,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;QAExC,sBAAsB;QACtB,MAAM,sBAAsB,GAAG,MAAA,CAC7B,MAAM,IAAA,6CAA0B,kCAEzB,IAAI,KACP,8BAA8B,EAAE,sBAAsB,CAAC,OAAO,EAC9D,oBAAoB,EAAE,oBAAoB,CAAC,oBAAoB,KAEjE,GAAG,CACJ,CACF,0CAAE,OAAO,CAAC;QACX,MAAM,sBAAsB,GAAG,4CAA4C,CAAC;QAC5E,MAAM,EACJ,OAAO,EAAE,0BAA0B,EACnC,QAAQ,EAAE,mBAAmB,GAC9B,GAAG,MAAM,IAAA,+CAAoB,kCAEvB,IAAI,KACP,sBAAsB,EAAE,sBAAsB,EAC9C,gBAAgB,EAAE,sBAAsB,EACxC,8BAA8B,EAAE,sBAAsB,CAAC,OAAO,KAEhE,GAAG,CACJ,CAAC;QACF,IAAI,CAAC,mBAAmB,EAAE;YACxB,OAAO,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;YAC5D,OAAO;SACR;QACD,MAAM,mBAAmB,CAAC,0BAA0B,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QACtF,MAAM,mBAAmB,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,CAAC;QAEtF,gBAAgB;QAChB,MAAM,yBAAyB,GAC7B,MAAA,MAAA,CACE,MAAM,IAAA,2CAAwB,kCAEvB,IAAI,KACP,8BAA8B,EAAE,sBAAsB,CAAC,OAAO,EAC9D,kBAAkB,EAAE,oBAAoB,CAAC,kBAAkB,EAC3D,eAAe,EAAE,QAAQ,KAE3B,GAAG,CACJ,CACF,0CAAE,OAAO,mCAAI,WAAW,CAAC;QAC5B,qCAAqC;QACrC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC;gCACkB,YAAY;gCACZ,kBAAkB;gCAClB,sBAAsB,CAAC,OAAO;gCAC9B,sBAAsB;gCACtB,0BAA0B;gCAC1B,yBAAyB;KACpD,CAAC,CAAC;;CACN;AAnGD,yBAmGC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"5_deploy-all.d.ts","sourceRoot":"","sources":["../../scripts/5_deploy-all.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAO1D,wBAA8B,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,yBAAyB,iBAK9E"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const tslib_1 = require("tslib");
|
|
4
|
+
const _1_deploy_request_storage_1 = require("./1_deploy-request-storage");
|
|
5
|
+
const _2_deploy_main_payments_1 = require("./2_deploy-main-payments");
|
|
6
|
+
const _3_deploy_chainlink_contract_1 = require("./3_deploy_chainlink_contract");
|
|
7
|
+
const _4_deploy_escrow_deployment_1 = require("./4_deploy-escrow-deployment");
|
|
8
|
+
// Deploys, set up the contracts
|
|
9
|
+
function deploy(_args, hre) {
|
|
10
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
11
|
+
yield (0, _1_deploy_request_storage_1.default)(_args, hre);
|
|
12
|
+
const mainPaymentAddresses = yield (0, _2_deploy_main_payments_1.default)(_args, hre);
|
|
13
|
+
yield (0, _3_deploy_chainlink_contract_1.default)(_args, hre, mainPaymentAddresses);
|
|
14
|
+
yield (0, _4_deploy_escrow_deployment_1.deployEscrow)(hre);
|
|
15
|
+
});
|
|
16
|
+
}
|
|
17
|
+
exports.default = deploy;
|
|
18
|
+
//# sourceMappingURL=5_deploy-all.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"5_deploy-all.js","sourceRoot":"","sources":["../../scripts/5_deploy-all.ts"],"names":[],"mappings":";;;AACA,0EAAuD;AACvD,sEAAqD;AACrD,gFAA6D;AAC7D,8EAA4D;AAE5D,gCAAgC;AAChC,SAA8B,MAAM,CAAC,KAAU,EAAE,GAA8B;;QAC7E,MAAM,IAAA,mCAAa,EAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAChC,MAAM,oBAAoB,GAAG,MAAM,IAAA,iCAAa,EAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC7D,MAAM,IAAA,sCAAgB,EAAC,KAAK,EAAE,GAAG,EAAE,oBAAoB,CAAC,CAAC;QACzD,MAAM,IAAA,0CAAY,EAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;CAAA;AALD,yBAKC"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { HardhatRuntimeEnvironment } from 'hardhat/types';
|
|
2
|
-
import {
|
|
2
|
+
import { Erc20ConversionProxy } from '../src/types/Erc20ConversionProxy';
|
|
3
3
|
export declare function deployERC20ConversionProxy(args: {
|
|
4
4
|
chainlinkConversionPathAddress?: string;
|
|
5
5
|
erc20FeeProxyAddress?: string;
|
|
6
|
-
|
|
6
|
+
nonceCondition?: number;
|
|
7
|
+
}, hre: HardhatRuntimeEnvironment): Promise<import("./deploy-one").DeploymentResult<Erc20ConversionProxy> | undefined>;
|
|
7
8
|
export declare function deployETHConversionProxy(args: {
|
|
8
9
|
chainlinkConversionPathAddress?: string;
|
|
9
10
|
ethFeeProxyAddress?: string;
|
|
10
|
-
|
|
11
|
+
nonceCondition?: number;
|
|
12
|
+
}, hre: HardhatRuntimeEnvironment): Promise<import("./deploy-one").DeploymentResult<import("ethers").Contract> | undefined>;
|
|
11
13
|
//# sourceMappingURL=conversion-proxy.d.ts.map
|
|
@@ -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;
|
|
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,sFAuB/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;CACzB,EACD,GAAG,EAAE,yBAAyB,2FAuC/B"}
|
|
@@ -22,6 +22,8 @@ function deployERC20ConversionProxy(args, hre) {
|
|
|
22
22
|
return (0, deploy_one_1.deployOne)(args, hre, contractName, {
|
|
23
23
|
constructorArguments: [args.erc20FeeProxyAddress, args.chainlinkConversionPathAddress],
|
|
24
24
|
artifact: lib_1.erc20ConversionProxy,
|
|
25
|
+
nonceCondition: args.nonceCondition,
|
|
26
|
+
version: '0.1.1',
|
|
25
27
|
});
|
|
26
28
|
});
|
|
27
29
|
}
|
|
@@ -54,6 +56,7 @@ function deployETHConversionProxy(args, hre) {
|
|
|
54
56
|
nativeTokenHash,
|
|
55
57
|
],
|
|
56
58
|
artifact: lib_1.ethConversionArtifact,
|
|
59
|
+
nonceCondition: args.nonceCondition,
|
|
57
60
|
});
|
|
58
61
|
});
|
|
59
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversion-proxy.js","sourceRoot":"","sources":["../../scripts/conversion-proxy.ts"],"names":[],"mappings":";;;;
|
|
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,CAAC,IAAI,CAAC,oBAAoB,EAAE,IAAI,CAAC,8BAA8B,CAAC;YACtF,QAAQ,EAAE,0BAA4B;YACtC,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,OAAO,EAAE,OAAO;SACjB,CAAC,CAAC;IACL,CAAC;CAAA;AA7BD,gEA6BC;AAED,SAAsB,wBAAwB,CAC5C,IAIC,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;SACpC,CAAC,CAAC;;CACJ;AA7CD,4DA6CC"}
|
|
@@ -16,6 +16,7 @@ export interface DeploymentResult<TContract extends Contract | unknown = Contrac
|
|
|
16
16
|
* @options
|
|
17
17
|
* - options.verify: set false to prevent verification on live networks
|
|
18
18
|
* - options.nonceCondition: only proceeds with the deployment if the nonce matches
|
|
19
|
+
* - options.version: to deploy or map a version different from the last version
|
|
19
20
|
* @returns a deployment result with address =
|
|
20
21
|
* - The address if the contract is deployed or attached
|
|
21
22
|
* - 'simulated' if args.simulate === true (no deployment/)
|
|
@@ -26,5 +27,6 @@ export declare function deployOne<TContract extends Contract>(args: any, hre: Ha
|
|
|
26
27
|
artifact?: ContractArtifact<Contract>;
|
|
27
28
|
verify?: boolean;
|
|
28
29
|
nonceCondition?: number;
|
|
30
|
+
version?: string;
|
|
29
31
|
}): Promise<DeploymentResult<TContract>>;
|
|
30
32
|
//# sourceMappingURL=deploy-one.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-one.d.ts","sourceRoot":"","sources":["../../scripts/deploy-one.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AACnC,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,WAAW,gBAAgB,CAAC,SAAS,SAAS,QAAQ,GAAG,OAAO,GAAG,QAAQ;IAC/E,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,SAAS,CAAC;IACpB,oBAAoB,EAAE,GAAG,EAAE,CAAC;IAC5B,IAAI,EAAE,WAAW,GAAG,UAAU,GAAG,UAAU,GAAG,SAAS,CAAC;IACxD,mBAAmB,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;CACxC;AAkBD
|
|
1
|
+
{"version":3,"file":"deploy-one.d.ts","sourceRoot":"","sources":["../../scripts/deploy-one.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AACnC,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,WAAW,gBAAgB,CAAC,SAAS,SAAS,QAAQ,GAAG,OAAO,GAAG,QAAQ;IAC/E,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,SAAS,CAAC;IACpB,oBAAoB,EAAE,GAAG,EAAE,CAAC;IAC5B,IAAI,EAAE,WAAW,GAAG,UAAU,GAAG,UAAU,GAAG,SAAS,CAAC;IACxD,mBAAmB,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;CACxC;AAkBD;;;;;;;;;;;GAWG;AACH,wBAAsB,SAAS,CAAC,SAAS,SAAS,QAAQ,EACxD,IAAI,EAAE,GAAG,EACT,GAAG,EAAE,yBAAyB,EAC9B,YAAY,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE;IACR,oBAAoB,CAAC,EAAE,GAAG,EAAE,CAAC;IAC7B,QAAQ,CAAC,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IACtC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GACA,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CA4FtC"}
|
|
@@ -23,6 +23,7 @@ const SKIPPED_DEPLOYMENT = {
|
|
|
23
23
|
* @options
|
|
24
24
|
* - options.verify: set false to prevent verification on live networks
|
|
25
25
|
* - options.nonceCondition: only proceeds with the deployment if the nonce matches
|
|
26
|
+
* - options.version: to deploy or map a version different from the last version
|
|
26
27
|
* @returns a deployment result with address =
|
|
27
28
|
* - The address if the contract is deployed or attached
|
|
28
29
|
* - 'simulated' if args.simulate === true (no deployment/)
|
|
@@ -37,9 +38,9 @@ function deployOne(args, hre, contractName, options) {
|
|
|
37
38
|
const constructorArguments = (_a = options === null || options === void 0 ? void 0 : options.constructorArguments) !== null && _a !== void 0 ? _a : [];
|
|
38
39
|
if (options === null || options === void 0 ? void 0 : options.artifact) {
|
|
39
40
|
try {
|
|
40
|
-
address = options.artifact.getAddress(hre.network.name);
|
|
41
|
+
address = options.artifact.getAddress(hre.network.name, options.version);
|
|
41
42
|
const action = args.force ? '(forcing deployment)' : '(skipping)';
|
|
42
|
-
console.log(`Found ${contractName} on ${hre.network.name} at address: ${address} ${action}`);
|
|
43
|
+
console.log(`Found ${contractName}${options.version ? ` v${options.version}` : ''} on ${hre.network.name} at address: ${address} ${action}`);
|
|
43
44
|
if (!args.force) {
|
|
44
45
|
return {
|
|
45
46
|
address,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-one.js","sourceRoot":"","sources":["../../scripts/deploy-one.ts"],"names":[],"mappings":";;;;AAAA,qCAAmC;AAcnC,MAAM,oBAAoB,GAA8B;IACtD,OAAO,EAAE,WAAW;IACpB,YAAY,EAAE,EAAE;IAChB,QAAQ,EAAE,IAAI;IACd,oBAAoB,EAAE,EAAE;IACxB,IAAI,EAAE,WAAW;CAClB,CAAC;AAEF,MAAM,kBAAkB,GAA8B;IACpD,OAAO,EAAE,SAAS;IAClB,YAAY,EAAE,EAAE;IAChB,QAAQ,EAAE,IAAI;IACd,oBAAoB,EAAE,EAAE;IACxB,IAAI,EAAE,SAAS;CAChB,CAAC;AAEF
|
|
1
|
+
{"version":3,"file":"deploy-one.js","sourceRoot":"","sources":["../../scripts/deploy-one.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-payments.d.ts","sourceRoot":"","sources":["../../scripts/deploy-payments.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AACnC,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy-payments.d.ts","sourceRoot":"","sources":["../../scripts/deploy-payments.ts"],"names":[],"mappings":"AAAA,OAAO,2BAA2B,CAAC;AACnC,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAuB1D;;;;;;;;;;;;;GAaG;AACH,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,GAAG,EACT,GAAG,EAAE,yBAAyB,GAC7B,OAAO,CAAC,IAAI,CAAC,CA2Wf"}
|