@rango-dev/queue-manager-rango-preset 0.1.10-next.77 → 0.1.10-next.80

package/src/index.ts

@@ -37,3 +37,6 @@ export const swapQueueDef: SwapQueueDef = {
     }
   },
 };
+
+export { SwapQueueContext, SwapStorage } from './types';
+export { PendingSwapWithQueueID } from './shared';

package/src/services/httpService.ts

@@ -0,0 +1,4 @@
+import { RangoClient } from 'rango-sdk';
+import { RANGO_DAPP_API_KEY } from '../constants';
+
+export const httpService = new RangoClient(RANGO_DAPP_API_KEY || '');

package/src/services/index.ts

@@ -0,0 +1 @@
+export { httpService } from './httpService';

package/src/shared-errors.ts

@@ -1,4 +1,5 @@
 import { WalletType } from '@rango-dev/wallets-shared';
+import { SignerErrorCode, isSignerErrorCode } from 'rango-types';
 
 export type ErrorDetail = {
   extraMessage: string;
@@ -153,4 +154,30 @@ export const ERROR_CONFIRM_SWAP = (status?: number | string): string =>
 export const WARNING_STARKNET_FOUND =
   'StarknNet blockchain is still an ALPHA version. As such, delays may occur, and catastrophic bugs may lurk.';
 
-  
+function isAPIErrorCode(value: string): value is APIErrorCode {
+  return (Object.values(APIErrorCode) as string[]).includes(value);
+}
+
+export function mapAppErrorCodesToAPIErrorCode(
+  errorCode: string | null
+): APIErrorCode {
+  const defaultErrorCode = APIErrorCode.CLIENT_UNEXPECTED_BEHAVIOUR;
+  try {
+    if (!errorCode) return defaultErrorCode;
+    if (isAPIErrorCode(errorCode)) return errorCode;
+    if (isSignerErrorCode(errorCode)) {
+      const t: { [key in SignerErrorCode]: APIErrorCode } = {
+        [SignerErrorCode.REJECTED_BY_USER]: APIErrorCode.USER_REJECT,
+        [SignerErrorCode.SIGN_TX_ERROR]: APIErrorCode.CALL_WALLET_FAILED,
+        [SignerErrorCode.SEND_TX_ERROR]: APIErrorCode.SEND_TX_FAILED,
+        [SignerErrorCode.NOT_IMPLEMENTED]: defaultErrorCode,
+        [SignerErrorCode.OPERATION_UNSUPPORTED]: defaultErrorCode,
+        [SignerErrorCode.UNEXPECTED_BEHAVIOUR]: defaultErrorCode,
+      };
+      return t[errorCode];
+    }
+    return defaultErrorCode;
+  } catch (err) {
+    return defaultErrorCode;
+  }
+}

package/src/shared-sentry.ts

@@ -16,7 +16,7 @@ export function logRPCError(
         swapper: currentStep?.swapperId || '',
         walletType: walletType || '',
       },
-      level: 'warning',
+      level: 'warning' as any,
     });
   } catch (e) {
     console.log({ e });

package/src/shared.ts

@@ -1,10 +1,4 @@
-import {
-  Network,
-  Transaction,
-  TransferTransaction,
-  WalletError,
-  WalletType,
-} from '@rango-dev/wallets-shared';
+import { Network, WalletType } from '@rango-dev/wallets-shared';
 import {
   CosmosTransaction,
   EvmBlockchainMeta,
@@ -13,23 +7,16 @@ import {
   SolanaTransaction,
   StarknetTransaction,
   TronTransaction,
+  Transfer as TransferTransaction,
 } from 'rango-sdk';
-import { BigNumber } from 'bignumber.js';
 
 import { ErrorDetail, PrettyError } from './shared-errors';
-import { getRelatedWallet } from './helpers';
+import { SignerError } from 'rango-types';
 
-export type SwapperStatusResponse = {
-  status: 'running' | 'failed' | 'success' | null;
-  extraMessage: string | null;
-  timestamp: number;
-  outputAmount: BigNumber | null;
-  explorerUrl: SwapExplorerUrl[] | null;
-  trackingCode: string;
-  newTx: Transaction | null;
-  diagnosisUrl: string | null;
-  steps: SwapperStatusStep[] | null;
-};
+export interface PendingSwapWithQueueID {
+  id: string;
+  swap: PendingSwap;
+}
 
 export type SwapProgressNotification = {
   eventType: EventType;
@@ -56,7 +43,7 @@ export type Account = {
   walletType: WalletType;
   error: boolean;
   explorerUrl: string | null;
-  isConnected: boolean;
+  isConnected?: boolean;
 };
 export type Blockchain = { name: string; accounts: Account[] };
 export type Wallet = { blockchains: Blockchain[] };
@@ -270,10 +257,24 @@ export const getEvmApproveUrl = (
   throw Error(`Explorer url for ${network} is not implemented`);
 };
 
+export const getStarknetApproveUrl = (tx: string): string => {
+  return 'https://starkscan.co/tx/{txHash}'.replace(
+    '{txHash}',
+    tx.toLowerCase()
+  );
+};
+
+export const getTronApproveUrl = (tx: string): string => {
+  return 'https://tronscan.org/#/transaction/{txHash}'.replace(
+    '{txHash}',
+    tx.toLowerCase()
+  );
+};
+
 export const prettifyErrorMessage = (obj: unknown): ErrorDetail => {
   if (!obj) return { extraMessage: '', extraMessageErrorCode: null };
   if (obj instanceof PrettyError) return obj.getErrorDetail();
-  if (obj instanceof WalletError) {
+  if (obj instanceof SignerError) {
     const t = obj.getErrorDetail();
     return {
       extraMessage: t.message,
@@ -294,19 +295,6 @@ export const prettifyErrorMessage = (obj: unknown): ErrorDetail => {
   return { extraMessage: obj, extraMessageErrorCode: null };
 };
 
-export function getCookieId(): string {
-  const key = 'X-Rango-Id';
-  const cookieId = window.localStorage.getItem(key);
-  if (cookieId) {
-    return cookieId;
-  }
-  const value =
-    Math.random().toString(36).substring(2, 15) +
-    Math.random().toString(36).substring(2, 15);
-  window.localStorage.setItem(key, value);
-  return value;
-}
-
 export function getNextStep(
   swap: PendingSwap,
   currentStep: PendingSwapStep
@@ -321,6 +309,45 @@ export function getNextStep(
   );
 }
 
+// TODO:  we have samething in `helpers`, for fixing circular dependency, we copied and should be removed eventually.
+export const getCurrentAddressOf = (
+  swap: PendingSwap,
+  step: PendingSwapStep
+): string => {
+  const result =
+    swap.wallets[step.evmTransaction?.blockChain || ''] ||
+    swap.wallets[step.evmApprovalTransaction?.blockChain || ''] ||
+    swap.wallets[step.cosmosTransaction?.blockChain || ''] ||
+    swap.wallets[step.solanaTransaction?.blockChain || ''] ||
+    (step.transferTransaction?.fromWalletAddress
+      ? { address: step.transferTransaction?.fromWalletAddress }
+      : null) ||
+    null;
+  if (result == null) throw PrettyError.WalletMissing();
+  return result.address;
+};
+
+// TODO:  we have samething in `helpers`, for fixing circular dependency, we copied and should be removed eventually.
+export function getRelatedWallet(
+  swap: PendingSwap,
+  currentStep: PendingSwapStep
+): WalletTypeAndAddress {
+  const walletAddress = getCurrentAddressOf(swap, currentStep);
+  const walletKV =
+    Object.keys(swap.wallets)
+      .map((k) => ({ k, v: swap.wallets[k] }))
+      .find(({ v }) => v.address === walletAddress) || null;
+  const blockchain = walletKV?.k || null;
+  const wallet = walletKV?.v || null;
+
+  const walletType = wallet?.walletType;
+  if (walletType === WalletType.UNKNOWN || wallet === null)
+    throw PrettyError.AssertionFailed(
+      `Wallet for source ${blockchain} not passed: walletType: ${walletType}`
+    );
+  return wallet;
+}
+
 export function getRelatedWalletOrNull(
   swap: PendingSwap,
   currentStep: PendingSwapStep

package/src/types.ts

@@ -2,14 +2,13 @@ import { QueueStorage, QueueDef } from '@rango-dev/queue-manager-core';
 import { QueueContext } from '@rango-dev/queue-manager-core/dist/queue';
 import { ConnectResult, Providers } from '@rango-dev/wallets-core';
 import {
-  EvmBlockchainMeta,
   Meta,
   Network,
-  WalletSigners,
   WalletState,
   WalletType,
 } from '@rango-dev/wallets-shared';
 import { PendingSwap, SwapProgressNotification, Wallet } from './shared';
+import { EvmBlockchainMeta, SignerFactory } from 'rango-types';
 
 export type SwapQueueDef = QueueDef<
   SwapStorage,
@@ -51,7 +50,7 @@ export interface SwapQueueContext extends QueueContext {
   meta: Meta;
   wallets: Wallet | null;
   providers: Providers;
-  getSigners: (type: WalletType) => WalletSigners;
+  getSigners: (type: WalletType) => SignerFactory;
   switchNetwork: (
     wallet: WalletType,
     network: Network

package/dist/shared-api.d.ts

@@ -1,10 +0,0 @@
-import { WalletType } from '@rango-dev/wallets-shared';
-import { SwapperStatusResponse } from './shared';
-import { CheckApprovalResponse, CreateTransactionRequest, CreateTransactionResponse } from 'rango-sdk';
-import { APIErrorCode } from './shared-errors';
-export declare function checkSwapStatus(requestId: string, txId: string, step: number): Promise<SwapperStatusResponse | null>;
-export declare function createTransaction(request: CreateTransactionRequest): Promise<CreateTransactionResponse>;
-export declare function checkApproved(requestId: string): Promise<CheckApprovalResponse>;
-export declare function mapAppErrorCodesToAPIErrorCode(errorCode: string | null): APIErrorCode;
-export declare function reportFailed(requestId: string, step: number, eventType: APIErrorCode, reason: string, walletType: WalletType | null): Promise<void>;
-//# sourceMappingURL=shared-api.d.ts.map

package/dist/shared-api.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"shared-api.d.ts","sourceRoot":"","sources":["src/shared-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,UAAU,EACX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAe,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAC9D,OAAO,EACL,qBAAqB,EAErB,wBAAwB,EACxB,yBAAyB,EAC1B,MAAM,WAAW,CAAC;AACnB,OAAO,EACL,YAAY,EAIb,MAAM,iBAAiB,CAAC;AAQzB,wBAAsB,eAAe,CACnC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC,CA4BvC;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,wBAAwB,GAChC,OAAO,CAAC,yBAAyB,CAAC,CAoCpC;AAED,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,qBAAqB,CAAC,CAmBhC;AAMD,wBAAgB,8BAA8B,CAC5C,SAAS,EAAE,MAAM,GAAG,IAAI,GACvB,YAAY,CAoBd;AAED,wBAAsB,YAAY,CAChC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,YAAY,EACvB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,GAAG,IAAI,GAC5B,OAAO,CAAC,IAAI,CAAC,CAkBf"}

package/src/shared-api.ts

@@ -1,175 +0,0 @@
-import {
-  isWalletErrorCode,
-  WalletErrorCode,
-  WalletType,
-} from '@rango-dev/wallets-shared';
-import { getCookieId, SwapperStatusResponse } from './shared';
-import {
-  CheckApprovalResponse,
-  CheckTxStatusRequest,
-  CreateTransactionRequest,
-  CreateTransactionResponse,
-} from 'rango-sdk';
-import {
-  APIErrorCode,
-  ApiMethodName,
-  ERROR_COMMUNICATING_WITH_API,
-  PrettyError,
-} from './shared-errors';
-import { BigNumber } from 'bignumber.js';
-import {
-  BASE_URL,
-  RANGO_COOKIE_HEADER,
-  RANGO_DAPP_ID_QUERY,
-} from './constants';
-
-export async function checkSwapStatus(
-  requestId: string,
-  txId: string,
-  step: number
-): Promise<SwapperStatusResponse | null> {
-  const url = `${BASE_URL}/tx/check-status?${RANGO_DAPP_ID_QUERY}`;
-  const body: CheckTxStatusRequest = { step, txId, requestId };
-
-  const response = await fetch(url, {
-    method: 'POST',
-    headers: {
-      [RANGO_COOKIE_HEADER]: getCookieId(),
-      'content-type': 'application/json;charset=UTF-8',
-    },
-    body: JSON.stringify(body),
-  });
-
-  if (
-    (!!response.status && (response.status < 200 || response.status >= 400)) ||
-    !response.ok
-  ) {
-    const apiError = ERROR_COMMUNICATING_WITH_API(
-      ApiMethodName.CheckingTransactionStatus
-    );
-    throw PrettyError.BadStatusCode(apiError, response.status);
-  }
-
-  const res = await response.json();
-  return {
-    ...res,
-    outputAmount: res.outputAmount ? new BigNumber(res.outputAmount) : null,
-  };
-}
-
-export async function createTransaction(
-  request: CreateTransactionRequest
-): Promise<CreateTransactionResponse> {
-  const url = `${BASE_URL}/tx/create?${RANGO_DAPP_ID_QUERY}`;
-  try {
-    const response = await fetch(url, {
-      method: 'POST',
-      headers: {
-        'content-type': 'application/json;charset=UTF-8',
-        [RANGO_COOKIE_HEADER]: getCookieId(),
-      },
-      body: JSON.stringify(request),
-    });
-
-    if (
-      (!!response.status &&
-        (response.status < 200 || response.status >= 400)) ||
-      !response.ok
-    ) {
-      throw PrettyError.CreateTransaction(
-        `Error creating the transaction, status code: ${response.status}`
-      );
-    }
-
-    const result: CreateTransactionResponse = await response.json();
-    if (!result.ok || !result.transaction)
-      throw PrettyError.CreateTransaction(
-        result.error || 'bad response from create tx endpoint'
-      );
-
-    return result;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  } catch (error) {
-    if (error instanceof Error) {
-      throw PrettyError.CreateTransaction(error.message);
-    }
-    throw error;
-  }
-}
-
-export async function checkApproved(
-  requestId: string
-): Promise<CheckApprovalResponse> {
-  const url = `${BASE_URL}/tx/${requestId}/check-approval?${RANGO_DAPP_ID_QUERY}`;
-  const response = await fetch(url, {
-    method: 'GET',
-    headers: {
-      'content-type': 'application/json;charset=UTF-8',
-      [RANGO_COOKIE_HEADER]: getCookieId(),
-    },
-  });
-
-  if (
-    (!!response.status && (response.status < 200 || response.status >= 400)) ||
-    !response.ok
-  ) {
-    const apiError = ERROR_COMMUNICATING_WITH_API(ApiMethodName.CheckApproval);
-    throw PrettyError.BadStatusCode(apiError, response.status);
-  }
-
-  return await response.json();
-}
-
-function isAPIErrorCode(value: string): value is APIErrorCode {
-  return (Object.values(APIErrorCode) as string[]).includes(value);
-}
-
-export function mapAppErrorCodesToAPIErrorCode(
-  errorCode: string | null
-): APIErrorCode {
-  const defaultErrorCode = APIErrorCode.CLIENT_UNEXPECTED_BEHAVIOUR;
-  try {
-    if (!errorCode) return defaultErrorCode;
-    if (isAPIErrorCode(errorCode)) return errorCode;
-    if (isWalletErrorCode(errorCode)) {
-      const t: { [key in WalletErrorCode]: APIErrorCode } = {
-        [WalletErrorCode.REJECTED_BY_USER]: APIErrorCode.USER_REJECT,
-        [WalletErrorCode.SIGN_TX_ERROR]: APIErrorCode.CALL_WALLET_FAILED,
-        [WalletErrorCode.SEND_TX_ERROR]: APIErrorCode.SEND_TX_FAILED,
-        [WalletErrorCode.NOT_IMPLEMENTED]: defaultErrorCode,
-        [WalletErrorCode.OPERATION_UNSUPPORTED]: defaultErrorCode,
-        [WalletErrorCode.UNEXPECTED_BEHAVIOUR]: defaultErrorCode,
-      };
-      return t[errorCode];
-    }
-    return defaultErrorCode;
-  } catch (err) {
-    return defaultErrorCode;
-  }
-}
-
-export async function reportFailed(
-  requestId: string,
-  step: number,
-  eventType: APIErrorCode,
-  reason: string,
-  walletType: WalletType | null
-): Promise<void> {
-  const url = `${BASE_URL}/tx/report-tx?${RANGO_DAPP_ID_QUERY}`;
-  await fetch(url, {
-    method: 'POST',
-    headers: {
-      'content-type': 'application/json;charset=UTF-8',
-      [RANGO_COOKIE_HEADER]: getCookieId(),
-    },
-    body: JSON.stringify({
-      requestId,
-      step,
-      eventType,
-      reason,
-      tags: {
-        wallet: walletType,
-      },
-    }),
-  });
-}