@orb-labs/orby-core 0.0.17 → 0.0.19

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ### Unreleased
 
+### 0.0.19
+
+- fix: use accountType when interacting with the backend
+
+### 0.0.18
+
+- chore: update type (using Account.type instead of Account.accountType)
+
 ### 0.0.17
 
 - fix: remove 'type': 'module' from package.json

package/dist/cjs/actions/account_cluster.js

@@ -4,6 +4,7 @@ exports.AccountClusterActions = void 0;
 const action_helpers_js_1 = require("../utils/action_helpers.js");
 const library_request_js_1 = require("../entities/library_request.js");
 const utils_js_1 = require("../utils/utils.js");
+const validateAndParseAddress_js_1 = require("../utils/validateAndParseAddress.js");
 class AccountClusterActions extends library_request_js_1.LibraryRequest {
     constructor(library, client, provider) {
         super(library, client, provider);
@@ -51,7 +52,7 @@ class AccountClusterActions extends library_request_js_1.LibraryRequest {
             return {
                 chainId: (0, utils_js_1.getChainIdFromOrbyChainId)(info.chainId),
                 virtualNodeRpcUrl: info.virtualNodeRpcUrl,
-                entrypointAccountAddress: info?.entrypointAccountAddress?.toLowerCase(),
+                entrypointAccountAddress: (0, validateAndParseAddress_js_1.validateAndFormatAddress)(info?.entrypointAccountAddress),
             };
         });
     }

package/dist/cjs/actions/operation.js

@@ -334,7 +334,7 @@ class OperationActions extends library_request_js_1.LibraryRequest {
         const smartAccountTransactions = operations.reduce((acc, operation) => {
             const accountKey = account_js_1.Account.key(operation.from, operation.chainId);
             const account = accountsMap.get(accountKey);
-            if (account?.accountType == enums_js_1.AccountType.SCA &&
+            if (account?.type == enums_js_1.AccountType.SCA &&
                 operation.format == enums_js_1.OperationDataFormat.TRANSACTION) {
                 if (!acc.has(accountKey)) {
                     acc.set(accountKey, []);
@@ -351,7 +351,7 @@ class OperationActions extends library_request_js_1.LibraryRequest {
                 const accountKey = account_js_1.Account.key(operation.from, operation.chainId);
                 const account = accountsMap.get(accountKey);
                 // skip signing the transaction if the account is an SCA
-                if (account?.accountType == enums_js_1.AccountType.SCA) {
+                if (account?.type == enums_js_1.AccountType.SCA) {
                     continue;
                 }
                 signature = await signTransaction(operation);

package/dist/cjs/constants.js

@@ -20,6 +20,7 @@ exports.BLOCKCHAIN_ID = {
     [enums_js_1.Blockchain.MOONBEAM]: 1284,
     [enums_js_1.Blockchain.BASE]: 8453,
     [enums_js_1.Blockchain.AVALANCHE]: 43114,
+    [enums_js_1.Blockchain.SOLANA]: 101,
     // testnets
     [enums_js_1.Blockchain.ETHEREUM_SEPOLIA]: 11155111,
     [enums_js_1.Blockchain.ETHEREUM_HOLESKY]: 17000,
@@ -76,6 +77,10 @@ exports.CHAIN_CONFIGS = {
         environment: enums_js_1.BlockchainEnvironment.MAINNET,
         chainId: BigInt(43114),
     },
+    [enums_js_1.Blockchain.SOLANA]: {
+        environment: enums_js_1.BlockchainEnvironment.MAINNET,
+        chainId: BigInt(101),
+    },
     // testnets
     [enums_js_1.Blockchain.ETHEREUM_SEPOLIA]: {
         environment: enums_js_1.BlockchainEnvironment.TESTNET,
@@ -125,6 +130,7 @@ exports.BLOCKCHAIN_ID_TO_BLOCKCHAIN = {
     [1284]: enums_js_1.Blockchain.MOONBEAM,
     [8453]: enums_js_1.Blockchain.BASE,
     [43114]: enums_js_1.Blockchain.AVALANCHE,
+    [101]: enums_js_1.Blockchain.SOLANA,
     // testnets
     [11155111]: enums_js_1.Blockchain.ETHEREUM_SEPOLIA,
     [84532]: enums_js_1.Blockchain.BASE_SEPOLIA,

package/dist/cjs/entities/account.d.ts

@@ -2,12 +2,12 @@ import { AccountType, VMType } from "../enums.js";
 export declare class Account {
     readonly address: string;
     readonly chainId?: bigint;
-    readonly accountType: AccountType;
+    readonly type: AccountType;
     readonly vmType: VMType;
     readonly key: string;
     hasSufficientBalanceForGas: boolean;
     static toAccount(account: any): Account;
-    constructor(address: string, accountType: AccountType, vmType: VMType, chainId?: bigint);
+    constructor(address: string, type: AccountType, vmType: VMType, chainId?: bigint);
     static key(address: string, chainId?: bigint): string;
     toAccountModel(): any;
     equals(other: Account): boolean;

package/dist/cjs/entities/account.js

@@ -3,26 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Account = void 0;
 const enums_js_1 = require("../enums.js");
 const utils_js_1 = require("../utils/utils.js");
+const validateAndParseAddress_js_1 = require("../utils/validateAndParseAddress.js");
 class Account {
     static toAccount(account) {
         const chainId = account?.chainId
             ? (0, utils_js_1.getChainIdFromOrbyChainId)(account.chainId)
             : undefined;
-        const formattedAccountType = account?.accountType;
-        if (!chainId && formattedAccountType == enums_js_1.AccountType.SCA) {
+        if (!chainId && account?.accountType == enums_js_1.AccountType.SCA) {
             return undefined;
         }
-        return new Account(account.address, formattedAccountType, account.vmType, chainId);
+        return new Account(account.address, account?.accountType, // backend uses accountType, frontend uses type
+        account.vmType, chainId);
     }
-    constructor(address, accountType, vmType, chainId) {
+    constructor(address, type, vmType, chainId) {
         // TODO(felix): add this back
         // invariant(!_.isUndefined(getBlockchainFromBlockchainId(chainId)), "CHAIN_ID");
-        this.address = address?.toLowerCase(); // validateAndParseAddress(address)?.toLowerCase();
+        this.address = (0, validateAndParseAddress_js_1.validateAndFormatAddress)(address);
         this.chainId = chainId ? BigInt(chainId) : undefined;
-        this.accountType = accountType;
+        this.type = type;
         this.vmType = vmType;
         this.key = Account.key(address, chainId);
-        if (this.accountType == enums_js_1.AccountType.SCA) {
+        if (this.type == enums_js_1.AccountType.SCA) {
             this.hasSufficientBalanceForGas = true;
         }
         else {
@@ -31,19 +32,19 @@ class Account {
     }
     static key(address, chainId) {
         return chainId
-            ? `${chainId?.toString()?.toLowerCase()}-${address}`
+            ? `${chainId?.toString()}-${(0, validateAndParseAddress_js_1.validateAndFormatAddress)(address)}`
             : address;
     }
     toAccountModel() {
         return {
             address: this.address,
-            accountType: this.accountType?.toUpperCase(),
+            accountType: this.type?.toUpperCase(), // backend uses accountType, frontend uses type
             vmType: this.vmType?.toUpperCase(),
             chainId: this.chainId ? "EIP155-" + this.chainId : undefined,
         };
     }
     equals(other) {
-        return this.key == other?.key && this.accountType == other?.accountType;
+        return this.key == other?.key && this.type == other?.type;
     }
 }
 exports.Account = Account;

package/dist/cjs/entities/financial/fungible_token.js

@@ -31,10 +31,10 @@ class FungibleToken extends currency_js_1.Currency {
         // TODO(felix): bypassChecksum is a little confusing since when bypassChecksum is true, we still validate the address
         // bypassChecksum is derived from the isNative parameter, so we should remove it and just check if isNative here
         if (bypassChecksum) {
-            this.address = (0, validateAndParseAddress_js_1.checkValidAddress)(address)?.toLowerCase();
+            this.address = (0, validateAndParseAddress_js_1.validateAndFormatAddress)(address);
         }
         else if (!isNative) {
-            this.address = (0, validateAndParseAddress_js_1.validateAndParseAddress)(address)?.toLowerCase();
+            this.address = (0, validateAndParseAddress_js_1.validateAndFormatAddress)(address);
         }
         else {
             this.address = address;
@@ -50,7 +50,8 @@ class FungibleToken extends currency_js_1.Currency {
         if (this === other)
             return true;
         return (this.chainId == other?.chainId &&
-            this.address.toLowerCase() == other?.address?.toLowerCase());
+            (0, validateAndParseAddress_js_1.validateAndFormatAddress)(this.address) ==
+                (0, validateAndParseAddress_js_1.validateAndFormatAddress)(other?.address));
     }
     /**
      * Returns the currency object that this token represents
@@ -62,7 +63,7 @@ class FungibleToken extends currency_js_1.Currency {
         return enums_js_1.TokenType.FUNGIBLE_TOKEN;
     }
     identifier() {
-        return `${this.chainId}+${this.address.toLowerCase()}`;
+        return `${this.chainId}+${(0, validateAndParseAddress_js_1.validateAndFormatAddress)(this.address)}`;
     }
 }
 exports.FungibleToken = FungibleToken;

package/dist/cjs/entities/financial/non_fungible_token.js

@@ -23,10 +23,10 @@ class NonFungibleToken extends asset_js_1.Asset {
         this.isNative = false;
         this.isToken = true;
         if (bypassChecksum) {
-            this.address = (0, validateAndParseAddress_js_1.checkValidAddress)(address)?.toLowerCase();
+            this.address = (0, validateAndParseAddress_js_1.validateAndFormatAddress)(address);
         }
         else {
-            this.address = (0, validateAndParseAddress_js_1.validateAndParseAddress)(address)?.toLowerCase();
+            this.address = (0, validateAndParseAddress_js_1.validateAndFormatAddress)(address);
         }
         this.chainId = chainId;
         this.url = url;
@@ -47,7 +47,7 @@ class NonFungibleToken extends asset_js_1.Asset {
         if (this === other)
             return true;
         return (this.chainId === other.chainId &&
-            this.address === other.address.toLowerCase());
+            this.address === (0, validateAndParseAddress_js_1.validateAndFormatAddress)(other.address));
     }
     /**
      * Returns the asset representation of this currency
@@ -59,7 +59,7 @@ class NonFungibleToken extends asset_js_1.Asset {
         return enums_js_1.TokenType.NON_FUNGIBLE_TOKEN;
     }
     identifier() {
-        return `${this.chainId}+${this.address.toLowerCase()}`;
+        return `${this.chainId}+${(0, validateAndParseAddress_js_1.validateAndFormatAddress)(this.address)}`;
     }
 }
 exports.NonFungibleToken = NonFungibleToken;

package/dist/cjs/entities/financial/semi_fungible_token.js

@@ -25,10 +25,10 @@ class SemiFungibleToken extends currency_js_1.Currency {
         this.isNative = false;
         this.isToken = true;
         if (bypassChecksum) {
-            this.address = (0, validateAndParseAddress_js_1.checkValidAddress)(address)?.toLowerCase();
+            this.address = (0, validateAndParseAddress_js_1.validateAndFormatAddress)(address);
         }
         else {
-            this.address = (0, validateAndParseAddress_js_1.validateAndParseAddress)(address)?.toLowerCase();
+            this.address = (0, validateAndParseAddress_js_1.validateAndFormatAddress)(address);
         }
         this.chainId = chainId;
         this.url = url;
@@ -49,7 +49,7 @@ class SemiFungibleToken extends currency_js_1.Currency {
         if (this === other)
             return true;
         return (this.chainId === other.chainId &&
-            this.address === other.address.toLowerCase());
+            this.address === (0, validateAndParseAddress_js_1.validateAndFormatAddress)(other.address));
     }
     /**
      * Returns the currency object that this token represents
@@ -61,7 +61,7 @@ class SemiFungibleToken extends currency_js_1.Currency {
         return enums_js_1.TokenType.SEMI_FUNGIBLE_TOKEN;
     }
     identifier() {
-        return `${this.chainId}+${this.address.toLowerCase()}`;
+        return `${this.chainId}+${(0, validateAndParseAddress_js_1.validateAndFormatAddress)(this.address)}`;
     }
 }
 exports.SemiFungibleToken = SemiFungibleToken;

package/dist/cjs/enums.d.ts

@@ -9,6 +9,7 @@ export declare enum Blockchain {
     OPTIMISM = "optimism",
     EVMOS = "evmos",
     MOONBEAM = "moonbeam",
+    SOLANA = "solana",
     ETHEREUM_SEPOLIA = "ethereum_sepolia",
     ETHEREUM_HOLESKY = "ethereum_holesky",
     BASE_SEPOLIA = "base_sepolia",
@@ -33,7 +34,8 @@ export declare enum AccountType {
     SCA = "SCA"
 }
 export declare enum VMType {
-    EVM = "EVM"
+    EVM = "EVM",
+    SVM = "SVM"
 }
 export declare enum ChainSupportStatus {
     CHAIN_SUPPORTED = "CHAIN_SUPPORTED",

package/dist/cjs/enums.js

@@ -13,6 +13,7 @@ var Blockchain;
     Blockchain["OPTIMISM"] = "optimism";
     Blockchain["EVMOS"] = "evmos";
     Blockchain["MOONBEAM"] = "moonbeam";
+    Blockchain["SOLANA"] = "solana";
     // testnets
     Blockchain["ETHEREUM_SEPOLIA"] = "ethereum_sepolia";
     Blockchain["ETHEREUM_HOLESKY"] = "ethereum_holesky";
@@ -43,6 +44,7 @@ var AccountType;
 var VMType;
 (function (VMType) {
     VMType["EVM"] = "EVM";
+    VMType["SVM"] = "SVM";
 })(VMType || (exports.VMType = VMType = {}));
 var ChainSupportStatus;
 (function (ChainSupportStatus) {

package/dist/cjs/index.d.ts

@@ -27,3 +27,4 @@ export * from "./enums.js";
 export * from "./types.js";
 export * from "./constants.js";
 export * from "./utils/utils.js";
+export * from "./utils/validateAndParseAddress.js";

package/dist/cjs/index.js

@@ -47,3 +47,4 @@ __exportStar(require("./enums.js"), exports);
 __exportStar(require("./types.js"), exports);
 __exportStar(require("./constants.js"), exports);
 __exportStar(require("./utils/utils.js"), exports);
+__exportStar(require("./utils/validateAndParseAddress.js"), exports);

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

@@ -1,5 +1,6 @@
-import { Blockchain } from "../enums.js";
+import { Blockchain, VMType } from "../enums.js";
 export declare const getChainIdFromOrbyChainId: (value: string) => bigint | undefined;
+export declare const getVirtualEnvironment: (id: bigint) => VMType;
 export declare const getOrbyChainId: (chainId: bigint) => string;
 export declare const getBlockchainIdFromBlockchain: (blockchain: Blockchain) => number;
 export declare const hasError: (data: any) => {

package/dist/cjs/utils/utils.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMainnet = exports.getBlockchainFromName = exports.hasError = exports.getBlockchainIdFromBlockchain = exports.getOrbyChainId = exports.getChainIdFromOrbyChainId = void 0;
+exports.isMainnet = exports.getBlockchainFromName = exports.hasError = exports.getBlockchainIdFromBlockchain = exports.getOrbyChainId = exports.getVirtualEnvironment = exports.getChainIdFromOrbyChainId = void 0;
 const enums_js_1 = require("../enums.js");
 const constants_js_1 = require("../constants.js");
+const validateAndParseAddress_js_1 = require("./validateAndParseAddress.js");
 const getChainIdFromOrbyChainId = (value) => {
     let chainId = undefined;
-    const formattedValue = value?.trim()?.toLowerCase();
+    const formattedValue = (0, validateAndParseAddress_js_1.validateAndLowerCase)(value);
     if (formattedValue?.includes("eip155")) {
         const publicIdElements = formattedValue.split("eip155-");
         const potentialId = publicIdElements?.length > 1 ? publicIdElements[1] : undefined;
@@ -13,6 +14,13 @@ const getChainIdFromOrbyChainId = (value) => {
             ? BigInt(potentialId)
             : undefined;
     }
+    else if (formattedValue?.includes("svm")) {
+        const publicIdElements = formattedValue.split("svm-");
+        const potentialId = publicIdElements?.length > 1 ? publicIdElements[1] : undefined;
+        chainId = !Number.isNaN(Number(potentialId))
+            ? BigInt(potentialId)
+            : undefined;
+    }
     else {
         const blockchain = (0, exports.getBlockchainFromName)(formattedValue);
         const potentialId = blockchain
@@ -23,11 +31,27 @@ const getChainIdFromOrbyChainId = (value) => {
     return chainId;
 };
 exports.getChainIdFromOrbyChainId = getChainIdFromOrbyChainId;
+const getVirtualEnvironment = (id) => {
+    const blockchain = id ? constants_js_1.BLOCKCHAIN_ID_TO_BLOCKCHAIN[Number(id)] : undefined;
+    switch (blockchain) {
+        case undefined:
+            return undefined;
+        case enums_js_1.Blockchain.SOLANA:
+            return enums_js_1.VMType.SVM;
+        default:
+            return enums_js_1.VMType.EVM;
+    }
+};
+exports.getVirtualEnvironment = getVirtualEnvironment;
 const getOrbyChainId = (chainId) => {
-    if (!chainId) {
-        return undefined;
+    switch ((0, exports.getVirtualEnvironment)(chainId)) {
+        case enums_js_1.VMType.SVM:
+            return `SVM-${chainId.toString()}`;
+        case enums_js_1.VMType.EVM:
+            return `EIP155-${chainId.toString()}`;
+        default:
+            return undefined;
     }
-    return `EIP155-${chainId.toString()}`;
 };
 exports.getOrbyChainId = getOrbyChainId;
 const getBlockchainIdFromBlockchain = (blockchain) => {
@@ -42,7 +66,7 @@ const hasError = (data) => {
 };
 exports.hasError = hasError;
 const getBlockchainFromName = (chainName) => {
-    const formattedChainName = chainName?.toLowerCase()?.replace("-", "_");
+    const formattedChainName = (0, validateAndParseAddress_js_1.validateAndLowerCase)(chainName)?.replace("-", "_");
     switch (formattedChainName) {
         case "bnbt": {
             return enums_js_1.Blockchain.BINANCE_TESTNET;

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

@@ -8,3 +8,11 @@ export declare function validateAndParseAddress(address: string): string;
  * @param address the unchecksummed hex address
  */
 export declare function checkValidAddress(address: string): string;
+/**
+ * Checks if an address is valid by checking 0x prefix, length === 42 and hex encoding.
+ * @param address the unchecksummed hex address
+ */
+export declare function checkValidEVMAddress(address: string): string;
+export declare function checkValidSVMAddress(address: string): string;
+export declare function validateAndFormatAddress(address?: string): string;
+export declare function validateAndLowerCase(value?: string): string;

package/dist/cjs/utils/validateAndParseAddress.js

@@ -2,6 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateAndParseAddress = validateAndParseAddress;
 exports.checkValidAddress = checkValidAddress;
+exports.checkValidEVMAddress = checkValidEVMAddress;
+exports.checkValidSVMAddress = checkValidSVMAddress;
+exports.validateAndFormatAddress = validateAndFormatAddress;
+exports.validateAndLowerCase = validateAndLowerCase;
 const address_1 = require("@ethersproject/address");
 /**
  * Validates an address and returns the parsed (checksummed) version of that address
@@ -27,3 +31,51 @@ function checkValidAddress(address) {
     }
     throw new Error(`${address} is not a valid address.`);
 }
+/**
+ * Checks if an address is valid by checking 0x prefix, length === 42 and hex encoding.
+ * @param address the unchecksummed hex address
+ */
+function checkValidEVMAddress(address) {
+    if (startsWith0xLen42HexRegex.test(address)) {
+        return address.toLowerCase();
+    }
+    throw new Error(`${address} is not a valid address.`);
+}
+// Solana address validation
+// Base58 character set: [1-9A-HJ-NP-Za-km-z]
+// Standard Solana addresses are 32-44 characters long
+const solanaRegex = /^[1-9A-HJ-NP-Za-km-z]{32,44}$/;
+function checkValidSVMAddress(address) {
+    if (solanaRegex.test(address)) {
+        return address;
+    }
+    throw new Error(`${address} is not a valid address.`);
+}
+// for ETH and SOL addresses.
+// ETH addresses are 42 characters long, starting with 0x
+// SOL addresses are 32-44 characters long, containing only alphanumeric characters
+function validateAndFormatAddress(address) {
+    if (!address) {
+        return undefined;
+    }
+    // Remove any whitespace
+    address = address?.trim();
+    if (startsWith0xLen42HexRegex.test(address)) {
+        return address.toLowerCase();
+    }
+    else if (solanaRegex.test(address)) {
+        return address;
+    }
+    return undefined;
+}
+function validateAndLowerCase(value) {
+    if (!value) {
+        return undefined;
+    }
+    // Remove any whitespace
+    value = value?.trim();
+    if (solanaRegex.test(value)) {
+        throw new Error(`should not lowwercase solana address: ${value}`);
+    }
+    return value?.toLowerCase();
+}

package/dist/esm/actions/account_cluster.js

@@ -1,6 +1,7 @@
 import { extractAccountCluster, extractActivities, extractFungibleTokenOverview, extractStandardizedBalances, } from "../utils/action_helpers.js";
 import { LibraryRequest } from "../entities/library_request.js";
 import { getChainIdFromOrbyChainId, getOrbyChainId } from "../utils/utils.js";
+import { validateAndFormatAddress } from "../utils/validateAndParseAddress.js";
 export class AccountClusterActions extends LibraryRequest {
     constructor(library, client, provider) {
         super(library, client, provider);
@@ -48,7 +49,7 @@ export class AccountClusterActions extends LibraryRequest {
             return {
                 chainId: getChainIdFromOrbyChainId(info.chainId),
                 virtualNodeRpcUrl: info.virtualNodeRpcUrl,
-                entrypointAccountAddress: info?.entrypointAccountAddress?.toLowerCase(),
+                entrypointAccountAddress: validateAndFormatAddress(info?.entrypointAccountAddress),
             };
         });
     }

package/dist/esm/actions/operation.js

@@ -331,7 +331,7 @@ export class OperationActions extends LibraryRequest {
         const smartAccountTransactions = operations.reduce((acc, operation) => {
             const accountKey = Account.key(operation.from, operation.chainId);
             const account = accountsMap.get(accountKey);
-            if (account?.accountType == AccountType.SCA &&
+            if (account?.type == AccountType.SCA &&
                 operation.format == OperationDataFormat.TRANSACTION) {
                 if (!acc.has(accountKey)) {
                     acc.set(accountKey, []);
@@ -348,7 +348,7 @@ export class OperationActions extends LibraryRequest {
                 const accountKey = Account.key(operation.from, operation.chainId);
                 const account = accountsMap.get(accountKey);
                 // skip signing the transaction if the account is an SCA
-                if (account?.accountType == AccountType.SCA) {
+                if (account?.type == AccountType.SCA) {
                     continue;
                 }
                 signature = await signTransaction(operation);

package/dist/esm/constants.js

@@ -14,6 +14,7 @@ export const BLOCKCHAIN_ID = {
     [Blockchain.MOONBEAM]: 1284,
     [Blockchain.BASE]: 8453,
     [Blockchain.AVALANCHE]: 43114,
+    [Blockchain.SOLANA]: 101,
     // testnets
     [Blockchain.ETHEREUM_SEPOLIA]: 11155111,
     [Blockchain.ETHEREUM_HOLESKY]: 17000,
@@ -70,6 +71,10 @@ export const CHAIN_CONFIGS = {
         environment: BlockchainEnvironment.MAINNET,
         chainId: BigInt(43114),
     },
+    [Blockchain.SOLANA]: {
+        environment: BlockchainEnvironment.MAINNET,
+        chainId: BigInt(101),
+    },
     // testnets
     [Blockchain.ETHEREUM_SEPOLIA]: {
         environment: BlockchainEnvironment.TESTNET,
@@ -119,6 +124,7 @@ export const BLOCKCHAIN_ID_TO_BLOCKCHAIN = {
     [1284]: Blockchain.MOONBEAM,
     [8453]: Blockchain.BASE,
     [43114]: Blockchain.AVALANCHE,
+    [101]: Blockchain.SOLANA,
     // testnets
     [11155111]: Blockchain.ETHEREUM_SEPOLIA,
     [84532]: Blockchain.BASE_SEPOLIA,

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

@@ -2,12 +2,12 @@ import { AccountType, VMType } from "../enums.js";
 export declare class Account {
     readonly address: string;
     readonly chainId?: bigint;
-    readonly accountType: AccountType;
+    readonly type: AccountType;
     readonly vmType: VMType;
     readonly key: string;
     hasSufficientBalanceForGas: boolean;
     static toAccount(account: any): Account;
-    constructor(address: string, accountType: AccountType, vmType: VMType, chainId?: bigint);
+    constructor(address: string, type: AccountType, vmType: VMType, chainId?: bigint);
     static key(address: string, chainId?: bigint): string;
     toAccountModel(): any;
     equals(other: Account): boolean;

package/dist/esm/entities/account.js

@@ -1,25 +1,26 @@
 import { AccountType } from "../enums.js";
 import { getChainIdFromOrbyChainId } from "../utils/utils.js";
+import { validateAndFormatAddress } from "../utils/validateAndParseAddress.js";
 export class Account {
     static toAccount(account) {
         const chainId = account?.chainId
             ? getChainIdFromOrbyChainId(account.chainId)
             : undefined;
-        const formattedAccountType = account?.accountType;
-        if (!chainId && formattedAccountType == AccountType.SCA) {
+        if (!chainId && account?.accountType == AccountType.SCA) {
             return undefined;
         }
-        return new Account(account.address, formattedAccountType, account.vmType, chainId);
+        return new Account(account.address, account?.accountType, // backend uses accountType, frontend uses type
+        account.vmType, chainId);
     }
-    constructor(address, accountType, vmType, chainId) {
+    constructor(address, type, vmType, chainId) {
         // TODO(felix): add this back
         // invariant(!_.isUndefined(getBlockchainFromBlockchainId(chainId)), "CHAIN_ID");
-        this.address = address?.toLowerCase(); // validateAndParseAddress(address)?.toLowerCase();
+        this.address = validateAndFormatAddress(address);
         this.chainId = chainId ? BigInt(chainId) : undefined;
-        this.accountType = accountType;
+        this.type = type;
         this.vmType = vmType;
         this.key = Account.key(address, chainId);
-        if (this.accountType == AccountType.SCA) {
+        if (this.type == AccountType.SCA) {
             this.hasSufficientBalanceForGas = true;
         }
         else {
@@ -28,18 +29,18 @@ export class Account {
     }
     static key(address, chainId) {
         return chainId
-            ? `${chainId?.toString()?.toLowerCase()}-${address}`
+            ? `${chainId?.toString()}-${validateAndFormatAddress(address)}`
             : address;
     }
     toAccountModel() {
         return {
             address: this.address,
-            accountType: this.accountType?.toUpperCase(),
+            accountType: this.type?.toUpperCase(), // backend uses accountType, frontend uses type
             vmType: this.vmType?.toUpperCase(),
             chainId: this.chainId ? "EIP155-" + this.chainId : undefined,
         };
     }
     equals(other) {
-        return this.key == other?.key && this.accountType == other?.accountType;
+        return this.key == other?.key && this.type == other?.type;
     }
 }

package/dist/esm/entities/financial/fungible_token.js

@@ -1,5 +1,5 @@
 import { Currency } from "./currency.js";
-import { checkValidAddress, validateAndParseAddress, } from "../../utils/validateAndParseAddress.js";
+import { validateAndFormatAddress, } from "../../utils/validateAndParseAddress.js";
 import { TokenType } from "../../enums.js";
 /**
  * Represents an ERC20 token with a unique address and some metadata.
@@ -28,10 +28,10 @@ export class FungibleToken extends Currency {
         // TODO(felix): bypassChecksum is a little confusing since when bypassChecksum is true, we still validate the address
         // bypassChecksum is derived from the isNative parameter, so we should remove it and just check if isNative here
         if (bypassChecksum) {
-            this.address = checkValidAddress(address)?.toLowerCase();
+            this.address = validateAndFormatAddress(address);
         }
         else if (!isNative) {
-            this.address = validateAndParseAddress(address)?.toLowerCase();
+            this.address = validateAndFormatAddress(address);
         }
         else {
             this.address = address;
@@ -47,7 +47,8 @@ export class FungibleToken extends Currency {
         if (this === other)
             return true;
         return (this.chainId == other?.chainId &&
-            this.address.toLowerCase() == other?.address?.toLowerCase());
+            validateAndFormatAddress(this.address) ==
+                validateAndFormatAddress(other?.address));
     }
     /**
      * Returns the currency object that this token represents
@@ -59,6 +60,6 @@ export class FungibleToken extends Currency {
         return TokenType.FUNGIBLE_TOKEN;
     }
     identifier() {
-        return `${this.chainId}+${this.address.toLowerCase()}`;
+        return `${this.chainId}+${validateAndFormatAddress(this.address)}`;
     }
 }