@atomiqlabs/chain-solana 7.3.8 → 8.0.0-beta.0

package/dist/solana/swaps/SolanaSwapProgram.js

@@ -1,17 +1,7 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolanaSwapProgram = void 0;
 const SolanaSwapData_1 = require("./SolanaSwapData");
-const BN = require("bn.js");
 const web3_js_1 = require("@solana/web3.js");
 const createHash = require("create-hash");
 const programIdl = require("./programIdl.json");
@@ -27,6 +17,9 @@ const SolanaLpVault_1 = require("./modules/SolanaLpVault");
 const buffer_1 = require("buffer");
 const SolanaSigner_1 = require("../wallet/SolanaSigner");
 const SolanaKeypairWallet_1 = require("../wallet/SolanaKeypairWallet");
+const Utils_1 = require("../../utils/Utils");
+const SolanaTokens_1 = require("../base/modules/SolanaTokens");
+const BN = require("bn.js");
 function toPublicKeyOrNull(str) {
     return str == null ? null : new web3_js_1.PublicKey(str);
 }
@@ -57,10 +50,8 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
         this.DataAccount = new SolanaDataAccount_1.SolanaDataAccount(this, storage);
         this.LpVault = new SolanaLpVault_1.SolanaLpVault(this);
     }
-    start() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.DataAccount.init();
-        });
+    async start() {
+        await this.DataAccount.init();
     }
     getClaimableDeposits(signer) {
         return this.DataAccount.getDataAccountsInfo(new web3_js_1.PublicKey(signer));
@@ -108,26 +99,24 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
      * @param signer
      * @param data
      */
-    isClaimable(signer, data) {
+    async isClaimable(signer, data) {
         if (!data.isClaimer(signer))
-            return Promise.resolve(false);
-        if (this.isExpired(signer, data))
-            return Promise.resolve(false);
-        return this.isCommited(data);
+            return false;
+        if (await this.isExpired(signer, data))
+            return false;
+        return await this.isCommited(data);
     }
     /**
      * Checks whether a swap is commited, i.e. the swap still exists on-chain and was not claimed nor refunded
      *
      * @param swapData
      */
-    isCommited(swapData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const paymentHash = buffer_1.Buffer.from(swapData.paymentHash, "hex");
-            const account = yield this.program.account.escrowState.fetchNullable(this.SwapEscrowState(paymentHash));
-            if (account == null)
-                return false;
-            return swapData.correctPDA(account);
-        });
+    async isCommited(swapData) {
+        const paymentHash = buffer_1.Buffer.from(swapData.paymentHash, "hex");
+        const account = await this.program.account.escrowState.fetchNullable(this.SwapEscrowState(paymentHash));
+        if (account == null)
+            return false;
+        return swapData.correctPDA(account);
     }
     /**
      * Checks whether the swap is expired, takes into consideration possible on-chain time skew, therefore for claimer
@@ -142,7 +131,7 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
             currentTimestamp = currentTimestamp.sub(new BN(this.refundGracePeriod));
         if (data.isOfferer(signer))
             currentTimestamp = currentTimestamp.add(new BN(this.claimGracePeriod));
-        return data.expiry.lt(currentTimestamp);
+        return Promise.resolve(data.expiry.lt(currentTimestamp));
     }
     /**
      * Checks if the swap is refundable by us, checks if we are offerer, if the swap is already expired & if the swap
@@ -151,27 +140,36 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
      * @param signer
      * @param data
      */
-    isRequestRefundable(signer, data) {
+    async isRequestRefundable(signer, data) {
         //Swap can only be refunded by the offerer
         if (!data.isOfferer(signer))
-            return Promise.resolve(false);
-        if (!this.isExpired(signer, data))
-            return Promise.resolve(false);
-        return this.isCommited(data);
+            return false;
+        if (!(await this.isExpired(signer, data)))
+            return false;
+        return await this.isCommited(data);
     }
     /**
      * Get the swap payment hash to be used for an on-chain swap, this just uses a sha256 hash of the values
      *
      * @param outputScript output script required to claim the swap
      * @param amount sats sent required to claim the swap
+     * @param confirmations
      * @param nonce swap nonce uniquely identifying the transaction to prevent replay attacks
      */
-    getHashForOnchain(outputScript, amount, nonce) {
-        return createHash("sha256").update(buffer_1.Buffer.concat([
-            buffer_1.Buffer.from(nonce.toArray("le", 8)),
-            buffer_1.Buffer.from(amount.toArray("le", 8)),
+    getHashForOnchain(outputScript, amount, confirmations, nonce) {
+        nonce ?? (nonce = 0n);
+        const paymentHash = createHash("sha256").update(buffer_1.Buffer.concat([
+            base_1.BigIntBufferUtils.toBuffer(nonce, "le", 8),
+            base_1.BigIntBufferUtils.toBuffer(amount, "le", 8),
             outputScript
-        ])).digest();
+        ])).digest().toString("hex");
+        return buffer_1.Buffer.from((0, Utils_1.toClaimHash)(paymentHash, nonce, confirmations), "hex");
+    }
+    getHashForHtlc(swapHash) {
+        return buffer_1.Buffer.from((0, Utils_1.toClaimHash)(swapHash.toString("hex"), 0n, 0), "hex");
+    }
+    getHashForTxId(txId, confirmations) {
+        return buffer_1.Buffer.from((0, Utils_1.toClaimHash)(buffer_1.Buffer.from(txId, "hex").reverse().toString("hex"), 0n, confirmations), "hex");
     }
     ////////////////////////////////////////////
     //// Swap data getters
@@ -182,115 +180,119 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
      * @param signer
      * @param data
      */
-    getCommitStatus(signer, data) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const escrowStateKey = this.SwapEscrowState(buffer_1.Buffer.from(data.paymentHash, "hex"));
-            const escrowState = yield this.program.account.escrowState.fetchNullable(escrowStateKey);
-            if (escrowState != null) {
-                if (data.correctPDA(escrowState)) {
-                    if (data.isOfferer(signer) && this.isExpired(signer, data))
-                        return base_1.SwapCommitStatus.REFUNDABLE;
-                    return base_1.SwapCommitStatus.COMMITED;
-                }
-                if (data.isOfferer(signer) && this.isExpired(signer, data))
-                    return base_1.SwapCommitStatus.EXPIRED;
-                return base_1.SwapCommitStatus.NOT_COMMITED;
+    async getCommitStatus(signer, data) {
+        const escrowStateKey = this.SwapEscrowState(buffer_1.Buffer.from(data.paymentHash, "hex"));
+        const [escrowState, isExpired] = await Promise.all([
+            this.program.account.escrowState.fetchNullable(escrowStateKey),
+            this.isExpired(signer, data)
+        ]);
+        if (escrowState != null) {
+            if (data.correctPDA(escrowState)) {
+                if (data.isOfferer(signer) && isExpired)
+                    return base_1.SwapCommitStatus.REFUNDABLE;
+                return base_1.SwapCommitStatus.COMMITED;
             }
-            //Check if paid or what
-            const status = yield this.Events.findInEvents(escrowStateKey, (event) => __awaiter(this, void 0, void 0, function* () {
-                if (event.name === "ClaimEvent") {
-                    if (!event.data.sequence.eq(data.sequence))
-                        return null;
-                    return base_1.SwapCommitStatus.PAID;
-                }
-                if (event.name === "RefundEvent") {
-                    if (!event.data.sequence.eq(data.sequence))
-                        return null;
-                    if (this.isExpired(signer, data))
-                        return base_1.SwapCommitStatus.EXPIRED;
-                    return base_1.SwapCommitStatus.NOT_COMMITED;
-                }
-            }));
-            if (status != null)
-                return status;
-            if (this.isExpired(signer, data)) {
+            if (data.isOfferer(signer) && isExpired)
                 return base_1.SwapCommitStatus.EXPIRED;
-            }
             return base_1.SwapCommitStatus.NOT_COMMITED;
+        }
+        //Check if paid or what
+        const status = await this.Events.findInEvents(escrowStateKey, async (event) => {
+            if (event.name === "ClaimEvent") {
+                if (!event.data.sequence.eq(data.sequence))
+                    return null;
+                return base_1.SwapCommitStatus.PAID;
+            }
+            if (event.name === "RefundEvent") {
+                if (!event.data.sequence.eq(data.sequence))
+                    return null;
+                if (isExpired)
+                    return base_1.SwapCommitStatus.EXPIRED;
+                return base_1.SwapCommitStatus.NOT_COMMITED;
+            }
         });
+        if (status != null)
+            return status;
+        if (isExpired) {
+            return base_1.SwapCommitStatus.EXPIRED;
+        }
+        return base_1.SwapCommitStatus.NOT_COMMITED;
     }
     /**
      * Checks the status of the specific payment hash
      *
-     * @param paymentHash
+     * @param claimHash
      */
-    getPaymentHashStatus(paymentHash) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const escrowStateKey = this.SwapEscrowState(buffer_1.Buffer.from(paymentHash, "hex"));
-            const abortController = new AbortController();
-            //Start fetching events before checking escrow PDA, this call is used when quoting, so saving 100ms here helps a lot!
-            const eventsPromise = this.Events.findInEvents(escrowStateKey, (event) => __awaiter(this, void 0, void 0, function* () {
-                if (event.name === "ClaimEvent")
-                    return base_1.SwapCommitStatus.PAID;
-                if (event.name === "RefundEvent")
-                    return base_1.SwapCommitStatus.NOT_COMMITED;
-            }), abortController.signal).catch(e => {
-                abortController.abort(e);
-                return null;
-            });
-            const escrowState = yield this.program.account.escrowState.fetchNullable(escrowStateKey);
-            abortController.signal.throwIfAborted();
-            if (escrowState != null) {
-                abortController.abort();
-                return base_1.SwapCommitStatus.COMMITED;
-            }
-            //Check if paid or what
-            const eventsStatus = yield eventsPromise;
-            abortController.signal.throwIfAborted();
-            if (eventsStatus != null)
-                return eventsStatus;
-            return base_1.SwapCommitStatus.NOT_COMMITED;
+    async getClaimHashStatus(claimHash) {
+        const { paymentHash } = (0, Utils_1.fromClaimHash)(claimHash);
+        const escrowStateKey = this.SwapEscrowState(buffer_1.Buffer.from(paymentHash, "hex"));
+        const abortController = new AbortController();
+        //Start fetching events before checking escrow PDA, this call is used when quoting, so saving 100ms here helps a lot!
+        const eventsPromise = this.Events.findInEvents(escrowStateKey, async (event) => {
+            if (event.name === "ClaimEvent")
+                return base_1.SwapCommitStatus.PAID;
+            if (event.name === "RefundEvent")
+                return base_1.SwapCommitStatus.NOT_COMMITED;
+        }, abortController.signal).catch(e => {
+            abortController.abort(e);
+            return null;
         });
+        const escrowState = await this.program.account.escrowState.fetchNullable(escrowStateKey);
+        abortController.signal.throwIfAborted();
+        if (escrowState != null) {
+            abortController.abort();
+            return base_1.SwapCommitStatus.COMMITED;
+        }
+        //Check if paid or what
+        const eventsStatus = await eventsPromise;
+        abortController.signal.throwIfAborted();
+        if (eventsStatus != null)
+            return eventsStatus;
+        return base_1.SwapCommitStatus.NOT_COMMITED;
     }
     /**
      * Returns the data committed for a specific payment hash, or null if no data is currently commited for
      *  the specific swap
      *
-     * @param paymentHashHex
+     * @param claimHashHex
      */
-    getCommitedData(paymentHashHex) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const paymentHash = buffer_1.Buffer.from(paymentHashHex, "hex");
-            const account = yield this.program.account.escrowState.fetchNullable(this.SwapEscrowState(paymentHash));
-            if (account == null)
-                return null;
-            return SolanaSwapData_1.SolanaSwapData.fromEscrowState(account);
-        });
+    async getCommitedData(claimHashHex) {
+        const { paymentHash } = (0, Utils_1.fromClaimHash)(claimHashHex);
+        const paymentHashBuffer = buffer_1.Buffer.from(paymentHash, "hex");
+        const account = await this.program.account.escrowState.fetchNullable(this.SwapEscrowState(paymentHashBuffer));
+        if (account == null)
+            return null;
+        return SolanaSwapData_1.SolanaSwapData.fromEscrowState(account);
     }
     ////////////////////////////////////////////
     //// Swap data initializer
-    createSwapData(type, offerer, claimer, token, amount, paymentHash, sequence, expiry, escrowNonce, confirmations, payIn, payOut, securityDeposit, claimerBounty) {
+    createSwapData(type, offerer, claimer, token, amount, claimHash, sequence, expiry, payIn, payOut, securityDeposit, claimerBounty, depositToken) {
+        if (depositToken != null) {
+            if (!new web3_js_1.PublicKey(depositToken).equals(SolanaTokens_1.SolanaTokens.WSOL_ADDRESS))
+                throw new Error("Only SOL supported as deposit token!");
+        }
         const tokenAddr = new web3_js_1.PublicKey(token);
         const offererKey = offerer == null ? null : new web3_js_1.PublicKey(offerer);
         const claimerKey = claimer == null ? null : new web3_js_1.PublicKey(claimer);
-        return Promise.resolve(new SolanaSwapData_1.SolanaSwapData(offererKey, claimerKey, tokenAddr, amount, paymentHash, sequence, expiry, escrowNonce, confirmations, payOut, type == null ? null : SolanaSwapData_1.SolanaSwapData.typeToKind(type), payIn, offererKey == null ? null : payIn ? (0, spl_token_1.getAssociatedTokenAddressSync)(tokenAddr, offererKey) : web3_js_1.PublicKey.default, claimerKey == null ? null : payOut ? (0, spl_token_1.getAssociatedTokenAddressSync)(tokenAddr, claimerKey) : web3_js_1.PublicKey.default, securityDeposit, claimerBounty, null));
+        const { paymentHash, nonce, confirmations } = (0, Utils_1.fromClaimHash)(claimHash);
+        return Promise.resolve(new SolanaSwapData_1.SolanaSwapData(offererKey, claimerKey, tokenAddr, (0, Utils_1.toBN)(amount), paymentHash, (0, Utils_1.toBN)(sequence), (0, Utils_1.toBN)(expiry), nonce, confirmations, payOut, type == null ? null : SolanaSwapData_1.SolanaSwapData.typeToKind(type), payIn, offererKey == null ? null : payIn ? (0, spl_token_1.getAssociatedTokenAddressSync)(tokenAddr, offererKey) : web3_js_1.PublicKey.default, claimerKey == null ? null : payOut ? (0, spl_token_1.getAssociatedTokenAddressSync)(tokenAddr, claimerKey) : web3_js_1.PublicKey.default, (0, Utils_1.toBN)(securityDeposit), (0, Utils_1.toBN)(claimerBounty), null));
     }
     ////////////////////////////////////////////
     //// Utils
-    getBalance(signer, tokenAddress, inContract) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const token = new web3_js_1.PublicKey(tokenAddress);
-            const publicKey = new web3_js_1.PublicKey(signer);
-            if (inContract)
-                return yield this.getIntermediaryBalance(publicKey, token);
-            let { balance, ataExists } = yield this.Tokens.getTokenBalance(publicKey, token);
-            if (token.equals(this.Tokens.WSOL_ADDRESS)) {
-                const accountRentExemptCost = new BN(1000000);
-                balance = BN.max(balance.sub(accountRentExemptCost), new BN(0));
-            }
-            this.logger.debug("getBalance(): token balance, token: " + token.toBase58() + " balance: " + balance.toString(10));
-            return balance;
-        });
+    async getBalance(signer, tokenAddress, inContract) {
+        const token = new web3_js_1.PublicKey(tokenAddress);
+        const publicKey = new web3_js_1.PublicKey(signer);
+        if (inContract)
+            return await this.getIntermediaryBalance(publicKey, token);
+        let { balance } = await this.Tokens.getTokenBalance(publicKey, token);
+        if (token.equals(SolanaTokens_1.SolanaTokens.WSOL_ADDRESS)) {
+            const accountRentExemptCost = 1000000n;
+            balance = balance - accountRentExemptCost;
+            if (balance < 0n)
+                balance = 0n;
+        }
+        this.logger.debug("getBalance(): token balance, token: " + token.toBase58() + " balance: " + balance.toString(10));
+        return balance;
     }
     getIntermediaryData(address, token) {
         return this.LpVault.getIntermediaryData(new web3_js_1.PublicKey(address), new web3_js_1.PublicKey(token));
@@ -309,27 +311,31 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
     }
     ////////////////////////////////////////////
     //// Transaction initializers
-    txsClaimWithSecret(signer, swapData, secret, checkExpiry, initAta, feeRate, skipAtaCheck) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.Claim.txsClaimWithSecret(typeof (signer) === "string" ? new web3_js_1.PublicKey(signer) : signer.getPublicKey(), swapData, secret, checkExpiry, initAta, feeRate, skipAtaCheck);
-        });
+    async txsClaimWithSecret(signer, swapData, secret, checkExpiry, initAta, feeRate, skipAtaCheck) {
+        return this.Claim.txsClaimWithSecret(typeof (signer) === "string" ? new web3_js_1.PublicKey(signer) : signer.getPublicKey(), swapData, secret, checkExpiry, initAta, feeRate, skipAtaCheck);
     }
-    txsClaimWithTxData(signer, swapData, blockheight, tx, vout, commitedHeader, synchronizer, initAta, feeRate, storageAccHolder) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.Claim.txsClaimWithTxData(typeof (signer) === "string" ? new web3_js_1.PublicKey(signer) : signer, swapData, blockheight, tx, vout, commitedHeader, synchronizer, initAta, storageAccHolder, feeRate);
-        });
+    async txsClaimWithTxData(signer, swapData, tx, requiredConfirmations, vout, commitedHeader, synchronizer, initAta, feeRate, storageAccHolder) {
+        if (swapData.confirmations !== requiredConfirmations)
+            throw new Error("Invalid requiredConfirmations provided!");
+        return this.Claim.txsClaimWithTxData(typeof (signer) === "string" ? new web3_js_1.PublicKey(signer) : signer, swapData, tx, vout, commitedHeader, synchronizer, initAta, storageAccHolder, feeRate);
     }
-    txsRefund(swapData, check, initAta, feeRate) {
+    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);
     }
-    txsRefundWithAuthorization(swapData, { timeout, prefix, signature }, check, initAta, feeRate) {
+    txsRefundWithAuthorization(signer, swapData, { timeout, prefix, signature }, check, initAta, feeRate) {
+        if (!swapData.isOfferer(signer))
+            throw new Error("Only offerer can refund on Solana");
         return this.Refund.txsRefundWithAuthorization(swapData, timeout, prefix, signature, check, initAta, feeRate);
     }
-    txsInitPayIn(swapData, { timeout, prefix, signature }, skipChecks, feeRate) {
-        return this.Init.txsInitPayIn(swapData, timeout, prefix, signature, skipChecks, feeRate);
-    }
-    txsInit(swapData, { timeout, prefix, signature }, txoHash, skipChecks, feeRate) {
-        return this.Init.txsInit(swapData, timeout, prefix, signature, skipChecks, feeRate);
+    txsInit(swapData, { timeout, prefix, signature }, skipChecks, feeRate) {
+        if (swapData.isPayIn()) {
+            return this.Init.txsInitPayIn(swapData, timeout, prefix, signature, skipChecks, feeRate);
+        }
+        else {
+            return this.Init.txsInit(swapData, timeout, prefix, signature, skipChecks, feeRate);
+        }
     }
     txsWithdraw(signer, token, amount, feeRate) {
         return this.LpVault.txsWithdraw(new web3_js_1.PublicKey(signer), new web3_js_1.PublicKey(token), amount, feeRate);
@@ -342,92 +348,69 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
     }
     ////////////////////////////////////////////
     //// Executors
-    claimWithSecret(signer, swapData, secret, checkExpiry, initAta, txOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const result = yield this.Claim.txsClaimWithSecret(signer.getPublicKey(), swapData, secret, checkExpiry, initAta, txOptions === null || txOptions === void 0 ? void 0 : txOptions.feeRate);
-            const [signature] = yield this.Transactions.sendAndConfirm(signer, result, txOptions === null || txOptions === void 0 ? void 0 : txOptions.waitForConfirmation, txOptions === null || txOptions === void 0 ? void 0 : txOptions.abortSignal);
-            return signature;
-        });
-    }
-    claimWithTxData(signer, swapData, blockheight, tx, vout, commitedHeader, synchronizer, initAta, txOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const data = {
-                storageAcc: null
-            };
-            const txs = yield this.Claim.txsClaimWithTxData(signer, swapData, blockheight, tx, vout, commitedHeader, synchronizer, initAta, data, txOptions === null || txOptions === void 0 ? void 0 : txOptions.feeRate);
-            if (txs === null)
-                throw new Error("Btc relay not synchronized to required blockheight!");
-            //TODO: This doesn't return proper tx signature
-            const [signature] = yield this.Transactions.sendAndConfirm(signer, txs, txOptions === null || txOptions === void 0 ? void 0 : txOptions.waitForConfirmation, txOptions === null || txOptions === void 0 ? void 0 : txOptions.abortSignal);
-            yield this.DataAccount.removeDataAccount(data.storageAcc);
-            return signature;
-        });
-    }
-    refund(signer, swapData, check, initAta, txOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
+    async claimWithSecret(signer, swapData, secret, checkExpiry, initAta, txOptions) {
+        const result = await this.Claim.txsClaimWithSecret(signer.getPublicKey(), swapData, secret, checkExpiry, initAta, txOptions?.feeRate);
+        const [signature] = await this.Transactions.sendAndConfirm(signer, result, txOptions?.waitForConfirmation, txOptions?.abortSignal);
+        return signature;
+    }
+    async claimWithTxData(signer, swapData, tx, requiredConfirmations, vout, commitedHeader, synchronizer, initAta, txOptions) {
+        if (requiredConfirmations !== swapData.confirmations)
+            throw new Error("Invalid requiredConfirmations provided!");
+        const data = {
+            storageAcc: null
+        };
+        const txs = await this.Claim.txsClaimWithTxData(signer, swapData, tx, vout, commitedHeader, synchronizer, initAta, data, txOptions?.feeRate);
+        if (txs === null)
+            throw new Error("Btc relay not synchronized to required blockheight!");
+        //TODO: This doesn't return proper tx signature
+        const [signature] = await this.Transactions.sendAndConfirm(signer, txs, txOptions?.waitForConfirmation, txOptions?.abortSignal);
+        await this.DataAccount.removeDataAccount(data.storageAcc);
+        return signature;
+    }
+    async refund(signer, swapData, check, initAta, txOptions) {
+        let result = await this.txsRefund(signer.getAddress(), swapData, check, initAta, txOptions?.feeRate);
+        const [signature] = await this.Transactions.sendAndConfirm(signer, result, txOptions?.waitForConfirmation, txOptions?.abortSignal);
+        return signature;
+    }
+    async refundWithAuthorization(signer, swapData, signature, check, initAta, txOptions) {
+        let result = await this.txsRefundWithAuthorization(signer.getAddress(), swapData, signature, check, initAta, txOptions?.feeRate);
+        const [txSignature] = await this.Transactions.sendAndConfirm(signer, result, txOptions?.waitForConfirmation, txOptions?.abortSignal);
+        return txSignature;
+    }
+    async init(signer, swapData, signature, skipChecks, txOptions) {
+        if (swapData.isPayIn()) {
             if (!signer.getPublicKey().equals(swapData.offerer))
                 throw new Error("Invalid signer provided!");
-            let result = yield this.txsRefund(swapData, check, initAta, txOptions === null || txOptions === void 0 ? void 0 : txOptions.feeRate);
-            const [signature] = yield this.Transactions.sendAndConfirm(signer, result, txOptions === null || txOptions === void 0 ? void 0 : txOptions.waitForConfirmation, txOptions === null || txOptions === void 0 ? void 0 : txOptions.abortSignal);
-            return signature;
-        });
-    }
-    refundWithAuthorization(signer, swapData, signature, check, initAta, txOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!signer.getPublicKey().equals(swapData.offerer))
-                throw new Error("Invalid signer provided!");
-            let result = yield this.txsRefundWithAuthorization(swapData, signature, check, initAta, txOptions === null || txOptions === void 0 ? void 0 : txOptions.feeRate);
-            const [txSignature] = yield this.Transactions.sendAndConfirm(signer, result, txOptions === null || txOptions === void 0 ? void 0 : txOptions.waitForConfirmation, txOptions === null || txOptions === void 0 ? void 0 : txOptions.abortSignal);
-            return txSignature;
-        });
-    }
-    initPayIn(signer, swapData, signature, skipChecks, txOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!signer.getPublicKey().equals(swapData.offerer))
-                throw new Error("Invalid signer provided!");
-            let result = yield this.txsInitPayIn(swapData, signature, skipChecks, txOptions === null || txOptions === void 0 ? void 0 : txOptions.feeRate);
-            const signatures = yield this.Transactions.sendAndConfirm(signer, result, txOptions === null || txOptions === void 0 ? void 0 : txOptions.waitForConfirmation, txOptions === null || txOptions === void 0 ? void 0 : txOptions.abortSignal);
-            return signatures[signatures.length - 1];
-        });
-    }
-    init(signer, swapData, signature, txoHash, skipChecks, txOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!signer.getPublicKey().equals(swapData.claimer))
-                throw new Error("Invalid signer provided!");
-            let result = yield this.txsInit(swapData, signature, txoHash, skipChecks, txOptions === null || txOptions === void 0 ? void 0 : txOptions.feeRate);
-            const [txSignature] = yield this.Transactions.sendAndConfirm(signer, result, txOptions === null || txOptions === void 0 ? void 0 : txOptions.waitForConfirmation, txOptions === null || txOptions === void 0 ? void 0 : txOptions.abortSignal);
-            return txSignature;
-        });
-    }
-    initAndClaimWithSecret(signer, swapData, signature, secret, skipChecks, txOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
+        }
+        else {
             if (!signer.getPublicKey().equals(swapData.claimer))
                 throw new Error("Invalid signer provided!");
-            const txsCommit = yield this.txsInit(swapData, signature, null, skipChecks, txOptions === null || txOptions === void 0 ? void 0 : txOptions.feeRate);
-            const txsClaim = yield this.Claim.txsClaimWithSecret(signer.getPublicKey(), swapData, secret, true, false, txOptions === null || txOptions === void 0 ? void 0 : txOptions.feeRate, true);
-            return yield this.Transactions.sendAndConfirm(signer, txsCommit.concat(txsClaim), txOptions === null || txOptions === void 0 ? void 0 : txOptions.waitForConfirmation, txOptions === null || txOptions === void 0 ? void 0 : txOptions.abortSignal);
-        });
-    }
-    withdraw(signer, token, amount, txOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const txs = yield this.LpVault.txsWithdraw(signer.getPublicKey(), new web3_js_1.PublicKey(token), amount, txOptions === null || txOptions === void 0 ? void 0 : txOptions.feeRate);
-            const [txId] = yield this.Transactions.sendAndConfirm(signer, txs, txOptions === null || txOptions === void 0 ? void 0 : txOptions.waitForConfirmation, txOptions === null || txOptions === void 0 ? void 0 : txOptions.abortSignal, false);
-            return txId;
-        });
-    }
-    deposit(signer, token, amount, txOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const txs = yield this.LpVault.txsDeposit(signer.getPublicKey(), new web3_js_1.PublicKey(token), amount, txOptions === null || txOptions === void 0 ? void 0 : txOptions.feeRate);
-            const [txId] = yield this.Transactions.sendAndConfirm(signer, txs, txOptions === null || txOptions === void 0 ? void 0 : txOptions.waitForConfirmation, txOptions === null || txOptions === void 0 ? void 0 : txOptions.abortSignal, false);
-            return txId;
-        });
-    }
-    transfer(signer, token, amount, dstAddress, txOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const txs = yield this.Tokens.txsTransfer(signer.getPublicKey(), new web3_js_1.PublicKey(token), amount, new web3_js_1.PublicKey(dstAddress), txOptions === null || txOptions === void 0 ? void 0 : txOptions.feeRate);
-            const [txId] = yield this.Transactions.sendAndConfirm(signer, txs, txOptions === null || txOptions === void 0 ? void 0 : txOptions.waitForConfirmation, txOptions === null || txOptions === void 0 ? void 0 : txOptions.abortSignal, false);
-            return txId;
-        });
+        }
+        const result = await this.txsInit(swapData, signature, skipChecks, txOptions?.feeRate);
+        const [txSignature] = await this.Transactions.sendAndConfirm(signer, result, txOptions?.waitForConfirmation, txOptions?.abortSignal);
+        return txSignature;
+    }
+    async initAndClaimWithSecret(signer, swapData, signature, secret, skipChecks, txOptions) {
+        if (!signer.getPublicKey().equals(swapData.claimer))
+            throw new Error("Invalid signer provided!");
+        const txsCommit = await this.txsInit(swapData, signature, skipChecks, txOptions?.feeRate);
+        const txsClaim = await this.Claim.txsClaimWithSecret(signer.getPublicKey(), swapData, secret, true, false, txOptions?.feeRate, true);
+        return await this.Transactions.sendAndConfirm(signer, txsCommit.concat(txsClaim), txOptions?.waitForConfirmation, txOptions?.abortSignal);
+    }
+    async withdraw(signer, token, amount, txOptions) {
+        const txs = await this.LpVault.txsWithdraw(signer.getPublicKey(), new web3_js_1.PublicKey(token), amount, txOptions?.feeRate);
+        const [txId] = await this.Transactions.sendAndConfirm(signer, txs, txOptions?.waitForConfirmation, txOptions?.abortSignal, false);
+        return txId;
+    }
+    async deposit(signer, token, amount, txOptions) {
+        const txs = await this.LpVault.txsDeposit(signer.getPublicKey(), new web3_js_1.PublicKey(token), amount, txOptions?.feeRate);
+        const [txId] = await this.Transactions.sendAndConfirm(signer, txs, txOptions?.waitForConfirmation, txOptions?.abortSignal, false);
+        return txId;
+    }
+    async transfer(signer, token, amount, dstAddress, txOptions) {
+        const txs = await this.Tokens.txsTransfer(signer.getPublicKey(), new web3_js_1.PublicKey(token), amount, new web3_js_1.PublicKey(dstAddress), txOptions?.feeRate);
+        const [txId] = await this.Transactions.sendAndConfirm(signer, txs, txOptions?.waitForConfirmation, txOptions?.abortSignal, false);
+        return txId;
     }
     ////////////////////////////////////////////
     //// Transactions
@@ -448,10 +431,12 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
     }
     ////////////////////////////////////////////
     //// Fees
-    getInitPayInFeeRate(offerer, claimer, token, paymentHash) {
+    getInitPayInFeeRate(offerer, claimer, token, claimHash) {
+        const paymentHash = claimHash == null ? null : (0, Utils_1.fromClaimHash)(claimHash).paymentHash;
         return this.Init.getInitPayInFeeRate(toPublicKeyOrNull(offerer), toPublicKeyOrNull(claimer), toPublicKeyOrNull(token), paymentHash);
     }
-    getInitFeeRate(offerer, claimer, token, paymentHash) {
+    getInitFeeRate(offerer, claimer, token, claimHash) {
+        const paymentHash = claimHash == null ? null : (0, Utils_1.fromClaimHash)(claimHash).paymentHash;
         return this.Init.getInitFeeRate(toPublicKeyOrNull(offerer), toPublicKeyOrNull(claimer), toPublicKeyOrNull(token), paymentHash);
     }
     getRefundFeeRate(swapData) {
@@ -525,5 +510,11 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
         const wallet = new SolanaKeypairWallet_1.SolanaKeypairWallet(keypair);
         return new SolanaSigner_1.SolanaSigner(wallet, keypair);
     }
+    getExtraData(outputScript, amount, confirmations, nonce) {
+        return createHash("sha256").update(buffer_1.Buffer.concat([
+            base_1.BigIntBufferUtils.toBuffer(amount, "le", 8),
+            outputScript
+        ])).digest();
+    }
 }
 exports.SolanaSwapProgram = SolanaSwapProgram;

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

@@ -5,7 +5,6 @@ import { IStorageManager, StorageObject } from "@atomiqlabs/base";
 import { SolanaSwapProgram } from "../SolanaSwapProgram";
 import { SolanaTx } from "../../base/modules/SolanaTransactions";
 import { SolanaSigner } from "../../wallet/SolanaSigner";
-import * as BN from "bn.js";
 export declare class StoredDataAccount implements StorageObject {
     accountKey: PublicKey;
     owner: PublicKey;
@@ -71,7 +70,7 @@ export declare class SolanaDataAccount extends SolanaSwapModule {
     getDataAccountsInfo(signer: PublicKey): Promise<{
         closePublicKeys: PublicKey[];
         count: number;
-        totalValue: BN;
+        totalValue: bigint;
     }>;
     /**
      * Sweeps all old data accounts, reclaiming the SOL locked in the PDAs
@@ -79,7 +78,7 @@ export declare class SolanaDataAccount extends SolanaSwapModule {
     sweepDataAccounts(signer: SolanaSigner): Promise<{
         txIds: string[];
         count: number;
-        totalValue: BN;
+        totalValue: bigint;
     }>;
     /**
      * Adds the transactions writing (and also initializing if it doesn't exist) data to the data account