@sats-connect/core 0.0.3-aae39fb → 0.0.3-e7448df

package/dist/index.d.mts

@@ -672,8 +672,6 @@ declare abstract class SatsConnectAdapter {
     abstract readonly id: string;
     private mintRunes;
     private etchRunes;
-    private estimateMint;
-    private estimateEtch;
     request<Method extends keyof Requests>(method: Method, params: Params<Method>): Promise<RpcResult<Method> | undefined>;
     protected abstract requestInternal<Method extends keyof Requests>(method: Method, params: Params<Method>): Promise<RpcResult<Method> | undefined>;
 }

package/dist/index.mjs

@@ -4,15 +4,15 @@ var BitcoinNetworkType = /* @__PURE__ */ ((BitcoinNetworkType2) => {
   BitcoinNetworkType2["Testnet"] = "Testnet";
   return BitcoinNetworkType2;
 })(BitcoinNetworkType || {});
-var RpcErrorCode = /* @__PURE__ */ ((RpcErrorCode3) => {
-  RpcErrorCode3[RpcErrorCode3["PARSE_ERROR"] = -32700] = "PARSE_ERROR";
-  RpcErrorCode3[RpcErrorCode3["INVALID_REQUEST"] = -32600] = "INVALID_REQUEST";
-  RpcErrorCode3[RpcErrorCode3["METHOD_NOT_FOUND"] = -32601] = "METHOD_NOT_FOUND";
-  RpcErrorCode3[RpcErrorCode3["INVALID_PARAMS"] = -32602] = "INVALID_PARAMS";
-  RpcErrorCode3[RpcErrorCode3["INTERNAL_ERROR"] = -32603] = "INTERNAL_ERROR";
-  RpcErrorCode3[RpcErrorCode3["USER_REJECTION"] = -32e3] = "USER_REJECTION";
-  RpcErrorCode3[RpcErrorCode3["METHOD_NOT_SUPPORTED"] = -32001] = "METHOD_NOT_SUPPORTED";
-  return RpcErrorCode3;
+var RpcErrorCode = /* @__PURE__ */ ((RpcErrorCode2) => {
+  RpcErrorCode2[RpcErrorCode2["PARSE_ERROR"] = -32700] = "PARSE_ERROR";
+  RpcErrorCode2[RpcErrorCode2["INVALID_REQUEST"] = -32600] = "INVALID_REQUEST";
+  RpcErrorCode2[RpcErrorCode2["METHOD_NOT_FOUND"] = -32601] = "METHOD_NOT_FOUND";
+  RpcErrorCode2[RpcErrorCode2["INVALID_PARAMS"] = -32602] = "INVALID_PARAMS";
+  RpcErrorCode2[RpcErrorCode2["INTERNAL_ERROR"] = -32603] = "INTERNAL_ERROR";
+  RpcErrorCode2[RpcErrorCode2["USER_REJECTION"] = -32e3] = "USER_REJECTION";
+  RpcErrorCode2[RpcErrorCode2["METHOD_NOT_SUPPORTED"] = -32001] = "METHOD_NOT_SUPPORTED";
+  return RpcErrorCode2;
 })(RpcErrorCode || {});
 
 // src/runes/index.ts
@@ -31,14 +31,19 @@ var RunesApi = class {
         ...mintParams
       });
       return {
-        data: response.data
+        status: "success",
+        result: {
+          costBreakdown: response.data.costBreakdown,
+          totalCost: response.data.totalCost,
+          totalSize: response.data.totalSize
+        }
       };
     } catch (error) {
-      const err = error;
       return {
+        status: "error",
         error: {
-          code: err.response?.status,
-          message: err.response?.data
+          code: -32603 /* INTERNAL_ERROR */,
+          message: error.message
         }
       };
     }
@@ -49,14 +54,19 @@ var RunesApi = class {
         ...etchParams
       });
       return {
-        data: response.data
+        status: "success",
+        result: {
+          costBreakdown: response.data.costBreakdown,
+          totalCost: response.data.totalCost,
+          totalSize: response.data.totalSize
+        }
       };
     } catch (error) {
-      const err = error;
       return {
+        status: "error",
         error: {
-          code: err.response?.status,
-          message: err.response?.data
+          code: -32603 /* INTERNAL_ERROR */,
+          message: error.data.message
         }
       };
     }
@@ -70,12 +80,8 @@ var RunesApi = class {
         data: response.data
       };
     } catch (error) {
-      const err = error;
       return {
-        error: {
-          code: err.response?.status,
-          message: err.response?.data
-        }
+        error: error.data.message
       };
     }
   };
@@ -88,12 +94,8 @@ var RunesApi = class {
         data: response.data
       };
     } catch (error) {
-      const err = error;
       return {
-        error: {
-          code: err.response?.status,
-          message: err.response?.data
-        }
+        error: error.data.message
       };
     }
   };
@@ -106,12 +108,8 @@ var RunesApi = class {
         data: response.data
       };
     } catch (error) {
-      const err = error;
       return {
-        error: {
-          code: err.response?.status,
-          message: err.response?.data
-        }
+        error: error.data.message
       };
     }
   };
@@ -124,62 +122,57 @@ var RunesApi = class {
         data: response.data
       };
     } catch (error) {
-      const err = error;
       return {
-        error: {
-          code: err.response?.status,
-          message: err.response?.data
-        }
+        error: error.data.message
       };
     }
   };
 };
-var testnetClient = new RunesApi("Testnet" /* Testnet */);
-var mainnetClient = new RunesApi("Mainnet" /* Mainnet */);
-var getRunesApiClient = (network = "Mainnet" /* Mainnet */) => network === "Mainnet" /* Mainnet */ ? mainnetClient : testnetClient;
 
 // src/adapters/satsConnectAdapter.ts
 var SatsConnectAdapter = class {
   async mintRunes(params) {
     try {
       const orderResponse = await new RunesApi(params.network).createMintOrder(params);
-      if (!orderResponse.data) {
-        return {
-          status: "error",
-          error: {
-            code: orderResponse.error.code === 400 ? -32600 /* INVALID_REQUEST */ : -32603 /* INTERNAL_ERROR */,
-            message: orderResponse.error.message
-          }
-        };
-      }
-      const paymentResponse = await this.requestInternal("sendTransfer", {
-        recipients: [
-          {
-            address: orderResponse.data.fundAddress,
-            amount: orderResponse.data.fundAmount
-          }
-        ]
-      });
-      if (paymentResponse?.status !== "success") {
+      if (orderResponse.data) {
+        const paymentResponse = await this.requestInternal("sendTransfer", {
+          recipients: [
+            {
+              address: orderResponse.data.fundAddress,
+              amount: orderResponse.data.fundAmount
+            }
+          ]
+        });
+        if (paymentResponse?.status === "success") {
+          await new RunesApi(params.network).executeMint(
+            orderResponse.data.orderId,
+            paymentResponse.result.txid
+          );
+          return {
+            status: "success",
+            result: {
+              orderId: orderResponse.data.orderId,
+              fundTransactionId: paymentResponse.result.txid
+            }
+          };
+        } else {
+          return {
+            status: "error",
+            error: {
+              code: -32e3 /* USER_REJECTION */,
+              message: "User rejected the payment request"
+            }
+          };
+        }
+      } else {
         return {
           status: "error",
           error: {
-            code: -32e3 /* USER_REJECTION */,
-            message: "User rejected the payment request"
+            code: -32603 /* INTERNAL_ERROR */,
+            message: orderResponse.error
           }
         };
       }
-      await new RunesApi(params.network).executeMint(
-        orderResponse.data.orderId,
-        paymentResponse.result.txid
-      );
-      return {
-        status: "success",
-        result: {
-          orderId: orderResponse.data.orderId,
-          fundTransactionId: paymentResponse.result.txid
-        }
-      };
     } catch (error) {
       return {
         status: "error",
@@ -193,43 +186,45 @@ var SatsConnectAdapter = class {
   async etchRunes(params) {
     try {
       const orderResponse = await new RunesApi(params.network).createEtchOrder(params);
-      if (!orderResponse.data) {
-        return {
-          status: "error",
-          error: {
-            code: orderResponse.error.code === 400 ? -32600 /* INVALID_REQUEST */ : -32603 /* INTERNAL_ERROR */,
-            message: orderResponse.error.message
-          }
-        };
-      }
-      const paymentResponse = await this.requestInternal("sendTransfer", {
-        recipients: [
-          {
-            address: orderResponse.data.fundAddress,
-            amount: orderResponse.data.fundAmount
-          }
-        ]
-      });
-      if (paymentResponse?.status !== "success") {
+      if (orderResponse.data) {
+        const paymentResponse = await this.requestInternal("sendTransfer", {
+          recipients: [
+            {
+              address: orderResponse.data.fundAddress,
+              amount: orderResponse.data.fundAmount
+            }
+          ]
+        });
+        if (paymentResponse?.status === "success") {
+          await new RunesApi(params.network).executeEtch(
+            orderResponse.data.orderId,
+            paymentResponse.result.txid
+          );
+          return {
+            status: "success",
+            result: {
+              orderId: orderResponse.data.orderId,
+              fundTransactionId: paymentResponse.result.txid
+            }
+          };
+        } else {
+          return {
+            status: "error",
+            error: {
+              code: -32e3 /* USER_REJECTION */,
+              message: "User rejected the payment request"
+            }
+          };
+        }
+      } else {
         return {
           status: "error",
           error: {
-            code: -32e3 /* USER_REJECTION */,
-            message: "User rejected the payment request"
+            code: -32603 /* INTERNAL_ERROR */,
+            message: orderResponse.error
           }
         };
       }
-      await new RunesApi(params.network).executeEtch(
-        orderResponse.data.orderId,
-        paymentResponse.result.txid
-      );
-      return {
-        status: "success",
-        result: {
-          orderId: orderResponse.data.orderId,
-          fundTransactionId: paymentResponse.result.txid
-        }
-      };
     } catch (error) {
       return {
         status: "error",
@@ -240,42 +235,6 @@ var SatsConnectAdapter = class {
       };
     }
   }
-  async estimateMint(params) {
-    const response = await getRunesApiClient(
-      params.network
-    ).estimateMintCost(params);
-    if (response.data) {
-      return {
-        status: "success",
-        result: response.data
-      };
-    }
-    return {
-      status: "error",
-      error: {
-        code: response.error.code === 400 ? -32600 /* INVALID_REQUEST */ : -32603 /* INTERNAL_ERROR */,
-        message: response.error.message
-      }
-    };
-  }
-  async estimateEtch(params) {
-    const response = await getRunesApiClient(
-      params.network
-    ).estimateEtchCost(params);
-    if (response.data) {
-      return {
-        status: "success",
-        result: response.data
-      };
-    }
-    return {
-      status: "error",
-      error: {
-        code: response.error.code === 400 ? -32600 /* INVALID_REQUEST */ : -32603 /* INTERNAL_ERROR */,
-        message: response.error.message
-      }
-    };
-  }
   async request(method, params) {
     switch (method) {
       case "runes_mint":
@@ -283,9 +242,13 @@ var SatsConnectAdapter = class {
       case "runes_etch":
         return this.etchRunes(params);
       case "runes_estimateMint":
-        return this.estimateMint(params);
+        return new RunesApi(params.network).estimateMintCost(
+          params
+        );
       case "runes_estimateEtch":
-        return this.estimateEtch(params);
+        return new RunesApi(params.network).estimateEtchCost(
+          params
+        );
       default:
         return this.requestInternal(method, params);
     }
@@ -369,6 +332,7 @@ var isRpcSuccessResponse = (response) => {
 var XverseAdapter = class extends SatsConnectAdapter {
   id = DefaultAdaptersInfo.xverse.id;
   requestInternal = async (method, params) => {
+    console.log("XverseAdapter requestInternal", method, params);
     return request(method, params, this.id);
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sats-connect/core",
-  "version": "0.0.3-aae39fb",
+  "version": "0.0.3-e7448df",
   "main": "dist/index.mjs",
   "module": "dist/index.mjs",
   "types": "dist/index.d.mts",
@@ -24,7 +24,7 @@
     ]
   },
   "dependencies": {
-    "axios": "1.6.8",
+    "axios": "^1.6.8",
     "bitcoin-address-validation": "2.2.3",
     "buffer": "6.0.3",
     "jsontokens": "4.0.1",