Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"url": "https://github.com/MetaMask/internal-snaps.git"
},
"workspaces": [
"examples/*",

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹

"packages/*"
],
"files": [],
Expand Down Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/bitcoin-wallet-snap/src/config.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
2 changes: 1 addition & 1 deletion packages/bitcoin-wallet-snap/src/entities/config.ts
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/bitcoin-wallet-snap/src/entities/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
2 changes: 1 addition & 1 deletion packages/bitcoin-wallet-snap/src/index.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
1 change: 1 addition & 0 deletions packages/bitcoin-wallet-snap/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
"moduleResolution": "bundler",
"types": ["jest"]
},
"references": [{ "path": "../snap-networks-utils" }],
"include": ["**/*.ts", "**/*.tsx", "locales/*.json"]
}
2 changes: 1 addition & 1 deletion packages/snap-networks-utils/src/logger/Logger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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(),
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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 */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Logger } from '@metamask/snap-networks-utils/logger';
import type { Logger } from '@metamask/snap-networks-utils';
import {
getSetComputeUnitLimitInstruction,
getSetComputeUnitPriceInstruction,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Logger } from '@metamask/snap-networks-utils/logger';
import type { Logger } from '@metamask/snap-networks-utils';
import {
resolveDomain,
getPrimaryDomain,
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Logger } from '@metamask/snap-networks-utils/logger';
import type { Logger } from '@metamask/snap-networks-utils';
import {
getSetComputeUnitLimitInstruction,
getSetComputeUnitPriceInstruction,
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/solana-wallet-snap/src/core/utils/logger.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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<void>;

Expand Down
1 change: 1 addition & 0 deletions packages/solana-wallet-snap/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
"moduleResolution": "bundler",
"types": ["jest"]
},
"references": [{ "path": "../snap-networks-utils" }],
"include": ["**/*.ts", "**/*.tsx", "locales/*.json"]
}
1 change: 1 addition & 0 deletions packages/stellar-wallet-snap/tsconfig.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/tron-wallet-snap/src/caching/InMemoryCache.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/tron-wallet-snap/src/caching/StateCache.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/tron-wallet-snap/src/clients/snap/SnapClient.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
2 changes: 1 addition & 1 deletion packages/tron-wallet-snap/src/handlers/assets/assets.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages/tron-wallet-snap/src/handlers/rpc/rpc.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
Loading