diff --git a/packages/0xsequence/tests/browser/mock-wallet/mock-wallet.test.ts b/packages/0xsequence/tests/browser/mock-wallet/mock-wallet.test.ts index 6ee073cb7..b11e57707 100644 --- a/packages/0xsequence/tests/browser/mock-wallet/mock-wallet.test.ts +++ b/packages/0xsequence/tests/browser/mock-wallet/mock-wallet.test.ts @@ -1,7 +1,7 @@ import { ethers } from 'ethers' import { WalletRequestHandler, WindowMessageHandler } from '@0xsequence/provider' import { Account } from '@0xsequence/account' -import { NetworkConfig } from '@0xsequence/network' +import { ChainId, NetworkConfig } from '@0xsequence/network' import { LocalRelayer } from '@0xsequence/relayer' import { configureLogger } from '@0xsequence/utils' @@ -41,7 +41,7 @@ const main = async () => { const networks: NetworkConfig[] = [ { name: 'hardhat', - chainId: 31337, + chainId: 31337 as ChainId, rpcUrl: provider.connection.url, provider: provider, relayer: relayer, @@ -54,7 +54,7 @@ const main = async () => { }, { name: 'hardhat2', - chainId: 31338, + chainId: 31338 as ChainId, rpcUrl: provider2.connection.url, provider: provider2, relayer: relayer2, diff --git a/packages/0xsequence/tests/browser/mux-transport/mux.test.ts b/packages/0xsequence/tests/browser/mux-transport/mux.test.ts index d69114376..db5217a9b 100644 --- a/packages/0xsequence/tests/browser/mux-transport/mux.test.ts +++ b/packages/0xsequence/tests/browser/mux-transport/mux.test.ts @@ -8,7 +8,7 @@ import { } from '@0xsequence/provider' import { ethers } from 'ethers' import { test, assert } from '../../utils/assert' -import { NetworkConfig } from '@0xsequence/network' +import { ChainId, NetworkConfig } from '@0xsequence/network' import { LocalRelayer } from '@0xsequence/relayer' import { configureLogger } from '@0xsequence/utils' import { testAccounts, getEOAWallet } from '../testutils' @@ -57,18 +57,28 @@ export const tests = async () => { const networks: NetworkConfig[] = [ { name: 'hardhat', - chainId: 31337, + chainId: 31337 as ChainId, rpcUrl: provider1.connection.url, provider: provider1, relayer: relayer1, - isDefaultChain: true + isDefaultChain: true, + nativeToken: { + symbol: 'ETH', + name: 'Ether', + decimals: 18 + } }, { name: 'hardhat2', - chainId: 31338, + chainId: 31338 as ChainId, rpcUrl: provider2.connection.url, provider: provider2, - relayer: relayer2 + relayer: relayer2, + nativeToken: { + symbol: 'ETH', + name: 'Ether', + decimals: 18 + } } ] diff --git a/packages/0xsequence/tests/browser/proxy-transport/channel.test.ts b/packages/0xsequence/tests/browser/proxy-transport/channel.test.ts index ae8e56f77..3524e29b6 100644 --- a/packages/0xsequence/tests/browser/proxy-transport/channel.test.ts +++ b/packages/0xsequence/tests/browser/proxy-transport/channel.test.ts @@ -17,6 +17,7 @@ import * as utils from '@0xsequence/tests' import { Orchestrator } from '@0xsequence/signhub' import { trackers } from '@0xsequence/sessions' import { commons } from '@0xsequence/core' +import { ChainId } from '@0xsequence/network' configureLogger({ logLevel: 'DEBUG', silence: false }) @@ -70,11 +71,16 @@ export const tests = async () => { const networks = [ { name: 'hardhat', - chainId: 31337, + chainId: 31337 as ChainId, rpcUrl: rpcProvider.connection.url, provider: rpcProvider, relayer: relayer, - isDefaultChain: true + isDefaultChain: true, + nativeToken: { + symbol: 'ETH', + name: 'Ether', + decimals: 18 + } } ] diff --git a/packages/0xsequence/tests/browser/wallet-provider/dapp.test.ts b/packages/0xsequence/tests/browser/wallet-provider/dapp.test.ts index 99c55cd03..26952f5bd 100644 --- a/packages/0xsequence/tests/browser/wallet-provider/dapp.test.ts +++ b/packages/0xsequence/tests/browser/wallet-provider/dapp.test.ts @@ -97,7 +97,7 @@ export const tests = async () => { assert.equal(networks.length, 2, '2 networks') assert.true(networks[0].isDefaultChain!, '1st network is DefaultChain') assert.true(!networks[1].isDefaultChain, '1st network is not DefaultChain') - assert.true(networks[1].chainId === 31338, 'authChainId is correct') + assert.equal(networks[1].chainId, 31338, 'authChainId is correct') const authProvider = wallet.getProvider(31338)! assert.equal(authProvider.getChainId(), 31338, 'authProvider chainId is 31338') diff --git a/packages/account/tests/account.spec.ts b/packages/account/tests/account.spec.ts index 056e22686..5dee9276c 100644 --- a/packages/account/tests/account.spec.ts +++ b/packages/account/tests/account.spec.ts @@ -1,7 +1,7 @@ import { walletContracts } from '@0xsequence/abi' import { commons, v1, v2 } from '@0xsequence/core' import { migrator } from '@0xsequence/migration' -import { NetworkConfig } from '@0xsequence/network' +import { ChainId, NetworkConfig } from '@0xsequence/network' import { LocalRelayer, Relayer } from '@0xsequence/relayer' import { tracker, trackers } from '@0xsequence/sessions' import { Orchestrator } from '@0xsequence/signhub' @@ -100,7 +100,7 @@ describe('Account', () => { networks = [ { - chainId: 31337, + chainId: 31337 as ChainId, name: 'hardhat', provider: provider1, rpcUrl: '', @@ -112,7 +112,7 @@ describe('Account', () => { } }, { - chainId: 31338, + chainId: 31338 as ChainId, name: 'hardhat2', provider: provider2, rpcUrl: 'http://127.0.0.1:7048', diff --git a/packages/account/tests/signer.spec.ts b/packages/account/tests/signer.spec.ts index cdc8aede4..b006f9973 100644 --- a/packages/account/tests/signer.spec.ts +++ b/packages/account/tests/signer.spec.ts @@ -1,6 +1,6 @@ import { commons, v1, v2 } from '@0xsequence/core' import { migrator } from '@0xsequence/migration' -import { NetworkConfig } from '@0xsequence/network' +import { ChainId, NetworkConfig } from '@0xsequence/network' import { FeeOption, FeeQuote, LocalRelayer, LocalRelayerOptions, Relayer, proto } from '@0xsequence/relayer' import { tracker, trackers } from '@0xsequence/sessions' import { Orchestrator } from '@0xsequence/signhub' @@ -44,7 +44,7 @@ describe('Account signer', () => { networks = [ { - chainId: 31337, + chainId: 31337 as ChainId, name: 'hardhat', provider: provider1, rpcUrl: '', @@ -56,7 +56,7 @@ describe('Account signer', () => { } }, { - chainId: 31338, + chainId: 31338 as ChainId, name: 'hardhat2', provider: provider2, rpcUrl: 'http://127.0.0.1:7048', @@ -85,9 +85,9 @@ describe('Account signer', () => { }) describe('with new account', () => { - var account: Account - var config: any - var accountSigner: ethers.Wallet + let account: Account + let config: any + let accountSigner: ethers.Wallet beforeEach(async () => { accountSigner = randomWallet('Should create a new account') @@ -220,8 +220,8 @@ describe('Account signer', () => { }) describe('select fee', () => { - var account: never - var getAccount: (feeOptions: FeeOption[], feeQuote: FeeQuote) => Promise + let account: never + let getAccount: (feeOptions: FeeOption[], feeQuote: FeeQuote) => Promise beforeEach(async () => { class LocalRelayerWithFee extends LocalRelayer { diff --git a/packages/network/src/config.ts b/packages/network/src/config.ts index 0eadfe5c5..e83b92468 100644 --- a/packages/network/src/config.ts +++ b/packages/network/src/config.ts @@ -175,25 +175,5 @@ export const allNetworks = validateAndSortNetworks([ { ...networks[ChainId.TELOS], ...genUrls('telos') - }, - { - ...networks[ChainId.HARDHAT], - rpcUrl: 'http://localhost:8545', - relayer: { - url: 'http://localhost:3000', - provider: { - url: 'http://localhost:8545' - } - } - }, - { - ...networks[ChainId.HARDHAT_2], - rpcUrl: 'http://localhost:9545', - relayer: { - url: 'http://localhost:3000', - provider: { - url: 'http://localhost:9545' - } - } } ]) diff --git a/packages/network/src/constants.ts b/packages/network/src/constants.ts index f1ef554b2..6d4d0c37d 100644 --- a/packages/network/src/constants.ts +++ b/packages/network/src/constants.ts @@ -59,11 +59,7 @@ export enum ChainId { XR_SEPOLIA = 2730, // TELOS - TELOS = 40, - - // HARDHAT TESTNETS - HARDHAT = 31337, - HARDHAT_2 = 31338 + TELOS = 40 } export enum NetworkType { @@ -672,26 +668,26 @@ export const networks: Record = { name: 'TLOS', decimals: 18 } - }, - - [ChainId.HARDHAT]: { - chainId: ChainId.HARDHAT, - name: 'hardhat', - title: 'Hardhat (local testnet)', - nativeToken: { - symbol: 'ETH', - name: 'Ether', - decimals: 18 - } - }, - [ChainId.HARDHAT_2]: { - chainId: ChainId.HARDHAT_2, - name: 'hardhat2', - title: 'Hardhat (local testnet)', - nativeToken: { - symbol: 'ETH', - name: 'Ether', - decimals: 18 - } } + + // [ChainId.HARDHAT]: { + // chainId: ChainId.HARDHAT, + // name: 'hardhat', + // title: 'Hardhat (local testnet)', + // nativeToken: { + // symbol: 'ETH', + // name: 'Ether', + // decimals: 18 + // } + // }, + // [ChainId.HARDHAT_2]: { + // chainId: ChainId.HARDHAT_2, + // name: 'hardhat2', + // title: 'Hardhat (local testnet)', + // nativeToken: { + // symbol: 'ETH', + // name: 'Ether', + // decimals: 18 + // } + // } } diff --git a/packages/provider/tests/provider.spec.ts b/packages/provider/tests/provider.spec.ts index 2025f6264..e033d760c 100644 --- a/packages/provider/tests/provider.spec.ts +++ b/packages/provider/tests/provider.spec.ts @@ -8,7 +8,7 @@ import { SingleNetworkSequenceProvider } from '../src' import { expect } from 'chai' -import { JsonRpcRequest, JsonRpcResponse, allNetworks } from '@0xsequence/network' +import { ChainId, JsonRpcRequest, JsonRpcResponse, NetworkConfig, allNetworks } from '@0xsequence/network' import { ExtendedTransactionRequest } from '../src/extended' const hardhat1Provider = new ethers.providers.JsonRpcProvider('http://127.0.0.1:9595') @@ -501,11 +501,16 @@ describe('SequenceProvider', () => { it('should work when passing a full network config', () => { expect(provider.toChainId(allNetworks.find(n => n.chainId === 1))).to.equal(1) - expect(provider.toChainId(allNetworks.find(n => n.chainId === 31337))).to.equal(31337) + expect(provider.toChainId(allNetworks.find(n => n.chainId === (31337 as ChainId)))).to.equal(31337) }) it('should fail if the passed network config doesnt exist on the provider', () => { - const fakeNetwork = { chainId: 99999, name: 'fake', rpcUrl: 'http://127.0.0.1:99999' } + const fakeNetwork = { + chainId: 99999 as ChainId, + name: 'fake', + rpcUrl: 'http://127.0.0.1:99999', + nativeToken: { symbol: 'ETH', name: 'Ether', decimals: 18 } + } expect(() => provider.toChainId(fakeNetwork)).to.throw(`Unsupported network ${fakeNetwork}`) })