@shelby-protocol/solana-kit 0.1.2-alpha.5 → 0.1.2-alpha.6

package/dist/node/index.cjs

@@ -22,6 +22,8 @@ var _gasstationclient = require('@aptos-labs/gas-station-client');
 
 // src/node/storageAccount.ts
 var _node3 = require('@aptos-labs/derived-wallet-solana/node');
+var ShelbyStorageAccount = class extends _node3.SolanaDerivedAccount {
+};
 
 // src/node/shelby.ts
 var Shelby = class extends _node.ShelbyClient {
@@ -56,7 +58,7 @@ var Shelby = class extends _node.ShelbyClient {
    * ```
    */
   createStorageAccount(solanaKeypair, domain) {
-    return new (0, _node3.SolanaDerivedAccount)({ solanaKeypair, domain });
+    return new ShelbyStorageAccount({ solanaKeypair, domain });
   }
 };
 

package/dist/node/index.d.cts

@@ -9,6 +9,9 @@ declare const Network: {
 };
 type Network = (typeof Network)[keyof typeof Network];
 
+declare class ShelbyStorageAccount extends SolanaDerivedAccount {
+}
+
 interface ShelbyParams {
     network: ShelbyNetwork;
     connection: Connection;
@@ -44,7 +47,7 @@ declare class Shelby extends ShelbyClient {
      * const storageAccount = shelbyClient.createStorageAccount(solanaKeypair, domain);
      * ```
      */
-    createStorageAccount(solanaKeypair: Keypair, domain: string): SolanaDerivedAccount;
+    createStorageAccount(solanaKeypair: Keypair, domain: string): ShelbyStorageAccount;
 }
 
 export { Network, Shelby, type ShelbyParams };

package/dist/node/index.d.ts

@@ -9,6 +9,9 @@ declare const Network: {
 };
 type Network = (typeof Network)[keyof typeof Network];
 
+declare class ShelbyStorageAccount extends SolanaDerivedAccount {
+}
+
 interface ShelbyParams {
     network: ShelbyNetwork;
     connection: Connection;
@@ -44,7 +47,7 @@ declare class Shelby extends ShelbyClient {
      * const storageAccount = shelbyClient.createStorageAccount(solanaKeypair, domain);
      * ```
      */
-    createStorageAccount(solanaKeypair: Keypair, domain: string): SolanaDerivedAccount;
+    createStorageAccount(solanaKeypair: Keypair, domain: string): ShelbyStorageAccount;
 }
 
 export { Network, Shelby, type ShelbyParams };

package/dist/node/index.mjs

@@ -22,6 +22,8 @@ import {
 
 // src/node/storageAccount.ts
 import { SolanaDerivedAccount } from "@aptos-labs/derived-wallet-solana/node";
+var ShelbyStorageAccount = class extends SolanaDerivedAccount {
+};
 
 // src/node/shelby.ts
 var Shelby = class extends ShelbyClient {
@@ -56,7 +58,7 @@ var Shelby = class extends ShelbyClient {
    * ```
    */
   createStorageAccount(solanaKeypair, domain) {
-    return new SolanaDerivedAccount({ solanaKeypair, domain });
+    return new ShelbyStorageAccount({ solanaKeypair, domain });
   }
 };
 export {

package/dist/react/index.d.ts

@@ -1,26 +1,35 @@
-import { SolanaSigningWallet } from '@aptos-labs/derived-wallet-solana/react';
-export { SolanaSigningWallet, useSolanaDerivedWallet } from '@aptos-labs/derived-wallet-solana/react';
-import { Network as Network$1, InputGenerateTransactionPayloadData, InputTransactionPluginData, AnyRawTransaction, AccountAuthenticatorAbstraction, AccountAddress } from '@aptos-labs/ts-sdk';
+import { Network as Network$1, InputEntryFunctionData, InputTransactionPluginData, AnyRawTransaction, AccountAuthenticatorAbstraction, AccountAddress } from '@aptos-labs/ts-sdk';
 import { ShelbyClient } from '@shelby-protocol/sdk/browser';
+import { SolanaSignInInput, SolanaSignInOutput } from '@solana/wallet-standard-features';
 
 declare const Network: {
     readonly SHELBYNET: Network$1.SHELBYNET;
 };
 type Network = (typeof Network)[keyof typeof Network];
 
+/**
+ * Minimal interface for Solana wallets that can sign.
+ * Compatible with @solana/wallet-adapter-react's useWallet() hook.
+ */
+interface SolanaWallet {
+    publicKey: string | null;
+    signMessage?: (message: Uint8Array) => Promise<Uint8Array>;
+    signIn?: (input?: SolanaSignInInput) => Promise<SolanaSignInOutput>;
+    name?: string;
+}
 type SignTransactionInput = {
-    data: InputGenerateTransactionPayloadData;
+    data: InputEntryFunctionData;
 };
 type SubmitTransactionInput = {
     transaction: AnyRawTransaction;
     senderAuthenticator: AccountAuthenticatorAbstraction;
 } & InputTransactionPluginData;
 type SignAndSubmitTransactionInput = {
-    data: InputGenerateTransactionPayloadData;
+    data: InputEntryFunctionData;
 } & InputTransactionPluginData;
 interface UseStorageAccountParams {
     client: ShelbyClient;
-    wallet: SolanaSigningWallet | null;
+    wallet: SolanaWallet | null;
 }
 interface UseStorageAccountResult {
     storageAccountAddress: AccountAddress | null;

package/dist/react/index.mjs

@@ -1,8 +1,3 @@
-// src/react/index.tsx
-import {
-  useSolanaDerivedWallet as useSolanaDerivedWallet2
-} from "@aptos-labs/derived-wallet-solana/react";
-
 // src/common/constants.ts
 import { defaultAuthenticationFunction } from "@aptos-labs/derived-wallet-solana";
 import { Network as AptosNetwork } from "@aptos-labs/ts-sdk";
@@ -18,27 +13,58 @@ import {
 
 // src/react/useStorageAccount.tsx
 import {
-  useSolanaDerivedWallet
-} from "@aptos-labs/derived-wallet-solana/react";
-import {
-  AccountAddress
-} from "@aptos-labs/ts-sdk";
+  defaultAuthenticationFunction as defaultAuthenticationFunction3,
+  SolanaDerivedPublicKey as SolanaDerivedPublicKey2,
+  signAptosTransactionWithSolana
+} from "@aptos-labs/derived-wallet-solana";
 import { UserResponseStatus } from "@aptos-labs/wallet-standard";
+import { PublicKey } from "@solana/web3.js";
+import { useMemo } from "react";
 function useStorageAccount(params) {
   const { client, wallet } = params;
-  const { derivedAddress, signTransaction: signWithSolana } = useSolanaDerivedWallet({ wallet });
-  const storageAccountAddress = derivedAddress ? AccountAddress.from(derivedAddress) : null;
+  const domain = typeof window !== "undefined" ? window.location.host : void 0;
+  const derivedPublicKey = useMemo(() => {
+    if (!wallet?.publicKey || !domain) return null;
+    return new SolanaDerivedPublicKey2({
+      domain,
+      solanaPublicKey: new PublicKey(wallet.publicKey),
+      authenticationFunction: defaultAuthenticationFunction3
+    });
+  }, [wallet?.publicKey, domain]);
+  const storageAccountAddress = useMemo(
+    () => derivedPublicKey?.authKey().derivedAddress() ?? null,
+    [derivedPublicKey]
+  );
   const signTransaction = async (params2) => {
     if (!storageAccountAddress) {
       throw new Error("Storage account address not found");
     }
+    if (!wallet?.publicKey) {
+      throw new Error("Wallet not connected");
+    }
     const rawTransaction = await client.aptos.transaction.build.simple({
       sender: storageAccountAddress,
       data: params2.data
     });
-    const response = await signWithSolana(rawTransaction);
+    if (!wallet) {
+      throw new Error("Wallet not connected");
+    }
+    if (!domain) {
+      throw new Error("Domain is required in the browser");
+    }
+    const response = await signAptosTransactionWithSolana({
+      solanaWallet: {
+        publicKey: new PublicKey(wallet.publicKey),
+        signMessage: wallet.signMessage,
+        signIn: wallet.signIn,
+        name: wallet.name ?? "Solana Wallet"
+      },
+      authenticationFunction: defaultAuthenticationFunction3,
+      rawTransaction,
+      domain
+    });
     if (response.status !== UserResponseStatus.APPROVED || !("args" in response)) {
-      throw new Error("Transaction signing rejected");
+      throw new Error("User rejected the request.");
     }
     return {
       authenticator: response.args,
@@ -75,6 +101,5 @@ function useStorageAccount(params) {
 }
 export {
   Network,
-  useSolanaDerivedWallet2 as useSolanaDerivedWallet,
   useStorageAccount
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shelby-protocol/solana-kit",
-  "version": "0.1.2-alpha.5",
+  "version": "0.1.2-alpha.6",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -47,10 +47,11 @@
     }
   },
   "dependencies": {
-    "@aptos-labs/derived-wallet-solana": "0.11.0-alpha.3",
+    "@aptos-labs/derived-wallet-solana": "0.11.0-alpha.4",
     "@aptos-labs/gas-station-client": "^2.0.3",
     "@aptos-labs/ts-sdk": "^5.1.1",
     "@aptos-labs/wallet-standard": "^0.5.2",
+    "@solana/wallet-standard-features": "^1.3.0",
     "@solana/web3.js": "^1.95.8",
     "@shelby-protocol/sdk": "0.0.9"
   },