From aa99faa5aa647213ec1ad25d8b6897554444f164 Mon Sep 17 00:00:00 2001 From: Mahmoud Aboelenein Date: Fri, 24 May 2024 13:38:32 +0300 Subject: [PATCH 1/3] pass the error message for fund tx transfer --- src/adapters/satsConnectAdapter.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/adapters/satsConnectAdapter.ts b/src/adapters/satsConnectAdapter.ts index 4b4b6ac..999e05c 100644 --- a/src/adapters/satsConnectAdapter.ts +++ b/src/adapters/satsConnectAdapter.ts @@ -41,8 +41,8 @@ abstract class SatsConnectAdapter { return { status: 'error', error: { - code: RpcErrorCode.USER_REJECTION, - message: 'User rejected the payment request', + code: paymentResponse?.error?.code || RpcErrorCode.USER_REJECTION, + message: paymentResponse?.error.message || 'User rejected the payment request', }, }; } @@ -111,8 +111,8 @@ abstract class SatsConnectAdapter { return { status: 'error', error: { - code: RpcErrorCode.USER_REJECTION, - message: 'User rejected the payment request', + code: paymentResponse?.error?.code || RpcErrorCode.USER_REJECTION, + message: paymentResponse?.error.message || 'User rejected the payment request', }, }; } From 9f309da6032bb3cee34f8bec1ecc5e3c8918b463 Mon Sep 17 00:00:00 2001 From: Mahmoud Aboelenein Date: Fri, 24 May 2024 13:44:05 +0300 Subject: [PATCH 2/3] version bump --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 97a834d..2c9873f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@sats-connect/core", - "version": "0.0.9", + "version": "0.0.10", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@sats-connect/core", - "version": "0.0.9", + "version": "0.0.10", "license": "ISC", "dependencies": { "axios": "1.6.8", diff --git a/package.json b/package.json index 72a39b7..b272517 100644 --- 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", From 7ab5e80e7d8d2f68dd281c26af61e34b28111b08 Mon Sep 17 00:00:00 2001 From: Mahmoud Aboelenein Date: Sun, 26 May 2024 15:41:29 +0300 Subject: [PATCH 3/3] update adapter request method type --- src/adapters/BaseAdapter.ts | 2 +- src/adapters/satsConnectAdapter.ts | 34 +++++++----------------------- src/adapters/unisat.ts | 2 +- src/adapters/xverse.ts | 2 +- 4 files changed, 11 insertions(+), 29 deletions(-) diff --git a/src/adapters/BaseAdapter.ts b/src/adapters/BaseAdapter.ts index c1d2feb..2aa13d9 100644 --- a/src/adapters/BaseAdapter.ts +++ b/src/adapters/BaseAdapter.ts @@ -14,7 +14,7 @@ class BaseAdapter extends SatsConnectAdapter { requestInternal = async ( method: Method, params: Params - ): Promise | undefined> => { + ): Promise> => { return request(method, params, this.id); }; } diff --git a/src/adapters/satsConnectAdapter.ts b/src/adapters/satsConnectAdapter.ts index 999e05c..6fb0ba7 100644 --- 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: paymentResponse?.error?.code || RpcErrorCode.USER_REJECTION, - message: paymentResponse?.error.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: paymentResponse?.error?.code || RpcErrorCode.USER_REJECTION, - message: paymentResponse?.error.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: Method, params: Params - ): Promise | undefined> { + ): Promise> { switch (method) { case 'runes_mint': return this.mintRunes(params as Params<'runes_mint'>) as Promise>; @@ -343,6 +325,6 @@ abstract class SatsConnectAdapter { protected abstract requestInternal( method: Method, params: Params - ): Promise | undefined>; + ): Promise>; } export { SatsConnectAdapter }; diff --git a/src/adapters/unisat.ts b/src/adapters/unisat.ts index f97e6d0..2d2390d 100644 --- a/src/adapters/unisat.ts +++ b/src/adapters/unisat.ts @@ -147,7 +147,7 @@ class UnisatAdapter extends SatsConnectAdapter { requestInternal = async ( method: Method, params: Params - ): Promise | undefined> => { + ): Promise> => { try { switch (method) { case 'getAccounts': { diff --git a/src/adapters/xverse.ts b/src/adapters/xverse.ts index 974eb8e..533c419 100644 --- a/src/adapters/xverse.ts +++ b/src/adapters/xverse.ts @@ -10,7 +10,7 @@ class XverseAdapter extends SatsConnectAdapter { requestInternal = async ( method: Method, params: Params - ): Promise | undefined> => { + ): Promise> => { return request(method, params, this.id); }; }