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

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

@@ -1,7 +1,7 @@
 import {ParsedAccountsModeBlockResponse, PublicKey, SystemProgram, Transaction} from "@solana/web3.js";
 import {SignatureVerificationError, SwapCommitStatus, SwapDataVerificationError} from "@atomiqlabs/base";
 import {SolanaSwapData} from "../SolanaSwapData";
-import {SolanaAction} from "../../base/SolanaAction";
+import {SolanaAction} from "../../chain/SolanaAction";
 import {
     Account,
     createAssociatedTokenAccountIdempotentInstruction,
@@ -9,11 +9,11 @@ import {
     TOKEN_PROGRAM_ID
 } from "@solana/spl-token";
 import {SolanaSwapModule} from "../SolanaSwapModule";
-import {SolanaTx} from "../../base/modules/SolanaTransactions";
+import {SolanaTx} from "../../chain/modules/SolanaTransactions";
 import {toBN, tryWithRetries} from "../../../utils/Utils";
 import {Buffer} from "buffer";
 import {SolanaSigner} from "../../wallet/SolanaSigner";
-import {SolanaTokens} from "../../base/modules/SolanaTokens";
+import {SolanaTokens} from "../../chain/modules/SolanaTokens";
 
 export type SolanaPreFetchVerification = {
     latestSlot?: {
@@ -55,18 +55,18 @@ export class SwapInit extends SolanaSwapModule {
         const accounts = {
             claimer: swapData.claimer,
             offerer: swapData.offerer,
-            escrowState: this.root.SwapEscrowState(paymentHash),
+            escrowState: this.program.SwapEscrowState(paymentHash),
             mint: swapData.token,
             systemProgram: 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 = getAssociatedTokenAddressSync(swapData.token, swapData.offerer);
 
             return new SolanaAction(swapData.offerer, this.root,
-                await this.program.methods
+                await this.swapProgram.methods
                     .offererInitializePayIn(
                         swapData.toSwapDataStruct(),
                         [...Buffer.alloc(32, 0)],
@@ -75,8 +75,8 @@ export class SwapInit extends SolanaSwapModule {
                     .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: TOKEN_PROGRAM_ID,
                     })
                     .instruction(),
@@ -84,7 +84,7 @@ export class SwapInit extends SolanaSwapModule {
             );
         } else {
             return new SolanaAction(swapData.claimer, this.root,
-                await this.program.methods
+                await this.swapProgram.methods
                     .offererInitialize(
                         swapData.toSwapDataStruct(),
                         swapData.securityDeposit,
@@ -94,7 +94,7 @@ export class SwapInit extends SolanaSwapModule {
                     )
                     .accounts({
                         ...accounts,
-                        offererUserData: this.root.SwapUserVault(swapData.offerer, swapData.token),
+                        offererUserData: this.program.SwapUserVault(swapData.offerer, swapData.token),
                     })
                     .instruction(),
                 SwapInit.CUCosts.INIT
@@ -354,14 +354,14 @@ export class SwapInit extends SolanaSwapModule {
         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 SignatureVerificationError("Swap will expire too soon!");
         }
 
         if(prefix!==this.getAuthPrefix(swapData)) throw new 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 SignatureVerificationError("Authorization expired!");
 
         const [transactionSlot, signatureString] = signature.split(";");
@@ -412,7 +412,7 @@ export class SwapInit extends SolanaSwapModule {
         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;
@@ -439,7 +439,7 @@ export class SwapInit extends SolanaSwapModule {
         const slotsLeft = lastValidTransactionSlot-latestSlot+this.SIGNATURE_SLOT_BUFFER;
 
         if(slotsLeft<0) return true;
-        if((parseInt(timeout)+this.root.authGracePeriod)*1000 < Date.now()) return true;
+        if((parseInt(timeout)+this.program.authGracePeriod)*1000 < Date.now()) return true;
         return false;
     }
 
@@ -469,7 +469,7 @@ export class SwapInit extends SolanaSwapModule {
                     () => this.isSignatureValid(swapData, timeout, prefix, signature, feeRate),
                     this.retryPolicy, (e) => e instanceof SignatureVerificationError
                 ),
-                tryWithRetries(() => this.root.getClaimHashStatus(swapData.getClaimHash()), this.retryPolicy)
+                tryWithRetries(() => this.program.getClaimHashStatus(swapData.getClaimHash()), this.retryPolicy)
             ]);
             if(payStatus!==SwapCommitStatus.NOT_COMMITED) throw new SwapDataVerificationError("Invoice already being paid for or paid");
         }
@@ -556,11 +556,11 @@ export class SwapInit extends 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(getAssociatedTokenAddressSync(token, offerer));
-            if (claimer != null) accounts.push(this.root.SwapUserVault(claimer, token));
+            if (claimer != null) accounts.push(this.program.SwapUserVault(claimer, token));
         }
-        if (paymentHash != null) accounts.push(this.root.SwapEscrowState(Buffer.from(paymentHash, "hex")));
+        if (paymentHash != null) accounts.push(this.program.SwapEscrowState(Buffer.from(paymentHash, "hex")));
 
         const shouldCheckWSOLAta = token != null && offerer != null && token.equals(SolanaTokens.WSOL_ADDRESS);
         let [feeRate, _account] = await Promise.all([
@@ -592,9 +592,9 @@ export class SwapInit extends SolanaSwapModule {
     public getInitFeeRate(offerer?: PublicKey, claimer?: PublicKey, token?: PublicKey, paymentHash?: string): Promise<string> {
         const accounts: PublicKey[] = [];
 
-        if(offerer!=null && token!=null) accounts.push(this.root.SwapUserVault(offerer, token));
+        if(offerer!=null && token!=null) accounts.push(this.program.SwapUserVault(offerer, token));
         if(claimer!=null) accounts.push(claimer)
-        if(paymentHash!=null) accounts.push(this.root.SwapEscrowState(Buffer.from(paymentHash, "hex")));
+        if(paymentHash!=null) accounts.push(this.program.SwapEscrowState(Buffer.from(paymentHash, "hex")));
 
         return this.root.Fees.getFeeRate(accounts);
     }
@@ -604,7 +604,7 @@ export class SwapInit extends SolanaSwapModule {
      *  and also deposit for ATAs
      */
     async getInitFee(swapData: SolanaSwapData, feeRate?: string): Promise<bigint> {
-        if(swapData==null) return BigInt(this.root.ESCROW_STATE_RENT_EXEMPT) + await this.getRawInitFee(swapData, feeRate);
+        if(swapData==null) return BigInt(this.program.ESCROW_STATE_RENT_EXEMPT) + await this.getRawInitFee(swapData, feeRate);
 
         feeRate = feeRate ||
             (swapData.payIn
@@ -618,7 +618,7 @@ export class SwapInit extends SolanaSwapModule {
                 Promise.resolve<null>(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.SPL_ATA_RENT_EXEMPT);
 
         if(swapData.payIn && this.shouldWrapOnInit(swapData, feeRate) && this.extractAtaDataFromFeeRate(feeRate).initAta) {

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

@@ -3,7 +3,7 @@ import {SolanaSwapData} from "../SolanaSwapData";
 import {sha256} from "@noble/hashes/sha2";
 import {sign} from "tweetnacl";
 import {SignatureVerificationError, SwapDataVerificationError} from "@atomiqlabs/base";
-import {SolanaTx} from "../../base/modules/SolanaTransactions";
+import {SolanaTx} from "../../chain/modules/SolanaTransactions";
 import {
     Ed25519Program,
     PublicKey,
@@ -13,11 +13,11 @@ import {
     getAssociatedTokenAddressSync,
     TOKEN_PROGRAM_ID
 } from "@solana/spl-token";
-import {SolanaAction} from "../../base/SolanaAction";
+import {SolanaAction} from "../../chain/SolanaAction";
 import {toBN, tryWithRetries} from "../../../utils/Utils";
 import {Buffer} from "buffer";
 import {SolanaSigner} from "../../wallet/SolanaSigner";
-import {SolanaTokens} from "../../base/modules/SolanaTokens";
+import {SolanaTokens} from "../../chain/modules/SolanaTokens";
 import * as BN from "bn.js";
 
 export class SwapRefund extends SolanaSwapModule {
@@ -39,8 +39,8 @@ export class SwapRefund extends SolanaSwapModule {
         const accounts = {
             offerer: swapData.offerer,
             claimer: swapData.claimer,
-            escrowState: this.root.SwapEscrowState(Buffer.from(swapData.paymentHash, "hex")),
-            claimerUserData: !swapData.payOut ? this.root.SwapUserVault(swapData.claimer, swapData.token) : null,
+            escrowState: this.program.SwapEscrowState(Buffer.from(swapData.paymentHash, "hex")),
+            claimerUserData: !swapData.payOut ? this.program.SwapUserVault(swapData.claimer, swapData.token) : null,
             ixSysvar: refundAuthTimeout!=null ? SYSVAR_INSTRUCTIONS_PUBKEY : null
         };
 
@@ -49,13 +49,13 @@ export class SwapRefund extends SolanaSwapModule {
             const ata = getAssociatedTokenAddressSync(swapData.token, swapData.offerer);
 
             return new SolanaAction(swapData.offerer, this.root,
-                await this.program.methods
+                await this.swapProgram.methods
                     .offererRefundPayIn(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: TOKEN_PROGRAM_ID
                     })
                     .instruction(),
@@ -63,11 +63,11 @@ export class SwapRefund extends SolanaSwapModule {
             );
         } else {
             return new SolanaAction(swapData.offerer, this.root,
-                await this.program.methods
+                await this.swapProgram.methods
                     .offererRefund(toBN(useTimeout))
                     .accounts({
                         ...accounts,
-                        offererUserData: this.root.SwapUserVault(swapData.offerer, swapData.token)
+                        offererUserData: this.program.SwapUserVault(swapData.offerer, swapData.token)
                     })
                     .instruction(),
                 SwapRefund.CUCosts.REFUND
@@ -166,7 +166,7 @@ export class SwapRefund extends SolanaSwapModule {
         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 SignatureVerificationError("Authorization expired!");
 
         const signatureBuffer = Buffer.from(signature, "hex");
@@ -193,13 +193,13 @@ export class SwapRefund extends SolanaSwapModule {
         initAta?: boolean,
         feeRate?: string
     ): Promise<SolanaTx[]> {
-        if(check && !await tryWithRetries(() => this.root.isRequestRefundable(swapData.offerer.toString(), swapData), this.retryPolicy)) {
+        if(check && !await tryWithRetries(() => this.program.isRequestRefundable(swapData.offerer.toString(), swapData), this.retryPolicy)) {
             throw new SwapDataVerificationError("Not refundable yet!");
         }
         const shouldInitAta = swapData.isPayIn() && !await this.root.Tokens.ataExists(swapData.offererAta);
         if(shouldInitAta && !initAta) throw new SwapDataVerificationError("ATA not initialized");
 
-        if(feeRate==null) feeRate = await this.root.getRefundFeeRate(swapData)
+        if(feeRate==null) feeRate = await this.program.getRefundFeeRate(swapData)
 
         const shouldUnwrap = this.shouldUnwrap(swapData);
         const action = new SolanaAction(swapData.offerer, this.root);
@@ -237,7 +237,7 @@ export class SwapRefund extends SolanaSwapModule {
         initAta?: boolean,
         feeRate?: string
     ): Promise<SolanaTx[]> {
-        if(check && !await tryWithRetries(() => this.root.isCommited(swapData), this.retryPolicy)) {
+        if(check && !await tryWithRetries(() => this.program.isCommited(swapData), this.retryPolicy)) {
             throw new SwapDataVerificationError("Not correctly committed");
         }
         await tryWithRetries(
@@ -248,7 +248,7 @@ export class SwapRefund extends SolanaSwapModule {
         const shouldInitAta = swapData.isPayIn() && !await this.root.Tokens.ataExists(swapData.offererAta);
         if(shouldInitAta && !initAta) throw new SwapDataVerificationError("ATA not initialized");
 
-        if(feeRate==null) feeRate = await this.root.getRefundFeeRate(swapData);
+        if(feeRate==null) feeRate = await this.program.getRefundFeeRate(swapData);
         console.log("[SolanaSwapProgram] txsRefundsWithAuthorization: feeRate: ", feeRate);
 
         const signatureBuffer = Buffer.from(signature, "hex");
@@ -272,19 +272,19 @@ export class SwapRefund extends SolanaSwapModule {
     public getRefundFeeRate(swapData: SolanaSwapData): Promise<string> {
         const accounts: PublicKey[] = [];
         if(swapData.payIn) {
-            if(swapData.token!=null) accounts.push(this.root.SwapVault(swapData.token));
+            if(swapData.token!=null) accounts.push(this.program.SwapVault(swapData.token));
             if(swapData.offerer!=null) accounts.push(swapData.offerer);
             if(swapData.claimer!=null) accounts.push(swapData.claimer);
             if(swapData.offererAta!=null && !swapData.offererAta.equals(PublicKey.default)) accounts.push(swapData.offererAta);
         } else {
             if(swapData.offerer!=null) {
                 accounts.push(swapData.offerer);
-                if(swapData.token!=null) accounts.push(this.root.SwapUserVault(swapData.offerer, swapData.token));
+                if(swapData.token!=null) 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.from(swapData.paymentHash, "hex")));
+        if(swapData.paymentHash!=null) accounts.push(this.program.SwapEscrowState(Buffer.from(swapData.paymentHash, "hex")));
 
         return this.root.Fees.getFeeRate(accounts);
     }

package/dist/solana/base/SolanaBase.d.ts

@@ -1,36 +0,0 @@
-import { Connection } from "@solana/web3.js";
-import { SolanaFees } from "./modules/SolanaFees";
-import { SolanaBlocks } from "./modules/SolanaBlocks";
-import { SolanaSlots } from "./modules/SolanaSlots";
-import { SolanaTokens } from "./modules/SolanaTokens";
-import { SolanaTransactions } from "./modules/SolanaTransactions";
-import { SolanaAddresses } from "./modules/SolanaAddresses";
-import { SolanaSignatures } from "./modules/SolanaSignatures";
-import { SolanaEvents } from "./modules/SolanaEvents";
-export type SolanaRetryPolicy = {
-    maxRetries?: number;
-    delay?: number;
-    exponential?: boolean;
-    transactionResendInterval?: number;
-};
-export declare class SolanaBase {
-    readonly SLOT_TIME = 400;
-    readonly TX_SLOT_VALIDITY = 151;
-    readonly connection: Connection;
-    readonly retryPolicy: SolanaRetryPolicy;
-    readonly Blocks: SolanaBlocks;
-    Fees: SolanaFees;
-    readonly Slots: SolanaSlots;
-    readonly Tokens: SolanaTokens;
-    readonly Transactions: SolanaTransactions;
-    readonly Addresses: SolanaAddresses;
-    readonly Signatures: SolanaSignatures;
-    readonly Events: SolanaEvents;
-    protected readonly logger: {
-        debug: (msg: any, ...args: any[]) => void;
-        info: (msg: any, ...args: any[]) => void;
-        warn: (msg: any, ...args: any[]) => void;
-        error: (msg: any, ...args: any[]) => void;
-    };
-    constructor(connection: Connection, retryPolicy?: SolanaRetryPolicy, solanaFeeEstimator?: SolanaFees);
-}

package/dist/solana/base/SolanaBase.js

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SolanaBase = void 0;
-const SolanaFees_1 = require("./modules/SolanaFees");
-const SolanaBlocks_1 = require("./modules/SolanaBlocks");
-const SolanaSlots_1 = require("./modules/SolanaSlots");
-const SolanaTokens_1 = require("./modules/SolanaTokens");
-const SolanaTransactions_1 = require("./modules/SolanaTransactions");
-const SolanaAddresses_1 = require("./modules/SolanaAddresses");
-const SolanaSignatures_1 = require("./modules/SolanaSignatures");
-const SolanaEvents_1 = require("./modules/SolanaEvents");
-const Utils_1 = require("../../utils/Utils");
-class SolanaBase {
-    constructor(connection, retryPolicy, solanaFeeEstimator = new SolanaFees_1.SolanaFees(connection)) {
-        this.SLOT_TIME = 400;
-        this.TX_SLOT_VALIDITY = 151;
-        this.logger = (0, Utils_1.getLogger)(this.constructor.name + ": ");
-        this.connection = connection;
-        this.retryPolicy = retryPolicy;
-        this.Blocks = new SolanaBlocks_1.SolanaBlocks(this);
-        this.Fees = solanaFeeEstimator;
-        this.Slots = new SolanaSlots_1.SolanaSlots(this);
-        this.Tokens = new SolanaTokens_1.SolanaTokens(this);
-        this.Transactions = new SolanaTransactions_1.SolanaTransactions(this);
-        this.Addresses = new SolanaAddresses_1.SolanaAddresses(this);
-        this.Signatures = new SolanaSignatures_1.SolanaSignatures(this);
-        this.Events = new SolanaEvents_1.SolanaEvents(this);
-    }
-}
-exports.SolanaBase = SolanaBase;

package/dist/solana/base/modules/SolanaAddresses.d.ts

@@ -1,9 +0,0 @@
-import { SolanaModule } from "../SolanaModule";
-export declare class SolanaAddresses extends SolanaModule {
-    /**
-     * Checks whether an address is a valid Solana address (base58 encoded ed25519 public key)
-     *
-     * @param address
-     */
-    isValidAddress(address: string): boolean;
-}

package/src/solana/base/SolanaBase.ts

@@ -1,56 +0,0 @@
-import {Connection} from "@solana/web3.js";
-import {SolanaFees} from "./modules/SolanaFees";
-import {SolanaBlocks} from "./modules/SolanaBlocks";
-import {SolanaSlots} from "./modules/SolanaSlots";
-import {SolanaTokens} from "./modules/SolanaTokens";
-import {SolanaTransactions} from "./modules/SolanaTransactions";
-import {SolanaAddresses} from "./modules/SolanaAddresses";
-import {SolanaSignatures} from "./modules/SolanaSignatures";
-import {SolanaEvents} from "./modules/SolanaEvents";
-import {getLogger} from "../../utils/Utils";
-
-export type SolanaRetryPolicy = {
-    maxRetries?: number,
-    delay?: number,
-    exponential?: boolean,
-    transactionResendInterval?: number
-}
-
-export class SolanaBase {
-
-    public readonly SLOT_TIME = 400;
-    public readonly TX_SLOT_VALIDITY = 151;
-
-    readonly connection: Connection;
-    readonly retryPolicy: SolanaRetryPolicy;
-
-    public readonly Blocks: SolanaBlocks;
-    public Fees: SolanaFees;
-    public readonly Slots: SolanaSlots;
-    public readonly Tokens: SolanaTokens;
-    public readonly Transactions: SolanaTransactions;
-    public readonly Addresses: SolanaAddresses;
-    public readonly Signatures: SolanaSignatures;
-    public readonly Events: SolanaEvents;
-
-    protected readonly logger = getLogger(this.constructor.name+": ");
-
-    constructor(
-        connection: Connection,
-        retryPolicy?: SolanaRetryPolicy,
-        solanaFeeEstimator: SolanaFees = new SolanaFees(connection)
-    ) {
-        this.connection = connection;
-        this.retryPolicy = retryPolicy;
-
-        this.Blocks = new SolanaBlocks(this);
-        this.Fees = solanaFeeEstimator;
-        this.Slots = new SolanaSlots(this);
-        this.Tokens = new SolanaTokens(this);
-        this.Transactions = new SolanaTransactions(this);
-        this.Addresses = new SolanaAddresses(this);
-        this.Signatures = new SolanaSignatures(this);
-        this.Events = new SolanaEvents(this);
-    }
-
-}