@venusprotocol/protocol-reserve 2.5.0-dev.1 → 3.0.0-dev.2

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.
Files changed (50) hide show
  1. package/deployments/arbitrumone/ConverterNetwork.json +723 -0
  2. package/deployments/arbitrumone/ConverterNetwork_Implementation.json +828 -0
  3. package/deployments/arbitrumone/ConverterNetwork_Proxy.json +277 -0
  4. package/deployments/arbitrumone/SingleTokenConverterBeacon.json +206 -0
  5. package/deployments/arbitrumone/SingleTokenConverterImp.json +2170 -0
  6. package/deployments/arbitrumone/USDCPrimeConverter.json +229 -0
  7. package/deployments/arbitrumone/USDTPrimeConverter.json +229 -0
  8. package/deployments/arbitrumone/WBTCPrimeConverter.json +229 -0
  9. package/deployments/arbitrumone/WETHPrimeConverter.json +229 -0
  10. package/deployments/arbitrumone/XVSVaultConverter.json +229 -0
  11. package/deployments/arbitrumone/XVSVaultTreasury.json +627 -0
  12. package/deployments/arbitrumone/XVSVaultTreasury_Implementation.json +672 -0
  13. package/deployments/arbitrumone/XVSVaultTreasury_Proxy.json +281 -0
  14. package/deployments/arbitrumone/solcInputs/027aeec938943227f90cf24126ba2c44.json +280 -0
  15. package/deployments/arbitrumone.json +4936 -889
  16. package/deployments/arbitrumone_addresses.json +14 -1
  17. package/dist/deploy/{001-psr.d.ts → 000-psr.d.ts} +1 -1
  18. package/dist/deploy/000-psr.d.ts.map +1 -0
  19. package/dist/deploy/000-psr.js +67 -0
  20. package/dist/deploy/000-psr.js.map +1 -0
  21. package/dist/deploy/{006-risk-fund-v2.d.ts → 001-risk-fund-v2.d.ts} +1 -1
  22. package/dist/deploy/001-risk-fund-v2.d.ts.map +1 -0
  23. package/dist/deploy/001-risk-fund-v2.js +38 -0
  24. package/dist/deploy/001-risk-fund-v2.js.map +1 -0
  25. package/dist/deploy/002-risk-fund-converter.d.ts.map +1 -1
  26. package/dist/deploy/002-risk-fund-converter.js +48 -54
  27. package/dist/deploy/002-risk-fund-converter.js.map +1 -1
  28. package/dist/deploy/003-xvs-vault-treasury.d.ts.map +1 -1
  29. package/dist/deploy/003-xvs-vault-treasury.js +21 -29
  30. package/dist/deploy/003-xvs-vault-treasury.js.map +1 -1
  31. package/dist/deploy/004-single-token-converter.d.ts.map +1 -1
  32. package/dist/deploy/004-single-token-converter.js +93 -94
  33. package/dist/deploy/004-single-token-converter.js.map +1 -1
  34. package/dist/deploy/005-converter-network.d.ts.map +1 -1
  35. package/dist/deploy/005-converter-network.js +19 -27
  36. package/dist/deploy/005-converter-network.js.map +1 -1
  37. package/dist/hardhat.config.d.ts.map +1 -1
  38. package/dist/hardhat.config.js +10 -13
  39. package/dist/hardhat.config.js.map +1 -1
  40. package/dist/helpers/utils.d.ts +0 -1
  41. package/dist/helpers/utils.d.ts.map +1 -1
  42. package/dist/helpers/utils.js +1 -2
  43. package/dist/helpers/utils.js.map +1 -1
  44. package/package.json +1 -1
  45. package/dist/deploy/001-psr.d.ts.map +0 -1
  46. package/dist/deploy/001-psr.js +0 -76
  47. package/dist/deploy/001-psr.js.map +0 -1
  48. package/dist/deploy/006-risk-fund-v2.d.ts.map +0 -1
  49. package/dist/deploy/006-risk-fund-v2.js +0 -43
  50. package/dist/deploy/006-risk-fund-v2.js.map +0 -1
@@ -2,9 +2,22 @@
2
2
  "name": "arbitrumone",
3
3
  "chainId": "42161",
4
4
  "addresses": {
5
+ "ConverterNetwork": "0x2F6672C9A0988748b0172D97961BecfD9DC6D6d5",
6
+ "ConverterNetwork_Implementation": "0xf4b78771044D21F8289238Cad82bA5a13076aa4d",
7
+ "ConverterNetwork_Proxy": "0x2F6672C9A0988748b0172D97961BecfD9DC6D6d5",
5
8
  "DefaultProxyAdmin": "0xF6fF3e9459227f0cDE8B102b90bE25960317b216",
6
9
  "ProtocolShareReserve": "0xF9263eaF7eB50815194f26aCcAB6765820B13D41",
7
10
  "ProtocolShareReserve_Implementation": "0x6B2D272CD89585BCE8404006f366a77680324F7d",
8
- "ProtocolShareReserve_Proxy": "0xF9263eaF7eB50815194f26aCcAB6765820B13D41"
11
+ "ProtocolShareReserve_Proxy": "0xF9263eaF7eB50815194f26aCcAB6765820B13D41",
12
+ "SingleTokenConverterBeacon": "0x993900Ab4ef4092e5B76d4781D09A2732086F0F0",
13
+ "SingleTokenConverterImp": "0x07801d54906Be49517DfDEd26c89A81fb94e504B",
14
+ "USDCPrimeConverter": "0x6553C9f9E131191d4fECb6F0E73bE13E229065C6",
15
+ "USDTPrimeConverter": "0x435Fac1B002d5D31f374E07c0177A1D709d5DC2D",
16
+ "WBTCPrimeConverter": "0xF91369009c37f029aa28AF89709a352375E5A162",
17
+ "WETHPrimeConverter": "0x4aCB90ddD6df24dC6b0D50df84C94e72012026d0",
18
+ "XVSVaultConverter": "0x9c5A7aB705EA40876c1B292630a3ff2e0c213DB1",
19
+ "XVSVaultTreasury": "0xb076D4f15c08D7A7B89466327Ba71bc7e1311b58",
20
+ "XVSVaultTreasury_Implementation": "0x1052B6eEe137074761fFE040a0357e6F8c80dB8D",
21
+ "XVSVaultTreasury_Proxy": "0xb076D4f15c08D7A7B89466327Ba71bc7e1311b58"
9
22
  }
10
23
  }
@@ -1,4 +1,4 @@
1
1
  import { DeployFunction } from "hardhat-deploy/types";
2
2
  declare const func: DeployFunction;
3
3
  export default func;
4
- //# sourceMappingURL=001-psr.d.ts.map
4
+ //# sourceMappingURL=000-psr.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"000-psr.d.ts","sourceRoot":"","sources":["../../deploy/000-psr.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAKtD,QAAA,MAAM,IAAI,EAAE,cA+CX,CAAC;AAIF,eAAe,IAAI,CAAC"}
@@ -0,0 +1,67 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
25
+ Object.defineProperty(exports, "__esModule", { value: true });
26
+ const hardhat_1 = __importStar(require("hardhat"));
27
+ const utils_1 = require("../helpers/utils");
28
+ const func = async ({ network: { live, name }, getNamedAccounts, deployments, }) => {
29
+ const { deploy } = deployments;
30
+ const { deployer } = await getNamedAccounts();
31
+ const vBNBAddress = (await hardhat_1.ethers.getContractOrNull("vBNB"))?.address || utils_1.ADDRESS_ONE;
32
+ const comptrollerAddress = (await hardhat_1.ethers.getContract("Unitroller"))?.address;
33
+ const WBNBAddress = (await hardhat_1.ethers.getContractOrNull("WBNB"))?.address || utils_1.ADDRESS_ONE;
34
+ const timelockAddress = (await hardhat_1.ethers.getContract("NormalTimelock"))?.address || utils_1.multisigs[name];
35
+ const acmAddress = (await hardhat_1.ethers.getContract("AccessControlManager"))?.address;
36
+ const loopsLimit = 20;
37
+ const defaultProxyAdmin = await hardhat_1.default.artifacts.readArtifact("hardhat-deploy/solc_0.8/openzeppelin/proxy/transparent/ProxyAdmin.sol:ProxyAdmin");
38
+ await deploy("ProtocolShareReserve", {
39
+ from: deployer,
40
+ log: true,
41
+ deterministicDeployment: false,
42
+ args: [comptrollerAddress, WBNBAddress, vBNBAddress],
43
+ proxy: live
44
+ ? {
45
+ owner: timelockAddress,
46
+ proxyContract: "OpenZeppelinTransparentProxy",
47
+ execute: {
48
+ methodName: "initialize",
49
+ args: [acmAddress, loopsLimit],
50
+ },
51
+ viaAdminContract: {
52
+ name: "DefaultProxyAdmin",
53
+ artifact: defaultProxyAdmin,
54
+ },
55
+ }
56
+ : undefined,
57
+ });
58
+ const psr = await hardhat_1.default.ethers.getContract("ProtocolShareReserve");
59
+ if (live) {
60
+ const tx = await psr.transferOwnership(timelockAddress);
61
+ await tx.wait();
62
+ console.log("Transferred ownership of PSR to Timelock");
63
+ }
64
+ };
65
+ func.tags = ["ProtocolShareReserve"];
66
+ exports.default = func;
67
+ //# sourceMappingURL=000-psr.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"000-psr.js","sourceRoot":"","sources":["../../deploy/000-psr.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAsC;AAItC,4CAA0D;AAE1D,MAAM,IAAI,GAAmB,KAAK,EAAE,EAClC,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EACvB,gBAAgB,EAChB,WAAW,GACe,EAAE,EAAE;IAC9B,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;IAC/B,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,gBAAgB,EAAE,CAAC;IAE9C,MAAM,WAAW,GAAG,CAAC,MAAM,gBAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,IAAI,mBAAW,CAAC;IACrF,MAAM,kBAAkB,GAAG,CAAC,MAAM,gBAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,EAAE,OAAO,CAAC;IAC7E,MAAM,WAAW,GAAG,CAAC,MAAM,gBAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,IAAI,mBAAW,CAAC;IACrF,MAAM,eAAe,GAAG,CAAC,MAAM,gBAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC,EAAE,OAAO,IAAI,iBAAS,CAAC,IAAI,CAAC,CAAC;IACjG,MAAM,UAAU,GAAG,CAAC,MAAM,gBAAM,CAAC,WAAW,CAAC,sBAAsB,CAAC,CAAC,EAAE,OAAO,CAAC;IAC/E,MAAM,UAAU,GAAG,EAAE,CAAC;IAEtB,MAAM,iBAAiB,GAAG,MAAM,iBAAG,CAAC,SAAS,CAAC,YAAY,CACxD,kFAAkF,CACnF,CAAC;IAEF,MAAM,MAAM,CAAC,sBAAsB,EAAE;QACnC,IAAI,EAAE,QAAQ;QACd,GAAG,EAAE,IAAI;QACT,uBAAuB,EAAE,KAAK;QAC9B,IAAI,EAAE,CAAC,kBAAkB,EAAE,WAAW,EAAE,WAAW,CAAC;QACpD,KAAK,EAAE,IAAI;YACT,CAAC,CAAC;gBACE,KAAK,EAAE,eAAe;gBACtB,aAAa,EAAE,8BAA8B;gBAC7C,OAAO,EAAE;oBACP,UAAU,EAAE,YAAY;oBACxB,IAAI,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC;iBAC/B;gBACD,gBAAgB,EAAE;oBAChB,IAAI,EAAE,mBAAmB;oBACzB,QAAQ,EAAE,iBAAiB;iBAC5B;aACF;YACH,CAAC,CAAC,SAAS;KACd,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,MAAM,iBAAG,CAAC,MAAM,CAAC,WAAW,CAAC,sBAAsB,CAAC,CAAC;IAEjE,IAAI,IAAI,EAAE;QACR,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QACxD,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;KACzD;AACH,CAAC,CAAC;AAEF,IAAI,CAAC,IAAI,GAAG,CAAC,sBAAsB,CAAC,CAAC;AAErC,kBAAe,IAAI,CAAC"}
@@ -1,4 +1,4 @@
1
1
  import { DeployFunction } from "hardhat-deploy/types";
2
2
  declare const func: DeployFunction;
3
3
  export default func;
4
- //# sourceMappingURL=006-risk-fund-v2.d.ts.map
4
+ //# sourceMappingURL=001-risk-fund-v2.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"001-risk-fund-v2.d.ts","sourceRoot":"","sources":["../../deploy/001-risk-fund-v2.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAKtD,QAAA,MAAM,IAAI,EAAE,cAsCX,CAAC;AAIF,eAAe,IAAI,CAAC"}
@@ -0,0 +1,38 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const hardhat_1 = require("hardhat");
4
+ const utils_1 = require("../helpers/utils");
5
+ const func = async ({ network: { name, live }, getNamedAccounts, deployments, }) => {
6
+ const { deploy } = deployments;
7
+ const { deployer } = await getNamedAccounts();
8
+ const proxyAdmin = await hardhat_1.ethers.getContract("DefaultProxyAdmin");
9
+ let owner = deployer;
10
+ if (live) {
11
+ owner = await proxyAdmin.owner();
12
+ }
13
+ await deploy("RiskFundV2", {
14
+ from: deployer,
15
+ contract: "RiskFundV2",
16
+ proxy: live
17
+ ? {
18
+ owner: owner,
19
+ proxyContract: "OpenZeppelinTransparentProxy",
20
+ upgradeIndex: 0,
21
+ }
22
+ : undefined,
23
+ autoMine: true,
24
+ log: true,
25
+ });
26
+ if (live) {
27
+ const targetOwner = (await hardhat_1.ethers.getContractOrNull("NormalTimelock"))?.address || utils_1.multisigs[name];
28
+ const contract = await hardhat_1.ethers.getContract("RiskFundV2");
29
+ if ((await contract.owner()) !== targetOwner && (await contract.pendingOwner()) !== targetOwner) {
30
+ console.log(`Transferring ownership of RiskFundV2 to ${targetOwner}`);
31
+ const tx = await contract.transferOwnership(targetOwner);
32
+ await tx.wait();
33
+ }
34
+ }
35
+ };
36
+ func.tags = ["RiskFundV2"];
37
+ exports.default = func;
38
+ //# sourceMappingURL=001-risk-fund-v2.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"001-risk-fund-v2.js","sourceRoot":"","sources":["../../deploy/001-risk-fund-v2.ts"],"names":[],"mappings":";;AAAA,qCAAiC;AAIjC,4CAA6C;AAE7C,MAAM,IAAI,GAAmB,KAAK,EAAE,EAClC,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EACvB,gBAAgB,EAChB,WAAW,GACe,EAAE,EAAE;IAC9B,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;IAC/B,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,gBAAgB,EAAE,CAAC;IAE9C,MAAM,UAAU,GAAG,MAAM,gBAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC;IACjE,IAAI,KAAK,GAAG,QAAQ,CAAC;IACrB,IAAI,IAAI,EAAE;QACR,KAAK,GAAG,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;KAClC;IAED,MAAM,MAAM,CAAC,YAAY,EAAE;QACzB,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,YAAY;QACtB,KAAK,EAAE,IAAI;YACT,CAAC,CAAC;gBACE,KAAK,EAAE,KAAK;gBACZ,aAAa,EAAE,8BAA8B;gBAC7C,YAAY,EAAE,CAAC;aAChB;YACH,CAAC,CAAC,SAAS;QACb,QAAQ,EAAE,IAAI;QACd,GAAG,EAAE,IAAI;KACV,CAAC,CAAC;IAEH,IAAI,IAAI,EAAE;QACR,MAAM,WAAW,GAAG,CAAC,MAAM,gBAAM,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC,EAAE,OAAO,IAAI,iBAAS,CAAC,IAAI,CAAC,CAAC;QAEnG,MAAM,QAAQ,GAAG,MAAM,gBAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QACxD,IAAI,CAAC,MAAM,QAAQ,CAAC,KAAK,EAAE,CAAC,KAAK,WAAW,IAAI,CAAC,MAAM,QAAQ,CAAC,YAAY,EAAE,CAAC,KAAK,WAAW,EAAE;YAC/F,OAAO,CAAC,GAAG,CAAC,2CAA2C,WAAW,EAAE,CAAC,CAAC;YACtE,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;YACzD,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;SACjB;KACF;AACH,CAAC,CAAC;AAEF,IAAI,CAAC,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC;AAE3B,kBAAe,IAAI,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"002-risk-fund-converter.d.ts","sourceRoot":"","sources":["../../deploy/002-risk-fund-converter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAOtD,QAAA,MAAM,IAAI,EAAE,cAmEX,CAAC;AAIF,eAAe,IAAI,CAAC"}
1
+ {"version":3,"file":"002-risk-fund-converter.d.ts","sourceRoot":"","sources":["../../deploy/002-risk-fund-converter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAOtD,QAAA,MAAM,IAAI,EAAE,cAuEX,CAAC;AAIF,eAAe,IAAI,CAAC"}
@@ -1,78 +1,72 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  const utils_1 = require("ethers/lib/utils");
13
4
  const hardhat_1 = require("hardhat");
14
5
  const utils_2 = require("../helpers/utils");
15
6
  const MIN_AMOUNT_TO_CONVERT = (0, utils_1.parseUnits)("10", 18);
16
- const func = ({ network: { live, name }, getNamedAccounts, deployments, }) => __awaiter(void 0, void 0, void 0, function* () {
17
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
7
+ const func = async ({ network: { live, name }, getNamedAccounts, deployments, }) => {
18
8
  const { deploy } = deployments;
19
- const { deployer } = yield getNamedAccounts();
20
- const acmAddress = ((_a = (yield hardhat_1.ethers.getContractOrNull("AccessControlManager"))) === null || _a === void 0 ? void 0 : _a.address) || utils_2.ADDRESS_ONE;
21
- const oracleAddress = ((_b = (yield hardhat_1.ethers.getContractOrNull("ResilientOracle"))) === null || _b === void 0 ? void 0 : _b.address) || utils_2.ADDRESS_ONE;
22
- const usdtAddress = ((_c = (yield hardhat_1.ethers.getContractOrNull("USDT"))) === null || _c === void 0 ? void 0 : _c.address) || utils_2.ADDRESS_ONE;
23
- const corePoolAddress = ((_d = (yield hardhat_1.ethers.getContractOrNull("Unitroller"))) === null || _d === void 0 ? void 0 : _d.address) || utils_2.ADDRESS_ONE;
24
- const btcbAddress = ((_e = (yield hardhat_1.ethers.getContractOrNull("BTCB"))) === null || _e === void 0 ? void 0 : _e.address) || utils_2.ADDRESS_ONE;
25
- const ethAddress = ((_f = (yield hardhat_1.ethers.getContractOrNull("ETH"))) === null || _f === void 0 ? void 0 : _f.address) || utils_2.ADDRESS_ONE;
26
- const vBNBAddress = ((_g = (yield hardhat_1.ethers.getContractOrNull("vBNB"))) === null || _g === void 0 ? void 0 : _g.address) || utils_2.ADDRESS_ONE;
27
- const wBNBAddress = ((_h = (yield hardhat_1.ethers.getContractOrNull("WBNB"))) === null || _h === void 0 ? void 0 : _h.address) || utils_2.ADDRESS_ONE;
28
- const riskFundAddress = ((_j = (yield hardhat_1.ethers.getContractOrNull("RiskFund"))) === null || _j === void 0 ? void 0 : _j.address) || utils_2.ADDRESS_ONE;
29
- const poolRegistryAddress = ((_k = (yield hardhat_1.ethers.getContractOrNull("PoolRegistry"))) === null || _k === void 0 ? void 0 : _k.address) || utils_2.ADDRESS_ONE;
30
- const poolDeFiAddress = ((_l = (yield hardhat_1.ethers.getContractOrNull("Comptroller_DeFi"))) === null || _l === void 0 ? void 0 : _l.address) || utils_2.ADDRESS_ONE;
31
- const poolGameFiAddress = ((_m = (yield hardhat_1.ethers.getContractOrNull("Comptroller_GameFi"))) === null || _m === void 0 ? void 0 : _m.address) || utils_2.ADDRESS_ONE;
32
- const poolTronAddress = ((_o = (yield hardhat_1.ethers.getContractOrNull("Comptroller_Tron"))) === null || _o === void 0 ? void 0 : _o.address) || utils_2.ADDRESS_ONE;
33
- const timelockAddress = ((_p = (yield hardhat_1.ethers.getContractOrNull("NormalTimelock"))) === null || _p === void 0 ? void 0 : _p.address) || utils_2.multisigs[name];
34
- let poolStableCoinAddress;
35
- if (hardhat_1.network.name === "bscmainnet") {
36
- poolStableCoinAddress = ((_q = (yield hardhat_1.ethers.getContractOrNull("Comptroller_Stablecoins"))) === null || _q === void 0 ? void 0 : _q.address) || utils_2.ADDRESS_ONE;
9
+ const { deployer } = await getNamedAccounts();
10
+ const acmAddress = (await hardhat_1.ethers.getContract("AccessControlManager"))?.address;
11
+ const oracleAddress = (await hardhat_1.ethers.getContract("ResilientOracle"))?.address;
12
+ const usdtAddress = (await hardhat_1.ethers.getContract("USDT"))?.address;
13
+ const corePoolAddress = (await hardhat_1.ethers.getContract("Unitroller"))?.address;
14
+ const btcbAddress = (await hardhat_1.ethers.getContract("BTCB"))?.address;
15
+ const ethAddress = (await hardhat_1.ethers.getContract("ETH"))?.address;
16
+ const vBNBAddress = (await hardhat_1.ethers.getContractOrNull("vBNB"))?.address || utils_2.ADDRESS_ONE;
17
+ const wBNBAddress = (await hardhat_1.ethers.getContractOrNull("WBNB"))?.address || utils_2.ADDRESS_ONE;
18
+ const riskFundAddress = (await hardhat_1.ethers.getContract("RiskFundV2"))?.address;
19
+ const poolRegistryAddress = (await hardhat_1.ethers.getContract("PoolRegistry"))?.address;
20
+ let comptrollers;
21
+ const timelockAddress = (await hardhat_1.ethers.getContract("NormalTimelock"))?.address || utils_2.multisigs[name];
22
+ if (live) {
23
+ const poolDeFiAddress = (await hardhat_1.ethers.getContract("Comptroller_DeFi"))?.address;
24
+ const poolGameFiAddress = (await hardhat_1.ethers.getContract("Comptroller_GameFi"))?.address;
25
+ const poolTronAddress = (await hardhat_1.ethers.getContract("Comptroller_Tron"))?.address;
26
+ const poolStableCoinAddress = (await hardhat_1.ethers.getContract("Comptroller_Stablecoins"))?.address;
27
+ comptrollers = [corePoolAddress, poolStableCoinAddress, poolDeFiAddress, poolGameFiAddress, poolTronAddress];
37
28
  }
38
29
  else {
39
- poolStableCoinAddress = ((_r = (yield hardhat_1.ethers.getContractOrNull("Comptroller_StableCoins"))) === null || _r === void 0 ? void 0 : _r.address) || utils_2.ADDRESS_ONE;
30
+ const pool1Address = (await hardhat_1.ethers.getContractOrNull("Comptroller_Pool1"))?.address || utils_2.ADDRESS_ONE;
31
+ const pool2Address = (await hardhat_1.ethers.getContractOrNull("Comptroller_Pool2"))?.address || utils_2.ADDRESS_ONE;
32
+ comptrollers = [pool1Address, pool2Address];
40
33
  }
41
- const comptrollers = [corePoolAddress, poolStableCoinAddress, poolDeFiAddress, poolGameFiAddress, poolTronAddress];
42
34
  const assets = [[usdtAddress, btcbAddress, ethAddress], [usdtAddress], [usdtAddress], [usdtAddress], [usdtAddress]];
43
35
  const values = [[true, true, true], [true], [true], [true], [true]];
44
- yield deploy("RiskFundConverter", {
36
+ await deploy("RiskFundConverter", {
45
37
  from: deployer,
46
38
  contract: "RiskFundConverter",
47
39
  args: [corePoolAddress, vBNBAddress, wBNBAddress],
48
- proxy: {
49
- owner: live ? timelockAddress : deployer,
50
- proxyContract: "OpenZeppelinTransparentProxy",
51
- execute: {
52
- methodName: "initialize",
53
- args: [
54
- acmAddress,
55
- oracleAddress,
56
- riskFundAddress,
57
- poolRegistryAddress,
58
- MIN_AMOUNT_TO_CONVERT,
59
- comptrollers,
60
- assets,
61
- values,
62
- ],
63
- },
64
- upgradeIndex: 0,
65
- },
40
+ proxy: live
41
+ ? {
42
+ owner: timelockAddress,
43
+ proxyContract: "OpenZeppelinTransparentProxy",
44
+ execute: {
45
+ methodName: "initialize",
46
+ args: [
47
+ acmAddress,
48
+ oracleAddress,
49
+ riskFundAddress,
50
+ poolRegistryAddress,
51
+ MIN_AMOUNT_TO_CONVERT,
52
+ comptrollers,
53
+ assets,
54
+ values,
55
+ ],
56
+ },
57
+ upgradeIndex: 0,
58
+ }
59
+ : undefined,
66
60
  autoMine: true,
67
61
  log: true,
68
62
  });
69
- const converter = yield hardhat_1.ethers.getContract("RiskFundConverter");
63
+ const converter = await hardhat_1.ethers.getContract("RiskFundConverter");
70
64
  if (live) {
71
- const tx = yield converter.transferOwnership(timelockAddress);
72
- yield tx.wait();
65
+ const tx = await converter.transferOwnership(timelockAddress);
66
+ await tx.wait();
73
67
  console.log(`Transferred ownership of RiskFundConverter to Timelock`);
74
68
  }
75
- });
69
+ };
76
70
  func.tags = ["RiskFundConverter"];
77
71
  exports.default = func;
78
72
  //# sourceMappingURL=002-risk-fund-converter.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"002-risk-fund-converter.js","sourceRoot":"","sources":["../../deploy/002-risk-fund-converter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"002-risk-fund-converter.js","sourceRoot":"","sources":["../../deploy/002-risk-fund-converter.ts"],"names":[],"mappings":";;AAAA,4CAA8C;AAC9C,qCAAiC;AAIjC,4CAA0D;AAE1D,MAAM,qBAAqB,GAAG,IAAA,kBAAU,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AAEnD,MAAM,IAAI,GAAmB,KAAK,EAAE,EAClC,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EACvB,gBAAgB,EAChB,WAAW,GACe,EAAE,EAAE;IAC9B,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;IAC/B,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,gBAAgB,EAAE,CAAC;IAE9C,MAAM,UAAU,GAAG,CAAC,MAAM,gBAAM,CAAC,WAAW,CAAC,sBAAsB,CAAC,CAAC,EAAE,OAAO,CAAC;IAC/E,MAAM,aAAa,GAAG,CAAC,MAAM,gBAAM,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC,EAAE,OAAO,CAAC;IAC7E,MAAM,WAAW,GAAG,CAAC,MAAM,gBAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC;IAChE,MAAM,eAAe,GAAG,CAAC,MAAM,gBAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,EAAE,OAAO,CAAC;IAC1E,MAAM,WAAW,GAAG,CAAC,MAAM,gBAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC;IAEhE,MAAM,UAAU,GAAG,CAAC,MAAM,gBAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC;IAC9D,MAAM,WAAW,GAAG,CAAC,MAAM,gBAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,IAAI,mBAAW,CAAC;IACrF,MAAM,WAAW,GAAG,CAAC,MAAM,gBAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,IAAI,mBAAW,CAAC;IACrF,MAAM,eAAe,GAAG,CAAC,MAAM,gBAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,EAAE,OAAO,CAAC;IAC1E,MAAM,mBAAmB,GAAG,CAAC,MAAM,gBAAM,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,EAAE,OAAO,CAAC;IAChF,IAAI,YAAY,CAAC;IACjB,MAAM,eAAe,GAAG,CAAC,MAAM,gBAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC,EAAE,OAAO,IAAI,iBAAS,CAAC,IAAI,CAAC,CAAC;IACjG,IAAI,IAAI,EAAE;QACR,MAAM,eAAe,GAAG,CAAC,MAAM,gBAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,EAAE,OAAO,CAAC;QAChF,MAAM,iBAAiB,GAAG,CAAC,MAAM,gBAAM,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC,EAAE,OAAO,CAAC;QACpF,MAAM,eAAe,GAAG,CAAC,MAAM,gBAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,EAAE,OAAO,CAAC;QAChF,MAAM,qBAAqB,GAAG,CAAC,MAAM,gBAAM,CAAC,WAAW,CAAC,yBAAyB,CAAC,CAAC,EAAE,OAAO,CAAC;QAC7F,YAAY,GAAG,CAAC,eAAe,EAAE,qBAAqB,EAAE,eAAe,EAAE,iBAAiB,EAAE,eAAe,CAAC,CAAC;KAC9G;SAAM;QACL,MAAM,YAAY,GAAG,CAAC,MAAM,gBAAM,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,CAAC,EAAE,OAAO,IAAI,mBAAW,CAAC;QACnG,MAAM,YAAY,GAAG,CAAC,MAAM,gBAAM,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,CAAC,EAAE,OAAO,IAAI,mBAAW,CAAC;QACnG,YAAY,GAAG,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;KAC7C;IAED,MAAM,MAAM,GAAG,CAAC,CAAC,WAAW,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IACpH,MAAM,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEpE,MAAM,MAAM,CAAC,mBAAmB,EAAE;QAChC,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,mBAAmB;QAC7B,IAAI,EAAE,CAAC,eAAe,EAAE,WAAW,EAAE,WAAW,CAAC;QACjD,KAAK,EAAE,IAAI;YACT,CAAC,CAAC;gBACE,KAAK,EAAE,eAAe;gBACtB,aAAa,EAAE,8BAA8B;gBAC7C,OAAO,EAAE;oBACP,UAAU,EAAE,YAAY;oBACxB,IAAI,EAAE;wBACJ,UAAU;wBACV,aAAa;wBACb,eAAe;wBACf,mBAAmB;wBACnB,qBAAqB;wBACrB,YAAY;wBACZ,MAAM;wBACN,MAAM;qBACP;iBACF;gBACD,YAAY,EAAE,CAAC;aAChB;YACH,CAAC,CAAC,SAAS;QACb,QAAQ,EAAE,IAAI;QACd,GAAG,EAAE,IAAI;KACV,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,MAAM,gBAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC;IAEhE,IAAI,IAAI,EAAE;QACR,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QAC9D,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,wDAAwD,CAAC,CAAC;KACvE;AACH,CAAC,CAAC;AAEF,IAAI,CAAC,IAAI,GAAG,CAAC,mBAAmB,CAAC,CAAC;AAElC,kBAAe,IAAI,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"003-xvs-vault-treasury.d.ts","sourceRoot":"","sources":["../../deploy/003-xvs-vault-treasury.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAI1D,QAAA,MAAM,IAAI;iEAAsE,yBAAyB;;CAgCxG,CAAC;AAIF,eAAe,IAAI,CAAC"}
1
+ {"version":3,"file":"003-xvs-vault-treasury.d.ts","sourceRoot":"","sources":["../../deploy/003-xvs-vault-treasury.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAI1D,QAAA,MAAM,IAAI;iEAAsE,yBAAyB;;CAiCxG,CAAC;AAIF,eAAe,IAAI,CAAC"}
@@ -1,45 +1,37 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  const hardhat_1 = require("hardhat");
13
4
  const utils_1 = require("../helpers/utils");
14
- const func = ({ network: { live, name }, getNamedAccounts, deployments }) => __awaiter(void 0, void 0, void 0, function* () {
15
- var _a, _b, _c, _d;
5
+ const func = async ({ network: { live, name }, getNamedAccounts, deployments }) => {
16
6
  const { deploy } = deployments;
17
- const { deployer } = yield getNamedAccounts();
18
- const xvsAddress = ((_a = (yield hardhat_1.ethers.getContractOrNull("XVS"))) === null || _a === void 0 ? void 0 : _a.address) || utils_1.ADDRESS_ONE;
19
- const proxyOwnerAddress = ((_b = (yield hardhat_1.ethers.getContractOrNull("NormalTimelock"))) === null || _b === void 0 ? void 0 : _b.address) || utils_1.multisigs[name] || utils_1.ADDRESS_ONE;
20
- const acmAddress = ((_c = (yield hardhat_1.ethers.getContractOrNull("AccessControlManager"))) === null || _c === void 0 ? void 0 : _c.address) || utils_1.ADDRESS_ONE;
21
- const xvsVaultAddress = ((_d = (yield hardhat_1.ethers.getContractOrNull("XVSVaultProxy"))) === null || _d === void 0 ? void 0 : _d.address) || utils_1.ADDRESS_ONE;
22
- yield deploy("XVSVaultTreasury", {
7
+ const { deployer } = await getNamedAccounts();
8
+ const xvsAddress = (await hardhat_1.ethers.getContract("XVS"))?.address;
9
+ const proxyOwnerAddress = (await hardhat_1.ethers.getContractOrNull("NormalTimelock"))?.address || utils_1.multisigs[name];
10
+ const acmAddress = (await hardhat_1.ethers.getContract("AccessControlManager"))?.address;
11
+ const xvsVaultAddress = (await hardhat_1.ethers.getContract("XVSVaultProxy"))?.address;
12
+ await deploy("XVSVaultTreasury", {
23
13
  from: deployer,
24
14
  log: true,
25
15
  deterministicDeployment: false,
26
16
  args: [xvsAddress],
27
- proxy: {
28
- owner: live ? proxyOwnerAddress : deployer,
29
- proxyContract: "OpenZeppelinTransparentProxy",
30
- execute: {
31
- methodName: "initialize",
32
- args: [acmAddress, xvsVaultAddress],
33
- },
34
- },
17
+ proxy: live
18
+ ? {
19
+ owner: proxyOwnerAddress,
20
+ proxyContract: "OpenZeppelinTransparentProxy",
21
+ execute: {
22
+ methodName: "initialize",
23
+ args: [acmAddress, xvsVaultAddress],
24
+ },
25
+ }
26
+ : undefined,
35
27
  });
36
- const xvsVaultTreasury = yield hardhat_1.ethers.getContract("XVSVaultTreasury");
28
+ const xvsVaultTreasury = await hardhat_1.ethers.getContract("XVSVaultTreasury");
37
29
  if (live) {
38
- const tx = yield xvsVaultTreasury.transferOwnership(proxyOwnerAddress);
39
- yield tx.wait();
30
+ const tx = await xvsVaultTreasury.transferOwnership(proxyOwnerAddress);
31
+ await tx.wait();
40
32
  console.log("Transferred ownership of XVSVaultTreasury to Timelock");
41
33
  }
42
- });
34
+ };
43
35
  func.tags = ["XVSVaultTreasury"];
44
36
  exports.default = func;
45
37
  //# sourceMappingURL=003-xvs-vault-treasury.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"003-xvs-vault-treasury.js","sourceRoot":"","sources":["../../deploy/003-xvs-vault-treasury.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,qCAAiC;AAGjC,4CAA0D;AAE1D,MAAM,IAAI,GAAG,CAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,gBAAgB,EAAE,WAAW,EAA6B,EAAE,EAAE;;IAC3G,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;IAC/B,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,gBAAgB,EAAE,CAAC;IAE9C,MAAM,UAAU,GAAG,CAAA,MAAA,CAAC,MAAM,gBAAM,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,0CAAE,OAAO,KAAI,mBAAW,CAAC;IACnF,MAAM,iBAAiB,GACrB,CAAA,MAAA,CAAC,MAAM,gBAAM,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC,0CAAE,OAAO,KAAI,iBAAS,CAAC,IAAI,CAAC,IAAI,mBAAW,CAAC;IAChG,MAAM,UAAU,GAAG,CAAA,MAAA,CAAC,MAAM,gBAAM,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,CAAC,0CAAE,OAAO,KAAI,mBAAW,CAAC;IACpG,MAAM,eAAe,GAAG,CAAA,MAAA,CAAC,MAAM,gBAAM,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC,0CAAE,OAAO,KAAI,mBAAW,CAAC;IAElG,MAAM,MAAM,CAAC,kBAAkB,EAAE;QAC/B,IAAI,EAAE,QAAQ;QACd,GAAG,EAAE,IAAI;QACT,uBAAuB,EAAE,KAAK;QAC9B,IAAI,EAAE,CAAC,UAAU,CAAC;QAClB,KAAK,EAAE;YACL,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,QAAQ;YAC1C,aAAa,EAAE,8BAA8B;YAC7C,OAAO,EAAE;gBACP,UAAU,EAAE,YAAY;gBACxB,IAAI,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC;aACpC;SACF;KACF,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,MAAM,gBAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;IAEtE,IAAI,IAAI,EAAE;QACR,MAAM,EAAE,GAAG,MAAM,gBAAgB,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;QACvE,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;KACtE;AACH,CAAC,CAAA,CAAC;AAEF,IAAI,CAAC,IAAI,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAEjC,kBAAe,IAAI,CAAC"}
1
+ {"version":3,"file":"003-xvs-vault-treasury.js","sourceRoot":"","sources":["../../deploy/003-xvs-vault-treasury.ts"],"names":[],"mappings":";;AAAA,qCAAiC;AAGjC,4CAA6C;AAE7C,MAAM,IAAI,GAAG,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,gBAAgB,EAAE,WAAW,EAA6B,EAAE,EAAE;IAC3G,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;IAC/B,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,gBAAgB,EAAE,CAAC;IAE9C,MAAM,UAAU,GAAG,CAAC,MAAM,gBAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC;IAC9D,MAAM,iBAAiB,GAAG,CAAC,MAAM,gBAAM,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC,EAAE,OAAO,IAAI,iBAAS,CAAC,IAAI,CAAC,CAAC;IACzG,MAAM,UAAU,GAAG,CAAC,MAAM,gBAAM,CAAC,WAAW,CAAC,sBAAsB,CAAC,CAAC,EAAE,OAAO,CAAC;IAC/E,MAAM,eAAe,GAAG,CAAC,MAAM,gBAAM,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,EAAE,OAAO,CAAC;IAE7E,MAAM,MAAM,CAAC,kBAAkB,EAAE;QAC/B,IAAI,EAAE,QAAQ;QACd,GAAG,EAAE,IAAI;QACT,uBAAuB,EAAE,KAAK;QAC9B,IAAI,EAAE,CAAC,UAAU,CAAC;QAClB,KAAK,EAAE,IAAI;YACT,CAAC,CAAC;gBACE,KAAK,EAAE,iBAAiB;gBACxB,aAAa,EAAE,8BAA8B;gBAC7C,OAAO,EAAE;oBACP,UAAU,EAAE,YAAY;oBACxB,IAAI,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC;iBACpC;aACF;YACH,CAAC,CAAC,SAAS;KACd,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,MAAM,gBAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC;IAEtE,IAAI,IAAI,EAAE;QACR,MAAM,EAAE,GAAG,MAAM,gBAAgB,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;QACvE,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;QAChB,OAAO,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC;KACtE;AACH,CAAC,CAAC;AAEF,IAAI,CAAC,IAAI,GAAG,CAAC,kBAAkB,CAAC,CAAC;AAEjC,kBAAe,IAAI,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"004-single-token-converter.d.ts","sourceRoot":"","sources":["../../deploy/004-single-token-converter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAqDtD,QAAA,MAAM,IAAI,EAAE,cA0DX,CAAC;AAIF,eAAe,IAAI,CAAC"}
1
+ {"version":3,"file":"004-single-token-converter.d.ts","sourceRoot":"","sources":["../../deploy/004-single-token-converter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAqEtD,QAAA,MAAM,IAAI,EAAE,cA0DX,CAAC;AAIF,eAAe,IAAI,CAAC"}