@atomiqlabs/chain-solana 8.0.3 → 9.0.0-beta.0

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

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SwapClaim = void 0;
 const SolanaSwapModule_1 = require("../SolanaSwapModule");
-const SolanaAction_1 = require("../../base/SolanaAction");
+const SolanaAction_1 = require("../../chain/SolanaAction");
 const spl_token_1 = require("@solana/spl-token");
 const base_1 = require("@atomiqlabs/base");
 const web3_js_1 = require("@solana/web3.js");
 const Utils_1 = require("../../../utils/Utils");
 const SolanaSigner_1 = require("../../wallet/SolanaSigner");
-const SolanaTokens_1 = require("../../base/modules/SolanaTokens");
+const SolanaTokens_1 = require("../../chain/modules/SolanaTokens");
 const BN = require("bn.js");
 class SwapClaim extends SolanaSwapModule_1.SolanaSwapModule {
     async Claim(signer, swapData, secretOrDataKey) {
@@ -16,7 +16,7 @@ class SwapClaim extends SolanaSwapModule_1.SolanaSwapModule {
         const accounts = {
             signer,
             initializer: swapData.isPayIn() ? swapData.offerer : swapData.claimer,
-            escrowState: this.root.SwapEscrowState(Buffer.from(swapData.paymentHash, "hex")),
+            escrowState: this.program.SwapEscrowState(Buffer.from(swapData.paymentHash, "hex")),
             ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             data: isDataKey ? secretOrDataKey : null,
         };
@@ -24,23 +24,23 @@ class SwapClaim extends SolanaSwapModule_1.SolanaSwapModule {
             Buffer.alloc(0) :
             Buffer.from(secretOrDataKey, "hex");
         if (swapData.isPayOut()) {
-            return new SolanaAction_1.SolanaAction(signer, this.root, await this.program.methods
+            return new SolanaAction_1.SolanaAction(signer, this.root, await this.swapProgram.methods
                 .claimerClaimPayOut(secretBuffer)
                 .accounts({
                 ...accounts,
                 claimerAta: swapData.claimerAta,
-                vault: this.root.SwapVault(swapData.token),
-                vaultAuthority: this.root.SwapVaultAuthority,
+                vault: this.program.SwapVault(swapData.token),
+                vaultAuthority: this.program.SwapVaultAuthority,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID
             })
                 .instruction(), this.getComputeBudget(swapData));
         }
         else {
-            return new SolanaAction_1.SolanaAction(signer, this.root, await this.program.methods
+            return new SolanaAction_1.SolanaAction(signer, this.root, await this.swapProgram.methods
                 .claimerClaim(secretBuffer)
                 .accounts({
                 ...accounts,
-                claimerUserData: this.root.SwapUserVault(swapData.claimer, swapData.token)
+                claimerUserData: this.program.SwapUserVault(swapData.claimer, swapData.token)
             })
                 .instruction(), this.getComputeBudget(swapData));
         }
@@ -64,8 +64,8 @@ class SwapClaim extends SolanaSwapModule_1.SolanaSwapModule {
         action.computeBudget = null;
         return action;
     }
-    constructor(root, btcRelay) {
-        super(root);
+    constructor(chainInterface, program, btcRelay) {
+        super(chainInterface, program);
         this.btcRelay = btcRelay;
     }
     /**
@@ -135,7 +135,7 @@ class SwapClaim extends SolanaSwapModule_1.SolanaSwapModule {
             Buffer.from(tx.hex, "hex")
         ]);
         this.logger.debug("addTxsWriteTransactionData(): writing transaction data: ", writeData.toString("hex"));
-        return this.root.DataAccount.addTxsWriteData(signer, reversedTxId, writeData, txs, feeRate);
+        return this.program.DataAccount.addTxsWriteData(signer, reversedTxId, writeData, txs, feeRate);
     }
     /**
      * Checks whether we should unwrap the WSOL to SOL when claiming the swap
@@ -164,7 +164,7 @@ class SwapClaim extends SolanaSwapModule_1.SolanaSwapModule {
     async txsClaimWithSecret(signer, swapData, secret, checkExpiry, initAta, feeRate, skipAtaCheck) {
         //We need to be sure that this transaction confirms in time, otherwise we reveal the secret to the counterparty
         // and won't claim the funds
-        if (checkExpiry && await this.root.isExpired(swapData.claimer.toString(), swapData)) {
+        if (checkExpiry && await this.program.isExpired(swapData.claimer.toString(), swapData)) {
             throw new base_1.SwapDataVerificationError("Not enough time to reliably pay the invoice");
         }
         const shouldInitAta = !skipAtaCheck && swapData.isPayOut() && !await this.root.Tokens.ataExists(swapData.claimerAta);
@@ -235,7 +235,7 @@ class SwapClaim extends SolanaSwapModule_1.SolanaSwapModule {
         const accounts = [signer];
         if (swapData.payOut) {
             if (swapData.token != null)
-                accounts.push(this.root.SwapVault(swapData.token));
+                accounts.push(this.program.SwapVault(swapData.token));
             if (swapData.payIn) {
                 if (swapData.offerer != null)
                     accounts.push(swapData.offerer);
@@ -249,7 +249,7 @@ class SwapClaim extends SolanaSwapModule_1.SolanaSwapModule {
         }
         else {
             if (swapData.claimer != null && swapData.token != null)
-                accounts.push(this.root.SwapUserVault(swapData.claimer, swapData.token));
+                accounts.push(this.program.SwapUserVault(swapData.claimer, swapData.token));
             if (swapData.payIn) {
                 if (swapData.offerer != null)
                     accounts.push(swapData.offerer);
@@ -260,7 +260,7 @@ class SwapClaim extends SolanaSwapModule_1.SolanaSwapModule {
             }
         }
         if (swapData.paymentHash != null)
-            accounts.push(this.root.SwapEscrowState(Buffer.from(swapData.paymentHash, "hex")));
+            accounts.push(this.program.SwapEscrowState(Buffer.from(swapData.paymentHash, "hex")));
         return this.root.Fees.getFeeRate(accounts);
     }
     /**

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

@@ -2,7 +2,7 @@
 import { ParsedAccountsModeBlockResponse, PublicKey } from "@solana/web3.js";
 import { SolanaSwapData } from "../SolanaSwapData";
 import { SolanaSwapModule } from "../SolanaSwapModule";
-import { SolanaTx } from "../../base/modules/SolanaTransactions";
+import { SolanaTx } from "../../chain/modules/SolanaTransactions";
 import { Buffer } from "buffer";
 import { SolanaSigner } from "../../wallet/SolanaSigner";
 export type SolanaPreFetchVerification = {

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

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SwapInit = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const base_1 = require("@atomiqlabs/base");
-const SolanaAction_1 = require("../../base/SolanaAction");
+const SolanaAction_1 = require("../../chain/SolanaAction");
 const spl_token_1 = require("@solana/spl-token");
 const SolanaSwapModule_1 = require("../SolanaSwapModule");
 const Utils_1 = require("../../../utils/Utils");
 const buffer_1 = require("buffer");
-const SolanaTokens_1 = require("../../base/modules/SolanaTokens");
+const SolanaTokens_1 = require("../../chain/modules/SolanaTokens");
 class SwapInit extends SolanaSwapModule_1.SolanaSwapModule {
     constructor() {
         super(...arguments);
@@ -28,31 +28,31 @@ class SwapInit extends SolanaSwapModule_1.SolanaSwapModule {
         const accounts = {
             claimer: swapData.claimer,
             offerer: swapData.offerer,
-            escrowState: this.root.SwapEscrowState(paymentHash),
+            escrowState: this.program.SwapEscrowState(paymentHash),
             mint: swapData.token,
             systemProgram: web3_js_1.SystemProgram.programId,
             claimerAta: swapData.payOut ? claimerAta : null,
-            claimerUserData: !swapData.payOut ? this.root.SwapUserVault(swapData.claimer, swapData.token) : null
+            claimerUserData: !swapData.payOut ? this.program.SwapUserVault(swapData.claimer, swapData.token) : null
         };
         if (swapData.payIn) {
             const ata = (0, spl_token_1.getAssociatedTokenAddressSync)(swapData.token, swapData.offerer);
-            return new SolanaAction_1.SolanaAction(swapData.offerer, this.root, await this.program.methods
+            return new SolanaAction_1.SolanaAction(swapData.offerer, this.root, await this.swapProgram.methods
                 .offererInitializePayIn(swapData.toSwapDataStruct(), [...buffer_1.Buffer.alloc(32, 0)], (0, Utils_1.toBN)(timeout))
                 .accounts({
                 ...accounts,
                 offererAta: ata,
-                vault: this.root.SwapVault(swapData.token),
-                vaultAuthority: this.root.SwapVaultAuthority,
+                vault: this.program.SwapVault(swapData.token),
+                vaultAuthority: this.program.SwapVaultAuthority,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             })
                 .instruction(), SwapInit.CUCosts.INIT_PAY_IN);
         }
         else {
-            return new SolanaAction_1.SolanaAction(swapData.claimer, this.root, await this.program.methods
+            return new SolanaAction_1.SolanaAction(swapData.claimer, this.root, await this.swapProgram.methods
                 .offererInitialize(swapData.toSwapDataStruct(), swapData.securityDeposit, swapData.claimerBounty, [...(swapData.txoHash != null ? buffer_1.Buffer.from(swapData.txoHash, "hex") : buffer_1.Buffer.alloc(32, 0))], (0, Utils_1.toBN)(timeout))
                 .accounts({
                 ...accounts,
-                offererUserData: this.root.SwapUserVault(swapData.offerer, swapData.token),
+                offererUserData: this.program.SwapUserVault(swapData.offerer, swapData.token),
             })
                 .instruction(), SwapInit.CUCosts.INIT);
         }
@@ -268,13 +268,13 @@ class SwapInit extends SolanaSwapModule_1.SolanaSwapModule {
     async isSignatureValid(swapData, timeout, prefix, signature, feeRate, preFetchedData) {
         const sender = swapData.isPayIn() ? swapData.offerer : swapData.claimer;
         const signer = swapData.isPayIn() ? swapData.claimer : swapData.offerer;
-        if (!swapData.isPayIn() && await this.root.isExpired(sender.toString(), swapData)) {
+        if (!swapData.isPayIn() && await this.program.isExpired(sender.toString(), swapData)) {
             throw new base_1.SignatureVerificationError("Swap will expire too soon!");
         }
         if (prefix !== this.getAuthPrefix(swapData))
             throw new base_1.SignatureVerificationError("Invalid prefix");
         const currentTimestamp = BigInt(Math.floor(Date.now() / 1000));
-        const isExpired = (BigInt(timeout) - currentTimestamp) < BigInt(this.root.authGracePeriod);
+        const isExpired = (BigInt(timeout) - currentTimestamp) < BigInt(this.program.authGracePeriod);
         if (isExpired)
             throw new base_1.SignatureVerificationError("Authorization expired!");
         const [transactionSlot, signatureString] = signature.split(";");
@@ -313,7 +313,7 @@ class SwapInit extends SolanaSwapModule_1.SolanaSwapModule {
         const slotsLeft = lastValidTransactionSlot - latestSlot - this.SIGNATURE_SLOT_BUFFER;
         const now = Date.now();
         const slotExpiryTime = now + (slotsLeft * this.root.SLOT_TIME);
-        const timeoutExpiryTime = (parseInt(timeout) - this.root.authGracePeriod) * 1000;
+        const timeoutExpiryTime = (parseInt(timeout) - this.program.authGracePeriod) * 1000;
         const expiry = Math.min(slotExpiryTime, timeoutExpiryTime);
         if (expiry < now)
             return 0;
@@ -334,7 +334,7 @@ class SwapInit extends SolanaSwapModule_1.SolanaSwapModule {
         const slotsLeft = lastValidTransactionSlot - latestSlot + this.SIGNATURE_SLOT_BUFFER;
         if (slotsLeft < 0)
             return true;
-        if ((parseInt(timeout) + this.root.authGracePeriod) * 1000 < Date.now())
+        if ((parseInt(timeout) + this.program.authGracePeriod) * 1000 < Date.now())
             return true;
         return false;
     }
@@ -354,7 +354,7 @@ class SwapInit extends SolanaSwapModule_1.SolanaSwapModule {
         if (!skipChecks) {
             const [_, payStatus] = await Promise.all([
                 (0, Utils_1.tryWithRetries)(() => this.isSignatureValid(swapData, timeout, prefix, signature, feeRate), this.retryPolicy, (e) => e instanceof base_1.SignatureVerificationError),
-                (0, Utils_1.tryWithRetries)(() => this.root.getClaimHashStatus(swapData.getClaimHash()), this.retryPolicy)
+                (0, Utils_1.tryWithRetries)(() => this.program.getClaimHashStatus(swapData.getClaimHash()), this.retryPolicy)
             ]);
             if (payStatus !== base_1.SwapCommitStatus.NOT_COMMITED)
                 throw new base_1.SwapDataVerificationError("Invoice already being paid for or paid");
@@ -416,14 +416,14 @@ class SwapInit extends SolanaSwapModule_1.SolanaSwapModule {
         if (offerer != null)
             accounts.push(offerer);
         if (token != null) {
-            accounts.push(this.root.SwapVault(token));
+            accounts.push(this.program.SwapVault(token));
             if (offerer != null)
                 accounts.push((0, spl_token_1.getAssociatedTokenAddressSync)(token, offerer));
             if (claimer != null)
-                accounts.push(this.root.SwapUserVault(claimer, token));
+                accounts.push(this.program.SwapUserVault(claimer, token));
         }
         if (paymentHash != null)
-            accounts.push(this.root.SwapEscrowState(buffer_1.Buffer.from(paymentHash, "hex")));
+            accounts.push(this.program.SwapEscrowState(buffer_1.Buffer.from(paymentHash, "hex")));
         const shouldCheckWSOLAta = token != null && offerer != null && token.equals(SolanaTokens_1.SolanaTokens.WSOL_ADDRESS);
         let [feeRate, _account] = await Promise.all([
             this.root.Fees.getFeeRate(accounts),
@@ -451,11 +451,11 @@ class SwapInit extends SolanaSwapModule_1.SolanaSwapModule {
     getInitFeeRate(offerer, claimer, token, paymentHash) {
         const accounts = [];
         if (offerer != null && token != null)
-            accounts.push(this.root.SwapUserVault(offerer, token));
+            accounts.push(this.program.SwapUserVault(offerer, token));
         if (claimer != null)
             accounts.push(claimer);
         if (paymentHash != null)
-            accounts.push(this.root.SwapEscrowState(buffer_1.Buffer.from(paymentHash, "hex")));
+            accounts.push(this.program.SwapEscrowState(buffer_1.Buffer.from(paymentHash, "hex")));
         return this.root.Fees.getFeeRate(accounts);
     }
     /**
@@ -464,7 +464,7 @@ class SwapInit extends SolanaSwapModule_1.SolanaSwapModule {
      */
     async getInitFee(swapData, feeRate) {
         if (swapData == null)
-            return BigInt(this.root.ESCROW_STATE_RENT_EXEMPT) + await this.getRawInitFee(swapData, feeRate);
+            return BigInt(this.program.ESCROW_STATE_RENT_EXEMPT) + await this.getRawInitFee(swapData, feeRate);
         feeRate = feeRate ||
             (swapData.payIn
                 ? await this.getInitPayInFeeRate(swapData.offerer, swapData.claimer, swapData.token, swapData.paymentHash)
@@ -475,7 +475,7 @@ class SwapInit extends SolanaSwapModule_1.SolanaSwapModule {
                 this.root.Tokens.getATAOrNull((0, spl_token_1.getAssociatedTokenAddressSync)(swapData.token, swapData.claimer)).then(acc => acc == null) :
                 Promise.resolve(null)
         ]);
-        let resultingFee = BigInt(this.root.ESCROW_STATE_RENT_EXEMPT) + rawFee;
+        let resultingFee = BigInt(this.program.ESCROW_STATE_RENT_EXEMPT) + rawFee;
         if (initAta)
             resultingFee += BigInt(SolanaTokens_1.SolanaTokens.SPL_ATA_RENT_EXEMPT);
         if (swapData.payIn && this.shouldWrapOnInit(swapData, feeRate) && this.extractAtaDataFromFeeRate(feeRate).initAta) {

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

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { SolanaSwapModule } from "../SolanaSwapModule";
 import { SolanaSwapData } from "../SolanaSwapData";
-import { SolanaTx } from "../../base/modules/SolanaTransactions";
+import { SolanaTx } from "../../chain/modules/SolanaTransactions";
 import { Buffer } from "buffer";
 import { SolanaSigner } from "../../wallet/SolanaSigner";
 export declare class SwapRefund extends SolanaSwapModule {

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

@@ -7,10 +7,10 @@ const tweetnacl_1 = require("tweetnacl");
 const base_1 = require("@atomiqlabs/base");
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
-const SolanaAction_1 = require("../../base/SolanaAction");
+const SolanaAction_1 = require("../../chain/SolanaAction");
 const Utils_1 = require("../../../utils/Utils");
 const buffer_1 = require("buffer");
-const SolanaTokens_1 = require("../../base/modules/SolanaTokens");
+const SolanaTokens_1 = require("../../chain/modules/SolanaTokens");
 const BN = require("bn.js");
 class SwapRefund extends SolanaSwapModule_1.SolanaSwapModule {
     /**
@@ -25,30 +25,30 @@ class SwapRefund extends SolanaSwapModule_1.SolanaSwapModule {
         const accounts = {
             offerer: swapData.offerer,
             claimer: swapData.claimer,
-            escrowState: this.root.SwapEscrowState(buffer_1.Buffer.from(swapData.paymentHash, "hex")),
-            claimerUserData: !swapData.payOut ? this.root.SwapUserVault(swapData.claimer, swapData.token) : null,
+            escrowState: this.program.SwapEscrowState(buffer_1.Buffer.from(swapData.paymentHash, "hex")),
+            claimerUserData: !swapData.payOut ? this.program.SwapUserVault(swapData.claimer, swapData.token) : null,
             ixSysvar: refundAuthTimeout != null ? web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY : null
         };
         const useTimeout = refundAuthTimeout != null ? refundAuthTimeout : 0n;
         if (swapData.isPayIn()) {
             const ata = (0, spl_token_1.getAssociatedTokenAddressSync)(swapData.token, swapData.offerer);
-            return new SolanaAction_1.SolanaAction(swapData.offerer, this.root, await this.program.methods
+            return new SolanaAction_1.SolanaAction(swapData.offerer, this.root, await this.swapProgram.methods
                 .offererRefundPayIn((0, Utils_1.toBN)(useTimeout))
                 .accounts({
                 ...accounts,
                 offererAta: ata,
-                vault: this.root.SwapVault(swapData.token),
-                vaultAuthority: this.root.SwapVaultAuthority,
+                vault: this.program.SwapVault(swapData.token),
+                vaultAuthority: this.program.SwapVaultAuthority,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID
             })
                 .instruction(), SwapRefund.CUCosts.REFUND_PAY_OUT);
         }
         else {
-            return new SolanaAction_1.SolanaAction(swapData.offerer, this.root, await this.program.methods
+            return new SolanaAction_1.SolanaAction(swapData.offerer, this.root, await this.swapProgram.methods
                 .offererRefund((0, Utils_1.toBN)(useTimeout))
                 .accounts({
                 ...accounts,
-                offererUserData: this.root.SwapUserVault(swapData.offerer, swapData.token)
+                offererUserData: this.program.SwapUserVault(swapData.offerer, swapData.token)
             })
                 .instruction(), SwapRefund.CUCosts.REFUND);
         }
@@ -122,7 +122,7 @@ class SwapRefund extends SolanaSwapModule_1.SolanaSwapModule {
             throw new base_1.SignatureVerificationError("Invalid prefix");
         const expiryTimestamp = BigInt(timeout);
         const currentTimestamp = BigInt(Math.floor(Date.now() / 1000));
-        const isExpired = (expiryTimestamp - currentTimestamp) < BigInt(this.root.authGracePeriod);
+        const isExpired = (expiryTimestamp - currentTimestamp) < BigInt(this.program.authGracePeriod);
         if (isExpired)
             throw new base_1.SignatureVerificationError("Authorization expired!");
         const signatureBuffer = buffer_1.Buffer.from(signature, "hex");
@@ -141,14 +141,14 @@ class SwapRefund extends SolanaSwapModule_1.SolanaSwapModule {
      * @param feeRate fee rate to be used for the transactions
      */
     async txsRefund(swapData, check, initAta, feeRate) {
-        if (check && !await (0, Utils_1.tryWithRetries)(() => this.root.isRequestRefundable(swapData.offerer.toString(), swapData), this.retryPolicy)) {
+        if (check && !await (0, Utils_1.tryWithRetries)(() => this.program.isRequestRefundable(swapData.offerer.toString(), swapData), this.retryPolicy)) {
             throw new base_1.SwapDataVerificationError("Not refundable yet!");
         }
         const shouldInitAta = swapData.isPayIn() && !await this.root.Tokens.ataExists(swapData.offererAta);
         if (shouldInitAta && !initAta)
             throw new base_1.SwapDataVerificationError("ATA not initialized");
         if (feeRate == null)
-            feeRate = await this.root.getRefundFeeRate(swapData);
+            feeRate = await this.program.getRefundFeeRate(swapData);
         const shouldUnwrap = this.shouldUnwrap(swapData);
         const action = new SolanaAction_1.SolanaAction(swapData.offerer, this.root);
         if (shouldInitAta) {
@@ -176,7 +176,7 @@ class SwapRefund extends SolanaSwapModule_1.SolanaSwapModule {
      * @param feeRate fee rate to be used for the transactions
      */
     async txsRefundWithAuthorization(swapData, timeout, prefix, signature, check, initAta, feeRate) {
-        if (check && !await (0, Utils_1.tryWithRetries)(() => this.root.isCommited(swapData), this.retryPolicy)) {
+        if (check && !await (0, Utils_1.tryWithRetries)(() => this.program.isCommited(swapData), this.retryPolicy)) {
             throw new base_1.SwapDataVerificationError("Not correctly committed");
         }
         await (0, Utils_1.tryWithRetries)(() => this.isSignatureValid(swapData, timeout, prefix, signature), this.retryPolicy, (e) => e instanceof base_1.SignatureVerificationError);
@@ -184,7 +184,7 @@ class SwapRefund extends SolanaSwapModule_1.SolanaSwapModule {
         if (shouldInitAta && !initAta)
             throw new base_1.SwapDataVerificationError("ATA not initialized");
         if (feeRate == null)
-            feeRate = await this.root.getRefundFeeRate(swapData);
+            feeRate = await this.program.getRefundFeeRate(swapData);
         console.log("[SolanaSwapProgram] txsRefundsWithAuthorization: feeRate: ", feeRate);
         const signatureBuffer = buffer_1.Buffer.from(signature, "hex");
         const shouldUnwrap = this.shouldUnwrap(swapData);
@@ -206,7 +206,7 @@ class SwapRefund extends SolanaSwapModule_1.SolanaSwapModule {
         const accounts = [];
         if (swapData.payIn) {
             if (swapData.token != null)
-                accounts.push(this.root.SwapVault(swapData.token));
+                accounts.push(this.program.SwapVault(swapData.token));
             if (swapData.offerer != null)
                 accounts.push(swapData.offerer);
             if (swapData.claimer != null)
@@ -218,13 +218,13 @@ class SwapRefund extends SolanaSwapModule_1.SolanaSwapModule {
             if (swapData.offerer != null) {
                 accounts.push(swapData.offerer);
                 if (swapData.token != null)
-                    accounts.push(this.root.SwapUserVault(swapData.offerer, swapData.token));
+                    accounts.push(this.program.SwapUserVault(swapData.offerer, swapData.token));
             }
             if (swapData.claimer != null)
                 accounts.push(swapData.claimer);
         }
         if (swapData.paymentHash != null)
-            accounts.push(this.root.SwapEscrowState(buffer_1.Buffer.from(swapData.paymentHash, "hex")));
+            accounts.push(this.program.SwapEscrowState(buffer_1.Buffer.from(swapData.paymentHash, "hex")));
         return this.root.Fees.getFeeRate(accounts);
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-solana",
-  "version": "8.0.3",
+  "version": "9.0.0-beta.0",
   "description": "Solana specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",
@@ -22,7 +22,7 @@
   "author": "adambor",
   "license": "ISC",
   "dependencies": {
-    "@atomiqlabs/base": "^8.0.0",
+    "@atomiqlabs/base": "^9.0.0-beta.0",
     "@noble/hashes": "^1.7.1",
     "bn.js": "5.2.1",
     "bs58": "4.0.1",

package/src/index.ts

@@ -2,18 +2,18 @@ export * from "./solana/btcrelay/headers/SolanaBtcHeader";
 export * from "./solana/btcrelay/headers/SolanaBtcStoredHeader";
 export * from "./solana/btcrelay/SolanaBtcRelay";
 
-export * from "./solana/base/modules/SolanaAddresses";
-export * from "./solana/base/modules/SolanaBlocks";
-export * from "./solana/base/modules/SolanaEvents";
-export * from "./solana/base/modules/SolanaFees";
-export * from "./solana/base/modules/SolanaSignatures";
-export * from "./solana/base/modules/SolanaSlots";
-export * from "./solana/base/modules/SolanaTokens";
-export * from "./solana/base/modules/SolanaTransactions";
+export * from "./solana/chain/modules/SolanaAddresses";
+export * from "./solana/chain/modules/SolanaBlocks";
+export * from "./solana/chain/modules/SolanaEvents";
+export * from "./solana/chain/modules/SolanaFees";
+export * from "./solana/chain/modules/SolanaSignatures";
+export * from "./solana/chain/modules/SolanaSlots";
+export * from "./solana/chain/modules/SolanaTokens";
+export * from "./solana/chain/modules/SolanaTransactions";
 
-export * from "./solana/base/SolanaAction";
-export * from "./solana/base/SolanaBase";
-export * from "./solana/base/SolanaModule";
+export * from "./solana/chain/SolanaAction";
+export * from "./solana/chain/SolanaChainInterface";
+export * from "./solana/chain/SolanaModule";
 
 export * from "./solana/program/modules/SolanaProgramEvents";
 export * from "./solana/program/SolanaProgramBase";

package/src/solana/SolanaChainType.ts

@@ -1,11 +1,12 @@
 import {ChainType} from "@atomiqlabs/base";
-import {SolanaTx} from "./base/modules/SolanaTransactions";
+import {SolanaTx} from "./chain/modules/SolanaTransactions";
 import {SolanaPreFetchData, SolanaPreFetchVerification} from "./swaps/modules/SwapInit";
 import {SolanaSigner} from "./wallet/SolanaSigner";
 import {SolanaSwapProgram} from "./swaps/SolanaSwapProgram";
 import {SolanaSwapData} from "./swaps/SolanaSwapData";
 import {SolanaChainEventsBrowser} from "./events/SolanaChainEventsBrowser";
 import {SolanaBtcRelay} from "./btcrelay/SolanaBtcRelay";
+import {SolanaChainInterface} from "./chain/SolanaChainInterface";
 
 export type SolanaChainType = ChainType<
     "SOLANA",
@@ -15,6 +16,10 @@ export type SolanaChainType = ChainType<
     SolanaSigner,
     SolanaSwapData,
     SolanaSwapProgram,
+    SolanaChainInterface,
     SolanaChainEventsBrowser,
-    SolanaBtcRelay<any>
+    SolanaBtcRelay<any>,
+    never,
+    never,
+    never
 >;

package/src/solana/SolanaInitializer.ts

@@ -9,8 +9,8 @@ import {
 } from "@atomiqlabs/base";
 import {Connection} from "@solana/web3.js";
 import {StoredDataAccount} from "./swaps/modules/SolanaDataAccount";
-import {SolanaRetryPolicy} from "./base/SolanaBase";
-import {SolanaFees} from "./base/modules/SolanaFees";
+import {SolanaChainInterface, SolanaRetryPolicy} from "./chain/SolanaChainInterface";
+import {SolanaFees} from "./chain/modules/SolanaFees";
 import {SolanaChainType} from "./SolanaChainType";
 import {SolanaBtcRelay} from "./btcrelay/SolanaBtcRelay";
 import {SolanaChains} from "./SolanaChains";
@@ -66,14 +66,16 @@ export function initializeSolana(
         options.rpcUrl;
 
     const Fees = options.fees ?? new SolanaFees(connection, 200000, 4, 100);
-    const btcRelay = new SolanaBtcRelay(connection, bitcoinRpc, options.btcRelayContract ?? SolanaChains[network].addresses.btcRelayContract, Fees);
+
+    const chainInterface = new SolanaChainInterface(connection, options.retryPolicy ?? {transactionResendInterval: 1000}, Fees);
+
+    const btcRelay = new SolanaBtcRelay(chainInterface, bitcoinRpc, options.btcRelayContract ?? SolanaChains[network].addresses.btcRelayContract);
+
     const swapContract = new SolanaSwapProgram(
-        connection,
+        chainInterface,
         btcRelay,
         options.dataAccountStorage || storageCtor("solAccounts"),
-        options.swapContract ?? SolanaChains[network].addresses.swapContract,
-        options.retryPolicy ?? {transactionResendInterval: 1000},
-        Fees
+        options.swapContract ?? SolanaChains[network].addresses.swapContract
     );
     const chainEvents = new SolanaChainEventsBrowser(connection, swapContract);
 
@@ -83,8 +85,10 @@ export function initializeSolana(
         swapContract,
         chainEvents,
         swapDataConstructor: SolanaSwapData,
-        //These are defined here to keep the data from old SolLightning-sdk, not needed for other chains
-        storagePrefix: "SOLv4-"+network+"-"
+        chainInterface,
+        spvVaultContract: null as never,
+        spvVaultDataConstructor: null,
+        spvVaultWithdrawalDataConstructor: null
     };
 }
 

package/src/solana/btcrelay/SolanaBtcRelay.ts

@@ -11,12 +11,13 @@ import * as programIdl from "./program/programIdl.json";
 import {BitcoinRpc, BtcBlock, BtcRelay, StatePredictorUtils} from "@atomiqlabs/base";
 import {MethodsBuilder} from "@coral-xyz/anchor/dist/cjs/program/namespace/methods";
 import {SolanaProgramBase} from "../program/SolanaProgramBase";
-import {SolanaAction} from "../base/SolanaAction";
+import {SolanaAction} from "../chain/SolanaAction";
 import {Buffer} from "buffer";
-import {SolanaFees} from "../base/modules/SolanaFees";
-import {SolanaTx} from "../base/modules/SolanaTransactions";
+import {SolanaTx} from "../chain/modules/SolanaTransactions";
 import {SolanaSigner} from "../wallet/SolanaSigner";
 import * as BN from "bn.js";
+import {SolanaChainInterface} from "../chain/SolanaChainInterface";
+import {getLogger} from "../../utils/Utils";
 
 const MAX_CLOSE_IX_PER_TX = 10;
 
@@ -46,7 +47,7 @@ export class SolanaBtcRelay<B extends BtcBlock> extends SolanaProgramBase<any> i
      */
     private async Initialize(signer: PublicKey, header: B, epochStart: number, pastBlocksTimestamps: number[]): Promise<SolanaAction> {
         const serializedBlock = serializeBlockHeader(header);
-        return new SolanaAction(signer, this,
+        return new SolanaAction(signer, this.Chain,
             await this.program.methods
                 .initialize(
                     serializedBlock,
@@ -85,7 +86,7 @@ export class SolanaBtcRelay<B extends BtcBlock> extends SolanaProgramBase<any> i
         reversedMerkleProof: Buffer[],
         committedHeader: SolanaBtcStoredHeader
     ): Promise<SolanaAction> {
-        return new SolanaAction(signer, this,
+        return new SolanaAction(signer, this.Chain,
             await this.program.methods
                 .verifyTransaction(
                     reversedTxId,
@@ -107,7 +108,7 @@ export class SolanaBtcRelay<B extends BtcBlock> extends SolanaProgramBase<any> i
     }
 
     public async CloseForkAccount(signer: PublicKey, forkId: number): Promise<SolanaAction> {
-        return new SolanaAction(signer, this,
+        return new SolanaAction(signer, this.Chain,
             await this.program.methods
                 .closeForkAccount(
                     new BN(forkId)
@@ -135,12 +136,11 @@ export class SolanaBtcRelay<B extends BtcBlock> extends SolanaProgramBase<any> i
     readonly maxShortForkHeadersPerTx: number = 4;
 
     constructor(
-        connection: Connection,
+        chainInterface: SolanaChainInterface,
         bitcoinRpc: BitcoinRpc<B>,
-        programAddress?: string,
-        solanaFeeEstimator: SolanaFees = new SolanaFees(connection)
+        programAddress?: string
     ) {
-        super(connection, programIdl, programAddress, null, solanaFeeEstimator);
+        super(chainInterface, programIdl, programAddress);
         this.bitcoinRpc = bitcoinRpc;
     }
 
@@ -208,8 +208,8 @@ export class SolanaBtcRelay<B extends BtcBlock> extends SolanaProgramBase<any> i
             .transaction();
         tx.feePayer = signer;
 
-        this.Fees.applyFeeRateBegin(tx, null, feeRate);
-        this.Fees.applyFeeRateEnd(tx, null, feeRate);
+        this.Chain.Fees.applyFeeRateBegin(tx, null, feeRate);
+        this.Chain.Fees.applyFeeRateEnd(tx, null, feeRate);
 
         const computedCommitedHeaders = this.computeCommitedHeaders(storedHeader, blockHeaderObj);
         const lastStoredHeader = computedCommitedHeaders[computedCommitedHeaders.length-1];
@@ -496,7 +496,7 @@ export class SolanaBtcRelay<B extends BtcBlock> extends SolanaProgramBase<any> i
         let forkId: number = mainState.forkCounter.toNumber();
 
         const txs: SolanaTx[] = [];
-        let action = new SolanaAction(signer.getPublicKey(), this);
+        let action = new SolanaAction(signer.getPublicKey(), this.Chain);
 
         let lastCheckedId = lastSweepId;
         for(
@@ -514,7 +514,7 @@ export class SolanaBtcRelay<B extends BtcBlock> extends SolanaProgramBase<any> i
 
             if(action.ixsLength()>=MAX_CLOSE_IX_PER_TX) {
                 await action.addToTxs(txs);
-                action = new SolanaAction(signer.getPublicKey(), this);
+                action = new SolanaAction(signer.getPublicKey(), this.Chain);
             }
         }
 
@@ -523,7 +523,7 @@ export class SolanaBtcRelay<B extends BtcBlock> extends SolanaProgramBase<any> i
         }
 
         if(txs.length>0) {
-            const signatures = await this.Transactions.sendAndConfirm(signer, txs, true);
+            const signatures = await this.Chain.sendAndConfirm(signer, txs, true);
             this.logger.info("sweepForkData(): forks swept, signatures: "+signatures.join());
         }
 
@@ -567,7 +567,7 @@ export class SolanaBtcRelay<B extends BtcBlock> extends SolanaProgramBase<any> i
      */
     public getMainFeeRate(signer: string | null): Promise<string> {
         const _signer = signer==null ? null : new PublicKey(signer);
-        return this.Fees.getFeeRate(_signer==null ? [this.BtcRelayMainState] : [
+        return this.Chain.Fees.getFeeRate(_signer==null ? [this.BtcRelayMainState] : [
             _signer,
             this.BtcRelayMainState
         ]);
@@ -578,7 +578,7 @@ export class SolanaBtcRelay<B extends BtcBlock> extends SolanaProgramBase<any> i
      */
     public getForkFeeRate(signer: string, forkId: number): Promise<string> {
         const _signer = new PublicKey(signer);
-        return this.Fees.getFeeRate([
+        return this.Chain.Fees.getFeeRate([
             _signer,
             this.BtcRelayMainState,
             this.BtcRelayFork(forkId, _signer)