fix(ordit-sdk): use datasource ordit-sdk 2.0 (#102)

ordzaar · Sep 30, 2023 · dfb619a · dfb619a
1 parent 7a60e74
commit dfb619a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/packages/ord-connect/src/hooks/useBalance.tsx b/packages/ord-connect/src/hooks/useBalance.tsx
@@ -1,8 +1,8 @@
 import { useState } from "react";
 import {
   addressNameToType,
-  OrditApi,
   getAddressesFromPublicKey,
+  JsonRpcDatasource,
 } from "@sadoprotocol/ordit-sdk";
 import { useOrdContext, Wallet } from "../providers/OrdContext.tsx";
 
@@ -11,6 +11,8 @@ export function useBalance(): [() => Promise<number>, string | null, boolean] {
   const [error, setError] = useState<string | null>(null);
   const [loading, setLoading] = useState<boolean>(false);
 
+  const datasource = new JsonRpcDatasource({ network });
+
   const getSafeBalance = async (): Promise<number> => {
     setLoading(true);
     try {
@@ -23,11 +25,11 @@ export function useBalance(): [() => Promise<number>, string | null, boolean] {
         network,
         addressNameToType[format.payments],
       )[0];
-      const { spendableUTXOs } = await OrditApi.fetchUnspentUTXOs({
+
+      const { spendableUTXOs } = await datasource.getUnspents({
         address,
-        network,
-        sort: "desc",
         type: "spendable",
+        decodeMetadata: false,
       });
 
       const totalCardinalsAvailable = spendableUTXOs.reduce(

diff --git a/packages/ord-connect/src/hooks/useSend.tsx b/packages/ord-connect/src/hooks/useSend.tsx
@@ -1,5 +1,5 @@
 import { useState } from "react";
-import { ordit, PSBTBuilder } from "@sadoprotocol/ordit-sdk";
+import { PSBTBuilder, JsonRpcDatasource } from "@sadoprotocol/ordit-sdk";
 import { sendBtcTransaction } from "sats-connect";
 
 import { useOrdContext, Wallet } from "../providers/OrdContext.tsx";
@@ -17,6 +17,8 @@ export function useSend(): [SendFunction, string | null, boolean] {
   const [error, setError] = useState<string | null>(null);
   const [loading, setLoading] = useState<boolean>(false);
 
+  const datasource = new JsonRpcDatasource({ network });
+
   const safeSend: SendFunction = async (toAddress, satoshis, feeRate) => {
     setLoading(true);
     try {
@@ -46,10 +48,8 @@ export function useSend(): [SendFunction, string | null, boolean] {
         psbt: psbtBuilder.toPSBT(),
       });
 
-      const txId = await ordit.transactions.relayTransaction(
-        signedPsbt.hex,
-        network,
-      );
+      const txId = await datasource.relay({ hex: signedPsbt.hex });
+
       setLoading(false);
       return txId;
     } catch (err: any) {