Merge pull request #224 from fukaoi/hotfix/ignore-dasUri

Hotfix/ignore das uri
fukaoi · Mar 5, 2024 · 55d21a0 · 55d21a0
2 parents c362a03 + 38595d2
commit 55d21a0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/packages/transaction-builder/src/priority-fee.ts b/packages/transaction-builder/src/priority-fee.ts
@@ -22,19 +22,29 @@ export namespace TransactionBuilder {
       debugLog('# estimates: ', estimates);
       try {
         // priority fee: medium
-        const lamports = estimates.isOk
-          ? estimates.unwrap().medium
-          : MINIMUM_PRIORITY_FEE;
+        const lamports =
+          estimates.isOk && estimates.unwrap().medium !== 0
+            ? estimates.unwrap().medium
+            : MINIMUM_PRIORITY_FEE;
         debugLog('# lamports: ', lamports);
-        return sendTransactionWithPriorityFee(lamports, transaction, signers);
+        return await sendTransactionWithPriorityFee(
+          lamports,
+          transaction,
+          signers,
+        );
       } catch (error) {
         debugLog('# priority fee error: ', error);
         // priority fee: high
-        const lamports = estimates.isOk
-          ? estimates.unwrap().high
-          : MINIMUM_PRIORITY_FEE;
+        const lamports =
+          estimates.isOk && estimates.unwrap().high !== 0
+            ? estimates.unwrap().high
+            : MINIMUM_PRIORITY_FEE;
         debugLog('# lamports: ', lamports);
-        return sendTransactionWithPriorityFee(lamports, transaction, signers);
+        return await sendTransactionWithPriorityFee(
+          lamports,
+          transaction,
+          signers,
+        );
       }
     };
 

diff --git a/packages/transaction-builder/test/priority-fee.test.ts b/packages/transaction-builder/test/priority-fee.test.ts
@@ -104,7 +104,7 @@ test('[PartialSignStructure]Set priority fee', async (t) => {
   );
 });
 
-test.only('[BatchStructure]Set priority fee', async (t) => {
+test('[BatchStructure]Set priority fee', async (t) => {
   const TOKEN_METADATA = {
     name: 'solana-suite-token',
     symbol: 'SST',