Skip to content

Commit

Permalink
remove dependency cycle
Browse files Browse the repository at this point in the history
  • Loading branch information
attente committed Jun 22, 2023
1 parent 2462dc9 commit 218f843
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 35 deletions.
4 changes: 2 additions & 2 deletions packages/account/src/account.ts
Original file line number Diff line number Diff line change
@@ -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'

Expand Down
4 changes: 2 additions & 2 deletions packages/auth/src/session.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
1 change: 0 additions & 1 deletion packages/estimator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"dependencies": {
"@0xsequence/abi": "workspace:*",
"@0xsequence/core": "workspace:*",
"@0xsequence/network": "workspace:*",
"@0xsequence/utils": "workspace:*",
"@0xsequence/wallet-contracts": "^1.10.0"
},
Expand Down
3 changes: 1 addition & 2 deletions packages/estimator/src/overwriter-estimator.ts
Original file line number Diff line number Diff line change
@@ -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')

Expand Down
14 changes: 0 additions & 14 deletions packages/network/src/json-rpc-provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
}
5 changes: 2 additions & 3 deletions packages/provider/src/wallet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions packages/relayer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions packages/relayer/src/rpc-relayer/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

Expand Down
1 change: 1 addition & 0 deletions packages/utils/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
15 changes: 15 additions & 0 deletions packages/utils/src/network.ts
Original file line number Diff line number Diff line change
@@ -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'
}
}
}
8 changes: 1 addition & 7 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 218f843

Please sign in to comment.