@txnlab/use-wallet 2.6.0 → 2.6.2

package/dist/cjs/src/clients/magic/client.d.ts

@@ -15,7 +15,7 @@ declare class MagicAuth extends BaseClient {
         icon: string;
         isWalletConnect: boolean;
     };
-    static init({ clientOptions, algodOptions, clientStatic, getDynamicClient, algosdkStatic, network }: InitParams<PROVIDER_ID.MAGIC>): Promise<BaseClient | null>;
+    static init({ clientOptions, algodOptions, clientStatic, getDynamicClient, extensionStatic, getDynamicExtension, algosdkStatic, network }: InitParams<PROVIDER_ID.MAGIC>): Promise<BaseClient | null>;
     connect(_: () => void, arg?: any): Promise<Wallet>;
     reconnect(): Promise<{
         accounts: {

package/dist/cjs/src/clients/magic/types.d.ts

@@ -1,8 +1,8 @@
+import type { AlgorandExtension } from '@magic-ext/algorand';
+import type { SDKBase, InstanceWithExtensions } from '@magic-sdk/provider';
 import type algosdk from 'algosdk';
 import type { Network } from '../../types/node';
 import type { Metadata } from '../../types/wallet';
-import { SDKBase, InstanceWithExtensions } from '@magic-sdk/provider';
-import { AlgorandExtension } from '@magic-ext/algorand';
 export type MagicAuthConnectOptions = {
     apiKey: string;
 };

package/dist/cjs/src/types/providers.d.ts

@@ -3,6 +3,8 @@ import type { PeraWalletConnect } from '@perawallet/connect';
 import type { DeflyWalletConnect } from '@blockshake/defly-connect';
 import type { DaffiWalletConnect } from '@daffiwallet/connect';
 import type LuteConnect from 'lute-connect';
+import type { Magic } from 'magic-sdk';
+import type { AlgorandExtension } from '@magic-ext/algorand';
 import type MyAlgoConnect from '@randlabs/myalgo-connect';
 import type { WalletConnectModalSign, WalletConnectModalSignOptions } from '@walletconnect/modal-sign-html';
 import type algosdk from 'algosdk';
@@ -17,7 +19,6 @@ import type { DaffiWalletConnectOptions } from '../clients/daffi/types';
 import type { NonEmptyArray } from './utilities';
 import type BaseClient from '../clients/base';
 import type { CustomOptions } from '../clients/custom/types';
-import { Magic } from 'magic-sdk';
 export type ProviderConfigMapping = {
     [PROVIDER_ID.PERA]: {
         clientOptions?: PeraWalletConnectOptions;
@@ -85,6 +86,8 @@ export type ProviderConfigMapping = {
         };
         clientStatic?: undefined;
         getDynamicClient?: () => Promise<typeof Magic>;
+        extensionStatic?: typeof AlgorandExtension;
+        getDynamicExtension?: () => Promise<typeof AlgorandExtension>;
     };
 };
 /**
@@ -121,7 +124,16 @@ type DynamicClient<T> = {
     getDynamicClient: () => Promise<T>;
 };
 type OneOfStaticOrDynamicClient<T> = StaticClient<T> | DynamicClient<T>;
-type ProviderDef = (ProviderConfig<PROVIDER_ID.PERA> & OneOfStaticOrDynamicClient<typeof PeraWalletConnect>) | (ProviderConfig<PROVIDER_ID.MAGIC> & OneOfStaticOrDynamicClient<typeof Magic> & {
+type StaticAlgoExtension<T> = {
+    extensionStatic: T;
+    getDynamicExtension?: undefined;
+};
+type DynamicAlgoExtension<T> = {
+    extensionStatic?: undefined;
+    getDynamicExtension: () => Promise<T>;
+};
+type OneOfStaticOrDynamicAlgoExtension<T> = StaticAlgoExtension<T> | DynamicAlgoExtension<T>;
+type ProviderDef = (ProviderConfig<PROVIDER_ID.PERA> & OneOfStaticOrDynamicClient<typeof PeraWalletConnect>) | (ProviderConfig<PROVIDER_ID.MAGIC> & OneOfStaticOrDynamicClient<typeof Magic> & OneOfStaticOrDynamicAlgoExtension<typeof AlgorandExtension> & {
     clientOptions: {
         apiKey: string;
     };

package/dist/esm/index.js

@@ -1,5 +1,4 @@
 import require$$0, { useDebugValue, useState, useEffect, createContext, useContext, useMemo } from 'react';
-import { AlgorandExtension } from '@magic-ext/algorand';
 import { Buffer as Buffer$1 } from 'buffer';
 
 var PROVIDER_ID;
@@ -2637,7 +2636,7 @@ class MagicAuth extends BaseClient {
         icon: ICON$4,
         isWalletConnect: true
     };
-    static async init({ clientOptions, algodOptions, clientStatic, getDynamicClient, algosdkStatic, network = DEFAULT_NETWORK }) {
+    static async init({ clientOptions, algodOptions, clientStatic, getDynamicClient, extensionStatic, getDynamicExtension, algosdkStatic, network = DEFAULT_NETWORK }) {
         try {
             debugLog(`${PROVIDER_ID.MAGIC.toUpperCase()} initializing...`);
             let Magic;
@@ -2647,12 +2646,22 @@ class MagicAuth extends BaseClient {
             else if (getDynamicClient) {
                 Magic = await getDynamicClient();
             }
-            else if (!clientOptions || !clientOptions.apiKey) {
-                throw new Error('Magic provider missing API Key to be passed by required property: clientOptions');
-            }
             else {
                 throw new Error('Magic provider missing required property: clientStatic or getDynamicClient');
             }
+            let AlgorandExtension;
+            if (extensionStatic) {
+                AlgorandExtension = extensionStatic;
+            }
+            else if (getDynamicExtension) {
+                AlgorandExtension = await getDynamicExtension();
+            }
+            else {
+                throw new Error('Magic provider missing required property: extensionStatic or getDynamicExtension');
+            }
+            if (!clientOptions || !clientOptions.apiKey) {
+                throw new Error('Magic provider missing API Key to be passed by required property: clientOptions');
+            }
             const algosdk = algosdkStatic || (await Algod.init(algodOptions)).algosdk;
             const algodClient = getAlgodClient(algosdk, algodOptions);
             const magic = new Magic(clientOptions?.apiKey, {

package/dist/esm/src/clients/magic/client.d.ts

@@ -15,7 +15,7 @@ declare class MagicAuth extends BaseClient {
         icon: string;
         isWalletConnect: boolean;
     };
-    static init({ clientOptions, algodOptions, clientStatic, getDynamicClient, algosdkStatic, network }: InitParams<PROVIDER_ID.MAGIC>): Promise<BaseClient | null>;
+    static init({ clientOptions, algodOptions, clientStatic, getDynamicClient, extensionStatic, getDynamicExtension, algosdkStatic, network }: InitParams<PROVIDER_ID.MAGIC>): Promise<BaseClient | null>;
     connect(_: () => void, arg?: any): Promise<Wallet>;
     reconnect(): Promise<{
         accounts: {

package/dist/esm/src/clients/magic/types.d.ts

@@ -1,8 +1,8 @@
+import type { AlgorandExtension } from '@magic-ext/algorand';
+import type { SDKBase, InstanceWithExtensions } from '@magic-sdk/provider';
 import type algosdk from 'algosdk';
 import type { Network } from '../../types/node';
 import type { Metadata } from '../../types/wallet';
-import { SDKBase, InstanceWithExtensions } from '@magic-sdk/provider';
-import { AlgorandExtension } from '@magic-ext/algorand';
 export type MagicAuthConnectOptions = {
     apiKey: string;
 };

package/dist/esm/src/types/providers.d.ts

@@ -3,6 +3,8 @@ import type { PeraWalletConnect } from '@perawallet/connect';
 import type { DeflyWalletConnect } from '@blockshake/defly-connect';
 import type { DaffiWalletConnect } from '@daffiwallet/connect';
 import type LuteConnect from 'lute-connect';
+import type { Magic } from 'magic-sdk';
+import type { AlgorandExtension } from '@magic-ext/algorand';
 import type MyAlgoConnect from '@randlabs/myalgo-connect';
 import type { WalletConnectModalSign, WalletConnectModalSignOptions } from '@walletconnect/modal-sign-html';
 import type algosdk from 'algosdk';
@@ -17,7 +19,6 @@ import type { DaffiWalletConnectOptions } from '../clients/daffi/types';
 import type { NonEmptyArray } from './utilities';
 import type BaseClient from '../clients/base';
 import type { CustomOptions } from '../clients/custom/types';
-import { Magic } from 'magic-sdk';
 export type ProviderConfigMapping = {
     [PROVIDER_ID.PERA]: {
         clientOptions?: PeraWalletConnectOptions;
@@ -85,6 +86,8 @@ export type ProviderConfigMapping = {
         };
         clientStatic?: undefined;
         getDynamicClient?: () => Promise<typeof Magic>;
+        extensionStatic?: typeof AlgorandExtension;
+        getDynamicExtension?: () => Promise<typeof AlgorandExtension>;
     };
 };
 /**
@@ -121,7 +124,16 @@ type DynamicClient<T> = {
     getDynamicClient: () => Promise<T>;
 };
 type OneOfStaticOrDynamicClient<T> = StaticClient<T> | DynamicClient<T>;
-type ProviderDef = (ProviderConfig<PROVIDER_ID.PERA> & OneOfStaticOrDynamicClient<typeof PeraWalletConnect>) | (ProviderConfig<PROVIDER_ID.MAGIC> & OneOfStaticOrDynamicClient<typeof Magic> & {
+type StaticAlgoExtension<T> = {
+    extensionStatic: T;
+    getDynamicExtension?: undefined;
+};
+type DynamicAlgoExtension<T> = {
+    extensionStatic?: undefined;
+    getDynamicExtension: () => Promise<T>;
+};
+type OneOfStaticOrDynamicAlgoExtension<T> = StaticAlgoExtension<T> | DynamicAlgoExtension<T>;
+type ProviderDef = (ProviderConfig<PROVIDER_ID.PERA> & OneOfStaticOrDynamicClient<typeof PeraWalletConnect>) | (ProviderConfig<PROVIDER_ID.MAGIC> & OneOfStaticOrDynamicClient<typeof Magic> & OneOfStaticOrDynamicAlgoExtension<typeof AlgorandExtension> & {
     clientOptions: {
         apiKey: string;
     };

package/dist/index.d.ts

@@ -3,15 +3,15 @@ import { PeraWalletConnect } from '@perawallet/connect';
 import { DeflyWalletConnect } from '@blockshake/defly-connect';
 import { DaffiWalletConnect } from '@daffiwallet/connect';
 import LuteConnect from 'lute-connect';
+import { Magic } from 'magic-sdk';
+import { AlgorandExtension } from '@magic-ext/algorand';
 import MyAlgoConnect from '@randlabs/myalgo-connect';
 import { WalletConnectModalSignOptions, WalletConnectModalSign } from '@walletconnect/modal-sign-html';
-import { Magic } from 'magic-sdk';
 import React from 'react';
 import * as zustand_middleware from 'zustand/middleware';
 import * as immer_dist_internal from 'immer/dist/internal';
 import * as zustand from 'zustand';
 import { InstanceWithExtensions, SDKBase } from '@magic-sdk/provider';
-import { AlgorandExtension } from '@magic-ext/algorand';
 
 type PublicNetwork = 'betanet' | 'testnet' | 'mainnet';
 type Network = PublicNetwork | string;
@@ -391,6 +391,8 @@ type ProviderConfigMapping = {
         };
         clientStatic?: undefined;
         getDynamicClient?: () => Promise<typeof Magic>;
+        extensionStatic?: typeof AlgorandExtension;
+        getDynamicExtension?: () => Promise<typeof AlgorandExtension>;
     };
 };
 /**
@@ -427,7 +429,16 @@ type DynamicClient<T> = {
     getDynamicClient: () => Promise<T>;
 };
 type OneOfStaticOrDynamicClient<T> = StaticClient<T> | DynamicClient<T>;
-type ProviderDef = (ProviderConfig<PROVIDER_ID.PERA> & OneOfStaticOrDynamicClient<typeof PeraWalletConnect>) | (ProviderConfig<PROVIDER_ID.MAGIC> & OneOfStaticOrDynamicClient<typeof Magic> & {
+type StaticAlgoExtension<T> = {
+    extensionStatic: T;
+    getDynamicExtension?: undefined;
+};
+type DynamicAlgoExtension<T> = {
+    extensionStatic?: undefined;
+    getDynamicExtension: () => Promise<T>;
+};
+type OneOfStaticOrDynamicAlgoExtension<T> = StaticAlgoExtension<T> | DynamicAlgoExtension<T>;
+type ProviderDef = (ProviderConfig<PROVIDER_ID.PERA> & OneOfStaticOrDynamicClient<typeof PeraWalletConnect>) | (ProviderConfig<PROVIDER_ID.MAGIC> & OneOfStaticOrDynamicClient<typeof Magic> & OneOfStaticOrDynamicAlgoExtension<typeof AlgorandExtension> & {
     clientOptions: {
         apiKey: string;
     };
@@ -747,7 +758,7 @@ declare class MagicAuth extends BaseClient {
         icon: string;
         isWalletConnect: boolean;
     };
-    static init({ clientOptions, algodOptions, clientStatic, getDynamicClient, algosdkStatic, network }: InitParams<PROVIDER_ID.MAGIC>): Promise<BaseClient | null>;
+    static init({ clientOptions, algodOptions, clientStatic, getDynamicClient, extensionStatic, getDynamicExtension, algosdkStatic, network }: InitParams<PROVIDER_ID.MAGIC>): Promise<BaseClient | null>;
     connect(_: () => void, arg?: any): Promise<Wallet>;
     reconnect(): Promise<{
         accounts: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@txnlab/use-wallet",
   "author": "TxnLab, Inc.",
-  "version": "2.6.0",
+  "version": "2.6.2",
   "license": "MIT",
   "description": "React hooks for using Algorand compatible wallets in dApps.",
   "scripts": {
@@ -120,7 +120,7 @@
     "@magic-ext/algorand": {
       "optional": true
     },
-    "@magic-sdk": {
+    "magic-sdk": {
       "optional": true
     },
     "@blockshake/defly-connect": {