@orb-labs/orby-core 0.0.27 → 0.0.28

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ### Unreleased
 
+### 0.0.28
+
+- returning the correct status
+- using the same extractBlockchainInformation for all the places we need to parse blockchain information from Orby
+- adding the getOperationSet function
+
 ### 0.0.27
 
 - fix gasToken input

package/dist/cjs/actions/blockchain.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BlockchainActions = void 0;
 const action_helpers_js_1 = require("../utils/action_helpers.js");
 const library_request_js_1 = require("../entities/library_request.js");
+const index_js_1 = require("../index.js");
 class BlockchainActions extends library_request_js_1.LibraryRequest {
     constructor(library, client, provider) {
         super(library, client, provider);
@@ -14,7 +15,7 @@ class BlockchainActions extends library_request_js_1.LibraryRequest {
             console.error("[getBlockchainInformation]", code, message);
             return undefined;
         }
-        return (0, action_helpers_js_1.extractBlockchainInformation)(blockchain);
+        return (0, index_js_1.extractBlockchainInformation)(blockchain);
     }
     async listBlockchainsInformation(offset, limit) {
         const { pageInfo, edges, code, message } = await this.sendRequest("orby_listBlockchainsInformation", [{ offset, limit }]);

package/dist/cjs/actions/operation.d.ts

@@ -1,4 +1,4 @@
-import { AccountCluster, OnchainOperation, OperationSet, OperationStatus, SignedOperation, UserOperation } from "../types.js";
+import { AccountCluster, Activity, OnchainOperation, OperationSet, OperationStatus, SignedOperation, UserOperation } from "../types.js";
 import { CurrencyAmount } from "../entities/financial/currency_amount.js";
 import { LIBRARY_TYPE, OperationStatusType, QuoteType } from "../enums.js";
 import { LibraryRequest } from "../entities/library_request.js";
@@ -32,6 +32,7 @@ export declare class OperationActions extends LibraryRequest {
         operationSetId: string;
         operationResponses: OperationStatus[];
     }>;
+    getOperationSet(operationSetId: string): Promise<Activity>;
     getOperationStatuses(operationIds: string[]): Promise<OperationStatus[]>;
     estimateFiatCostToExecuteTransaction(data: string, to?: string, value?: bigint): Promise<CurrencyAmount>;
     estimateFiatCostToSignTypedData(data: string): Promise<CurrencyAmount>;
@@ -94,6 +95,9 @@ export declare class OperationActions extends LibraryRequest {
             address?: string;
         }[];
     }): Promise<OperationSet>;
+    subscribeToOperationSetStatus(operationSetId?: string, onOperationSetStatusUpdateCallback?: (activity?: Activity) => void, timeout?: number): {
+        intervalId: NodeJS.Timeout | null;
+    };
     subscribeToOperationStatuses(ids?: string[], onOperationStatusesUpdateCallback?: (statusSummary: OperationStatusType, primaryOperationStatus?: OperationStatus, allOperationStatuses?: OperationStatus[]) => void, timout?: number): {
         intervalId: NodeJS.Timeout | null;
     };

package/dist/cjs/actions/operation.js

@@ -97,6 +97,14 @@ class OperationActions extends library_request_js_1.LibraryRequest {
             operationResponses: (0, action_helpers_js_1.extractOperationStatuses)(operationResponses),
         };
     }
+    async getOperationSet(operationSetId) {
+        const { activity, code, message } = await this.sendRequest("orby_getOperationSet", [{ operationSetId }]);
+        if (code && message) {
+            console.error("[getOperationSet]", code, message);
+            return undefined;
+        }
+        return (0, action_helpers_js_1.extractActivity)(activity);
+    }
     async getOperationStatuses(operationIds) {
         const { operationStatuses } = await this.sendRequest("orby_getOperationStatuses", [{ operationIds }]);
         return (0, action_helpers_js_1.extractOperationStatuses)(operationStatuses);
@@ -225,6 +233,47 @@ class OperationActions extends library_request_js_1.LibraryRequest {
         ]);
         return (0, action_helpers_js_1.extractOperationSet)(operationSet);
     }
+    subscribeToOperationSetStatus(operationSetId, onOperationSetStatusUpdateCallback, timeout) {
+        let intervalId = null;
+        let totalWaitTime = 0;
+        const timeoutOrDefault = timeout ?? 300_000;
+        if (operationSetId) {
+            const waitTime = 500;
+            intervalId = setInterval(async () => {
+                let statusSummary = enums_js_1.ActivityStatus.WAITING_PRECONDITION;
+                try {
+                    const activity = operationSetId
+                        ? await this?.getOperationSet(operationSetId)
+                        : undefined;
+                    if (activity) {
+                        statusSummary = activity?.overallStatus;
+                    }
+                    onOperationSetStatusUpdateCallback?.(activity);
+                }
+                catch (error) {
+                    console.error("[subscribeToOperationSetStatus]", error);
+                }
+                finally {
+                    totalWaitTime += waitTime;
+                    if (intervalId &&
+                        ![
+                            enums_js_1.ActivityStatus.WAITING_TOKEN_APPROVAL_TRANSACTIONS,
+                            enums_js_1.ActivityStatus.WAITING_GAS_ABSTRACTION,
+                            enums_js_1.ActivityStatus.WAITING_PRECONDITION,
+                        ].includes(statusSummary)) {
+                        clearInterval(intervalId);
+                        intervalId = null;
+                    }
+                    else if (intervalId && totalWaitTime >= timeoutOrDefault) {
+                        // we cant wait for more than 2 ETH blocks
+                        clearInterval(intervalId);
+                        intervalId = null;
+                    }
+                }
+            }, waitTime);
+        }
+        return { intervalId };
+    }
     subscribeToOperationStatuses(ids, onOperationStatusesUpdateCallback, timout) {
         let intervalId = null;
         let totalWaitTime = 0;
@@ -251,18 +300,25 @@ class OperationActions extends library_request_js_1.LibraryRequest {
                         statusSummary = enums_js_1.OperationStatusType.SUCCESSFUL;
                     }
                     primaryOperation = statuses?.find((status) => status.type == enums_js_1.OperationType.FINAL_TRANSACTION);
-                    if (primaryOperation?.status == enums_js_1.OperationStatusType.PENDING) {
-                        statusSummary = enums_js_1.OperationStatusType.PENDING;
+                    if ([
+                        enums_js_1.OperationStatusType.PENDING,
+                        enums_js_1.OperationStatusType.SUCCESSFUL,
+                    ].includes(primaryOperation?.status)) {
+                        statusSummary = primaryOperation?.status;
                     }
                     onOperationStatusesUpdateCallback?.(statusSummary, primaryOperation, statuses);
                 }
                 catch (error) {
-                    console.error("[useWaitForStatusCompletion]", error);
+                    console.error("[subscribeToOperationStatuses]", error);
                 }
                 finally {
                     totalWaitTime += waitTime;
                     if (intervalId &&
-                        enums_js_1.OperationStatusType.WAITING_PRECONDITION != statusSummary) {
+                        ![
+                            enums_js_1.OperationStatusType.WAITING_TOKEN_APPROVAL_TRANSACTIONS,
+                            enums_js_1.OperationStatusType.WAITING_GAS_ABSTRACTION,
+                            enums_js_1.OperationStatusType.WAITING_PRECONDITION,
+                        ].includes(statusSummary)) {
                         clearInterval(intervalId);
                         intervalId = null;
                     }

package/dist/cjs/constants.d.ts

@@ -1,9 +1,9 @@
 import { Currency } from "./entities/financial/currency.js";
-import { ChainConfigs } from "./types.js";
+import { BlockchainInformation } from "./types.js";
 export declare const Big: any;
 export declare const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
 export declare const ONE_ADDRESS = "0x0000000000000000000000000000000000000001";
 export declare const TWO_ADDRESS = "0x0000000000000000000000000000000000000002";
 export declare const NATIVE_TOKEN_ADDRESS = "0x0000000000000000000000000000000000000000";
-export declare const CHAIN_CONFIGS: Record<number, ChainConfigs>;
+export declare const CHAIN_CONFIGS: Record<number, BlockchainInformation>;
 export declare const FIAT_CURRENCY: Currency;

package/dist/cjs/enums.d.ts

@@ -48,11 +48,15 @@ export declare enum Category {
     TYPED_DATA_SIGNATURE = "TYPED_DATA_SIGNATURE"
 }
 export declare enum OperationStatusType {
+    CANCELLED = "CANCELLED",
     FAILED = "FAILED",
     NOT_FOUND = "NOT_FOUND",
     PENDING = "PENDING",
     SUCCESSFUL = "SUCCESSFUL",
-    WAITING_PRECONDITION = "WAITING_PRECONDITION"
+    WAITING_GAS_ABSTRACTION = "WAITING_GAS_ABSTRACTION",
+    WAITING_TOKEN_APPROVAL_TRANSACTIONS = "WAITING_TOKEN_APPROVAL_TRANSACTIONS",
+    WAITING_PRECONDITION = "WAITING_PRECONDITION",
+    WAITING_TIMEOUT = "WAITING_TIMEOUT"
 }
 export declare enum QuoteType {
     EXACT_INPUT = "EXACT_INPUT",
@@ -65,8 +69,13 @@ export declare enum Order {
 export declare enum ActivityStatus {
     CANCELLED = "CANCELLED",
     FAILED = "FAILED",
+    NOT_FOUND = "NOT_FOUND",
     PENDING = "PENDING",
-    SUCCESS = "SUCCESS"
+    SUCCESSFUL = "SUCCESSFUL",
+    WAITING_GAS_ABSTRACTION = "WAITING_GAS_ABSTRACTION",
+    WAITING_TOKEN_APPROVAL_TRANSACTIONS = "WAITING_TOKEN_APPROVAL_TRANSACTIONS",
+    WAITING_PRECONDITION = "WAITING_PRECONDITION",
+    WAITING_TIMEOUT = "WAITING_TIMEOUT"
 }
 export declare enum BlockchainEnvironment {
     MAINNET = "MAINNET",

package/dist/cjs/enums.js

@@ -60,11 +60,15 @@ var Category;
 })(Category || (exports.Category = Category = {}));
 var OperationStatusType;
 (function (OperationStatusType) {
+    OperationStatusType["CANCELLED"] = "CANCELLED";
     OperationStatusType["FAILED"] = "FAILED";
     OperationStatusType["NOT_FOUND"] = "NOT_FOUND";
     OperationStatusType["PENDING"] = "PENDING";
     OperationStatusType["SUCCESSFUL"] = "SUCCESSFUL";
+    OperationStatusType["WAITING_GAS_ABSTRACTION"] = "WAITING_GAS_ABSTRACTION";
+    OperationStatusType["WAITING_TOKEN_APPROVAL_TRANSACTIONS"] = "WAITING_TOKEN_APPROVAL_TRANSACTIONS";
     OperationStatusType["WAITING_PRECONDITION"] = "WAITING_PRECONDITION";
+    OperationStatusType["WAITING_TIMEOUT"] = "WAITING_TIMEOUT";
 })(OperationStatusType || (exports.OperationStatusType = OperationStatusType = {}));
 var QuoteType;
 (function (QuoteType) {
@@ -80,8 +84,13 @@ var ActivityStatus;
 (function (ActivityStatus) {
     ActivityStatus["CANCELLED"] = "CANCELLED";
     ActivityStatus["FAILED"] = "FAILED";
+    ActivityStatus["NOT_FOUND"] = "NOT_FOUND";
     ActivityStatus["PENDING"] = "PENDING";
-    ActivityStatus["SUCCESS"] = "SUCCESS";
+    ActivityStatus["SUCCESSFUL"] = "SUCCESSFUL";
+    ActivityStatus["WAITING_GAS_ABSTRACTION"] = "WAITING_GAS_ABSTRACTION";
+    ActivityStatus["WAITING_TOKEN_APPROVAL_TRANSACTIONS"] = "WAITING_TOKEN_APPROVAL_TRANSACTIONS";
+    ActivityStatus["WAITING_PRECONDITION"] = "WAITING_PRECONDITION";
+    ActivityStatus["WAITING_TIMEOUT"] = "WAITING_TIMEOUT";
 })(ActivityStatus || (exports.ActivityStatus = ActivityStatus = {}));
 var BlockchainEnvironment;
 (function (BlockchainEnvironment) {

package/dist/cjs/interfaces/operation.d.ts

@@ -1,4 +1,4 @@
-import { AccountCluster, OnchainOperation, OperationSet, OperationStatus, SignedOperation, UserOperation } from "../types.js";
+import { AccountCluster, Activity, OnchainOperation, OperationSet, OperationStatus, SignedOperation, UserOperation } from "../types.js";
 import { CurrencyAmount } from "../entities/financial/currency_amount.js";
 import { OperationStatusType, QuoteType } from "../enums.js";
 export interface IOperationActions {
@@ -31,6 +31,7 @@ export interface IOperationActions {
         operationResponses: OperationStatus[];
     }>;
     getOperationStatuses(operationIds: string[]): Promise<OperationStatus[]>;
+    getOperationSet(operationSetId: string): Promise<Activity>;
     estimateFiatCostToExecuteTransaction(data: string, to?: string, value?: bigint): Promise<CurrencyAmount>;
     estimateFiatCostToSignTypedData(data: string): Promise<CurrencyAmount>;
     getOperationsToTransferToken(accountClusterId: string, standardizedTokenId: string, amount: bigint, recipient: {
@@ -95,6 +96,9 @@ export interface IOperationActions {
     subscribeToOperationStatuses(ids?: string[], onOperationStatusesUpdateCallback?: (statusSummary: OperationStatusType, primaryOperationStatus?: OperationStatus, allOperationStatuses?: OperationStatus[]) => void, timout?: number): {
         intervalId: NodeJS.Timeout | null;
     };
+    subscribeToOperationSetStatus(operationSetId?: string, onOperationSetStatusUpdateCallback?: (activity?: Activity) => void, timout?: number): {
+        intervalId: NodeJS.Timeout | null;
+    };
     sendOperationSet(accountCluster: AccountCluster, operationSet: OperationSet, signTransaction?: (operation: OnchainOperation) => Promise<string | undefined>, signUserOperation?: (operations: OnchainOperation[], accountAddress: string, chainId: bigint, txRpcUrl: string) => Promise<UserOperation | undefined>, signTypedData?: (operation: OnchainOperation) => Promise<string | undefined>): Promise<{
         success: boolean;
         operationSetId?: string;

package/dist/cjs/types.d.ts

@@ -95,6 +95,8 @@ export type Activity = {
     aggregateNetworkFeesInFiatCurrency?: CurrencyAmount;
     aggregateProtocolFeesInFiatCurrency?: CurrencyAmount;
     category: Category;
+    gasTokenAmount?: FungibleTokenAmount;
+    gasTokenAmountInFiatCurrency?: CurrencyAmount;
     initiateAt?: Date;
     inputState?: State;
     operationStatuses: OperationStatus[];
@@ -120,10 +122,13 @@ export type StandardizedToken = {
     tokens: FungibleToken[];
 };
 export type BlockchainInformation = {
-    chainId: bigint;
     environment: BlockchainEnvironment;
-    logoUrl?: string;
-    name?: string;
+    chainId: bigint;
+    vmType: VMType;
+    logoUrl: string;
+    name: string;
+    genesisBlockHash?: string;
+    nativeCurrency: Currency;
 };
 export type ContractAllowlistWithAllMethodFallback = {
     contractAddress: string;
@@ -161,15 +166,6 @@ export type GasSponsorshipData = {
     totalGasSpent: CurrencyAmount;
     totalTransactionCount: bigint;
 };
-export type ChainConfigs = {
-    environment: BlockchainEnvironment;
-    chainId: bigint;
-    vmType: VMType;
-    logoUrl: string;
-    name: string;
-    genesisBlockHash?: string;
-    nativeCurrency: Currency;
-};
 export type VirtualNodeRpcUrlForSupportedChain = {
     chainId: string;
     entrypointAccountAddress: string;

package/dist/cjs/utils/action_helpers.d.ts

@@ -6,13 +6,13 @@ export declare const extractIntent: (intent?: any) => Intent;
 export declare const extractOperationStatuses: (operationStatus?: any[]) => OperationStatus[];
 export declare const extractOperationStatus: (status?: any) => OperationStatus;
 export declare const extractActivities: (activities?: any[]) => Activity[];
+export declare const extractActivity: (activity?: any) => Activity;
 export declare const extractFungibleTokenOverview: (overview?: any) => FungibleTokenOverview;
 export declare const extractStandardizedBalances: (balances?: any) => StandardizedBalance[];
 export declare const extractStandardizedBalance: (balance?: any) => StandardizedBalance;
 export declare const extractStandardizedTokens: (tokens?: any) => StandardizedToken[];
 export declare const extractStandardizedToken: (token?: any) => StandardizedToken;
 export declare const extractBlockchainInformations: (blockchainInformation?: any[]) => BlockchainInformation[];
-export declare const extractBlockchainInformation: (blockchainInformation?: any) => BlockchainInformation;
 export declare const extractMaxAmountPerInterval: (maxAmountPerInterval?: any) => MaxAmountPerInterval;
 export declare const extractAllowlistWithOpenFallback: (allowlist?: any) => AllowlistWithOpenFallback;
 export declare const extractGasSponsorshipPolicy: (gasSponsorshipPolicy?: any) => GasSponsorshipPolicy;

package/dist/cjs/utils/action_helpers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractGasSponsorshipData = exports.extractGasSponsorshipInformation = exports.extractGasSpendForInstance = exports.extractGasSpendForInstances = exports.extractGasSponsorshipPolicy = exports.extractAllowlistWithOpenFallback = exports.extractMaxAmountPerInterval = exports.extractBlockchainInformation = exports.extractBlockchainInformations = exports.extractStandardizedToken = exports.extractStandardizedTokens = exports.extractStandardizedBalance = exports.extractStandardizedBalances = exports.extractFungibleTokenOverview = exports.extractActivities = exports.extractOperationStatus = exports.extractOperationStatuses = exports.extractIntent = exports.extractOnchainOperation = exports.extractOperationSet = exports.extractAccountCluster = void 0;
+exports.extractGasSponsorshipData = exports.extractGasSponsorshipInformation = exports.extractGasSpendForInstance = exports.extractGasSpendForInstances = exports.extractGasSponsorshipPolicy = exports.extractAllowlistWithOpenFallback = exports.extractMaxAmountPerInterval = exports.extractBlockchainInformations = exports.extractStandardizedToken = exports.extractStandardizedTokens = exports.extractStandardizedBalance = exports.extractStandardizedBalances = exports.extractFungibleTokenOverview = exports.extractActivity = exports.extractActivities = exports.extractOperationStatus = exports.extractOperationStatuses = exports.extractIntent = exports.extractOnchainOperation = exports.extractOperationSet = exports.extractAccountCluster = void 0;
 const enums_js_1 = require("../enums.js");
 const currency_amount_js_1 = require("../entities/financial/currency_amount.js");
 const state_js_1 = require("../entities/state.js");
@@ -124,22 +124,29 @@ const extractActivities = (activities) => {
     if (!activities) {
         return undefined;
     }
-    return activities.map((activity) => {
-        return {
-            aggregateFiatValueOfInputState: currency_amount_js_1.CurrencyAmount.toCurrencyAmount(activity.aggregateFiatValueOfInputState),
-            aggregateFiatValueOfOutputState: currency_amount_js_1.CurrencyAmount.toCurrencyAmount(activity.aggregateFiatValueOfOutputState),
-            aggregateNetworkFeesInFiatCurrency: currency_amount_js_1.CurrencyAmount.toCurrencyAmount(activity.aggregateNetworkFeesInFiatCurrency),
-            aggregateProtocolFeesInFiatCurrency: currency_amount_js_1.CurrencyAmount.toCurrencyAmount(activity.aggregateProtocolFeesInFiatCurrency),
-            category: activity.category,
-            initiateAt: activity.initiateAt,
-            inputState: state_js_1.State.toState(activity.inputState),
-            operationStatuses: (0, exports.extractOperationStatuses)(activity.operationStatuses),
-            outputState: state_js_1.State.toState(activity.outputState),
-            overallStatus: activity.overallStatus,
-        };
-    });
+    return activities
+        .map((activity) => (0, exports.extractActivity)(activity))
+        .filter(utils_js_1.notEmpty);
 };
 exports.extractActivities = extractActivities;
+const extractActivity = (activity) => {
+    if (!activity) {
+        return undefined;
+    }
+    return {
+        aggregateFiatValueOfInputState: currency_amount_js_1.CurrencyAmount.toCurrencyAmount(activity.aggregateFiatValueOfInputState),
+        aggregateFiatValueOfOutputState: currency_amount_js_1.CurrencyAmount.toCurrencyAmount(activity.aggregateFiatValueOfOutputState),
+        aggregateNetworkFeesInFiatCurrency: currency_amount_js_1.CurrencyAmount.toCurrencyAmount(activity.aggregateNetworkFeesInFiatCurrency),
+        aggregateProtocolFeesInFiatCurrency: currency_amount_js_1.CurrencyAmount.toCurrencyAmount(activity.aggregateProtocolFeesInFiatCurrency),
+        category: activity.category,
+        initiateAt: activity.initiateAt,
+        inputState: state_js_1.State.toState(activity.inputState),
+        operationStatuses: (0, exports.extractOperationStatuses)(activity.operationStatuses),
+        outputState: state_js_1.State.toState(activity.outputState),
+        overallStatus: activity.overallStatus,
+    };
+};
+exports.extractActivity = extractActivity;
 const extractFungibleTokenOverview = (overview) => {
     if (!overview) {
         return undefined;
@@ -189,21 +196,9 @@ const extractStandardizedToken = (token) => {
 };
 exports.extractStandardizedToken = extractStandardizedToken;
 const extractBlockchainInformations = (blockchainInformation) => {
-    return blockchainInformation?.map((info) => (0, exports.extractBlockchainInformation)(info));
+    return blockchainInformation?.map((info) => (0, utils_js_1.extractBlockchainInformation)(info));
 };
 exports.extractBlockchainInformations = extractBlockchainInformations;
-const extractBlockchainInformation = (blockchainInformation) => {
-    if (!blockchainInformation) {
-        return undefined;
-    }
-    return {
-        chainId: (0, utils_js_1.getChainIdFromOrbyChainId)(blockchainInformation.chainId),
-        environment: blockchainInformation.environment,
-        logoUrl: blockchainInformation.logoUrl,
-        name: blockchainInformation.name,
-    };
-};
-exports.extractBlockchainInformation = extractBlockchainInformation;
 const extractMaxAmountPerInterval = (maxAmountPerInterval) => {
     if (!maxAmountPerInterval) {
         return undefined;

package/dist/cjs/utils/utils.d.ts

@@ -3,7 +3,10 @@ import { Currency } from "../entities/financial/currency.js";
 import { FungibleToken } from "../entities/financial/fungible_token.js";
 import { FungibleTokenAmount } from "../entities/financial/fungible_token_amount.js";
 import { CurrencyAmount } from "../entities/financial/currency_amount.js";
+import { BlockchainInformation } from "../types.js";
+export declare const notEmpty: <T>(value: T) => value is NonNullable<T>;
 export declare const initializeBlockchainInformation: (orbyUrl: string) => Promise<void>;
+export declare const extractBlockchainInformation: (blockchainInformation?: any) => BlockchainInformation;
 export declare const getChainIdFromOrbyChainId: (value: string) => bigint | undefined;
 export declare const getVirtualEnvironment: (id: bigint) => Promise<VMType>;
 export declare const hasError: (data: any) => {

package/dist/cjs/utils/utils.js

@@ -1,12 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNativeCurrencyAmount = exports.createNativeFungibleTokenAmount = exports.getNativeFungibleToken = exports.getNativeCurrency = exports.hasError = exports.getVirtualEnvironment = exports.getChainIdFromOrbyChainId = exports.initializeBlockchainInformation = void 0;
+exports.createNativeCurrencyAmount = exports.createNativeFungibleTokenAmount = exports.getNativeFungibleToken = exports.getNativeCurrency = exports.hasError = exports.getVirtualEnvironment = exports.getChainIdFromOrbyChainId = exports.extractBlockchainInformation = exports.initializeBlockchainInformation = exports.notEmpty = void 0;
 const constants_js_1 = require("../constants.js");
 const validateAndParseAddress_js_1 = require("./validateAndParseAddress.js");
 const currency_js_1 = require("../entities/financial/currency.js");
 const fungible_token_js_1 = require("../entities/financial/fungible_token.js");
 const fungible_token_amount_js_1 = require("../entities/financial/fungible_token_amount.js");
 const currency_amount_js_1 = require("../entities/financial/currency_amount.js");
+// used to filter out null and undefined values: https://stackoverflow.com/questions/43118692/typescript-filter-out-nulls-from-an-array
+const notEmpty = (value) => value != undefined && value != null;
+exports.notEmpty = notEmpty;
 const initializeBlockchainInformation = async (orbyUrl) => {
     const response = await fetch(orbyUrl, {
         method: "POST",
@@ -28,15 +31,26 @@ const initializeBlockchainInformation = async (orbyUrl) => {
     result.edges?.map((blockchainInfo) => {
         const chainId = (0, exports.getChainIdFromOrbyChainId)(blockchainInfo.chainId);
         if (chainId && blockchainInfo?.name) {
-            constants_js_1.CHAIN_CONFIGS[Number(chainId)] = {
-                ...blockchainInfo,
-                chainId: chainId,
-                nativeCurrency: currency_js_1.Currency.toCurrency(blockchainInfo?.nativeCurrency),
-            };
+            constants_js_1.CHAIN_CONFIGS[Number(chainId)] =
+                (0, exports.extractBlockchainInformation)(blockchainInfo);
         }
     });
 };
 exports.initializeBlockchainInformation = initializeBlockchainInformation;
+const extractBlockchainInformation = (blockchainInformation) => {
+    if (!blockchainInformation) {
+        return undefined;
+    }
+    return {
+        chainId: (0, exports.getChainIdFromOrbyChainId)(blockchainInformation.chainId),
+        environment: blockchainInformation.environment,
+        logoUrl: blockchainInformation.logoUrl,
+        name: blockchainInformation.name,
+        vmType: blockchainInformation.vmType,
+        nativeCurrency: currency_js_1.Currency.toCurrency(blockchainInformation.nativeCurrency),
+    };
+};
+exports.extractBlockchainInformation = extractBlockchainInformation;
 const getChainIdFromOrbyChainId = (value) => {
     let chainId = undefined;
     const formattedValue = (0, validateAndParseAddress_js_1.validateAndLowerCase)(value);

package/dist/esm/actions/blockchain.js

@@ -1,5 +1,6 @@
-import { extractBlockchainInformation, extractBlockchainInformations, } from "../utils/action_helpers.js";
+import { extractBlockchainInformations } from "../utils/action_helpers.js";
 import { LibraryRequest } from "../entities/library_request.js";
+import { extractBlockchainInformation } from "../index.js";
 export class BlockchainActions extends LibraryRequest {
     constructor(library, client, provider) {
         super(library, client, provider);

package/dist/esm/actions/operation.d.ts

@@ -1,4 +1,4 @@
-import { AccountCluster, OnchainOperation, OperationSet, OperationStatus, SignedOperation, UserOperation } from "../types.js";
+import { AccountCluster, Activity, OnchainOperation, OperationSet, OperationStatus, SignedOperation, UserOperation } from "../types.js";
 import { CurrencyAmount } from "../entities/financial/currency_amount.js";
 import { LIBRARY_TYPE, OperationStatusType, QuoteType } from "../enums.js";
 import { LibraryRequest } from "../entities/library_request.js";
@@ -32,6 +32,7 @@ export declare class OperationActions extends LibraryRequest {
         operationSetId: string;
         operationResponses: OperationStatus[];
     }>;
+    getOperationSet(operationSetId: string): Promise<Activity>;
     getOperationStatuses(operationIds: string[]): Promise<OperationStatus[]>;
     estimateFiatCostToExecuteTransaction(data: string, to?: string, value?: bigint): Promise<CurrencyAmount>;
     estimateFiatCostToSignTypedData(data: string): Promise<CurrencyAmount>;
@@ -94,6 +95,9 @@ export declare class OperationActions extends LibraryRequest {
             address?: string;
         }[];
     }): Promise<OperationSet>;
+    subscribeToOperationSetStatus(operationSetId?: string, onOperationSetStatusUpdateCallback?: (activity?: Activity) => void, timeout?: number): {
+        intervalId: NodeJS.Timeout | null;
+    };
     subscribeToOperationStatuses(ids?: string[], onOperationStatusesUpdateCallback?: (statusSummary: OperationStatusType, primaryOperationStatus?: OperationStatus, allOperationStatuses?: OperationStatus[]) => void, timout?: number): {
         intervalId: NodeJS.Timeout | null;
     };

package/dist/esm/actions/operation.js

@@ -1,6 +1,6 @@
-import { extractOperationSet, extractOperationStatuses, } from "../utils/action_helpers.js";
+import { extractActivity, extractOperationSet, extractOperationStatuses, } from "../utils/action_helpers.js";
 import { CurrencyAmount } from "../entities/financial/currency_amount.js";
-import { AccountType, OperationDataFormat, OperationStatusType, OperationType, } from "../enums.js";
+import { AccountType, ActivityStatus, OperationDataFormat, OperationStatusType, OperationType, } from "../enums.js";
 import { LibraryRequest } from "../entities/library_request.js";
 import { Account } from "../entities/account.js";
 // from here: https://stackoverflow.com/questions/65152373/typescript-serialize-bigint-in-json
@@ -94,6 +94,14 @@ export class OperationActions extends LibraryRequest {
             operationResponses: extractOperationStatuses(operationResponses),
         };
     }
+    async getOperationSet(operationSetId) {
+        const { activity, code, message } = await this.sendRequest("orby_getOperationSet", [{ operationSetId }]);
+        if (code && message) {
+            console.error("[getOperationSet]", code, message);
+            return undefined;
+        }
+        return extractActivity(activity);
+    }
     async getOperationStatuses(operationIds) {
         const { operationStatuses } = await this.sendRequest("orby_getOperationStatuses", [{ operationIds }]);
         return extractOperationStatuses(operationStatuses);
@@ -222,6 +230,47 @@ export class OperationActions extends LibraryRequest {
         ]);
         return extractOperationSet(operationSet);
     }
+    subscribeToOperationSetStatus(operationSetId, onOperationSetStatusUpdateCallback, timeout) {
+        let intervalId = null;
+        let totalWaitTime = 0;
+        const timeoutOrDefault = timeout ?? 300_000;
+        if (operationSetId) {
+            const waitTime = 500;
+            intervalId = setInterval(async () => {
+                let statusSummary = ActivityStatus.WAITING_PRECONDITION;
+                try {
+                    const activity = operationSetId
+                        ? await this?.getOperationSet(operationSetId)
+                        : undefined;
+                    if (activity) {
+                        statusSummary = activity?.overallStatus;
+                    }
+                    onOperationSetStatusUpdateCallback?.(activity);
+                }
+                catch (error) {
+                    console.error("[subscribeToOperationSetStatus]", error);
+                }
+                finally {
+                    totalWaitTime += waitTime;
+                    if (intervalId &&
+                        ![
+                            ActivityStatus.WAITING_TOKEN_APPROVAL_TRANSACTIONS,
+                            ActivityStatus.WAITING_GAS_ABSTRACTION,
+                            ActivityStatus.WAITING_PRECONDITION,
+                        ].includes(statusSummary)) {
+                        clearInterval(intervalId);
+                        intervalId = null;
+                    }
+                    else if (intervalId && totalWaitTime >= timeoutOrDefault) {
+                        // we cant wait for more than 2 ETH blocks
+                        clearInterval(intervalId);
+                        intervalId = null;
+                    }
+                }
+            }, waitTime);
+        }
+        return { intervalId };
+    }
     subscribeToOperationStatuses(ids, onOperationStatusesUpdateCallback, timout) {
         let intervalId = null;
         let totalWaitTime = 0;
@@ -248,18 +297,25 @@ export class OperationActions extends LibraryRequest {
                         statusSummary = OperationStatusType.SUCCESSFUL;
                     }
                     primaryOperation = statuses?.find((status) => status.type == OperationType.FINAL_TRANSACTION);
-                    if (primaryOperation?.status == OperationStatusType.PENDING) {
-                        statusSummary = OperationStatusType.PENDING;
+                    if ([
+                        OperationStatusType.PENDING,
+                        OperationStatusType.SUCCESSFUL,
+                    ].includes(primaryOperation?.status)) {
+                        statusSummary = primaryOperation?.status;
                     }
                     onOperationStatusesUpdateCallback?.(statusSummary, primaryOperation, statuses);
                 }
                 catch (error) {
-                    console.error("[useWaitForStatusCompletion]", error);
+                    console.error("[subscribeToOperationStatuses]", error);
                 }
                 finally {
                     totalWaitTime += waitTime;
                     if (intervalId &&
-                        OperationStatusType.WAITING_PRECONDITION != statusSummary) {
+                        ![
+                            OperationStatusType.WAITING_TOKEN_APPROVAL_TRANSACTIONS,
+                            OperationStatusType.WAITING_GAS_ABSTRACTION,
+                            OperationStatusType.WAITING_PRECONDITION,
+                        ].includes(statusSummary)) {
                         clearInterval(intervalId);
                         intervalId = null;
                     }

package/dist/esm/constants.d.ts

@@ -1,9 +1,9 @@
 import { Currency } from "./entities/financial/currency.js";
-import { ChainConfigs } from "./types.js";
+import { BlockchainInformation } from "./types.js";
 export declare const Big: any;
 export declare const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
 export declare const ONE_ADDRESS = "0x0000000000000000000000000000000000000001";
 export declare const TWO_ADDRESS = "0x0000000000000000000000000000000000000002";
 export declare const NATIVE_TOKEN_ADDRESS = "0x0000000000000000000000000000000000000000";
-export declare const CHAIN_CONFIGS: Record<number, ChainConfigs>;
+export declare const CHAIN_CONFIGS: Record<number, BlockchainInformation>;
 export declare const FIAT_CURRENCY: Currency;

package/dist/esm/enums.d.ts

@@ -48,11 +48,15 @@ export declare enum Category {
     TYPED_DATA_SIGNATURE = "TYPED_DATA_SIGNATURE"
 }
 export declare enum OperationStatusType {
+    CANCELLED = "CANCELLED",
     FAILED = "FAILED",
     NOT_FOUND = "NOT_FOUND",
     PENDING = "PENDING",
     SUCCESSFUL = "SUCCESSFUL",
-    WAITING_PRECONDITION = "WAITING_PRECONDITION"
+    WAITING_GAS_ABSTRACTION = "WAITING_GAS_ABSTRACTION",
+    WAITING_TOKEN_APPROVAL_TRANSACTIONS = "WAITING_TOKEN_APPROVAL_TRANSACTIONS",
+    WAITING_PRECONDITION = "WAITING_PRECONDITION",
+    WAITING_TIMEOUT = "WAITING_TIMEOUT"
 }
 export declare enum QuoteType {
     EXACT_INPUT = "EXACT_INPUT",
@@ -65,8 +69,13 @@ export declare enum Order {
 export declare enum ActivityStatus {
     CANCELLED = "CANCELLED",
     FAILED = "FAILED",
+    NOT_FOUND = "NOT_FOUND",
     PENDING = "PENDING",
-    SUCCESS = "SUCCESS"
+    SUCCESSFUL = "SUCCESSFUL",
+    WAITING_GAS_ABSTRACTION = "WAITING_GAS_ABSTRACTION",
+    WAITING_TOKEN_APPROVAL_TRANSACTIONS = "WAITING_TOKEN_APPROVAL_TRANSACTIONS",
+    WAITING_PRECONDITION = "WAITING_PRECONDITION",
+    WAITING_TIMEOUT = "WAITING_TIMEOUT"
 }
 export declare enum BlockchainEnvironment {
     MAINNET = "MAINNET",