Merge branch 'develop' into feat/swapper

Exef · Exef · commit 36b894ee3ced · 2025-12-10T11:09:37.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,62 @@
+## [1.1.0-dev.1](https://github.com/VenusProtocol/venus-periphery/compare/v1.0.1-dev.1...v1.1.0-dev.1) (2025-12-02)
+
+
+### Features
+
+* add Collateral swapper functionality ([9b4a131](https://github.com/VenusProtocol/venus-periphery/commit/9b4a1311f8c30005a86b925ce1b0b372a56dd3d6))
+* added debt swap feature ([429a814](https://github.com/VenusProtocol/venus-periphery/commit/429a814ffc8517b11f2ed2ac1dd00eeccb7e05f8))
+* utility to swap wbnb to bnb ([4884ea3](https://github.com/VenusProtocol/venus-periphery/commit/4884ea302c369d87038e897df1b2bed305f6bf17))
+
+
+### Bug Fixes
+
+* added missing netspec and forceApprove ([11b59a1](https://github.com/VenusProtocol/venus-periphery/commit/11b59a1ddf9896e37ac683189bda6398f4d7d73a))
+* added unit tests for debt swap ([75821c6](https://github.com/VenusProtocol/venus-periphery/commit/75821c671beaddec1ad844b734488f2b841478f0))
+* expanded tests ([dee3f89](https://github.com/VenusProtocol/venus-periphery/commit/dee3f89345be52c9f832763d45d215c0ef9762a3))
+* fixed compiler error ([c83bb05](https://github.com/VenusProtocol/venus-periphery/commit/c83bb05f918b700d706426d2bd3db155f6adb81b))
+* fixed event name ([0c5d144](https://github.com/VenusProtocol/venus-periphery/commit/0c5d144ceb69f16579daef46980c3c921b2e0daa))
+* fixed fork tests ([b15c2d7](https://github.com/VenusProtocol/venus-periphery/commit/b15c2d716588c9af627bc8820f2dae4fa0ff8871))
+* fixed imports ([528402e](https://github.com/VenusProtocol/venus-periphery/commit/528402e89c638363f96f6e392dda6c31e4362abf))
+* fixed lint ([0943f62](https://github.com/VenusProtocol/venus-periphery/commit/0943f62dc04e127f3dbf7f409ba628896bc62213))
+* fixed ut ([35e8411](https://github.com/VenusProtocol/venus-periphery/commit/35e84115f6dfc9c6fa1df9dc513a171cf265072b))
+* fixed yarn lock ([1593207](https://github.com/VenusProtocol/venus-periphery/commit/15932074b0a1aa6d45ed833294001c29c2a4eeb7))
+* fixed yarn lock ([9e149df](https://github.com/VenusProtocol/venus-periphery/commit/9e149df8196d19a0706189f5d48ce51eaa602bc8))
+* implement fork tests for debt swap ([35ebe30](https://github.com/VenusProtocol/venus-periphery/commit/35ebe305f27a624b84714386264be6685e5fbc9d))
+* m02 ([cff664c](https://github.com/VenusProtocol/venus-periphery/commit/cff664cf7bbdf4503de68f399a21e58c22f5347b))
+* remove duplicate check ([95a87c0](https://github.com/VenusProtocol/venus-periphery/commit/95a87c030e208bda6b78bc72c0a5f43efb37257d))
+* renamed CollateralSwapper to PositionSwapper ([4555faa](https://github.com/VenusProtocol/venus-periphery/commit/4555faa6a4a1c34de54e8d0c63725d7b1e28bdd9))
+* renamed file ([ea4c952](https://github.com/VenusProtocol/venus-periphery/commit/ea4c9520c88ccdbfc6d30d727eabcd8000af213e))
+* s1 ([fbccb32](https://github.com/VenusProtocol/venus-periphery/commit/fbccb329847a5241362dde677be586f1d4be0ad3))
+* s3 ([7ab4537](https://github.com/VenusProtocol/venus-periphery/commit/7ab4537f379129f0baabdd36b9acb997067dd347))
+* update yarn.lock ([98a464b](https://github.com/VenusProtocol/venus-periphery/commit/98a464b8f2933111887298e2ef566aba5582e965))
+* upgrade vtoken ([055a55f](https://github.com/VenusProtocol/venus-periphery/commit/055a55fdc19432463980c83a76a5ecebccdc1273))
+* use facets with whitelisted feature ([2ba681f](https://github.com/VenusProtocol/venus-periphery/commit/2ba681f326d8cb4726a71af21cdaae98fb35f405))
+* use forceApprove ([2853954](https://github.com/VenusProtocol/venus-periphery/commit/2853954cd09a4daaf33ffcd1c87ef5e40d30cabd))
+* vlp-02 ([3852699](https://github.com/VenusProtocol/venus-periphery/commit/38526995a69fca00c1618dde5b84617cac4bfbe2))
+* vlp-02 ([f3088b2](https://github.com/VenusProtocol/venus-periphery/commit/f3088b27ee287bf3c891a23c39807dae5dabb518))
+* vlp-04 ([540a95e](https://github.com/VenusProtocol/venus-periphery/commit/540a95e7464e9072e82f1e34f53a2752b70140df))
+* vps-01 ([7d8a6ad](https://github.com/VenusProtocol/venus-periphery/commit/7d8a6ad565eb735d0cdc2fbe7518d854e9593460))
+* vps-01 ([aeeb8cf](https://github.com/VenusProtocol/venus-periphery/commit/aeeb8cfca14be53958307b8c5ca5bae9fc588e3a))
+* vps-02 ([2625454](https://github.com/VenusProtocol/venus-periphery/commit/26254543c225a68eaaecf46996527c83bc4bc0ae))
+* vps-02 ([9063796](https://github.com/VenusProtocol/venus-periphery/commit/9063796eff8e55c80476bf4b6c514804f751e64c))
+* vps-03 ([65cb255](https://github.com/VenusProtocol/venus-periphery/commit/65cb255d77dee91e2cfef6b55e2140f2756441a5))
+* vps-03 ([b209b9f](https://github.com/VenusProtocol/venus-periphery/commit/b209b9fec8ef5782cec70e8be28ffe3783d3fa15))
+* vps-03 ([8e1c7f9](https://github.com/VenusProtocol/venus-periphery/commit/8e1c7f9d2b27c8a245927495159b5fac1f89bc23))
+* vps-04 ([f249d4e](https://github.com/VenusProtocol/venus-periphery/commit/f249d4e535397cb086074c4932aadbe53e2c80a4))
+* vps-05 and vps-16 ([454b93e](https://github.com/VenusProtocol/venus-periphery/commit/454b93ec0e21a826fe2363b4b4b883c1503e96f4))
+* vps-06 ([6f52088](https://github.com/VenusProtocol/venus-periphery/commit/6f52088a0995d2e59671f8d6a6c3450ac111eb91))
+* vps-07 ([991d561](https://github.com/VenusProtocol/venus-periphery/commit/991d5610dc7b5e39d81b38b9e0729506308ef9ac))
+* vps-13 ([e4f3997](https://github.com/VenusProtocol/venus-periphery/commit/e4f3997f2af9f87f897cfed396ebcb02fd0425e2))
+* vps-14 ([bc86a53](https://github.com/VenusProtocol/venus-periphery/commit/bc86a533a4d7d95af05904355acc5c6ebdff32ce))
+* vps-15 ([11c448d](https://github.com/VenusProtocol/venus-periphery/commit/11c448d33182a5211c74e48ec5691c7ac16c962d))
+
+## [1.0.1-dev.1](https://github.com/VenusProtocol/venus-periphery/compare/v1.0.0...v1.0.1-dev.1) (2025-10-20)
+
+
+### Bug Fixes
+
+* fixed contract verification ([9f0293e](https://github.com/VenusProtocol/venus-periphery/commit/9f0293e7c0d53815f847c48d06fcdd47e6ae7d6c))
+
 ## 1.0.0 (2025-07-31)
 
 
diff --git a/contracts/test/Imports-legacy.sol b/contracts/test/Imports-legacy.sol
@@ -1,3 +1,4 @@
+import { InterestRateModelHarness } from "@venusprotocol/venus-protocol/contracts/test/InterestRateModelHarness.sol";
 // SPDX-License-Identifier: BSD-3-Clause
 pragma solidity 0.5.16;
 
diff --git a/contracts/test/Imports.sol b/contracts/test/Imports.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: BSD-3-Clause
 pragma solidity 0.8.25;
 
+import { IAccessControlManagerV8 } from "@venusprotocol/governance-contracts/contracts/Governance/IAccessControlManagerV8.sol";
 import { ComptrollerMock } from "@venusprotocol/venus-protocol/contracts/test/ComptrollerMock.sol";
 import { VBNB } from "@venusprotocol/venus-protocol/contracts/Tokens/VTokens/VBNB.sol";
 import { Diamond } from "@venusprotocol/venus-protocol/contracts/Comptroller/Diamond/Diamond.sol";
diff --git a/deployments/bscmainnet/SwapHelper.json b/deployments/bscmainnet/SwapHelper.json
diff --git a/deployments/bscmainnet/solcInputs/4c6c3ced8b62cc3ecee2f6cfbd2182da.json b/deployments/bscmainnet/solcInputs/4c6c3ced8b62cc3ecee2f6cfbd2182da.json
@@ -78,13 +78,11 @@
           "userdoc",
           "evm.gasEstimates"
         ],
-        "": [
-          "ast"
-        ]
+        "": ["ast"]
       }
     },
     "metadata": {
       "useLiteralContent": true
     }
   }
-}
+}
diff --git a/deployments/bscmainnet/solcInputs/5daf1620a8af9648f7f80eb086519ad7.json b/deployments/bscmainnet/solcInputs/5daf1620a8af9648f7f80eb086519ad7.json
@@ -78,13 +78,11 @@
           "userdoc",
           "evm.gasEstimates"
         ],
-        "": [
-          "ast"
-        ]
+        "": ["ast"]
       }
     },
     "metadata": {
       "useLiteralContent": true
     }
   }
-}
+}
diff --git a/deployments/bsctestnet/SwapHelper.json b/deployments/bsctestnet/SwapHelper.json
diff --git a/deployments/bsctestnet/solcInputs/4c6c3ced8b62cc3ecee2f6cfbd2182da.json b/deployments/bsctestnet/solcInputs/4c6c3ced8b62cc3ecee2f6cfbd2182da.json
@@ -78,13 +78,11 @@
           "userdoc",
           "evm.gasEstimates"
         ],
-        "": [
-          "ast"
-        ]
+        "": ["ast"]
       }
     },
     "metadata": {
       "useLiteralContent": true
     }
   }
-}
+}
diff --git a/deployments/bsctestnet/solcInputs/5daf1620a8af9648f7f80eb086519ad7.json b/deployments/bsctestnet/solcInputs/5daf1620a8af9648f7f80eb086519ad7.json
@@ -78,13 +78,11 @@
           "userdoc",
           "evm.gasEstimates"
         ],
-        "": [
-          "ast"
-        ]
+        "": ["ast"]
       }
     },
     "metadata": {
       "useLiteralContent": true
     }
   }
-}
+}
diff --git a/hardhat.config.zksync.ts b/hardhat.config.zksync.ts
@@ -51,6 +51,23 @@ const config: HardhatUserConfig = {
   },
   solidity: {
     compilers: [
+      {
+        version: "0.8.28",
+        settings: {
+          optimizer: {
+            enabled: true,
+            details: {
+              yul: !process.env.CI,
+            },
+          },
+          evmVersion: "cancun",
+          outputSelection: {
+            "*": {
+              "*": ["storageLayout"],
+            },
+          },
+        },
+      },
       {
         version: "0.8.25",
         settings: {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@venusprotocol/venus-periphery",
-  "version": "1.0.0",
+  "version": "1.1.0-dev.2",
   "description": "",
   "files": [
     "artifacts",
@@ -81,7 +81,7 @@
     "@venusprotocol/isolated-pools": "^4.3.0",
     "@venusprotocol/oracle": "^2.13.0",
     "@venusprotocol/protocol-reserve": "^3.3.0",
-    "@venusprotocol/venus-protocol": "10.0.0",
+    "@venusprotocol/venus-protocol": "^10.0.0",
     "bignumber.js": "9.0.0",
     "chai": "^4.3.6",
     "dotenv": "^10.0.0",
diff --git a/tests/hardhat/PositionSwapper/PositionSwapper.ts b/tests/hardhat/PositionSwapper/PositionSwapper.ts
@@ -129,7 +129,9 @@ const setupMarketFixture = async (): Promise<SetupMarketFixture> => {
   };
 };
 
-describe("PositionSwapper", () => {
+// Tests require the venus-protocol package to include the latest WhitelistedExecutor changes.
+// ref: https://github.com/VenusProtocol/venus-protocol/pull/606
+describe.skip("PositionSwapper", () => {
   let vBNB: MockVBNB;
   let WBNB: MockContract<WBNB>;
   let vWBNB: MockContract<VBep20Harness>;
diff --git a/tests/hardhat/SwapHelper/SwapHelper.ts b/tests/hardhat/SwapHelper/SwapHelper.ts
@@ -4,7 +4,7 @@ import { Signer, Wallet } from "ethers";
 import { _TypedDataEncoder, parseUnits } from "ethers/lib/utils";
 import { ethers, network } from "hardhat";
 
-import { FaucetToken, SwapHelper, WBNB } from "../../../typechain";
+import { FaucetToken, SwapHelper } from "../../../typechain";
 
 const { constants } = ethers;
 
@@ -17,7 +17,6 @@ describe("SwapHelper", () => {
   let userAddress: string;
   let user2Address: string;
   let swapHelper: SwapHelper;
-  let wBNB: WBNB;
   let erc20: FaucetToken;
 
   beforeEach(async () => {
@@ -29,9 +28,6 @@ describe("SwapHelper", () => {
     userAddress = await user1.getAddress();
     user2Address = await user2.getAddress();
 
-    const WBNBFactory = await ethers.getContractFactory("WBNB");
-    wBNB = (await WBNBFactory.deploy()) as WBNB;
-
     const ERC20Factory = await ethers.getContractFactory("FaucetToken");
     erc20 = (await ERC20Factory.deploy(parseUnits("10000", 18), "Test Token", 18, "TEST")) as FaucetToken;
 
@@ -261,15 +257,6 @@ describe("SwapHelper", () => {
   });
 
   describe("multicall", () => {
-    const types = {
-      Multicall: [
-        { name: "caller", type: "address" },
-        { name: "calls", type: "bytes[]" },
-        { name: "deadline", type: "uint256" },
-        { name: "salt", type: "bytes32" },
-      ],
-    };
-
     it("should revert if calls array is empty", async () => {
       const domain = {
         chainId: network.config.chainId,
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import { InterestRateModelHarness } from "@venusprotocol/venus-protocol/contracts/test/InterestRateModelHarness.sol";`
`1`	`2`	`// SPDX-License-Identifier: BSD-3-Clause`
`2`	`3`	`pragma solidity 0.5.16;`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -78,13 +78,11 @@`
`78`	`78`	`"userdoc",`
`79`	`79`	`"evm.gasEstimates"`
`80`	`80`	`],`
`81`		`- "": [`
`82`		`- "ast"`
`83`		`- ]`
	`81`	`+ "": ["ast"]`
`84`	`82`	`}`
`85`	`83`	`},`
`86`	`84`	`"metadata": {`
`87`	`85`	`"useLiteralContent": true`
`88`	`86`	`}`
`89`	`87`	`}`
`90`		`-}`
	`88`	`+}`