@atomiqlabs/chain-solana 13.3.0 → 13.5.6

package/dist/solana/swaps/SolanaSwapData.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolanaSwapData = exports.isSerializedData = void 0;
+exports.SolanaSwapDataV2 = exports.SolanaSwapDataV1 = exports.SolanaSwapData = exports.isSerializedData = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const BN = require("bn.js");
 const base_1 = require("@atomiqlabs/base");
@@ -25,6 +25,7 @@ class SolanaSwapData extends base_1.SwapData {
         super();
         if (!isSerializedData(data)) {
             this.programId = data.programId;
+            this.version = data.version;
             this.offerer = data.offerer;
             this.claimer = data.claimer;
             this.token = data.token;
@@ -42,9 +43,11 @@ class SolanaSwapData extends base_1.SwapData {
             this.securityDeposit = data.securityDeposit;
             this.claimerBounty = data.claimerBounty;
             this.txoHash = data.txoHash;
+            this.offererInitializer = data.offererInitializer;
         }
         else {
             this.programId = new web3_js_1.PublicKey(data.programId ?? "4hfUykhqmD7ZRvNh1HuzVKEY7ToENixtdUKZspNDCrEM");
+            this.version = data.version ?? "v1";
             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);
@@ -62,6 +65,7 @@ class SolanaSwapData extends base_1.SwapData {
             this.securityDeposit = new BN(data.securityDeposit);
             this.claimerBounty = new BN(data.claimerBounty);
             this.txoHash = data.txoHash;
+            this.offererInitializer = data.offererInitializer;
         }
     }
     /**
@@ -100,6 +104,7 @@ class SolanaSwapData extends base_1.SwapData {
         return {
             type: "sol",
             programId: this.programId?.toBase58(),
+            version: this.version,
             offerer: this.offerer?.toBase58(),
             claimer: this.claimer?.toBase58(),
             token: this.token?.toBase58(),
@@ -116,7 +121,8 @@ class SolanaSwapData extends base_1.SwapData {
             claimerAta: this.claimerAta?.toBase58(),
             securityDeposit: this.securityDeposit?.toString(10),
             claimerBounty: this.claimerBounty?.toString(10),
-            txoHash: this.txoHash
+            txoHash: this.txoHash,
+            offererInitializer: this.offererInitializer
         };
     }
     /**
@@ -282,7 +288,8 @@ class SolanaSwapData extends base_1.SwapData {
             (this.claimerAta == null || account.claimerAta.equals(this.claimerAta)) &&
             account.mint.equals(this.token) &&
             this.claimerBounty.eq(account.claimerBounty) &&
-            this.securityDeposit.eq(account.securityDeposit);
+            this.securityDeposit.eq(account.securityDeposit) &&
+            (this.offererInitializer == null || account.offererInitializer === this.offererInitializer);
     }
     /**
      * @inheritDoc
@@ -304,6 +311,14 @@ class SolanaSwapData extends base_1.SwapData {
             if (!this.offererAta.equals(other.offererAta))
                 return false;
         }
+        if (this.offererInitializer == null && other.offererInitializer != null)
+            return false;
+        if (this.offererInitializer != null && other.offererInitializer == null)
+            return false;
+        if (this.offererInitializer != null && other.offererInitializer != null) {
+            if (this.offererInitializer !== other.offererInitializer)
+                return false;
+        }
         return other.kind === this.kind &&
             other.confirmations === this.confirmations &&
             this.nonce.eq(other.nonce) &&
@@ -323,11 +338,12 @@ class SolanaSwapData extends base_1.SwapData {
      * Converts initialize instruction data into {@link SolanaSwapData}.
      *
      * @param programId
+     * @param version
      * @param initIx Decoded initialize instruction
      * @param txoHash Parsed txo hash hint from initialize event
      * @returns Converted and parsed swap data
      */
-    static fromInstruction(programId, initIx, txoHash) {
+    static fromInstruction(programId, version, initIx, txoHash) {
         const paymentHash = buffer_1.Buffer.from(initIx.data.swapData.hash);
         let securityDeposit = new BN(0);
         let claimerBounty = new BN(0);
@@ -337,8 +353,14 @@ class SolanaSwapData extends base_1.SwapData {
             securityDeposit = initIx.data.securityDeposit;
             claimerBounty = initIx.data.claimerBounty;
         }
+        if (version !== "v1" && initIx.name === "offererInitializePayIn") {
+            payIn = true;
+            securityDeposit = initIx.data.securityDeposit;
+            claimerBounty = initIx.data.claimerBounty;
+        }
         return new SolanaSwapData({
             programId,
+            version,
             offerer: initIx.accounts.offerer,
             claimer: initIx.accounts.claimer,
             token: initIx.accounts.mint,
@@ -355,19 +377,22 @@ class SolanaSwapData extends base_1.SwapData {
             claimerAta: initIx.data.swapData.payOut ? initIx.accounts.claimerAta : web3_js_1.PublicKey.default,
             securityDeposit,
             claimerBounty,
-            txoHash
+            txoHash,
+            offererInitializer: initIx.accounts.initializer != null ? initIx.accounts.initializer.equals(initIx.accounts.offerer) : undefined
         });
     }
     /**
      * Deserializes swap data from an on-chain escrow account state.
      *
      * @param programId
+     * @param version
      * @param account Escrow account state as returned by Anchor
      */
-    static fromEscrowState(programId, account) {
+    static fromEscrowState(programId, version, account) {
         const data = account.data;
         return new SolanaSwapData({
             programId,
+            version,
             offerer: account.offerer,
             claimer: account.claimer,
             token: account.mint,
@@ -383,7 +408,8 @@ class SolanaSwapData extends base_1.SwapData {
             offererAta: account.offererAta,
             claimerAta: account.claimerAta,
             securityDeposit: account.securityDeposit,
-            claimerBounty: account.claimerBounty
+            claimerBounty: account.claimerBounty,
+            offererInitializer: account.offererInitializer ?? undefined
         });
     }
     /**
@@ -464,7 +490,9 @@ class SolanaSwapData extends base_1.SwapData {
                 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(),
+                initializer: this.offererInitializer != null
+                    ? (this.offererInitializer ? this.offerer.toString() : this.claimer.toString())
+                    : (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(),
@@ -488,4 +516,20 @@ class SolanaSwapData extends base_1.SwapData {
     }
 }
 exports.SolanaSwapData = SolanaSwapData;
+class SolanaSwapDataV1 extends SolanaSwapData {
+    constructor(data) {
+        super(data);
+        if (this.version !== "v1")
+            throw new Error(`Invalid swap data version, expected v1, got ${this.version}`);
+    }
+}
+exports.SolanaSwapDataV1 = SolanaSwapDataV1;
+class SolanaSwapDataV2 extends SolanaSwapData {
+    constructor(data) {
+        super(data);
+        if (this.version !== "v2")
+            throw new Error(`Invalid swap data version, expected v2, got ${this.version}`);
+    }
+}
+exports.SolanaSwapDataV2 = SolanaSwapDataV2;
 base_1.SwapData.deserializers["sol"] = SolanaSwapData;

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

@@ -1,10 +1,11 @@
 import { SolanaSwapProgram } from "./SolanaSwapProgram";
 import { Program } from "@coral-xyz/anchor";
-import { SwapProgram } from "./programTypes";
+import { SwapProgram } from "./v1/programTypes";
 import { SolanaProgramModule } from "../program/SolanaProgramModule";
 import { SolanaChainInterface } from "../chain/SolanaChainInterface";
-export declare class SolanaSwapModule extends SolanaProgramModule<SwapProgram> {
+import { SwapProgramV2 } from "./v2/programTypes";
+export declare class SolanaSwapModule extends SolanaProgramModule<SwapProgram | SwapProgramV2> {
     protected readonly program: SolanaSwapProgram;
-    protected readonly swapProgram: Program<SwapProgram>;
+    protected readonly swapProgram: Program<SwapProgram | SwapProgramV2>;
     constructor(chainInterface: SolanaChainInterface, program: SolanaSwapProgram);
 }

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

@@ -1,11 +1,12 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { SolanaSwapData } from "./SolanaSwapData";
+import { Program } from "@coral-xyz/anchor";
 import { PublicKey } from "@solana/web3.js";
 import { SolanaBtcRelay } from "../btcrelay/SolanaBtcRelay";
-import { IStorageManager, SwapContract, ChainSwapType, IntermediaryReputationType, TransactionConfirmationOptions, SignatureData, RelaySynchronizer, SwapCommitState, SwapCommitStateType } from "@atomiqlabs/base";
+import { IStorageManager, SwapContract, ChainSwapType, IntermediaryReputationType, TransactionConfirmationOptions, SignatureData, RelaySynchronizer, SwapCommitState, SwapCommitStateType, BitcoinNetwork } from "@atomiqlabs/base";
 import { SolanaBtcStoredHeader } from "../btcrelay/headers/SolanaBtcStoredHeader";
-import { SwapProgram } from "./programTypes";
+import { SwapProgram } from "./v1/programTypes";
 import { SolanaChainInterface } from "../chain/SolanaChainInterface";
 import { SolanaProgramBase } from "../program/SolanaProgramBase";
 import { SolanaTx } from "../chain/modules/SolanaTransactions";
@@ -13,16 +14,21 @@ import { SolanaPreFetchData, SolanaPreFetchVerification } from "./modules/SwapIn
 import { SolanaDataAccount, StoredDataAccount } from "./modules/SolanaDataAccount";
 import { Buffer } from "buffer";
 import { SolanaSigner } from "../wallet/SolanaSigner";
+import { SwapProgramV2 } from "./v2/programTypes";
+export declare function isSwapProgramV1(obj: any): obj is Program<SwapProgram>;
+export declare function isSwapProgramV2(obj: any): obj is Program<SwapProgramV2>;
 /**
  * Solana swap (escrow manager) program representation handling PrTLC (on-chain) and HTLC (lightning) based swaps.
  *
  * @category Swaps
  */
-export declare class SolanaSwapProgram extends SolanaProgramBase<SwapProgram> implements SwapContract<SolanaSwapData, SolanaTx, SolanaPreFetchData, SolanaPreFetchVerification, SolanaSigner, "SOLANA"> {
+export declare class SolanaSwapProgram<Version extends "v1" | "v2" = "v1" | "v2"> extends SolanaProgramBase<SwapProgram | SwapProgramV2> implements SwapContract<SolanaSwapData, SolanaTx, SolanaPreFetchData, SolanaPreFetchVerification, SolanaSigner, "SOLANA"> {
     /**
      * Rent-exempt amount (lamports) for escrow state accounts.
      */
-    readonly ESCROW_STATE_RENT_EXEMPT = 2658720;
+    readonly ESCROW_STATE_RENT_EXEMPT: number;
+    readonly version: Version;
+    readonly supportsInitWithoutClaimer: Version extends "v1" ? false : true;
     /**
      * PDA of the swap vault authority.
      * @internal
@@ -97,7 +103,7 @@ export declare class SolanaSwapProgram extends SolanaProgramBase<SwapProgram> im
      * @internal
      */
     readonly _DataAccount: SolanaDataAccount;
-    constructor(chainInterface: SolanaChainInterface, btcRelay: SolanaBtcRelay<any>, storage: IStorageManager<StoredDataAccount>, programAddress?: string);
+    constructor(chainInterface: SolanaChainInterface, btcRelay: SolanaBtcRelay<any>, storage: IStorageManager<StoredDataAccount>, programAddress?: string, bitcoinNetwork?: BitcoinNetwork, version?: Version);
     /**
      * @inheritDoc
      */
@@ -168,7 +174,7 @@ export declare class SolanaSwapProgram extends SolanaProgramBase<SwapProgram> im
     /**
      * @inheritDoc
      */
-    isExpired(signer: string, data: SolanaSwapData): Promise<boolean>;
+    isExpired(signer: string, data: SolanaSwapData, refundSide?: boolean): Promise<boolean>;
     /**
      * @inheritDoc
      */

package/dist/solana/swaps/SolanaSwapProgram.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolanaSwapProgram = void 0;
+exports.SolanaSwapProgram = exports.isSwapProgramV2 = exports.isSwapProgramV1 = void 0;
 const SolanaSwapData_1 = require("./SolanaSwapData");
 const web3_js_1 = require("@solana/web3.js");
 const sha2_1 = require("@noble/hashes/sha2");
-const programIdl = require("./programIdl.json");
+const programIdlV1 = require("./v1/programIdl.json");
+const programIdlV2 = require("./v2/programIdl.json");
 const base_1 = require("@atomiqlabs/base");
 const spl_token_1 = require("@solana/spl-token");
 const SolanaProgramBase_1 = require("../program/SolanaProgramBase");
@@ -17,6 +18,15 @@ const buffer_1 = require("buffer");
 const Utils_1 = require("../../utils/Utils");
 const SolanaTokens_1 = require("../chain/modules/SolanaTokens");
 const BN = require("bn.js");
+const SolanaChains_1 = require("../SolanaChains");
+function isSwapProgramV1(obj) {
+    return obj.idl.version === "0.1.0";
+}
+exports.isSwapProgramV1 = isSwapProgramV1;
+function isSwapProgramV2(obj) {
+    return obj.idl.version === "0.2.0";
+}
+exports.isSwapProgramV2 = isSwapProgramV2;
 function toPublicKeyOrNull(str) {
     return str == null ? undefined : new web3_js_1.PublicKey(str);
 }
@@ -27,15 +37,13 @@ const MAX_PARALLEL_COMMIT_STATUS_CHECKS = 5;
  * @category Swaps
  */
 class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
-    constructor(chainInterface, btcRelay, storage, programAddress) {
-        super(chainInterface, programIdl, programAddress);
-        ////////////////////////
-        //// Constants
-        /**
-         * Rent-exempt amount (lamports) for escrow state accounts.
-         */
-        this.ESCROW_STATE_RENT_EXEMPT = 2658720;
-        this._SwapVaultAuthority = SolanaSwapProgram._SwapVaultAuthority(this.program.programId);
+    constructor(chainInterface, btcRelay, storage, programAddress, bitcoinNetwork, version) {
+        version ?? (version = "v1");
+        if (bitcoinNetwork != null && programAddress == null) {
+            programAddress = SolanaChains_1.SolanaChains[bitcoinNetwork]?.addresses[version ?? "v1"]?.swapContract;
+        }
+        super(chainInterface, version === "v1" ? programIdlV1 : programIdlV2, programAddress);
+        this._SwapVaultAuthority = SolanaSwapProgram._SwapVaultAuthority(this.program.programId); // Only necessary for V1 program
         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);
@@ -69,7 +77,10 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
          * Authorization grace period in seconds.
          * @internal
          */
-        this._authGracePeriod = 5 * 60;
+        this._authGracePeriod = 30;
+        this.version = version;
+        this.ESCROW_STATE_RENT_EXEMPT = this.version === "v1" ? 2658720 : 2665680;
+        this.supportsInitWithoutClaimer = (this.version !== "v1");
         this.Init = new SwapInit_1.SwapInit(chainInterface, this);
         this.Refund = new SwapRefund_1.SwapRefund(chainInterface, this);
         this.Claim = new SwapClaim_1.SwapClaim(chainInterface, this, btcRelay);
@@ -118,7 +129,7 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
      * @inheritDoc
      */
     isValidInitAuthorization(signer, swapData, sig, feeRate, preFetchedData) {
-        return this.Init.isSignatureValid(signer, swapData, sig.timeout, sig.prefix, sig.signature, feeRate, preFetchedData);
+        return this.Init.isSignatureValid(new web3_js_1.PublicKey(signer), swapData, sig.timeout, sig.prefix, sig.signature, feeRate, preFetchedData);
     }
     /**
      * @inheritDoc
@@ -181,22 +192,24 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
     /**
      * @inheritDoc
      */
-    isExpired(signer, data) {
+    isExpired(signer, data, refundSide) {
         let currentTimestamp = new BN(Math.floor(Date.now() / 1000));
-        if (data.isClaimer(signer))
+        if (data.isClaimer(signer) && !refundSide) {
             currentTimestamp = currentTimestamp.add(new BN(this.claimGracePeriod));
-        if (data.isOfferer(signer))
+        }
+        else {
             currentTimestamp = currentTimestamp.sub(new BN(this.refundGracePeriod));
+        }
         return Promise.resolve(data.expiry.lt(currentTimestamp));
     }
     /**
      * @inheritDoc
      */
     async isRequestRefundable(signer, data) {
-        //Swap can only be refunded by the offerer
-        if (!data.isOfferer(signer))
+        //V1 Swap can only be refunded by the offerer
+        if (isSwapProgramV1(this.program) && !data.isOfferer(signer))
             return false;
-        if (!(await this.isExpired(signer, data)))
+        if (!(await this.isExpired(signer, data, true)))
             return false;
         return await this.isCommited(data);
     }
@@ -235,11 +248,26 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
             this.program.account.escrowState.fetchNullable(escrowStateKey),
             this.isExpired(signer, data)
         ]);
+        const getInitTxId = (0, Utils_1.onceAsync)(async () => {
+            const txId = await this._Events.findInEvents(escrowStateKey, async (event, tx) => {
+                if (event.name === "InitializeEvent") {
+                    const paymentHash = buffer_1.Buffer.from(event.data.hash).toString("hex");
+                    if (paymentHash !== data.paymentHash)
+                        return null;
+                    if (!event.data.sequence.eq(data.sequence))
+                        return null;
+                    return tx.transaction.signatures[0];
+                }
+            });
+            if (txId == null)
+                throw new Error("Initialize event not found!");
+            return txId;
+        });
         if (escrowState != null) {
             if (data.correctPDA(escrowState)) {
                 if (data.isOfferer(signer) && isExpired)
-                    return { type: base_1.SwapCommitStateType.REFUNDABLE };
-                return { type: base_1.SwapCommitStateType.COMMITED };
+                    return { type: base_1.SwapCommitStateType.REFUNDABLE, getInitTxId };
+                return { type: base_1.SwapCommitStateType.COMMITED, getInitTxId };
             }
             if (data.isOfferer(signer) && isExpired)
                 return { type: base_1.SwapCommitStateType.EXPIRED };
@@ -255,6 +283,7 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
                     return null;
                 return {
                     type: base_1.SwapCommitStateType.PAID,
+                    getInitTxId,
                     getClaimTxId: () => Promise.resolve(tx.transaction.signatures[0]),
                     getClaimResult: () => Promise.resolve(buffer_1.Buffer.from(event.data.secret).toString("hex")),
                     getTxBlock: () => Promise.resolve({
@@ -271,6 +300,7 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
                     return null;
                 return {
                     type: isExpired ? base_1.SwapCommitStateType.EXPIRED : base_1.SwapCommitStateType.NOT_COMMITED,
+                    getInitTxId,
                     getRefundTxId: () => Promise.resolve(tx.transaction.signatures[0]),
                     getTxBlock: () => Promise.resolve({
                         blockHeight: tx.slot,
@@ -342,7 +372,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(this.program.programId, account);
+        return SolanaSwapData_1.SolanaSwapData.fromEscrowState(this.program.programId, this.version, account);
     }
     /**
      * @inheritDoc
@@ -377,7 +407,7 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
                     continue;
                 }
                 swapsOpened[escrowHash] = {
-                    data: SolanaSwapData_1.SolanaSwapData.fromInstruction(this.program.programId, initIx, txoHash),
+                    data: SolanaSwapData_1.SolanaSwapData.fromInstruction(this.program.programId, this.version, initIx, txoHash),
                     getInitTxId: () => Promise.resolve(txSignature),
                     getTxBlock: () => Promise.resolve({
                         blockHeight: tx.slot,
@@ -392,6 +422,7 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
                     init: foundSwapData,
                     state: {
                         type: base_1.SwapCommitStateType.PAID,
+                        getInitTxId: foundSwapData?.getInitTxId,
                         getClaimTxId: () => Promise.resolve(txSignature),
                         getClaimResult: () => Promise.resolve(buffer_1.Buffer.from(event.data.secret).toString("hex")),
                         getTxBlock: () => Promise.resolve({
@@ -409,6 +440,7 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
                     init: foundSwapData,
                     state: {
                         type: isExpired ? base_1.SwapCommitStateType.EXPIRED : base_1.SwapCommitStateType.NOT_COMMITED,
+                        getInitTxId: foundSwapData?.getInitTxId,
                         getRefundTxId: () => Promise.resolve(txSignature),
                         getTxBlock: () => Promise.resolve({
                             blockHeight: tx.slot,
@@ -426,8 +458,8 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
             resultingSwaps[escrowHash] = {
                 init: foundSwapData,
                 state: foundSwapData.data.isOfferer(signer) && isExpired
-                    ? { type: base_1.SwapCommitStateType.REFUNDABLE }
-                    : { type: base_1.SwapCommitStateType.COMMITED }
+                    ? { type: base_1.SwapCommitStateType.REFUNDABLE, getInitTxId: foundSwapData.getInitTxId }
+                    : { type: base_1.SwapCommitStateType.COMMITED, getInitTxId: foundSwapData.getInitTxId }
             };
         }
         return {
@@ -451,6 +483,7 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
         const { paymentHash, nonce, confirmations } = (0, Utils_1.fromClaimHash)(claimHash);
         const swapData = new SolanaSwapData_1.SolanaSwapData({
             programId: this.program.programId,
+            version: this.version,
             offerer: offererKey,
             claimer: claimerKey,
             token: tokenAddr,
@@ -525,31 +558,23 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
      * @inheritDoc
      */
     txsRefund(signer, swapData, check, initAta, feeRate) {
-        if (!swapData.isOfferer(signer))
-            throw new Error("Only offerer can refund on Solana");
-        return this.Refund.txsRefund(swapData, check, initAta, feeRate);
+        return this.Refund.txsRefund(new web3_js_1.PublicKey(signer), swapData, check, initAta, feeRate);
     }
     /**
      * @inheritDoc
      */
     txsRefundWithAuthorization(signer, swapData, sig, check, initAta, feeRate) {
-        if (!swapData.isOfferer(signer))
-            throw new Error("Only offerer can refund on Solana");
-        return this.Refund.txsRefundWithAuthorization(swapData, sig.timeout, sig.prefix, sig.signature, check, initAta, feeRate);
+        return this.Refund.txsRefundWithAuthorization(new web3_js_1.PublicKey(signer), swapData, sig.timeout, sig.prefix, sig.signature, check, initAta, feeRate);
     }
     /**
      * @inheritDoc
      */
     txsInit(sender, swapData, sig, skipChecks, feeRate) {
         if (swapData.isPayIn()) {
-            if (!swapData.isOfferer(sender))
-                throw new Error("Only offerer can create payIn=true swap");
-            return this.Init.txsInitPayIn(swapData, sig.timeout, sig.prefix, sig.signature, skipChecks, feeRate);
+            return this.Init.txsInitPayIn(new web3_js_1.PublicKey(sender), swapData, sig.timeout, sig.prefix, sig.signature, skipChecks, feeRate);
         }
         else {
-            if (!swapData.isClaimer(sender))
-                throw new Error("Only claimer can create payIn=false swap");
-            return this.Init.txsInit(swapData, sig.timeout, sig.prefix, sig.signature, skipChecks, feeRate);
+            return this.Init.txsInit(new web3_js_1.PublicKey(sender), swapData, sig.timeout, sig.prefix, sig.signature, skipChecks, feeRate);
         }
     }
     /**
@@ -605,14 +630,6 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
      * @inheritDoc
      */
     async init(signer, swapData, signature, skipChecks, txOptions) {
-        if (swapData.isPayIn()) {
-            if (!signer.getPublicKey().equals(swapData.offerer))
-                throw new Error("Invalid signer provided!");
-        }
-        else {
-            if (!signer.getPublicKey().equals(swapData.claimer))
-                throw new Error("Invalid signer provided!");
-        }
         const result = await this.txsInit(signer.getAddress(), swapData, signature, skipChecks, txOptions?.feeRate);
         const signatures = await this._Chain.sendAndConfirm(signer, result, txOptions?.waitForConfirmation, txOptions?.abortSignal);
         return signatures[signatures.length - 1];
@@ -624,7 +641,16 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
         if (!signer.getPublicKey().equals(swapData.claimer))
             throw new Error("Invalid signer provided!");
         const txsCommit = await this.txsInit(signer.getAddress(), swapData, signature, skipChecks, txOptions?.feeRate);
-        const txsClaim = await this.Claim.txsClaimWithSecret(signer.getPublicKey(), swapData, secret, true, false, txOptions?.feeRate, true);
+        let txsClaim;
+        if (isSwapProgramV1(this.program)) {
+            // In V1 the initialize instruction has to contain the ATA initialization, hence we can skip checking it in claim
+            txsClaim = await this.Claim.txsClaimWithSecret(signer.getPublicKey(), swapData, secret, true, false, txOptions?.feeRate, true);
+        }
+        else {
+            // In V2 the initialize instruction doesn't necessarily contain the ATA initialization, hence the claim instruction needs to
+            //  check and initialize the ATA if needed
+            txsClaim = await this.Claim.txsClaimWithSecret(signer.getPublicKey(), swapData, secret, true, true, txOptions?.feeRate, false);
+        }
         const signatures = await this._Chain.sendAndConfirm(signer, txsCommit.concat(txsClaim), txOptions?.waitForConfirmation, txOptions?.abortSignal);
         return [signatures[txsCommit.length - 1], signatures[signatures.length - 1]];
     }
@@ -725,7 +751,7 @@ exports.SolanaSwapProgram = SolanaSwapProgram;
  * PDA of the swap vault authority.
  * @internal
  */
-SolanaSwapProgram._SwapVaultAuthority = SolanaProgramBase_1.SolanaProgramBase._pda("authority");
+SolanaSwapProgram._SwapVaultAuthority = SolanaProgramBase_1.SolanaProgramBase._pda("authority"); // Only necessary for V1 program
 /**
  * PDA helper for global token vault accounts.
  * @internal

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

@@ -14,6 +14,8 @@ class SwapClaim extends SolanaSwapModule_1.SolanaSwapModule {
         const isDataKey = typeof (secretOrDataKey) !== "string";
         const accounts = {
             signer,
+            offerer: swapData.offerer,
+            claimer: swapData.claimer,
             initializer: swapData.isPayIn() ? swapData.offerer : swapData.claimer,
             escrowState: this.program._SwapEscrowState(Buffer.from(swapData.paymentHash, "hex")),
             ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,

package/dist/solana/swaps/modules/SwapInit.d.ts

@@ -28,6 +28,7 @@ export declare class SwapInit extends SolanaSwapModule {
     /**
      * bare Init action based on the data passed in swapData
      *
+     * @param sender
      * @param swapData
      * @param timeout
      * @private
@@ -36,6 +37,7 @@ export declare class SwapInit extends SolanaSwapModule {
     /**
      * InitPayIn action which includes SOL to WSOL wrapping if indicated by the fee rate
      *
+     * @param signer
      * @param swapData
      * @param timeout
      * @param feeRate
@@ -46,6 +48,7 @@ export declare class SwapInit extends SolanaSwapModule {
      * InitNotPayIn action with additional createAssociatedTokenAccountIdempotentInstruction instruction, such that
      *  a recipient ATA is created if it doesn't exist
      *
+     * @param sender
      * @param swapData
      * @param timeout
      * @private
@@ -135,7 +138,7 @@ export declare class SwapInit extends SolanaSwapModule {
      * @param preFetchedData
      * @public
      */
-    isSignatureValid(sender: string, swapData: SolanaSwapData, timeout: string, prefix: string, signature: string, feeRate?: string, preFetchedData?: SolanaPreFetchVerification): Promise<Buffer>;
+    isSignatureValid(sender: PublicKey, swapData: SolanaSwapData, timeout: string, prefix: string, signature: string | null, feeRate?: string, preFetchedData?: SolanaPreFetchVerification): Promise<Buffer>;
     /**
      * Gets expiry of the provided signature data, this is a minimum of slot expiry & swap signature expiry
      *
@@ -144,7 +147,7 @@ export declare class SwapInit extends SolanaSwapModule {
      * @param preFetchedData
      * @public
      */
-    getSignatureExpiry(timeout: string, signature: string, preFetchedData?: SolanaPreFetchVerification): Promise<number>;
+    getSignatureExpiry(timeout: string, signature: string | null, preFetchedData?: SolanaPreFetchVerification): Promise<number>;
     /**
      * Checks whether signature is expired for good (uses "finalized" slot)
      *
@@ -152,12 +155,13 @@ export declare class SwapInit extends SolanaSwapModule {
      * @param timeout
      * @public
      */
-    isSignatureExpired(signature: string, timeout: string): Promise<boolean>;
+    isSignatureExpired(signature: string | null, timeout: string): Promise<boolean>;
     /**
      * Creates init transaction (InitPayIn) with a valid signature from an LP, also adds a SOL to WSOL wrapping ix to
      *  the init transaction (if indicated by the fee rate) or adds the wrapping in a separate transaction (if no
      *  indication in the fee rate)
      *
+     * @param sender
      * @param swapData swap to initialize
      * @param timeout init signature timeout
      * @param prefix init signature prefix
@@ -165,10 +169,11 @@ export declare class SwapInit extends SolanaSwapModule {
      * @param skipChecks whether to skip signature validity checks
      * @param feeRate fee rate to use for the transaction
      */
-    txsInitPayIn(swapData: SolanaSwapData, timeout: string, prefix: string, signature: string, skipChecks?: boolean, feeRate?: string): Promise<SolanaTx[]>;
+    txsInitPayIn(sender: PublicKey, swapData: SolanaSwapData, timeout: string, prefix: string, signature: string, skipChecks?: boolean, feeRate?: string): Promise<SolanaTx[]>;
     /**
      * Creates init transactions (InitNotPayIn) with a valid signature from an intermediary
      *
+     * @param sender
      * @param swapData swap to initialize
      * @param timeout init signature timeout
      * @param prefix init signature prefix
@@ -176,7 +181,7 @@ export declare class SwapInit extends SolanaSwapModule {
      * @param skipChecks whether to skip signature validity checks
      * @param feeRate fee rate to use for the transaction
      */
-    txsInit(swapData: SolanaSwapData, timeout: string, prefix: string, signature: string, skipChecks?: boolean, feeRate?: string): Promise<SolanaTx[]>;
+    txsInit(sender: PublicKey, swapData: SolanaSwapData, timeout: string, prefix: string, signature: string, skipChecks?: boolean, feeRate?: string): Promise<SolanaTx[]>;
     /**
      * Returns the fee rate to be used for a specific init transaction, also adding indication whether the WSOL ATA
      *  should be initialized in the init transaction and/or current balance in the WSOL ATA