@phantom/browser-injected-sdk 1.0.0-beta.9 → 1.0.2

package/dist/solana/index.mjs

@@ -179,28 +179,26 @@ function addEventListener(event, callback) {
   if (!eventCallbacks.has(event)) {
     eventCallbacks.set(event, /* @__PURE__ */ new Set());
   }
-  eventCallbacks.get(event).add(callback);
+  eventCallbacks.get(event)?.add(callback);
   return () => {
     removeEventListener(event, callback);
   };
 }
 function removeEventListener(event, callback) {
   if (eventCallbacks.has(event)) {
-    eventCallbacks.get(event).delete(callback);
-    if (eventCallbacks.get(event).size === 0) {
+    eventCallbacks.get(event)?.delete(callback);
+    if (eventCallbacks.get(event)?.size === 0) {
       eventCallbacks.delete(event);
     }
   }
 }
 function triggerEvent(event, ...args) {
   if (eventCallbacks.has(event)) {
-    eventCallbacks.get(event).forEach((cb) => {
-      if (event === "connect" && args[0] && typeof args[0] === "string") {
-        cb(args[0]);
-      } else if (event === "disconnect") {
-        cb();
-      } else if (event === "accountChanged" && args[0] && typeof args[0] === "string") {
-        cb(args[0]);
+    eventCallbacks.get(event)?.forEach((cb) => {
+      try {
+        cb(...args);
+      } catch (error) {
+        console.error(`Error in ${event} event listener:`, error);
       }
     });
   }
@@ -301,19 +299,6 @@ async function signAllTransactions(transactions) {
   return provider.signAllTransactions(transactions);
 }
 
-// src/solana/signIn.ts
-async function signIn(signInData) {
-  const provider = await getProvider();
-  if (!provider) {
-    throw new Error("Provider not found.");
-  }
-  const result = await provider.signIn(signInData);
-  if (result.address) {
-    triggerEvent("connect", result.address);
-  }
-  return result;
-}
-
 // src/solana/signMessage.ts
 async function signMessage(message, display) {
   const provider = await getProvider();
@@ -327,43 +312,112 @@ async function signMessage(message, display) {
 }
 
 // src/solana/plugin.ts
-var solana = {
-  connect,
-  disconnect,
-  getAccount,
-  signMessage,
-  signIn,
-  signTransaction,
-  signAllTransactions,
-  signAndSendTransaction,
-  signAndSendAllTransactions,
-  addEventListener,
-  removeEventListener
-};
-async function bindProviderEvents() {
-  try {
-    const strategy = await getProvider();
-    const provider = strategy.getProvider();
-    if (provider) {
-      provider.on("connect", (publicKey) => {
-        if (publicKey)
-          triggerEvent("connect", publicKey.toString());
-      });
-      provider.on("disconnect", () => triggerEvent("disconnect"));
-      provider.on("accountChanged", (publicKey) => {
-        if (publicKey)
-          triggerEvent("accountChanged", publicKey.toString());
-      });
+var Solana = class {
+  constructor() {
+    this._publicKey = null;
+    this.bindProviderEvents();
+  }
+  get publicKey() {
+    return this._publicKey;
+  }
+  get connected() {
+    return this._publicKey !== null;
+  }
+  async connect(options) {
+    const address = await connect(options);
+    if (!address) {
+      throw new Error("Failed to connect to Solana wallet");
     }
-  } catch (error) {
+    this._publicKey = address;
+    return { publicKey: address };
   }
-}
+  async disconnect() {
+    await disconnect();
+    this._publicKey = null;
+  }
+  async signMessage(message) {
+    const messageBytes = typeof message === "string" ? new TextEncoder().encode(message) : message;
+    const result = await signMessage(messageBytes);
+    return {
+      signature: result.signature instanceof Uint8Array ? result.signature : new Uint8Array(result.signature),
+      publicKey: result.address || this._publicKey || ""
+    };
+  }
+  signTransaction(transaction) {
+    return signTransaction(transaction);
+  }
+  async signAndSendTransaction(transaction) {
+    const result = await signAndSendTransaction(transaction);
+    return { signature: result.signature };
+  }
+  signAllTransactions(transactions) {
+    return signAllTransactions(transactions);
+  }
+  async signAndSendAllTransactions(transactions) {
+    const result = await signAndSendAllTransactions(transactions);
+    return { signatures: result.signatures };
+  }
+  async switchNetwork(_network) {
+    return Promise.resolve();
+  }
+  async getPublicKey() {
+    if (this._publicKey) {
+      return this._publicKey;
+    }
+    try {
+      const account = await getAccount();
+      this._publicKey = account || null;
+      return this._publicKey;
+    } catch {
+      return null;
+    }
+  }
+  isConnected() {
+    return this._publicKey !== null;
+  }
+  on(event, listener) {
+    addEventListener(event, listener);
+  }
+  off(event, listener) {
+    removeEventListener(event, listener);
+  }
+  async bindProviderEvents() {
+    try {
+      const strategy = await getProvider();
+      const provider = strategy.getProvider();
+      if (provider) {
+        provider.on("connect", (publicKey) => {
+          if (publicKey) {
+            const pubKey = publicKey.toString();
+            this._publicKey = pubKey;
+            triggerEvent("connect", pubKey);
+          }
+        });
+        provider.on("disconnect", () => {
+          this._publicKey = null;
+          triggerEvent("disconnect");
+        });
+        provider.on("accountChanged", (publicKey) => {
+          if (publicKey) {
+            const pubKey = publicKey.toString();
+            this._publicKey = pubKey;
+            triggerEvent("accountChanged", pubKey);
+            triggerEvent("connect", pubKey);
+          } else {
+            this._publicKey = null;
+            triggerEvent("accountChanged", null);
+          }
+        });
+      }
+    } catch (error) {
+    }
+  }
+};
 function createSolanaPlugin() {
   return {
     name: "solana",
     create: () => {
-      bindProviderEvents();
-      return solana;
+      return new Solana();
     }
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phantom/browser-injected-sdk",
-  "version": "1.0.0-beta.9",
+  "version": "1.0.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/phantom/phantom-connect-sdk",
@@ -47,13 +47,16 @@
     "prettier": "prettier --write \"src/**/*.{ts,tsx}\""
   },
   "dependencies": {
-    "@phantom/constants": "^1.0.0-beta.12",
-    "@phantom/sdk-types": "^1.0.0-beta.12"
+    "@phantom/chain-interfaces": "^1.0.2",
+    "@phantom/constants": "^1.0.2",
+    "@phantom/sdk-types": "^1.0.2"
   },
   "devDependencies": {
+    "@jest/fake-timers": "^29.7.0",
     "@types/jest": "^29.5.14",
     "eslint": "8.53.0",
     "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
     "prettier": "^3.5.2",
     "rimraf": "^6.0.1",
     "tsup": "^6.7.0",

package/dist/index-3a750f13.d.ts

@@ -1,208 +0,0 @@
-declare function isInstalled(): boolean;
-
-type Extension = {
-    isInstalled: typeof isInstalled;
-};
-declare function createExtensionPlugin(): Plugin<Extension>;
-
-declare module "../index" {
-    interface Phantom {
-        extension: Extension;
-    }
-}
-
-declare function connect({ onlyIfTrusted }?: {
-    onlyIfTrusted?: boolean | undefined;
-}): Promise<string[]>;
-
-declare function disconnect(): Promise<void>;
-
-type EthereumTransaction = {
-    to?: string;
-    from?: string;
-    value?: string;
-    gas?: string;
-    gasPrice?: string;
-    maxFeePerGas?: string;
-    maxPriorityFeePerGas?: string;
-    data?: string;
-    nonce?: string;
-    type?: string;
-    chainId?: string;
-};
-type EthereumSignInData = {
-    domain?: string;
-    address?: string;
-    statement?: string;
-    uri?: string;
-    version?: string;
-    chainId?: string;
-    nonce?: string;
-    issuedAt?: string;
-    expirationTime?: string;
-    notBefore?: string;
-    requestId?: string;
-    resources?: string[];
-};
-type EthereumEventType = "connect" | "disconnect" | "accountsChanged" | "chainChanged";
-interface PhantomEthereumProvider {
-    isPhantom: boolean;
-    selectedAddress: string | null;
-    chainId: string;
-    isConnected: boolean;
-    request: (args: {
-        method: string;
-        params?: any[];
-    }) => Promise<any>;
-    on: (event: EthereumEventType, handler: (...args: any[]) => void) => void;
-    off: (event: EthereumEventType, handler: (...args: any[]) => void) => void;
-    removeAllListeners: (event?: EthereumEventType) => void;
-}
-
-type PhantomEthereumEventCallback = (data: any) => void;
-
-declare function getAccounts(): Promise<string[]>;
-
-/**
- * Signs a message using the Phantom Ethereum provider.
- * @param message The message to sign (as a string).
- * @param address The address to sign with.
- * @returns A promise that resolves with the signature.
- * @throws Error if Phantom provider is not found or if the operation fails.
- */
-declare function signMessage(message: string, address: string): Promise<string>;
-/**
- * Signs a personal message using the Phantom Ethereum provider.
- * @param message The message to sign (as a string).
- * @param address The address to sign with.
- * @returns A promise that resolves with the signature.
- * @throws Error if Phantom provider is not found or if the operation fails.
- */
-declare function signPersonalMessage(message: string, address: string): Promise<string>;
-/**
- * Signs typed data using the Phantom Ethereum provider.
- * @param typedData The typed data to sign.
- * @param address The address to sign with.
- * @returns A promise that resolves with the signature.
- * @throws Error if Phantom provider is not found or if the operation fails.
- */
-declare function signTypedData(typedData: any, address: string): Promise<string>;
-
-/**
- * Signs in using the Phantom Ethereum provider.
- * @param signInData The sign-in data.
- * @returns A promise that resolves with the signature data.
- * @throws Error if Phantom provider is not found or if the operation fails.
- */
-declare function signIn(signInData: EthereumSignInData): Promise<{
-    address: string;
-    signature: string;
-    signedMessage: string;
-}>;
-
-/**
- * Sends a transaction using the Phantom Ethereum provider.
- * @param transaction The transaction to send.
- * @returns A promise that resolves with the transaction hash.
- * @throws Error if Phantom provider is not found or if the operation fails.
- */
-declare function sendTransaction(transaction: EthereumTransaction): Promise<string>;
-/**
- * Signs a transaction using the Phantom Ethereum provider.
- * @param transaction The transaction to sign.
- * @returns A promise that resolves with the signed transaction.
- * @throws Error if Phantom provider is not found or if the operation fails.
- */
-declare function signTransaction(transaction: EthereumTransaction): Promise<string>;
-
-/**
- * Gets the current chain ID.
- * @returns A promise that resolves with the chain ID.
- * @throws Error if Phantom provider is not found or if the operation fails.
- */
-declare function getChainId(): Promise<string>;
-/**
- * Switches to a different chain.
- * @param chainId The chain ID to switch to.
- * @returns A promise that resolves when the switch is complete.
- * @throws Error if Phantom provider is not found or if the operation fails.
- */
-declare function switchChain(chainId: string): Promise<void>;
-
-declare enum ProviderStrategy {
-    INJECTED = "injected"
-}
-
-interface EthereumStrategy {
-    readonly type: ProviderStrategy;
-    isConnected: boolean;
-    getProvider: () => PhantomEthereumProvider | null;
-    connect: ({ onlyIfTrusted }: {
-        onlyIfTrusted: boolean;
-    }) => Promise<string[] | undefined>;
-    disconnect: () => Promise<void>;
-    getAccounts: () => Promise<string[]>;
-    signMessage: (message: string, address: string) => Promise<string>;
-    signPersonalMessage: (message: string, address: string) => Promise<string>;
-    signTypedData: (typedData: any, address: string) => Promise<string>;
-    signIn: (signInData: EthereumSignInData) => Promise<{
-        address: string;
-        signature: string;
-        signedMessage: string;
-    }>;
-    sendTransaction: (transaction: EthereumTransaction) => Promise<string>;
-    signTransaction: (transaction: EthereumTransaction) => Promise<string>;
-    getChainId: () => Promise<string>;
-    switchChain: (chainId: string) => Promise<void>;
-    request: <T = any>(args: {
-        method: string;
-        params?: unknown[];
-    }) => Promise<T>;
-}
-
-/**
- * Retrieves Phantom Ethereum provider and returns it if it exists.
- * @returns Phantom Ethereum provider or throws error if it doesn't exist.
- */
-declare function getProvider(strategy?: ProviderStrategy): Promise<EthereumStrategy>;
-
-type Ethereum = {
-    connect: typeof connect;
-    disconnect: typeof disconnect;
-    getAccounts: typeof getAccounts;
-    signMessage: typeof signMessage;
-    signPersonalMessage: typeof signPersonalMessage;
-    signTypedData: typeof signTypedData;
-    signIn: typeof signIn;
-    sendTransaction: typeof sendTransaction;
-    signTransaction: typeof signTransaction;
-    getChainId: typeof getChainId;
-    switchChain: typeof switchChain;
-    getProvider: typeof getProvider;
-    addEventListener: (event: EthereumEventType, callback: PhantomEthereumEventCallback) => () => void;
-    removeEventListener: (event: EthereumEventType, callback: PhantomEthereumEventCallback) => void;
-};
-declare function createEthereumPlugin(): Plugin<Ethereum>;
-
-declare module "../index" {
-    interface Phantom {
-        ethereum: Ethereum;
-    }
-}
-
-type Plugin<T> = {
-    name: string;
-    create: () => T;
-};
-type CreatePhantomConfig = {
-    plugins?: Plugin<unknown>[];
-};
-interface Phantom {
-}
-/**
- * Creates a Phantom instance with the provided plugins.
- * Each plugin extends the Phantom interface via declaration merging.
- */
-declare function createPhantom({ plugins }: CreatePhantomConfig): Phantom;
-
-export { CreatePhantomConfig as C, Ethereum as E, Plugin as P, PhantomEthereumProvider as a, EthereumTransaction as b, createEthereumPlugin as c, EthereumSignInData as d, EthereumEventType as e, Phantom as f, createPhantom as g, createExtensionPlugin as h, Extension as i, isInstalled as j };