diff --git a/packages/tron-wallet-snap/src/handlers/clientRequest/validation.ts b/packages/tron-wallet-snap/src/handlers/clientRequest/validation.ts index 87bae5c7..db872772 100644 --- a/packages/tron-wallet-snap/src/handlers/clientRequest/validation.ts +++ b/packages/tron-wallet-snap/src/handlers/clientRequest/validation.ts @@ -1,4 +1,5 @@ import { AssetStruct, FeeType } from '@metamask/keyring-api'; +import { UuidStruct } from '@metamask/snap-networks-utils'; import { literal } from '@metamask/snaps-sdk'; import type { Infer } from '@metamask/superstruct'; import { @@ -24,7 +25,6 @@ import { PositiveNumberStringStruct, ScopeStringStruct, TronAddressStruct, - UuidStruct, } from '../../validation/structs'; import { ClientRequestMethod, SendErrorCodes } from './types'; diff --git a/packages/tron-wallet-snap/src/handlers/keyring/keyring.ts b/packages/tron-wallet-snap/src/handlers/keyring/keyring.ts index 048e63f4..d52fd406 100644 --- a/packages/tron-wallet-snap/src/handlers/keyring/keyring.ts +++ b/packages/tron-wallet-snap/src/handlers/keyring/keyring.ts @@ -14,7 +14,7 @@ import type { KeyringSnapRpc, } from '@metamask/keyring-api/v2'; import { handleKeyringRequest } from '@metamask/keyring-snap-sdk/v2'; -import { validateOrigin } from '@metamask/snap-networks-utils'; +import { UuidStruct, validateOrigin } from '@metamask/snap-networks-utils'; import type { Logger } from '@metamask/snap-networks-utils'; import { InvalidParamsError, @@ -53,7 +53,6 @@ import { PrivateKeyHexStruct, SignTransactionRequestStruct, TronKeyringRequestStruct, - UuidStruct, } from '../../validation/structs'; import type { TronWalletKeyringRequest } from '../../validation/structs'; import { validateRequest, validateResponse } from '../../validation/validators'; diff --git a/packages/tron-wallet-snap/src/validation/structs.test.ts b/packages/tron-wallet-snap/src/validation/structs.test.ts index 676f2ddb..ce5aa02a 100644 --- a/packages/tron-wallet-snap/src/validation/structs.test.ts +++ b/packages/tron-wallet-snap/src/validation/structs.test.ts @@ -1,24 +1,9 @@ /* eslint-disable jest/require-to-throw-message */ import { assert, is } from '@metamask/superstruct'; -import { Base58Struct, Base64Struct, UuidStruct } from './structs'; +import { Base58Struct, Base64Struct } from './structs'; describe('structs', () => { - describe('Uuid', () => { - it('validates valid UUIDs', () => { - const validUuids = [ - 'c747acb9-1b2b-4352-b9da-3d658fcc3cc7', - '2507a426-ac26-43c4-a82a-250f5d999398', - '52d181f4-d050-4971-b448-17c15107fa3b', - ]; - - validUuids.forEach((uuid) => { - expect(() => assert(uuid, UuidStruct)).not.toThrow(); - expect(is(uuid, UuidStruct)).toBe(true); - }); - }); - }); - describe('Base58Struct', () => { it('validates valid Base58 strings', () => { const validBase58Strings = [ diff --git a/packages/tron-wallet-snap/src/validation/structs.ts b/packages/tron-wallet-snap/src/validation/structs.ts index 25960cd0..adb05c4e 100644 --- a/packages/tron-wallet-snap/src/validation/structs.ts +++ b/packages/tron-wallet-snap/src/validation/structs.ts @@ -5,6 +5,7 @@ import { TrxAccountType, } from '@metamask/keyring-api'; import { ExportAccountOptionsStruct } from '@metamask/keyring-api/v2'; +import { UuidStruct } from '@metamask/snap-networks-utils'; import type { Infer, Struct } from '@metamask/superstruct'; import { array, @@ -35,12 +36,6 @@ import { TokenCaipAssetTypeStruct, } from '../services/assets/types'; -// create a uuid validation -export const UuidStruct = pattern( - string(), - /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/u, -); - export const PositiveNumberStringStruct = pattern( string(), /^(?!0\d)(\d+(\.\d+)?)$/u,