@nucypher/shared 0.6.0-alpha.3 → 0.6.0-alpha.5

package/dist/es/porter.js

@@ -1,4 +1,4 @@
-import { CapsuleFrag, EncryptedThresholdDecryptionResponse, PublicKey, } from '@nucypher/nucypher-core';
+import { CapsuleFrag, EncryptedThresholdDecryptionResponse, EncryptedThresholdSignatureResponse, PublicKey, } from '@nucypher/nucypher-core';
 import axios, { HttpStatusCode, } from 'axios';
 import qs from 'qs';
 import { fromBase64, fromHexString, toBase64, toHexString } from './utils';
@@ -43,23 +43,6 @@ export const getPorterUrisFromSource = async (domain) => {
         return [];
     }
 };
-function decodeSignature(signerAddress, signatureB64) {
-    try {
-        const decodedData = JSON.parse(new TextDecoder().decode(fromBase64(signatureB64)));
-        return {
-            result: {
-                messageHash: decodedData.message_hash,
-                signature: decodedData.signature,
-                signerAddress,
-            },
-        };
-    }
-    catch (error) {
-        return {
-            error: `Failed to decode signature: ${error}`,
-        };
-    }
-}
 export class PorterClient {
     porterUrls;
     constructor(porterUris) {
@@ -166,33 +149,26 @@ export class PorterClient {
         const encryptedResponses = Object.fromEntries(decryptionResponses);
         return { encryptedResponses, errors };
     }
-    async signUserOp(signingRequests, threshold) {
+    async signUserOp(encryptedSigningRequests, threshold) {
         const data = {
-            signing_requests: signingRequests,
-            threshold: threshold,
+            encrypted_signing_requests: Object.fromEntries(Object.entries(encryptedSigningRequests).map(([ursula, encryptedSigningRequest]) => [
+                ursula,
+                toBase64(encryptedSigningRequest.toBytes()),
+            ])),
+            threshold,
         };
         const resp = await this.tryAndCall({
             url: '/sign',
             method: 'post',
             data,
         });
-        const { signatures, errors } = resp.data.result.signing_results;
-        const allErrors = { ...errors };
-        const signingResults = {};
-        for (const [ursulaAddress, [signerAddress, signatureB64]] of Object.entries(signatures || {})) {
-            const decoded = decodeSignature(signerAddress, signatureB64);
-            if (decoded.error) {
-                // issue with decoding signature, add to errors
-                allErrors[ursulaAddress] = decoded.error;
-                continue;
-            }
-            // Always include all decoded signatures in signingResults
-            signingResults[ursulaAddress] = decoded.result;
+        const { encrypted_signature_responses, errors } = resp.data.result.signing_results;
+        const encryptedResponses = {};
+        for (const [ursulaAddress, encryptedResponseBase64] of Object.entries(encrypted_signature_responses || {})) {
+            const encryptedSignatureResponse = EncryptedThresholdSignatureResponse.fromBytes(fromBase64(encryptedResponseBase64));
+            encryptedResponses[ursulaAddress] = encryptedSignatureResponse;
         }
-        return {
-            signingResults,
-            errors: allErrors,
-        };
+        return { encryptedResponses, errors };
     }
 }
 //# sourceMappingURL=porter.js.map

package/dist/es/porter.js.map

@@ -1 +1 @@
-{"version":3,"file":"porter.js","sourceRoot":"","sources":["../../src/porter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"porter.js","sourceRoot":"","sources":["../../src/porter.ts"],"names":[],"mappings":"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"}

package/dist/es/types.d.ts

@@ -1,47 +1,35 @@
+import { PackedUserOperation, UserOperation } from '@nucypher/nucypher-core';
 export type ChecksumAddress = `0x${string}`;
 export type HexEncodedBytes = string;
 export type Base64EncodedBytes = string;
-export type UserOperation = {
-    sender: string;
-    nonce: number;
-    factory: string;
-    factoryData: string;
-    callData: string;
-    callGasLimit: number;
-    verificationGasLimit: number;
-    preVerificationGas: number;
-    maxFeePerGas: number;
-    maxPriorityFeePerGas: number;
-    paymaster: string;
-    paymasterVerificationGasLimit: number;
-    paymasterPostOpGasLimit: number;
-    paymasterData: string;
-    signature: string;
+export type UserOperationToSign = {
+    sender: `0x${string}`;
+    nonce: bigint | number;
+    callData: `0x${string}` | Uint8Array;
+    callGasLimit: bigint | number;
+    verificationGasLimit: bigint | number;
+    preVerificationGas: bigint | number;
+    maxFeePerGas: bigint | number;
+    maxPriorityFeePerGas: bigint | number;
+    factory?: `0x${string}` | undefined;
+    factoryData?: `0x${string}` | Uint8Array | undefined;
+    paymaster?: `0x${string}` | undefined;
+    paymasterVerificationGasLimit?: bigint | number | undefined;
+    paymasterPostOpGasLimit?: bigint | number | undefined;
+    paymasterData?: `0x${string}` | Uint8Array | undefined;
+    signature?: `0x${string}` | Uint8Array | undefined;
 };
-export declare class UserOperationSignatureRequest {
-    private userOp;
-    private aaVersion;
-    private cohortId;
-    private chainId;
-    private context;
-    private signatureType;
-    constructor(userOp: ReturnType<typeof convertUserOperationToPython>, aaVersion: string, cohortId: number, chainId: number, context?: unknown, signatureType?: string);
-    toBytes(): Uint8Array;
-}
-export declare function convertUserOperationToPython(userOp: UserOperation): {
-    sender: string | null;
-    nonce: number;
-    factory: string | null;
-    factory_data: string;
-    call_data: string;
-    call_gas_limit: number;
-    verification_gas_limit: number;
-    pre_verification_gas: number;
-    max_fee_per_gas: number;
-    max_priority_fee_per_gas: number;
-    paymaster: string | null;
-    paymaster_verification_gas_limit: number;
-    paymaster_post_op_gas_limit: number;
-    paymaster_data: string;
-    signature: string;
+export type PackedUserOperationToSign = {
+    sender: `0x${string}`;
+    nonce: bigint | number;
+    initCode: `0x${string}` | Uint8Array;
+    callData: `0x${string}` | Uint8Array;
+    accountGasLimits: `0x${string}` | Uint8Array;
+    preVerificationGas: bigint | number;
+    gasFees: `0x${string}` | Uint8Array;
+    paymasterAndData: `0x${string}` | Uint8Array;
+    signature?: `0x${string}` | Uint8Array | undefined;
 };
+export declare function toCoreUserOperation(userOperation: UserOperationToSign): UserOperation;
+export declare function toCorePackedUserOperation(packedUserOperation: PackedUserOperationToSign): PackedUserOperation;
+export declare function isPackedUserOperation(op: UserOperationToSign | PackedUserOperationToSign): op is PackedUserOperationToSign;

package/dist/es/types.js

@@ -1,61 +1,45 @@
-import { ethers } from 'ethers';
-export class UserOperationSignatureRequest {
-    userOp;
-    aaVersion;
-    cohortId;
-    chainId;
-    context;
-    signatureType;
-    constructor(userOp, aaVersion, cohortId, chainId, context = {}, signatureType = 'userop') {
-        this.userOp = userOp;
-        this.aaVersion = aaVersion;
-        this.cohortId = cohortId;
-        this.chainId = chainId;
-        this.context = context;
-        this.signatureType = signatureType;
-    }
-    toBytes() {
-        const data = {
-            user_op: JSON.stringify(this.userOp),
-            aa_version: this.aaVersion,
-            cohort_id: this.cohortId,
-            chain_id: this.chainId,
-            context: this.context,
-            signature_type: this.signatureType,
-        };
-        return new TextEncoder().encode(JSON.stringify(data));
-    }
+import { PackedUserOperation, UserOperation } from '@nucypher/nucypher-core';
+import { fromHexString } from './utils';
+function getBigIntValue(value) {
+    return typeof value === 'bigint' ? value : BigInt(value);
 }
-function normalizeAddress(address) {
-    if (!address || address === '0x') {
-        return null;
-    }
-    try {
-        // Use ethers to get the checksummed address - this will throw on invalid addresses
-        return ethers.utils.getAddress(address);
+function getUint256String(value) {
+    return getBigIntValue(value).toString();
+}
+function getUint8ArrayValue(value) {
+    return value instanceof Uint8Array ? value : fromHexString(value);
+}
+export function toCoreUserOperation(userOperation) {
+    const userOp = new UserOperation(userOperation.sender, getUint256String(userOperation.nonce), // nonce as string to support big numbers
+    getUint8ArrayValue(userOperation.callData), getBigIntValue(userOperation.callGasLimit), getBigIntValue(userOperation.verificationGasLimit), getBigIntValue(userOperation.preVerificationGas), getBigIntValue(userOperation.maxFeePerGas), getBigIntValue(userOperation.maxPriorityFeePerGas));
+    // optional factory data
+    if (userOperation.factory) {
+        let factory_data = undefined;
+        if (userOperation.factoryData) {
+            factory_data = getUint8ArrayValue(userOperation.factoryData);
+        }
+        userOp.setFactoryData(userOperation.factory, factory_data);
     }
-    catch (error) {
-        // Re-throw the error to fail fast on invalid addresses
-        throw new Error(`Invalid address: ${address}. ${error instanceof Error ? error.message : 'Unknown error'}`);
+    // optional paymaster data
+    if (userOperation.paymaster) {
+        if (!userOperation.paymasterVerificationGasLimit) {
+            throw new Error('paymasterVerificationGasLimit is required when paymaster is set');
+        }
+        else if (!userOperation.paymasterPostOpGasLimit) {
+            throw new Error('paymasterPostOpGasLimit is required when paymaster is set');
+        }
+        userOp.setPaymasterData(userOperation.paymaster, getBigIntValue(userOperation.paymasterVerificationGasLimit), getBigIntValue(userOperation.paymasterPostOpGasLimit), userOperation.paymasterData
+            ? getUint8ArrayValue(userOperation.paymasterData)
+            : undefined);
     }
+    return userOp;
+}
+export function toCorePackedUserOperation(packedUserOperation) {
+    const packedUserOp = new PackedUserOperation(packedUserOperation.sender, getUint256String(packedUserOperation.nonce), // nonce as string to support big numbers
+    getUint8ArrayValue(packedUserOperation.initCode), getUint8ArrayValue(packedUserOperation.callData), getUint8ArrayValue(packedUserOperation.accountGasLimits), getBigIntValue(packedUserOperation.preVerificationGas), getUint8ArrayValue(packedUserOperation.gasFees), getUint8ArrayValue(packedUserOperation.paymasterAndData));
+    return packedUserOp;
 }
-export function convertUserOperationToPython(userOp) {
-    return {
-        sender: normalizeAddress(userOp.sender),
-        nonce: userOp.nonce,
-        factory: normalizeAddress(userOp.factory),
-        factory_data: userOp.factoryData || '0x',
-        call_data: userOp.callData || '0x',
-        call_gas_limit: userOp.callGasLimit,
-        verification_gas_limit: userOp.verificationGasLimit,
-        pre_verification_gas: userOp.preVerificationGas,
-        max_fee_per_gas: userOp.maxFeePerGas,
-        max_priority_fee_per_gas: userOp.maxPriorityFeePerGas,
-        paymaster: normalizeAddress(userOp.paymaster),
-        paymaster_verification_gas_limit: userOp.paymasterVerificationGasLimit,
-        paymaster_post_op_gas_limit: userOp.paymasterPostOpGasLimit,
-        paymaster_data: userOp.paymasterData || '0x',
-        signature: userOp.signature || '0x',
-    };
+export function isPackedUserOperation(op) {
+    return 'initCode' in op && 'gasFees' in op;
 }
 //# sourceMappingURL=types.js.map

package/dist/es/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAwBhC,MAAM,OAAO,6BAA6B;IAE9B;IACA;IACA;IACA;IACA;IACA;IANV,YACU,MAAuD,EACvD,SAAiB,EACjB,QAAgB,EAChB,OAAe,EACf,UAAmB,EAAE,EACrB,gBAAwB,QAAQ;QALhC,WAAM,GAAN,MAAM,CAAiD;QACvD,cAAS,GAAT,SAAS,CAAQ;QACjB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,YAAO,GAAP,OAAO,CAAQ;QACf,YAAO,GAAP,OAAO,CAAc;QACrB,kBAAa,GAAb,aAAa,CAAmB;IACvC,CAAC;IAEJ,OAAO;QACL,MAAM,IAAI,GAAG;YACX,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC;YACpC,UAAU,EAAE,IAAI,CAAC,SAAS;YAC1B,SAAS,EAAE,IAAI,CAAC,QAAQ;YACxB,QAAQ,EAAE,IAAI,CAAC,OAAO;YACtB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,cAAc,EAAE,IAAI,CAAC,aAAa;SACnC,CAAC;QACF,OAAO,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACxD,CAAC;CACF;AAED,SAAS,gBAAgB,CAAC,OAAe;IACvC,IAAI,CAAC,OAAO,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC;QACH,mFAAmF;QACnF,OAAO,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,uDAAuD;QACvD,MAAM,IAAI,KAAK,CACb,oBAAoB,OAAO,KAAK,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,EAAE,CAC3F,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,MAAqB;IAChE,OAAO;QACL,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC;QACvC,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC;QACzC,YAAY,EAAE,MAAM,CAAC,WAAW,IAAI,IAAI;QACxC,SAAS,EAAE,MAAM,CAAC,QAAQ,IAAI,IAAI;QAClC,cAAc,EAAE,MAAM,CAAC,YAAY;QACnC,sBAAsB,EAAE,MAAM,CAAC,oBAAoB;QACnD,oBAAoB,EAAE,MAAM,CAAC,kBAAkB;QAC/C,eAAe,EAAE,MAAM,CAAC,YAAY;QACpC,wBAAwB,EAAE,MAAM,CAAC,oBAAoB;QACrD,SAAS,EAAE,gBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC;QAC7C,gCAAgC,EAAE,MAAM,CAAC,6BAA6B;QACtE,2BAA2B,EAAE,MAAM,CAAC,uBAAuB;QAC3D,cAAc,EAAE,MAAM,CAAC,aAAa,IAAI,IAAI;QAC5C,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,IAAI;KACpC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"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"}