@atomiqlabs/chain-solana 7.3.3 → 7.3.4

package/dist/solana/btcrelay/SolanaBtcRelay.js

@@ -430,19 +430,15 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
      */
     estimateSynchronizeFee(requiredBlockheight, feeRate) {
         return __awaiter(this, void 0, void 0, function* () {
-            // const tipData = await this.getTipData();
-            // const currBlockheight = tipData.blockheight;
-            //
-            // const blockheightDelta = requiredBlockheight-currBlockheight;
-            //
-            // if(blockheightDelta<=0) return new BN(0);
-            //
-            // const synchronizationFee = new BN(blockheightDelta).mul(await this.getFeePerBlock(feeRate));
-            // this.logger.debug("estimateSynchronizeFee(): required blockheight: "+requiredBlockheight+
-            //     " blockheight delta: "+blockheightDelta+" fee: "+synchronizationFee.toString(10));
-            //
-            // return synchronizationFee;
-            return new BN(5000000);
+            const tipData = yield this.getTipData();
+            const currBlockheight = tipData.blockheight;
+            const blockheightDelta = requiredBlockheight - currBlockheight;
+            if (blockheightDelta <= 0)
+                return new BN(0);
+            const synchronizationFee = new BN(blockheightDelta).mul(yield this.getFeePerBlock(feeRate));
+            this.logger.debug("estimateSynchronizeFee(): required blockheight: " + requiredBlockheight +
+                " blockheight delta: " + blockheightDelta + " fee: " + synchronizationFee.toString(10));
+            return synchronizationFee;
         });
     }
     /**
@@ -452,8 +448,9 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
      */
     getFeePerBlock(feeRate) {
         return __awaiter(this, void 0, void 0, function* () {
-            feeRate = feeRate || (yield this.getMainFeeRate(null));
-            return BASE_FEE_SOL_PER_BLOCKHEADER.add(this.Fees.getPriorityFee(200000, feeRate, false));
+            // feeRate = feeRate || await this.getMainFeeRate(null);
+            // return BASE_FEE_SOL_PER_BLOCKHEADER.add(this.Fees.getPriorityFee(200000, feeRate, false));
+            return new BN(50000);
         });
     }
     /**

package/package.json

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

package/src/solana/btcrelay/SolanaBtcRelay.ts

@@ -541,19 +541,18 @@ export class SolanaBtcRelay<B extends BtcBlock> extends SolanaProgramBase<any> i
      * @param feeRate
      */
     public async estimateSynchronizeFee(requiredBlockheight: number, feeRate?: string): Promise<BN> {
-        // const tipData = await this.getTipData();
-        // const currBlockheight = tipData.blockheight;
-        //
-        // const blockheightDelta = requiredBlockheight-currBlockheight;
-        //
-        // if(blockheightDelta<=0) return new BN(0);
-        //
-        // const synchronizationFee = new BN(blockheightDelta).mul(await this.getFeePerBlock(feeRate));
-        // this.logger.debug("estimateSynchronizeFee(): required blockheight: "+requiredBlockheight+
-        //     " blockheight delta: "+blockheightDelta+" fee: "+synchronizationFee.toString(10));
-        //
-        // return synchronizationFee;
-        return new BN(5000000);
+        const tipData = await this.getTipData();
+        const currBlockheight = tipData.blockheight;
+
+        const blockheightDelta = requiredBlockheight-currBlockheight;
+
+        if(blockheightDelta<=0) return new BN(0);
+
+        const synchronizationFee = new BN(blockheightDelta).mul(await this.getFeePerBlock(feeRate));
+        this.logger.debug("estimateSynchronizeFee(): required blockheight: "+requiredBlockheight+
+            " blockheight delta: "+blockheightDelta+" fee: "+synchronizationFee.toString(10));
+
+        return synchronizationFee;
     }
 
     /**
@@ -562,8 +561,9 @@ export class SolanaBtcRelay<B extends BtcBlock> extends SolanaProgramBase<any> i
      * @param feeRate
      */
     public async getFeePerBlock(feeRate?: string): Promise<BN> {
-        feeRate = feeRate || await this.getMainFeeRate(null);
-        return BASE_FEE_SOL_PER_BLOCKHEADER.add(this.Fees.getPriorityFee(200000, feeRate, false));
+        // feeRate = feeRate || await this.getMainFeeRate(null);
+        // return BASE_FEE_SOL_PER_BLOCKHEADER.add(this.Fees.getPriorityFee(200000, feeRate, false));
+        return new BN(50000);
     }
 
     /**