diff --git a/src/methods/changeMultisigOwners.ts b/src/methods/changeMultisigOwners.ts index 62754a3c..c80e0ea6 100644 --- a/src/methods/changeMultisigOwners.ts +++ b/src/methods/changeMultisigOwners.ts @@ -1,11 +1,11 @@ import { Contracts } from "../contracts/contracts"; -import { ContractNames, slavesMultisigsNames } from "../contracts/names"; +import { getSlavesMultisigsNames } from "../contracts/names"; import { MasterMultisig } from "../../typechain-types"; import { submitTransaction } from "../multisig/submitTransaction"; export async function changeMultisigOwners(contracts: Contracts, newOwner: string, multisigAddresses?: string[]) { if (!multisigAddresses) - multisigAddresses = slavesMultisigsNames + multisigAddresses = getSlavesMultisigsNames(contracts.multisigVersion) .map((n) => contracts.getContractByNameSafe(n)?.address) .filter((el) => el !== undefined) as string[]; diff --git a/src/multisig/submitTransaction.ts b/src/multisig/submitTransaction.ts index 5b2ca352..fcd447b4 100644 --- a/src/multisig/submitTransaction.ts +++ b/src/multisig/submitTransaction.ts @@ -1,6 +1,6 @@ import { Multisig } from "../../typechain-types"; import { BaseContract, BigNumberish, PopulatedTransaction } from "ethers"; -import { ContractNames, MULTISIGS } from "../contracts/names"; +import { ContractNames, getMultisigs } from "../contracts/names"; import { Contracts } from "../contracts/contracts"; export async function submitTransaction( @@ -22,15 +22,15 @@ export async function submitTransaction( export async function submitTransaction2( contracts: Contracts, - contractName: Omit, + contractName: Omit, value: BigNumberish, calldataTx: (contract: T["populateTransaction"]) => Promise ) { - const contractNameTyped: keyof typeof MULTISIGS = (contractName as keyof typeof MULTISIGS); - if (MULTISIGS[contractNameTyped] === undefined) - throw new Error(`Multisig for ${contractName} not found`); + const multisigs = getMultisigs(contracts.multisigVersion); + const contractNameTyped: keyof typeof multisigs = contractName as keyof typeof multisigs; + if (multisigs[contractNameTyped] === undefined) throw new Error(`Multisig for ${contractName} not found`); const contract = contracts.getContractByName(contractNameTyped) as T; - const multisig = contracts.getContractByName(MULTISIGS[contractNameTyped]) as Multisig; + const multisig = contracts.getContractByName(multisigs[contractNameTyped]) as Multisig; const calldata = (await calldataTx(contract.populateTransaction)).data!; return await submitTransaction(multisig, contract.address, value, calldata); }