@orb-labs/orby-core 0.0.15 → 0.0.16

package/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ### Unreleased
 
+### 0.0.16
+
+- change the sendOperationSet interface to support callbacks for AA
+- support for AA
+
 ### 0.0.15
 
 - feat: support dual module format builds

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

@@ -1,4 +1,4 @@
-import { OnchainOperation, OperationSet, OperationStatus, SignedOperation } from "../types.js";
+import { AccountCluster, 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";
@@ -90,7 +90,7 @@ export declare class OperationActions extends LibraryRequest {
     subscribeToOperationStatuses(ids?: string[], onOperationStatusesUpdateCallback?: (statusSummary: OperationStatusType, primaryOperationStatus?: OperationStatus, allOperationStatuses?: OperationStatus[]) => void, timout?: number): {
         intervalId: NodeJS.Timeout | null;
     };
-    sendOperationSet(accountClusterId: string, operationSet: OperationSet, signOperation: (operation: OnchainOperation) => Promise<SignedOperation | undefined>): Promise<{
+    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;
         primaryOperationStatus?: OperationStatus;

package/dist/cjs/actions/operation.js

@@ -6,6 +6,11 @@ const currency_amount_js_1 = require("../entities/financial/currency_amount.js")
 const enums_js_1 = require("../enums.js");
 const library_request_js_1 = require("../entities/library_request.js");
 const utils_js_1 = require("../utils/utils.js");
+const account_js_1 = require("../entities/account.js");
+// from here: https://stackoverflow.com/questions/65152373/typescript-serialize-bigint-in-json
+BigInt.prototype.toJSON = function () {
+    return this.toString();
+};
 class OperationActions extends library_request_js_1.LibraryRequest {
     constructor(library, client, provider) {
         super(library, client, provider);
@@ -305,7 +310,7 @@ class OperationActions extends library_request_js_1.LibraryRequest {
         }
         return { intervalId };
     }
-    async sendOperationSet(accountClusterId, operationSet, signOperation) {
+    async sendOperationSet(accountCluster, operationSet, signTransaction, signUserOperation, signTypedData) {
         const signedOperations = [];
         const operations = operationSet.intents
             ?.map((intent) => intent.intentOperations)
@@ -322,15 +327,80 @@ class OperationActions extends library_request_js_1.LibraryRequest {
         if (!hasPrimaryOperation) {
             return { success: false };
         }
+        const accountsMap = accountCluster.accounts.reduce((acc, account) => {
+            acc.set(account.key, account);
+            return acc;
+        }, new Map());
+        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 &&
+                operation.format == enums_js_1.OperationDataFormat.TRANSACTION) {
+                if (!acc.has(accountKey)) {
+                    acc.set(accountKey, []);
+                }
+                acc.get(accountKey).push(operation);
+            }
+            return acc;
+        }, new Map());
         // Loop through all the operations and sign them
         for (let i = 0; i < operations.length; i++) {
-            const signature = await signOperation(operations[i]);
+            const operation = operations[i];
+            let signature;
+            if (operation.format == enums_js_1.OperationDataFormat.TRANSACTION) {
+                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) {
+                    continue;
+                }
+                signature = await signTransaction(operation);
+            }
+            else if (operation.format == enums_js_1.OperationDataFormat.TYPED_DATA) {
+                signature = await signTypedData(operation);
+            }
             if (!signature) {
                 return { success: false };
             }
-            signedOperations.push(signature);
+            signedOperations.push({
+                type: operation.type,
+                signature: signature,
+                data: operation.data,
+                from: operation.from,
+                chainId: (0, utils_js_1.getOrbyChainId)(operation.chainId),
+            });
+        }
+        // batch sign all the smart contract transactions
+        const accountKeys = Array.from(smartAccountTransactions.keys());
+        for (const accountKey of accountKeys) {
+            const transactions = smartAccountTransactions.get(accountKey);
+            transactions.sort((operationA, _) => {
+                if (operationA.type == enums_js_1.OperationType.APPROVE_ERC20_TOKEN) {
+                    return -1;
+                }
+                return 0;
+            });
+            const userOperation = await signUserOperation(transactions, transactions[0].from, transactions[0].chainId, transactions[0].txRpcUrl);
+            if (!userOperation) {
+                return { success: false };
+            }
+            const types = transactions.map((operation) => operation.type);
+            let type = types[0];
+            if (types.includes(enums_js_1.OperationType.FINAL_TRANSACTION)) {
+                type = enums_js_1.OperationType.FINAL_TRANSACTION;
+            }
+            else if (types.includes(enums_js_1.OperationType.SUBMIT_INTENT)) {
+                type = enums_js_1.OperationType.SUBMIT_INTENT;
+            }
+            signedOperations.push({
+                type,
+                signature: userOperation.signature,
+                data: JSON.stringify(userOperation),
+                from: transactions[0].from,
+                chainId: (0, utils_js_1.getOrbyChainId)(transactions[0].chainId),
+            });
         }
-        const { operationSetId, operationResponses } = await this.sendSignedOperations(accountClusterId, signedOperations);
+        const { operationSetId, operationResponses } = await this.sendSignedOperations(accountCluster.accountClusterId, signedOperations);
         return {
             operationSetId,
             operationResponses,

package/dist/cjs/entities/account.js

@@ -8,7 +8,7 @@ class Account {
         const chainId = account?.chainId
             ? (0, utils_js_1.getChainIdFromOrbyChainId)(account.chainId)
             : undefined;
-        const formattedAccountType = account?.accountType?.toLowerCase();
+        const formattedAccountType = account?.accountType;
         if (!chainId && formattedAccountType == enums_js_1.AccountType.SCA) {
             return undefined;
         }

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

@@ -1,4 +1,4 @@
-import { OnchainOperation, OperationSet, OperationStatus, SignedOperation } from "../types.js";
+import { AccountCluster, 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 {
@@ -88,7 +88,7 @@ export interface IOperationActions {
     subscribeToOperationStatuses(ids?: string[], onOperationStatusesUpdateCallback?: (statusSummary: OperationStatusType, primaryOperationStatus?: OperationStatus, allOperationStatuses?: OperationStatus[]) => void, timout?: number): {
         intervalId: NodeJS.Timeout | null;
     };
-    sendOperationSet(accountClusterId: string, operationSet: OperationSet, signOperation: (operation: OnchainOperation) => Promise<SignedOperation | undefined>): Promise<{
+    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;
         primaryOperationStatus?: OperationStatus;

package/dist/cjs/types.d.ts

@@ -32,6 +32,24 @@ export type Intent = {
     intentOperations?: OnchainOperation[];
     outputState?: State;
 };
+export type UserOperation = {
+    sender: string;
+    nonce: string;
+    factory: string;
+    factoryData: string;
+    callData: string;
+    callGasLimit: string;
+    verificationGasLimit: string;
+    preVerificationGas: string;
+    maxFeePerGas: string;
+    maxPriorityFeePerGas: string;
+    paymasterVerificationGasLimit: string;
+    paymasterPostOpGasLimit: string;
+    signature: string;
+    paymaster: string;
+    paymasterData: string;
+    entrypoint: string;
+};
 export interface OnchainOperation {
     chainId: bigint;
     data: string;
@@ -58,6 +76,8 @@ export type SignedOperation = {
     signature: string;
     category?: Category;
     data?: string;
+    from?: string;
+    chainId?: string;
 };
 export type OperationStatus = {
     blockHash?: string;

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

@@ -1,4 +1,4 @@
-import { OnchainOperation, OperationSet, OperationStatus, SignedOperation } from "../types.js";
+import { AccountCluster, 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";
@@ -90,7 +90,7 @@ export declare class OperationActions extends LibraryRequest {
     subscribeToOperationStatuses(ids?: string[], onOperationStatusesUpdateCallback?: (statusSummary: OperationStatusType, primaryOperationStatus?: OperationStatus, allOperationStatuses?: OperationStatus[]) => void, timout?: number): {
         intervalId: NodeJS.Timeout | null;
     };
-    sendOperationSet(accountClusterId: string, operationSet: OperationSet, signOperation: (operation: OnchainOperation) => Promise<SignedOperation | undefined>): Promise<{
+    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;
         primaryOperationStatus?: OperationStatus;

package/dist/esm/actions/operation.js

@@ -1,8 +1,13 @@
 import { extractOperationSet, extractOperationStatuses, } from "../utils/action_helpers.js";
 import { CurrencyAmount } from "../entities/financial/currency_amount.js";
-import { OperationStatusType, OperationType, } from "../enums.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 () {
+    return this.toString();
+};
 export class OperationActions extends LibraryRequest {
     constructor(library, client, provider) {
         super(library, client, provider);
@@ -302,7 +307,7 @@ export class OperationActions extends LibraryRequest {
         }
         return { intervalId };
     }
-    async sendOperationSet(accountClusterId, operationSet, signOperation) {
+    async sendOperationSet(accountCluster, operationSet, signTransaction, signUserOperation, signTypedData) {
         const signedOperations = [];
         const operations = operationSet.intents
             ?.map((intent) => intent.intentOperations)
@@ -319,15 +324,80 @@ export class OperationActions extends LibraryRequest {
         if (!hasPrimaryOperation) {
             return { success: false };
         }
+        const accountsMap = accountCluster.accounts.reduce((acc, account) => {
+            acc.set(account.key, account);
+            return acc;
+        }, new Map());
+        const smartAccountTransactions = operations.reduce((acc, operation) => {
+            const accountKey = Account.key(operation.from, operation.chainId);
+            const account = accountsMap.get(accountKey);
+            if (account?.accountType == AccountType.SCA &&
+                operation.format == OperationDataFormat.TRANSACTION) {
+                if (!acc.has(accountKey)) {
+                    acc.set(accountKey, []);
+                }
+                acc.get(accountKey).push(operation);
+            }
+            return acc;
+        }, new Map());
         // Loop through all the operations and sign them
         for (let i = 0; i < operations.length; i++) {
-            const signature = await signOperation(operations[i]);
+            const operation = operations[i];
+            let signature;
+            if (operation.format == OperationDataFormat.TRANSACTION) {
+                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) {
+                    continue;
+                }
+                signature = await signTransaction(operation);
+            }
+            else if (operation.format == OperationDataFormat.TYPED_DATA) {
+                signature = await signTypedData(operation);
+            }
             if (!signature) {
                 return { success: false };
             }
-            signedOperations.push(signature);
+            signedOperations.push({
+                type: operation.type,
+                signature: signature,
+                data: operation.data,
+                from: operation.from,
+                chainId: getOrbyChainId(operation.chainId),
+            });
+        }
+        // batch sign all the smart contract transactions
+        const accountKeys = Array.from(smartAccountTransactions.keys());
+        for (const accountKey of accountKeys) {
+            const transactions = smartAccountTransactions.get(accountKey);
+            transactions.sort((operationA, _) => {
+                if (operationA.type == OperationType.APPROVE_ERC20_TOKEN) {
+                    return -1;
+                }
+                return 0;
+            });
+            const userOperation = await signUserOperation(transactions, transactions[0].from, transactions[0].chainId, transactions[0].txRpcUrl);
+            if (!userOperation) {
+                return { success: false };
+            }
+            const types = transactions.map((operation) => operation.type);
+            let type = types[0];
+            if (types.includes(OperationType.FINAL_TRANSACTION)) {
+                type = OperationType.FINAL_TRANSACTION;
+            }
+            else if (types.includes(OperationType.SUBMIT_INTENT)) {
+                type = OperationType.SUBMIT_INTENT;
+            }
+            signedOperations.push({
+                type,
+                signature: userOperation.signature,
+                data: JSON.stringify(userOperation),
+                from: transactions[0].from,
+                chainId: getOrbyChainId(transactions[0].chainId),
+            });
         }
-        const { operationSetId, operationResponses } = await this.sendSignedOperations(accountClusterId, signedOperations);
+        const { operationSetId, operationResponses } = await this.sendSignedOperations(accountCluster.accountClusterId, signedOperations);
         return {
             operationSetId,
             operationResponses,

package/dist/esm/actions/token.js

@@ -1,4 +1,4 @@
-import { extractStandardizedTokens, } from "../utils/action_helpers.js";
+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 {

package/dist/esm/entities/account.js

@@ -5,7 +5,7 @@ export class Account {
         const chainId = account?.chainId
             ? getChainIdFromOrbyChainId(account.chainId)
             : undefined;
-        const formattedAccountType = account?.accountType?.toLowerCase();
+        const formattedAccountType = account?.accountType;
         if (!chainId && formattedAccountType == AccountType.SCA) {
             return undefined;
         }

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

@@ -1,4 +1,4 @@
-import { OnchainOperation, OperationSet, OperationStatus, SignedOperation } from "../types.js";
+import { AccountCluster, 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 {
@@ -88,7 +88,7 @@ export interface IOperationActions {
     subscribeToOperationStatuses(ids?: string[], onOperationStatusesUpdateCallback?: (statusSummary: OperationStatusType, primaryOperationStatus?: OperationStatus, allOperationStatuses?: OperationStatus[]) => void, timout?: number): {
         intervalId: NodeJS.Timeout | null;
     };
-    sendOperationSet(accountClusterId: string, operationSet: OperationSet, signOperation: (operation: OnchainOperation) => Promise<SignedOperation | undefined>): Promise<{
+    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;
         primaryOperationStatus?: OperationStatus;

package/dist/esm/types.d.ts

@@ -32,6 +32,24 @@ export type Intent = {
     intentOperations?: OnchainOperation[];
     outputState?: State;
 };
+export type UserOperation = {
+    sender: string;
+    nonce: string;
+    factory: string;
+    factoryData: string;
+    callData: string;
+    callGasLimit: string;
+    verificationGasLimit: string;
+    preVerificationGas: string;
+    maxFeePerGas: string;
+    maxPriorityFeePerGas: string;
+    paymasterVerificationGasLimit: string;
+    paymasterPostOpGasLimit: string;
+    signature: string;
+    paymaster: string;
+    paymasterData: string;
+    entrypoint: string;
+};
 export interface OnchainOperation {
     chainId: bigint;
     data: string;
@@ -58,6 +76,8 @@ export type SignedOperation = {
     signature: string;
     category?: Category;
     data?: string;
+    from?: string;
+    chainId?: string;
 };
 export type OperationStatus = {
     blockHash?: string;