Merge branch 'filter-unspent-address-api' into 'dev'

Add filter to ensure node api issue do not interefere with the permit check results Closes #42 See merge request ergo/rosen-bridge/health-check!39
rosen-bridge · Dec 23, 2024 · 4adaf03 · 4adaf03
2 parents 844aa41 + dd00b84
commit 4adaf03
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 8 deletions.
diff --git a/.changeset/serious-yaks-cross.md b/.changeset/serious-yaks-cross.md
@@ -0,0 +1,5 @@
+---
+'@rosen-bridge/permit-check': patch
+---
+
+Add filter to ensure node api issue do not interefere with the permit check results
diff --git a/packages/permit-check/lib/node.ts b/packages/permit-check/lib/node.ts
@@ -41,16 +41,29 @@ class NodePermitHealthCheckParam extends AbstractPermitHealthCheckParam {
       });
 
       boxes.forEach((box) => {
-        const R4 = box.additionalRegisters['R4'];
+        /**
+         * TODO: remove extra filter (local:ergo/rosen-bridge/health-check/-/issues/43)
+         * The getBoxesByAddressUnspent node API has issues: it returns not only
+         * unspent boxes for the specified address but also unrelated boxes from
+         * different addresses
+         * This filter is added to ensure such boxes do not interfere with the
+         * results
+         */
         if (
-          R4 &&
-          Buffer.from(
-            wasm.Constant.decode_from_base16(R4).to_byte_array(),
-          ).toString('hex') === this.WID
+          box.address == this.permitAddress &&
+          box.spentTransactionId == null
         ) {
-          RWTCount +=
-            box.assets?.find((token) => token.tokenId === this.RWT)?.amount ??
-            0n;
+          const R4 = box.additionalRegisters['R4'];
+          if (
+            R4 &&
+            Buffer.from(
+              wasm.Constant.decode_from_base16(R4).to_byte_array(),
+            ).toString('hex') === this.WID
+          ) {
+            RWTCount +=
+              box.assets?.find((token) => token.tokenId === this.RWT)?.amount ??
+              0n;
+          }
         }
       });
 

diff --git a/packages/permit-check/tests/testData.ts b/packages/permit-check/tests/testData.ts
@@ -61,6 +61,7 @@ export const explorerUnspentBoxesByAddress = {
 
 export const nodeUnspentBoxesByAddress = [
   {
+    address: 'permitAddress',
     assets: [
       {
         tokenId:
@@ -74,6 +75,7 @@ export const nodeUnspentBoxesByAddress = [
     },
   },
   {
+    address: 'permitAddress',
     assets: [
       {
         tokenId:
@@ -87,6 +89,7 @@ export const nodeUnspentBoxesByAddress = [
     },
   },
   {
+    address: 'permitAddress',
     assets: [
       {
         tokenId:
@@ -100,6 +103,7 @@ export const nodeUnspentBoxesByAddress = [
     },
   },
   {
+    address: 'permitAddress',
     assets: [
       {
         tokenId: