@faremeter/wallet-solana-squads 0.20.1 → 0.21.0

package/README.md

@@ -27,19 +27,18 @@ pnpm install @faremeter/wallet-solana-squads
 
 Creates a Squads multisig wallet for Solana.
 
-Wraps the Squads SDK to create proposals, gather approvals, and execute
-vault transactions through a multisig workflow.
+Wraps the Squads SDK (still on
 
-| Function             | Type                                                                                                                                                                                                                                           |
-| -------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `createSquadsWallet` | `(network: string, connection: Connection, keypair: Keypair, multisigPda: PublicKey, squadMember: Keypair) => Promise<{ network: string; publicKey: PublicKey; buildTransaction: (instructions: TransactionInstruction[]) => Promise<...>; }>` |
+| Function             | Type                                                                                                                                                                                                                                                                          |
+| -------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `createSquadsWallet` | `(network: string, connection: Connection, keypair: Keypair, multisigPda: PublicKey, squadMember: Keypair) => Promise<{ network: string; publicKey: Address; buildTransaction: (instructions: readonly Instruction<...>[], lifetimeConstraint: { ...; }) => Promise<...>; }>` |
 
 Parameters:
 
 - `network`: - Solana network identifier.
-- `connection`: - Solana RPC connection.
+- `connection`: - Solana RPC connection (v1).
 - `keypair`: - Admin keypair for creating and signing proposals.
-- `multisigPda`: - Program-derived address of the Squads multisig account.
+- `multisigPda`: - Program-derived address of the Squads multisig.
 - `squadMember`: - Additional squad member keypair for approval quorum.
 
 Returns:

package/dist/src/index.d.ts

@@ -3,24 +3,38 @@
  * @sidebarTitle Wallet Squads
  * @description Squads multisig wallet integration for Solana
  * @packageDocumentation
+ *
+ * NOTE: This package retains @solana/web3.js v1 as a direct dependency
+ * because @sqds/multisig has no @solana/kit-compatible version. It
+ * exposes a kit-typed Wallet bridge so Faremeter callers can stay on
+ * the kit-native payment-solana/exact flow. A future kit
+ * reimplementation of the Squads instruction builders is a follow-up.
  */
-import { type Connection, type Keypair, type PublicKey, type TransactionInstruction, VersionedTransaction } from "@solana/web3.js";
+import { type Connection, type Keypair, type PublicKey } from "@solana/web3.js";
+import { type Address, type Blockhash, type Instruction, type Transaction as KitTransaction } from "@solana/kit";
 /**
  * Creates a Squads multisig wallet for Solana.
  *
- * Wraps the Squads SDK to create proposals, gather approvals, and execute
- * vault transactions through a multisig workflow.
+ * Wraps the Squads SDK (still on @solana/web3.js v1 internally) and
+ * exposes a kit-typed Wallet via a bridge: callers pass kit
+ * `Instruction`s, the package converts them to v1 `TransactionInstruction`s,
+ * runs them through the full @sqds/multisig proposal + approve + execute
+ * flow, serializes the resulting v1 VersionedTransaction, and decodes
+ * the bytes as a kit `Transaction`.
  *
  * @param network - Solana network identifier.
- * @param connection - Solana RPC connection.
+ * @param connection - Solana RPC connection (v1).
  * @param keypair - Admin keypair for creating and signing proposals.
- * @param multisigPda - Program-derived address of the Squads multisig account.
+ * @param multisigPda - Program-derived address of the Squads multisig.
  * @param squadMember - Additional squad member keypair for approval quorum.
  * @returns A wallet object that builds and executes multisig transactions.
  */
 export declare function createSquadsWallet(network: string, connection: Connection, keypair: Keypair, multisigPda: PublicKey, squadMember: Keypair): Promise<{
     network: string;
-    publicKey: PublicKey;
-    buildTransaction: (instructions: TransactionInstruction[]) => Promise<VersionedTransaction>;
+    publicKey: Address;
+    buildTransaction: (instructions: readonly Instruction[], lifetimeConstraint: {
+        blockhash: Blockhash;
+        lastValidBlockHeight: bigint;
+    }) => Promise<KitTransaction>;
 }>;
 //# sourceMappingURL=index.d.ts.map

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EACL,KAAK,UAAU,EACf,KAAK,OAAO,EACZ,KAAK,SAAS,EACd,KAAK,sBAAsB,EAG3B,oBAAoB,EAErB,MAAM,iBAAiB,CAAC;AAKzB;;;;;;;;;;;;GAYG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,SAAS,EACtB,WAAW,EAAE,OAAO;;;qCAMF,sBAAsB,EAAE,KACrC,OAAO,CAAC,oBAAoB,CAAC;GAuHnC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,EACL,KAAK,UAAU,EACf,KAAK,OAAO,EACZ,KAAK,SAAS,EAOf,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAGL,KAAK,OAAO,EACZ,KAAK,SAAS,EACd,KAAK,WAAW,EAChB,KAAK,WAAW,IAAI,cAAc,EACnC,MAAM,aAAa,CAAC;AA2BrB;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,SAAS,EACtB,WAAW,EAAE,OAAO;;;qCAQF,SAAS,WAAW,EAAE,sBAChB;QAClB,SAAS,EAAE,SAAS,CAAC;QACrB,oBAAoB,EAAE,MAAM,CAAC;KAC9B,KACA,OAAO,CAAC,cAAc,CAAC;GA2H7B"}

package/dist/src/index.js

@@ -3,29 +3,59 @@
  * @sidebarTitle Wallet Squads
  * @description Squads multisig wallet integration for Solana
  * @packageDocumentation
+ *
+ * NOTE: This package retains @solana/web3.js v1 as a direct dependency
+ * because @sqds/multisig has no @solana/kit-compatible version. It
+ * exposes a kit-typed Wallet bridge so Faremeter callers can stay on
+ * the kit-native payment-solana/exact flow. A future kit
+ * reimplementation of the Squads instruction builders is a follow-up.
  */
-import { Transaction, TransactionMessage, VersionedTransaction, sendAndConfirmTransaction, } from "@solana/web3.js";
+import { Transaction, TransactionInstruction, TransactionMessage, VersionedTransaction, sendAndConfirmTransaction, PublicKey as SolanaPublicKey, } from "@solana/web3.js";
+import { AccountRole, address, } from "@solana/kit";
+import { getTransactionDecoder } from "@solana/transactions";
 import * as multisig from "@sqds/multisig";
 import bs58 from "bs58";
 import { logger } from "./logger.js";
+function toV1Instruction(ix) {
+    if (!ix.accounts || !ix.data) {
+        throw new Error("squads bridge requires instructions with accounts and data");
+    }
+    return new TransactionInstruction({
+        programId: new SolanaPublicKey(ix.programAddress),
+        keys: ix.accounts.map((a) => ({
+            pubkey: new SolanaPublicKey(a.address),
+            isSigner: a.role === AccountRole.WRITABLE_SIGNER ||
+                a.role === AccountRole.READONLY_SIGNER,
+            isWritable: a.role === AccountRole.WRITABLE_SIGNER ||
+                a.role === AccountRole.WRITABLE,
+        })),
+        data: Buffer.from(ix.data),
+    });
+}
 /**
  * Creates a Squads multisig wallet for Solana.
  *
- * Wraps the Squads SDK to create proposals, gather approvals, and execute
- * vault transactions through a multisig workflow.
+ * Wraps the Squads SDK (still on @solana/web3.js v1 internally) and
+ * exposes a kit-typed Wallet via a bridge: callers pass kit
+ * `Instruction`s, the package converts them to v1 `TransactionInstruction`s,
+ * runs them through the full @sqds/multisig proposal + approve + execute
+ * flow, serializes the resulting v1 VersionedTransaction, and decodes
+ * the bytes as a kit `Transaction`.
  *
  * @param network - Solana network identifier.
- * @param connection - Solana RPC connection.
+ * @param connection - Solana RPC connection (v1).
  * @param keypair - Admin keypair for creating and signing proposals.
- * @param multisigPda - Program-derived address of the Squads multisig account.
+ * @param multisigPda - Program-derived address of the Squads multisig.
  * @param squadMember - Additional squad member keypair for approval quorum.
  * @returns A wallet object that builds and executes multisig transactions.
  */
 export async function createSquadsWallet(network, connection, keypair, multisigPda, squadMember) {
+    const publicKey = address(keypair.publicKey.toBase58());
     return {
         network,
-        publicKey: keypair.publicKey,
-        buildTransaction: async (instructions) => {
+        publicKey,
+        buildTransaction: async (instructions, lifetimeConstraint) => {
+            const v1Instructions = instructions.map(toV1Instruction);
             const [vaultPda] = multisig.getVaultPda({
                 multisigPda,
                 index: 0,
@@ -33,11 +63,10 @@ export async function createSquadsWallet(network, connection, keypair, multisigP
             const multisigInfo = await multisig.accounts.Multisig.fromAccountAddress(connection, multisigPda);
             const currentTransactionIndex = Number(multisigInfo.transactionIndex);
             const newTransactionIndex = BigInt(currentTransactionIndex + 1);
-            const recentBlockhash = (await connection.getLatestBlockhash()).blockhash;
             const testTransferMessage = new TransactionMessage({
                 payerKey: vaultPda,
-                recentBlockhash,
-                instructions,
+                recentBlockhash: lifetimeConstraint.blockhash,
+                instructions: v1Instructions,
             });
             const createVaultInstruction = multisig.instructions.vaultTransactionCreate({
                 multisigPda,
@@ -84,13 +113,17 @@ export async function createSquadsWallet(network, connection, keypair, multisigP
                 payerKey: keypair.publicKey,
                 recentBlockhash: blockhash,
             }).compileToV0Message();
-            const tx = new VersionedTransaction(message);
-            tx.sign([keypair]);
-            if (tx.signatures[0] === undefined) {
+            const v1Tx = new VersionedTransaction(message);
+            v1Tx.sign([keypair]);
+            if (v1Tx.signatures[0] === undefined) {
                 throw new Error("vault transaction is undefined");
             }
-            logger.info(`Execute vault transaction signature: ${bs58.encode(tx.signatures[0])}`);
-            return tx;
+            logger.info(`Execute vault transaction signature: ${bs58.encode(v1Tx.signatures[0])}`);
+            // Bridge the v1 VersionedTransaction back to a kit Transaction by
+            // serializing to wire bytes and running them through the kit
+            // Transaction decoder.
+            const wireBytes = v1Tx.serialize();
+            return getTransactionDecoder().decode(wireBytes);
         },
     };
 }