@orb-labs/orby-core 0.0.22 → 0.0.23

package/dist/esm/actions/operation.js

@@ -2,7 +2,6 @@ import { extractOperationSet, extractOperationStatuses, } from "../utils/action_
 import { CurrencyAmount } from "../entities/financial/currency_amount.js";
 import { AccountType, OperationDataFormat, OperationStatusType, OperationType, } from "../enums.js";
 import { LibraryRequest } from "../entities/library_request.js";
-import { getOrbyChainId } from "../utils/utils.js";
 import { Account } from "../entities/account.js";
 // from here: https://stackoverflow.com/questions/65152373/typescript-serialize-bigint-in-json
 BigInt.prototype.toJSON = function () {
@@ -17,7 +16,7 @@ export class OperationActions extends LibraryRequest {
             ? {
                 ...gasToken,
                 tokenSources: await Promise.all(gasToken.tokenSources?.map(async ({ chainId, address }) => ({
-                    chainId: await getOrbyChainId(chainId),
+                    chainId: await this.getOrbyChainId(chainId),
                     address,
                 })) ?? []),
             }
@@ -38,7 +37,7 @@ export class OperationActions extends LibraryRequest {
             ? {
                 ...gasToken,
                 tokenSources: await Promise.all(gasToken.tokenSources?.map(async ({ chainId, address }) => ({
-                    chainId: await getOrbyChainId(chainId),
+                    chainId: await this.getOrbyChainId(chainId),
                     address,
                 })) ?? []),
             }
@@ -57,7 +56,7 @@ export class OperationActions extends LibraryRequest {
             ? {
                 ...gasToken,
                 tokenSources: await Promise.all(gasToken.tokenSources?.map(async ({ chainId, address }) => ({
-                    chainId: await getOrbyChainId(chainId),
+                    chainId: await this.getOrbyChainId(chainId),
                     address,
                 })) ?? []),
             }
@@ -153,13 +152,13 @@ export class OperationActions extends LibraryRequest {
             ? {
                 ...gasToken,
                 tokenSources: await Promise.all(gasToken.tokenSources?.map(async ({ chainId, address }) => ({
-                    chainId: await getOrbyChainId(chainId),
+                    chainId: await this.getOrbyChainId(chainId),
                     address,
                 })) ?? []),
             }
             : undefined;
         const formattedRecepient = {
-            chainId: await getOrbyChainId(recipient.chainId),
+            chainId: await this.getOrbyChainId(recipient.chainId),
             recipientAddress: recipient.recipientAddress,
         };
         const operationSet = await this.sendRequest("orby_getOperationsToTransferToken", [
@@ -178,7 +177,7 @@ export class OperationActions extends LibraryRequest {
             ? {
                 ...input,
                 tokenSources: await Promise.all(input.tokenSources?.map(async ({ chainId, address }) => ({
-                    chainId: await getOrbyChainId(chainId),
+                    chainId: await this.getOrbyChainId(chainId),
                     address,
                 })) ?? []),
             }
@@ -188,7 +187,7 @@ export class OperationActions extends LibraryRequest {
                 ...output,
                 tokenDestination: output.tokenDestination
                     ? {
-                        chainId: await getOrbyChainId(output.tokenDestination.chainId),
+                        chainId: await this.getOrbyChainId(output.tokenDestination.chainId),
                         address: output.tokenDestination.address,
                     }
                     : undefined,
@@ -198,7 +197,7 @@ export class OperationActions extends LibraryRequest {
             ? {
                 ...gasToken,
                 tokenSources: await Promise.all(gasToken.tokenSources?.map(async ({ chainId, address }) => ({
-                    chainId: await getOrbyChainId(chainId),
+                    chainId: await this.getOrbyChainId(chainId),
                     address,
                 })) ?? []),
             }
@@ -219,7 +218,7 @@ export class OperationActions extends LibraryRequest {
             ? {
                 ...input,
                 tokenSources: await Promise.all(input.tokenSources?.map(async ({ chainId, address }) => ({
-                    chainId: await getOrbyChainId(chainId),
+                    chainId: await this.getOrbyChainId(chainId),
                     address,
                 })) ?? []),
             }
@@ -229,7 +228,7 @@ export class OperationActions extends LibraryRequest {
                 ...output,
                 tokenDestination: output.tokenDestination
                     ? {
-                        chainId: await getOrbyChainId(output.tokenDestination.chainId),
+                        chainId: await this.getOrbyChainId(output.tokenDestination.chainId),
                         address: output.tokenDestination.address,
                     }
                     : undefined,
@@ -247,12 +246,12 @@ export class OperationActions extends LibraryRequest {
     }
     async getOperationsToBridge(accountClusterId, standardizedTokenId, amount, tokenSources, tokenDestination, gasToken) {
         const formattedTokenSources = await Promise.all(tokenSources.map(async ({ chainId, address }) => ({
-            chainId: await getOrbyChainId(chainId),
+            chainId: await this.getOrbyChainId(chainId),
             address,
         })));
         const formattedDestination = tokenDestination
             ? {
-                chainId: await getOrbyChainId(tokenDestination.chainId),
+                chainId: await this.getOrbyChainId(tokenDestination.chainId),
                 address: tokenDestination.address,
             }
             : undefined;
@@ -260,7 +259,7 @@ export class OperationActions extends LibraryRequest {
             ? {
                 ...gasToken,
                 tokenSources: await Promise.all(gasToken.tokenSources?.map(async ({ chainId, address }) => ({
-                    chainId: await getOrbyChainId(chainId),
+                    chainId: await this.getOrbyChainId(chainId),
                     address,
                 })) ?? []),
             }
@@ -391,7 +390,7 @@ export class OperationActions extends LibraryRequest {
                 signature: signature,
                 data: operation.data,
                 from: operation.from,
-                chainId: await getOrbyChainId(operation.chainId),
+                chainId: await this.getOrbyChainId(operation.chainId),
             });
         }
         // batch sign all the smart contract transactions
@@ -421,7 +420,7 @@ export class OperationActions extends LibraryRequest {
                 signature: userOperation.signature,
                 data: JSON.stringify(userOperation),
                 from: transactions[0].from,
-                chainId: await getOrbyChainId(transactions[0].chainId),
+                chainId: await this.getOrbyChainId(transactions[0].chainId),
             });
         }
         const { operationSetId, operationResponses } = await this.sendSignedOperations(accountCluster.accountClusterId, signedOperations);

package/dist/esm/actions/token.js

@@ -1,13 +1,12 @@
 import { extractStandardizedTokens } from "../utils/action_helpers.js";
 import { LibraryRequest } from "../entities/library_request.js";
-import { getOrbyChainId } from "../utils/utils.js";
 export class TokenActions extends LibraryRequest {
     constructor(library, client, provider) {
         super(library, client, provider);
     }
     async getStandardizedTokenIds(tokens) {
         const promises = tokens.map(async ({ tokenAddress, chainId }) => {
-            return { chainId: await getOrbyChainId(chainId), tokenAddress };
+            return { chainId: await this.getOrbyChainId(chainId), tokenAddress };
         });
         const formattedTokensInfo = await Promise.all(promises);
         const { standardizedTokenIds, message, code } = await this.sendRequest("orby_getStandardizedTokenIds", [
@@ -23,7 +22,7 @@ export class TokenActions extends LibraryRequest {
     }
     async getStandardizedTokens(tokens) {
         const promises = tokens.map(async ({ tokenAddress, chainId }) => {
-            return { chainId: await getOrbyChainId(chainId), tokenAddress };
+            return { chainId: await this.getOrbyChainId(chainId), tokenAddress };
         });
         const formattedTokensInfo = await Promise.all(promises);
         const { standardizedTokens, message, code } = await this.sendRequest("orby_getStandardizedTokens", [

package/dist/esm/constants.d.ts

@@ -2,7 +2,6 @@ import { Blockchain } from "./enums.js";
 import { Currency } from "./entities/financial/currency.js";
 import { ChainConfigs } from "./types.js";
 export declare const Big: any;
-export declare const ORBY_URL = "https://api-rpc-dev.orblabs.xyz/f1c1d996-8df4-4d23-b926-ca702173021d/mainnet";
 export declare const BLOCKCHAIN_ID: Record<Blockchain, number>;
 export declare const CHAIN_CONFIGS: Record<Blockchain, ChainConfigs>;
 export declare const BLOCKCHAIN_ID_TO_BLOCKCHAIN: Record<number, Blockchain>;

package/dist/esm/constants.js

@@ -2,8 +2,6 @@ import toFormat from "toformat";
 import _Big from "big.js";
 import { Currency } from "./entities/financial/currency.js";
 export const Big = toFormat(_Big);
-// TO-DO (Sofia): fix API to return full list instead of just mainnet
-export const ORBY_URL = "https://api-rpc-dev.orblabs.xyz/f1c1d996-8df4-4d23-b926-ca702173021d/mainnet";
 export const BLOCKCHAIN_ID = {};
 export const CHAIN_CONFIGS = {};
 export const BLOCKCHAIN_ID_TO_BLOCKCHAIN = {};

package/dist/esm/entities/library_request.d.ts

@@ -1,8 +1,11 @@
-import { LIBRARY_TYPE } from "../enums.js";
+import { LIBRARY_TYPE, VMType } from "../enums.js";
 export declare class LibraryRequest {
     readonly library: LIBRARY_TYPE;
     readonly client?: any;
     readonly provider?: any;
     constructor(library: LIBRARY_TYPE, client?: any, provider?: any);
     sendRequest(method: string, params: any[]): Promise<any>;
+    protected getOrbyChainId: (chainId: bigint) => Promise<string>;
+    protected getVirtualEnvironment: (id: bigint) => Promise<VMType>;
+    protected providerUrl(): string;
 }

package/dist/esm/entities/library_request.js

@@ -1,7 +1,36 @@
-import { LIBRARY_TYPE } from "../enums.js";
+import { LIBRARY_TYPE, VMType } from "../enums.js";
 import invariant from "tiny-invariant";
+import { BLOCKCHAIN_ID_TO_BLOCKCHAIN, CHAIN_CONFIGS } from "../constants.js";
+import { initializeBlockchainInformation } from "../utils/utils.js";
 export class LibraryRequest {
     constructor(library, client, provider) {
+        this.getOrbyChainId = async (chainId) => {
+            if (!chainId) {
+                return undefined;
+            }
+            const environment = await this.getVirtualEnvironment(chainId);
+            console.log("ENVIRONMENT", environment);
+            switch (environment) {
+                case VMType.SVM:
+                    return `SVM-${chainId.toString()}`;
+                case VMType.EVM:
+                    return `EIP155-${chainId.toString()}`;
+                default:
+                    return undefined;
+            }
+        };
+        this.getVirtualEnvironment = async (id) => {
+            if (Object.keys(BLOCKCHAIN_ID_TO_BLOCKCHAIN).length == 0) {
+                await initializeBlockchainInformation(this.providerUrl());
+            }
+            console.log("CHAIN_CONFIGS", CHAIN_CONFIGS);
+            const blockchain = id ? BLOCKCHAIN_ID_TO_BLOCKCHAIN[Number(id)] : undefined;
+            if (!blockchain) {
+                console.error("No blockchain found for chainId", id);
+                return undefined;
+            }
+            return CHAIN_CONFIGS[blockchain]?.vmType;
+        };
         if (library == LIBRARY_TYPE.VIEM) {
             invariant(client, "CLIENT");
             invariant(!provider, "PROVIDER");
@@ -27,4 +56,12 @@ export class LibraryRequest {
             return this.provider.send(method, params);
         }
     }
+    providerUrl() {
+        if (this.library == LIBRARY_TYPE.VIEM) {
+            return this.client?.transport?.url;
+        }
+        else if (this.library == LIBRARY_TYPE.ETHERS) {
+            return this.provider._getConnection().url;
+        }
+    }
 }

package/dist/esm/types.d.ts

@@ -4,7 +4,7 @@ import { CurrencyAmount } from "./entities/financial/currency_amount.js";
 import { FungibleToken } from "./entities/financial/fungible_token.js";
 import { FungibleTokenAmount } from "./entities/financial/fungible_token_amount.js";
 import { State } from "./entities/state.js";
-import { ActivityStatus, BlockchainEnvironment, Category, CreateOperationsStatus, OperationDataFormat, OperationStatusType, OperationType, TimeIntervalUnits, TokenAllowlistType } from "./enums.js";
+import { ActivityStatus, BlockchainEnvironment, Category, CreateOperationsStatus, OperationDataFormat, OperationStatusType, OperationType, TimeIntervalUnits, TokenAllowlistType, VMType } from "./enums.js";
 export type AccountCluster = {
     accountClusterId: string;
     accounts: Account[];
@@ -164,6 +164,7 @@ export type GasSponsorshipData = {
 export type ChainConfigs = {
     environment: BlockchainEnvironment;
     chainId: bigint;
+    vmType: VMType;
 };
 export type VirtualNodeRpcUrlForSupportedChain = {
     chainId: string;

package/dist/esm/utils/utils.d.ts

@@ -1,10 +1,8 @@
-import { Blockchain, VMType } from "../enums.js";
-export declare const initializeBlockchainInfo: () => Promise<void>;
+import { VMType } from "../enums.js";
+export declare const initializeBlockchainInformation: (orbyUrl: string) => Promise<void>;
 export declare const getChainIdFromOrbyChainId: (value: string) => bigint | undefined;
 export declare const getVirtualEnvironment: (id: bigint) => Promise<VMType>;
-export declare const getOrbyChainId: (chainId: bigint) => Promise<string>;
 export declare const hasError: (data: any) => {
     code: number;
     message: string;
 };
-export declare const getBlockchainFromName: (chainName: string) => Blockchain;

package/dist/esm/utils/utils.js

@@ -1,8 +1,7 @@
-import { Blockchain, VMType } from "../enums.js";
-import { BLOCKCHAIN_ID, BLOCKCHAIN_ID_TO_BLOCKCHAIN, CHAIN_CONFIGS, ORBY_URL, } from "../constants.js";
+import { BLOCKCHAIN_ID, BLOCKCHAIN_ID_TO_BLOCKCHAIN, CHAIN_CONFIGS, } from "../constants.js";
 import { validateAndLowerCase } from "./validateAndParseAddress.js";
-export const initializeBlockchainInfo = async () => {
-    const response = await fetch(ORBY_URL, {
+export const initializeBlockchainInformation = async (orbyUrl) => {
+    const response = await fetch(orbyUrl, {
         method: "POST",
         headers: {
             "Content-Type": "application/json",
@@ -27,7 +26,8 @@ export const initializeBlockchainInfo = async () => {
             BLOCKCHAIN_ID_TO_BLOCKCHAIN[Number(chainId)] = blockchainName;
             CHAIN_CONFIGS[blockchainName] = {
                 environment: blockchainInfo.environment,
-                chainId: chainId
+                chainId: chainId,
+                vmType: blockchainInfo.vmType,
             };
         }
     });
@@ -49,42 +49,14 @@ export const getChainIdFromOrbyChainId = (value) => {
             ? BigInt(potentialId)
             : undefined;
     }
-    else {
-        const blockchain = getBlockchainFromName(formattedValue);
-        const potentialId = blockchain
-            ? BLOCKCHAIN_ID[blockchain]
-            : undefined;
-        chainId = potentialId ? BigInt(potentialId) : undefined;
-    }
     return chainId;
 };
 export const getVirtualEnvironment = async (id) => {
-    if (Object.keys(BLOCKCHAIN_ID_TO_BLOCKCHAIN).length === 0) {
-        await initializeBlockchainInfo();
-    }
     const blockchain = id ? BLOCKCHAIN_ID_TO_BLOCKCHAIN[Number(id)] : undefined;
-    switch (blockchain) {
-        case undefined:
-            return undefined;
-        case Blockchain.SOLANA:
-            return VMType.SVM;
-        default:
-            return VMType.EVM;
-    }
-};
-export const getOrbyChainId = async (chainId) => {
-    if (!chainId) {
+    if (!blockchain) {
         return undefined;
     }
-    const environment = await getVirtualEnvironment(chainId);
-    switch (environment) {
-        case VMType.SVM:
-            return `SVM-${chainId.toString()}`;
-        case VMType.EVM:
-            return `EIP155-${chainId.toString()}`;
-        default:
-            return undefined;
-    }
+    return CHAIN_CONFIGS[blockchain]?.vmType;
 };
 export const hasError = (data) => {
     if (data?.code && data?.message) {
@@ -92,33 +64,3 @@ export const hasError = (data) => {
     }
     return undefined;
 };
-export const getBlockchainFromName = (chainName) => {
-    const formattedChainName = validateAndLowerCase(chainName)?.replace("-", "_");
-    switch (formattedChainName) {
-        case "bnbt": {
-            return Blockchain.BINANCE_TESTNET;
-        }
-        case "matic_amoy": {
-            return Blockchain.POLYGON_AMOY;
-        }
-        case "matic": {
-            return Blockchain.POLYGON;
-        }
-        case "mainnet": {
-            return Blockchain.ETHEREUM;
-        }
-        case "holesky": {
-            return Blockchain.ETHEREUM_HOLESKY;
-        }
-        case "sepolia": {
-            return Blockchain.ETHEREUM_SEPOLIA;
-        }
-        case "unknown": {
-            return undefined;
-        }
-        default: {
-            //statements;
-            return formattedChainName;
-        }
-    }
-};