refactor: use xvs vault proxy

VenusProtocol · Oct 19, 2023 · d9b5025 · d9b5025
1 parent 6292f1b
commit d9b5025
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/deploy/017-vaults.ts b/deploy/017-vaults.ts
@@ -40,23 +40,25 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     autoMine: true,
   });
 
-  const xvsVault = await ethers.getContract('XVSVault');
+  let xvsVault = await ethers.getContract('XVSVault');
   const xvsStore = await ethers.getContract('XVSStore');
   const xvsVaultProxy = await ethers.getContract('XVSVaultProxy');
   const accessControlManager = await ethers.getContract('AccessControlManager');
 
+  // Become Implementation of XVSVaultProxy
+  await xvsVaultProxy._setPendingImplementation(xvsVaultAddress);
+  await xvsVault._become(xvsVaultProxyAddress);
+
+  xvsVault = await ethers.getContractAt('XVSVault', xvsVaultProxyAddress);
+
   let txn = await xvsVault.setXvsStore(xvsAddress, xvsStore.address);
   await txn.wait(1);
 
   txn = await xvsVault.setAccessControl(accessControlManager.address);
   await txn.wait(1);
 
-  // Become Implementation of XVSVaultProxy
-  await xvsVaultProxy._setPendingImplementation(xvsVaultAddress);
-  await xvsVault._become(xvsVaultProxyAddress);
-
   // Set new owner to xvs store
-  await xvsStore.setNewOwner(xvsVaultAddress);
+  await xvsStore.setNewOwner(xvsVaultProxyAddress);
 };
 
 func.tags = ['XVS vault'];

diff --git a/deploy/019-configure-vaults.ts b/deploy/019-configure-vaults.ts
@@ -7,7 +7,8 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { deployer } = await getNamedAccounts();
 
   const accessControlManager = await ethers.getContract('AccessControlManager');
-  const xvsVault = await ethers.getContract('XVSVault');
+  const xvsVaultProxy = await ethers.getContract('XVSVaultProxy');
+  const xvsVault = await ethers.getContractAt('XVSVault', xvsVaultProxy.address);
   const xvs = await ethers.getContract('XVS');
 
   const tx = await accessControlManager.giveCallPermission(

diff --git a/subgraphs/venus-governance/tests/integration/utils/voter.ts b/subgraphs/venus-governance/tests/integration/utils/voter.ts
@@ -3,7 +3,8 @@ import { ethers } from 'hardhat';
 
 export async function enfranchiseAccount(account: any, amount: BigNumber) {
   const xvs = await ethers.getContract('XVS');
-  const xvsVault = await ethers.getContract('XVSVault');
+  const xvsVaultProxy = await ethers.getContract('XVSVaultProxy');
+  const xvsVault = await ethers.getContractAt('XVSVault', xvsVaultProxy.address);
 
   await xvs.connect(account).approve(xvsVault.address, amount.toFixed());
 

diff --git a/subgraphs/venus-governance/tests/integration/xvsVault.ts b/subgraphs/venus-governance/tests/integration/xvsVault.ts
@@ -20,7 +20,8 @@ describe('XVS Vault and Delegation', function () {
     signers = await ethers.getSigners();
 
     xvs = await ethers.getContract('XVS');
-    xvsVault = await ethers.getContract('XVSVault');
+    const xvsVaultProxy = await ethers.getContract('XVSVaultProxy');
+    xvsVault = await ethers.getContractAt('XVSVault', xvsVaultProxy.address);
 
     await waitForSubgraphToBeSynced(SYNC_DELAY);
   });