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

package/README.md

@@ -143,28 +143,26 @@ await shelbyClient.upload({
 
 ## React Integration
 
-For React applications, use the `useStorageAccount` hook:
+For React applications, use the `useStorageAccount` hook with `@solana/react-hooks`:
 
 ```tsx
 "use client";
 
 import { useStorageAccount, Network } from "@shelby-protocol/solana-kit/react";
 import { ShelbyClient } from "@shelby-protocol/sdk/browser";
-import { useWallet } from "@solana/wallet-adapter-react";
+import { useWalletConnection } from "@solana/react-hooks";
 
 function MyComponent() {
-  const wallet = useWallet();
+  const { wallet } = useWalletConnection();
   const shelbyClient = new ShelbyClient({
     network: Network.SHELBYNET,
     apiKey: "AG-***",
   });
 
-  const { storageAccountAddress } = useStorageAccount(
-    {
-      client: shelbyClient,
-      wallet,
-    }
-  );
+  const { storageAccountAddress, signAndSubmitTransaction } = useStorageAccount({
+    client: shelbyClient,
+    wallet,
+  });
 
   return (
     <div>
@@ -174,6 +172,31 @@ function MyComponent() {
 }
 ```
 
+### Using with `@solana/wallet-adapter-react`
+
+If you're using the `@solana/wallet-adapter-react` package, you can adapt the wallet to the expected shape:
+
+```tsx
+import { useWallet } from "@solana/wallet-adapter-react";
+
+function MyComponent() {
+  const { publicKey, signMessage, signIn } = useWallet();
+
+  const { storageAccountAddress } = useStorageAccount({
+    client: shelbyClient,
+    wallet: publicKey
+      ? {
+          account: { address: publicKey },
+          signMessage,
+          signIn,
+        }
+      : null,
+  });
+
+  // ...
+}
+```
+
 ## Retrieving a file
 
 ### Through Shelby Explorer

package/dist/react/index.d.ts

@@ -8,14 +8,17 @@ declare const Network: {
 type Network = (typeof Network)[keyof typeof Network];
 
 /**
- * Minimal interface for Solana wallets that can sign.
- * Compatible with @solana/wallet-adapter-react's useWallet() hook.
+ * Wallet shape from @solana/react-hooks useWalletConnection()
+ * Compatible with the modern @solana/kit stack.
  */
 interface SolanaWallet {
-    publicKey: string | null;
+    account: {
+        address: {
+            toString(): string;
+        };
+    };
     signMessage?: (message: Uint8Array) => Promise<Uint8Array>;
     signIn?: (input?: SolanaSignInInput) => Promise<SolanaSignInOutput>;
-    name?: string;
 }
 type SignTransactionInput = {
     data: InputEntryFunctionData;
@@ -29,7 +32,7 @@ type SignAndSubmitTransactionInput = {
 } & InputTransactionPluginData;
 interface UseStorageAccountParams {
     client: ShelbyClient;
-    wallet: SolanaWallet | null;
+    wallet: SolanaWallet | null | undefined;
 }
 interface UseStorageAccountResult {
     storageAccountAddress: AccountAddress | null;

package/dist/react/index.mjs

@@ -23,14 +23,15 @@ import { useMemo } from "react";
 function useStorageAccount(params) {
   const { client, wallet } = params;
   const domain = typeof window !== "undefined" ? window.location.host : void 0;
+  const publicKey = wallet?.account?.address?.toString() ?? null;
   const derivedPublicKey = useMemo(() => {
-    if (!wallet?.publicKey || !domain) return null;
+    if (!publicKey || !domain) return null;
     return new SolanaDerivedPublicKey2({
       domain,
-      solanaPublicKey: new PublicKey(wallet.publicKey),
+      solanaPublicKey: new PublicKey(publicKey),
       authenticationFunction: defaultAuthenticationFunction3
     });
-  }, [wallet?.publicKey, domain]);
+  }, [publicKey, domain]);
   const storageAccountAddress = useMemo(
     () => derivedPublicKey?.authKey().derivedAddress() ?? null,
     [derivedPublicKey]
@@ -39,25 +40,22 @@ function useStorageAccount(params) {
     if (!storageAccountAddress) {
       throw new Error("Storage account address not found");
     }
-    if (!wallet?.publicKey) {
+    if (!publicKey) {
       throw new Error("Wallet not connected");
     }
     const rawTransaction = await client.aptos.transaction.build.simple({
       sender: storageAccountAddress,
       data: params2.data
     });
-    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"
+        publicKey: new PublicKey(publicKey),
+        signMessage: wallet?.signMessage,
+        signIn: wallet?.signIn,
+        name: "Solana Wallet"
       },
       authenticationFunction: defaultAuthenticationFunction3,
       rawTransaction,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shelby-protocol/solana-kit",
-  "version": "0.1.2-alpha.6",
+  "version": "0.1.2-alpha.8",
   "private": false,
   "publishConfig": {
     "access": "public"