@venusprotocol/protocol-reserve 1.5.0-dev.6 → 1.5.0-dev.8

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.
@@ -14,7 +14,9 @@
14
14
  "RiskFundConverter": "0x32Fbf7bBbd79355B86741E3181ef8c1D9bD309Bb",
15
15
  "RiskFundConverter_Implementation": "0x857ebb8CAcb97DE5ab719320c9FB3aa16076bFe3",
16
16
  "RiskFundConverter_Proxy": "0x32Fbf7bBbd79355B86741E3181ef8c1D9bD309Bb",
17
- "RiskFundV2": "0xcA2A023FBe3be30b7187E88D7FDE1A9a4358B509",
17
+ "RiskFundV2": "0x487CeF72dacABD7E12e633bb3B63815a386f7012",
18
+ "RiskFundV2_Implementation": "0xcA2A023FBe3be30b7187E88D7FDE1A9a4358B509",
19
+ "RiskFundV2_Proxy": "0x487CeF72dacABD7E12e633bb3B63815a386f7012",
18
20
  "SingleTokenConverterBeacon": "0xD2410D8B581D37c5B474CD9Ee0C15F02138AC028",
19
21
  "SingleTokenConverterImp": "0x42Ec3Eb6F23460dFDfa3aE5688f3415CDfE0C6AD",
20
22
  "USDCPrimeConverter": "0x2ecEdE6989d8646c992344fF6C97c72a3f811A13",
@@ -1,7 +1,4 @@
1
- import { HardhatRuntimeEnvironment } from "hardhat/types";
2
- declare const func: {
3
- ({ getNamedAccounts, deployments }: HardhatRuntimeEnvironment): Promise<void>;
4
- tags: string[];
5
- };
1
+ import { DeployFunction } from "hardhat-deploy/types";
2
+ declare const func: DeployFunction;
6
3
  export default func;
7
4
  //# sourceMappingURL=006-risk-fund-v2.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"006-risk-fund-v2.d.ts","sourceRoot":"","sources":["../../deploy/006-risk-fund-v2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAE1D,QAAA,MAAM,IAAI;wCAA6C,yBAAyB;;CAU/E,CAAC;AAIF,eAAe,IAAI,CAAC"}
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"}
@@ -9,16 +9,34 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
9
9
  });
10
10
  };
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
- const func = ({ getNamedAccounts, deployments }) => __awaiter(void 0, void 0, void 0, function* () {
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;
13
16
  const { deploy } = deployments;
14
17
  const { deployer } = yield getNamedAccounts();
18
+ const proxyAdmin = yield hardhat_1.ethers.getContract("DefaultProxyAdmin");
19
+ const owner = yield proxyAdmin.owner();
15
20
  yield deploy("RiskFundV2", {
16
- contract: "RiskFundV2",
17
21
  from: deployer,
18
- args: [],
19
- log: true,
22
+ contract: "RiskFundV2",
23
+ proxy: {
24
+ owner: owner,
25
+ proxyContract: "OpenZeppelinTransparentProxy",
26
+ upgradeIndex: 0,
27
+ },
20
28
  autoMine: true,
29
+ log: true,
21
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
+ }
22
40
  });
23
41
  func.tags = ["RiskFundV2"];
24
42
  exports.default = func;
@@ -1 +1 @@
1
- {"version":3,"file":"006-risk-fund-v2.js","sourceRoot":"","sources":["../../deploy/006-risk-fund-v2.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,MAAM,IAAI,GAAG,CAAO,EAAE,gBAAgB,EAAE,WAAW,EAA6B,EAAE,EAAE;IAClF,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;IAC/B,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,gBAAgB,EAAE,CAAC;IAC9C,MAAM,MAAM,CAAC,YAAY,EAAE;QACzB,QAAQ,EAAE,YAAY;QACtB,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,EAAE;QACR,GAAG,EAAE,IAAI;QACT,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;AACL,CAAC,CAAA,CAAC;AAEF,IAAI,CAAC,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC;AAE3B,kBAAe,IAAI,CAAC"}
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"}
@@ -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,gBAAgB,CAAC;AACxB,OAAO,sBAAsB,CAAC;AAC9B,OAAO,EAAE,iBAAiB,EAAsB,MAAM,gBAAgB,CAAC;AAEvE,OAAO,mBAAmB,CAAC;AAC3B,OAAO,iBAAiB,CAAC;AA+EzB,QAAA,MAAM,MAAM,EAAE,iBAuJb,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,gBAAgB,CAAC;AACxB,OAAO,sBAAsB,CAAC;AAC9B,OAAO,EAAE,iBAAiB,EAAsB,MAAM,gBAAgB,CAAC;AAEvE,OAAO,mBAAmB,CAAC;AAC3B,OAAO,iBAAiB,CAAC;AAyEzB,QAAA,MAAM,MAAM,EAAE,iBAuJb,CAAC;AAEF,eAAe,MAAM,CAAC"}
@@ -31,32 +31,26 @@ const externalDeployments = {
31
31
  bsctestnet: [
32
32
  "node_modules/@venusprotocol/governance-contracts/deployments/bsctestnet",
33
33
  "node_modules/@venusprotocol/oracle/deployments/bsctestnet",
34
- "node_modules/@venusprotocol/isolated-pools/deployments/bsctestnet",
35
34
  ],
36
35
  sepolia: [
37
36
  "node_modules/@venusprotocol/governance-contracts/deployments/sepolia",
38
37
  "node_modules/@venusprotocol/oracle/deployments/sepolia",
39
- "node_modules/@venusprotocol/isolated-pools/deployments/sepolia",
40
38
  ],
41
39
  opbnbtestnet: [
42
40
  "node_modules/@venusprotocol/governance-contracts/deployments/opbnbtestnet",
43
41
  "node_modules/@venusprotocol/oracle/deployments/opbnbtestnet",
44
- "node_modules/@venusprotocol/isolated-pools/deployments/opbnbtestnet",
45
42
  ],
46
43
  bscmainnet: [
47
44
  "node_modules/@venusprotocol/governance-contracts/deployments/bscmainnet",
48
45
  "node_modules/@venusprotocol/oracle/deployments/bscmainnet",
49
- "node_modules/@venusprotocol/isolated-pools/deployments/bscmainnet",
50
46
  ],
51
47
  ethereum: [
52
48
  "node_modules/@venusprotocol/governance-contracts/deployments/ethereum",
53
49
  "node_modules/@venusprotocol/oracle/deployments/ethereum",
54
- "node_modules/@venusprotocol/isolated-pools/deployments/ethereum",
55
50
  ],
56
51
  opbnbmainnet: [
57
52
  "node_modules/@venusprotocol/governance-contracts/deployments/opbnbmainnet",
58
53
  "node_modules/@venusprotocol/oracle/deployments/opbnbmainnet",
59
- "node_modules/@venusprotocol/isolated-pools/deployments/opbnbmainnet",
60
54
  ],
61
55
  };
62
56
  (0, config_1.extendConfig)((config) => {
@@ -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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"}
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": "1.5.0-dev.6",
4
+ "version": "1.5.0-dev.8",
5
5
  "author": "Venus",
6
6
  "engines": {
7
7
  "node": ">=18.0.0"
@@ -45,7 +45,6 @@
45
45
  "@openzeppelin/contracts-upgradeable": "^4.8.3",
46
46
  "@openzeppelin/hardhat-upgrades": "^1.21.0",
47
47
  "@solidity-parser/parser": "^0.13.2",
48
- "@venusprotocol/isolated-pools": "^2.6.0",
49
48
  "@venusprotocol/solidity-utilities": "^1.3.0",
50
49
  "ethers": "^5.7.0",
51
50
  "hardhat-deploy": "^0.11.14",