Upgrade tests

contracts/deploy/mainnet/109_ousd_upgrade.js

@@ -0,0 +1,34 @@
+const { deploymentWithGovernanceProposal } = require("../../utils/deploy");
+
+module.exports = deploymentWithGovernanceProposal(
+  {
+    deployName: "109_ousd_upgrade",
+    forceDeploy: false,
+    forceSkip: false,
+    reduceQueueTime: true,
+    deployerIsProposer: false,
+    proposalId: "",
+  },
+  async ({ deployWithConfirmation }) => {
+    // Deployer Actions
+    // ----------------
+
+    // 1. Deploy new OUSD implementation without storage slot checks
+    const dOUSD = await deployWithConfirmation("OUSD", [], "OUSD", true);
+    const cOUSDProxy = await ethers.getContract("OUSDProxy");
+
+    // Governance Actions
+    // ----------------
+    return {
+      name: "Upgrade OUSD token contract",
+      actions: [
+        // 1. Upgrade the OUSD proxy to the new implementation
+        {
+          contract: cOUSDProxy,
+          signature: "upgradeTo(address)",
+          args: [dOUSD.address],
+        },
+      ],
+    };
+  }
+);

contracts/deploy/mainnet/110_oeth_upgrade.js

@@ -0,0 +1,38 @@
+const { deploymentWithGovernanceProposal } = require("../../utils/deploy");
+
+module.exports = deploymentWithGovernanceProposal(
+  {
+    deployName: "110_oeth_upgrade",
+    forceDeploy: false,
+    forceSkip: false,
+    reduceQueueTime: true,
+    deployerIsProposer: false,
+    proposalId: "",
+  },
+  async ({ deployWithConfirmation }) => {
+    // Deployer Actions
+    // ----------------
+    const cOETHProxy = await ethers.getContract("OETHProxy");
+
+    // Deploy new version of OETH contract
+    const dOETHImpl = await deployWithConfirmation("OETH", []);
+
+    // Governance Actions
+    // ----------------
+    return {
+      name: "Upgrade OETH token contract\n\
+      \n\
+      This upgrade enabled yield delegation controlled by xOGN governance \n\
+      \n\
+      ",
+      actions: [
+        // Upgrade the OETH token proxy contract to the new implementation
+        {
+          contract: cOETHProxy,
+          signature: "upgradeTo(address)",
+          args: [dOETHImpl.address],
+        },
+      ],
+    };
+  }
+);

contracts/package.json

@@ -41,6 +41,7 @@
     "echidna": "yarn run clean && rm -rf echidna-corpus && echidna . --contract Echidna --config echidna-config.yaml",
     "compute-merkle-proofs-local": "HARDHAT_NETWORK=localhost node scripts/staking/airDrop.js reimbursements.csv scripts/staking/merkleProofedAccountsToBeCompensated.json && cp scripts/staking/merkleProofedAccountsToBeCompensated.json ../dapp/src/constants/merkleProofedAccountsToBeCompensated.json",
     "compute-merkle-proofs-mainnet": "HARDHAT_NETWORK=mainnet node scripts/staking/airDrop.js reimbursements.csv scripts/staking/merkleProofedAccountsToBeCompensated.json && cp scripts/staking/merkleProofedAccountsToBeCompensated.json ../dapp/src/constants/merkleProofedAccountsToBeCompensated.json",
+    "fetch-pre-upgrade": "node scripts/yield-delegation/fetchAllAddresses.js",
     "slither": "yarn run clean && slither . --config-file slither.config.json",
     "slither:triage": "yarn run clean && slither . --triage --config-file slither.config.json",
     "clean": "rm -rf build crytic-export artifacts cache deployments/local*",
@@ -94,6 +95,7 @@
     "lodash": "^4.17.21",
     "mocha": "^10.2.0",
     "papaparse": "^5.3.1",
+    "postgres": "^3.4.5",
     "prettier": "^2.3.2",
     "prettier-plugin-solidity": "1.0.0-beta.17",
     "rollup": "^4.18.0",

contracts/scripts/yield-delegation/fetchAllAddresses.js

@@ -0,0 +1,66 @@
+require("dotenv").config();
+const postgres = require("postgres");
+const ethers = require("ethers");
+const fs = require('fs');
+
+const sql = postgres(process.env.SQUID_DB_URL);
+
+const OETH_ADDRESS = "0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3";
+const OUSD_ADDRESS = "0x2a8e1e676ec238d8a992307b495b45b3feaa5e86";
+const SUPER_OETH_ADDRESS = "0xdbfefd2e8460a6ee4955a68582f85708baea60a3";
+
+async function getAddressesAndBalances(oTokenAddress, maxBlockNumber, csvFileName) {
+  const batchSize = 5000;
+  let offset = 0;
+  const allAddresses = [];
+
+  const blockSmallerOrEq = blockNumber => sql` AND block_number <= ${ blockNumber }`
+  while (true) {
+    console.log(`Running query batchSize: ${batchSize}, offset: ${offset}`);
+    const batch = await sql`
+      SELECT b.account, b.balance FROM (
+        SELECT DISTINCT ON (account) account, balance
+        FROM erc20_holder
+        WHERE address = ${oTokenAddress}
+        ORDER BY account
+        LIMIT ${batchSize} 
+        OFFSET ${offset}
+      ) b WHERE balance > 0
+    `;
+
+    if (batch.length === 0) break;
+
+    batch.forEach((row) => {
+      allAddresses.push([row.account, row.balance].join(','))
+      //console.log(`account: ${row.account} balance: ${row.balance} block_number: ${row.block_number}`)
+    });
+    offset += batchSize;
+
+    console.log(`Processed ${allAddresses.length} unique addresses so far...`);
+  }
+
+  console.log(`Total ${oTokenAddress == OETH_ADDRESS ? "OETH" : "OUSD"} unique addresses found: ${allAddresses.length}`);
+
+  // // Write addresses to CSV
+  const csvContent = allAddresses.join('\n');
+  fs.writeFileSync(csvFileName, csvContent);
+  console.log(`Addresses and balances written to ${csvFileName}`);
+
+  return allAddresses;
+}
+
+async function main() {
+  const oethAddresses = await getAddressesAndBalances(OETH_ADDRESS, 0, 'oethBalances.csv');
+  const ousdAddresses = await getAddressesAndBalances(OUSD_ADDRESS, 0, 'ousdBalances.csv');
+  const soethAddresses = await getAddressesAndBalances(SUPER_OETH_ADDRESS, 0, 'soethBalances.csv');
+}
+
+main()
+  .then(() => {
+    console.log("Done!");
+    process.exit(0);
+  })
+  .catch((err) => {
+    console.error(err);
+    process.exit(1);
+  });

contracts/test/helpers.js

@@ -5,7 +5,9 @@ const { parseUnits, formatUnits, keccak256, toUtf8Bytes } =
 const { BigNumber } = require("ethers");
 
 const addresses = require("../utils/addresses");
+const { impersonateAndFund } = require("../utils/signers");
 const { decimalsFor, units } = require("../utils/units");
+const fs = require('fs');
 
 /**
  * Checks if the actual value is approximately equal to the expected value
@@ -756,6 +758,104 @@ async function differenceInStrategyBalance(
   return returnVals;
 }
 
+function* chunks(arr, n) {
+  for (let i = 0; i < arr.length; i += n) {
+    yield arr.slice(i, i + n);
+  }
+}
+
+async function addActualBalancesToSquidData(squidDataCsvFile, outputFileName, tokenContract) {
+  // CSV file in format account, balance, blockNumber (balance from squid)
+  const data = fs.readFileSync(squidDataCsvFile, "utf8").split('\n');
+  const combinedData = [];
+  const batchSize = 50;
+  const chunkedData = [...chunks(data, batchSize)];
+
+  for (let i = 0; i < chunkedData.length; i++) {
+    const data = chunkedData[i];
+    const balanceOfPromises = [];
+
+    for (let j = 0; j < data.length; j++) {
+      const [account,,] = data[j].split(',');
+      balanceOfPromises.push(tokenContract.balanceOf(account));
+    }
+
+    await Promise.all(balanceOfPromises).then(values => {
+      for(let j = 0; j < values.length; j++) {
+        const [account, balance,] = data[j].split(',')
+        const onChainBalance = values[j].toString(10)
+        combinedData.push([account, balance, onChainBalance].join(','))
+      }
+    });
+    console.log(`Inspected ${(i+1) * batchSize} accounts`);
+  }
+  const csvContent = combinedData.join('\n');
+  fs.writeFileSync(outputFileName, csvContent);
+}
+
+async function testTransfersOnTokenContract(balancesFile, upgradedTokenContract) {
+  // CSV file in format account, squidBalance, onChainBalance
+  const data = fs.readFileSync(balancesFile, "utf8").split('\n');
+  let transferBalanceMissmatches = 0;
+  for (let i = 1; i < data.length; i++) {
+    const [accountPrevious,,] = data[i-1].split(',');
+    const [account,,] = data[i].split(',');
+
+    const balanceSender = await upgradedTokenContract.balanceOf(account);
+    const balanceReceiver = await upgradedTokenContract.balanceOf(accountPrevious);
+
+    if (i % 50 == 0) {
+      console.log(`Validated transfers of ${i + 1} accounts`);
+    }
+
+    if (balanceSender.lte(BigNumber.from(2))) {
+      // skip small balances
+      continue;
+    }
+
+    const accountSigner = await impersonateAndFund(account);
+    // 1/2 balance 
+    const balanceToTransfer = balanceSender.div(BigNumber.from("2"));
+    await upgradedTokenContract
+      .connect(accountSigner)
+      .transfer(accountPrevious, balanceToTransfer);
+
+
+    const balanceSenderAfter = await upgradedTokenContract.balanceOf(account);
+    const balanceReceiverAfter = await upgradedTokenContract.balanceOf(accountPrevious);
+
+    if (!balanceSender.sub(balanceToTransfer).eq(balanceSenderAfter)) {
+      transferBalanceMissmatches += 1;
+      console.log(`Balance miss match ${account} expected to have ${balanceSender.sub(balanceToTransfer).toString(10)} actually has ${balanceSenderAfter.toString(10)}`)
+    }
+    if (!balanceReceiver.add(balanceToTransfer).eq(balanceReceiverAfter)) {
+      transferBalanceMissmatches += 1;
+      console.log(`Balance miss match ${accountPrevious} expected to have ${balanceReceiver.add(balanceToTransfer).toString(10)} actually has ${balanceReceiverAfter.toString(10)}`)
+    }
+  }
+  console.log(`Accounts with unexpected balances: ${transferBalanceMissmatches}`)
+}
+
+async function compareUpgradedContractBalances(balancesFile, upgradedTokenContract) {
+  // CSV file in format account, squidBalance, onChainBalance
+  const data = fs.readFileSync(balancesFile, "utf8").split('\n');
+  let balanceMissmatches = 0;
+  for (let i = 0; i < data.length; i++) {
+    const [account,,balanceBefore] = data[i].split(',');
+    const expectedBalance = BigNumber.from(balanceBefore);
+    const actualBalance = await upgradedTokenContract.balanceOf(account)
+
+    if (i % 50 == 0) {
+      console.log(`Compared balances of ${i + 1} accounts`);
+    }
+    if (!actualBalance.eq(expectedBalance)) {
+      balanceMissmatches += 1;
+      console.log(`Balance miss match ${account} balance before upgrade: ${expectedBalance.toString(10)} balance before upgrade: ${actualBalance.toString(10)}`)
+    }
+  }
+  console.log(`Accounts with difference balances: ${balanceMissmatches}`)
+}
+
 async function governorArgs({ contract, signature, args = [] }) {
   const method = signature.split("(")[0];
   const tx = await contract.populateTransaction[method](...args);
@@ -861,4 +961,7 @@ module.exports = {
   differenceInErc20TokenBalance,
   differenceInErc20TokenBalances,
   differenceInStrategyBalance,
+  addActualBalancesToSquidData,
+  compareUpgradedContractBalances,
+  testTransfersOnTokenContract,
 };