From 8059c3e06cbd41cb33abfc84a8d02c46d82f92c3 Mon Sep 17 00:00:00 2001
From: bluezdot <72647326+bluezdot@users.noreply.github.com>
Date: Tue, 25 Jun 2024 12:42:32 +0700
Subject: [PATCH] [Issue-208] Update interface rune utxos

---
 .../bitcoin/strategy/BlockStream/index.ts     |  2 +-
 .../bitcoin/strategy/BlockStream/types.ts     | 19 ++++++++++---------
 .../src/services/hiro-service/index.ts        |  4 ++--
 .../src/services/rune-service/index.ts        |  4 ++--
 .../src/utils/bitcoin/utxo-management.ts      |  2 +-
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/packages/extension-base/src/services/chain-service/handler/bitcoin/strategy/BlockStream/index.ts b/packages/extension-base/src/services/chain-service/handler/bitcoin/strategy/BlockStream/index.ts
index 6652dc81f53..5f51c498de0 100644
--- a/packages/extension-base/src/services/chain-service/handler/bitcoin/strategy/BlockStream/index.ts
+++ b/packages/extension-base/src/services/chain-service/handler/bitcoin/strategy/BlockStream/index.ts
@@ -307,7 +307,7 @@ export class BlockStreamRequestStrategy extends BaseApiRequestStrategy implement
     try {
       const responseRuneUtxos = await runeService.getAddressRuneUtxos(address);
 
-      return responseRuneUtxos.utxo;
+      return responseRuneUtxos.utxoItems;
     } catch (error) {
       console.error(`Failed to get ${address} rune utxos`, error);
       throw error;
diff --git a/packages/extension-base/src/services/chain-service/handler/bitcoin/strategy/BlockStream/types.ts b/packages/extension-base/src/services/chain-service/handler/bitcoin/strategy/BlockStream/types.ts
index 28b497c3cab..662b6528470 100644
--- a/packages/extension-base/src/services/chain-service/handler/bitcoin/strategy/BlockStream/types.ts
+++ b/packages/extension-base/src/services/chain-service/handler/bitcoin/strategy/BlockStream/types.ts
@@ -247,22 +247,23 @@ export interface BlockStreamTransactionDetail {
 }
 
 export interface RuneUtxoResponse {
-  start: number,
-  total: number,
-  utxo: RuneUtxo[]
+  totalUtxo: number,
+  utxoItems: RuneUtxo[]
 }
 
 export interface RuneUtxo {
-  height: number,
-  confirmations: number,
-  address: string,
-  satoshi: number,
-  scriptPk: string,
+  value: number,
   txid: string,
   vout: number,
-  runes: RuneInject[]
+  status: {
+    confirmed: boolean;
+    block_height?: number;
+    block_hash: string;
+    block_time?: number;
+  }
 }
 
+// @ts-ignore
 interface RuneInject {
   rune: string,
   runeid: string,
diff --git a/packages/extension-base/src/services/hiro-service/index.ts b/packages/extension-base/src/services/hiro-service/index.ts
index bf60f3528bd..cbb224cb56d 100644
--- a/packages/extension-base/src/services/hiro-service/index.ts
+++ b/packages/extension-base/src/services/hiro-service/index.ts
@@ -9,8 +9,8 @@ import { BaseApiRequestStrategy } from '@subwallet/extension-base/strategy/api-r
 import { BaseApiRequestContext } from '@subwallet/extension-base/strategy/api-request-strategy/contexts/base';
 import { getRequest } from '@subwallet/extension-base/strategy/api-request-strategy/utils';
 
-const OPENBIT_URL = 'https://api.openbit.app';
-const OPENBIT_URL_TEST = 'https://api-testnet.openbit.app';
+const OPENBIT_URL = 'https://apix.openbit.app';
+const OPENBIT_URL_TEST = 'https://apix-testnet.openbit.app';
 
 export class HiroService extends BaseApiRequestStrategy {
   baseUrl: string;
diff --git a/packages/extension-base/src/services/rune-service/index.ts b/packages/extension-base/src/services/rune-service/index.ts
index 89d88684131..09a542c1941 100644
--- a/packages/extension-base/src/services/rune-service/index.ts
+++ b/packages/extension-base/src/services/rune-service/index.ts
@@ -9,8 +9,8 @@ import { BaseApiRequestStrategy } from '@subwallet/extension-base/strategy/api-r
 import { BaseApiRequestContext } from '@subwallet/extension-base/strategy/api-request-strategy/contexts/base';
 import { getRequest } from '@subwallet/extension-base/strategy/api-request-strategy/utils';
 
-const OPENBIT_URL = 'https://api.openbit.app';
-const OPENBIT_URL_TEST = 'https://api-testnet.openbit.app';
+const OPENBIT_URL = 'https://apix.openbit.app';
+const OPENBIT_URL_TEST = 'https://apix-testnet.openbit.app';
 
 export class RunesService extends BaseApiRequestStrategy {
   baseUrl: string;
diff --git a/packages/extension-base/src/utils/bitcoin/utxo-management.ts b/packages/extension-base/src/utils/bitcoin/utxo-management.ts
index d0a24595156..63726b6cefa 100644
--- a/packages/extension-base/src/utils/bitcoin/utxo-management.ts
+++ b/packages/extension-base/src/utils/bitcoin/utxo-management.ts
@@ -197,7 +197,7 @@ export async function getRuneUtxos (bitcoinApi: _BitcoinApi, address: string) {
   responseRuneUtxos.forEach((responseRuneUtxo) => {
     const txid = responseRuneUtxo.txid;
     const vout = responseRuneUtxo.vout;
-    const utxoValue = responseRuneUtxo.satoshi;
+    const utxoValue = responseRuneUtxo.value;
 
     if (txid && vout && utxoValue) {
       const item = {