fix: merge branch 'develop' into feat/diamond-proxy

VenusProtocol · Sep 11, 2023 · e6e9ca5 · e6e9ca5
2 parents 3586e05 + bcd6caf
commit e6e9ca5
Show file tree

Hide file tree

Showing 27 changed files with 2,122 additions and 1,149 deletions.
diff --git a/.dockerignore b/.dockerignore
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -18,6 +18,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
+          node-version: 18
           cache: "yarn"
 
       - name: Install dependencies

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,29 +7,30 @@ name: Venus-Protocol
 
 on:
   push:
-    branches: [master, develop]
+    branches: [main, develop]
   pull_request:
     branches: [main, develop]
 
 jobs:
   test:
     name: Test
-    runs-on: self-hosted
-
+    runs-on: ubuntu-22.04
+    env:
+      NODE_OPTIONS: --max-old-space-size=4096
     steps:
       - uses: actions/checkout@v2
 
-      - name: Clear
-        run: docker system prune -f -a --volumes
-
-      - name: Build docker
-        run: docker build -t venus:${GITHUB_SHA::7} .
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18
+          cache: "yarn"
 
-      - name: Run tests
-        run: docker run --name ${GITHUB_SHA::7} venus:${GITHUB_SHA::7} yarn test
+      - name: Install deps
+        run: yarn
 
-      - name: Clear
-        run: docker rm ${GITHUB_SHA::7}
+      - name: Run hardhat compile and tests coverage
+        run: |
+          yarn test
 
   lint:
     name: Lint

diff --git a/.gitignore b/.gitignore
@@ -63,4 +63,12 @@ dist
 docgen-docs
 
 #openzepplin files
-.openzeppelin/*
+.openzeppelin/*
+
+# yarn
+.yarn/*
+!.yarn/patches
+!.yarn/releases
+!.yarn/plugins
+!.yarn/sdks
+!.yarn/versions
diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,37 @@
+## [3.0.0-dev.19](https://github.com/VenusProtocol/venus-protocol/compare/v3.0.0-dev.18...v3.0.0-dev.19) (2023-09-04)
+
+
+### Features
+
+* add semantic release to main ([7f28dc0](https://github.com/VenusProtocol/venus-protocol/commit/7f28dc0d705e9339ad27472c6e9ebd3e88a3e4a5))
+
+
+### Bug Fixes
+
+* remove duplicate import ([e220aec](https://github.com/VenusProtocol/venus-protocol/commit/e220aec2090af60aaeee778f58b70f13fe9b5ba7))
+* remove exports from package.json ([1192698](https://github.com/VenusProtocol/venus-protocol/commit/11926980735f0bb613f4dff0df4424dcdda5a6b3))
+* set path for hardhat-ethers ([28795b1](https://github.com/VenusProtocol/venus-protocol/commit/28795b1001119a85ac9a0f5ae303945c8c3ba66f))
+* update dependencies ([36b6e76](https://github.com/VenusProtocol/venus-protocol/commit/36b6e76ee022360f7421156ca9d0e4423215f4c5))
+* update the network files with the currently used addresses ([4eaa8ae](https://github.com/VenusProtocol/venus-protocol/commit/4eaa8aef5e6a3ece21e2116073efb4c6bf1c26d5))
+
+## [3.0.0-dev.18](https://github.com/VenusProtocol/venus-protocol/compare/v3.0.0-dev.17...v3.0.0-dev.18) (2023-08-23)
+
+
+### Bug Fixes
+
+* add a missing param to SwapRouter deployment script ([e5a47e8](https://github.com/VenusProtocol/venus-protocol/commit/e5a47e80d788264b6a5c5e60c3e9b7cfb40c14c4))
+
+## [3.0.0-dev.17](https://github.com/VenusProtocol/venus-protocol/compare/v3.0.0-dev.16...v3.0.0-dev.17) (2023-08-22)
+
+
+### Bug Fixes
+
+* correct testnet VenusLens address ([ba24b14](https://github.com/VenusProtocol/venus-protocol/commit/ba24b143015c2b93abe706f2ca3395f42e673985))
+
+## [3.0.0-dev.16](https://github.com/VenusProtocol/venus-protocol/compare/v3.0.0-dev.15...v3.0.0-dev.16) (2023-08-09)
+
+## [3.0.0-dev.15](https://github.com/VenusProtocol/venus-protocol/compare/v3.0.0-dev.14...v3.0.0-dev.15) (2023-08-08)
+
 ## [3.0.0-dev.14](https://github.com/VenusProtocol/venus-protocol/compare/v3.0.0-dev.13...v3.0.0-dev.14) (2023-08-01)
 
 

diff --git a/Dockerfile b/Dockerfile
diff --git a/audits/021_psm_certik_20230524.pdf b/audits/021_psm_certik_20230524.pdf
diff --git a/audits/022_psm_peckshield_20230426.pdf b/audits/022_psm_peckshield_20230426.pdf
diff --git a/audits/028_psm_hacken_20230626.pdf b/audits/028_psm_hacken_20230626.pdf
diff --git a/audits/057_psm_quantstamp_20230807.pdf b/audits/057_psm_quantstamp_20230807.pdf
diff --git a/deploy/006-deploy-psm.ts b/deploy/006-deploy-psm.ts
@@ -26,7 +26,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const USDTAddress = ADDRESSES[networkName].USDT;
   const VAIAddress = ADDRESSES[networkName].VAI;
   const FEE_IN = 0;
-  const FEE_OUT = 10; // 10bps
+  const FEE_OUT = 0;
   const VAI_MINT_CAP = parseUnits("5000000", 18); // 5M
 
   const treasuryAddresses: { [network: string]: string } = {

diff --git a/deploy/006-deploy-swaprouter.ts b/deploy/006-deploy-swaprouter.ts
@@ -27,7 +27,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   await deploy("SwapRouter", {
     contract: "SwapRouter",
     from: deployer,
-    args: [WBNBAddress, pancakeFactoryAddress, ADDRESSES[networkName].Unitroller],
+    args: [WBNBAddress, pancakeFactoryAddress, ADDRESSES[networkName].Unitroller, ADDRESSES[networkName].vBNB],
     log: true,
     autoMine: true,
   });

diff --git a/deployments/bscmainnet/.migrations.json b/deployments/bscmainnet/.migrations.json
@@ -0,0 +1,3 @@
+{
+  "psm_initial_deploy": 1690981284
+}