fix: update errorHandler decorator, fix context

lidofinance · Sep 6, 2023 · 6533bd3 · 6533bd3
1 parent 3fe0c7a
commit 6533bd3
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 27 deletions.
diff --git a/packages/sdk/src/common/decorators/ErrorHandler.ts b/packages/sdk/src/common/decorators/ErrorHandler.ts
@@ -1,6 +1,44 @@
+import { type LidoSDKCore } from '../../core/index.js';
 import { callConsoleMessage } from './utils.js';
 import { HeadMessage } from './types.js';
 
+const isBus = function (
+  value: unknown,
+): value is { bus: { core?: LidoSDKCore } } {
+  return !!value && typeof value === 'object' && 'bus' in value;
+};
+
+const isCore = function (value: unknown): value is { core?: LidoSDKCore } {
+  return !!value && typeof value === 'object' && 'core' in value;
+};
+
+const extractError = function <This>(this: This, error: unknown) {
+  let txError = error;
+
+  if (isBus(this)) {
+    const { message, code } = (this.bus.core as LidoSDKCore)?.getErrorMessage?.(
+      error,
+    );
+
+    txError = (this.bus?.core as LidoSDKCore)?.error?.({
+      message,
+      error,
+      code,
+    });
+  } else if (isCore(this)) {
+    const { message, code } = (this.core as LidoSDKCore)?.getErrorMessage?.(
+      error,
+    );
+    txError = (this.core as LidoSDKCore)?.error?.({
+      message,
+      error,
+      code,
+    });
+  }
+
+  return txError;
+};
+
 export const ErrorHandler = function (headMessage: HeadMessage = 'Error:') {
   return function ErrorHandlerMethod<This, Args extends any[], Return>(
     originalMethod: (this: This, ...args: Args) => Return,
@@ -25,14 +63,8 @@ export const ErrorHandler = function (headMessage: HeadMessage = 'Error:') {
                 `Error in method '${methodName}'.`,
                 'Error:',
               );
-              // @ts-ignore
-              const { message, code } = this.core.getErrorMessage(error);
-              // @ts-ignore
-              const txError = this.core.error({
-                message,
-                error,
-                code,
-              });
+
+              let txError = extractError.call(this, error);
               callback?.({ stage: 'error', payload: txError });
 
               throw txError;
@@ -47,14 +79,8 @@ export const ErrorHandler = function (headMessage: HeadMessage = 'Error:') {
           `Error in method '${methodName}'.`,
           'Error:',
         );
-        // @ts-ignore
-        const { message, code } = this.core.getErrorMessage(error);
-        // @ts-ignore
-        const txError = this.core.error({
-          message,
-          error,
-          code,
-        });
+
+        let txError = extractError.call(this, error);
         callback?.({ stage: 'error', payload: txError });
 
         throw txError;

diff --git a/packages/sdk/src/withdrawals/withdrawals.ts b/packages/sdk/src/withdrawals/withdrawals.ts
@@ -122,7 +122,7 @@ export class LidoSDKWithdrawals extends Bus {
 
     callback?.({ stage: RequestCallbackStages.SIGN, payload: gasLimit });
 
-    const transaction = await tokenRequestMethod([...params], {
+    const transaction = await tokenRequestMethod.call(this, [...params], {
       ...overrides,
       chain: this.core.chain,
     });
@@ -206,7 +206,7 @@ export class LidoSDKWithdrawals extends Bus {
 
     callback?.({ stage: RequestCallbackStages.SIGN, payload: gasLimit });
 
-    const transaction = await tokenRequestMethod([...params], {
+    const transaction = await tokenRequestMethod.call(this, [...params], {
       chain: this.core.chain,
       gas: gasLimit,
       ...overrides,
@@ -253,7 +253,7 @@ export class LidoSDKWithdrawals extends Bus {
 
     callback?.({ stage: RequestCallbackStages.SIGN });
 
-    const transaction = await tokenRequestMethod([...params], {
+    const transaction = await tokenRequestMethod.call(this, [...params], {
       account,
       chain: this.core.chain,
     });
@@ -298,7 +298,9 @@ export class LidoSDKWithdrawals extends Bus {
       },
     ] as const;
 
-    const gasLimit = await tokenRequestMethod([...params], { account });
+    const gasLimit = await tokenRequestMethod.call(this, [...params], {
+      account,
+    });
 
     return gasLimit;
   }
@@ -320,7 +322,9 @@ export class LidoSDKWithdrawals extends Bus {
     else tokenRequestMethod = contract.estimateGas.requestWithdrawalsWstETH;
 
     const params = [requests, account] as const;
-    const gasLimit = await tokenRequestMethod([...params], { account });
+    const gasLimit = await tokenRequestMethod.call(this, [...params], {
+      account,
+    });
 
     return gasLimit;
   }

diff --git a/packages/sdk/src/withdrawals/withdrawalsApprove.ts b/packages/sdk/src/withdrawals/withdrawalsApprove.ts
@@ -80,7 +80,7 @@ export class LidoSDKWithdrawalsApprove {
 
     callback?.({ stage: ApproveCallbackStages.GAS_LIMIT });
 
-    const gasLimit = await gasLimitMethod(amount, account);
+    const gasLimit = await gasLimitMethod.call(this, amount, account);
     const feeData = await this.bus.core.getFeeData();
     const overrides = {
       account,
@@ -90,7 +90,8 @@ export class LidoSDKWithdrawalsApprove {
 
     callback?.({ stage: ApproveCallbackStages.SIGN, payload: gasLimit });
 
-    const transaction = await tokenApproveMethod(
+    const transaction = await tokenApproveMethod.call(
+      this,
       [addressWithdrawalsQueue, parseEther(amount)],
       { chain: this.bus.core.chain, ...overrides, gas: gasLimit },
     );
@@ -156,7 +157,8 @@ export class LidoSDKWithdrawalsApprove {
 
     callback?.({ stage: ApproveCallbackStages.SIGN });
 
-    const transaction = await tokenApproveMethod(
+    const transaction = await tokenApproveMethod.call(
+      this,
       [addressWithdrawalsQueue, parseEther(amount)],
       { chain: this.bus.core.chain, account },
     );
@@ -183,7 +185,7 @@ export class LidoSDKWithdrawalsApprove {
   }
 
   @Logger('Utils:')
-  @Cache(30 * 1000, ['core.chain.id'])
+  @Cache(30 * 1000, ['bus.core.chain.id'])
   private async approveGasLimitByToken(
     amount: string,
     account: Address,
@@ -204,7 +206,8 @@ export class LidoSDKWithdrawalsApprove {
     const addressWithdrawalsQueue =
       await this.bus.contract.contractAddressWithdrawalsQueue();
 
-    const gasLimit = await estimateGasMethod(
+    const gasLimit = await estimateGasMethod.call(
+      this,
       [addressWithdrawalsQueue, parseEther(amount)],
       { account },
     );
@@ -245,7 +248,8 @@ export class LidoSDKWithdrawalsApprove {
     const addressWithdrawalsQueue =
       await this.bus.contract.contractAddressWithdrawalsQueue();
 
-    const allowance = await allowanceMethod(
+    const allowance = await allowanceMethod.call(
+      this,
       [account, addressWithdrawalsQueue],
       { account },
     );