@rango-dev/queue-manager-rango-preset 0.1.14 → 0.1.15-next.0

package/dist/types.d.ts

@@ -34,6 +34,7 @@ export interface SwapQueueContext extends QueueContext {
     switchNetwork: (wallet: WalletType, network: Network) => Promise<ConnectResult> | undefined;
     connect: (wallet: WalletType, network: Network) => Promise<ConnectResult> | undefined;
     state: (type: WalletType) => WalletState;
+    isMobileWallet: (type: WalletType) => boolean;
     notifier: (data: SwapProgressNotification) => void;
     claimedBy?: string;
     resetClaimedBy?: () => void;

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EACL,IAAI,EACJ,OAAO,EACP,WAAW,EACX,UAAU,EACX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE/D,oBAAY,YAAY,GAAG,QAAQ,CACjC,WAAW,EACX,eAAe,EACf,gBAAgB,CACjB,CAAC;AAEF,MAAM,WAAW,WAAY,SAAQ,YAAY;IAC/C,WAAW,EAAE,WAAW,CAAC;CAC1B;AAED,oBAAY,eAAe;IACzB,KAAK,UAAU;IACf,kBAAkB,uBAAuB;IACzC,kBAAkB,uBAAuB;IACzC,mBAAmB,wBAAwB;IAC3C,wBAAwB,6BAA6B;CACtD;AAED,oBAAY,iBAAiB,GAAG,CAC9B,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,OAAO,KACb,MAAM,GAAG,SAAS,CAAC;AAExB,oBAAY,WAAW;IACrB,uBAAuB,kCAAkC;IACzD,uBAAuB,+BAA+B;IACtD,uBAAuB,4BAA4B;CACpD;AAGD,MAAM,WAAW,KAAK,CAAC,CAAC,GAAG,GAAG;IAC5B,MAAM,EAAE,WAAW,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,CAAC;CACb;AAED,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACpD,IAAI,EAAE,IAAI,CAAC;IACX,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,aAAa,CAAC;IAChD,aAAa,EAAE,CACb,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,OAAO,KACb,OAAO,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;IACxC,OAAO,EAAE,CACP,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,OAAO,KACb,OAAO,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;IACxC,KAAK,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,WAAW,CAAC;IACzC,QAAQ,EAAE,CAAC,IAAI,EAAE,wBAAwB,KAAK,IAAI,CAAC;IAGnD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;CAC7B;AAED,MAAM,WAAW,qBAAqB;IACpC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,kBAAkB,EAAE,UAAU,GAAG,SAAS,CAAC;IAC3C,uBAAuB,EAAE,MAAM,IAAI,CAAC;IACpC,SAAS,EAAE,iBAAiB,EAAE,CAAC;IAC/B,QAAQ,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAAC;CACxC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EACL,IAAI,EACJ,OAAO,EACP,WAAW,EACX,UAAU,EACX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE/D,oBAAY,YAAY,GAAG,QAAQ,CACjC,WAAW,EACX,eAAe,EACf,gBAAgB,CACjB,CAAC;AAEF,MAAM,WAAW,WAAY,SAAQ,YAAY;IAC/C,WAAW,EAAE,WAAW,CAAC;CAC1B;AAED,oBAAY,eAAe;IACzB,KAAK,UAAU;IACf,kBAAkB,uBAAuB;IACzC,kBAAkB,uBAAuB;IACzC,mBAAmB,wBAAwB;IAC3C,wBAAwB,6BAA6B;CACtD;AAED,oBAAY,iBAAiB,GAAG,CAC9B,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,OAAO,KACb,MAAM,GAAG,SAAS,CAAC;AAExB,oBAAY,WAAW;IACrB,uBAAuB,kCAAkC;IACzD,uBAAuB,+BAA+B;IACtD,uBAAuB,4BAA4B;CACpD;AAGD,MAAM,WAAW,KAAK,CAAC,CAAC,GAAG,GAAG;IAC5B,MAAM,EAAE,WAAW,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,CAAC;CACb;AAED,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACpD,IAAI,EAAE,IAAI,CAAC;IACX,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,aAAa,CAAC;IAChD,aAAa,EAAE,CACb,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,OAAO,KACb,OAAO,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;IACxC,OAAO,EAAE,CACP,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,OAAO,KACb,OAAO,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC;IACxC,KAAK,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,WAAW,CAAC;IACzC,cAAc,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,OAAO,CAAC;IAC9C,QAAQ,EAAE,CAAC,IAAI,EAAE,wBAAwB,KAAK,IAAI,CAAC;IAGnD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,IAAI,CAAC;CAC7B;AAED,MAAM,WAAW,qBAAqB;IACpC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,kBAAkB,EAAE,UAAU,GAAG,SAAS,CAAC;IAC3C,uBAAuB,EAAE,MAAM,IAAI,CAAC;IACpC,SAAS,EAAE,iBAAiB,EAAE,CAAC;IAC/B,QAAQ,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAAC;CACxC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/queue-manager-rango-preset",
-  "version": "0.1.14",
+  "version": "0.1.15-next.0",
   "license": "MIT",
   "module": "dist/queue-manager-rango-preset.esm.js",
   "main": "dist/index.js",

package/src/helpers.ts

@@ -330,10 +330,7 @@ export function markRunningSwapAsSwitchingNetwork({
   const { type } = getRequiredWallet(swap);
   const fromBlockchain = getCurrentBlockchainOf(swap, currentStep);
   const reason = `Change ${type} wallet network to ${fromBlockchain}`;
-  let metamaskMessage = '';
-  if (type === WalletType.META_MASK)
-    metamaskMessage = `(Networks -> Select '${fromBlockchain}' network.)`;
-  const reasonDetail = `Please change your ${type} wallet network to ${fromBlockchain}. ${metamaskMessage}`;
+  const reasonDetail = `Please change your ${type} wallet network to ${fromBlockchain}.`;
 
   const currentTime = new Date();
   swap.lastNotificationTime = currentTime.getTime().toString();
@@ -528,50 +525,25 @@ export async function isNetworkMatchedForTransaction(
     try {
       const sourceWallet = swap.wallets[fromBlockChain];
       if (sourceWallet) {
-        if (
-          [
-            WalletType.META_MASK,
-            WalletType.BINANCE_CHAIN,
-            WalletType.XDEFI,
-            WalletType.WALLET_CONNECT,
-            WalletType.TRUST_WALLET,
-            WalletType.COIN98,
-            WalletType.EXODUS,
-            WalletType.OKX,
-            WalletType.COINBASE,
-            WalletType.TOKEN_POCKET,
-            WalletType.MATH,
-            WalletType.SAFEPAL,
-            WalletType.COSMOSTATION,
-            WalletType.CLOVER,
-            WalletType.BRAVE,
-            WalletType.FRONTIER,
-            WalletType.KUCOIN,
-            WalletType.ENKRYPT,
-          ].includes(sourceWallet.walletType)
-        ) {
-          const provider = getEvmProvider(providers, sourceWallet.walletType);
-          const chainId: number | string | null = await getChainId(provider);
-          if (chainId) {
-            const blockChain = getBlockChainNameFromId(
-              chainId,
-              Object.entries(meta.blockchains).map(
-                ([, blockchainMeta]) => blockchainMeta
-              )
-            );
-            if (
-              blockChain &&
-              blockChain.toLowerCase() === fromBlockChain.toLowerCase()
-            )
-              return true;
-            if (
-              blockChain &&
-              blockChain.toLowerCase() !== fromBlockChain.toLowerCase()
+        const provider = getEvmProvider(providers, sourceWallet.walletType);
+        const chainId: number | string | null = await getChainId(provider);
+        if (chainId) {
+          const blockChain = getBlockChainNameFromId(
+            chainId,
+            Object.entries(meta.blockchains).map(
+              ([, blockchainMeta]) => blockchainMeta
             )
-              return false;
-          }
-        } else {
-          return true;
+          );
+          if (
+            blockChain &&
+            blockChain.toLowerCase() === fromBlockChain.toLowerCase()
+          )
+            return true;
+          if (
+            blockChain &&
+            blockChain.toLowerCase() !== fromBlockChain.toLowerCase()
+          )
+            return false;
         }
       }
     } catch (e) {
@@ -822,7 +794,7 @@ export function singTransaction(
   actions: ExecuterActions<SwapStorage, SwapActionTypes, SwapQueueContext>
 ): void {
   const { getStorage, setStorage, failed, next, schedule, context } = actions;
-  const { meta, getSigners, notifier } = context;
+  const { meta, getSigners, notifier, isMobileWallet } = context;
   const swap = getStorage().swapDetails;
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   const currentStep = getCurrentStep(swap)!;
@@ -840,6 +812,7 @@ export function singTransaction(
   const sourceWallet = getRelatedWallet(swap, currentStep);
   const walletAddress = getCurrentAddressOf(swap, currentStep);
   const walletSigners = getSigners(sourceWallet.walletType);
+  const mobileWallet = isMobileWallet(sourceWallet.walletType);
 
   const onFinish = () => {
     // TODO resetClaimedBy is undefined here
@@ -858,9 +831,7 @@ export function singTransaction(
 
     // Update swap status
     const message = `Waiting for approval of ${currentStep?.fromSymbol} coin ${
-      sourceWallet.walletType === WalletType.WALLET_CONNECT
-        ? 'on your mobile phone'
-        : ''
+      mobileWallet ? 'on your mobile phone' : ''
     }`;
     const updateResult = updateSwapStatus({
       getStorage,
@@ -942,9 +913,7 @@ export function singTransaction(
   } else if (!!tronApprovalTransaction) {
     // Update swap status
     const message = `Waiting for approval of ${currentStep?.fromSymbol} coin ${
-      sourceWallet.walletType === WalletType.WALLET_CONNECT
-        ? 'on your mobile phone'
-        : ''
+      mobileWallet ? 'on your mobile phone' : ''
     }`;
     const updateResult = updateSwapStatus({
       getStorage,
@@ -1023,9 +992,7 @@ export function singTransaction(
   } else if (!!starknetApprovalTransaction) {
     // Update swap status
     const message = `Waiting for approval of ${currentStep?.fromSymbol} coin ${
-      sourceWallet.walletType === WalletType.WALLET_CONNECT
-        ? 'on your mobile phone'
-        : ''
+      mobileWallet ? 'on your mobile phone' : ''
     }`;
     const updateResult = updateSwapStatus({
       getStorage,
@@ -1113,12 +1080,7 @@ export function singTransaction(
   const executeMessage = hasAlreadyProceededToSign
     ? 'Transaction is expired. Please try again'
     : 'executing transaction';
-  const executeDetails = `${
-    sourceWallet.walletType === WalletType.WALLET_CONNECT
-      ? 'Check your mobile phone'
-      : ''
-  }`;
-
+  const executeDetails = mobileWallet ? 'Check your mobile phone' : '';
   if (!!transferTransaction) {
     const updateResult = updateSwapStatus({
       getStorage,
@@ -1265,38 +1227,6 @@ export function singTransaction(
       failed();
       onFinish();
     } else {
-      // If keplr wallet is executing contracts on terra, throw error. keplr doesn't support transfer or execute contracts. only IBC messages are supported
-      if (
-        (currentStep?.swapperId.toString() === 'TerraSwap' ||
-          (currentStep?.swapperId.toString() === 'ThorChain' &&
-            currentStep?.fromBlockchain === Network.TERRA) ||
-          (currentStep?.swapperId.toString() === 'Terra Bridge' &&
-            currentStep.fromBlockchain === Network.TERRA)) && // here we must allow ibc on terrastatus
-        sourceWallet.walletType === WalletType.KEPLR
-      ) {
-        const { extraMessage, extraMessageDetail, extraMessageErrorCode } =
-          prettifyErrorMessage(
-            'Keplr only supports IBC Transactions on Terra. ' +
-              'Using Terra Bridge, TerraSwap and THORChain is not possible with Keplr. Please use TerraStation or Leap wallet'
-          );
-        const updateResult = updateSwapStatus({
-          getStorage,
-          setStorage,
-          nextStatus: 'failed',
-          nextStepStatus: 'failed',
-          message: extraMessage,
-          details: extraMessageDetail,
-          errorCode: extraMessageErrorCode,
-        });
-        notifier({
-          eventType: 'smart_contract_call_failed',
-          ...updateResult,
-        });
-        failed();
-        onFinish();
-        return;
-      }
-
       walletSigners
         .getSigner(TransactionType.COSMOS)
         .signAndSendTx(cosmosTransaction, walletAddress, null)

package/src/shared.ts

@@ -338,7 +338,7 @@ export function getRelatedWallet(
   const wallet = walletKV?.v || null;
 
   const walletType = wallet?.walletType;
-  if (walletType === WalletType.UNKNOWN || wallet === null)
+  if (wallet === null)
     throw PrettyError.AssertionFailed(
       `Wallet for source ${blockchain} not passed: walletType: ${walletType}`
     );

package/src/types.ts

@@ -60,6 +60,7 @@ export interface SwapQueueContext extends QueueContext {
     network: Network
   ) => Promise<ConnectResult> | undefined;
   state: (type: WalletType) => WalletState;
+  isMobileWallet: (type: WalletType) => boolean;
   notifier: (data: SwapProgressNotification) => void;
 
   // Dynamically will be added to context.