@atomiqlabs/chain-solana 13.2.3 → 13.3.0

package/dist/solana/events/SolanaChainEventsBrowser.js

@@ -134,7 +134,7 @@ class SolanaChainEventsBrowser {
             const initIx = eventObject.instructions.find(ix => ix != null && (ix.name === "offererInitializePayIn" || ix.name === "offererInitialize"));
             if (initIx == null)
                 return null;
-            return SolanaSwapData_1.SolanaSwapData.fromInstruction(initIx, txoHash);
+            return SolanaSwapData_1.SolanaSwapData.fromInstruction(this.solanaSwapProgram.program.programId, initIx, txoHash);
         };
     }
     /**

package/dist/solana/program/SolanaProgramBase.d.ts

@@ -45,6 +45,23 @@ export declare class SolanaProgramBase<T extends Idl> {
      * @internal
      */
     protected pda<T extends Array<any>>(seed: string, func: (...args: T) => Buffer[]): (...args: T) => PublicKey;
+    /**
+     * Derives static PDA address from the seed
+     *
+     * @param seed
+     *
+     * @internal
+     */
+    static _pda(seed: string): (programId: PublicKey) => PublicKey;
+    /**
+     * Returns a function for deriving a dynamic PDA address from seed + dynamic arguments
+     *
+     * @param seed
+     * @param func function translating the function argument to Buffer[]
+     *
+     * @internal
+     */
+    static _pda<T extends Array<any>>(seed: string, func: (...args: T) => Buffer[]): (programId: PublicKey, ...args: T) => PublicKey;
     /**
      * Returns a function for deriving a dynamic deterministic keypair from dynamic arguments
      *

package/dist/solana/program/SolanaProgramBase.js

@@ -23,11 +23,17 @@ class SolanaProgramBase {
     }
     pda(seed, func) {
         if (func == null) {
-            return web3_js_1.PublicKey.findProgramAddressSync([buffer_1.Buffer.from(seed)], this.program.programId)[0];
+            return SolanaProgramBase._pda(seed)(this.program.programId);
         }
-        return (...args) => {
+        return SolanaProgramBase._pda(seed, func).bind(this, this.program.programId);
+    }
+    static _pda(seed, func) {
+        if (func == null) {
+            return (programId) => web3_js_1.PublicKey.findProgramAddressSync([buffer_1.Buffer.from(seed)], programId)[0];
+        }
+        return (programId, ...args) => {
             const res = func(...args);
-            return web3_js_1.PublicKey.findProgramAddressSync([buffer_1.Buffer.from(seed)].concat(res), this.program.programId)[0];
+            return web3_js_1.PublicKey.findProgramAddressSync([buffer_1.Buffer.from(seed)].concat(res), programId)[0];
         };
     }
     /**

package/dist/solana/swaps/SolanaSwapData.d.ts

@@ -7,6 +7,7 @@ import { Serialized } from "../../utils/Utils";
 import { SingleInstructionWithAccounts } from "../program/modules/SolanaProgramEvents";
 export type InitInstruction = SingleInstructionWithAccounts<SwapProgram["instructions"][2 | 3], SwapProgram>;
 export type SolanaSwapDataCtorArgs = {
+    programId: PublicKey;
     offerer: PublicKey;
     claimer: PublicKey;
     token: PublicKey;
@@ -34,6 +35,10 @@ export declare function isSerializedData(obj: any): obj is ({
  * @category Swaps
  */
 export declare class SolanaSwapData extends SwapData {
+    /**
+     * Program ID for which this swap data was created
+     */
+    programId: PublicKey;
     /**
      * Offerer address funding the swap.
      */
@@ -235,17 +240,19 @@ export declare class SolanaSwapData extends SwapData {
     /**
      * Converts initialize instruction data into {@link SolanaSwapData}.
      *
+     * @param programId
      * @param initIx Decoded initialize instruction
      * @param txoHash Parsed txo hash hint from initialize event
      * @returns Converted and parsed swap data
      */
-    static fromInstruction(initIx: InitInstruction, txoHash: string): SolanaSwapData;
+    static fromInstruction(programId: PublicKey, initIx: InitInstruction, txoHash: string): SolanaSwapData;
     /**
      * Deserializes swap data from an on-chain escrow account state.
      *
+     * @param programId
      * @param account Escrow account state as returned by Anchor
      */
-    static fromEscrowState(account: IdlAccounts<SwapProgram>["escrowState"]): SolanaSwapData;
+    static fromEscrowState(programId: PublicKey, account: IdlAccounts<SwapProgram>["escrowState"]): SolanaSwapData;
     /**
      * Converts abstract swap type to Solana program kind discriminator.
      *
@@ -274,4 +281,8 @@ export declare class SolanaSwapData extends SwapData {
      * @inheritDoc
      */
     isDepositToken(token: string): boolean;
+    /**
+     * @inheritDoc
+     */
+    getEscrowStruct(): any;
 }

package/dist/solana/swaps/SolanaSwapData.js

@@ -9,6 +9,7 @@ const buffer_1 = require("buffer");
 const spl_token_1 = require("@solana/spl-token");
 const Utils_1 = require("../../utils/Utils");
 const SolanaTokens_1 = require("../chain/modules/SolanaTokens");
+const SolanaSwapProgram_1 = require("./SolanaSwapProgram");
 const EXPIRY_BLOCKHEIGHT_THRESHOLD = new BN("1000000000");
 function isSerializedData(obj) {
     return obj.type === "sol";
@@ -23,6 +24,7 @@ class SolanaSwapData extends base_1.SwapData {
     constructor(data) {
         super();
         if (!isSerializedData(data)) {
+            this.programId = data.programId;
             this.offerer = data.offerer;
             this.claimer = data.claimer;
             this.token = data.token;
@@ -42,6 +44,7 @@ class SolanaSwapData extends base_1.SwapData {
             this.txoHash = data.txoHash;
         }
         else {
+            this.programId = new web3_js_1.PublicKey(data.programId ?? "4hfUykhqmD7ZRvNh1HuzVKEY7ToENixtdUKZspNDCrEM");
             this.offerer = new web3_js_1.PublicKey(data.offerer);
             this.claimer = new web3_js_1.PublicKey(data.claimer);
             this.token = new web3_js_1.PublicKey(data.token);
@@ -96,6 +99,7 @@ class SolanaSwapData extends base_1.SwapData {
     serialize() {
         return {
             type: "sol",
+            programId: this.programId?.toBase58(),
             offerer: this.offerer?.toBase58(),
             claimer: this.claimer?.toBase58(),
             token: this.token?.toBase58(),
@@ -318,11 +322,12 @@ class SolanaSwapData extends base_1.SwapData {
     /**
      * Converts initialize instruction data into {@link SolanaSwapData}.
      *
+     * @param programId
      * @param initIx Decoded initialize instruction
      * @param txoHash Parsed txo hash hint from initialize event
      * @returns Converted and parsed swap data
      */
-    static fromInstruction(initIx, txoHash) {
+    static fromInstruction(programId, initIx, txoHash) {
         const paymentHash = buffer_1.Buffer.from(initIx.data.swapData.hash);
         let securityDeposit = new BN(0);
         let claimerBounty = new BN(0);
@@ -333,6 +338,7 @@ class SolanaSwapData extends base_1.SwapData {
             claimerBounty = initIx.data.claimerBounty;
         }
         return new SolanaSwapData({
+            programId,
             offerer: initIx.accounts.offerer,
             claimer: initIx.accounts.claimer,
             token: initIx.accounts.mint,
@@ -355,11 +361,13 @@ class SolanaSwapData extends base_1.SwapData {
     /**
      * Deserializes swap data from an on-chain escrow account state.
      *
+     * @param programId
      * @param account Escrow account state as returned by Anchor
      */
-    static fromEscrowState(account) {
+    static fromEscrowState(programId, account) {
         const data = account.data;
         return new SolanaSwapData({
+            programId,
             offerer: account.offerer,
             claimer: account.claimer,
             token: account.mint,
@@ -444,6 +452,40 @@ class SolanaSwapData extends base_1.SwapData {
     isDepositToken(token) {
         return SolanaTokens_1.SolanaTokens.WSOL_ADDRESS.equals(new web3_js_1.PublicKey(token));
     }
+    /**
+     * @inheritDoc
+     */
+    getEscrowStruct() {
+        return {
+            accounts: {
+                offerer: this.offerer.toString(),
+                claimer: this.claimer.toString(),
+                claimerAta: this.claimerAta == null || this.claimerAta.equals(web3_js_1.PublicKey.default) ? null : this.claimerAta.toString(),
+                offererAta: this.offererAta == null || this.offererAta.equals(web3_js_1.PublicKey.default) ? null : this.offererAta.toString(),
+                claimerUserData: SolanaSwapProgram_1.SolanaSwapProgram._SwapUserVault(this.programId, this.claimer, this.token).toString(),
+                offererUserData: SolanaSwapProgram_1.SolanaSwapProgram._SwapUserVault(this.programId, this.offerer, this.token).toString(),
+                initializer: this.isPayIn() ? this.offerer.toString() : this.claimer.toString(),
+                escrowState: SolanaSwapProgram_1.SolanaSwapProgram._SwapEscrowState(this.programId, buffer_1.Buffer.from(this.paymentHash, "hex")).toString(),
+                mint: this.token.toString(),
+                vault: SolanaSwapProgram_1.SolanaSwapProgram._SwapVault(this.programId, this.token).toString(),
+                vaultAuthority: SolanaSwapProgram_1.SolanaSwapProgram._SwapVaultAuthority(this.programId).toString(),
+                systemProgram: web3_js_1.SystemProgram.programId.toString(),
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID.toString(),
+                ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY.toString(),
+            },
+            data: {
+                kind: SwapTypeEnum_1.SwapTypeEnum.fromNumber(this.kind),
+                confirmations: this.confirmations,
+                nonce: this.nonce.toString(10),
+                hash: [...buffer_1.Buffer.from(this.paymentHash, "hex")],
+                payIn: this.payIn,
+                payOut: this.payOut,
+                amount: this.amount.toString(10),
+                expiry: this.expiry.toString(10),
+                sequence: this.sequence.toString(10)
+            }
+        };
+    }
 }
 exports.SolanaSwapData = SolanaSwapData;
 base_1.SwapData.deserializers["sol"] = SolanaSwapData;

package/dist/solana/swaps/SolanaSwapProgram.d.ts

@@ -27,21 +27,25 @@ export declare class SolanaSwapProgram extends SolanaProgramBase<SwapProgram> im
      * PDA of the swap vault authority.
      * @internal
      */
+    static readonly _SwapVaultAuthority: (programId: PublicKey) => PublicKey;
     readonly _SwapVaultAuthority: PublicKey;
     /**
      * PDA helper for global token vault accounts.
      * @internal
      */
+    static readonly _SwapVault: (programId: PublicKey, tokenAddress: PublicKey) => PublicKey;
     readonly _SwapVault: (tokenAddress: PublicKey) => PublicKey;
     /**
      * PDA helper for per-user token vault accounts.
      * @internal
      */
+    static readonly _SwapUserVault: (programId: PublicKey, publicKey: PublicKey, tokenAddress: PublicKey) => PublicKey;
     readonly _SwapUserVault: (publicKey: PublicKey, tokenAddress: PublicKey) => PublicKey;
     /**
      * PDA helper for escrow state accounts.
      * @internal
      */
+    static readonly _SwapEscrowState: (programId: PublicKey, hash: Buffer) => PublicKey;
     readonly _SwapEscrowState: (hash: Buffer) => PublicKey;
     /**
      * @inheritDoc

package/dist/solana/swaps/SolanaSwapProgram.js

@@ -35,28 +35,10 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
          * Rent-exempt amount (lamports) for escrow state accounts.
          */
         this.ESCROW_STATE_RENT_EXEMPT = 2658720;
-        ////////////////////////
-        //// PDA accessors
-        /**
-         * PDA of the swap vault authority.
-         * @internal
-         */
-        this._SwapVaultAuthority = this.pda("authority");
-        /**
-         * PDA helper for global token vault accounts.
-         * @internal
-         */
-        this._SwapVault = this.pda("vault", (tokenAddress) => [tokenAddress.toBuffer()]);
-        /**
-         * PDA helper for per-user token vault accounts.
-         * @internal
-         */
-        this._SwapUserVault = this.pda("uservault", (publicKey, tokenAddress) => [publicKey.toBuffer(), tokenAddress.toBuffer()]);
-        /**
-         * PDA helper for escrow state accounts.
-         * @internal
-         */
-        this._SwapEscrowState = this.pda("state", (hash) => [hash]);
+        this._SwapVaultAuthority = SolanaSwapProgram._SwapVaultAuthority(this.program.programId);
+        this._SwapVault = SolanaSwapProgram._SwapVault.bind(this, this.program.programId);
+        this._SwapUserVault = SolanaSwapProgram._SwapUserVault.bind(this, this.program.programId);
+        this._SwapEscrowState = SolanaSwapProgram._SwapEscrowState.bind(this, this.program.programId);
         ////////////////////////
         //// Timeouts
         /**
@@ -360,7 +342,7 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
         const account = await this.program.account.escrowState.fetchNullable(this._SwapEscrowState(paymentHashBuffer));
         if (account == null)
             return null;
-        return SolanaSwapData_1.SolanaSwapData.fromEscrowState(account);
+        return SolanaSwapData_1.SolanaSwapData.fromEscrowState(this.program.programId, account);
     }
     /**
      * @inheritDoc
@@ -395,7 +377,7 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
                     continue;
                 }
                 swapsOpened[escrowHash] = {
-                    data: SolanaSwapData_1.SolanaSwapData.fromInstruction(initIx, txoHash),
+                    data: SolanaSwapData_1.SolanaSwapData.fromInstruction(this.program.programId, initIx, txoHash),
                     getInitTxId: () => Promise.resolve(txSignature),
                     getTxBlock: () => Promise.resolve({
                         blockHeight: tx.slot,
@@ -468,6 +450,7 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
         const claimerKey = new web3_js_1.PublicKey(claimer);
         const { paymentHash, nonce, confirmations } = (0, Utils_1.fromClaimHash)(claimHash);
         const swapData = new SolanaSwapData_1.SolanaSwapData({
+            programId: this.program.programId,
             offerer: offererKey,
             claimer: claimerKey,
             token: tokenAddr,
@@ -736,3 +719,25 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
     }
 }
 exports.SolanaSwapProgram = SolanaSwapProgram;
+////////////////////////
+//// PDA accessors
+/**
+ * PDA of the swap vault authority.
+ * @internal
+ */
+SolanaSwapProgram._SwapVaultAuthority = SolanaProgramBase_1.SolanaProgramBase._pda("authority");
+/**
+ * PDA helper for global token vault accounts.
+ * @internal
+ */
+SolanaSwapProgram._SwapVault = SolanaProgramBase_1.SolanaProgramBase._pda("vault", (tokenAddress) => [tokenAddress.toBuffer()]);
+/**
+ * PDA helper for per-user token vault accounts.
+ * @internal
+ */
+SolanaSwapProgram._SwapUserVault = SolanaProgramBase_1.SolanaProgramBase._pda("uservault", (publicKey, tokenAddress) => [publicKey.toBuffer(), tokenAddress.toBuffer()]);
+/**
+ * PDA helper for escrow state accounts.
+ * @internal
+ */
+SolanaSwapProgram._SwapEscrowState = SolanaProgramBase_1.SolanaProgramBase._pda("state", (hash) => [hash]);

package/dist/solana/swaps/modules/SwapInit.js

@@ -244,7 +244,7 @@ class SwapInit extends SolanaSwapModule_1.SolanaSwapModule {
         txToSign.feePayer = swapData.isPayIn() ? swapData.offerer : swapData.claimer;
         txToSign.recentBlockhash = latestBlock.blockhash;
         txToSign.sign(signer.keypair);
-        this.logger.debug("signSwapInitialization(): Signed tx: ", txToSign);
+        // this.logger.debug("signSwapInitialization(): Signed tx: ",txToSign);
         const sig = txToSign.signatures.find(e => e.publicKey.equals(signer.getPublicKey()));
         if (sig == null || sig.signature == null)
             throw new Error(`Unable to extract transaction signature! Signer: ${signer.getAddress()}`);
@@ -299,7 +299,7 @@ class SwapInit extends SolanaSwapModule_1.SolanaSwapModule {
         txToSign.feePayer = new web3_js_1.PublicKey(sender);
         txToSign.recentBlockhash = blockhash;
         txToSign.addSignature(signer, buffer_1.Buffer.from(signatureString, "hex"));
-        this.logger.debug("isSignatureValid(): Signed tx: ", txToSign);
+        // this.logger.debug("isSignatureValid(): Signed tx: ",txToSign);
         const valid = txToSign.verifySignatures(false);
         if (!valid)
             throw new base_1.SignatureVerificationError("Invalid signature!");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-solana",
-  "version": "13.2.3",
+  "version": "13.3.0",
   "description": "Solana specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",
@@ -26,7 +26,7 @@
   "author": "adambor",
   "license": "ISC",
   "dependencies": {
-    "@atomiqlabs/base": "^13.2.0",
+    "@atomiqlabs/base": "^13.3.0",
     "@coral-xyz/anchor": "0.29.0",
     "@noble/hashes": "^1.7.1",
     "@solana/spl-token": "0.4.14",

package/src/solana/events/SolanaChainEventsBrowser.ts

@@ -193,7 +193,7 @@ export class SolanaChainEventsBrowser implements ChainEvents<SolanaSwapData, Sol
             ) as InitInstruction;
             if(initIx == null) return null;
 
-            return SolanaSwapData.fromInstruction(initIx, txoHash);
+            return SolanaSwapData.fromInstruction(this.solanaSwapProgram.program.programId, initIx, txoHash);
         }
     }
 

package/src/solana/program/SolanaProgramBase.ts

@@ -64,19 +64,44 @@ export class SolanaProgramBase<T extends Idl> {
     protected pda<T extends Array<any>>(seed: string, func: (...args: T) => Buffer[]): (...args: T) => PublicKey;
     protected pda<T extends Array<any>>(seed: string, func?: (...args: T) => Buffer[]): PublicKey | ((...args: T) => PublicKey) {
         if(func==null) {
-            return PublicKey.findProgramAddressSync(
+            return SolanaProgramBase._pda(seed)(this.program.programId);
+        }
+        return SolanaProgramBase._pda(seed, func).bind(this, this.program.programId);
+    }
+
+    /**
+     * Derives static PDA address from the seed
+     *
+     * @param seed
+     *
+     * @internal
+     */
+    static _pda(seed: string): (programId: PublicKey) => PublicKey;
+    /**
+     * Returns a function for deriving a dynamic PDA address from seed + dynamic arguments
+     *
+     * @param seed
+     * @param func function translating the function argument to Buffer[]
+     *
+     * @internal
+     */
+    static _pda<T extends Array<any>>(seed: string, func: (...args: T) => Buffer[]): (programId: PublicKey, ...args: T) => PublicKey;
+    static _pda<T extends Array<any>>(seed: string, func?: (...args: T) => Buffer[]): ((programId: PublicKey) => PublicKey) | ((programId: PublicKey, ...args: T) => PublicKey) {
+        if(func==null) {
+            return (programId: PublicKey) => PublicKey.findProgramAddressSync(
                 [Buffer.from(seed)],
-                this.program.programId
+                programId
             )[0];
         }
-        return (...args: T) => {
+        return (programId: PublicKey, ...args: T) => {
             const res = func(...args);
             return PublicKey.findProgramAddressSync(
                 [Buffer.from(seed)].concat(res as Buffer<ArrayBuffer>[]),
-                this.program.programId
+                programId
             )[0]
         }
     }
+
     /**
      * Returns a function for deriving a dynamic deterministic keypair from dynamic arguments
      *

package/src/solana/swaps/SolanaSwapData.ts

@@ -1,20 +1,23 @@
-import {PublicKey} from "@solana/web3.js";
+import {PublicKey, SystemProgram, SYSVAR_INSTRUCTIONS_PUBKEY} from "@solana/web3.js";
 import * as BN from "bn.js";
 import {ChainSwapType, SwapData} from "@atomiqlabs/base";
 import {SwapProgram} from "./programTypes";
 import {IdlAccounts, IdlTypes} from "@coral-xyz/anchor";
 import {SwapTypeEnum} from "./SwapTypeEnum";
 import {Buffer} from "buffer";
-import {getAssociatedTokenAddressSync} from "@solana/spl-token";
+import {getAssociatedTokenAddressSync, TOKEN_PROGRAM_ID} from "@solana/spl-token";
 import {Serialized, toBigInt, toClaimHash, toEscrowHash} from "../../utils/Utils";
 import {SolanaTokens} from "../chain/modules/SolanaTokens";
 import {SingleInstructionWithAccounts} from "../program/modules/SolanaProgramEvents";
+import {SolanaSwapProgram} from "./SolanaSwapProgram";
 
 export type InitInstruction = SingleInstructionWithAccounts<SwapProgram["instructions"][2 | 3], SwapProgram>;
 
 const EXPIRY_BLOCKHEIGHT_THRESHOLD = new BN("1000000000");
 
 export type SolanaSwapDataCtorArgs = {
+    programId: PublicKey,
+
     offerer: PublicKey,
     claimer: PublicKey,
     token: PublicKey,
@@ -48,6 +51,10 @@ export function isSerializedData(obj: any): obj is ({type: "sol"} & Serialized<S
  */
 export class SolanaSwapData extends SwapData {
 
+    /**
+     * Program ID for which this swap data was created
+     */
+    programId: PublicKey;
     /**
      * Offerer address funding the swap.
      */
@@ -135,6 +142,7 @@ export class SolanaSwapData extends SwapData {
     constructor(data: ({type: "sol"} & Serialized<SolanaSwapData>) | SolanaSwapDataCtorArgs) {
         super();
         if(!isSerializedData(data)) {
+            this.programId = data.programId;
             this.offerer = data.offerer;
             this.claimer = data.claimer;
             this.token = data.token;
@@ -153,6 +161,7 @@ export class SolanaSwapData extends SwapData {
             this.claimerBounty = data.claimerBounty;
             this.txoHash = data.txoHash;
         } else {
+            this.programId = new PublicKey(data.programId ?? "4hfUykhqmD7ZRvNh1HuzVKEY7ToENixtdUKZspNDCrEM");
             this.offerer = new PublicKey(data.offerer);
             this.claimer = new PublicKey(data.claimer);
             this.token = new PublicKey(data.token);
@@ -212,6 +221,7 @@ export class SolanaSwapData extends SwapData {
     serialize(): {type: "sol"} & Serialized<SolanaSwapData> {
         return {
             type: "sol",
+            programId: this.programId?.toBase58(),
             offerer: this.offerer?.toBase58(),
             claimer: this.claimer?.toBase58(),
             token: this.token?.toBase58(),
@@ -452,11 +462,13 @@ export class SolanaSwapData extends SwapData {
     /**
      * Converts initialize instruction data into {@link SolanaSwapData}.
      *
+     * @param programId
      * @param initIx Decoded initialize instruction
      * @param txoHash Parsed txo hash hint from initialize event
      * @returns Converted and parsed swap data
      */
     static fromInstruction(
+        programId: PublicKey,
         initIx: InitInstruction,
         txoHash: string
     ): SolanaSwapData {
@@ -471,6 +483,7 @@ export class SolanaSwapData extends SwapData {
         }
 
         return new SolanaSwapData({
+            programId,
             offerer: initIx.accounts.offerer,
             claimer: initIx.accounts.claimer,
             token: initIx.accounts.mint,
@@ -494,12 +507,17 @@ export class SolanaSwapData extends SwapData {
     /**
      * Deserializes swap data from an on-chain escrow account state.
      *
+     * @param programId
      * @param account Escrow account state as returned by Anchor
      */
-    static fromEscrowState(account: IdlAccounts<SwapProgram>["escrowState"]) {
+    static fromEscrowState(
+        programId: PublicKey,
+        account: IdlAccounts<SwapProgram>["escrowState"]
+    ) {
         const data: IdlTypes<SwapProgram>["SwapData"] = account.data;
 
         return new SolanaSwapData({
+            programId,
             offerer: account.offerer,
             claimer: account.claimer,
             token: account.mint,
@@ -590,6 +608,44 @@ export class SolanaSwapData extends SwapData {
         return SolanaTokens.WSOL_ADDRESS.equals(new PublicKey(token));
     }
 
+    /**
+     * @inheritDoc
+     */
+    getEscrowStruct(): any {
+        return {
+            accounts: {
+                offerer: this.offerer.toString(),
+                claimer: this.claimer.toString(),
+                claimerAta: this.claimerAta==null || this.claimerAta.equals(PublicKey.default) ? null : this.claimerAta.toString(),
+                offererAta: this.offererAta==null || this.offererAta.equals(PublicKey.default) ? null : this.offererAta.toString(),
+                claimerUserData: SolanaSwapProgram._SwapUserVault(this.programId, this.claimer, this.token).toString(),
+                offererUserData: SolanaSwapProgram._SwapUserVault(this.programId, this.offerer, this.token).toString(),
+
+                initializer: this.isPayIn() ? this.offerer.toString() : this.claimer.toString(),
+
+                escrowState: SolanaSwapProgram._SwapEscrowState(this.programId, Buffer.from(this.paymentHash, "hex")).toString(),
+                mint: this.token.toString(),
+                vault: SolanaSwapProgram._SwapVault(this.programId, this.token).toString(),
+                vaultAuthority: SolanaSwapProgram._SwapVaultAuthority(this.programId).toString(),
+
+                systemProgram: SystemProgram.programId.toString(),
+                tokenProgram: TOKEN_PROGRAM_ID.toString(),
+                ixSysvar: SYSVAR_INSTRUCTIONS_PUBKEY.toString(),
+            },
+            data: {
+                kind: SwapTypeEnum.fromNumber(this.kind as 0 | 1 | 2 | 3),
+                confirmations: this.confirmations,
+                nonce: this.nonce.toString(10),
+                hash: [...Buffer.from(this.paymentHash, "hex")],
+                payIn: this.payIn,
+                payOut: this.payOut,
+                amount: this.amount.toString(10),
+                expiry: this.expiry.toString(10),
+                sequence: this.sequence.toString(10)
+            }
+        }
+    }
+
 }
 
 SwapData.deserializers["sol"] = SolanaSwapData;

package/src/solana/swaps/SolanaSwapProgram.ts

@@ -74,24 +74,28 @@ export class SolanaSwapProgram
      * PDA of the swap vault authority.
      * @internal
      */
-    readonly _SwapVaultAuthority = this.pda("authority");
+    static readonly _SwapVaultAuthority = SolanaProgramBase._pda("authority");
+    readonly _SwapVaultAuthority = SolanaSwapProgram._SwapVaultAuthority(this.program.programId);
     /**
      * PDA helper for global token vault accounts.
      * @internal
      */
-    readonly _SwapVault = this.pda("vault", (tokenAddress: PublicKey) => [tokenAddress.toBuffer()]);
+    static readonly _SwapVault = SolanaProgramBase._pda("vault", (tokenAddress: PublicKey) => [tokenAddress.toBuffer()]);
+    readonly _SwapVault = SolanaSwapProgram._SwapVault.bind(this, this.program.programId);
     /**
      * PDA helper for per-user token vault accounts.
      * @internal
      */
-    readonly _SwapUserVault = this.pda("uservault",
+    static readonly _SwapUserVault = SolanaProgramBase._pda("uservault",
         (publicKey: PublicKey, tokenAddress: PublicKey) => [publicKey.toBuffer(), tokenAddress.toBuffer()]
     );
+    readonly _SwapUserVault = SolanaSwapProgram._SwapUserVault.bind(this, this.program.programId);
     /**
      * PDA helper for escrow state accounts.
      * @internal
      */
-    readonly _SwapEscrowState = this.pda("state", (hash: Buffer) => [hash]);
+    static readonly _SwapEscrowState = SolanaProgramBase._pda("state", (hash: Buffer) => [hash]);
+    readonly _SwapEscrowState = SolanaSwapProgram._SwapEscrowState.bind(this, this.program.programId);
 
     ////////////////////////
     //// Timeouts
@@ -461,7 +465,7 @@ export class SolanaSwapProgram
             );
         if(account==null) return null;
 
-        return SolanaSwapData.fromEscrowState(account);
+        return SolanaSwapData.fromEscrowState(this.program.programId, account);
     }
 
     /**
@@ -540,7 +544,7 @@ export class SolanaSwapProgram
                 }
 
                 swapsOpened[escrowHash] = {
-                    data: SolanaSwapData.fromInstruction(initIx, txoHash),
+                    data: SolanaSwapData.fromInstruction(this.program.programId, initIx, txoHash),
                     getInitTxId: () => Promise.resolve(txSignature),
                     getTxBlock: () => Promise.resolve({
                         blockHeight: tx.slot,
@@ -632,6 +636,7 @@ export class SolanaSwapProgram
         const claimerKey = new PublicKey(claimer);
         const {paymentHash, nonce, confirmations} = fromClaimHash(claimHash);
         const swapData = new SolanaSwapData({
+            programId: this.program.programId,
             offerer: offererKey,
             claimer: claimerKey,
             token: tokenAddr,

package/src/solana/swaps/modules/SwapInit.ts

@@ -326,7 +326,7 @@ export class SwapInit extends SolanaSwapModule {
         txToSign.feePayer = swapData.isPayIn() ? swapData.offerer : swapData.claimer;
         txToSign.recentBlockhash = latestBlock.blockhash;
         txToSign.sign(signer.keypair);
-        this.logger.debug("signSwapInitialization(): Signed tx: ",txToSign);
+        // this.logger.debug("signSwapInitialization(): Signed tx: ",txToSign);
 
         const sig = txToSign.signatures.find(e => e.publicKey.equals(signer.getPublicKey()));
         if(sig==null || sig.signature==null) throw new Error(`Unable to extract transaction signature! Signer: ${signer.getAddress()}`);
@@ -393,7 +393,7 @@ export class SwapInit extends SolanaSwapModule {
         txToSign.feePayer = new PublicKey(sender);
         txToSign.recentBlockhash = blockhash;
         txToSign.addSignature(signer, Buffer.from(signatureString, "hex"));
-        this.logger.debug("isSignatureValid(): Signed tx: ",txToSign);
+        // this.logger.debug("isSignatureValid(): Signed tx: ",txToSign);
 
         const valid = txToSign.verifySignatures(false);