Merge pull request #317 from rsksmart/feature/GBI-2478-addMultisigExecTransaction

gsoares85 · web-flow · commit 495faeeb0bd1 · 2025-02-11T14:09:01.000+01:00
feat: extended multisig change unit tests
diff --git a/e2e/multisig-migration.test.ts b/e2e/multisig-migration.test.ts
@@ -1,9 +1,16 @@
-import { ethers } from "hardhat";
+import { ethers, upgrades } from "hardhat";
 import * as helpers from "@nomicfoundation/hardhat-toolbox/network-helpers";
 import { changeMultisigOwner } from "../scripts/deployment-utils/change-multisig-owner";
 import { expect } from "chai";
 import { DeploymentConfig, read } from "../scripts/deployment-utils/deploy";
 import multsigInfoJson from "../multisig-owners.json";
+import {
+  GnosisSafe,
+  LiquidityBridgeContract,
+  LiquidityBridgeContractAdmin,
+  LiquidityBridgeContractV2,
+} from "../typechain-types";
+import { deployUpgradeLibraries } from "../scripts/deployment-utils/upgrade-proxy";
 
 type MultisigInfo = Record<
   string,
@@ -14,33 +21,29 @@ type MultisigInfo = Record<
 >;
 
 const { FORK_NETWORK_NAME } = process.env;
-
 const multsigInfo: MultisigInfo = multsigInfoJson;
 
-describe("Should change LBC owner to the multisig", function () {
+describe("Should change LBC owner to the multisig.ts", function () {
   it("Should change the owner", async () => {
     await checkForkedNetwork();
-
     const networkName = FORK_NETWORK_NAME ?? "rskTestnet";
 
+    const lbcName = "LiquidityBridgeContract";
     const addresses: Partial<DeploymentConfig> = read();
     const networkDeployments: Partial<DeploymentConfig[string]> | undefined =
       addresses[networkName];
-
     const lbcAddress = networkDeployments?.LiquidityBridgeContract?.address;
+    const safeAddress = multsigInfo[networkName].address;
 
     if (!lbcAddress) {
       throw new Error(
         "LiquidityBridgeContract proxy deployment info not found"
       );
     }
+    console.info(`LBC address: ${lbcAddress}`);
+    console.info(`Safe address: ${safeAddress}`);
 
-    const lbc = await ethers.getContractAt(
-      "LiquidityBridgeContractV2",
-      lbcAddress
-    );
-
-    const safeAddress = multsigInfo[networkName].address;
+    const lbc = await ethers.getContractAt(lbcName, lbcAddress);
 
     const lbcOwner = await lbc.owner();
     console.info("LBC owner:", lbcOwner);
@@ -52,6 +55,57 @@ describe("Should change LBC owner to the multisig", function () {
     ).to.not.be.reverted;
     const newLbcOwner = await lbc.owner();
     console.info("New LBC owner:", newLbcOwner);
+
+    await expect(
+      lbc.connect(impersonatedSigner).setProviderStatus(1, false)
+    ).to.be.revertedWith("LBC005");
+
+    const safeContract = await ethers.getContractAt("GnosisSafe", safeAddress);
+    const opts = { verbose: true };
+    const libs = await deployUpgradeLibraries(networkName, opts);
+
+    const NewLbcFactory = await ethers.getContractFactory(
+      "LiquidityBridgeContractV2",
+      {
+        libraries: {
+          QuotesV2: libs.quotesV2,
+          BtcUtils: libs.btcUtils,
+          SignatureValidator: libs.signatureValidator,
+        },
+      }
+    );
+
+    const newLbcDeployed = await NewLbcFactory.deploy();
+    const newLbcAddress = await newLbcDeployed.getAddress();
+
+    await expect(
+      multisigExecProviderStatusChangeTransaction(safeContract, lbc)
+    ).to.eventually.be.equal(true);
+
+    const adminAddress = await upgrades.erc1967.getAdminAddress(lbcAddress);
+    const adminContract = await ethers.getContractAt(
+      "LiquidityBridgeContractAdmin",
+      adminAddress
+    );
+
+    await expect(
+      adminContract.upgrade(lbcAddress, newLbcAddress)
+    ).to.revertedWith("Ownable: caller is not the owner");
+
+    await expect(
+      multisigExecUpgradeTransaction(
+        safeContract,
+        lbc,
+        newLbcDeployed,
+        adminContract
+      )
+    ).to.eventually.be.equal(true);
+
+    const newLbc = await ethers.getContractAt(
+      "LiquidityBridgeContractV2",
+      lbcAddress
+    );
+    await expect(newLbc.version()).to.eventually.be.equal("1.3.0");
   });
 });
 
@@ -62,3 +116,212 @@ async function checkForkedNetwork() {
     console.error("Not a forked network:", error);
   }
 }
+
+function generateConcatenatedSignatures(owners: string[]) {
+  const concatenatedSignatures =
+    "0x" +
+    owners
+      .sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase())) // SORT owners in ascending order
+      .map((owner) => {
+        return "0".repeat(24) + owner.slice(2) + "0".repeat(64) + "01";
+      })
+      .join("");
+
+  return concatenatedSignatures;
+}
+
+export async function multisigExecProviderStatusChangeTransaction(
+  safeContract: GnosisSafe,
+  lbc: LiquidityBridgeContract
+): Promise<boolean> {
+  const callData = lbc.interface.encodeFunctionData("setProviderStatus", [
+    1,
+    false,
+  ]);
+  console.info("Call data:", callData);
+
+  const nonce = await safeContract.nonce();
+  console.info("Nonce:", nonce);
+
+  const txData = {
+    to: await lbc.getAddress(),
+    value: 0,
+    data: callData,
+    operation: 0,
+    safeTxGas: 0,
+    baseGas: 0,
+    gasPrice: 0,
+    gasToken: ethers.ZeroAddress,
+    refundReceiver: ethers.ZeroAddress,
+    nonce: nonce,
+    signatures: "0x",
+  };
+
+  const owners = await safeContract.getOwners();
+
+  const desiredBalance = ethers.toQuantity(ethers.parseEther("100"));
+
+  await helpers.impersonateAccount(owners[0]);
+  const impersonateOwner1 = await ethers.getSigner(owners[0]);
+  await ethers.provider.send("hardhat_setBalance", [
+    impersonateOwner1.address,
+    desiredBalance,
+  ]);
+  await helpers.impersonateAccount(owners[1]);
+  const impersonateOwner2 = await ethers.getSigner(owners[1]);
+  await ethers.provider.send("hardhat_setBalance", [
+    impersonateOwner2.address,
+    desiredBalance,
+  ]);
+  await helpers.impersonateAccount(owners[2]);
+  const impersonateOwner3 = await ethers.getSigner(owners[2]);
+  await ethers.provider.send("hardhat_setBalance", [
+    impersonateOwner3.address,
+    desiredBalance,
+  ]);
+
+  const transactionHash = await safeContract
+    .connect(impersonateOwner1)
+    .getTransactionHash(
+      txData.to,
+      txData.value,
+      txData.data,
+      txData.operation,
+      txData.safeTxGas,
+      txData.baseGas,
+      txData.gasPrice,
+      txData.gasToken,
+      txData.refundReceiver,
+      txData.nonce
+    );
+  console.info("Transaction hash:", transactionHash);
+
+  await safeContract.connect(impersonateOwner1).approveHash(transactionHash);
+  await safeContract.connect(impersonateOwner2).approveHash(transactionHash);
+  await safeContract.connect(impersonateOwner3).approveHash(transactionHash);
+  const signature = generateConcatenatedSignatures([
+    impersonateOwner1.address,
+    impersonateOwner2.address,
+    impersonateOwner3.address,
+  ]);
+  console.info("Signature:", signature);
+
+  txData.signatures = signature;
+
+  const result = await safeContract.execTransaction(
+    txData.to,
+    txData.value,
+    txData.data,
+    txData.operation,
+    txData.safeTxGas,
+    txData.baseGas,
+    txData.gasPrice,
+    txData.gasToken,
+    txData.refundReceiver,
+    txData.signatures
+  );
+
+  return Boolean(result);
+}
+
+export async function multisigExecUpgradeTransaction(
+  safeContract: GnosisSafe,
+  lbc: LiquidityBridgeContract,
+  lbcV2: LiquidityBridgeContractV2,
+  adminContract: LiquidityBridgeContractAdmin
+): Promise<boolean> {
+  const proxyAddress = await lbc.getAddress();
+
+  let result = false;
+
+  const callData = adminContract.interface.encodeFunctionData("upgrade", [
+    proxyAddress,
+    await lbcV2.getAddress(),
+  ]);
+  console.info("Call data:", callData);
+
+  const nonce = await safeContract.nonce();
+  console.info("Nonce:", nonce);
+
+  const txData = {
+    to: await adminContract.getAddress(),
+    value: 0,
+    data: callData,
+    operation: 0,
+    safeTxGas: 0,
+    baseGas: 0,
+    gasPrice: 0,
+    gasToken: ethers.ZeroAddress,
+    refundReceiver: ethers.ZeroAddress,
+    nonce: nonce,
+    signatures: "0x",
+  };
+
+  const owners = await safeContract.getOwners();
+
+  const desiredBalance = ethers.toQuantity(ethers.parseEther("100"));
+
+  await helpers.impersonateAccount(owners[0]);
+  const impersonateOwner1 = await ethers.getSigner(owners[0]);
+  await ethers.provider.send("hardhat_setBalance", [
+    impersonateOwner1.address,
+    desiredBalance,
+  ]);
+  await helpers.impersonateAccount(owners[1]);
+  const impersonateOwner2 = await ethers.getSigner(owners[1]);
+  await ethers.provider.send("hardhat_setBalance", [
+    impersonateOwner2.address,
+    desiredBalance,
+  ]);
+  await helpers.impersonateAccount(owners[2]);
+  const impersonateOwner3 = await ethers.getSigner(owners[2]);
+  await ethers.provider.send("hardhat_setBalance", [
+    impersonateOwner3.address,
+    desiredBalance,
+  ]);
+
+  const transactionHash = await safeContract
+    .connect(impersonateOwner1)
+    .getTransactionHash(
+      txData.to,
+      txData.value,
+      txData.data,
+      txData.operation,
+      txData.safeTxGas,
+      txData.baseGas,
+      txData.gasPrice,
+      txData.gasToken,
+      txData.refundReceiver,
+      txData.nonce
+    );
+  console.info("Transaction hash:", transactionHash);
+
+  await safeContract.connect(impersonateOwner1).approveHash(transactionHash);
+  await safeContract.connect(impersonateOwner2).approveHash(transactionHash);
+  await safeContract.connect(impersonateOwner3).approveHash(transactionHash);
+  const signature = generateConcatenatedSignatures([
+    impersonateOwner1.address,
+    impersonateOwner2.address,
+    impersonateOwner3.address,
+  ]);
+  console.info("Signature:", signature);
+
+  txData.signatures = signature;
+
+  result = Boolean(
+    await safeContract.execTransaction(
+      txData.to,
+      txData.value,
+      txData.data,
+      txData.operation,
+      txData.safeTxGas,
+      txData.baseGas,
+      txData.gasPrice,
+      txData.gasToken,
+      txData.refundReceiver,
+      txData.signatures
+    )
+  );
+
+  return Boolean(result);
+}
diff --git a/scripts/deployment-utils/change-multisig-owner.ts b/scripts/deployment-utils/change-multisig-owner.ts
@@ -4,24 +4,24 @@ import multisigOwners from "../../multisig-owners.json";
 import { HardhatEthersSigner } from "@nomicfoundation/hardhat-ethers/signers";
 
 /**
- * Changes the multisig owner of the `LiquidityBridgeContract` deployed on the current network to the safe wallet
+ * Changes the multisig.ts owner of the `LiquidityBridgeContract` deployed on the current network to the safe wallet
  * provided.
  *
  * This function validates the provided `newOwner` address, ensures ownership configuration matches
- * expectations, and performs the transfer of ownership to the new multisig address. Additionally,
+ * expectations, and performs the transfer of ownership to the new multisig.ts address. Additionally,
  * it updates both the contract and proxy admin ownership.
  *
  * @async
- * @param {string} newOwner - The address of the new multisig owner (Safe contract).
+ * @param {string} newOwner - The address of the new multisig.ts owner (Safe contract).
  * @param {string} network - The network where the script will run, by default will be the environment network.
  * @param {HardhatEthersSigner} signer - Optional signer for test.
  * @throws {Error} If the proxy contract is not deployed on the current network.
- * @throws {Error} If the provided `newOwner` address is not a valid multisig Safe contract.
+ * @throws {Error} If the provided `newOwner` address is not a valid multisig.ts Safe contract.
  * @throws {Error} If the configuration of owners on the Safe does not match the expected configuration.
  * @returns {Promise<void>} Resolves when the ownership transfer process is complete.
  *
  * @example
- * // Change the multisig owner of the contract
+ * // Change the multisig.ts owner of the contract
  * const newMultisigAddress = "0xNewSafeAddress";
  * await changeMultisigOwner(newMultisigAddress);
  */
