Merge branch 'main' into vic/signet

secretkeylabs · Jun 6, 2024 · 2c983fc · 2c983fc
2 parents 66520e6 + e0fff30
commit 2c983fc
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 32 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sats-connect/core",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "main": "dist/index.mjs",
   "module": "dist/index.mjs",
   "types": "dist/index.d.mts",

diff --git a/src/adapters/BaseAdapter.ts b/src/adapters/BaseAdapter.ts
@@ -14,7 +14,7 @@ class BaseAdapter extends SatsConnectAdapter {
   requestInternal = async <Method extends keyof Requests>(
     method: Method,
     params: Params<Method>
-  ): Promise<RpcResult<Method> | undefined> => {
+  ): Promise<RpcResult<Method>> => {
     return request(method, params, this.id);
   };
 }

diff --git a/src/adapters/satsConnectAdapter.ts b/src/adapters/satsConnectAdapter.ts
@@ -37,14 +37,8 @@ abstract class SatsConnectAdapter {
           },
         ],
       });
-      if (paymentResponse?.status !== 'success') {
-        return {
-          status: 'error',
-          error: {
-            code: RpcErrorCode.USER_REJECTION,
-            message: 'User rejected the payment request',
-          },
-        };
+      if (paymentResponse.status !== 'success') {
+        return paymentResponse;
       }
       await new RunesApi(params.network).executeMint(
         orderResponse.data.orderId,
@@ -107,14 +101,8 @@ abstract class SatsConnectAdapter {
           },
         ],
       });
-      if (paymentResponse?.status !== 'success') {
-        return {
-          status: 'error',
-          error: {
-            code: RpcErrorCode.USER_REJECTION,
-            message: 'User rejected the payment request',
-          },
-        };
+      if (paymentResponse.status !== 'success') {
+        return paymentResponse;
       }
       await new RunesApi(params.network).executeEtch(
         orderResponse.data.orderId,
@@ -279,14 +267,8 @@ abstract class SatsConnectAdapter {
           },
         ],
       });
-      if (paymentResponse?.status !== 'success') {
-        return {
-          status: 'error',
-          error: {
-            code: RpcErrorCode.USER_REJECTION,
-            message: 'User rejected the payment request',
-          },
-        };
+      if (paymentResponse.status !== 'success') {
+        return paymentResponse;
       }
       return {
         status: 'success',
@@ -310,7 +292,7 @@ abstract class SatsConnectAdapter {
   async request<Method extends keyof Requests>(
     method: Method,
     params: Params<Method>
-  ): Promise<RpcResult<Method> | undefined> {
+  ): Promise<RpcResult<Method>> {
     switch (method) {
       case 'runes_mint':
         return this.mintRunes(params as Params<'runes_mint'>) as Promise<RpcResult<Method>>;
@@ -343,6 +325,6 @@ abstract class SatsConnectAdapter {
   protected abstract requestInternal<Method extends keyof Requests>(
     method: Method,
     params: Params<Method>
-  ): Promise<RpcResult<Method> | undefined>;
+  ): Promise<RpcResult<Method>>;
 }
 export { SatsConnectAdapter };
diff --git a/src/adapters/unisat.ts b/src/adapters/unisat.ts
@@ -147,7 +147,7 @@ class UnisatAdapter extends SatsConnectAdapter {
   requestInternal = async <Method extends keyof Requests>(
     method: Method,
     params: Params<Method>
-  ): Promise<RpcResult<Method> | undefined> => {
+  ): Promise<RpcResult<Method>> => {
     try {
       switch (method) {
         case 'getAccounts': {

diff --git a/src/adapters/xverse.ts b/src/adapters/xverse.ts
@@ -10,7 +10,7 @@ class XverseAdapter extends SatsConnectAdapter {
   requestInternal = async <Method extends keyof Requests>(
     method: Method,
     params: Params<Method>
-  ): Promise<RpcResult<Method> | undefined> => {
+  ): Promise<RpcResult<Method>> => {
     return request(method, params, this.id);
   };
 }