From 5fee43a7573bda535b5257319fff18c600e2c0c2 Mon Sep 17 00:00:00 2001 From: William Hua Date: Thu, 22 Jun 2023 16:02:41 -0400 Subject: [PATCH] remove dependency cycle --- packages/account/src/account.ts | 4 ++-- packages/auth/src/session.ts | 4 ++-- packages/estimator/package.json | 1 - packages/estimator/src/overwriter-estimator.ts | 3 +-- packages/network/src/json-rpc-provider.ts | 14 -------------- packages/provider/src/wallet.ts | 5 ++--- packages/relayer/package.json | 3 +-- packages/relayer/src/rpc-relayer/index.ts | 3 +-- packages/utils/src/index.ts | 1 + packages/utils/src/network.ts | 15 +++++++++++++++ pnpm-lock.yaml | 8 +------- 11 files changed, 26 insertions(+), 35 deletions(-) create mode 100644 packages/utils/src/network.ts diff --git a/packages/account/src/account.ts b/packages/account/src/account.ts index f7cbe7015..b9f6a1cc8 100644 --- a/packages/account/src/account.ts +++ b/packages/account/src/account.ts @@ -1,10 +1,10 @@ import { commons, universal } from '@0xsequence/core' import { migrator, defaults, version } from '@0xsequence/migration' -import { NetworkConfig, getDefaultConnectionInfo } from '@0xsequence/network' +import { NetworkConfig } from '@0xsequence/network' import { FeeOption, FeeQuote, isRelayer, Relayer, RpcRelayer } from '@0xsequence/relayer' import { tracker } from '@0xsequence/sessions' import { Orchestrator } from '@0xsequence/signhub' -import { encodeTypedDataDigest } from '@0xsequence/utils' +import { encodeTypedDataDigest, getDefaultConnectionInfo } from '@0xsequence/utils' import { Wallet } from '@0xsequence/wallet' import { ethers, TypedDataDomain, TypedDataField } from 'ethers' diff --git a/packages/auth/src/session.ts b/packages/auth/src/session.ts index 0615fab1e..8071eaf23 100644 --- a/packages/auth/src/session.ts +++ b/packages/auth/src/session.ts @@ -1,5 +1,5 @@ -import { NetworkConfig, ChainIdLike, findNetworkConfig, getDefaultConnectionInfo } from '@0xsequence/network' -import { jwtDecodeClaims } from '@0xsequence/utils' +import { NetworkConfig, ChainIdLike, findNetworkConfig } from '@0xsequence/network' +import { getDefaultConnectionInfo, jwtDecodeClaims } from '@0xsequence/utils' import { Account } from '@0xsequence/account' import { ethers } from 'ethers' import { tracker, trackers } from '@0xsequence/sessions' diff --git a/packages/estimator/package.json b/packages/estimator/package.json index 4ec943285..1eb6516da 100644 --- a/packages/estimator/package.json +++ b/packages/estimator/package.json @@ -19,7 +19,6 @@ "dependencies": { "@0xsequence/abi": "workspace:*", "@0xsequence/core": "workspace:*", - "@0xsequence/network": "workspace:*", "@0xsequence/utils": "workspace:*", "@0xsequence/wallet-contracts": "^1.10.0" }, diff --git a/packages/estimator/src/overwriter-estimator.ts b/packages/estimator/src/overwriter-estimator.ts index 7bb850c26..ba038e054 100644 --- a/packages/estimator/src/overwriter-estimator.ts +++ b/packages/estimator/src/overwriter-estimator.ts @@ -1,6 +1,5 @@ import { ethers } from 'ethers' -import { isBigNumberish, Optionals } from '@0xsequence/utils' -import { getDefaultConnectionInfo } from '@0xsequence/network' +import { getDefaultConnectionInfo, isBigNumberish, Optionals } from '@0xsequence/utils' const GasEstimator = require('@0xsequence/wallet-contracts/artifacts/contracts/modules/utils/GasEstimator.sol/GasEstimator.json') diff --git a/packages/network/src/json-rpc-provider.ts b/packages/network/src/json-rpc-provider.ts index 65ef32c4f..1d2518106 100644 --- a/packages/network/src/json-rpc-provider.ts +++ b/packages/network/src/json-rpc-provider.ts @@ -106,17 +106,3 @@ function getResult(payload: { error?: { code?: number; data?: any; message?: str } return payload.result } - -export const getDefaultConnectionInfo = (url: string): ethers.utils.ConnectionInfo => { - return { - url, - skipFetchSetup: true, - fetchOptions: { - mode: 'cors', - cache: 'force-cache', - credentials: 'same-origin', - redirect: 'follow', - referrer: 'client' - } - } -} diff --git a/packages/provider/src/wallet.ts b/packages/provider/src/wallet.ts index 6e9c6857a..7de77b70c 100644 --- a/packages/provider/src/wallet.ts +++ b/packages/provider/src/wallet.ts @@ -16,10 +16,9 @@ import { updateNetworkConfig, ensureValidNetworks, sortNetworks, - findSupportedNetwork, - getDefaultConnectionInfo + findSupportedNetwork } from '@0xsequence/network' -import { logger } from '@0xsequence/utils' +import { getDefaultConnectionInfo, logger } from '@0xsequence/utils' import { Web3Provider, Web3Signer } from './provider' import { MuxMessageProvider, diff --git a/packages/relayer/package.json b/packages/relayer/package.json index bdb363f4d..4faadafc9 100644 --- a/packages/relayer/package.json +++ b/packages/relayer/package.json @@ -19,8 +19,7 @@ "dependencies": { "@0xsequence/abi": "workspace:*", "@0xsequence/core": "workspace:*", - "@0xsequence/utils": "workspace:*", - "@0xsequence/network": "workspace:*" + "@0xsequence/utils": "workspace:*" }, "peerDependencies": { "ethers": ">=5.5 < 6" diff --git a/packages/relayer/src/rpc-relayer/index.ts b/packages/relayer/src/rpc-relayer/index.ts index 5f8f2cdb5..0c1cb7b6f 100644 --- a/packages/relayer/src/rpc-relayer/index.ts +++ b/packages/relayer/src/rpc-relayer/index.ts @@ -2,8 +2,7 @@ import { ethers } from 'ethers' import { FeeOption, FeeQuote, Relayer, SimulateResult } from '..' import * as proto from './relayer.gen' import { commons } from '@0xsequence/core' -import { logger } from '@0xsequence/utils' -import { getDefaultConnectionInfo } from '@0xsequence/network' +import { getDefaultConnectionInfo, logger } from '@0xsequence/utils' export { proto } diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts index 1ce1a6de9..233452aec 100644 --- a/packages/utils/src/index.ts +++ b/packages/utils/src/index.ts @@ -4,6 +4,7 @@ export * from './digest' export * from './is-node-or-browser' export * from './jwt-decode' export * from './logger' +export * from './network' export * from './promise-cache' export * from './promisify' export * from './query-string' diff --git a/packages/utils/src/network.ts b/packages/utils/src/network.ts new file mode 100644 index 000000000..1a1cadbad --- /dev/null +++ b/packages/utils/src/network.ts @@ -0,0 +1,15 @@ +import { ethers } from 'ethers' + +export const getDefaultConnectionInfo = (url: string): ethers.utils.ConnectionInfo => { + return { + url, + skipFetchSetup: true, + fetchOptions: { + mode: 'cors', + cache: 'force-cache', + credentials: 'same-origin', + redirect: 'follow', + referrer: 'client' + } + } +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 94a57774e..0616723d3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '6.1' +lockfileVersion: '6.0' settings: autoInstallPeers: true @@ -413,9 +413,6 @@ importers: '@0xsequence/core': specifier: workspace:* version: link:../core - '@0xsequence/network': - specifier: workspace:* - version: link:../network '@0xsequence/utils': specifier: workspace:* version: link:../utils @@ -587,9 +584,6 @@ importers: '@0xsequence/core': specifier: workspace:* version: link:../core - '@0xsequence/network': - specifier: workspace:* - version: link:../network '@0xsequence/utils': specifier: workspace:* version: link:../utils