diff --git a/.changeset/small-singers-attend.md b/.changeset/small-singers-attend.md new file mode 100644 index 00000000..ec6ffd00 --- /dev/null +++ b/.changeset/small-singers-attend.md @@ -0,0 +1,6 @@ +--- +'@fuel-bridge/solidity-contracts': minor +'@fuel-bridge/test-utils': minor +--- + +ts linting for test packages diff --git a/.eslintignore b/.eslintignore index 5ebbe234..b03558b7 100644 --- a/.eslintignore +++ b/.eslintignore @@ -4,3 +4,4 @@ **/typechain/ docker/l1-chain/hardhat dist +**/exports/ diff --git a/packages/integration-tests/tests/bridge_erc20.ts b/packages/integration-tests/tests/bridge_erc20.ts index ee0d7096..c3b4015d 100644 --- a/packages/integration-tests/tests/bridge_erc20.ts +++ b/packages/integration-tests/tests/bridge_erc20.ts @@ -642,7 +642,7 @@ describe('Bridging ERC20 tokens', async function () { it('Rate limit parameters are updated when current withdrawn amount is more than the new limit & set a new higher limit', async () => { const deployer = await env.eth.deployer; - let newRateLimit = '5'; + const newRateLimit = '5'; let withdrawnAmountBeforeReset = await env.eth.fuelERC20Gateway.currentPeriodAmount( diff --git a/packages/integration-tests/tests/bridge_mainnet_tokens.ts b/packages/integration-tests/tests/bridge_mainnet_tokens.ts index 4c569bb1..593c9973 100644 --- a/packages/integration-tests/tests/bridge_mainnet_tokens.ts +++ b/packages/integration-tests/tests/bridge_mainnet_tokens.ts @@ -2,19 +2,19 @@ import type { BridgeFungibleToken } from '@fuel-bridge/fungible-token'; import { RATE_LIMIT_AMOUNT, RATE_LIMIT_DURATION, + USDT_ADDRESS, + USDC_ADDRESS, + WBTC_ADDRESS, + WETH_ADDRESS, } from '@fuel-bridge/solidity-contracts/protocol/constants'; -import { +import type { CustomToken, CustomTokenWETH, +} from '@fuel-bridge/solidity-contracts/typechain'; +import { CustomToken__factory, CustomTokenWETH__factory, } from '@fuel-bridge/solidity-contracts/typechain'; -import { - USDT_ADDRESS, - USDC_ADDRESS, - WBTC_ADDRESS, - WETH_ADDRESS, -} from '@fuel-bridge/solidity-contracts/protocol/constants'; import type { TestEnvironment } from '@fuel-bridge/test-utils'; import { setupEnvironment, @@ -89,8 +89,7 @@ describe('Bridge mainnet tokens', function () { fuel_AssetId ); - let transactionRequest; - transactionRequest = await fuel_bridge.functions + const transactionRequest = await fuel_bridge.functions .withdraw(paddedAddress) .addContracts([fuel_bridge, fuel_bridgeImpl]) .txParams({ @@ -232,7 +231,6 @@ describe('Bridge mainnet tokens', function () { const NUM_TOKENS = 100000000000000000000n; let ethereumTokenSender: Signer; let ethereumTokenSenderAddress: string; - let ethereumTokenSenderBalance: bigint; let fuelTokenReceiver: FuelWallet; let fuelTokenReceiverAddress: string; let fuelTokenReceiverBalance: BN; @@ -247,20 +245,12 @@ describe('Bridge mainnet tokens', function () { await weth_testToken .connect(ethereumTokenSender) .deposit({ value: NUM_TOKENS }); - - ethereumTokenSenderBalance = await weth_testToken.balanceOf( - ethereumTokenSenderAddress - ); } else { const mintAmount = BigInt(NUM_TOKENS) / 10n ** (18n - decimals[index]); await customToken .mint(ethereumTokenSender, mintAmount) .then((tx) => tx.wait()); - - ethereumTokenSenderBalance = await customToken.balanceOf( - ethereumTokenSenderAddress - ); } fuelTokenReceiver = env.fuel.signers[0]; @@ -302,10 +292,10 @@ describe('Bridge mainnet tokens', function () { fuelTokenMessageNonce = new BN(event.args.nonce.toString()); - let newSenderBalance; - // check that the sender balance has decreased by the expected amount - newSenderBalance = await token.balanceOf(ethereumTokenSenderAddress); + const newSenderBalance = await token.balanceOf( + ethereumTokenSenderAddress + ); expect(newSenderBalance === 0n).to.be.true; }); @@ -315,7 +305,7 @@ describe('Bridge mainnet tokens', function () { this.timeout(FUEL_MESSAGE_TIMEOUT_MS); // relay the message ourselves - let message = await waitForMessage( + const message = await waitForMessage( env.fuel.provider, fuelTokenMessageReceiver, fuelTokenMessageNonce, @@ -323,7 +313,7 @@ describe('Bridge mainnet tokens', function () { ); expect(message).to.not.be.null; - let tx = await relayCommonMessage(env.fuel.deployer, message, { + const tx = await relayCommonMessage(env.fuel.deployer, message, { gasLimit: 30000000, maturity: undefined, contractIds: [fuel_bridgeImpl.id.toHexString()], diff --git a/packages/integration-tests/tests/bridge_proxy.ts b/packages/integration-tests/tests/bridge_proxy.ts index 16ad23cb..ec184fbf 100644 --- a/packages/integration-tests/tests/bridge_proxy.ts +++ b/packages/integration-tests/tests/bridge_proxy.ts @@ -1,8 +1,8 @@ +import type { Proxy } from '@fuel-bridge/fungible-token'; import type { TestEnvironment } from '@fuel-bridge/test-utils'; import { setupEnvironment, getOrDeployL2Bridge } from '@fuel-bridge/test-utils'; import chai from 'chai'; import type { Contract, FuelError } from 'fuels'; -import { Proxy } from '@fuel-bridge/fungible-token'; const { expect } = chai; diff --git a/packages/integration-tests/tests/transfer_eth.ts b/packages/integration-tests/tests/transfer_eth.ts index ba28203f..2ef61397 100644 --- a/packages/integration-tests/tests/transfer_eth.ts +++ b/packages/integration-tests/tests/transfer_eth.ts @@ -1,5 +1,5 @@ +import type { TestEnvironment } from '@fuel-bridge/test-utils'; import { - TestEnvironment, setupEnvironment, fuels_parseEther, createRelayMessageParams, @@ -14,9 +14,8 @@ import { hardhatSkipTime, } from '@fuel-bridge/test-utils'; import chai from 'chai'; -import type { Signer } from 'ethers'; import { parseEther } from 'ethers'; -import type { JsonRpcProvider } from 'ethers'; +import type { Signer, JsonRpcProvider } from 'ethers'; import { Address, BN, padFirst12BytesOfEvmAddress } from 'fuels'; import type { AbstractAddress, @@ -264,6 +263,8 @@ describe('Transferring ETH', async function () { // withdraw ETH back to the base chain const blocksPerCommitInterval = await env.eth.fuelChainState.BLOCKS_PER_COMMIT_INTERVAL(); + + // eslint-disable-next-line no-constant-condition while (true) { const currentBlock = await env.fuel.provider.getBlockNumber(); debug(`Current block ${currentBlock.toString()}`); @@ -349,7 +350,7 @@ describe('Transferring ETH', async function () { }); describe('ETH Withdrawls based on rate limit updates', async () => { - let NUM_ETH = '9'; + const NUM_ETH = '9'; const largeRateLimit = `30`; let fuelETHSender: FuelWallet; let ethereumETHReceiver: Signer; diff --git a/packages/solidity-contracts/test/behaviors/erc20GatewayV4.behavior.test.ts b/packages/solidity-contracts/test/behaviors/erc20GatewayV4.behavior.test.ts index 9a53c5a1..678f35d2 100644 --- a/packages/solidity-contracts/test/behaviors/erc20GatewayV4.behavior.test.ts +++ b/packages/solidity-contracts/test/behaviors/erc20GatewayV4.behavior.test.ts @@ -23,7 +23,7 @@ import { import { randomAddress, randomBytes32 } from '../../protocol/utils'; import { CustomToken__factory, - NoDecimalsToken__factory + NoDecimalsToken__factory, } from '../../typechain'; import type { MockFuelMessagePortal, @@ -31,8 +31,8 @@ import type { Token, CustomToken, NoDecimalsToken, - - MockPermitToken} from '../../typechain'; + MockPermitToken, +} from '../../typechain'; import { impersonateAccount } from '../utils/impersonateAccount'; type Env = { diff --git a/packages/test-utils/src/scripts/check-balances.ts b/packages/test-utils/src/scripts/check-balances.ts index 25919ff0..e04df958 100644 --- a/packages/test-utils/src/scripts/check-balances.ts +++ b/packages/test-utils/src/scripts/check-balances.ts @@ -5,7 +5,8 @@ import { password } from '@inquirer/prompts'; import { Provider, WalletUnlocked } from 'fuels'; -let { L2_ADDRESS, L2_RPC } = process.env; +let { L2_ADDRESS } = process.env; +const { L2_RPC } = process.env; const main = async () => { const provider = await Provider.create(L2_RPC, { resourceCacheTTL: -1 }); diff --git a/packages/test-utils/src/scripts/check-nonce.ts b/packages/test-utils/src/scripts/check-nonce.ts index 3cb78f12..c6a8175a 100644 --- a/packages/test-utils/src/scripts/check-nonce.ts +++ b/packages/test-utils/src/scripts/check-nonce.ts @@ -2,9 +2,10 @@ * This is a stand-alone script that looks for a message nonce */ -import { BN, Message, Provider } from 'fuels'; +import type { Message } from 'fuels'; +import { BN, Provider } from 'fuels'; -let { L2_RPC, L2_MESSAGE_NONCE } = process.env; +const { L2_RPC, L2_MESSAGE_NONCE } = process.env; const main = async () => { if (!L2_MESSAGE_NONCE) { diff --git a/packages/test-utils/src/scripts/check-proxy-data.ts b/packages/test-utils/src/scripts/check-proxy-data.ts index 727d709b..eb6cc5e5 100644 --- a/packages/test-utils/src/scripts/check-proxy-data.ts +++ b/packages/test-utils/src/scripts/check-proxy-data.ts @@ -4,11 +4,9 @@ */ import { Proxy } from '@fuel-bridge/fungible-token'; - import { Provider } from 'fuels'; -let { L2_RPC, L2_BRIDGE_ID } = process.env; -const L1_LLAMA_RPC = 'https://eth.llamarpc.com'; +const { L2_RPC, L2_BRIDGE_ID } = process.env; const main = async () => { const fuel_provider = await Provider.create(L2_RPC, { resourceCacheTTL: -1 }); diff --git a/packages/test-utils/src/scripts/deploy-bridge.ts b/packages/test-utils/src/scripts/deploy-bridge.ts index e7bb6e68..80f7e2a3 100644 --- a/packages/test-utils/src/scripts/deploy-bridge.ts +++ b/packages/test-utils/src/scripts/deploy-bridge.ts @@ -8,17 +8,12 @@ import { BridgeFungibleTokenFactory, ProxyFactory, } from '@fuel-bridge/fungible-token'; - -import { - DeployContractResult, - Provider, - Wallet, - WalletUnlocked, - ZeroBytes32, -} from 'fuels'; import { password } from '@inquirer/prompts'; +import type { DeployContractResult, WalletUnlocked } from 'fuels'; +import { Provider, Wallet, ZeroBytes32 } from 'fuels'; -let { L1_TOKEN_GATEWAY, L2_SIGNER, L2_RPC } = process.env; +let { L2_SIGNER } = process.env; +const { L1_TOKEN_GATEWAY, L2_RPC } = process.env; // This helper avoids an exception in the case that the contract // was already deployed, and returns the contract instead diff --git a/packages/test-utils/src/scripts/deposit-to-coin.ts b/packages/test-utils/src/scripts/deposit-to-coin.ts index 8ad1b84c..d7d9f2fd 100644 --- a/packages/test-utils/src/scripts/deposit-to-coin.ts +++ b/packages/test-utils/src/scripts/deposit-to-coin.ts @@ -3,10 +3,11 @@ * to convert a message coin into a coin utxo */ -import { Provider, TransactionStatus, Wallet } from 'fuels'; import { password } from '@inquirer/prompts'; +import { Provider, TransactionStatus, Wallet } from 'fuels'; -let { L2_SIGNER, L2_RPC } = process.env; +let { L2_SIGNER } = process.env; +const { L2_RPC } = process.env; const main = async () => { if (!L2_RPC) { diff --git a/packages/test-utils/src/scripts/relay-deposit.ts b/packages/test-utils/src/scripts/relay-deposit.ts index 7c8e4ac3..dd087dee 100644 --- a/packages/test-utils/src/scripts/relay-deposit.ts +++ b/packages/test-utils/src/scripts/relay-deposit.ts @@ -4,9 +4,8 @@ */ import { Proxy } from '@fuel-bridge/fungible-token'; - import { contractMessagePredicate } from '@fuel-bridge/message-predicates'; - +import { password } from '@inquirer/prompts'; import { Account, BN, @@ -16,7 +15,7 @@ import { getPredicateRoot, hexlify, } from 'fuels'; -import { password } from '@inquirer/prompts'; + import { FUEL_MESSAGE_TIMEOUT_MS, debug, @@ -26,7 +25,9 @@ import { const TOKEN_RECIPIENT_DATA_OFFSET = 160; -let { L2_SIGNER, L2_RPC, L2_BRIDGE_ID, L2_MESSAGE_NONCE, L2_TOKEN_RECEIVER } = +let { L2_SIGNER } = process.env; + +const { L2_RPC, L2_BRIDGE_ID, L2_MESSAGE_NONCE, L2_TOKEN_RECEIVER } = process.env; const main = async () => { @@ -45,7 +46,7 @@ const main = async () => { console.log('\t> Balance: ', (await wallet.getBalance()).toString()); debug('Detecting if the bridge is a proxy...'); - let implementation_id: string | null = await proxy.functions + const implementation_id: string | null = await proxy.functions .proxy_target() .dryRun() .then((result) => { @@ -63,7 +64,9 @@ const main = async () => { let endCursor: string | undefined; if (L2_MESSAGE_NONCE) nonce = new BN(L2_MESSAGE_NONCE); + else + // eslint-disable-next-line no-constant-condition while (true) { const response = await provider.getMessages(predicateRoot, { after: endCursor, diff --git a/packages/test-utils/src/scripts/relay-metadata.ts b/packages/test-utils/src/scripts/relay-metadata.ts index 28ebce29..92a38ec3 100644 --- a/packages/test-utils/src/scripts/relay-metadata.ts +++ b/packages/test-utils/src/scripts/relay-metadata.ts @@ -4,9 +4,8 @@ */ import { Proxy } from '@fuel-bridge/fungible-token'; - import { contractMessagePredicate } from '@fuel-bridge/message-predicates'; - +import { password } from '@inquirer/prompts'; import { Account, BN, @@ -15,7 +14,7 @@ import { Wallet, getPredicateRoot, } from 'fuels'; -import { password } from '@inquirer/prompts'; + import { FUEL_MESSAGE_TIMEOUT_MS, debug, @@ -23,7 +22,8 @@ import { waitForMessage, } from '../utils'; -let { L2_SIGNER, L2_RPC, L2_BRIDGE_ID, L2_MESSAGE_NONCE } = process.env; +let { L2_SIGNER } = process.env; +const { L2_RPC, L2_BRIDGE_ID, L2_MESSAGE_NONCE } = process.env; const main = async () => { if (!L2_RPC) { @@ -51,7 +51,7 @@ const main = async () => { console.log('\t> Balance: ', (await wallet.getBalance()).toString()); debug('Detecting if the bridge is a proxy...'); - let implementation_id: string | null = await proxy.functions + const implementation_id: string | null = await proxy.functions .proxy_target() .dryRun() .then((result) => { diff --git a/packages/test-utils/src/scripts/transfer-bridge-ownership.ts b/packages/test-utils/src/scripts/transfer-bridge-ownership.ts index b6668be9..c5767fe1 100644 --- a/packages/test-utils/src/scripts/transfer-bridge-ownership.ts +++ b/packages/test-utils/src/scripts/transfer-bridge-ownership.ts @@ -4,12 +4,13 @@ */ import { Proxy } from '@fuel-bridge/fungible-token'; - -import { Provider, Wallet } from 'fuels'; import { password } from '@inquirer/prompts'; +import { Provider, Wallet } from 'fuels'; + import { debug } from '../utils'; -let { L2_SIGNER, L2_RPC, L2_BRIDGE_ID, L2_NEW_OWNER } = process.env; +let { L2_SIGNER } = process.env; +const { L2_RPC, L2_BRIDGE_ID, L2_NEW_OWNER } = process.env; const main = async () => { const provider = await Provider.create(L2_RPC, { resourceCacheTTL: -1 }); @@ -27,7 +28,7 @@ const main = async () => { console.log('\t> Balance: ', (await wallet.getBalance()).toString()); debug('Detecting if the bridge is a proxy...'); - let owner: string | null = await proxy.functions + const owner: string | null = await proxy.functions ._proxy_owner() .dryRun() .then((result) => { diff --git a/packages/test-utils/src/scripts/upgrade-bridge-kms.ts b/packages/test-utils/src/scripts/upgrade-bridge-kms.ts index a64b2a87..4be5a128 100644 --- a/packages/test-utils/src/scripts/upgrade-bridge-kms.ts +++ b/packages/test-utils/src/scripts/upgrade-bridge-kms.ts @@ -8,13 +8,14 @@ import { BridgeFungibleToken, } from '@fuel-bridge/fungible-token'; import { KMSAccount } from '@fuels/kms-account'; - -import { Provider, TransactionStatus, getRandomB256 } from 'fuels'; import { password } from '@inquirer/prompts'; +import { Provider, TransactionStatus, getRandomB256 } from 'fuels'; + import { debug } from '../utils'; -let { L1_TOKEN_GATEWAY, L2_SIGNER, L2_RPC, L2_BRIDGE_ID, KMS_KEY_ID } = - process.env; +let { L2_SIGNER } = process.env; + +const { L2_RPC, L2_BRIDGE_ID, KMS_KEY_ID, L1_TOKEN_GATEWAY } = process.env; const main = async () => { const provider = await Provider.create(L2_RPC!, { resourceCacheTTL: -1 }); @@ -32,7 +33,7 @@ const main = async () => { console.log('\t> Balance: ', (await kms_wallet.getBalance()).toString()); debug('Detecting if the bridge is a proxy: implementation'); - let current_implementation: string = await proxy.functions + const current_implementation: string = await proxy.functions .proxy_target() .dryRun() .then((result) => { @@ -50,7 +51,7 @@ const main = async () => { debug(`Current implementation at ${current_implementation}`); debug('Detecting if the bridge is a proxy: owner'); - let owner: string | null = await proxy.functions + const owner: string | null = await proxy.functions ._proxy_owner() .dryRun() .then((result) => { diff --git a/packages/test-utils/src/scripts/upgrade-bridge.ts b/packages/test-utils/src/scripts/upgrade-bridge.ts index 1c528b37..383a0cff 100644 --- a/packages/test-utils/src/scripts/upgrade-bridge.ts +++ b/packages/test-utils/src/scripts/upgrade-bridge.ts @@ -7,12 +7,14 @@ import { BridgeFungibleTokenFactory, BridgeFungibleToken, } from '@fuel-bridge/fungible-token'; - -import { Provider, TransactionStatus, Wallet, ZeroBytes32 } from 'fuels'; import { password } from '@inquirer/prompts'; +import { Provider, TransactionStatus, Wallet, ZeroBytes32 } from 'fuels'; + import { debug } from '../utils'; -let { L1_TOKEN_GATEWAY, L2_SIGNER, L2_RPC, L2_BRIDGE_ID } = process.env; +let { L2_SIGNER } = process.env; + +const { L2_RPC, L2_BRIDGE_ID, L1_TOKEN_GATEWAY } = process.env; const main = async () => { const provider = await Provider.create(L2_RPC!, { resourceCacheTTL: -1 }); @@ -28,7 +30,7 @@ const main = async () => { console.log('\t> Balance: ', (await wallet.getBalance()).toString()); debug('Detecting if the bridge is a proxy: implementation'); - let current_implementation: string = await proxy.functions + const current_implementation: string = await proxy.functions .proxy_target() .dryRun() .then((result) => { @@ -46,7 +48,7 @@ const main = async () => { debug(`Current implementation at ${current_implementation}`); debug('Detecting if the bridge is a proxy: owner'); - let owner: string | null = await proxy.functions + const owner: string | null = await proxy.functions ._proxy_owner() .dryRun() .then((result) => { diff --git a/packages/test-utils/src/scripts/verify-asset-metadata.ts b/packages/test-utils/src/scripts/verify-asset-metadata.ts index edd5f8d8..e5d98866 100644 --- a/packages/test-utils/src/scripts/verify-asset-metadata.ts +++ b/packages/test-utils/src/scripts/verify-asset-metadata.ts @@ -5,14 +5,17 @@ */ import { BridgeFungibleToken, Proxy } from '@fuel-bridge/fungible-token'; +import { IERC20Metadata__factory } from '@fuel-bridge/solidity-contracts/typechain'; +import { JsonRpcProvider, isAddress } from 'ethers'; +import type { FuelError } from 'fuels'; +import { Provider, isB256 } from 'fuels'; -import { FuelError, Provider, isB256 } from 'fuels'; import { debug, getTokenId } from '../utils'; -import { JsonRpcProvider, isAddress } from 'ethers'; -import { IERC20Metadata__factory } from '@fuel-bridge/solidity-contracts/typechain'; -let { L1_RPC, L2_RPC, L2_BRIDGE_ID, L2_ASSET_ID, L1_TOKEN_ADDRESS } = - process.env; +let { L2_ASSET_ID } = process.env; + +const { L1_RPC, L2_RPC, L2_BRIDGE_ID, L1_TOKEN_ADDRESS } = process.env; + const L1_LLAMA_RPC = 'https://eth.llamarpc.com'; const main = async () => { const fuel_provider = await Provider.create(L2_RPC, { resourceCacheTTL: -1 }); @@ -31,7 +34,7 @@ const main = async () => { console.log('\t> Checking asset metadata...'); debug('Detecting if the bridge is a proxy...'); - let implementation_id: string | null = await proxy.functions + await proxy.functions .proxy_target() .dryRun() .then((result) => { @@ -64,7 +67,7 @@ const main = async () => { return; } - let l1_token_address = '0x' + (call_result.value as string).slice(-40); + const l1_token_address = '0x' + (call_result.value as string).slice(-40); console.log('l1_token_address', `${l1_token_address}`); const fuel_symbol = (await bridge.functions.symbol(asset).dryRun()).value; diff --git a/packages/test-utils/src/scripts/withdraw-init.ts b/packages/test-utils/src/scripts/withdraw-init.ts index bec5fa42..20467015 100644 --- a/packages/test-utils/src/scripts/withdraw-init.ts +++ b/packages/test-utils/src/scripts/withdraw-init.ts @@ -4,27 +4,17 @@ */ import { BridgeFungibleToken, Proxy } from '@fuel-bridge/fungible-token'; - -import { - AbstractContract, - BN, - Provider, - TransactionStatus, - Wallet, - isB256, -} from 'fuels'; -import { isAddress, parseUnits } from 'ethers'; import { password } from '@inquirer/prompts'; +import { isAddress, parseUnits } from 'ethers'; +import type { AbstractContract } from 'fuels'; +import { BN, Provider, TransactionStatus, Wallet, isB256 } from 'fuels'; + import { debug, eth_address_to_b256 } from '../utils'; -let { - L2_SIGNER, - L2_RPC, - L2_BRIDGE_ID, - L2_ASSET_ID, - AMOUNT, - L1_TOKEN_RECEIVER, -} = process.env; +let { L2_SIGNER } = process.env; + +const { L2_ASSET_ID, L2_RPC, L2_BRIDGE_ID, AMOUNT, L1_TOKEN_RECEIVER } = + process.env; const main = async () => { const provider = await Provider.create(L2_RPC, { resourceCacheTTL: -1 }); @@ -52,7 +42,7 @@ const main = async () => { console.log('\t> Balance: ', (await wallet.getBalance()).toString()); debug('Detecting if the bridge is a proxy...'); - let implementation_id: string | null = await proxy.functions + const implementation_id: string | null = await proxy.functions .proxy_target() .dryRun() .then((result) => { diff --git a/packages/test-utils/src/utils/fuels/waitForBlock.ts b/packages/test-utils/src/utils/fuels/waitForBlock.ts index bb45c449..a720402a 100644 --- a/packages/test-utils/src/utils/fuels/waitForBlock.ts +++ b/packages/test-utils/src/utils/fuels/waitForBlock.ts @@ -1,4 +1,4 @@ -import { type Provider as FuelProvider, type BigNumberish, BN } from 'fuels'; +import { type Provider as FuelProvider, type BigNumberish } from 'fuels'; export async function waitForBlock( blockNumber: BigNumberish, diff --git a/packages/test-utils/src/utils/fuels/waitForMessage.ts b/packages/test-utils/src/utils/fuels/waitForMessage.ts index 6bf987e1..99b5af04 100644 --- a/packages/test-utils/src/utils/fuels/waitForMessage.ts +++ b/packages/test-utils/src/utils/fuels/waitForMessage.ts @@ -1,12 +1,7 @@ /// @dev The Fuel testing utils. /// A set of useful helper methods for the integration test environment. -import { - type Provider as FuelProvider, - type Message, - BN, - AbstractAddress, - hexlify, -} from 'fuels'; +import type { BN, AbstractAddress } from 'fuels'; +import { type Provider as FuelProvider, type Message, hexlify } from 'fuels'; import { FUEL_MESSAGE_POLL_MS } from '../constants'; import { delay } from '../delay'; diff --git a/packages/test-utils/src/utils/setup.ts b/packages/test-utils/src/utils/setup.ts index 7ce57778..35640936 100644 --- a/packages/test-utils/src/utils/setup.ts +++ b/packages/test-utils/src/utils/setup.ts @@ -13,7 +13,7 @@ import { FuelERC721Gateway__factory, } from '@fuel-bridge/solidity-contracts/typechain'; import * as dotenv from 'dotenv'; -import type { Signer as EthSigner, Provider as EthProvider } from 'ethers'; +import type { Signer as EthSigner } from 'ethers'; import { JsonRpcProvider, ethers,