Merge pull request #114 from VenusProtocol/add-xvs-vault-event-tests

test: add integration tests for xvs vault

.github/workflows/ci.yaml

@@ -4,7 +4,7 @@ on: [push]
 
 jobs:
   lint:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -25,7 +25,7 @@ jobs:
         run: yarn pretty
 
   unit-test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -49,7 +49,7 @@ jobs:
         run: yarn test
 
   integration-test-isolated-pools:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: unit-test
     steps:
       - name: Checkout
@@ -82,7 +82,7 @@ jobs:
           docker system prune -f -a --volumes
 
   integration-test-governance:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: unit-test
     steps:
       - name: Checkout

copy_contracts.sh

@@ -16,6 +16,12 @@ mkdir -p ./contracts/protocol
 cp -rf ./node_modules/@venusprotocol/venus-protocol/contracts/ ./contracts/protocol/contracts
 rm -rf contracts/protocol/contracts/test
 
+mkdir -p ./contracts/governance/contracts/Governance
+mkdir -p ./contracts/governance/contracts/legacy
+cp ./node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorBravoDelegateV1.sol ./contracts/governance/contracts/legacy/GovernorBravoDelegateV1.sol
+cp ./node_modules/@venusprotocol/governance-contracts/contracts/legacy/GovernorBravoInterfaces.sol ./contracts/governance/contracts/legacy/GovernorBravoInterfaces.sol
+cp ./node_modules/@venusprotocol/governance-contracts/contracts/Governance/GovernorBravoInterfaces.sol ./contracts/governance/contracts/Governance/GovernorBravoInterfaces.sol
+
 rm contracts/protocol/contracts/Governance/GovernorBravoDelegate.sol
 rm contracts/protocol/contracts/Governance/GovernorBravoDelegator.sol
 rm contracts/protocol/contracts/Governance/Timelock.sol

deploy/004-swap-router.ts

@@ -1,3 +1,3 @@
-import deployPoolLens from '@venusprotocol/isolated-pools/dist/deploy/004-swap-router';
+import swapRouter from '@venusprotocol/isolated-pools/dist/deploy/004-swap-router';
 
-export default deployPoolLens;
+export default swapRouter;

deploy/006-deploy-pool-registry.ts

@@ -1,3 +1,3 @@
-import deployPoolLens from '@venusprotocol/isolated-pools/dist/deploy/006-deploy-pool-registry';
+import deployPoolRegistry from '@venusprotocol/isolated-pools/dist/deploy/006-deploy-pool-registry';
 
-export default deployPoolLens;
+export default deployPoolRegistry;

deploy/008-deploy-comptrollers.ts

@@ -1,3 +1,3 @@
-import accessControlConfigure from '@venusprotocol/isolated-pools/dist/deploy/008-deploy-comptrollers';
+import deployComptrollers from '@venusprotocol/isolated-pools/dist/deploy/008-deploy-comptrollers';
 
-export default accessControlConfigure;
+export default deployComptrollers;

deploy/009-deploy-vtokens.ts

@@ -1,3 +1,3 @@
-import deployPoolLens from '@venusprotocol/isolated-pools/dist/deploy/009-deploy-vtokens';
+import deployVTokens from '@venusprotocol/isolated-pools/dist/deploy/009-deploy-vtokens';
 
-export default deployPoolLens;
+export default deployVTokens;

deploy/010-deploy-reward-distributors.ts

@@ -1,3 +1,3 @@
-import deployPoolLens from '@venusprotocol/isolated-pools/dist/deploy/010-deploy-reward-distributors';
+import deployRewardDistributors from '@venusprotocol/isolated-pools/dist/deploy/010-deploy-reward-distributors';
 
-export default deployPoolLens;
+export default deployRewardDistributors;

deploy/011-initial-liquidity.ts

@@ -1,3 +1,3 @@
-import upgradeComptroller from '@venusprotocol/isolated-pools/dist/deploy/011-initial-liquidity';
+import initialLiquidity from '@venusprotocol/isolated-pools/dist/deploy/011-initial-liquidity';
 
-export default upgradeComptroller;
+export default initialLiquidity;

deploy/012-transfer-pools-ownership.ts

@@ -1,3 +1,3 @@
-import upgradeComptroller from '@venusprotocol/isolated-pools/dist/deploy/012-transfer-pools-ownership';
+import transferPoolsOwnership from '@venusprotocol/isolated-pools/dist/deploy/012-transfer-pools-ownership';
 
-export default upgradeComptroller;
+export default transferPoolsOwnership;

deploy/013-vip-based-config.ts

@@ -1,3 +1,3 @@
-import upgradeComptroller from '@venusprotocol/isolated-pools/dist/deploy/013-vip-based-config';
+import vipBasedConfig from '@venusprotocol/isolated-pools/dist/deploy/013-vip-based-config';
 
-export default upgradeComptroller;
+export default vipBasedConfig;

deploy/014-riskfund-protocolshare.ts

@@ -1,3 +1,3 @@
-import upgradeComptroller from '@venusprotocol/isolated-pools/dist/deploy/014-riskfund-protocolshare';
+import riskFundProtocolShare from '@venusprotocol/isolated-pools/dist/deploy/014-riskfund-protocolshare';
 
-export default upgradeComptroller;
+export default riskFundProtocolShare;

deploy/015-transfer-funds-ownership.ts

@@ -1,3 +1,3 @@
-import upgradeComptroller from '@venusprotocol/isolated-pools/dist/deploy/015-funds-config';
+import fundsConfig from '@venusprotocol/isolated-pools/dist/deploy/015-funds-config';
 
-export default upgradeComptroller;
+export default fundsConfig;

package.json

@@ -35,7 +35,7 @@
   "devDependencies": {
     "@graphprotocol/client-cli": "^3.0.0",
     "@graphprotocol/graph-cli": "0.56.0",
-    "@graphprotocol/graph-ts": "0.27.0",
+    "@graphprotocol/graph-ts": "0.31.0",
     "@nomicfoundation/hardhat-chai-matchers": "^1.0.3",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.4",
     "@nomicfoundation/hardhat-toolbox": "^1.0.2",
@@ -48,9 +48,9 @@
     "@types/mustache": "^4.2.1",
     "@typescript-eslint/eslint-plugin": "^5.40.1",
     "@typescript-eslint/parser": "^5.40.1",
-    "@venusprotocol/governance-contracts": "^1.1.0-dev.1",
+    "@venusprotocol/governance-contracts": "^1.3.0",
     "@venusprotocol/isolated-pools": "2.1.0-dev.2",
-    "@venusprotocol/oracle": "^1.7.2",
+    "@venusprotocol/oracle": "^1.7.3-dev.1",
     "@venusprotocol/venus-protocol": "3.1.0",
     "assemblyscript": "0.19.23",
     "chai": "^4.3.6",
@@ -67,7 +67,7 @@
     "hardhat-gas-reporter": "^1.0.8",
     "husky": "^3.0.5",
     "lint-staged": "^12.3.3",
-    "matchstick-as": "^0.5.0",
+    "matchstick-as": "^0.6.0",
     "module-alias": "^2.2.2",
     "mustache": "^4.2.0",
     "patch-package": "6.5.1",