diff --git a/scripts/constant/abis.ts b/scripts/constant/abis.ts index 43097ba5..b63e82e8 100644 --- a/scripts/constant/abis.ts +++ b/scripts/constant/abis.ts @@ -1,4 +1,4 @@ -export const abis: Record = { +export default { core: { connectorsV2: require("./abi/core/connectorsV2.json"), instaIndex: require("./abi/core/instaIndex.json"), diff --git a/scripts/tests/buildDSAv2.ts b/scripts/tests/buildDSAv2.ts index 383d9ef1..d8a95ee1 100644 --- a/scripts/tests/buildDSAv2.ts +++ b/scripts/tests/buildDSAv2.ts @@ -2,7 +2,7 @@ import { ethers } from "hardhat"; import { addresses as addressesPolygon } from "./polygon/addresses"; import { addresses } from "./mainnet/addresses"; -import { abis } from "../constant/abis"; +import abis from "../constant/abis"; import { abi } from "../../deployements/mainnet/Implementation_m1.sol/InstaImplementationM1.json"; function getAddress(network: string | undefined) { diff --git a/scripts/tests/deployAndEnableConnector.ts b/scripts/tests/deployAndEnableConnector.ts index 8e1f5d4b..324b56ec 100644 --- a/scripts/tests/deployAndEnableConnector.ts +++ b/scripts/tests/deployAndEnableConnector.ts @@ -1,6 +1,6 @@ import { addresses as addressesPolygon } from "./polygon/addresses"; import { addresses } from "./mainnet/addresses"; -import { abis } from "../constant/abis"; +import abis from "../constant/abis"; import hre from "hardhat"; import type { Signer, Contract } from "ethers"; diff --git a/scripts/tests/encodeSpells.ts b/scripts/tests/encodeSpells.ts index 62a7a8bb..81ddcb03 100644 --- a/scripts/tests/encodeSpells.ts +++ b/scripts/tests/encodeSpells.ts @@ -1,5 +1,5 @@ import { web3 } from "hardhat"; -import { abis } from "../constant/abis"; +import abis from "../constant/abis"; export function encodeSpells(spells: any[]) { const targets = spells.map((a) => a.connector); diff --git a/scripts/tests/getMasterSigner.ts b/scripts/tests/getMasterSigner.ts index 794bb4be..e0f0e0b1 100644 --- a/scripts/tests/getMasterSigner.ts +++ b/scripts/tests/getMasterSigner.ts @@ -1,7 +1,7 @@ import { ethers, network } from "hardhat"; import { addresses } from "./mainnet/addresses"; import { addresses as addressesPolygon } from "./polygon/addresses"; -import { abis } from "../constant/abis"; +import abis from "../constant/abis"; function getAddress(network: string | undefined) { if (network === "polygon") return addressesPolygon.core.instaIndex; diff --git a/test/mainnet/aave/v1.test.ts b/test/mainnet/aave/v1.test.ts index 6af2ac78..bdf7c22e 100644 --- a/test/mainnet/aave/v1.test.ts +++ b/test/mainnet/aave/v1.test.ts @@ -1,6 +1,6 @@ import hre from "hardhat"; import { expect } from "chai"; -import { abis } from "../../../scripts/constant/abis"; +import abis from "../../../scripts/constant/abis"; import addresses from "../../../scripts/constant/addresses"; import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector"; import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"; diff --git a/test/mainnet/aave/v2.test.ts b/test/mainnet/aave/v2.test.ts index 85d1fb18..7348555a 100644 --- a/test/mainnet/aave/v2.test.ts +++ b/test/mainnet/aave/v2.test.ts @@ -1,6 +1,6 @@ import { expect } from "chai"; import hre from "hardhat"; -import { abis } from "../../../scripts/constant/abis"; +import abis from "../../../scripts/constant/abis"; import addresses from "../../../scripts/constant/addresses"; import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnableConnector"; import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"; diff --git a/test/mainnet/b.protocol/b.compound.test.ts b/test/mainnet/b.protocol/b.compound.test.ts index d222a2d0..743c8012 100644 --- a/test/mainnet/b.protocol/b.compound.test.ts +++ b/test/mainnet/b.protocol/b.compound.test.ts @@ -8,7 +8,7 @@ import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2" import { encodeSpells } from "../../../scripts/tests/encodeSpells" import { getMasterSigner } from "../../../scripts/tests/getMasterSigner" import addresses from "../../../scripts/constant/addresses"; -import { abis } from "../../../scripts/constant/abis"; +import abis from "../../../scripts/constant/abis"; import { constants } from "../../../scripts/constant/constant"; import { ConnectV2BCompound__factory } from "../../../typechain"; import type { Signer, Contract } from "ethers"; diff --git a/test/mainnet/b.protocol/b.liquity.test.ts b/test/mainnet/b.protocol/b.liquity.test.ts index eae222f5..007605a4 100644 --- a/test/mainnet/b.protocol/b.liquity.test.ts +++ b/test/mainnet/b.protocol/b.liquity.test.ts @@ -7,7 +7,7 @@ import { deployAndEnableConnector } from "../../../scripts/tests/deployAndEnable import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2" import { encodeSpells } from "../../../scripts/tests/encodeSpells" import { getMasterSigner } from "../../../scripts/tests/getMasterSigner" -import { abis } from "../../../scripts/constant/abis"; +import abis from "../../../scripts/constant/abis"; import { ConnectV2BLiquity__factory } from "../../../typechain"; import type { Signer, Contract } from "ethers"; import addresses from "../../../scripts/constant/addresses"; diff --git a/test/mainnet/b.protocol/b.maker.test.ts b/test/mainnet/b.protocol/b.maker.test.ts index 31e82d34..84b8df36 100644 --- a/test/mainnet/b.protocol/b.maker.test.ts +++ b/test/mainnet/b.protocol/b.maker.test.ts @@ -8,7 +8,7 @@ import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2" import { encodeSpells } from "../../../scripts/tests/encodeSpells" import { getMasterSigner } from "../../../scripts/tests/getMasterSigner" import addresses from "../../../scripts/constant/addresses"; -import { abis } from "../../../scripts/constant/abis"; +import abis from "../../../scripts/constant/abis"; import { tokens } from "../../../scripts/constant/tokens"; import { ConnectV2BMakerDAO__factory } from "../../../typechain"; import type { Signer, Contract } from "ethers"; diff --git a/test/mainnet/basic-ERC1155/ERC1155-transfer.ts b/test/mainnet/basic-ERC1155/ERC1155-transfer.ts index da0ab626..df9490a3 100644 --- a/test/mainnet/basic-ERC1155/ERC1155-transfer.ts +++ b/test/mainnet/basic-ERC1155/ERC1155-transfer.ts @@ -9,7 +9,7 @@ import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2" import { encodeSpells } from "../../../scripts/tests/encodeSpells" import { getMasterSigner } from "../../../scripts/tests/getMasterSigner" import addresses from "../../../scripts/constant/addresses" -import { abis } from "../../../scripts/constant/abis" +import abis from "../../../scripts/constant/abis" import type { Signer, Contract } from "ethers"; import { ConnectV2BasicERC1155__factory, IERC1155__factory } from "../../../typechain"; diff --git a/test/mainnet/basic-ERC721/ERC721-transfer.ts b/test/mainnet/basic-ERC721/ERC721-transfer.ts index d4811879..6139449d 100644 --- a/test/mainnet/basic-ERC721/ERC721-transfer.ts +++ b/test/mainnet/basic-ERC721/ERC721-transfer.ts @@ -9,7 +9,7 @@ import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2" import { encodeSpells } from "../../../scripts/tests/encodeSpells" import { getMasterSigner } from "../../../scripts/tests/getMasterSigner" import addresses from "../../../scripts/constant/addresses" -import { abis } from "../../../scripts/constant/abis" +import abis from "../../../scripts/constant/abis" import type { Signer, Contract } from "ethers"; import { ConnectV2BasicERC721__factory, IERC721__factory } from "../../../typechain"; diff --git a/test/mainnet/compound/compound.test.ts b/test/mainnet/compound/compound.test.ts index ccb1c228..0a92eb49 100644 --- a/test/mainnet/compound/compound.test.ts +++ b/test/mainnet/compound/compound.test.ts @@ -10,7 +10,7 @@ import { buildDSAv2 } from "../../../scripts/tests/buildDSAv2" import { encodeSpells } from "../../../scripts/tests/encodeSpells"; import { getMasterSigner } from "../../../scripts/tests/getMasterSigner" import addresses from "../../../scripts/constant/addresses"; -import { abis } from "../../../scripts/constant/abis"; +import abis from "../../../scripts/constant/abis"; import { constants } from "../../../scripts/constant/constant"; import { ConnectV2Compound__factory } from "../../../typechain"; diff --git a/test/mainnet/instapool/instapool.test.ts b/test/mainnet/instapool/instapool.test.ts index 7aab1b6c..a30a612e 100644 --- a/test/mainnet/instapool/instapool.test.ts +++ b/test/mainnet/instapool/instapool.test.ts @@ -10,7 +10,7 @@ import encodeFlashcastData from "../../../scripts/tests/encodeFlashcastData" import { getMasterSigner } from "../../../scripts/tests/getMasterSigner" import addresses from "../../../scripts/constant/addresses"; -import { abis } from "../../../scripts/constant/abis"; +import abis from "../../../scripts/constant/abis"; import type { Signer, Contract } from "ethers"; import { ConnectV2Compound__factory } from "../../../typechain"; diff --git a/test/mainnet/liquity/liquity.helpers.ts b/test/mainnet/liquity/liquity.helpers.ts index 17e0b8af..e1cf4c54 100644 --- a/test/mainnet/liquity/liquity.helpers.ts +++ b/test/mainnet/liquity/liquity.helpers.ts @@ -10,7 +10,7 @@ import { getMasterSigner } from "../../../scripts/tests/getMasterSigner" // Instadapp instadappAddresses/ABIs import instadappAddresses from "../../../scripts/constant/addresses"; -import { abis } from "../../../scripts/constant/abis"; +import abis from "../../../scripts/constant/abis"; // Instadapp Liquity Connector artifacts import { ConnectV2Liquity__factory, ConnectV2Basic__factory } from "../../../typechain"; diff --git a/test/mainnet/pooltogether/pooltogether.test.ts b/test/mainnet/pooltogether/pooltogether.test.ts index 1882a3f2..6482118f 100644 --- a/test/mainnet/pooltogether/pooltogether.test.ts +++ b/test/mainnet/pooltogether/pooltogether.test.ts @@ -9,7 +9,7 @@ import { encodeSpells } from "../../../scripts/tests/encodeSpells"; import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"; import addresses from "../../../scripts/constant/addresses"; -import { abis } from "../../../scripts/constant/abis"; +import abis from "../../../scripts/constant/abis"; import { constants } from "../../../scripts/constant/constant"; import { tokens } from "../../../scripts/constant/tokens"; import type { Signer, Contract } from "ethers"; diff --git a/test/mainnet/uniswap/uniswap.test.ts b/test/mainnet/uniswap/uniswap.test.ts index 9b6761b3..92d1288a 100644 --- a/test/mainnet/uniswap/uniswap.test.ts +++ b/test/mainnet/uniswap/uniswap.test.ts @@ -9,7 +9,7 @@ import { encodeSpells } from "../../../scripts/tests/encodeSpells"; import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"; import { addLiquidity } from "../../../scripts/tests/addLiquidity"; import addresses from "../../../scripts/constant/addresses"; -import { abis } from "../../../scripts/constant/abis"; +import abis from "../../../scripts/constant/abis"; import type { Signer, Contract } from "ethers"; import { abi } from "@uniswap/v3-periphery/artifacts/contracts/NonfungiblePositionManager.sol/NonfungiblePositionManager.json"; diff --git a/test/mainnet/uniswapStake/uniswapStake.test.ts b/test/mainnet/uniswapStake/uniswapStake.test.ts index 0a86080d..8236cd0a 100644 --- a/test/mainnet/uniswapStake/uniswapStake.test.ts +++ b/test/mainnet/uniswapStake/uniswapStake.test.ts @@ -10,7 +10,7 @@ import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"; import { addLiquidity } from "../../../scripts/tests/addLiquidity"; import addresses from "../../../scripts/constant/addresses"; -import { abis } from "../../../scripts/constant/abis"; +import abis from "../../../scripts/constant/abis"; import { abi } from "@uniswap/v3-periphery/artifacts/contracts/NonfungiblePositionManager.sol/NonfungiblePositionManager.json" import type { Signer, Contract } from "ethers"; diff --git a/test/mainnet/yearn/yearn.test.ts b/test/mainnet/yearn/yearn.test.ts index 055b22c9..624c30a6 100644 --- a/test/mainnet/yearn/yearn.test.ts +++ b/test/mainnet/yearn/yearn.test.ts @@ -9,7 +9,7 @@ import { encodeSpells } from "../../../scripts/tests/encodeSpells"; import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"; import addresses from "../../../scripts/constant/addresses"; -import { abis } from "../../../scripts/constant/abis"; +import abis from "../../../scripts/constant/abis"; import { tokens } from "../../../scripts/constant/tokens"; import { Signer, Contract, BigNumber } from "ethers"; diff --git a/test/polygon/pooltogether/pooltogether.test.ts b/test/polygon/pooltogether/pooltogether.test.ts index 52b34073..e5bdbc24 100644 --- a/test/polygon/pooltogether/pooltogether.test.ts +++ b/test/polygon/pooltogether/pooltogether.test.ts @@ -11,7 +11,7 @@ import { encodeSpells } from "../../../scripts/tests/encodeSpells"; import { getMasterSigner } from "../../../scripts/tests/getMasterSigner"; import addresses from "../../../scripts/constant/addresses"; -import { abis } from "../../../scripts/constant/abis"; +import abis from "../../../scripts/constant/abis"; import { tokens } from "../../../scripts/constant/tokens"; import type { Signer, Contract } from "ethers";