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

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 (34) hide show
  1. package/dist/deploy/{001-psr.d.ts → 000-psr.d.ts} +1 -1
  2. package/dist/deploy/000-psr.d.ts.map +1 -0
  3. package/dist/deploy/000-psr.js +67 -0
  4. package/dist/deploy/000-psr.js.map +1 -0
  5. package/dist/deploy/{006-risk-fund-v2.d.ts → 001-risk-fund-v2.d.ts} +1 -1
  6. package/dist/deploy/001-risk-fund-v2.d.ts.map +1 -0
  7. package/dist/deploy/001-risk-fund-v2.js +38 -0
  8. package/dist/deploy/001-risk-fund-v2.js.map +1 -0
  9. package/dist/deploy/002-risk-fund-converter.d.ts.map +1 -1
  10. package/dist/deploy/002-risk-fund-converter.js +48 -54
  11. package/dist/deploy/002-risk-fund-converter.js.map +1 -1
  12. package/dist/deploy/003-xvs-vault-treasury.d.ts.map +1 -1
  13. package/dist/deploy/003-xvs-vault-treasury.js +21 -29
  14. package/dist/deploy/003-xvs-vault-treasury.js.map +1 -1
  15. package/dist/deploy/004-single-token-converter.d.ts.map +1 -1
  16. package/dist/deploy/004-single-token-converter.js +86 -94
  17. package/dist/deploy/004-single-token-converter.js.map +1 -1
  18. package/dist/deploy/005-converter-network.d.ts.map +1 -1
  19. package/dist/deploy/005-converter-network.js +19 -27
  20. package/dist/deploy/005-converter-network.js.map +1 -1
  21. package/dist/hardhat.config.d.ts.map +1 -1
  22. package/dist/hardhat.config.js +10 -13
  23. package/dist/hardhat.config.js.map +1 -1
  24. package/dist/helpers/utils.d.ts +0 -1
  25. package/dist/helpers/utils.d.ts.map +1 -1
  26. package/dist/helpers/utils.js +1 -2
  27. package/dist/helpers/utils.js.map +1 -1
  28. package/package.json +1 -1
  29. package/dist/deploy/001-psr.d.ts.map +0 -1
  30. package/dist/deploy/001-psr.js +0 -76
  31. package/dist/deploy/001-psr.js.map +0 -1
  32. package/dist/deploy/006-risk-fund-v2.d.ts.map +0 -1
  33. package/dist/deploy/006-risk-fund-v2.js +0 -43
  34. package/dist/deploy/006-risk-fund-v2.js.map +0 -1
@@ -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":"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"}
@@ -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;AA8DtD,QAAA,MAAM,IAAI,EAAE,cA0DX,CAAC;AAIF,eAAe,IAAI,CAAC"}
@@ -1,109 +1,101 @@
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
- function getBaseAssets(network) {
16
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
17
- return __awaiter(this, void 0, void 0, function* () {
18
- const networkBaseAssets = {
19
- bsctestnet: {
20
- USDTPrimeConverter: ((_a = (yield hardhat_1.ethers.getContractOrNull("USDT"))) === null || _a === void 0 ? void 0 : _a.address) || utils_2.ADDRESS_ONE,
21
- USDCPrimeConverter: ((_b = (yield hardhat_1.ethers.getContractOrNull("USDC"))) === null || _b === void 0 ? void 0 : _b.address) || utils_2.ADDRESS_ONE,
22
- BTCBPrimeConverter: ((_c = (yield hardhat_1.ethers.getContractOrNull("BTCB"))) === null || _c === void 0 ? void 0 : _c.address) || utils_2.ADDRESS_ONE,
23
- ETHPrimeConverter: ((_d = (yield hardhat_1.ethers.getContractOrNull("ETH"))) === null || _d === void 0 ? void 0 : _d.address) || utils_2.ADDRESS_ONE,
24
- XVSVaultConverter: ((_e = (yield hardhat_1.ethers.getContractOrNull("XVS"))) === null || _e === void 0 ? void 0 : _e.address) || utils_2.ADDRESS_TWO,
25
- },
26
- bscmainnet: {
27
- USDTPrimeConverter: ((_f = (yield hardhat_1.ethers.getContractOrNull("USDT"))) === null || _f === void 0 ? void 0 : _f.address) || utils_2.ADDRESS_ONE,
28
- USDCPrimeConverter: ((_g = (yield hardhat_1.ethers.getContractOrNull("USDC"))) === null || _g === void 0 ? void 0 : _g.address) || utils_2.ADDRESS_ONE,
29
- BTCBPrimeConverter: ((_h = (yield hardhat_1.ethers.getContractOrNull("BTCB"))) === null || _h === void 0 ? void 0 : _h.address) || utils_2.ADDRESS_ONE,
30
- ETHPrimeConverter: ((_j = (yield hardhat_1.ethers.getContractOrNull("ETH"))) === null || _j === void 0 ? void 0 : _j.address) || utils_2.ADDRESS_ONE,
31
- XVSVaultConverter: ((_k = (yield hardhat_1.ethers.getContractOrNull("XVS"))) === null || _k === void 0 ? void 0 : _k.address) || utils_2.ADDRESS_TWO,
32
- },
33
- sepolia: {
34
- USDTPrimeConverter: ((_l = (yield hardhat_1.ethers.getContractOrNull("MockUSDT"))) === null || _l === void 0 ? void 0 : _l.address) || utils_2.ADDRESS_ONE,
35
- USDCPrimeConverter: ((_m = (yield hardhat_1.ethers.getContractOrNull("MockUSDC"))) === null || _m === void 0 ? void 0 : _m.address) || utils_2.ADDRESS_ONE,
36
- WBTCPrimeConverter: ((_o = (yield hardhat_1.ethers.getContractOrNull("MockWBTC"))) === null || _o === void 0 ? void 0 : _o.address) || utils_2.ADDRESS_ONE,
37
- WETHPrimeConverter: "0x7b79995e5f793A07Bc00c21412e50Ecae098E7f9",
38
- XVSVaultConverter: ((_p = (yield hardhat_1.ethers.getContractOrNull("XVS"))) === null || _p === void 0 ? void 0 : _p.address) || utils_2.ADDRESS_TWO,
39
- },
40
- ethereum: {
41
- USDTPrimeConverter: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
42
- USDCPrimeConverter: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
43
- WBTCPrimeConverter: "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
44
- WETHPrimeConverter: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
45
- XVSVaultConverter: ((_q = (yield hardhat_1.ethers.getContractOrNull("XVS"))) === null || _q === void 0 ? void 0 : _q.address) || utils_2.ADDRESS_TWO,
46
- },
47
- arbitrumsepolia: {
48
- USDTPrimeConverter: "0xf3118a17863996B9F2A073c9A66Faaa664355cf8",
49
- USDCPrimeConverter: "0x86f096B1D970990091319835faF3Ee011708eAe8",
50
- WBTCPrimeConverter: "0xFb8d93FD3Cf18386a5564bb5619cD1FdB130dF7D",
51
- WETHPrimeConverter: "0x980B62Da83eFf3D4576C647993b0c1D7faf17c73",
52
- XVSVaultConverter: "0x877Dc896e7b13096D3827872e396927BbE704407",
53
- },
54
- };
55
- return networkBaseAssets[network];
56
- });
6
+ async function getBaseAssets(network) {
7
+ const networkBaseAssets = {
8
+ hardhat: async () => ({
9
+ USDTPrimeConverter: (await hardhat_1.ethers.getContract("USDT"))?.address,
10
+ USDCPrimeConverter: (await hardhat_1.ethers.getContract("USDC"))?.address,
11
+ BTCBPrimeConverter: (await hardhat_1.ethers.getContract("BTCB"))?.address,
12
+ ETHPrimeConverter: (await hardhat_1.ethers.getContract("ETH"))?.address,
13
+ XVSVaultConverter: (await hardhat_1.ethers.getContract("XVS"))?.address,
14
+ }),
15
+ bsctestnet: async () => ({
16
+ USDTPrimeConverter: (await hardhat_1.ethers.getContract("USDT"))?.address,
17
+ USDCPrimeConverter: (await hardhat_1.ethers.getContract("USDC"))?.address,
18
+ BTCBPrimeConverter: (await hardhat_1.ethers.getContract("BTCB"))?.address,
19
+ ETHPrimeConverter: (await hardhat_1.ethers.getContract("ETH"))?.address,
20
+ XVSVaultConverter: (await hardhat_1.ethers.getContract("XVS"))?.address,
21
+ }),
22
+ bscmainnet: async () => ({
23
+ USDTPrimeConverter: (await hardhat_1.ethers.getContract("USDT"))?.address,
24
+ USDCPrimeConverter: (await hardhat_1.ethers.getContract("USDC"))?.address,
25
+ BTCBPrimeConverter: (await hardhat_1.ethers.getContract("BTCB"))?.address,
26
+ ETHPrimeConverter: (await hardhat_1.ethers.getContract("ETH"))?.address,
27
+ XVSVaultConverter: (await hardhat_1.ethers.getContract("XVS"))?.address,
28
+ }),
29
+ sepolia: async () => ({
30
+ USDTPrimeConverter: (await hardhat_1.ethers.getContract("MockUSDT"))?.address,
31
+ USDCPrimeConverter: (await hardhat_1.ethers.getContract("MockUSDC"))?.address,
32
+ WBTCPrimeConverter: (await hardhat_1.ethers.getContract("MockWBTC"))?.address,
33
+ WETHPrimeConverter: "0x7b79995e5f793A07Bc00c21412e50Ecae098E7f9",
34
+ XVSVaultConverter: (await hardhat_1.ethers.getContract("XVS"))?.address,
35
+ }),
36
+ ethereum: async () => ({
37
+ USDTPrimeConverter: "0xdAC17F958D2ee523a2206206994597C13D831ec7",
38
+ USDCPrimeConverter: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
39
+ WBTCPrimeConverter: "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
40
+ WETHPrimeConverter: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
41
+ XVSVaultConverter: (await hardhat_1.ethers.getContract("XVS"))?.address,
42
+ }),
43
+ arbitrumsepolia: async () => ({
44
+ USDTPrimeConverter: "0xf3118a17863996B9F2A073c9A66Faaa664355cf8",
45
+ USDCPrimeConverter: "0x86f096B1D970990091319835faF3Ee011708eAe8",
46
+ WBTCPrimeConverter: "0xFb8d93FD3Cf18386a5564bb5619cD1FdB130dF7D",
47
+ WETHPrimeConverter: "0x980B62Da83eFf3D4576C647993b0c1D7faf17c73",
48
+ XVSVaultConverter: "0x877Dc896e7b13096D3827872e396927BbE704407",
49
+ }),
50
+ };
51
+ return await networkBaseAssets[network]();
57
52
  }
58
53
  const MIN_AMOUNT_TO_CONVERT = (0, utils_1.parseUnits)("10", 18).toString();
59
- const func = function (hre) {
60
- var _a, _b, _c, _d, _e, _f;
61
- return __awaiter(this, void 0, void 0, function* () {
62
- const { deployments, getNamedAccounts, network } = hre;
63
- const { deploy } = deployments;
64
- const { deployer } = yield getNamedAccounts();
65
- const networkName = network.name;
66
- const baseAssets = yield getBaseAssets(networkName);
67
- const acmAddress = ((_a = (yield hardhat_1.ethers.getContractOrNull("AccessControlManager"))) === null || _a === void 0 ? void 0 : _a.address) || utils_2.ADDRESS_ONE;
68
- const oracleAddress = ((_b = (yield hardhat_1.ethers.getContractOrNull("ResilientOracle"))) === null || _b === void 0 ? void 0 : _b.address) || utils_2.ADDRESS_ONE;
69
- const proxyOwnerAddress = ((_c = (yield hardhat_1.ethers.getContractOrNull("NormalTimelock"))) === null || _c === void 0 ? void 0 : _c.address) || utils_2.multisigs[networkName] || utils_2.ADDRESS_ONE;
70
- const singleTokenConverterImp = yield deploy("SingleTokenConverterImp", {
71
- contract: "SingleTokenConverter",
72
- from: deployer,
73
- args: [],
74
- log: true,
75
- autoMine: true,
76
- });
77
- const SingleTokenConverterBeacon = yield deploy("SingleTokenConverterBeacon", {
78
- contract: "UpgradeableBeacon",
54
+ const func = async function (hre) {
55
+ const { deployments, getNamedAccounts, network } = hre;
56
+ const { deploy } = deployments;
57
+ const { deployer } = await getNamedAccounts();
58
+ const networkName = network.name;
59
+ const baseAssets = await getBaseAssets(networkName);
60
+ const acmAddress = (await hardhat_1.ethers.getContract("AccessControlManager"))?.address;
61
+ const oracleAddress = (await hardhat_1.ethers.getContract("ResilientOracle"))?.address;
62
+ const proxyOwnerAddress = (await hardhat_1.ethers.getContract("NormalTimelock"))?.address || utils_2.multisigs[networkName];
63
+ const singleTokenConverterImp = await deploy("SingleTokenConverterImp", {
64
+ contract: "SingleTokenConverter",
65
+ from: deployer,
66
+ args: [],
67
+ log: true,
68
+ autoMine: true,
69
+ });
70
+ const SingleTokenConverterBeacon = await deploy("SingleTokenConverterBeacon", {
71
+ contract: "UpgradeableBeacon",
72
+ from: deployer,
73
+ args: [singleTokenConverterImp.address],
74
+ log: true,
75
+ autoMine: true,
76
+ });
77
+ const SingleTokenConverter = await hardhat_1.ethers.getContractFactory("SingleTokenConverter");
78
+ for (const singleTokenConverterName in baseAssets) {
79
+ const baseAsset = baseAssets[singleTokenConverterName];
80
+ let destinationAddress = (await hardhat_1.ethers.getContract("PrimeLiquidityProvider"))?.address;
81
+ if (baseAsset == (await hardhat_1.ethers.getContract("XVS"))?.address) {
82
+ destinationAddress = (await hardhat_1.ethers.getContract("XVSVaultTreasury"))?.address;
83
+ }
84
+ const args = [acmAddress, oracleAddress, destinationAddress, baseAsset, MIN_AMOUNT_TO_CONVERT];
85
+ const converterProxy = await deploy(singleTokenConverterName, {
79
86
  from: deployer,
80
- args: [singleTokenConverterImp.address],
87
+ contract: "BeaconProxy",
88
+ args: [SingleTokenConverterBeacon.address, SingleTokenConverter.interface.encodeFunctionData("initialize", args)],
81
89
  log: true,
82
90
  autoMine: true,
83
91
  });
84
- const SingleTokenConverter = yield hardhat_1.ethers.getContractFactory("SingleTokenConverter");
85
- for (const singleTokenConverterName in baseAssets) {
86
- const baseAsset = baseAssets[singleTokenConverterName];
87
- let destinationAddress = ((_d = (yield hardhat_1.ethers.getContractOrNull("PrimeLiquidityProvider"))) === null || _d === void 0 ? void 0 : _d.address) || utils_2.ADDRESS_ONE;
88
- if (baseAsset == (((_e = (yield hardhat_1.ethers.getContractOrNull("XVS"))) === null || _e === void 0 ? void 0 : _e.address) || utils_2.ADDRESS_TWO)) {
89
- destinationAddress = ((_f = (yield hardhat_1.ethers.getContractOrNull("XVSVaultTreasury"))) === null || _f === void 0 ? void 0 : _f.address) || utils_2.ADDRESS_ONE;
90
- }
91
- const args = [acmAddress, oracleAddress, destinationAddress, baseAsset, MIN_AMOUNT_TO_CONVERT];
92
- const converterProxy = yield deploy(singleTokenConverterName, {
93
- from: deployer,
94
- contract: "BeaconProxy",
95
- args: [SingleTokenConverterBeacon.address, SingleTokenConverter.interface.encodeFunctionData("initialize", args)],
96
- log: true,
97
- autoMine: true,
98
- });
99
- if (network.live) {
100
- const converter = yield hardhat_1.ethers.getContractAt("SingleTokenConverter", converterProxy.address);
101
- const tx = yield converter.transferOwnership(proxyOwnerAddress);
102
- yield tx.wait();
103
- console.log(`Transferred ownership of ${singleTokenConverterName} to Timelock: ` + proxyOwnerAddress);
104
- }
92
+ if (network.live) {
93
+ const converter = await hardhat_1.ethers.getContractAt("SingleTokenConverter", converterProxy.address);
94
+ const tx = await converter.transferOwnership(proxyOwnerAddress);
95
+ await tx.wait();
96
+ console.log(`Transferred ownership of ${singleTokenConverterName} to Timelock: ` + proxyOwnerAddress);
105
97
  }
106
- });
98
+ }
107
99
  };
108
100
  func.tags = ["SingleTokenConverter", "Converters"];
109
101
  exports.default = func;
@@ -1 +1 @@
1
- {"version":3,"file":"004-single-token-converter.js","sourceRoot":"","sources":["../../deploy/004-single-token-converter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"004-single-token-converter.js","sourceRoot":"","sources":["../../deploy/004-single-token-converter.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"005-converter-network.d.ts","sourceRoot":"","sources":["../../deploy/005-converter-network.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAM1D,QAAA,MAAM,IAAI;iEAAsE,yBAAyB;;CA4BxG,CAAC;AAIF,eAAe,IAAI,CAAC"}
1
+ {"version":3,"file":"005-converter-network.d.ts","sourceRoot":"","sources":["../../deploy/005-converter-network.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAM1D,QAAA,MAAM,IAAI;iEAAsE,yBAAyB;;CA8BxG,CAAC;AAIF,eAAe,IAAI,CAAC"}
@@ -1,43 +1,35 @@
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
5
  const MAX_LOOPS_LIMIT = 20;
15
- const func = ({ network: { live, name }, getNamedAccounts, deployments }) => __awaiter(void 0, void 0, void 0, function* () {
16
- var _a, _b;
6
+ const func = async ({ network: { live, name }, getNamedAccounts, deployments }) => {
17
7
  const { deploy } = deployments;
18
- const { deployer } = yield getNamedAccounts();
19
- const timelockAddress = ((_a = (yield hardhat_1.ethers.getContractOrNull("NormalTimelock"))) === null || _a === void 0 ? void 0 : _a.address) || utils_1.multisigs[name];
20
- const acmAddress = ((_b = (yield hardhat_1.ethers.getContractOrNull("AccessControlManager"))) === null || _b === void 0 ? void 0 : _b.address) || utils_1.ADDRESS_ONE;
21
- yield deploy("ConverterNetwork", {
8
+ const { deployer } = await getNamedAccounts();
9
+ const timelockAddress = (await hardhat_1.ethers.getContractOrNull("NormalTimelock"))?.address || utils_1.multisigs[name];
10
+ const acmAddress = (await hardhat_1.ethers.getContract("AccessControlManager"))?.address;
11
+ await deploy("ConverterNetwork", {
22
12
  from: deployer,
23
13
  log: true,
24
14
  deterministicDeployment: false,
25
- proxy: {
26
- owner: live ? timelockAddress : deployer,
27
- proxyContract: "OpenZeppelinTransparentProxy",
28
- execute: {
29
- methodName: "initialize",
30
- args: [acmAddress, MAX_LOOPS_LIMIT],
31
- },
32
- },
15
+ proxy: live
16
+ ? {
17
+ owner: timelockAddress,
18
+ proxyContract: "OpenZeppelinTransparentProxy",
19
+ execute: {
20
+ methodName: "initialize",
21
+ args: [acmAddress, MAX_LOOPS_LIMIT],
22
+ },
23
+ }
24
+ : undefined,
33
25
  });
34
- const converterNetwork = yield hardhat_1.ethers.getContract("ConverterNetwork");
26
+ const converterNetwork = await hardhat_1.ethers.getContract("ConverterNetwork");
35
27
  if (live) {
36
- const tx = yield converterNetwork.transferOwnership(timelockAddress);
37
- yield tx.wait();
28
+ const tx = await converterNetwork.transferOwnership(timelockAddress);
29
+ await tx.wait();
38
30
  console.log("Transferred ownership of ConverterNetwork to Timelock");
39
31
  }
40
- });
32
+ };
41
33
  func.tags = ["ConverterNetwork", "Converters"];
42
34
  exports.default = func;
43
35
  //# sourceMappingURL=005-converter-network.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"005-converter-network.js","sourceRoot":"","sources":["../../deploy/005-converter-network.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,qCAAiC;AAGjC,4CAA0D;AAE1D,MAAM,eAAe,GAAG,EAAE,CAAC;AAE3B,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,eAAe,GAAG,CAAA,MAAA,CAAC,MAAM,gBAAM,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC,0CAAE,OAAO,KAAI,iBAAS,CAAC,IAAI,CAAC,CAAC;IACvG,MAAM,UAAU,GAAG,CAAA,MAAA,CAAC,MAAM,gBAAM,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,CAAC,0CAAE,OAAO,KAAI,mBAAW,CAAC;IAEpG,MAAM,MAAM,CAAC,kBAAkB,EAAE;QAC/B,IAAI,EAAE,QAAQ;QACd,GAAG,EAAE,IAAI;QACT,uBAAuB,EAAE,KAAK;QAC9B,KAAK,EAAE;YACL,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,QAAQ;YACxC,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,eAAe,CAAC,CAAC;QACrE,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,EAAE,YAAY,CAAC,CAAC;AAE/C,kBAAe,IAAI,CAAC"}
1
+ {"version":3,"file":"005-converter-network.js","sourceRoot":"","sources":["../../deploy/005-converter-network.ts"],"names":[],"mappings":";;AAAA,qCAAiC;AAGjC,4CAA6C;AAE7C,MAAM,eAAe,GAAG,EAAE,CAAC;AAE3B,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,eAAe,GAAG,CAAC,MAAM,gBAAM,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC,EAAE,OAAO,IAAI,iBAAS,CAAC,IAAI,CAAC,CAAC;IACvG,MAAM,UAAU,GAAG,CAAC,MAAM,gBAAM,CAAC,WAAW,CAAC,sBAAsB,CAAC,CAAC,EAAE,OAAO,CAAC;IAE/E,MAAM,MAAM,CAAC,kBAAkB,EAAE;QAC/B,IAAI,EAAE,QAAQ;QACd,GAAG,EAAE,IAAI;QACT,uBAAuB,EAAE,KAAK;QAC9B,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,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,eAAe,CAAC,CAAC;QACrE,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,EAAE,YAAY,CAAC,CAAC;AAE/C,kBAAe,IAAI,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"hardhat.config.d.ts","sourceRoot":"","sources":["../hardhat.config.ts"],"names":[],"mappings":"AAAA,OAAO,uBAAuB,CAAC;AAE/B,OAAO,wCAAwC,CAAC;AAChD,OAAO,kCAAkC,CAAC;AAC1C,OAAO,2BAA2B,CAAC;AACnC,OAAO,8BAA8B,CAAC;AACtC,OAAO,gCAAgC,CAAC;AACxC,OAAO,oBAAoB,CAAC;AAE5B,OAAO,6BAA6B,CAAC;AACrC,OAAO,gBAAgB,CAAC;AACxB,OAAO,sBAAsB,CAAC;AAC9B,OAAO,EAAE,iBAAiB,EAAsB,MAAM,gBAAgB,CAAC;AAEvE,OAAO,mBAAmB,CAAC;AAC3B,OAAO,iBAAiB,CAAC;AAqFzB,QAAA,MAAM,MAAM,EAAE,iBA2Nb,CAAC;AAEF,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"hardhat.config.d.ts","sourceRoot":"","sources":["../hardhat.config.ts"],"names":[],"mappings":"AAAA,OAAO,uBAAuB,CAAC;AAE/B,OAAO,wCAAwC,CAAC;AAChD,OAAO,kCAAkC,CAAC;AAC1C,OAAO,2BAA2B,CAAC;AACnC,OAAO,8BAA8B,CAAC;AACtC,OAAO,gCAAgC,CAAC;AACxC,OAAO,oBAAoB,CAAC;AAE5B,OAAO,6BAA6B,CAAC;AACrC,OAAO,gBAAgB,CAAC;AACxB,OAAO,sBAAsB,CAAC;AAC9B,OAAO,EAAE,iBAAiB,EAAsB,MAAM,gBAAgB,CAAC;AAEvE,OAAO,mBAAmB,CAAC;AAC3B,OAAO,iBAAiB,CAAC;AA2FzB,QAAA,MAAM,MAAM,EAAE,iBA2Nb,CAAC;AAEF,eAAe,MAAM,CAAC"}
@@ -1,13 +1,4 @@
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
  var __importDefault = (this && this.__importDefault) || function (mod) {
12
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
4
  };
@@ -30,6 +21,12 @@ dotenv_1.default.config();
30
21
  const DEPLOYER_PRIVATE_KEY = process.env.DEPLOYER_PRIVATE_KEY;
31
22
  const ETHERSCAN_API_KEY = process.env.ETHERSCAN_API_KEY;
32
23
  const externalDeployments = {
24
+ hardhat: [
25
+ "node_modules/@venusprotocol/isolated-pools/deployments/bscmainnet",
26
+ "node_modules/@venusprotocol/venus-protocol/deployments/bscmainnet",
27
+ "node_modules/@venusprotocol/governance-contracts/deployments/bscmainnet",
28
+ "node_modules/@venusprotocol/oracle/deployments/bscmainnet",
29
+ ],
33
30
  bsctestnet: [
34
31
  "node_modules/@venusprotocol/governance-contracts/deployments/bsctestnet",
35
32
  "node_modules/@venusprotocol/oracle/deployments/bsctestnet",
@@ -68,15 +65,15 @@ const externalDeployments = {
68
65
  };
69
66
  (0, config_1.extendConfig)((config) => {
70
67
  if (process.env.EXPORT !== "true") {
71
- config.external = Object.assign(Object.assign({}, config.external), { deployments: externalDeployments });
68
+ config.external = { ...config.external, deployments: externalDeployments };
72
69
  }
73
70
  });
74
- (0, config_1.task)("accounts", "Prints the list of accounts", (taskArgs, hre) => __awaiter(void 0, void 0, void 0, function* () {
75
- const accounts = yield hre.ethers.getSigners();
71
+ (0, config_1.task)("accounts", "Prints the list of accounts", async (taskArgs, hre) => {
72
+ const accounts = await hre.ethers.getSigners();
76
73
  for (const account of accounts) {
77
74
  console.log(account.address);
78
75
  }
79
- }));
76
+ });
80
77
  function isFork() {
81
78
  return process.env.FORK === "true"
82
79
  ? {
@@ -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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"}
@@ -1,6 +1,5 @@
1
1
  export declare const convertToUnit: (amount: string | number, decimals: number) => string;
2
2
  export declare const ADDRESS_ONE = "0x0000000000000000000000000000000000000001";
3
- export declare const ADDRESS_TWO = "0x0000000000000000000000000000000000000002";
4
3
  interface ChainAddressesConfig {
5
4
  [key: string]: string;
6
5
  }
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../helpers/utils.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,aAAa,WAAY,MAAM,GAAG,MAAM,YAAY,MAAM,WAEtE,CAAC;AAEF,eAAO,MAAM,WAAW,+CAA+C,CAAC;AACxE,eAAO,MAAM,WAAW,+CAA+C,CAAC;AAExE,UAAU,oBAAoB;IAC5B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB;AAGD,eAAO,MAAM,SAAS,EAAE,oBAWvB,CAAC"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../helpers/utils.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,aAAa,WAAY,MAAM,GAAG,MAAM,YAAY,MAAM,WAEtE,CAAC;AAEF,eAAO,MAAM,WAAW,+CAA+C,CAAC;AAExE,UAAU,oBAAoB;IAC5B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB;AAGD,eAAO,MAAM,SAAS,EAAE,oBAWvB,CAAC"}
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.multisigs = exports.ADDRESS_TWO = exports.ADDRESS_ONE = exports.convertToUnit = void 0;
6
+ exports.multisigs = exports.ADDRESS_ONE = exports.convertToUnit = void 0;
7
7
  const bignumber_js_1 = __importDefault(require("bignumber.js"));
8
8
  bignumber_js_1.default.config({
9
9
  FORMAT: {
@@ -22,7 +22,6 @@ const convertToUnit = (amount, decimals) => {
22
22
  };
23
23
  exports.convertToUnit = convertToUnit;
24
24
  exports.ADDRESS_ONE = "0x0000000000000000000000000000000000000001";
25
- exports.ADDRESS_TWO = "0x0000000000000000000000000000000000000002";
26
25
  exports.multisigs = {
27
26
  sepolia: "0x94fa6078b6b8a26f0b6edffbe6501b22a10470fb",
28
27
  ethereum: "0x285960C5B22fD66A736C7136967A3eB15e93CC67",
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../helpers/utils.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AAErC,sBAAS,CAAC,MAAM,CAAC;IACf,MAAM,EAAE;QACN,gBAAgB,EAAE,GAAG;QACrB,SAAS,EAAE,CAAC;QACZ,cAAc,EAAE,EAAE;QAClB,kBAAkB,EAAE,CAAC;QACrB,sBAAsB,EAAE,EAAE;QAC1B,iBAAiB,EAAE,CAAC;KACrB;IACD,aAAa,EAAE,sBAAS,CAAC,UAAU;IACnC,cAAc,EAAE,GAAG;CACpB,CAAC,CAAC;AAEI,MAAM,aAAa,GAAG,CAAC,MAAuB,EAAE,QAAgB,EAAE,EAAE;IACzE,OAAO,IAAI,sBAAS,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,sBAAS,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;AACjF,CAAC,CAAC;AAFW,QAAA,aAAa,iBAExB;AAEW,QAAA,WAAW,GAAG,4CAA4C,CAAC;AAC3D,QAAA,WAAW,GAAG,4CAA4C,CAAC;AAO3D,QAAA,SAAS,GAAyB;IAC7C,OAAO,EAAE,4CAA4C;IACrD,QAAQ,EAAE,4CAA4C;IACtD,YAAY,EAAE,4CAA4C;IAC1D,YAAY,EAAE,4CAA4C;IAC1D,eAAe,EAAE,4CAA4C;IAC7D,WAAW,EAAE,4CAA4C;IACzD,aAAa,EAAE,4CAA4C;IAC3D,aAAa,EAAE,4CAA4C;IAC3D,SAAS,EAAE,4CAA4C;IACvD,SAAS,EAAE,4CAA4C;CACxD,CAAC"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../helpers/utils.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AAErC,sBAAS,CAAC,MAAM,CAAC;IACf,MAAM,EAAE;QACN,gBAAgB,EAAE,GAAG;QACrB,SAAS,EAAE,CAAC;QACZ,cAAc,EAAE,EAAE;QAClB,kBAAkB,EAAE,CAAC;QACrB,sBAAsB,EAAE,EAAE;QAC1B,iBAAiB,EAAE,CAAC;KACrB;IACD,aAAa,EAAE,sBAAS,CAAC,UAAU;IACnC,cAAc,EAAE,GAAG;CACpB,CAAC,CAAC;AAEI,MAAM,aAAa,GAAG,CAAC,MAAuB,EAAE,QAAgB,EAAE,EAAE;IACzE,OAAO,IAAI,sBAAS,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,sBAAS,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;AACjF,CAAC,CAAC;AAFW,QAAA,aAAa,iBAExB;AAEW,QAAA,WAAW,GAAG,4CAA4C,CAAC;AAO3D,QAAA,SAAS,GAAyB;IAC7C,OAAO,EAAE,4CAA4C;IACrD,QAAQ,EAAE,4CAA4C;IACtD,YAAY,EAAE,4CAA4C;IAC1D,YAAY,EAAE,4CAA4C;IAC1D,eAAe,EAAE,4CAA4C;IAC7D,WAAW,EAAE,4CAA4C;IACzD,aAAa,EAAE,4CAA4C;IAC3D,aAAa,EAAE,4CAA4C;IAC3D,SAAS,EAAE,4CAA4C;IACvD,SAAS,EAAE,4CAA4C;CACxD,CAAC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@venusprotocol/protocol-reserve",
3
3
  "description": "Venus Protocol contracts to manage the income generated by the protocol",
4
- "version": "2.5.0-dev.1",
4
+ "version": "3.0.0-dev.1",
5
5
  "author": "Venus",
6
6
  "engines": {
7
7
  "node": ">=18.0.0"
@@ -1 +0,0 @@
1
- {"version":3,"file":"001-psr.d.ts","sourceRoot":"","sources":["../../deploy/001-psr.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAKtD,QAAA,MAAM,IAAI,EAAE,cA8CX,CAAC;AAIF,eAAe,IAAI,CAAC"}
@@ -1,76 +0,0 @@
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
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
26
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
27
- return new (P || (P = Promise))(function (resolve, reject) {
28
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
29
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
30
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
31
- step((generator = generator.apply(thisArg, _arguments || [])).next());
32
- });
33
- };
34
- Object.defineProperty(exports, "__esModule", { value: true });
35
- const hardhat_1 = __importStar(require("hardhat"));
36
- const utils_1 = require("../helpers/utils");
37
- const func = ({ network: { live, name }, getNamedAccounts, deployments, }) => __awaiter(void 0, void 0, void 0, function* () {
38
- var _a, _b, _c, _d, _e;
39
- const { deploy } = deployments;
40
- const { deployer } = yield getNamedAccounts();
41
- const vBNBAddress = ((_a = (yield hardhat_1.ethers.getContractOrNull("vBNB"))) === null || _a === void 0 ? void 0 : _a.address) || utils_1.ADDRESS_ONE;
42
- const comptrollerAddress = ((_b = (yield hardhat_1.ethers.getContractOrNull("Unitroller"))) === null || _b === void 0 ? void 0 : _b.address) || utils_1.ADDRESS_ONE;
43
- const WBNBAddress = ((_c = (yield hardhat_1.ethers.getContractOrNull("WBNB"))) === null || _c === void 0 ? void 0 : _c.address) || utils_1.ADDRESS_ONE;
44
- const timelockAddress = ((_d = (yield hardhat_1.ethers.getContractOrNull("NormalTimelock"))) === null || _d === void 0 ? void 0 : _d.address) || utils_1.multisigs[name];
45
- const acmAddress = ((_e = (yield hardhat_1.ethers.getContractOrNull("AccessControlManager"))) === null || _e === void 0 ? void 0 : _e.address) || utils_1.ADDRESS_ONE;
46
- const loopsLimit = 20;
47
- const defaultProxyAdmin = yield hardhat_1.default.artifacts.readArtifact("hardhat-deploy/solc_0.8/openzeppelin/proxy/transparent/ProxyAdmin.sol:ProxyAdmin");
48
- yield deploy("ProtocolShareReserve", {
49
- from: deployer,
50
- log: true,
51
- deterministicDeployment: false,
52
- args: [comptrollerAddress, WBNBAddress, vBNBAddress],
53
- skipIfAlreadyDeployed: true,
54
- proxy: {
55
- owner: live ? timelockAddress : deployer,
56
- proxyContract: "OptimizedTransparentUpgradeableProxy",
57
- execute: {
58
- methodName: "initialize",
59
- args: [acmAddress, loopsLimit],
60
- },
61
- viaAdminContract: {
62
- name: "DefaultProxyAdmin",
63
- artifact: defaultProxyAdmin,
64
- },
65
- },
66
- });
67
- const psr = yield hardhat_1.default.ethers.getContract("ProtocolShareReserve");
68
- if (live) {
69
- const tx = yield psr.transferOwnership(timelockAddress);
70
- yield tx.wait();
71
- console.log("Transferred ownership of PSR to Timelock");
72
- }
73
- });
74
- func.tags = ["ProtocolShareReserve"];
75
- exports.default = func;
76
- //# sourceMappingURL=001-psr.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"001-psr.js","sourceRoot":"","sources":["../../deploy/001-psr.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAAsC;AAItC,4CAA0D;AAE1D,MAAM,IAAI,GAAmB,CAAO,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,CAAA,MAAA,CAAC,MAAM,gBAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,0CAAE,OAAO,KAAI,mBAAW,CAAC;IACrF,MAAM,kBAAkB,GAAG,CAAA,MAAA,CAAC,MAAM,gBAAM,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC,0CAAE,OAAO,KAAI,mBAAW,CAAC;IAClG,MAAM,WAAW,GAAG,CAAA,MAAA,CAAC,MAAM,gBAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,0CAAE,OAAO,KAAI,mBAAW,CAAC;IACrF,MAAM,eAAe,GAAG,CAAA,MAAA,CAAC,MAAM,gBAAM,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC,0CAAE,OAAO,KAAI,iBAAS,CAAC,IAAI,CAAC,CAAC;IACvG,MAAM,UAAU,GAAG,CAAA,MAAA,CAAC,MAAM,gBAAM,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,CAAC,0CAAE,OAAO,KAAI,mBAAW,CAAC;IACpG,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,qBAAqB,EAAE,IAAI;QAC3B,KAAK,EAAE;YACL,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,QAAQ;YACxC,aAAa,EAAE,sCAAsC;YACrD,OAAO,EAAE;gBACP,UAAU,EAAE,YAAY;gBACxB,IAAI,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC;aAC/B;YACD,gBAAgB,EAAE;gBAChB,IAAI,EAAE,mBAAmB;gBACzB,QAAQ,EAAE,iBAAiB;aAC5B;SACF;KACF,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,CAAA,CAAC;AAEF,IAAI,CAAC,IAAI,GAAG,CAAC,sBAAsB,CAAC,CAAC;AAErC,kBAAe,IAAI,CAAC"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"006-risk-fund-v2.d.ts","sourceRoot":"","sources":["../../deploy/006-risk-fund-v2.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAKtD,QAAA,MAAM,IAAI,EAAE,cAiCX,CAAC;AAIF,eAAe,IAAI,CAAC"}
@@ -1,43 +0,0 @@
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
- Object.defineProperty(exports, "__esModule", { value: true });
12
- const hardhat_1 = require("hardhat");
13
- const utils_1 = require("../helpers/utils");
14
- const func = ({ network: { name, live }, getNamedAccounts, deployments, }) => __awaiter(void 0, void 0, void 0, function* () {
15
- var _a;
16
- const { deploy } = deployments;
17
- const { deployer } = yield getNamedAccounts();
18
- const proxyAdmin = yield hardhat_1.ethers.getContract("DefaultProxyAdmin");
19
- const owner = yield proxyAdmin.owner();
20
- yield deploy("RiskFundV2", {
21
- from: deployer,
22
- contract: "RiskFundV2",
23
- proxy: {
24
- owner: owner,
25
- proxyContract: "OpenZeppelinTransparentProxy",
26
- upgradeIndex: 0,
27
- },
28
- autoMine: true,
29
- log: true,
30
- });
31
- if (live) {
32
- const targetOwner = ((_a = (yield hardhat_1.ethers.getContractOrNull("NormalTimelock"))) === null || _a === void 0 ? void 0 : _a.address) || utils_1.multisigs[name];
33
- const contract = yield hardhat_1.ethers.getContract("RiskFundV2");
34
- if ((yield contract.owner()) !== targetOwner && (yield contract.pendingOwner()) !== targetOwner) {
35
- console.log(`Transferring ownership of RiskFundV2 to ${targetOwner}`);
36
- const tx = yield contract.transferOwnership(targetOwner);
37
- yield tx.wait();
38
- }
39
- }
40
- });
41
- func.tags = ["RiskFundV2"];
42
- exports.default = func;
43
- //# sourceMappingURL=006-risk-fund-v2.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"006-risk-fund-v2.js","sourceRoot":"","sources":["../../deploy/006-risk-fund-v2.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,qCAAiC;AAIjC,4CAA6C;AAE7C,MAAM,IAAI,GAAmB,CAAO,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,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;IAEvC,MAAM,MAAM,CAAC,YAAY,EAAE;QACzB,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,YAAY;QACtB,KAAK,EAAE;YACL,KAAK,EAAE,KAAK;YACZ,aAAa,EAAE,8BAA8B;YAC7C,YAAY,EAAE,CAAC;SAChB;QACD,QAAQ,EAAE,IAAI;QACd,GAAG,EAAE,IAAI;KACV,CAAC,CAAC;IAEH,IAAI,IAAI,EAAE;QACR,MAAM,WAAW,GAAG,CAAA,MAAA,CAAC,MAAM,gBAAM,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC,0CAAE,OAAO,KAAI,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,CAAA,CAAC;AAEF,IAAI,CAAC,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC;AAE3B,kBAAe,IAAI,CAAC"}