diff --git a/package.json b/package.json index 105c1c46b..45ad17422 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,6 @@ "url": "https://github.com/MetaMask/internal-snaps.git" }, "workspaces": [ - "examples/*", "packages/*" ], "files": [], @@ -39,7 +38,6 @@ "test:packages": "yarn test:verbose --silent --collectCoverage=false --reporters=jest-silent-reporter", "test:scripts": "NODE_OPTIONS=--experimental-vm-modules yarn jest --config ./jest.config.scripts.js --silent", "test:verbose": "yarn workspaces foreach --all --exclude @metamask/sample-snap --parallel --verbose run test:verbose", - "typecheck": "yarn workspace @metamask/snap-networks-utils run build && yarn workspaces foreach --all --parallel --verbose exec tsc --noEmit", "workspaces:list-versions": "./scripts/list-workspace-versions.sh" }, "devDependencies": { diff --git a/packages/bitcoin-wallet-snap/src/config.ts b/packages/bitcoin-wallet-snap/src/config.ts index 07d13052d..21d35aa56 100644 --- a/packages/bitcoin-wallet-snap/src/config.ts +++ b/packages/bitcoin-wallet-snap/src/config.ts @@ -1,7 +1,7 @@ /* eslint-disable no-restricted-globals */ import type { AddressType } from '@metamask/bitcoindevkit'; -import { LogLevel } from '@metamask/snap-networks-utils/logger'; +import { LogLevel } from '@metamask/snap-networks-utils'; import type { SnapConfig } from './entities'; diff --git a/packages/bitcoin-wallet-snap/src/entities/config.ts b/packages/bitcoin-wallet-snap/src/entities/config.ts index 3700c4301..4675c6e20 100644 --- a/packages/bitcoin-wallet-snap/src/entities/config.ts +++ b/packages/bitcoin-wallet-snap/src/entities/config.ts @@ -1,5 +1,5 @@ import type { AddressType, Network } from '@metamask/bitcoindevkit'; -import type { LogLevel } from '@metamask/snap-networks-utils/logger'; +import type { LogLevel } from '@metamask/snap-networks-utils'; export type SnapConfig = { logLevel: LogLevel; diff --git a/packages/bitcoin-wallet-snap/src/entities/index.ts b/packages/bitcoin-wallet-snap/src/entities/index.ts index 80e0fbff6..952bd1682 100644 --- a/packages/bitcoin-wallet-snap/src/entities/index.ts +++ b/packages/bitcoin-wallet-snap/src/entities/index.ts @@ -9,6 +9,6 @@ export * from './snap'; export type * from './meta-protocols'; export type * from './translator'; export type * from './rates'; -export type { Logger } from '@metamask/snap-networks-utils/logger'; +export type { Logger } from '@metamask/snap-networks-utils'; export * from './error'; export * from './confirmation'; diff --git a/packages/bitcoin-wallet-snap/src/index.ts b/packages/bitcoin-wallet-snap/src/index.ts index c81608743..92076b779 100644 --- a/packages/bitcoin-wallet-snap/src/index.ts +++ b/packages/bitcoin-wallet-snap/src/index.ts @@ -1,5 +1,5 @@ import { handleKeyringRequest } from '@metamask/keyring-snap-sdk/v2'; -import { Logger } from '@metamask/snap-networks-utils/logger'; +import { Logger } from '@metamask/snap-networks-utils'; import type { OnAssetsConversionHandler, OnAssetsLookupHandler, diff --git a/packages/bitcoin-wallet-snap/tsconfig.json b/packages/bitcoin-wallet-snap/tsconfig.json index a8a6abb0f..34352b8df 100644 --- a/packages/bitcoin-wallet-snap/tsconfig.json +++ b/packages/bitcoin-wallet-snap/tsconfig.json @@ -15,5 +15,6 @@ "moduleResolution": "bundler", "types": ["jest"] }, + "references": [{ "path": "../snap-networks-utils" }], "include": ["**/*.ts", "**/*.tsx", "locales/*.json"] } diff --git a/packages/snap-networks-utils/src/logger/Logger.ts b/packages/snap-networks-utils/src/logger/Logger.ts index 57230867b..b05465add 100644 --- a/packages/snap-networks-utils/src/logger/Logger.ts +++ b/packages/snap-networks-utils/src/logger/Logger.ts @@ -87,7 +87,7 @@ export type LoggerOptions = { * **Example: create an enabled logger.** * * ```ts - * import { Logger } from '@metamask/snap-networks-utils/logger'; + * import { Logger } from '@metamask/snap-networks-utils'; * * const logger = new Logger({ level: LogLevel.TRACE }); * logger.info('Account synced'); diff --git a/packages/solana-wallet-snap/src/core/caching/InMemoryCache.ts b/packages/solana-wallet-snap/src/core/caching/InMemoryCache.ts index 2e360f4ff..aa3cdd221 100644 --- a/packages/solana-wallet-snap/src/core/caching/InMemoryCache.ts +++ b/packages/solana-wallet-snap/src/core/caching/InMemoryCache.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { assert } from '@metamask/utils'; import type { Serializable } from '../serialization/types'; diff --git a/packages/solana-wallet-snap/src/core/caching/StateCache.ts b/packages/solana-wallet-snap/src/core/caching/StateCache.ts index b4806ecdb..c3f113459 100644 --- a/packages/solana-wallet-snap/src/core/caching/StateCache.ts +++ b/packages/solana-wallet-snap/src/core/caching/StateCache.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { assert } from '@metamask/utils'; import type { Serializable } from '../serialization/types'; diff --git a/packages/solana-wallet-snap/src/core/clients/price-api/PriceApiClient.ts b/packages/solana-wallet-snap/src/core/clients/price-api/PriceApiClient.ts index c63908ef5..72dda238a 100644 --- a/packages/solana-wallet-snap/src/core/clients/price-api/PriceApiClient.ts +++ b/packages/solana-wallet-snap/src/core/clients/price-api/PriceApiClient.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/naming-convention */ import type { CaipAssetType } from '@metamask/keyring-api'; -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { array, assert } from '@metamask/superstruct'; import { CaipAssetTypeStruct } from '@metamask/utils'; import { mapKeys } from 'lodash'; diff --git a/packages/solana-wallet-snap/src/core/clients/security-alerts-api/SecurityAlertsApiClient.ts b/packages/solana-wallet-snap/src/core/clients/security-alerts-api/SecurityAlertsApiClient.ts index 3bc70108f..1c485dfad 100644 --- a/packages/solana-wallet-snap/src/core/clients/security-alerts-api/SecurityAlertsApiClient.ts +++ b/packages/solana-wallet-snap/src/core/clients/security-alerts-api/SecurityAlertsApiClient.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; /* eslint-disable no-restricted-globals */ import bs58 from 'bs58'; diff --git a/packages/solana-wallet-snap/src/core/clients/token-api-client/TokenApiClient.ts b/packages/solana-wallet-snap/src/core/clients/token-api-client/TokenApiClient.ts index 4c6e416e1..5c8c71cf5 100644 --- a/packages/solana-wallet-snap/src/core/clients/token-api-client/TokenApiClient.ts +++ b/packages/solana-wallet-snap/src/core/clients/token-api-client/TokenApiClient.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import type { FungibleAssetMetadata } from '@metamask/snaps-sdk'; import { array, assert } from '@metamask/superstruct'; import type { Infer } from '@metamask/superstruct'; diff --git a/packages/solana-wallet-snap/src/core/handlers/onClientRequest/ClientRequestHandler.test.ts b/packages/solana-wallet-snap/src/core/handlers/onClientRequest/ClientRequestHandler.test.ts index 05de1a513..1a2b5f3b8 100644 --- a/packages/solana-wallet-snap/src/core/handlers/onClientRequest/ClientRequestHandler.test.ts +++ b/packages/solana-wallet-snap/src/core/handlers/onClientRequest/ClientRequestHandler.test.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { InvalidParamsError } from '@metamask/snaps-sdk'; import type { JsonRpcRequest } from '@metamask/snaps-sdk'; import { getBase64Codec, getUtf8Codec, pipe } from '@solana/kit'; diff --git a/packages/solana-wallet-snap/src/core/handlers/onClientRequest/ClientRequestHandler.ts b/packages/solana-wallet-snap/src/core/handlers/onClientRequest/ClientRequestHandler.ts index 89df73a61..e26bf05bd 100644 --- a/packages/solana-wallet-snap/src/core/handlers/onClientRequest/ClientRequestHandler.ts +++ b/packages/solana-wallet-snap/src/core/handlers/onClientRequest/ClientRequestHandler.ts @@ -1,5 +1,5 @@ import { FeeType } from '@metamask/keyring-api'; -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { InvalidParamsError, MethodNotFoundError } from '@metamask/snaps-sdk'; import type { Json, JsonRpcRequest } from '@metamask/snaps-sdk'; import { assert, create } from '@metamask/superstruct'; diff --git a/packages/solana-wallet-snap/src/core/handlers/onKeyringRequest/Keyring.test.ts b/packages/solana-wallet-snap/src/core/handlers/onKeyringRequest/Keyring.test.ts index 10c3d286c..25c37521a 100644 --- a/packages/solana-wallet-snap/src/core/handlers/onKeyringRequest/Keyring.test.ts +++ b/packages/solana-wallet-snap/src/core/handlers/onKeyringRequest/Keyring.test.ts @@ -2,7 +2,7 @@ import type { KeyringRequest } from '@metamask/keyring-api'; import { AccountCreationType, SolMethod } from '@metamask/keyring-api'; -import { Logger } from '@metamask/snap-networks-utils/logger'; +import { Logger } from '@metamask/snap-networks-utils'; import { InvalidParamsError, SnapError } from '@metamask/snaps-sdk'; import type { CaipAssetType, JsonRpcRequest } from '@metamask/snaps-sdk'; import { signature } from '@solana/kit'; diff --git a/packages/solana-wallet-snap/src/core/handlers/onKeyringRequest/Keyring.ts b/packages/solana-wallet-snap/src/core/handlers/onKeyringRequest/Keyring.ts index 06de637d2..9c1e9be66 100644 --- a/packages/solana-wallet-snap/src/core/handlers/onKeyringRequest/Keyring.ts +++ b/packages/solana-wallet-snap/src/core/handlers/onKeyringRequest/Keyring.ts @@ -24,7 +24,7 @@ import type { ExportedAccount, KeyringSnapRpc, } from '@metamask/keyring-api/v2'; -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import type { CaipAssetType, JsonRpcRequest } from '@metamask/snaps-sdk'; import { InvalidParamsError, diff --git a/packages/solana-wallet-snap/src/core/services/__mocks__/logger.ts b/packages/solana-wallet-snap/src/core/services/__mocks__/logger.ts index 6c6f19503..81db2fb1f 100644 --- a/packages/solana-wallet-snap/src/core/services/__mocks__/logger.ts +++ b/packages/solana-wallet-snap/src/core/services/__mocks__/logger.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; export const mockLogger = { log: jest.fn(), diff --git a/packages/solana-wallet-snap/src/core/services/accounts/AccountsSynchronizer.ts b/packages/solana-wallet-snap/src/core/services/accounts/AccountsSynchronizer.ts index 2563e4d49..5e1607f3d 100644 --- a/packages/solana-wallet-snap/src/core/services/accounts/AccountsSynchronizer.ts +++ b/packages/solana-wallet-snap/src/core/services/accounts/AccountsSynchronizer.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import type { SolanaKeyringAccount } from '../../../entities'; import type { AssetsService } from '../assets/AssetsService'; diff --git a/packages/solana-wallet-snap/src/core/services/analytics/AnalyticsService.ts b/packages/solana-wallet-snap/src/core/services/analytics/AnalyticsService.ts index a50d0d5de..397b4204a 100644 --- a/packages/solana-wallet-snap/src/core/services/analytics/AnalyticsService.ts +++ b/packages/solana-wallet-snap/src/core/services/analytics/AnalyticsService.ts @@ -1,5 +1,5 @@ import type { Transaction } from '@metamask/keyring-api'; -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import type { Json } from '@metamask/utils'; import type { SolanaKeyringAccount } from '../../../entities'; diff --git a/packages/solana-wallet-snap/src/core/services/approve-token/ApproveTokenService.test.ts b/packages/solana-wallet-snap/src/core/services/approve-token/ApproveTokenService.test.ts index 23af75817..60d8f8103 100644 --- a/packages/solana-wallet-snap/src/core/services/approve-token/ApproveTokenService.test.ts +++ b/packages/solana-wallet-snap/src/core/services/approve-token/ApproveTokenService.test.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { COMPUTE_BUDGET_PROGRAM_ADDRESS } from '@solana-program/compute-budget'; import { TOKEN_PROGRAM_ADDRESS } from '@solana-program/token'; /* eslint-disable @typescript-eslint/no-require-imports */ diff --git a/packages/solana-wallet-snap/src/core/services/approve-token/ApproveTokenService.ts b/packages/solana-wallet-snap/src/core/services/approve-token/ApproveTokenService.ts index 4c89c82e3..6e48b1dad 100644 --- a/packages/solana-wallet-snap/src/core/services/approve-token/ApproveTokenService.ts +++ b/packages/solana-wallet-snap/src/core/services/approve-token/ApproveTokenService.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { getSetComputeUnitLimitInstruction, getSetComputeUnitPriceInstruction, diff --git a/packages/solana-wallet-snap/src/core/services/assets/adapters/SnapAssetsAdapter.ts b/packages/solana-wallet-snap/src/core/services/assets/adapters/SnapAssetsAdapter.ts index 685320e9b..5bc27c123 100644 --- a/packages/solana-wallet-snap/src/core/services/assets/adapters/SnapAssetsAdapter.ts +++ b/packages/solana-wallet-snap/src/core/services/assets/adapters/SnapAssetsAdapter.ts @@ -6,7 +6,7 @@ import type { Balance, } from '@metamask/keyring-api'; import { emitSnapKeyringEvent } from '@metamask/keyring-snap-sdk'; -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import type { FungibleAssetMarketData, FungibleAssetMetadata, diff --git a/packages/solana-wallet-snap/src/core/services/config/ConfigProvider.ts b/packages/solana-wallet-snap/src/core/services/config/ConfigProvider.ts index a77f1e587..3a25d8f82 100644 --- a/packages/solana-wallet-snap/src/core/services/config/ConfigProvider.ts +++ b/packages/solana-wallet-snap/src/core/services/config/ConfigProvider.ts @@ -1,4 +1,4 @@ -import { LogLevel } from '@metamask/snap-networks-utils/logger'; +import { LogLevel } from '@metamask/snap-networks-utils'; /* eslint-disable no-restricted-globals */ import type { Infer } from '@metamask/superstruct'; import { diff --git a/packages/solana-wallet-snap/src/core/services/name-resolution/NameResolutionService.ts b/packages/solana-wallet-snap/src/core/services/name-resolution/NameResolutionService.ts index 07dec74f0..df1737deb 100644 --- a/packages/solana-wallet-snap/src/core/services/name-resolution/NameResolutionService.ts +++ b/packages/solana-wallet-snap/src/core/services/name-resolution/NameResolutionService.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { resolveDomain, getPrimaryDomain, diff --git a/packages/solana-wallet-snap/src/core/services/nft/NftService.ts b/packages/solana-wallet-snap/src/core/services/nft/NftService.ts index 318bb3cf0..01db1262c 100644 --- a/packages/solana-wallet-snap/src/core/services/nft/NftService.ts +++ b/packages/solana-wallet-snap/src/core/services/nft/NftService.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import logger from '../../utils/logger'; import type { SolanaConnection } from '../connection'; diff --git a/packages/solana-wallet-snap/src/core/services/send/RecipientClassifier.ts b/packages/solana-wallet-snap/src/core/services/send/RecipientClassifier.ts index 12f6ae05c..e7dbb7eac 100644 --- a/packages/solana-wallet-snap/src/core/services/send/RecipientClassifier.ts +++ b/packages/solana-wallet-snap/src/core/services/send/RecipientClassifier.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { SYSTEM_PROGRAM_ADDRESS } from '@solana-program/system'; import { TOKEN_PROGRAM_ADDRESS } from '@solana-program/token'; import { TOKEN_2022_PROGRAM_ADDRESS } from '@solana-program/token-2022'; diff --git a/packages/solana-wallet-snap/src/core/services/send/SendService.ts b/packages/solana-wallet-snap/src/core/services/send/SendService.ts index 240467495..225ed45dc 100644 --- a/packages/solana-wallet-snap/src/core/services/send/SendService.ts +++ b/packages/solana-wallet-snap/src/core/services/send/SendService.ts @@ -1,6 +1,6 @@ import type { KeyringRequest } from '@metamask/keyring-api'; import { SolMethod } from '@metamask/keyring-api'; -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import type { Json } from '@metamask/snaps-sdk'; import { Duration, parseCaipAssetType } from '@metamask/utils'; import { address as asAddress, compileTransaction } from '@solana/kit'; diff --git a/packages/solana-wallet-snap/src/core/services/send/SendSolBuilder.ts b/packages/solana-wallet-snap/src/core/services/send/SendSolBuilder.ts index bf1553285..29c7c6c3a 100644 --- a/packages/solana-wallet-snap/src/core/services/send/SendSolBuilder.ts +++ b/packages/solana-wallet-snap/src/core/services/send/SendSolBuilder.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { getSetComputeUnitLimitInstruction, getSetComputeUnitPriceInstruction, diff --git a/packages/solana-wallet-snap/src/core/services/send/SendSplTokenBuilder.ts b/packages/solana-wallet-snap/src/core/services/send/SendSplTokenBuilder.ts index 545d61b1d..b340b48a2 100644 --- a/packages/solana-wallet-snap/src/core/services/send/SendSplTokenBuilder.ts +++ b/packages/solana-wallet-snap/src/core/services/send/SendSplTokenBuilder.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { assert } from '@metamask/utils'; import { getSetComputeUnitLimitInstruction, diff --git a/packages/solana-wallet-snap/src/core/services/signer/Signer.ts b/packages/solana-wallet-snap/src/core/services/signer/Signer.ts index a94dd3600..2377af0ad 100644 --- a/packages/solana-wallet-snap/src/core/services/signer/Signer.ts +++ b/packages/solana-wallet-snap/src/core/services/signer/Signer.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import type { Infer } from '@metamask/superstruct'; import type { BaseTransactionMessage, diff --git a/packages/solana-wallet-snap/src/core/services/subscriptions/KeyringAccountMonitor.ts b/packages/solana-wallet-snap/src/core/services/subscriptions/KeyringAccountMonitor.ts index 71a31f071..bf8541683 100644 --- a/packages/solana-wallet-snap/src/core/services/subscriptions/KeyringAccountMonitor.ts +++ b/packages/solana-wallet-snap/src/core/services/subscriptions/KeyringAccountMonitor.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { assert, number, string } from '@metamask/superstruct'; import { TOKEN_PROGRAM_ADDRESS } from '@solana-program/token'; import { TOKEN_2022_PROGRAM_ADDRESS } from '@solana-program/token-2022'; diff --git a/packages/solana-wallet-snap/src/core/services/subscriptions/MonitoredAccountsInitializer.ts b/packages/solana-wallet-snap/src/core/services/subscriptions/MonitoredAccountsInitializer.ts index 6c5857dbd..5ddee2136 100644 --- a/packages/solana-wallet-snap/src/core/services/subscriptions/MonitoredAccountsInitializer.ts +++ b/packages/solana-wallet-snap/src/core/services/subscriptions/MonitoredAccountsInitializer.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import type { EventEmitter } from '../../../infrastructure/event-emitter'; import type { AccountsService } from '../accounts/AccountsService'; diff --git a/packages/solana-wallet-snap/src/core/services/subscriptions/SignatureMonitor.ts b/packages/solana-wallet-snap/src/core/services/subscriptions/SignatureMonitor.ts index 5439af593..545070582 100644 --- a/packages/solana-wallet-snap/src/core/services/subscriptions/SignatureMonitor.ts +++ b/packages/solana-wallet-snap/src/core/services/subscriptions/SignatureMonitor.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { assert, string } from '@metamask/superstruct'; import { Duration } from '@metamask/utils'; import { signature as asSignature } from '@solana/kit'; diff --git a/packages/solana-wallet-snap/src/core/services/subscriptions/SubscriptionService.ts b/packages/solana-wallet-snap/src/core/services/subscriptions/SubscriptionService.ts index b24a6e94c..a81374251 100644 --- a/packages/solana-wallet-snap/src/core/services/subscriptions/SubscriptionService.ts +++ b/packages/solana-wallet-snap/src/core/services/subscriptions/SubscriptionService.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; /* eslint-disable @typescript-eslint/no-non-null-assertion */ import type { WebSocketEvent } from '@metamask/snaps-sdk'; import { isJsonRpcFailure } from '@metamask/utils'; diff --git a/packages/solana-wallet-snap/src/core/services/subscriptions/WebSocketConnectionService.ts b/packages/solana-wallet-snap/src/core/services/subscriptions/WebSocketConnectionService.ts index 720f86cf0..a71d1dea9 100644 --- a/packages/solana-wallet-snap/src/core/services/subscriptions/WebSocketConnectionService.ts +++ b/packages/solana-wallet-snap/src/core/services/subscriptions/WebSocketConnectionService.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import type { WebSocketCloseEvent, WebSocketEvent, diff --git a/packages/solana-wallet-snap/src/core/services/token-prices/TokenPrices.ts b/packages/solana-wallet-snap/src/core/services/token-prices/TokenPrices.ts index 251b1701e..e54da2436 100644 --- a/packages/solana-wallet-snap/src/core/services/token-prices/TokenPrices.ts +++ b/packages/solana-wallet-snap/src/core/services/token-prices/TokenPrices.ts @@ -1,6 +1,6 @@ import { CaipAssetTypeStruct } from '@metamask/keyring-api'; import type { CaipAssetType } from '@metamask/keyring-api'; -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import type { AssetConversion, FungibleAssetMarketData, diff --git a/packages/solana-wallet-snap/src/core/services/transaction-scan/TransactionScan.test.ts b/packages/solana-wallet-snap/src/core/services/transaction-scan/TransactionScan.test.ts index fab7c65fc..0af9628f7 100644 --- a/packages/solana-wallet-snap/src/core/services/transaction-scan/TransactionScan.test.ts +++ b/packages/solana-wallet-snap/src/core/services/transaction-scan/TransactionScan.test.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import type { SecurityAlertsApiClient } from '../../clients/security-alerts-api/SecurityAlertsApiClient'; import type { SecurityAlertSimulationValidationResponse } from '../../clients/security-alerts-api/types'; diff --git a/packages/solana-wallet-snap/src/core/services/transaction-scan/TransactionScan.ts b/packages/solana-wallet-snap/src/core/services/transaction-scan/TransactionScan.ts index b1e206734..9931999f6 100644 --- a/packages/solana-wallet-snap/src/core/services/transaction-scan/TransactionScan.ts +++ b/packages/solana-wallet-snap/src/core/services/transaction-scan/TransactionScan.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import type { SolanaKeyringAccount } from '../../../entities'; import type { SecurityAlertsApiClient } from '../../clients/security-alerts-api/SecurityAlertsApiClient'; diff --git a/packages/solana-wallet-snap/src/core/services/transactions/TransactionMapper.ts b/packages/solana-wallet-snap/src/core/services/transactions/TransactionMapper.ts index 0ffb9fcbe..586bad608 100644 --- a/packages/solana-wallet-snap/src/core/services/transactions/TransactionMapper.ts +++ b/packages/solana-wallet-snap/src/core/services/transactions/TransactionMapper.ts @@ -1,6 +1,6 @@ import type { Transaction } from '@metamask/keyring-api'; import { TransactionStatus, TransactionType } from '@metamask/keyring-api'; -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import type { CaipAssetType } from '@metamask/utils'; import { SYSTEM_PROGRAM_ADDRESS } from '@solana-program/system'; import { address as asAddress, lamports } from '@solana/kit'; diff --git a/packages/solana-wallet-snap/src/core/services/wallet/WalletService.ts b/packages/solana-wallet-snap/src/core/services/wallet/WalletService.ts index 9e13b9c5f..7a0b77f1d 100644 --- a/packages/solana-wallet-snap/src/core/services/wallet/WalletService.ts +++ b/packages/solana-wallet-snap/src/core/services/wallet/WalletService.ts @@ -1,5 +1,5 @@ import { SolMethod } from '@metamask/keyring-api'; -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import type { Infer } from '@metamask/superstruct'; import { assert, instance, object } from '@metamask/superstruct'; import type { Commitment, SignatureBytes } from '@solana/kit'; diff --git a/packages/solana-wallet-snap/src/core/utils/logMaybeSolanaError.ts b/packages/solana-wallet-snap/src/core/utils/logMaybeSolanaError.ts index 8850389d5..c54ac57f5 100644 --- a/packages/solana-wallet-snap/src/core/utils/logMaybeSolanaError.ts +++ b/packages/solana-wallet-snap/src/core/utils/logMaybeSolanaError.ts @@ -1,4 +1,4 @@ -import type { LogMethod } from '@metamask/snap-networks-utils/logger'; +import type { LogMethod } from '@metamask/snap-networks-utils'; import { getSystemErrorMessage, isSystemError } from '@solana-program/system'; import type { Address } from '@solana/kit'; import { isSolanaError } from '@solana/kit'; diff --git a/packages/solana-wallet-snap/src/core/utils/logger.ts b/packages/solana-wallet-snap/src/core/utils/logger.ts index 9b20c8ea9..1a02c8d24 100644 --- a/packages/solana-wallet-snap/src/core/utils/logger.ts +++ b/packages/solana-wallet-snap/src/core/utils/logger.ts @@ -1,4 +1,4 @@ -import { Logger, LogLevel } from '@metamask/snap-networks-utils/logger'; +import { Logger, LogLevel } from '@metamask/snap-networks-utils'; import { ConfigProvider } from '../services/config'; import { logMaybeSolanaError } from './logMaybeSolanaError'; diff --git a/packages/solana-wallet-snap/src/infrastructure/event-emitter/EventEmitter.ts b/packages/solana-wallet-snap/src/infrastructure/event-emitter/EventEmitter.ts index f9189b819..ccc4c0c92 100644 --- a/packages/solana-wallet-snap/src/infrastructure/event-emitter/EventEmitter.ts +++ b/packages/solana-wallet-snap/src/infrastructure/event-emitter/EventEmitter.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; type Listener = (data?: any) => Promise; diff --git a/packages/solana-wallet-snap/tsconfig.json b/packages/solana-wallet-snap/tsconfig.json index 3eb63f359..11f05f5bf 100644 --- a/packages/solana-wallet-snap/tsconfig.json +++ b/packages/solana-wallet-snap/tsconfig.json @@ -16,5 +16,6 @@ "moduleResolution": "bundler", "types": ["jest"] }, + "references": [{ "path": "../snap-networks-utils" }], "include": ["**/*.ts", "**/*.tsx", "locales/*.json"] } diff --git a/packages/stellar-wallet-snap/tsconfig.json b/packages/stellar-wallet-snap/tsconfig.json index df5a8f6b6..226043f20 100644 --- a/packages/stellar-wallet-snap/tsconfig.json +++ b/packages/stellar-wallet-snap/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "../../tsconfig.packages.json", "compilerOptions": { + "baseUrl": "./", "resolveJsonModule": true /* lets us import JSON modules from within TypeScript modules. */, "jsx": "react-jsx", "jsxImportSource": "@metamask/snaps-sdk", diff --git a/packages/tron-wallet-snap/src/caching/InMemoryCache.ts b/packages/tron-wallet-snap/src/caching/InMemoryCache.ts index e81b81443..cb499d959 100644 --- a/packages/tron-wallet-snap/src/caching/InMemoryCache.ts +++ b/packages/tron-wallet-snap/src/caching/InMemoryCache.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { assert } from '@metamask/utils'; import type { Serializable } from '../utils/serialization/types'; diff --git a/packages/tron-wallet-snap/src/caching/StateCache.ts b/packages/tron-wallet-snap/src/caching/StateCache.ts index e1a07572a..bc4e5b2da 100644 --- a/packages/tron-wallet-snap/src/caching/StateCache.ts +++ b/packages/tron-wallet-snap/src/caching/StateCache.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { assert } from '@metamask/utils'; import type { IStateManager } from '../services/state/IStateManager'; diff --git a/packages/tron-wallet-snap/src/clients/price-api/PriceApiClient.ts b/packages/tron-wallet-snap/src/clients/price-api/PriceApiClient.ts index 36dd344c2..d513e74ed 100644 --- a/packages/tron-wallet-snap/src/clients/price-api/PriceApiClient.ts +++ b/packages/tron-wallet-snap/src/clients/price-api/PriceApiClient.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/naming-convention */ import type { CaipAssetType } from '@metamask/keyring-api'; -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { array, assert } from '@metamask/superstruct'; import { CaipAssetTypeStruct } from '@metamask/utils'; import { mapKeys } from 'lodash'; diff --git a/packages/tron-wallet-snap/src/clients/security-alerts-api/SecurityAlertsApiClient.ts b/packages/tron-wallet-snap/src/clients/security-alerts-api/SecurityAlertsApiClient.ts index 02972616d..6491fbed3 100644 --- a/packages/tron-wallet-snap/src/clients/security-alerts-api/SecurityAlertsApiClient.ts +++ b/packages/tron-wallet-snap/src/clients/security-alerts-api/SecurityAlertsApiClient.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/naming-convention */ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { assert } from '@metamask/superstruct'; import { Types as TronwebTypes } from 'tronweb'; diff --git a/packages/tron-wallet-snap/src/clients/snap/SnapClient.test.ts b/packages/tron-wallet-snap/src/clients/snap/SnapClient.test.ts index 0b16c87f5..c2d68ce4c 100644 --- a/packages/tron-wallet-snap/src/clients/snap/SnapClient.test.ts +++ b/packages/tron-wallet-snap/src/clients/snap/SnapClient.test.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { mockLogger } from '../../utils/mockLogger'; import { SnapClient } from './SnapClient'; diff --git a/packages/tron-wallet-snap/src/clients/snap/SnapClient.ts b/packages/tron-wallet-snap/src/clients/snap/SnapClient.ts index 79da8f053..6f56639df 100644 --- a/packages/tron-wallet-snap/src/clients/snap/SnapClient.ts +++ b/packages/tron-wallet-snap/src/clients/snap/SnapClient.ts @@ -1,6 +1,6 @@ import type { JsonSLIP10Node } from '@metamask/key-tree'; import type { EntropySourceId } from '@metamask/keyring-api'; -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { getJsonError } from '@metamask/snaps-sdk'; import type { DialogResult, diff --git a/packages/tron-wallet-snap/src/clients/token-api/TokenApiClient.ts b/packages/tron-wallet-snap/src/clients/token-api/TokenApiClient.ts index f822ba4f3..d223f6e42 100644 --- a/packages/tron-wallet-snap/src/clients/token-api/TokenApiClient.ts +++ b/packages/tron-wallet-snap/src/clients/token-api/TokenApiClient.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import type { FungibleAssetMetadata } from '@metamask/snaps-sdk'; import { array, assert } from '@metamask/superstruct'; import type { Infer } from '@metamask/superstruct'; diff --git a/packages/tron-wallet-snap/src/handlers/assets/assets.ts b/packages/tron-wallet-snap/src/handlers/assets/assets.ts index f9dda22d0..5a35db6c2 100644 --- a/packages/tron-wallet-snap/src/handlers/assets/assets.ts +++ b/packages/tron-wallet-snap/src/handlers/assets/assets.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import type { OnAssetHistoricalPriceArguments, OnAssetHistoricalPriceResponse, diff --git a/packages/tron-wallet-snap/src/handlers/clientRequest/clientRequest.ts b/packages/tron-wallet-snap/src/handlers/clientRequest/clientRequest.ts index 46e0b2abb..775ed93a8 100644 --- a/packages/tron-wallet-snap/src/handlers/clientRequest/clientRequest.ts +++ b/packages/tron-wallet-snap/src/handlers/clientRequest/clientRequest.ts @@ -1,5 +1,5 @@ import { TransactionStatus } from '@metamask/keyring-api'; -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import type { Json, JsonRpcRequest } from '@metamask/snaps-sdk'; import { InvalidParamsError, diff --git a/packages/tron-wallet-snap/src/handlers/cronjob/cronjob.tsx b/packages/tron-wallet-snap/src/handlers/cronjob/cronjob.tsx index 90d0980ac..c9916179c 100644 --- a/packages/tron-wallet-snap/src/handlers/cronjob/cronjob.tsx +++ b/packages/tron-wallet-snap/src/handlers/cronjob/cronjob.tsx @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import type { JsonRpcRequest } from '@metamask/snaps-sdk'; import type { PriceApiClient } from '../../clients/price-api/PriceApiClient'; diff --git a/packages/tron-wallet-snap/src/handlers/keyring/keyring.ts b/packages/tron-wallet-snap/src/handlers/keyring/keyring.ts index d6f9398c9..62f60d678 100644 --- a/packages/tron-wallet-snap/src/handlers/keyring/keyring.ts +++ b/packages/tron-wallet-snap/src/handlers/keyring/keyring.ts @@ -18,7 +18,7 @@ import type { } from '@metamask/keyring-api/v2'; import { emitSnapKeyringEvent } from '@metamask/keyring-snap-sdk'; import { handleKeyringRequest } from '@metamask/keyring-snap-sdk/v2'; -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { InvalidParamsError, SnapError, diff --git a/packages/tron-wallet-snap/src/handlers/rpc/rpc.ts b/packages/tron-wallet-snap/src/handlers/rpc/rpc.ts index a02c13a04..6d144396f 100644 --- a/packages/tron-wallet-snap/src/handlers/rpc/rpc.ts +++ b/packages/tron-wallet-snap/src/handlers/rpc/rpc.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { MethodNotFoundError } from '@metamask/snaps-sdk'; import type { Json, JsonRpcRequest } from '@metamask/snaps-sdk'; diff --git a/packages/tron-wallet-snap/src/handlers/user-input/userInput.ts b/packages/tron-wallet-snap/src/handlers/user-input/userInput.ts index e064f1b90..5d69b557d 100644 --- a/packages/tron-wallet-snap/src/handlers/user-input/userInput.ts +++ b/packages/tron-wallet-snap/src/handlers/user-input/userInput.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import type { InterfaceContext, UserInputEvent } from '@metamask/snaps-sdk'; import type { SnapClient } from '../../clients/snap/SnapClient'; diff --git a/packages/tron-wallet-snap/src/services/accounts/AccountsService.test.ts b/packages/tron-wallet-snap/src/services/accounts/AccountsService.test.ts index 7abaf08e2..0c5c46deb 100644 --- a/packages/tron-wallet-snap/src/services/accounts/AccountsService.test.ts +++ b/packages/tron-wallet-snap/src/services/accounts/AccountsService.test.ts @@ -17,8 +17,8 @@ import { emitSnapKeyringEvent, getSelectedAccounts, } from '@metamask/keyring-snap-sdk'; -import type { Logger } from '@metamask/snap-networks-utils/logger'; -import { LogLevel } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; +import { LogLevel } from '@metamask/snap-networks-utils'; import type { SnapClient } from '../../clients/snap/SnapClient'; import { Network } from '../../constants'; diff --git a/packages/tron-wallet-snap/src/services/accounts/AccountsService.ts b/packages/tron-wallet-snap/src/services/accounts/AccountsService.ts index 88cca569e..277a4cc5a 100644 --- a/packages/tron-wallet-snap/src/services/accounts/AccountsService.ts +++ b/packages/tron-wallet-snap/src/services/accounts/AccountsService.ts @@ -14,7 +14,7 @@ import { emitSnapKeyringEvent, getSelectedAccounts, } from '@metamask/keyring-snap-sdk'; -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import type { Json } from '@metamask/snaps-sdk'; import { assert } from '@metamask/superstruct'; import { hexToBytes } from '@metamask/utils'; diff --git a/packages/tron-wallet-snap/src/services/assets/adapters/CoreAssetsAdapter.ts b/packages/tron-wallet-snap/src/services/assets/adapters/CoreAssetsAdapter.ts index 192187f25..dcead6166 100644 --- a/packages/tron-wallet-snap/src/services/assets/adapters/CoreAssetsAdapter.ts +++ b/packages/tron-wallet-snap/src/services/assets/adapters/CoreAssetsAdapter.ts @@ -7,7 +7,7 @@ import type { } from '@metamask/keyring-api'; import { emitSnapKeyringEvent } from '@metamask/keyring-snap-sdk'; import type { AssetsProvider } from '@metamask/snap-networks-utils'; -import { Logger } from '@metamask/snap-networks-utils/logger'; +import { Logger } from '@metamask/snap-networks-utils'; import type { TronHttpClient } from '../../../clients/tron-http/TronHttpClient'; import { TrongridAccountNotFoundError } from '../../../clients/trongrid/errors'; diff --git a/packages/tron-wallet-snap/src/services/assets/adapters/SnapAssetsAdapter.ts b/packages/tron-wallet-snap/src/services/assets/adapters/SnapAssetsAdapter.ts index 215239d43..fc5754404 100644 --- a/packages/tron-wallet-snap/src/services/assets/adapters/SnapAssetsAdapter.ts +++ b/packages/tron-wallet-snap/src/services/assets/adapters/SnapAssetsAdapter.ts @@ -5,7 +5,7 @@ import type { KeyringAccount, } from '@metamask/keyring-api'; import { emitSnapKeyringEvent } from '@metamask/keyring-snap-sdk'; -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import type { AssetConversion, AssetMetadata, diff --git a/packages/tron-wallet-snap/src/services/config/ConfigProvider.ts b/packages/tron-wallet-snap/src/services/config/ConfigProvider.ts index 2c9dbc49a..4382cccf8 100644 --- a/packages/tron-wallet-snap/src/services/config/ConfigProvider.ts +++ b/packages/tron-wallet-snap/src/services/config/ConfigProvider.ts @@ -1,4 +1,4 @@ -import { LogLevel } from '@metamask/snap-networks-utils/logger'; +import { LogLevel } from '@metamask/snap-networks-utils'; /* eslint-disable no-restricted-globals */ import type { Infer } from '@metamask/superstruct'; import { diff --git a/packages/tron-wallet-snap/src/services/confirmation/ConfirmationHandler.ts b/packages/tron-wallet-snap/src/services/confirmation/ConfirmationHandler.ts index 99432ece0..83f3bbdb5 100644 --- a/packages/tron-wallet-snap/src/services/confirmation/ConfirmationHandler.ts +++ b/packages/tron-wallet-snap/src/services/confirmation/ConfirmationHandler.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { InternalError } from '@metamask/snaps-sdk'; import { assert } from '@metamask/superstruct'; import { BigNumber } from 'bignumber.js'; diff --git a/packages/tron-wallet-snap/src/services/send/FeeCalculatorService.ts b/packages/tron-wallet-snap/src/services/send/FeeCalculatorService.ts index 185bbce77..76ae0a679 100644 --- a/packages/tron-wallet-snap/src/services/send/FeeCalculatorService.ts +++ b/packages/tron-wallet-snap/src/services/send/FeeCalculatorService.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/naming-convention */ import { FeeType } from '@metamask/keyring-api'; -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { BigNumber } from 'bignumber.js'; import type { Types as TronwebTypes } from 'tronweb'; diff --git a/packages/tron-wallet-snap/src/services/send/SendService.ts b/packages/tron-wallet-snap/src/services/send/SendService.ts index 637e9f20c..3eb6c53af 100644 --- a/packages/tron-wallet-snap/src/services/send/SendService.ts +++ b/packages/tron-wallet-snap/src/services/send/SendService.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { parseCaipAssetType } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; import type { TronWeb, Types as TronwebTypes } from 'tronweb'; diff --git a/packages/tron-wallet-snap/src/services/staking/StakingService.ts b/packages/tron-wallet-snap/src/services/staking/StakingService.ts index 86f8961b2..787e8f397 100644 --- a/packages/tron-wallet-snap/src/services/staking/StakingService.ts +++ b/packages/tron-wallet-snap/src/services/staking/StakingService.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { parseCaipAssetType } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; import type { Types as TronwebTypes } from 'tronweb'; diff --git a/packages/tron-wallet-snap/src/services/transaction-scan/TransactionScanService.ts b/packages/tron-wallet-snap/src/services/transaction-scan/TransactionScanService.ts index f3b5f2d36..86bee3d43 100644 --- a/packages/tron-wallet-snap/src/services/transaction-scan/TransactionScanService.ts +++ b/packages/tron-wallet-snap/src/services/transaction-scan/TransactionScanService.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { BigNumber } from 'bignumber.js'; import type { Types as TronwebTypes } from 'tronweb'; diff --git a/packages/tron-wallet-snap/src/services/transactions/TransactionsService.test.ts b/packages/tron-wallet-snap/src/services/transactions/TransactionsService.test.ts index 36a1e06cc..516538b36 100644 --- a/packages/tron-wallet-snap/src/services/transactions/TransactionsService.test.ts +++ b/packages/tron-wallet-snap/src/services/transactions/TransactionsService.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ import type { Transaction } from '@metamask/keyring-api'; import { TransactionStatus, TransactionType } from '@metamask/keyring-api'; -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import type { PriceApiClient } from '../../clients/price-api/PriceApiClient'; import type { SnapClient } from '../../clients/snap/SnapClient'; diff --git a/packages/tron-wallet-snap/src/services/transactions/TransactionsService.ts b/packages/tron-wallet-snap/src/services/transactions/TransactionsService.ts index 789822ffe..56742cc15 100644 --- a/packages/tron-wallet-snap/src/services/transactions/TransactionsService.ts +++ b/packages/tron-wallet-snap/src/services/transactions/TransactionsService.ts @@ -1,7 +1,7 @@ import type { CaipAssetType, Transaction } from '@metamask/keyring-api'; import { KeyringEvent, TransactionType } from '@metamask/keyring-api'; import { emitSnapKeyringEvent } from '@metamask/keyring-snap-sdk'; -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { groupBy } from 'lodash'; import type { PriceApiClient } from '../../clients/price-api/PriceApiClient'; diff --git a/packages/tron-wallet-snap/src/services/wallet/WalletService.ts b/packages/tron-wallet-snap/src/services/wallet/WalletService.ts index a92976446..96f1c3971 100644 --- a/packages/tron-wallet-snap/src/services/wallet/WalletService.ts +++ b/packages/tron-wallet-snap/src/services/wallet/WalletService.ts @@ -1,5 +1,5 @@ import type { ResolvedAccountAddress } from '@metamask/keyring-api'; -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; import { SnapError } from '@metamask/snaps-sdk'; import type { Json, JsonRpcRequest } from '@metamask/snaps-sdk'; import { bytesToHex, hexToBytes, sha256 } from '@metamask/utils'; diff --git a/packages/tron-wallet-snap/src/utils/logger.ts b/packages/tron-wallet-snap/src/utils/logger.ts index ebf4fb9e0..e43ab990b 100644 --- a/packages/tron-wallet-snap/src/utils/logger.ts +++ b/packages/tron-wallet-snap/src/utils/logger.ts @@ -1,4 +1,4 @@ -import { Logger, LogLevel } from '@metamask/snap-networks-utils/logger'; +import { Logger, LogLevel } from '@metamask/snap-networks-utils'; import { ConfigProvider } from '../services/config'; diff --git a/packages/tron-wallet-snap/src/utils/mockLogger.ts b/packages/tron-wallet-snap/src/utils/mockLogger.ts index aa2a641a1..7041c4e6c 100644 --- a/packages/tron-wallet-snap/src/utils/mockLogger.ts +++ b/packages/tron-wallet-snap/src/utils/mockLogger.ts @@ -1,4 +1,4 @@ -import type { Logger } from '@metamask/snap-networks-utils/logger'; +import type { Logger } from '@metamask/snap-networks-utils'; export const mockLogger = { log: jest.fn(), diff --git a/packages/tron-wallet-snap/tsconfig.json b/packages/tron-wallet-snap/tsconfig.json index df5a8f6b6..aa6bd53f5 100644 --- a/packages/tron-wallet-snap/tsconfig.json +++ b/packages/tron-wallet-snap/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "../../tsconfig.packages.json", "compilerOptions": { + "baseUrl": "./", "resolveJsonModule": true /* lets us import JSON modules from within TypeScript modules. */, "jsx": "react-jsx", "jsxImportSource": "@metamask/snaps-sdk", @@ -15,5 +16,6 @@ "moduleResolution": "bundler", "types": ["jest"] }, + "references": [{ "path": "../snap-networks-utils" }], "include": ["**/*.ts", "**/*.tsx", "locales/*.json"] } diff --git a/tsconfig.json b/tsconfig.json index 8555d5148..23df98f6d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -9,8 +9,23 @@ "skipLibCheck": true }, "references": [ + { + "path": "./packages/bitcoin-wallet-snap" + }, + { + "path": "./packages/sample-snap" + }, { "path": "./packages/snap-networks-utils" + }, + { + "path": "./packages/solana-wallet-snap" + }, + { + "path": "./packages/stellar-wallet-snap" + }, + { + "path": "./packages/tron-wallet-snap" } ], "files": [],