refactor: bitcoin queries, closes leather-io/issues#94 and leather-io…

…/issues#101
leather-io · Jul 20, 2024 · 1187acf · 1187acf
1 parent 85d34b3
commit 1187acf
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 31 deletions.
diff --git a/package.json b/package.json
@@ -138,7 +138,7 @@
     "@leather.io/constants": "0.8.2",
     "@leather.io/crypto": "1.0.4",
     "@leather.io/models": "0.10.2",
-    "@leather.io/query": "1.0.2",
+    "@leather.io/query": "2.0.0",
     "@leather.io/tokens": "0.6.2",
     "@leather.io/ui": "1.6.4",
     "@leather.io/utils": "0.10.2",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/app/components/inscription-preview-card/components/inscription-text.tsx b/src/app/components/inscription-preview-card/components/inscription-text.tsx
@@ -1,7 +1,7 @@
 import { sanitize } from 'dompurify';
 import { Box } from 'leather-styles/jsx';
 
-import { useInscriptionTextContentQuery } from '@leather.io/query';
+import { useGetInscriptionTextContentQuery } from '@leather.io/query';
 
 import { parseJson } from '@app/components/json';
 import { LoadingSpinner } from '@app/components/loading-spinner';
@@ -10,7 +10,7 @@ interface InscriptionTextProps {
   contentSrc: string;
 }
 export function InscriptionText(props: InscriptionTextProps) {
-  const query = useInscriptionTextContentQuery(props.contentSrc);
+  const query = useGetInscriptionTextContentQuery(props.contentSrc);
 
   if (query.isLoading) return <LoadingSpinner size="16px" />;
 

diff --git a/src/app/features/activity-list/activity-list.tsx b/src/app/features/activity-list/activity-list.tsx
@@ -6,7 +6,7 @@ import uniqby from 'lodash.uniqby';
 import {
   useBitcoinPendingTransactions,
   useGetAccountTransactionsWithTransfersQuery,
-  useGetBitcoinTransactionsByAddressesQuery,
+  useGetBitcoinTransactionsByAddressListQuery,
   useStacksPendingTransactions,
 } from '@leather.io/query';
 
@@ -52,7 +52,7 @@ export function ActivityList() {
   const [
     { isLoading: isLoadingNsBitcoinTransactions, data: nsBitcoinTransactions = [] },
     { isLoading: isLoadingTrBitcoinTransactions, data: trBitcoinTransactions = [] },
-  ] = useGetBitcoinTransactionsByAddressesQuery([nsBitcoinAddress, trBitcoinAddress]);
+  ] = useGetBitcoinTransactionsByAddressListQuery([nsBitcoinAddress, trBitcoinAddress]);
 
   const [{ data: nsPendingTxs = [] }, { data: trPendingTxs = [] }] = useBitcoinPendingTransactions([
     nsBitcoinAddress,

diff --git a/src/app/features/collectibles/components/bitcoin/inscription-text.tsx b/src/app/features/collectibles/components/bitcoin/inscription-text.tsx
@@ -1,4 +1,4 @@
-import { useInscriptionTextContentQuery } from '@leather.io/query';
+import { useGetInscriptionTextContentQuery } from '@leather.io/query';
 import { OrdinalAvatarIcon } from '@leather.io/ui';
 
 import { parseJson } from '@app/components/json';
@@ -17,7 +17,7 @@ export function InscriptionText({
   onClickCallToAction,
   onClickSend,
 }: InscriptionTextProps) {
-  const query = useInscriptionTextContentQuery(contentSrc);
+  const query = useGetInscriptionTextContentQuery(contentSrc);
 
   if (query.isLoading || query.isError) return null;
 

diff --git a/src/app/features/collectibles/hooks/use-is-fetching-collectibles.ts b/src/app/features/collectibles/hooks/use-is-fetching-collectibles.ts
@@ -9,10 +9,10 @@ function areAnyQueriesFetching(...args: number[]) {
 
 export function useIsFetchingCollectiblesRelatedQuery() {
   // Ordinal inscriptions
-  const n1 = useIsFetching({ queryKey: [BitcoinQueryPrefixes.TaprootAddressUtxos] });
-  const n2 = useIsFetching({ queryKey: [BitcoinQueryPrefixes.InscriptionsByAddress] });
-  const n3 = useIsFetching({ queryKey: [BitcoinQueryPrefixes.InscriptionMetadata] });
-  const n4 = useIsFetching({ queryKey: [BitcoinQueryPrefixes.OrdinalTextContent] });
+  const n1 = useIsFetching({ queryKey: [BitcoinQueryPrefixes.GetTaprootUtxosByAddress] });
+  const n2 = useIsFetching({ queryKey: [BitcoinQueryPrefixes.GetInscriptionsByAddress] });
+  const n3 = useIsFetching({ queryKey: [BitcoinQueryPrefixes.GetInscription] });
+  const n4 = useIsFetching({ queryKey: [BitcoinQueryPrefixes.GetInscriptionTextContent] });
   const n5 = useIsFetching({ queryKey: [BitcoinQueryPrefixes.GetInscriptions] });
 
   // BNS

diff --git a/test-app/src/components/debugger.tsx b/test-app/src/components/debugger.tsx
@@ -137,7 +137,7 @@ export const Debugger = () => {
       bufferCV(Buffer.from('hello, world')),
       stringAsciiCV('hey-ascii'),
       stringUtf8CV('hey-utf8'),
-      standardPrincipalCV('ST1X6M947Z7E58CNE0H8YJVJTVKS9VW0PHEG3NHN3'),
+      standardPrincipalCV('STS8CKF63P16J28AYF7PXW9E5AACH0NZNRV74CM7'),
       trueCV(),
     ];
     const postConditions = [
@@ -150,7 +150,7 @@ export const Debugger = () => {
     console.log('creating allow mode contract call');
     await doContractCall({
       network,
-      contractAddress: 'ST1X6M947Z7E58CNE0H8YJVJTVKS9VW0PHEG3NHN3',
+      contractAddress: 'STS8CKF63P16J28AYF7PXW9E5AACH0NZNRV74CM7',
       contractName: 'faker',
       functionName: 'rawr',
       functionArgs: args,

diff --git a/tests/mocks/mock-inscriptions.ts b/tests/mocks/mock-inscriptions.ts
@@ -1,4 +1,4 @@
-import { type InscriptionResponseHiro, createInscriptionHiro } from '@leather.io/query';
+import { type InscriptionResponseHiro, createHiroInscription } from '@leather.io/query';
 
 export const mockInscriptionResponse1: InscriptionResponseHiro = {
   address: 'bc1pwrmewwprc8k8l2k63x4advg0nx0jk50xzqnee996lm87mcuza7kq6drg2k',
@@ -27,7 +27,7 @@ export const mockInscriptionResponse1: InscriptionResponseHiro = {
   value: '10000',
 };
 
-export const mockInscription1 = createInscriptionHiro(mockInscriptionResponse1);
+export const mockInscription1 = createHiroInscription(mockInscriptionResponse1);
 
 export const mockInscriptionResponse2: InscriptionResponseHiro = {
   address: 'bc1pwrmewwprc8k8l2k63x4advg0nx0jk50xzqnee996lm87mcuza7kq6drg2k',
@@ -56,7 +56,7 @@ export const mockInscriptionResponse2: InscriptionResponseHiro = {
   value: '10000',
 };
 
-export const mockInscription2 = createInscriptionHiro(mockInscriptionResponse2);
+export const mockInscription2 = createHiroInscription(mockInscriptionResponse2);
 
 export const mockInscriptionResponsesList = [
   {
@@ -86,4 +86,4 @@ export const mockInscriptionResponsesList = [
     value: '546',
   },
 ];
-export const mockInscriptionsList = mockInscriptionResponsesList.map(createInscriptionHiro);
+export const mockInscriptionsList = mockInscriptionResponsesList.map(createHiroInscription);
diff --git a/tests/specs/transactions/transactions.spec.ts b/tests/specs/transactions/transactions.spec.ts
@@ -35,6 +35,7 @@ test.describe('Transaction signing', () => {
 
       await testAppPage.clickContractCallButton();
       const transactionRequestPage = new TransactionRequestPage(await context.waitForEvent('page'));
+      await transactionRequestPage.waitForTransactionRequestPage();
       const error =
         await transactionRequestPage.waitForTransactionRequestError('Insufficient balance');