@atomiqlabs/chain-solana 7.3.6 → 7.3.7

package/dist/solana/swaps/SolanaSwapProgram.js

@@ -284,9 +284,9 @@ class SolanaSwapProgram extends SolanaProgramBase_1.SolanaProgramBase {
             if (inContract)
                 return yield this.getIntermediaryBalance(publicKey, token);
             let { balance, ataExists } = yield this.Tokens.getTokenBalance(publicKey, token);
-            if (token.equals(this.Tokens.WSOL_ADDRESS) && !ataExists) {
-                const feeCosts = new BN(this.Tokens.SPL_ATA_RENT_EXEMPT);
-                balance = BN.max(balance.sub(feeCosts), new BN(0));
+            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;

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

@@ -117,13 +117,12 @@ export declare class SwapClaim extends SolanaSwapModule {
     }, feeRate?: string): Promise<SolanaTx[] | null>;
     getClaimFeeRate(signer: PublicKey, swapData: SolanaSwapData): Promise<string>;
     /**
-     * Get the estimated solana transaction fee of the claim transaction, this fee might be negative since it
-     *  includes the rebate for closing the swap PDA
+     * Get the estimated solana transaction fee of the claim transaction in the worst case scenario in case where the
+     *  ATA needs to be initialized again (i.e. adding the ATA rent exempt lamports to the fee)
      */
     getClaimFee(signer: PublicKey, swapData: SolanaSwapData, feeRate?: string): Promise<BN>;
     /**
-     * Get the estimated solana transaction fee of the claim transaction in the worst case scenario in case where the
-     *  ATA needs to be initialized again (i.e. adding the ATA rent exempt lamports to the fee)
+     * Get the estimated solana transaction fee of the claim transaction, without
      */
     getRawClaimFee(signer: PublicKey, swapData: SolanaSwapData, feeRate?: string): Promise<BN>;
 }

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

@@ -273,20 +273,16 @@ class SwapClaim extends SolanaSwapModule_1.SolanaSwapModule {
         return this.root.Fees.getFeeRate(accounts);
     }
     /**
-     * Get the estimated solana transaction fee of the claim transaction, this fee might be negative since it
-     *  includes the rebate for closing the swap PDA
+     * Get the estimated solana transaction fee of the claim transaction in the worst case scenario in case where the
+     *  ATA needs to be initialized again (i.e. adding the ATA rent exempt lamports to the fee)
      */
     getClaimFee(signer, swapData, feeRate) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (swapData == null)
-                return new BN(-this.root.ESCROW_STATE_RENT_EXEMPT + 5000);
-            feeRate = feeRate || (yield this.getClaimFeeRate(signer, swapData));
-            return new BN(-this.root.ESCROW_STATE_RENT_EXEMPT + 5000).add(this.root.Fees.getPriorityFee(this.getComputeBudget(swapData), feeRate));
+            return new BN(swapData == null || swapData.payOut ? this.root.Tokens.SPL_ATA_RENT_EXEMPT : 0).add(yield this.getRawClaimFee(signer, swapData, feeRate));
         });
     }
     /**
-     * Get the estimated solana transaction fee of the claim transaction in the worst case scenario in case where the
-     *  ATA needs to be initialized again (i.e. adding the ATA rent exempt lamports to the fee)
+     * Get the estimated solana transaction fee of the claim transaction, without
      */
     getRawClaimFee(signer, swapData, feeRate) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -294,7 +290,7 @@ class SwapClaim extends SolanaSwapModule_1.SolanaSwapModule {
                 return new BN(5000);
             feeRate = feeRate || (yield this.getClaimFeeRate(signer, swapData));
             //Include rent exempt in claim fee, to take into consideration worst case cost when user destroys ATA
-            return new BN(this.root.Tokens.SPL_ATA_RENT_EXEMPT + 5000).add(this.root.Fees.getPriorityFee(this.getComputeBudget(swapData), feeRate));
+            return new BN(5000).add(this.root.Fees.getPriorityFee(this.getComputeBudget(swapData), feeRate));
         });
     }
 }

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

@@ -207,6 +207,7 @@ export declare class SwapInit extends SolanaSwapModule {
     getInitFeeRate(offerer?: PublicKey, claimer?: PublicKey, token?: PublicKey, paymentHash?: string): Promise<string>;
     /**
      * Get the estimated solana fee of the init transaction, this includes the required deposit for creating swap PDA
+     *  and also deposit for ATAs
      */
     getInitFee(swapData: SolanaSwapData, feeRate?: string): Promise<BN>;
     /**

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

@@ -487,10 +487,29 @@ class SwapInit extends SolanaSwapModule_1.SolanaSwapModule {
     }
     /**
      * Get the estimated solana fee of the init transaction, this includes the required deposit for creating swap PDA
+     *  and also deposit for ATAs
      */
     getInitFee(swapData, feeRate) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new BN(this.root.ESCROW_STATE_RENT_EXEMPT).add(yield this.getRawInitFee(swapData, feeRate));
+            if (swapData == null)
+                return new BN(this.root.ESCROW_STATE_RENT_EXEMPT).add(yield this.getRawInitFee(swapData, feeRate));
+            feeRate = feeRate ||
+                (swapData.payIn
+                    ? yield this.getInitPayInFeeRate(swapData.offerer, swapData.claimer, swapData.token, swapData.paymentHash)
+                    : yield this.getInitFeeRate(swapData.offerer, swapData.claimer, swapData.token, swapData.paymentHash));
+            const [rawFee, initAta] = yield Promise.all([
+                this.getRawInitFee(swapData, feeRate),
+                swapData != null && swapData.payOut ?
+                    this.root.Tokens.getATAOrNull((0, spl_token_1.getAssociatedTokenAddressSync)(swapData.claimer, swapData.token)).then(acc => acc == null) :
+                    Promise.resolve(null)
+            ]);
+            let resultingFee = new BN(this.root.ESCROW_STATE_RENT_EXEMPT).add(rawFee);
+            if (initAta)
+                resultingFee = resultingFee.add(new BN(this.root.Tokens.SPL_ATA_RENT_EXEMPT));
+            if (swapData.payIn && this.shouldWrapOnInit(swapData, feeRate) && this.extractAtaDataFromFeeRate(feeRate).initAta) {
+                resultingFee = resultingFee.add(new BN(this.root.Tokens.SPL_ATA_RENT_EXEMPT));
+            }
+            return resultingFee;
         });
     }
     /**

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

@@ -72,8 +72,8 @@ export declare class SwapRefund extends SolanaSwapModule {
     txsRefundWithAuthorization(swapData: SolanaSwapData, timeout: string, prefix: string, signature: string, check?: boolean, initAta?: boolean, feeRate?: string): Promise<SolanaTx[]>;
     getRefundFeeRate(swapData: SolanaSwapData): Promise<string>;
     /**
-     * Get the estimated solana transaction fee of the refund transaction, this fee might be negative since it
-     *  includes the rebate for closing the swap PDA
+     * Get the estimated solana transaction fee of the refund transaction, in the worst case scenario in case where the
+     *  ATA needs to be initialized again (i.e. adding the ATA rent exempt lamports to the fee)
      */
     getRefundFee(swapData: SolanaSwapData, feeRate?: string): Promise<BN>;
     /**

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

@@ -235,13 +235,12 @@ class SwapRefund extends SolanaSwapModule_1.SolanaSwapModule {
         return this.root.Fees.getFeeRate(accounts);
     }
     /**
-     * Get the estimated solana transaction fee of the refund transaction, this fee might be negative since it
-     *  includes the rebate for closing the swap PDA
+     * Get the estimated solana transaction fee of the refund transaction, in the worst case scenario in case where the
+     *  ATA needs to be initialized again (i.e. adding the ATA rent exempt lamports to the fee)
      */
     getRefundFee(swapData, feeRate) {
         return __awaiter(this, void 0, void 0, function* () {
-            const rawFee = yield this.getRawRefundFee(swapData, feeRate);
-            return rawFee.sub(new BN(this.root.ESCROW_STATE_RENT_EXEMPT));
+            return new BN(swapData == null || swapData.payIn ? this.root.Tokens.SPL_ATA_RENT_EXEMPT : 0).add(yield this.getRawRefundFee(swapData, feeRate));
         });
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-solana",
-  "version": "7.3.6",
+  "version": "7.3.7",
   "description": "Solana specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",

package/src/solana/swaps/SolanaSwapProgram.ts

@@ -360,9 +360,9 @@ export class SolanaSwapProgram
         if(inContract) return await this.getIntermediaryBalance(publicKey, token);
 
         let { balance, ataExists } = await this.Tokens.getTokenBalance(publicKey, token);
-        if(token.equals(this.Tokens.WSOL_ADDRESS) && !ataExists) {
-            const feeCosts = new BN(this.Tokens.SPL_ATA_RENT_EXEMPT);
-            balance = BN.max(balance.sub(feeCosts), new BN(0));
+        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;

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

@@ -366,22 +366,17 @@ export class SwapClaim extends SolanaSwapModule {
     }
 
     /**
-     * Get the estimated solana transaction fee of the claim transaction, this fee might be negative since it
-     *  includes the rebate for closing the swap PDA
+     * Get the estimated solana transaction fee of the claim transaction in the worst case scenario in case where the
+     *  ATA needs to be initialized again (i.e. adding the ATA rent exempt lamports to the fee)
      */
     public async getClaimFee(signer: PublicKey, swapData: SolanaSwapData, feeRate?: string): Promise<BN> {
-        if(swapData==null) return new BN(-this.root.ESCROW_STATE_RENT_EXEMPT+5000);
-
-        feeRate = feeRate || await this.getClaimFeeRate(signer, swapData);
-
-        return new BN(-this.root.ESCROW_STATE_RENT_EXEMPT+5000).add(
-            this.root.Fees.getPriorityFee(this.getComputeBudget(swapData), feeRate)
+        return new BN(swapData==null || swapData.payOut ? this.root.Tokens.SPL_ATA_RENT_EXEMPT : 0).add(
+            await this.getRawClaimFee(signer, swapData, feeRate)
         );
     }
 
     /**
-     * Get the estimated solana transaction fee of the claim transaction in the worst case scenario in case where the
-     *  ATA needs to be initialized again (i.e. adding the ATA rent exempt lamports to the fee)
+     * Get the estimated solana transaction fee of the claim transaction, without
      */
     public async getRawClaimFee(signer: PublicKey, swapData: SolanaSwapData, feeRate?: string): Promise<BN> {
         if(swapData==null) return new BN(5000);
@@ -389,7 +384,7 @@ export class SwapClaim extends SolanaSwapModule {
         feeRate = feeRate || await this.getClaimFeeRate(signer, swapData);
 
         //Include rent exempt in claim fee, to take into consideration worst case cost when user destroys ATA
-        return new BN(this.root.Tokens.SPL_ATA_RENT_EXEMPT+5000).add(
+        return new BN(5000).add(
             this.root.Fees.getPriorityFee(this.getComputeBudget(swapData), feeRate)
         );
     }

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

@@ -602,11 +602,31 @@ export class SwapInit extends SolanaSwapModule {
 
     /**
      * Get the estimated solana fee of the init transaction, this includes the required deposit for creating swap PDA
+     *  and also deposit for ATAs
      */
     async getInitFee(swapData: SolanaSwapData, feeRate?: string): Promise<BN> {
-        return new BN(this.root.ESCROW_STATE_RENT_EXEMPT).add(
-            await this.getRawInitFee(swapData, feeRate)
-        );
+        if(swapData==null) return new BN(this.root.ESCROW_STATE_RENT_EXEMPT).add(await this.getRawInitFee(swapData, feeRate));
+
+        feeRate = feeRate ||
+            (swapData.payIn
+                ? await this.getInitPayInFeeRate(swapData.offerer, swapData.claimer, swapData.token, swapData.paymentHash)
+                : await this.getInitFeeRate(swapData.offerer, swapData.claimer, swapData.token, swapData.paymentHash));
+
+        const [rawFee, initAta] = await Promise.all([
+            this.getRawInitFee(swapData, feeRate),
+            swapData!=null && swapData.payOut ?
+                this.root.Tokens.getATAOrNull(getAssociatedTokenAddressSync(swapData.claimer, swapData.token)).then(acc => acc==null) :
+                Promise.resolve<null>(null)
+        ]);
+
+        let resultingFee = new BN(this.root.ESCROW_STATE_RENT_EXEMPT).add(rawFee);
+        if(initAta) resultingFee = resultingFee.add(new BN(this.root.Tokens.SPL_ATA_RENT_EXEMPT));
+
+        if(swapData.payIn && this.shouldWrapOnInit(swapData, feeRate) && this.extractAtaDataFromFeeRate(feeRate).initAta) {
+            resultingFee = resultingFee.add(new BN(this.root.Tokens.SPL_ATA_RENT_EXEMPT));
+        }
+
+        return resultingFee;
     }
 
     /**

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

@@ -290,12 +290,13 @@ export class SwapRefund extends SolanaSwapModule {
     }
 
     /**
-     * Get the estimated solana transaction fee of the refund transaction, this fee might be negative since it
-     *  includes the rebate for closing the swap PDA
+     * Get the estimated solana transaction fee of the refund transaction, in the worst case scenario in case where the
+     *  ATA needs to be initialized again (i.e. adding the ATA rent exempt lamports to the fee)
      */
     async getRefundFee(swapData: SolanaSwapData, feeRate?: string): Promise<BN> {
-        const rawFee = await this.getRawRefundFee(swapData, feeRate);
-        return rawFee.sub(new BN(this.root.ESCROW_STATE_RENT_EXEMPT));
+        return new BN(swapData==null || swapData.payIn ? this.root.Tokens.SPL_ATA_RENT_EXEMPT : 0).add(
+            await this.getRawRefundFee(swapData, feeRate)
+        );
     }
 
     /**