Merge branch 'master' into knorrium/update-node-matrix

[accelerator] display payment errors, auto reload after 10 secs instead of 3 secs

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ jobs:
     if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')"
     strategy:
       matrix:
-        node: ["20", "21"]
+        node: ["20", "22"]
         flavor: ["dev", "prod"]
       fail-fast: false
     runs-on: "ubuntu-latest"
@@ -160,7 +160,7 @@ jobs:
     if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')"
     strategy:
       matrix:
-        node: ["20", "21"]
+        node: ["20", "22"]
         flavor: ["dev", "prod"]
       fail-fast: false
     runs-on: "ubuntu-latest"
@@ -263,7 +263,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 20
+          node-version: 22
           cache: "npm"
           cache-dependency-path: ${{ matrix.module }}/frontend/package-lock.json
 

.nvmrc

@@ -1 +1 @@
-v20.8.0
+v22.13.0

frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.html

@@ -1,10 +1,18 @@
 <div class="box card w-100 accelerate-checkout-inner" [class.input-disabled]="isCheckoutLocked > 0" style="background: var(--box-bg)" id=acceleratePreviewAnchor>
   @if (accelerateError) {
-    <div class="row mb-1 text-center">
+    @if (accelerateError.includes('Payment declined')) {
-      <div class="col-sm">
+      <div class="row mb-1 text-center">
-        <h1 style="font-size: larger;" i18n="accelerator.sorry-error-title">Sorry, something went wrong!</h1>
+        <div class="col-sm">
+          <h1 style="font-size: larger;">{{ accelerateError }}</h1>
+        </div>
       </div>
-    </div>
+    } @else {
+      <div class="row mb-1 text-center">
+        <div class="col-sm">
+          <h1 style="font-size: larger;" i18n="accelerator.sorry-error-title">Sorry, something went wrong!</h1>
+        </div>
+      </div>
+    }
     <div class="row text-center mt-1">
       <div class="col-sm">
         <div class="d-flex flex-row justify-content-center align-items-center">

frontend/src/app/components/accelerate-checkout/accelerate-checkout.component.ts

@@ -559,7 +559,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
                         // Reset everything by reloading the page :D, can be improved
                         const urlParams = new URLSearchParams(window.location.search);
                         window.location.assign(window.location.toString().replace(`?cash_request_id=${urlParams.get('cash_request_id')}`, ``));
-                      }, 3000);
+                      }, 10000);
                     }
                   }
                 });
@@ -686,7 +686,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
                       // Reset everything by reloading the page :D, can be improved
                       const urlParams = new URLSearchParams(window.location.search);
                       window.location.assign(window.location.toString().replace(`?cash_request_id=${urlParams.get('cash_request_id')}`, ``));
-                    }, 3000);
+                    }, 10000);
                   }
                 }
               });
@@ -785,7 +785,7 @@ export class AccelerateCheckout implements OnInit, OnDestroy {
                     // Reset everything by reloading the page :D, can be improved
                     const urlParams = new URLSearchParams(window.location.search);
                     window.location.assign(window.location.toString().replace(`?cash_request_id=${urlParams.get('cash_request_id')}`, ``));
-                  }, 3000);
+                  }, 10000);
                 }
               }
             });

frontend/src/app/components/stratum/stratum-list/stratum-list.component.ts

@@ -8,8 +8,10 @@ import { SinglePoolStats } from '../../../interfaces/node-api.interface';
 
 type MerkleCellType = ' ' | '┬' | '├' | '└' | '│' | '─' | 'leaf';
 
+
 interface TaggedStratumJob extends StratumJob {
   tag: string;
+  merkleBranchIds: string[];
 }
 
 interface MerkleCell {
@@ -46,6 +48,18 @@ function parseTag(scriptSig: string): string {
   return (ascii.match(/\/.*\//)?.[0] || ascii).trim();
 }
 
+function getMerkleBranchIds(merkleBranches: string[], numBranches: number): string[] {
+  let lastHash = '';
+  const ids: string[] = [];
+  for (let i = 0; i < numBranches; i++) {
+    if (merkleBranches[i]) {
+      lastHash = merkleBranches[i];
+    }
+    ids.push(`${i}-${lastHash}`);
+  }
+  return ids;
+}
+
 @Component({
   selector: 'app-stratum-list',
   templateUrl: './stratum-list.component.html',
@@ -81,16 +95,15 @@ export class StratumList implements OnInit, OnDestroy {
   }
 
   processJobs(rawJobs: Record<string, StratumJob>): PoolRow[] {
+    const numBranches = Math.max(...Object.values(rawJobs).map(job => job.merkleBranches.length));
     const jobs: Record<string, TaggedStratumJob> = {};
     for (const [id, job] of Object.entries(rawJobs)) {
-      jobs[id] = { ...job, tag: parseTag(job.scriptsig) };
+      jobs[id] = { ...job, tag: parseTag(job.scriptsig), merkleBranchIds: getMerkleBranchIds(job.merkleBranches, numBranches) };
     }
     if (Object.keys(jobs).length === 0) {
       return [];
     }
 
-    const numBranches = Math.max(...Object.values(jobs).map(job => job.merkleBranches.length));
-
     let trees: MerkleTree[] = Object.keys(jobs).map(job => ({
       job,
       size: 1,
@@ -100,12 +113,13 @@ export class StratumList implements OnInit, OnDestroy {
     for (let col = numBranches - 1; col >= 0; col--) {
       const groups: Record<string, MerkleTree[]> = {};
       for (const tree of trees) {
-        const hash = jobs[tree.job].merkleBranches[col];
+        const branchId = jobs[tree.job].merkleBranchIds[col];
-        if (!groups[hash]) {
+        if (!groups[branchId]) {
-          groups[hash] = [];
+          groups[branchId] = [];
         }
-        groups[hash].push(tree);
+        groups[branchId].push(tree);
       }
+
       trees = Object.values(groups).map(group => ({
         hash: jobs[group[0].job].merkleBranches[col],
         job: group[0].job,

frontend/src/app/shared/shared.module.ts

@@ -7,7 +7,7 @@ import { faFilter, faAngleDown, faAngleUp, faAngleRight, faAngleLeft, faBolt, fa
   faFileAlt, faRedoAlt, faArrowAltCircleRight, faExternalLinkAlt, faBook, faListUl, faDownload, faQrcode, faArrowRightArrowLeft, faArrowsRotate, faCircleLeft,
   faFastForward, faWallet, faUserClock, faWrench, faUserFriends, faQuestionCircle, faHistory, faSignOutAlt, faKey, faSuitcase, faIdCardAlt, faNetworkWired, faUserCheck,
   faCircleCheck, faUserCircle, faCheck, faRocket, faScaleBalanced, faHourglassStart, faHourglassHalf, faHourglassEnd, faWandMagicSparkles, faFaucetDrip, faTimeline,
-  faCircleXmark, faCalendarCheck, faMoneyBillTrendUp, faRobot } from '@fortawesome/free-solid-svg-icons';
+  faCircleXmark, faCalendarCheck, faMoneyBillTrendUp, faRobot, faShareNodes } from '@fortawesome/free-solid-svg-icons';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import { MenuComponent } from '@components/menu/menu.component';
 import { PreviewTitleComponent } from '@components/master-page-preview/preview-title.component';
@@ -459,5 +459,6 @@ export class SharedModule {
     library.addIcons(faCalendarCheck);
     library.addIcons(faMoneyBillTrendUp);
     library.addIcons(faRobot);
+    library.addIcons(faShareNodes);
   }
 }

production/mempool-config.mainnet.json

@@ -154,5 +154,9 @@
   "WALLETS": {
     "ENABLED": true,
     "WALLETS": ["BITB", "3350"]
+  },
+  "STRATUM": {
+    "ENABLED": true,
+    "API": "http://127.0.0.1:81/api/v1/stratum/ws"
   }
 }

production/mempool-frontend-config.mainnet.json

@@ -4,8 +4,7 @@
   "TESTNET4_ENABLED": true,
   "LIQUID_ENABLED": false,
   "LIQUID_TESTNET_ENABLED": false,
-  "BISQ_ENABLED": true,
+  "STRATUM_ENABLED": true,
-  "BISQ_SEPARATE_BACKEND": true,
   "SIGNET_ENABLED": true,
   "MEMPOOL_WEBSITE_URL": "https://mempool.space",
   "LIQUID_WEBSITE_URL": "https://liquid.network",