@rango-dev/queue-manager-rango-preset 0.1.15-next.6 → 0.1.15-next.7

package/dist/types.d.ts

@@ -32,6 +32,7 @@ export interface SwapQueueContext extends QueueContext {
     providers: Providers;
     getSigners: (type: WalletType) => SignerFactory;
     switchNetwork: (wallet: WalletType, network: Network) => Promise<ConnectResult> | undefined;
+    canSwitchNetworkTo: (type: WalletType, network: Network) => boolean;
     connect: (wallet: WalletType, network: Network) => Promise<ConnectResult> | undefined;
     state: (type: WalletType) => WalletState;
     isMobileWallet: (type: WalletType) => boolean;
@@ -45,5 +46,6 @@ export interface UseQueueManagerParams {
     clearDisconnectedWallet: () => void;
     evmChains: EvmBlockchainMeta[];
     notifier: SwapQueueContext['notifier'];
+    canSwitchNetworkTo: (type: WalletType, network: Network) => boolean;
 }
 //# sourceMappingURL=types.d.ts.map

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,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"}
+{"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,kBAAkB,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC;IACpE,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;IACvC,kBAAkB,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC;CACrE"}

package/package.json

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

package/src/helpers.ts

@@ -96,7 +96,7 @@ export function claimQueue() {
  * map of transactions hash to the TransactionResponse
  *
  */
-let swapTransactionToResponseMap: { [id: string]: any } = {};
+const swapTransactionToResponseMap: { [id: string]: any } = {};
 export function useTransactionsResponse() {
   return {
     getTransactionResponseByHash: (hash: string) =>
@@ -286,7 +286,7 @@ export function updateSwapStatus({
   const currentStep = getCurrentStep(swap);
   if (!!nextStepStatus && !!currentStep) currentStep.status = nextStepStatus;
 
-  if (!!nextStatus) swap.status = nextStatus;
+  if (nextStatus) swap.status = nextStatus;
   swap.hasAlreadyProceededToSign = hasAlreadyProceededToSign;
   if (!!nextStatus && ['failed', 'success'].includes(nextStatus))
     swap.finishTime = new Date().getTime().toString();
@@ -354,7 +354,7 @@ export function setStepTransactionIds(
   const currentStep = getCurrentStep(swap)!;
   currentStep.executedTransactionId = txId;
   currentStep.executedTransactionTime = new Date().getTime().toString();
-  if (!!explorerUrl?.url)
+  if (explorerUrl?.url)
     currentStep.explorerUrl = [
       ...(currentStep.explorerUrl || []),
       {
@@ -376,7 +376,7 @@ export function setStepTransactionIds(
     ...getStorage(),
     swapDetails: swap,
   });
-  if (!!eventType)
+  if (eventType)
     notifier({ eventType: eventType, swap: swap, step: currentStep });
 }
 
@@ -613,7 +613,7 @@ export async function isNetworkMatchedForTransaction(
   if (!fromBlockChain) return false;
 
   if (
-    !!meta.evmBasedChains.find(
+    meta.evmBasedChains.find(
       (evmBlochain) => evmBlochain.name === fromBlockChain
     )
   ) {
@@ -783,16 +783,18 @@ export function onBlockForChangeNetwork(
   // Try to auto switch
   const { type, network } = getRequiredWallet(swap);
   if (!!type && !!network) {
-    const result = context.switchNetwork(type, network);
-    if (result) {
-      result
-        .then(() => {
-          queue.unblock();
-        })
-        .catch((error) => {
-          // ignore switch network errors
-          console.log({ error });
-        });
+    if (context.canSwitchNetworkTo(type, network)) {
+      const result = context.switchNetwork(type, network);
+      if (result) {
+        result
+          .then(() => {
+            queue.unblock();
+          })
+          .catch((error) => {
+            // ignore switch network errors
+            console.log({ error });
+          });
+      }
     }
   }
 }
@@ -860,7 +862,12 @@ export function onDependsOnOtherQueues(
     resetClaimedBy: () => {
       reset();
       // TODO: Use key generator
-      retryOn(`${type}-${network}:${address}`, context.notifier, manager);
+      retryOn(
+        `${type}-${network}:${address}`,
+        context.notifier,
+        manager,
+        context.canSwitchNetworkTo
+      );
     },
   });
 }
@@ -1147,7 +1154,7 @@ export function checkWaitingForNetworkChange(manager?: Manager): void {
  */
 export function getRunningSwaps(manager: Manager): PendingSwap[] {
   const queues = manager?.getAll() || new Map<QueueName, QueueInfo>();
-  let result: PendingSwap[] = [];
+  const result: PendingSwap[] = [];
   queues.forEach((q) => {
     // retry only on affected queues
     const queueStorage = q.list.getStorage() as SwapStorage | undefined;
@@ -1204,6 +1211,7 @@ export function retryOn(
   wallet_network: string,
   notifier: SwapQueueContext['notifier'],
   manager?: Manager,
+  canSwitchNetworkTo?: (type: WalletType, network: Network) => boolean,
   options = { fallbackToOnlyWallet: true }
 ): void {
   const [wallet, network] = splitWalletNetwork(wallet_network);
@@ -1258,7 +1266,9 @@ export function retryOn(
     finalQueueToBeRun = onlyWalletMatched[0];
   }
 
-  finalQueueToBeRun?.checkBlock();
+  if (!canSwitchNetworkTo?.(wallet, network as Network))
+    finalQueueToBeRun?.unblock();
+  else finalQueueToBeRun?.checkBlock();
 }
 
 /* 
@@ -1276,17 +1286,13 @@ For backward compatibilty with server and sdk, we use this wrapper to reject the
 export async function throwOnOK(
   rawResponse: Promise<CreateTransactionResponse>
 ): Promise<CreateTransactionResponse> {
-  try {
-    const responseBody = await rawResponse;
-    if (!responseBody.ok || !responseBody.transaction) {
-      throw PrettyError.CreateTransaction(
-        responseBody.error || 'bad response from create tx endpoint'
-      );
-    }
-    return responseBody;
-  } catch (e) {
-    throw e;
+  const responseBody = await rawResponse;
+  if (!responseBody.ok || !responseBody.transaction) {
+    throw PrettyError.CreateTransaction(
+      responseBody.error || 'bad response from create tx endpoint'
+    );
   }
+  return responseBody;
 }
 
 export function cancelSwap(

package/src/hooks.ts

@@ -56,7 +56,12 @@ function useQueueManager(params: UseQueueManagerParams): void {
         manager,
         notifier: params.notifier,
       });
-      retryOn(params.lastConnectedWallet, params.notifier, manager);
+      retryOn(
+        params.lastConnectedWallet,
+        params.notifier,
+        manager,
+        params.canSwitchNetworkTo
+      );
     }
   }, [params.lastConnectedWallet]);
 

package/src/types.ts

@@ -55,6 +55,7 @@ export interface SwapQueueContext extends QueueContext {
     wallet: WalletType,
     network: Network
   ) => Promise<ConnectResult> | undefined;
+  canSwitchNetworkTo: (type: WalletType, network: Network) => boolean;
   connect: (
     wallet: WalletType,
     network: Network
@@ -74,4 +75,5 @@ export interface UseQueueManagerParams {
   clearDisconnectedWallet: () => void;
   evmChains: EvmBlockchainMeta[];
   notifier: SwapQueueContext['notifier'];
+  canSwitchNetworkTo: (type: WalletType, network: Network) => boolean;
 }