From 4426ba682dfc60a532b7e10a4911c1ca2846b1a5 Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 20 Mar 2023 09:27:20 -0700 Subject: [PATCH 1/6] Add data attribute to MagicRPCError --- .../@magic-sdk/provider/src/core/sdk-exceptions.ts | 2 ++ .../sdk-exceptions/magic-rpc-error/constructor.spec.ts | 10 ++++++++++ .../test/spec/modules/base-module/request.spec.ts | 6 +++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/packages/@magic-sdk/provider/src/core/sdk-exceptions.ts b/packages/@magic-sdk/provider/src/core/sdk-exceptions.ts index 3d158207c..0f72f57cc 100644 --- a/packages/@magic-sdk/provider/src/core/sdk-exceptions.ts +++ b/packages/@magic-sdk/provider/src/core/sdk-exceptions.ts @@ -28,6 +28,7 @@ export class MagicRPCError extends Error { public code: RPCErrorCode | number; public rawMessage: string; + public data: any; constructor(sourceError?: JsonRpcError | null) { super(); @@ -36,6 +37,7 @@ export class MagicRPCError extends Error { this.rawMessage = sourceError?.message || 'Internal error'; this.code = isJsonRpcErrorCode(codeNormalized) ? codeNormalized : RPCErrorCode.InternalError; this.message = `Magic RPC Error: [${this.code}] ${this.rawMessage}`; + this.data = sourceError?.data || undefined; Object.setPrototypeOf(this, MagicRPCError.prototype); } diff --git a/packages/@magic-sdk/provider/test/spec/core/sdk-exceptions/magic-rpc-error/constructor.spec.ts b/packages/@magic-sdk/provider/test/spec/core/sdk-exceptions/magic-rpc-error/constructor.spec.ts index 9fdaaad83..70ee8db23 100644 --- a/packages/@magic-sdk/provider/test/spec/core/sdk-exceptions/magic-rpc-error/constructor.spec.ts +++ b/packages/@magic-sdk/provider/test/spec/core/sdk-exceptions/magic-rpc-error/constructor.spec.ts @@ -1,6 +1,9 @@ import browserEnv from '@ikscodes/browser-env'; import { MagicRPCError } from '../../../../../src/core/sdk-exceptions'; +const exampleData = + '0x08c379a000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000011555345525f554e52454749535445524544000000000000000000000000000000'; + beforeEach(() => { browserEnv.restore(); }); @@ -9,12 +12,14 @@ test('Initialize `MagicRPCError` with object argument', () => { const err = new MagicRPCError({ code: -32603, message: 'hello world', + data: exampleData, }); expect(err instanceof MagicRPCError).toBe(true); expect(err.code).toBe(-32603); expect(err.message).toBe('Magic RPC Error: [-32603] hello world'); expect(err.rawMessage).toBe('hello world'); + expect(err.data).toBe(exampleData); }); test('Initialize MagicRPCError with `null` argument', () => { @@ -24,6 +29,7 @@ test('Initialize MagicRPCError with `null` argument', () => { expect(err.code).toBe(-32603); expect(err.message).toBe('Magic RPC Error: [-32603] Internal error'); expect(err.rawMessage).toBe('Internal error'); + expect(err.data).toBe(undefined); }); test('Initialize MagicRPCError with `undefined` argument', () => { @@ -33,16 +39,20 @@ test('Initialize MagicRPCError with `undefined` argument', () => { expect(err.code).toBe(-32603); expect(err.message).toBe('Magic RPC Error: [-32603] Internal error'); expect(err.rawMessage).toBe('Internal error'); + expect(err.data).toBe(undefined); }); test('Initialize MagicRPCError with unknown error code argument', () => { const err = new MagicRPCError({ + // @ts-ignore code: 1, message: 'hello world', + data: exampleData, }); expect(err instanceof MagicRPCError).toBe(true); expect(err.code).toBe(-32603); expect(err.message).toBe('Magic RPC Error: [-32603] hello world'); expect(err.rawMessage).toBe('hello world'); + expect(err.data).toBe(exampleData); }); diff --git a/packages/@magic-sdk/provider/test/spec/modules/base-module/request.spec.ts b/packages/@magic-sdk/provider/test/spec/modules/base-module/request.spec.ts index 02a735a10..e07078de1 100644 --- a/packages/@magic-sdk/provider/test/spec/modules/base-module/request.spec.ts +++ b/packages/@magic-sdk/provider/test/spec/modules/base-module/request.spec.ts @@ -46,7 +46,11 @@ test('Resolves with a successful response', async () => { test('Rejects with a `MagicRPCError` upon request failed', async () => { const response = new JsonRpcResponse(requestPayload).applyError({ code: -32603, message: 'hello world' }); const { baseModule } = createBaseModule(jest.fn().mockImplementation(() => Promise.resolve(response))); - const expectedError = new MagicRPCError({ code: -32603, message: 'hello world' }); + const expectedError = new MagicRPCError({ + code: -32603, + message: 'hello world', + data: '0x08c379a000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000011555345525f554e52454749535445524544000000000000000000000000000000', + }); await expect(() => baseModule.request(requestPayload)).rejects.toThrow(expectedError); }); From a967c6ff4449875324c99bc662dbd7efbfe57d45 Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 20 Mar 2023 09:28:08 -0700 Subject: [PATCH 2/6] Update json rpc type --- packages/@magic-sdk/types/src/core/json-rpc-types.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/@magic-sdk/types/src/core/json-rpc-types.ts b/packages/@magic-sdk/types/src/core/json-rpc-types.ts index 6a7b95070..13932aece 100644 --- a/packages/@magic-sdk/types/src/core/json-rpc-types.ts +++ b/packages/@magic-sdk/types/src/core/json-rpc-types.ts @@ -24,6 +24,7 @@ export interface JsonRpcBatchRequestCallback { export interface JsonRpcError { message: string; code: RPCErrorCode; + data?: any; } export interface JsonRpcResponsePayload { From 4bcf4d3d81dbbefa669decaefaaa1fd69aac8060 Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 20 Mar 2023 09:28:34 -0700 Subject: [PATCH 3/6] Update version --- yarn.lock | 86 +++++++++++++++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/yarn.lock b/yarn.lock index d6f659501..993fb258f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2731,7 +2731,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/algorand@workspace:packages/@magic-ext/algorand" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2739,7 +2739,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/avalanche@workspace:packages/@magic-ext/avalanche" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2747,7 +2747,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/bitcoin@workspace:packages/@magic-ext/bitcoin" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2755,7 +2755,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/conflux@workspace:packages/@magic-ext/conflux" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2763,7 +2763,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/connect@workspace:packages/@magic-ext/connect" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2771,7 +2771,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/cosmos@workspace:packages/@magic-ext/cosmos" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2779,7 +2779,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/ed25519@workspace:packages/@magic-ext/ed25519" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2787,7 +2787,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/flow@workspace:packages/@magic-ext/flow" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 "@onflow/fcl": 0.0.41 "@onflow/types": 0.0.3 peerDependencies: @@ -2800,7 +2800,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/harmony@workspace:packages/@magic-ext/harmony" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2808,7 +2808,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/icon@workspace:packages/@magic-ext/icon" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2816,18 +2816,18 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/near@workspace:packages/@magic-ext/near" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft -"@magic-ext/oauth@^7.5.0, @magic-ext/oauth@workspace:packages/@magic-ext/oauth": +"@magic-ext/oauth@^7.6.0, @magic-ext/oauth@workspace:packages/@magic-ext/oauth": version: 0.0.0-use.local resolution: "@magic-ext/oauth@workspace:packages/@magic-ext/oauth" dependencies: - "@magic-sdk/types": ^11.5.0 + "@magic-sdk/types": ^11.6.0 "@types/crypto-js": ~3.1.47 crypto-js: ^3.3.0 - magic-sdk: ^13.5.0 + magic-sdk: ^13.6.0 languageName: unknown linkType: soft @@ -2843,7 +2843,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/polkadot@workspace:packages/@magic-ext/polkadot" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2851,7 +2851,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/react-native-bare-oauth@workspace:packages/@magic-ext/react-native-bare-oauth" dependencies: - "@magic-sdk/react-native-bare": ^14.5.0 + "@magic-sdk/react-native-bare": ^14.6.0 "@magic-sdk/types": ^10.0.1 "@types/crypto-js": ~3.1.47 crypto-js: ^3.3.0 @@ -2867,7 +2867,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/react-native-expo-oauth@workspace:packages/@magic-ext/react-native-expo-oauth" dependencies: - "@magic-sdk/react-native-expo": ^14.5.0 + "@magic-sdk/react-native-expo": ^14.6.0 "@magic-sdk/types": ^10.0.0 "@types/crypto-js": ~3.1.47 crypto-js: ^3.3.0 @@ -2882,7 +2882,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/solana@workspace:packages/@magic-ext/solana" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2890,7 +2890,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/taquito@workspace:packages/@magic-ext/taquito" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2898,7 +2898,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/terra@workspace:packages/@magic-ext/terra" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2906,7 +2906,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/tezos@workspace:packages/@magic-ext/tezos" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2914,7 +2914,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/webauthn@workspace:packages/@magic-ext/webauthn" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2922,16 +2922,16 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/zilliqa@workspace:packages/@magic-ext/zilliqa" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft -"@magic-sdk/commons@^9.5.0, @magic-sdk/commons@workspace:packages/@magic-sdk/commons": +"@magic-sdk/commons@^9.6.0, @magic-sdk/commons@workspace:packages/@magic-sdk/commons": version: 0.0.0-use.local resolution: "@magic-sdk/commons@workspace:packages/@magic-sdk/commons" dependencies: - "@magic-sdk/provider": ^13.5.0 - "@magic-sdk/types": ^11.5.0 + "@magic-sdk/provider": ^13.6.0 + "@magic-sdk/types": ^11.6.0 peerDependencies: "@magic-sdk/provider": ">=4.3.0" "@magic-sdk/types": ">=3.1.1" @@ -2955,17 +2955,17 @@ __metadata: "@babel/core": ^7.9.6 "@babel/plugin-proposal-optional-chaining": ^7.9.0 "@babel/runtime": ^7.9.6 - "@magic-ext/oauth": ^7.5.0 - magic-sdk: ^13.5.0 + "@magic-ext/oauth": ^7.6.0 + magic-sdk: ^13.6.0 languageName: unknown linkType: soft -"@magic-sdk/provider@^13.5.0, @magic-sdk/provider@workspace:packages/@magic-sdk/provider": +"@magic-sdk/provider@^13.6.0, @magic-sdk/provider@workspace:packages/@magic-sdk/provider": version: 0.0.0-use.local resolution: "@magic-sdk/provider@workspace:packages/@magic-sdk/provider" dependencies: "@babel/plugin-transform-modules-commonjs": ^7.9.6 - "@magic-sdk/types": ^11.5.0 + "@magic-sdk/types": ^11.6.0 "@peculiar/webcrypto": ^1.1.7 eventemitter3: ^4.0.4 localforage: ^1.7.4 @@ -2990,7 +2990,7 @@ __metadata: languageName: node linkType: hard -"@magic-sdk/react-native-bare@^14.5.0, @magic-sdk/react-native-bare@workspace:packages/@magic-sdk/react-native-bare": +"@magic-sdk/react-native-bare@^14.6.0, @magic-sdk/react-native-bare@workspace:packages/@magic-sdk/react-native-bare": version: 0.0.0-use.local resolution: "@magic-sdk/react-native-bare@workspace:packages/@magic-sdk/react-native-bare" dependencies: @@ -2998,9 +2998,9 @@ __metadata: "@babel/core": ^7.15.0 "@babel/plugin-transform-flow-strip-types": ^7.14.5 "@babel/runtime": ~7.10.4 - "@magic-sdk/commons": ^9.5.0 - "@magic-sdk/provider": ^13.5.0 - "@magic-sdk/types": ^11.5.0 + "@magic-sdk/commons": ^9.6.0 + "@magic-sdk/provider": ^13.6.0 + "@magic-sdk/types": ^11.6.0 "@react-native-async-storage/async-storage": ^1.15.5 "@react-native-community/async-storage": ^1.12.1 "@types/lodash": ^4.14.158 @@ -3027,7 +3027,7 @@ __metadata: languageName: unknown linkType: soft -"@magic-sdk/react-native-expo@^14.5.0, @magic-sdk/react-native-expo@workspace:packages/@magic-sdk/react-native-expo": +"@magic-sdk/react-native-expo@^14.6.0, @magic-sdk/react-native-expo@workspace:packages/@magic-sdk/react-native-expo": version: 0.0.0-use.local resolution: "@magic-sdk/react-native-expo@workspace:packages/@magic-sdk/react-native-expo" dependencies: @@ -3035,9 +3035,9 @@ __metadata: "@babel/core": ^7.15.0 "@babel/plugin-transform-flow-strip-types": ^7.14.5 "@babel/runtime": ~7.10.4 - "@magic-sdk/commons": ^9.5.0 - "@magic-sdk/provider": ^13.5.0 - "@magic-sdk/types": ^11.5.0 + "@magic-sdk/commons": ^9.6.0 + "@magic-sdk/provider": ^13.6.0 + "@magic-sdk/types": ^11.6.0 "@react-native-async-storage/async-storage": ^1.15.5 "@types/lodash": ^4.14.158 buffer: ~5.6.0 @@ -3063,7 +3063,7 @@ __metadata: languageName: unknown linkType: soft -"@magic-sdk/types@^11.5.0, @magic-sdk/types@workspace:packages/@magic-sdk/types": +"@magic-sdk/types@^11.6.0, @magic-sdk/types@workspace:packages/@magic-sdk/types": version: 0.0.0-use.local resolution: "@magic-sdk/types@workspace:packages/@magic-sdk/types" languageName: unknown @@ -12338,16 +12338,16 @@ fsevents@^2.3.2: languageName: unknown linkType: soft -"magic-sdk@^13.5.0, magic-sdk@workspace:packages/magic-sdk": +"magic-sdk@^13.6.0, magic-sdk@workspace:packages/magic-sdk": version: 0.0.0-use.local resolution: "magic-sdk@workspace:packages/magic-sdk" dependencies: "@babel/core": ^7.9.6 "@babel/plugin-proposal-optional-chaining": ^7.9.0 "@babel/runtime": ^7.9.6 - "@magic-sdk/commons": ^9.5.0 - "@magic-sdk/provider": ^13.5.0 - "@magic-sdk/types": ^11.5.0 + "@magic-sdk/commons": ^9.6.0 + "@magic-sdk/provider": ^13.6.0 + "@magic-sdk/types": ^11.6.0 localforage: ^1.7.4 localforage-driver-memory: ^1.0.5 languageName: unknown From 30a3175f43a32c556101bb5ec81dcc913646e1ed Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 20 Mar 2023 11:38:09 -0700 Subject: [PATCH 4/6] update canary version --- packages/@magic-sdk/provider/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@magic-sdk/provider/package.json b/packages/@magic-sdk/provider/package.json index c981e4c24..7b1bb5902 100644 --- a/packages/@magic-sdk/provider/package.json +++ b/packages/@magic-sdk/provider/package.json @@ -1,6 +1,6 @@ { "name": "@magic-sdk/provider", - "version": "13.6.0", + "version": "13.6.1-4bcf4d3", "description": "Core business logic for Magic SDK packages.", "author": "Magic Labs (https://magic.link/)", "license": "MIT", From 96902bebcc85f31cbea7a0d57da38e09433c546a Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 20 Mar 2023 13:14:58 -0700 Subject: [PATCH 5/6] Reset version history --- packages/@magic-sdk/provider/package.json | 2 +- yarn.lock | 86 +++++++++++------------ 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/packages/@magic-sdk/provider/package.json b/packages/@magic-sdk/provider/package.json index 7b1bb5902..c981e4c24 100644 --- a/packages/@magic-sdk/provider/package.json +++ b/packages/@magic-sdk/provider/package.json @@ -1,6 +1,6 @@ { "name": "@magic-sdk/provider", - "version": "13.6.1-4bcf4d3", + "version": "13.6.0", "description": "Core business logic for Magic SDK packages.", "author": "Magic Labs (https://magic.link/)", "license": "MIT", diff --git a/yarn.lock b/yarn.lock index 993fb258f..d6f659501 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2731,7 +2731,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/algorand@workspace:packages/@magic-ext/algorand" dependencies: - "@magic-sdk/commons": ^9.6.0 + "@magic-sdk/commons": ^9.5.0 languageName: unknown linkType: soft @@ -2739,7 +2739,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/avalanche@workspace:packages/@magic-ext/avalanche" dependencies: - "@magic-sdk/commons": ^9.6.0 + "@magic-sdk/commons": ^9.5.0 languageName: unknown linkType: soft @@ -2747,7 +2747,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/bitcoin@workspace:packages/@magic-ext/bitcoin" dependencies: - "@magic-sdk/commons": ^9.6.0 + "@magic-sdk/commons": ^9.5.0 languageName: unknown linkType: soft @@ -2755,7 +2755,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/conflux@workspace:packages/@magic-ext/conflux" dependencies: - "@magic-sdk/commons": ^9.6.0 + "@magic-sdk/commons": ^9.5.0 languageName: unknown linkType: soft @@ -2763,7 +2763,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/connect@workspace:packages/@magic-ext/connect" dependencies: - "@magic-sdk/commons": ^9.6.0 + "@magic-sdk/commons": ^9.5.0 languageName: unknown linkType: soft @@ -2771,7 +2771,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/cosmos@workspace:packages/@magic-ext/cosmos" dependencies: - "@magic-sdk/commons": ^9.6.0 + "@magic-sdk/commons": ^9.5.0 languageName: unknown linkType: soft @@ -2779,7 +2779,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/ed25519@workspace:packages/@magic-ext/ed25519" dependencies: - "@magic-sdk/commons": ^9.6.0 + "@magic-sdk/commons": ^9.5.0 languageName: unknown linkType: soft @@ -2787,7 +2787,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/flow@workspace:packages/@magic-ext/flow" dependencies: - "@magic-sdk/commons": ^9.6.0 + "@magic-sdk/commons": ^9.5.0 "@onflow/fcl": 0.0.41 "@onflow/types": 0.0.3 peerDependencies: @@ -2800,7 +2800,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/harmony@workspace:packages/@magic-ext/harmony" dependencies: - "@magic-sdk/commons": ^9.6.0 + "@magic-sdk/commons": ^9.5.0 languageName: unknown linkType: soft @@ -2808,7 +2808,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/icon@workspace:packages/@magic-ext/icon" dependencies: - "@magic-sdk/commons": ^9.6.0 + "@magic-sdk/commons": ^9.5.0 languageName: unknown linkType: soft @@ -2816,18 +2816,18 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/near@workspace:packages/@magic-ext/near" dependencies: - "@magic-sdk/commons": ^9.6.0 + "@magic-sdk/commons": ^9.5.0 languageName: unknown linkType: soft -"@magic-ext/oauth@^7.6.0, @magic-ext/oauth@workspace:packages/@magic-ext/oauth": +"@magic-ext/oauth@^7.5.0, @magic-ext/oauth@workspace:packages/@magic-ext/oauth": version: 0.0.0-use.local resolution: "@magic-ext/oauth@workspace:packages/@magic-ext/oauth" dependencies: - "@magic-sdk/types": ^11.6.0 + "@magic-sdk/types": ^11.5.0 "@types/crypto-js": ~3.1.47 crypto-js: ^3.3.0 - magic-sdk: ^13.6.0 + magic-sdk: ^13.5.0 languageName: unknown linkType: soft @@ -2843,7 +2843,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/polkadot@workspace:packages/@magic-ext/polkadot" dependencies: - "@magic-sdk/commons": ^9.6.0 + "@magic-sdk/commons": ^9.5.0 languageName: unknown linkType: soft @@ -2851,7 +2851,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/react-native-bare-oauth@workspace:packages/@magic-ext/react-native-bare-oauth" dependencies: - "@magic-sdk/react-native-bare": ^14.6.0 + "@magic-sdk/react-native-bare": ^14.5.0 "@magic-sdk/types": ^10.0.1 "@types/crypto-js": ~3.1.47 crypto-js: ^3.3.0 @@ -2867,7 +2867,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/react-native-expo-oauth@workspace:packages/@magic-ext/react-native-expo-oauth" dependencies: - "@magic-sdk/react-native-expo": ^14.6.0 + "@magic-sdk/react-native-expo": ^14.5.0 "@magic-sdk/types": ^10.0.0 "@types/crypto-js": ~3.1.47 crypto-js: ^3.3.0 @@ -2882,7 +2882,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/solana@workspace:packages/@magic-ext/solana" dependencies: - "@magic-sdk/commons": ^9.6.0 + "@magic-sdk/commons": ^9.5.0 languageName: unknown linkType: soft @@ -2890,7 +2890,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/taquito@workspace:packages/@magic-ext/taquito" dependencies: - "@magic-sdk/commons": ^9.6.0 + "@magic-sdk/commons": ^9.5.0 languageName: unknown linkType: soft @@ -2898,7 +2898,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/terra@workspace:packages/@magic-ext/terra" dependencies: - "@magic-sdk/commons": ^9.6.0 + "@magic-sdk/commons": ^9.5.0 languageName: unknown linkType: soft @@ -2906,7 +2906,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/tezos@workspace:packages/@magic-ext/tezos" dependencies: - "@magic-sdk/commons": ^9.6.0 + "@magic-sdk/commons": ^9.5.0 languageName: unknown linkType: soft @@ -2914,7 +2914,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/webauthn@workspace:packages/@magic-ext/webauthn" dependencies: - "@magic-sdk/commons": ^9.6.0 + "@magic-sdk/commons": ^9.5.0 languageName: unknown linkType: soft @@ -2922,16 +2922,16 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/zilliqa@workspace:packages/@magic-ext/zilliqa" dependencies: - "@magic-sdk/commons": ^9.6.0 + "@magic-sdk/commons": ^9.5.0 languageName: unknown linkType: soft -"@magic-sdk/commons@^9.6.0, @magic-sdk/commons@workspace:packages/@magic-sdk/commons": +"@magic-sdk/commons@^9.5.0, @magic-sdk/commons@workspace:packages/@magic-sdk/commons": version: 0.0.0-use.local resolution: "@magic-sdk/commons@workspace:packages/@magic-sdk/commons" dependencies: - "@magic-sdk/provider": ^13.6.0 - "@magic-sdk/types": ^11.6.0 + "@magic-sdk/provider": ^13.5.0 + "@magic-sdk/types": ^11.5.0 peerDependencies: "@magic-sdk/provider": ">=4.3.0" "@magic-sdk/types": ">=3.1.1" @@ -2955,17 +2955,17 @@ __metadata: "@babel/core": ^7.9.6 "@babel/plugin-proposal-optional-chaining": ^7.9.0 "@babel/runtime": ^7.9.6 - "@magic-ext/oauth": ^7.6.0 - magic-sdk: ^13.6.0 + "@magic-ext/oauth": ^7.5.0 + magic-sdk: ^13.5.0 languageName: unknown linkType: soft -"@magic-sdk/provider@^13.6.0, @magic-sdk/provider@workspace:packages/@magic-sdk/provider": +"@magic-sdk/provider@^13.5.0, @magic-sdk/provider@workspace:packages/@magic-sdk/provider": version: 0.0.0-use.local resolution: "@magic-sdk/provider@workspace:packages/@magic-sdk/provider" dependencies: "@babel/plugin-transform-modules-commonjs": ^7.9.6 - "@magic-sdk/types": ^11.6.0 + "@magic-sdk/types": ^11.5.0 "@peculiar/webcrypto": ^1.1.7 eventemitter3: ^4.0.4 localforage: ^1.7.4 @@ -2990,7 +2990,7 @@ __metadata: languageName: node linkType: hard -"@magic-sdk/react-native-bare@^14.6.0, @magic-sdk/react-native-bare@workspace:packages/@magic-sdk/react-native-bare": +"@magic-sdk/react-native-bare@^14.5.0, @magic-sdk/react-native-bare@workspace:packages/@magic-sdk/react-native-bare": version: 0.0.0-use.local resolution: "@magic-sdk/react-native-bare@workspace:packages/@magic-sdk/react-native-bare" dependencies: @@ -2998,9 +2998,9 @@ __metadata: "@babel/core": ^7.15.0 "@babel/plugin-transform-flow-strip-types": ^7.14.5 "@babel/runtime": ~7.10.4 - "@magic-sdk/commons": ^9.6.0 - "@magic-sdk/provider": ^13.6.0 - "@magic-sdk/types": ^11.6.0 + "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/provider": ^13.5.0 + "@magic-sdk/types": ^11.5.0 "@react-native-async-storage/async-storage": ^1.15.5 "@react-native-community/async-storage": ^1.12.1 "@types/lodash": ^4.14.158 @@ -3027,7 +3027,7 @@ __metadata: languageName: unknown linkType: soft -"@magic-sdk/react-native-expo@^14.6.0, @magic-sdk/react-native-expo@workspace:packages/@magic-sdk/react-native-expo": +"@magic-sdk/react-native-expo@^14.5.0, @magic-sdk/react-native-expo@workspace:packages/@magic-sdk/react-native-expo": version: 0.0.0-use.local resolution: "@magic-sdk/react-native-expo@workspace:packages/@magic-sdk/react-native-expo" dependencies: @@ -3035,9 +3035,9 @@ __metadata: "@babel/core": ^7.15.0 "@babel/plugin-transform-flow-strip-types": ^7.14.5 "@babel/runtime": ~7.10.4 - "@magic-sdk/commons": ^9.6.0 - "@magic-sdk/provider": ^13.6.0 - "@magic-sdk/types": ^11.6.0 + "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/provider": ^13.5.0 + "@magic-sdk/types": ^11.5.0 "@react-native-async-storage/async-storage": ^1.15.5 "@types/lodash": ^4.14.158 buffer: ~5.6.0 @@ -3063,7 +3063,7 @@ __metadata: languageName: unknown linkType: soft -"@magic-sdk/types@^11.6.0, @magic-sdk/types@workspace:packages/@magic-sdk/types": +"@magic-sdk/types@^11.5.0, @magic-sdk/types@workspace:packages/@magic-sdk/types": version: 0.0.0-use.local resolution: "@magic-sdk/types@workspace:packages/@magic-sdk/types" languageName: unknown @@ -12338,16 +12338,16 @@ fsevents@^2.3.2: languageName: unknown linkType: soft -"magic-sdk@^13.6.0, magic-sdk@workspace:packages/magic-sdk": +"magic-sdk@^13.5.0, magic-sdk@workspace:packages/magic-sdk": version: 0.0.0-use.local resolution: "magic-sdk@workspace:packages/magic-sdk" dependencies: "@babel/core": ^7.9.6 "@babel/plugin-proposal-optional-chaining": ^7.9.0 "@babel/runtime": ^7.9.6 - "@magic-sdk/commons": ^9.6.0 - "@magic-sdk/provider": ^13.6.0 - "@magic-sdk/types": ^11.6.0 + "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/provider": ^13.5.0 + "@magic-sdk/types": ^11.5.0 localforage: ^1.7.4 localforage-driver-memory: ^1.0.5 languageName: unknown From 15e4f10c1d1b23c3be442fcf344c2bfb779ced2e Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 20 Mar 2023 13:20:52 -0700 Subject: [PATCH 6/6] Update yarn lock --- yarn.lock | 86 +++++++++++++++++++++++++++---------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/yarn.lock b/yarn.lock index d6f659501..993fb258f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2731,7 +2731,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/algorand@workspace:packages/@magic-ext/algorand" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2739,7 +2739,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/avalanche@workspace:packages/@magic-ext/avalanche" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2747,7 +2747,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/bitcoin@workspace:packages/@magic-ext/bitcoin" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2755,7 +2755,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/conflux@workspace:packages/@magic-ext/conflux" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2763,7 +2763,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/connect@workspace:packages/@magic-ext/connect" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2771,7 +2771,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/cosmos@workspace:packages/@magic-ext/cosmos" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2779,7 +2779,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/ed25519@workspace:packages/@magic-ext/ed25519" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2787,7 +2787,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/flow@workspace:packages/@magic-ext/flow" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 "@onflow/fcl": 0.0.41 "@onflow/types": 0.0.3 peerDependencies: @@ -2800,7 +2800,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/harmony@workspace:packages/@magic-ext/harmony" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2808,7 +2808,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/icon@workspace:packages/@magic-ext/icon" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2816,18 +2816,18 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/near@workspace:packages/@magic-ext/near" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft -"@magic-ext/oauth@^7.5.0, @magic-ext/oauth@workspace:packages/@magic-ext/oauth": +"@magic-ext/oauth@^7.6.0, @magic-ext/oauth@workspace:packages/@magic-ext/oauth": version: 0.0.0-use.local resolution: "@magic-ext/oauth@workspace:packages/@magic-ext/oauth" dependencies: - "@magic-sdk/types": ^11.5.0 + "@magic-sdk/types": ^11.6.0 "@types/crypto-js": ~3.1.47 crypto-js: ^3.3.0 - magic-sdk: ^13.5.0 + magic-sdk: ^13.6.0 languageName: unknown linkType: soft @@ -2843,7 +2843,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/polkadot@workspace:packages/@magic-ext/polkadot" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2851,7 +2851,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/react-native-bare-oauth@workspace:packages/@magic-ext/react-native-bare-oauth" dependencies: - "@magic-sdk/react-native-bare": ^14.5.0 + "@magic-sdk/react-native-bare": ^14.6.0 "@magic-sdk/types": ^10.0.1 "@types/crypto-js": ~3.1.47 crypto-js: ^3.3.0 @@ -2867,7 +2867,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/react-native-expo-oauth@workspace:packages/@magic-ext/react-native-expo-oauth" dependencies: - "@magic-sdk/react-native-expo": ^14.5.0 + "@magic-sdk/react-native-expo": ^14.6.0 "@magic-sdk/types": ^10.0.0 "@types/crypto-js": ~3.1.47 crypto-js: ^3.3.0 @@ -2882,7 +2882,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/solana@workspace:packages/@magic-ext/solana" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2890,7 +2890,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/taquito@workspace:packages/@magic-ext/taquito" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2898,7 +2898,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/terra@workspace:packages/@magic-ext/terra" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2906,7 +2906,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/tezos@workspace:packages/@magic-ext/tezos" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2914,7 +2914,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/webauthn@workspace:packages/@magic-ext/webauthn" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft @@ -2922,16 +2922,16 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/zilliqa@workspace:packages/@magic-ext/zilliqa" dependencies: - "@magic-sdk/commons": ^9.5.0 + "@magic-sdk/commons": ^9.6.0 languageName: unknown linkType: soft -"@magic-sdk/commons@^9.5.0, @magic-sdk/commons@workspace:packages/@magic-sdk/commons": +"@magic-sdk/commons@^9.6.0, @magic-sdk/commons@workspace:packages/@magic-sdk/commons": version: 0.0.0-use.local resolution: "@magic-sdk/commons@workspace:packages/@magic-sdk/commons" dependencies: - "@magic-sdk/provider": ^13.5.0 - "@magic-sdk/types": ^11.5.0 + "@magic-sdk/provider": ^13.6.0 + "@magic-sdk/types": ^11.6.0 peerDependencies: "@magic-sdk/provider": ">=4.3.0" "@magic-sdk/types": ">=3.1.1" @@ -2955,17 +2955,17 @@ __metadata: "@babel/core": ^7.9.6 "@babel/plugin-proposal-optional-chaining": ^7.9.0 "@babel/runtime": ^7.9.6 - "@magic-ext/oauth": ^7.5.0 - magic-sdk: ^13.5.0 + "@magic-ext/oauth": ^7.6.0 + magic-sdk: ^13.6.0 languageName: unknown linkType: soft -"@magic-sdk/provider@^13.5.0, @magic-sdk/provider@workspace:packages/@magic-sdk/provider": +"@magic-sdk/provider@^13.6.0, @magic-sdk/provider@workspace:packages/@magic-sdk/provider": version: 0.0.0-use.local resolution: "@magic-sdk/provider@workspace:packages/@magic-sdk/provider" dependencies: "@babel/plugin-transform-modules-commonjs": ^7.9.6 - "@magic-sdk/types": ^11.5.0 + "@magic-sdk/types": ^11.6.0 "@peculiar/webcrypto": ^1.1.7 eventemitter3: ^4.0.4 localforage: ^1.7.4 @@ -2990,7 +2990,7 @@ __metadata: languageName: node linkType: hard -"@magic-sdk/react-native-bare@^14.5.0, @magic-sdk/react-native-bare@workspace:packages/@magic-sdk/react-native-bare": +"@magic-sdk/react-native-bare@^14.6.0, @magic-sdk/react-native-bare@workspace:packages/@magic-sdk/react-native-bare": version: 0.0.0-use.local resolution: "@magic-sdk/react-native-bare@workspace:packages/@magic-sdk/react-native-bare" dependencies: @@ -2998,9 +2998,9 @@ __metadata: "@babel/core": ^7.15.0 "@babel/plugin-transform-flow-strip-types": ^7.14.5 "@babel/runtime": ~7.10.4 - "@magic-sdk/commons": ^9.5.0 - "@magic-sdk/provider": ^13.5.0 - "@magic-sdk/types": ^11.5.0 + "@magic-sdk/commons": ^9.6.0 + "@magic-sdk/provider": ^13.6.0 + "@magic-sdk/types": ^11.6.0 "@react-native-async-storage/async-storage": ^1.15.5 "@react-native-community/async-storage": ^1.12.1 "@types/lodash": ^4.14.158 @@ -3027,7 +3027,7 @@ __metadata: languageName: unknown linkType: soft -"@magic-sdk/react-native-expo@^14.5.0, @magic-sdk/react-native-expo@workspace:packages/@magic-sdk/react-native-expo": +"@magic-sdk/react-native-expo@^14.6.0, @magic-sdk/react-native-expo@workspace:packages/@magic-sdk/react-native-expo": version: 0.0.0-use.local resolution: "@magic-sdk/react-native-expo@workspace:packages/@magic-sdk/react-native-expo" dependencies: @@ -3035,9 +3035,9 @@ __metadata: "@babel/core": ^7.15.0 "@babel/plugin-transform-flow-strip-types": ^7.14.5 "@babel/runtime": ~7.10.4 - "@magic-sdk/commons": ^9.5.0 - "@magic-sdk/provider": ^13.5.0 - "@magic-sdk/types": ^11.5.0 + "@magic-sdk/commons": ^9.6.0 + "@magic-sdk/provider": ^13.6.0 + "@magic-sdk/types": ^11.6.0 "@react-native-async-storage/async-storage": ^1.15.5 "@types/lodash": ^4.14.158 buffer: ~5.6.0 @@ -3063,7 +3063,7 @@ __metadata: languageName: unknown linkType: soft -"@magic-sdk/types@^11.5.0, @magic-sdk/types@workspace:packages/@magic-sdk/types": +"@magic-sdk/types@^11.6.0, @magic-sdk/types@workspace:packages/@magic-sdk/types": version: 0.0.0-use.local resolution: "@magic-sdk/types@workspace:packages/@magic-sdk/types" languageName: unknown @@ -12338,16 +12338,16 @@ fsevents@^2.3.2: languageName: unknown linkType: soft -"magic-sdk@^13.5.0, magic-sdk@workspace:packages/magic-sdk": +"magic-sdk@^13.6.0, magic-sdk@workspace:packages/magic-sdk": version: 0.0.0-use.local resolution: "magic-sdk@workspace:packages/magic-sdk" dependencies: "@babel/core": ^7.9.6 "@babel/plugin-proposal-optional-chaining": ^7.9.0 "@babel/runtime": ^7.9.6 - "@magic-sdk/commons": ^9.5.0 - "@magic-sdk/provider": ^13.5.0 - "@magic-sdk/types": ^11.5.0 + "@magic-sdk/commons": ^9.6.0 + "@magic-sdk/provider": ^13.6.0 + "@magic-sdk/types": ^11.6.0 localforage: ^1.7.4 localforage-driver-memory: ^1.0.5 languageName: unknown