tempo.ts 0.7.5 → 0.8.0

package/dist/viem/Account.d.ts

@@ -1,8 +1,33 @@
-import { WebCryptoP256 } from 'ox';
-import type * as Hex from 'ox/Hex';
+import * as Address from 'ox/Address';
+import * as Hex from 'ox/Hex';
+import * as PublicKey from 'ox/PublicKey';
 import * as WebAuthnP256 from 'ox/WebAuthnP256';
-import * as internal from './internal/account.js';
-export type { Account } from './internal/account.js';
+import * as WebCryptoP256 from 'ox/WebCryptoP256';
+import type { LocalAccount, RequiredBy, Account as viem_Account } from 'viem';
+import type { OneOf } from '../internal/types.js';
+import * as KeyAuthorization from '../ox/KeyAuthorization.js';
+import * as SignatureEnvelope from '../ox/SignatureEnvelope.js';
+import * as Storage from './Storage.js';
+type StorageSchema = {
+    pendingKeyAuthorization?: KeyAuthorization.Signed | undefined;
+};
+export type Account_base<source extends string = string> = RequiredBy<LocalAccount<source>, 'sign' | 'signAuthorization'> & {
+    /** Key type. */
+    keyType: SignatureEnvelope.Type;
+    /** Account storage. */
+    storage: Storage.Storage<StorageSchema>;
+};
+export type RootAccount = Account_base<'root'> & {
+    /** Assign key authorization to the next transaction. */
+    assignKeyAuthorization: (keyAuthorization: KeyAuthorization.Signed) => Promise<void>;
+    /** Sign key authorization. */
+    signKeyAuthorization: (key: Pick<AccessKeyAccount, 'accessKeyAddress' | 'keyType'>, parameters?: Pick<KeyAuthorization.KeyAuthorization, 'expiry' | 'limits'>) => Promise<KeyAuthorization.Signed>;
+};
+export type AccessKeyAccount = Account_base<'accessKey'> & {
+    /** Access key ID. */
+    accessKeyAddress: Address.Address;
+};
+export type Account = OneOf<RootAccount | AccessKeyAccount>;
 /**
  * Instantiates an Account from a headless WebAuthn credential (P256 private key).
  *
@@ -16,13 +41,13 @@ export type { Account } from './internal/account.js';
  * @param privateKey P256 private key.
  * @returns Account.
  */
-export declare function fromHeadlessWebAuthn(privateKey: Hex.Hex, options: fromHeadlessWebAuthn.Options): fromP256.ReturnValue;
+export declare function fromHeadlessWebAuthn<const options extends fromHeadlessWebAuthn.Options>(privateKey: Hex.Hex, options: options | fromHeadlessWebAuthn.Options): fromHeadlessWebAuthn.ReturnValue<options>;
 export declare namespace fromHeadlessWebAuthn {
-    type Options = Omit<WebAuthnP256.getSignPayload.Options, 'challenge' | 'rpId' | 'origin'> & {
+    type Options = Omit<WebAuthnP256.getSignPayload.Options, 'challenge' | 'rpId' | 'origin'> & Pick<from.Parameters, 'access' | 'storage'> & {
         rpId: string;
         origin: string;
     };
-    type ReturnValue = internal.toPrivateKeyAccount.ReturnValue;
+    type ReturnValue<options extends Options = Options> = from.ReturnValue<options>;
 }
 /**
  * Instantiates an Account from a P256 private key.
@@ -37,9 +62,10 @@ export declare namespace fromHeadlessWebAuthn {
  * @param privateKey P256 private key.
  * @returns Account.
  */
-export declare function fromP256(privateKey: Hex.Hex): fromP256.ReturnValue;
+export declare function fromP256<const options extends fromP256.Options>(privateKey: Hex.Hex, options?: options | fromP256.Options): fromP256.ReturnValue<options>;
 export declare namespace fromP256 {
-    type ReturnValue = internal.toPrivateKeyAccount.ReturnValue;
+    type Options = Pick<from.Parameters, 'access' | 'storage'>;
+    type ReturnValue<options extends Options = Options> = from.ReturnValue<options>;
 }
 /**
  * Instantiates an Account from a Secp256k1 private key.
@@ -54,9 +80,10 @@ export declare namespace fromP256 {
  * @param privateKey Secp256k1 private key.
  * @returns Account.
  */
-export declare function fromSecp256k1(privateKey: Hex.Hex): fromSecp256k1.ReturnValue;
+export declare function fromSecp256k1<const options extends fromSecp256k1.Options>(privateKey: Hex.Hex, options?: options | fromSecp256k1.Options): fromSecp256k1.ReturnValue<options>;
 export declare namespace fromSecp256k1 {
-    type ReturnValue = internal.toPrivateKeyAccount.ReturnValue;
+    type Options = Pick<from.Parameters, 'access' | 'storage'>;
+    type ReturnValue<options extends Options = Options> = from.ReturnValue<options>;
 }
 /**
  * Instantiates an Account from a WebAuthn credential.
@@ -124,8 +151,9 @@ export declare namespace fromWebAuthnP256 {
     type Options = {
         getFn?: WebAuthnP256.sign.Options['getFn'] | undefined;
         rpId?: WebAuthnP256.sign.Options['rpId'] | undefined;
+        storage?: from.Parameters['storage'] | undefined;
     };
-    type ReturnValue = internal.toPrivateKeyAccount.ReturnValue;
+    type ReturnValue = from.ReturnValue;
 }
 /**
  * Instantiates an Account from a P256 private key.
@@ -143,8 +171,69 @@ export declare namespace fromWebAuthnP256 {
  * @param keyPair WebCryptoP256 key pair.
  * @returns Account.
  */
-export declare function fromWebCryptoP256(keyPair: Awaited<ReturnType<typeof WebCryptoP256.createKeyPair>>): fromWebCryptoP256.ReturnValue;
+export declare function fromWebCryptoP256<const options extends fromWebCryptoP256.Options>(keyPair: Awaited<ReturnType<typeof WebCryptoP256.createKeyPair>>, options?: options | fromWebCryptoP256.Options): fromWebCryptoP256.ReturnValue<options>;
 export declare namespace fromWebCryptoP256 {
-    type ReturnValue = internal.toPrivateKeyAccount.ReturnValue;
+    type Options = Pick<from.Parameters, 'access' | 'storage'>;
+    type ReturnValue<options extends Options = Options> = from.ReturnValue<options>;
 }
+export declare function signKeyAuthorization(account: LocalAccount, parameters: signKeyAuthorization.Parameters): Promise<signKeyAuthorization.ReturnValue>;
+export declare namespace signKeyAuthorization {
+    type Parameters = Pick<KeyAuthorization.KeyAuthorization, 'expiry' | 'limits'> & {
+        key: Pick<AccessKeyAccount, 'accessKeyAddress' | 'keyType'>;
+    };
+    type ReturnValue = KeyAuthorization.Signed;
+}
+/** @internal */
+declare function fromBase(parameters: fromBase.Parameters): Account_base;
+declare namespace fromBase {
+    type Parameters = {
+        /** Parent address. */
+        parentAddress?: Address.Address | undefined;
+        /** Public key. */
+        publicKey: PublicKey.PublicKey;
+        /** Key type. */
+        keyType?: SignatureEnvelope.Type | undefined;
+        /** Sign function. */
+        sign: NonNullable<LocalAccount['sign']>;
+        /** Source. */
+        source?: string | undefined;
+        /**
+         * Account storage.
+         * Used for access key management, and pending key authorizations.
+         * @default `Storage.memory()`
+         */
+        storage?: Storage.Storage | undefined;
+    };
+    type ReturnValue = Account_base;
+}
+/** @internal */
+declare function fromRoot(parameters: fromRoot.Parameters): RootAccount;
+declare namespace fromRoot {
+    type Parameters = fromBase.Parameters;
+    type ReturnValue = RootAccount;
+}
+declare function fromAccessKey(parameters: fromAccessKey.Parameters): AccessKeyAccount;
+declare namespace fromAccessKey {
+    type Parameters = fromBase.Parameters & {
+        /**
+         * Parent account to access.
+         * If defined, this account will act as an "access key", and use
+         * the parent account's address as the keychain address.
+         */
+        access: viem_Account | Address.Address;
+    };
+    type ReturnValue = AccessKeyAccount;
+}
+declare function from<const parameters extends from.Parameters>(parameters: parameters | from.Parameters): from.ReturnValue<parameters>;
+declare namespace from {
+    type Parameters = OneOf<fromRoot.Parameters | fromAccessKey.Parameters>;
+    type ReturnValue<parameters extends {
+        access?: fromAccessKey.Parameters['access'] | undefined;
+    } = {
+        access?: fromAccessKey.Parameters['access'] | undefined;
+    }> = parameters extends {
+        access: fromAccessKey.Parameters['access'];
+    } ? AccessKeyAccount : RootAccount;
+}
+export {};
 //# sourceMappingURL=Account.d.ts.map

package/dist/viem/Account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Account.d.ts","sourceRoot":"","sources":["../../src/viem/Account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,IAAI,CAAA;AAElC,OAAO,KAAK,KAAK,GAAG,MAAM,QAAQ,CAAA;AAKlC,OAAO,KAAK,YAAY,MAAM,iBAAiB,CAAA;AAE/C,OAAO,KAAK,QAAQ,MAAM,uBAAuB,CAAA;AAEjD,YAAY,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAEpD;;;;;;;;;;;;GAYG;AACH,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,GAAG,CAAC,GAAG,EACnB,OAAO,EAAE,oBAAoB,CAAC,OAAO,GACpC,QAAQ,CAAC,WAAW,CA8BtB;AAED,MAAM,CAAC,OAAO,WAAW,oBAAoB,CAAC;IAC5C,KAAY,OAAO,GAAG,IAAI,CACxB,YAAY,CAAC,cAAc,CAAC,OAAO,EACnC,WAAW,GAAG,MAAM,GAAG,QAAQ,CAChC,GAAG;QACF,IAAI,EAAE,MAAM,CAAA;QACZ,MAAM,EAAE,MAAM,CAAA;KACf,CAAA;IAED,KAAY,WAAW,GAAG,QAAQ,CAAC,mBAAmB,CAAC,WAAW,CAAA;CACnE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,GAAG,GAAG,QAAQ,CAAC,WAAW,CAiBlE;AAED,MAAM,CAAC,OAAO,WAAW,QAAQ,CAAC;IAChC,KAAY,WAAW,GAAG,QAAQ,CAAC,mBAAmB,CAAC,WAAW,CAAA;CACnE;AAED;;;;;;;;;;;;GAYG;AAEH,wBAAgB,aAAa,CAAC,UAAU,EAAE,GAAG,CAAC,GAAG,GAAG,aAAa,CAAC,WAAW,CAY5E;AAED,MAAM,CAAC,OAAO,WAAW,aAAa,CAAC;IACrC,KAAY,WAAW,GAAG,QAAQ,CAAC,mBAAmB,CAAC,WAAW,CAAA;CACnE;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwDG;AACH,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,gBAAgB,CAAC,UAAU,EACvC,OAAO,GAAE,gBAAgB,CAAC,OAAY,GACrC,gBAAgB,CAAC,WAAW,CAqB9B;AAED,MAAM,CAAC,OAAO,WAAW,gBAAgB,CAAC;IACxC,KAAY,UAAU,GAAG;QACvB,EAAE,EAAE,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;QACrC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAA;KACnB,CAAA;IAED,KAAY,OAAO,GAAG;QACpB,KAAK,CAAC,EAAE,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,SAAS,CAAA;QACtD,IAAI,CAAC,EAAE,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,SAAS,CAAA;KACrD,CAAA;IAED,KAAY,WAAW,GAAG,QAAQ,CAAC,mBAAmB,CAAC,WAAW,CAAA;CACnE;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,aAAa,CAAC,aAAa,CAAC,CAAC,GAC/D,iBAAiB,CAAC,WAAW,CAkB/B;AAED,MAAM,CAAC,OAAO,WAAW,iBAAiB,CAAC;IACzC,KAAY,WAAW,GAAG,QAAQ,CAAC,mBAAmB,CAAC,WAAW,CAAA;CACnE"}
+{"version":3,"file":"Account.d.ts","sourceRoot":"","sources":["../../src/viem/Account.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,YAAY,CAAA;AACrC,OAAO,KAAK,GAAG,MAAM,QAAQ,CAAA;AAE7B,OAAO,KAAK,SAAS,MAAM,cAAc,CAAA;AAGzC,OAAO,KAAK,YAAY,MAAM,iBAAiB,CAAA;AAC/C,OAAO,KAAK,aAAa,MAAM,kBAAkB,CAAA;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,MAAM,CAAA;AAQ7E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,KAAK,gBAAgB,MAAM,2BAA2B,CAAA;AAC7D,OAAO,KAAK,iBAAiB,MAAM,4BAA4B,CAAA;AAC/D,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAGvC,KAAK,aAAa,GAAG;IACnB,uBAAuB,CAAC,EAAE,gBAAgB,CAAC,MAAM,GAAG,SAAS,CAAA;CAC9D,CAAA;AAED,MAAM,MAAM,YAAY,CAAC,MAAM,SAAS,MAAM,GAAG,MAAM,IAAI,UAAU,CACnE,YAAY,CAAC,MAAM,CAAC,EACpB,MAAM,GAAG,mBAAmB,CAC7B,GAAG;IACF,gBAAgB;IAChB,OAAO,EAAE,iBAAiB,CAAC,IAAI,CAAA;IAC/B,uBAAuB;IACvB,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;CACxC,CAAA;AAED,MAAM,MAAM,WAAW,GAAG,YAAY,CAAC,MAAM,CAAC,GAAG;IAC/C,wDAAwD;IACxD,sBAAsB,EAAE,CACtB,gBAAgB,EAAE,gBAAgB,CAAC,MAAM,KACtC,OAAO,CAAC,IAAI,CAAC,CAAA;IAClB,8BAA8B;IAC9B,oBAAoB,EAAE,CACpB,GAAG,EAAE,IAAI,CAAC,gBAAgB,EAAE,kBAAkB,GAAG,SAAS,CAAC,EAC3D,UAAU,CAAC,EAAE,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,EAAE,QAAQ,GAAG,QAAQ,CAAC,KACtE,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;CACtC,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,YAAY,CAAC,WAAW,CAAC,GAAG;IACzD,qBAAqB;IACrB,gBAAgB,EAAE,OAAO,CAAC,OAAO,CAAA;CAClC,CAAA;AAED,MAAM,MAAM,OAAO,GAAG,KAAK,CAAC,WAAW,GAAG,gBAAgB,CAAC,CAAA;AAE3D;;;;;;;;;;;;GAYG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,CAAC,OAAO,SAAS,oBAAoB,CAAC,OAAO,EAElD,UAAU,EAAE,GAAG,CAAC,GAAG,EACnB,OAAO,EAAE,OAAO,GAAG,oBAAoB,CAAC,OAAO,GAC9C,oBAAoB,CAAC,WAAW,CAAC,OAAO,CAAC,CA8B3C;AAED,MAAM,CAAC,OAAO,WAAW,oBAAoB,CAAC;IAC5C,KAAY,OAAO,GAAG,IAAI,CACxB,YAAY,CAAC,cAAc,CAAC,OAAO,EACnC,WAAW,GAAG,MAAM,GAAG,QAAQ,CAChC,GACC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,GAAG,SAAS,CAAC,GAAG;QAC5C,IAAI,EAAE,MAAM,CAAA;QACZ,MAAM,EAAE,MAAM,CAAA;KACf,CAAA;IAEH,KAAY,WAAW,CAAC,OAAO,SAAS,OAAO,GAAG,OAAO,IACvD,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;CAC5B;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,QAAQ,CAAC,KAAK,CAAC,OAAO,SAAS,QAAQ,CAAC,OAAO,EAC7D,UAAU,EAAE,GAAG,CAAC,GAAG,EACnB,OAAO,GAAE,OAAO,GAAG,QAAQ,CAAC,OAAY,GACvC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAkB/B;AAED,MAAM,CAAC,OAAO,WAAW,QAAQ,CAAC;IAChC,KAAY,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,GAAG,SAAS,CAAC,CAAA;IAEjE,KAAY,WAAW,CAAC,OAAO,SAAS,OAAO,GAAG,OAAO,IACvD,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;CAC5B;AAED;;;;;;;;;;;;GAYG;AAEH,wBAAgB,aAAa,CAAC,KAAK,CAAC,OAAO,SAAS,aAAa,CAAC,OAAO,EACvE,UAAU,EAAE,GAAG,CAAC,GAAG,EACnB,OAAO,GAAE,OAAO,GAAG,aAAa,CAAC,OAAY,GAC5C,aAAa,CAAC,WAAW,CAAC,OAAO,CAAC,CAepC;AAED,MAAM,CAAC,OAAO,WAAW,aAAa,CAAC;IACrC,KAAY,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,GAAG,SAAS,CAAC,CAAA;IAEjE,KAAY,WAAW,CAAC,OAAO,SAAS,OAAO,GAAG,OAAO,IACvD,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;CAC5B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwDG;AACH,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,gBAAgB,CAAC,UAAU,EACvC,OAAO,GAAE,gBAAgB,CAAC,OAAY,GACrC,gBAAgB,CAAC,WAAW,CAsB9B;AAED,MAAM,CAAC,OAAO,WAAW,gBAAgB,CAAC;IACxC,KAAY,UAAU,GAAG;QACvB,EAAE,EAAE,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;QACrC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAA;KACnB,CAAA;IAED,KAAY,OAAO,GAAG;QACpB,KAAK,CAAC,EAAE,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,SAAS,CAAA;QACtD,IAAI,CAAC,EAAE,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,SAAS,CAAA;QACpD,OAAO,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,SAAS,CAAA;KACjD,CAAA;IAED,KAAY,WAAW,GAAG,IAAI,CAAC,WAAW,CAAA;CAC3C;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,CAAC,OAAO,SAAS,iBAAiB,CAAC,OAAO,EAE/C,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,aAAa,CAAC,aAAa,CAAC,CAAC,EAChE,OAAO,GAAE,OAAO,GAAG,iBAAiB,CAAC,OAAY,GAChD,iBAAiB,CAAC,WAAW,CAAC,OAAO,CAAC,CAmBxC;AAED,MAAM,CAAC,OAAO,WAAW,iBAAiB,CAAC;IACzC,KAAY,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,GAAG,SAAS,CAAC,CAAA;IAEjE,KAAY,WAAW,CAAC,OAAO,SAAS,OAAO,GAAG,OAAO,IACvD,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;CAC5B;AAED,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,YAAY,EACrB,UAAU,EAAE,oBAAoB,CAAC,UAAU,GAC1C,OAAO,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAmB3C;AAED,MAAM,CAAC,OAAO,WAAW,oBAAoB,CAAC;IAC5C,KAAK,UAAU,GAAG,IAAI,CACpB,gBAAgB,CAAC,gBAAgB,EACjC,QAAQ,GAAG,QAAQ,CACpB,GAAG;QACF,GAAG,EAAE,IAAI,CAAC,gBAAgB,EAAE,kBAAkB,GAAG,SAAS,CAAC,CAAA;KAC5D,CAAA;IAED,KAAK,WAAW,GAAG,gBAAgB,CAAC,MAAM,CAAA;CAC3C;AAED,gBAAgB;AAEhB,iBAAS,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,UAAU,GAAG,YAAY,CA0F/D;AAED,OAAO,WAAW,QAAQ,CAAC;IACzB,KAAY,UAAU,GAAG;QACvB,sBAAsB;QACtB,aAAa,CAAC,EAAE,OAAO,CAAC,OAAO,GAAG,SAAS,CAAA;QAC3C,kBAAkB;QAClB,SAAS,EAAE,SAAS,CAAC,SAAS,CAAA;QAC9B,gBAAgB;QAChB,OAAO,CAAC,EAAE,iBAAiB,CAAC,IAAI,GAAG,SAAS,CAAA;QAC5C,qBAAqB;QACrB,IAAI,EAAE,WAAW,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAA;QACvC,cAAc;QACd,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QAC3B;;;;WAIG;QACH,OAAO,CAAC,EAAE,OAAO,CAAC,OAAO,GAAG,SAAS,CAAA;KACtC,CAAA;IAED,KAAY,WAAW,GAAG,YAAY,CAAA;CACvC;AAED,gBAAgB;AAEhB,iBAAS,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,UAAU,GAAG,WAAW,CA8B9D;AAED,OAAO,WAAW,QAAQ,CAAC;IACzB,KAAY,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAA;IAE5C,KAAY,WAAW,GAAG,WAAW,CAAA;CACtC;AAGD,iBAAS,aAAa,CAAC,UAAU,EAAE,aAAa,CAAC,UAAU,GAAG,gBAAgB,CAS7E;AAED,OAAO,WAAW,aAAa,CAAC;IAC9B,KAAY,UAAU,GAAG,QAAQ,CAAC,UAAU,GAAG;QAC7C;;;;WAIG;QACH,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAA;KACvC,CAAA;IAED,KAAY,WAAW,GAAG,gBAAgB,CAAA;CAC3C;AAGD,iBAAS,IAAI,CAAC,KAAK,CAAC,UAAU,SAAS,IAAI,CAAC,UAAU,EACpD,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC,UAAU,GACvC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAI9B;AAED,OAAO,WAAW,IAAI,CAAC;IACrB,KAAY,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAC,UAAU,GAAG,aAAa,CAAC,UAAU,CAAC,CAAA;IAE9E,KAAY,WAAW,CACrB,UAAU,SAAS;QACjB,MAAM,CAAC,EAAE,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAA;KACxD,GAAG;QACF,MAAM,CAAC,EAAE,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAA;KACxD,IACC,UAAU,SAAS;QACrB,MAAM,EAAE,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAA;KAC3C,GACG,gBAAgB,GAChB,WAAW,CAAA;CAChB"}

package/dist/viem/Account.js

@@ -1,12 +1,16 @@
-import { WebCryptoP256 } from 'ox';
 import * as Address from 'ox/Address';
+import * as Hex from 'ox/Hex';
 import * as P256 from 'ox/P256';
 import * as PublicKey from 'ox/PublicKey';
 import * as Secp256k1 from 'ox/Secp256k1';
 import * as Signature from 'ox/Signature';
 import * as WebAuthnP256 from 'ox/WebAuthnP256';
+import * as WebCryptoP256 from 'ox/WebCryptoP256';
+import { hashAuthorization, hashMessage, hashTypedData, keccak256, parseAccount, } from 'viem/utils';
+import * as KeyAuthorization from '../ox/KeyAuthorization.js';
 import * as SignatureEnvelope from '../ox/SignatureEnvelope.js';
-import * as internal from './internal/account.js';
+import * as Storage from './Storage.js';
+import * as Transaction from './Transaction.js';
 /**
  * Instantiates an Account from a headless WebAuthn credential (P256 private key).
  *
@@ -21,11 +25,11 @@ import * as internal from './internal/account.js';
  * @returns Account.
  */
 export function fromHeadlessWebAuthn(privateKey, options) {
-    const { rpId, origin } = options;
+    const { access, rpId, origin, storage } = options;
     const publicKey = P256.getPublicKey({ privateKey });
-    const address = Address.fromPublicKey(publicKey);
-    return internal.toPrivateKeyAccount({
-        address,
+    return from({
+        access,
+        keyType: 'webAuthn',
         publicKey,
         async sign({ hash }) {
             const { metadata, payload } = WebAuthnP256.getSignPayload({
@@ -46,7 +50,7 @@ export function fromHeadlessWebAuthn(privateKey, options) {
                 type: 'webAuthn',
             });
         },
-        source: 'webAuthn',
+        storage,
     });
 }
 /**
@@ -62,11 +66,12 @@ export function fromHeadlessWebAuthn(privateKey, options) {
  * @param privateKey P256 private key.
  * @returns Account.
  */
-export function fromP256(privateKey) {
+export function fromP256(privateKey, options = {}) {
+    const { access, storage } = options;
     const publicKey = P256.getPublicKey({ privateKey });
-    const address = Address.fromPublicKey(publicKey);
-    return internal.toPrivateKeyAccount({
-        address,
+    return from({
+        access,
+        keyType: 'p256',
         publicKey,
         async sign({ hash }) {
             const signature = P256.sign({ payload: hash, privateKey });
@@ -76,7 +81,7 @@ export function fromP256(privateKey) {
                 type: 'p256',
             });
         },
-        source: 'p256',
+        storage,
     });
 }
 /**
@@ -93,16 +98,19 @@ export function fromP256(privateKey) {
  * @returns Account.
  */
 // TODO: this function will be redundant when Viem migrates to Ox.
-export function fromSecp256k1(privateKey) {
+export function fromSecp256k1(privateKey, options = {}) {
+    const { access, storage } = options;
     const publicKey = Secp256k1.getPublicKey({ privateKey });
-    return internal.toPrivateKeyAccount({
-        address: Address.fromPublicKey(publicKey),
+    return from({
+        access,
+        keyType: 'secp256k1',
         publicKey,
         async sign(parameters) {
             const { hash } = parameters;
             const signature = Secp256k1.sign({ payload: hash, privateKey });
             return Signature.toHex(signature);
         },
+        storage,
     });
 }
 /**
@@ -164,9 +172,10 @@ export function fromSecp256k1(privateKey) {
  */
 export function fromWebAuthnP256(credential, options = {}) {
     const { id } = credential;
+    const { storage } = options;
     const publicKey = PublicKey.fromHex(credential.publicKey);
-    return internal.toPrivateKeyAccount({
-        address: Address.fromPublicKey(publicKey),
+    return from({
+        keyType: 'webAuthn',
         publicKey,
         async sign({ hash }) {
             const { metadata, signature } = await WebAuthnP256.sign({
@@ -181,7 +190,7 @@ export function fromWebAuthnP256(credential, options = {}) {
                 type: 'webAuthn',
             });
         },
-        source: 'webAuthn',
+        storage,
     });
 }
 /**
@@ -200,11 +209,12 @@ export function fromWebAuthnP256(credential, options = {}) {
  * @param keyPair WebCryptoP256 key pair.
  * @returns Account.
  */
-export function fromWebCryptoP256(keyPair) {
+export function fromWebCryptoP256(keyPair, options = {}) {
+    const { access, storage } = options;
     const { publicKey, privateKey } = keyPair;
-    const address = Address.fromPublicKey(publicKey);
-    return internal.toPrivateKeyAccount({
-        address,
+    return from({
+        access,
+        keyType: 'p256',
         publicKey,
         async sign({ hash }) {
             const signature = await WebCryptoP256.sign({ payload: hash, privateKey });
@@ -215,7 +225,151 @@ export function fromWebCryptoP256(keyPair) {
                 type: 'p256',
             });
         },
-        source: 'p256',
+        storage,
     });
 }
+export async function signKeyAuthorization(account, parameters) {
+    const { key, expiry, limits } = parameters;
+    const { accessKeyAddress, keyType: type } = key;
+    const signature = await account.sign({
+        hash: KeyAuthorization.getSignPayload({
+            address: accessKeyAddress,
+            expiry,
+            limits,
+            type,
+        }),
+    });
+    return KeyAuthorization.from({
+        address: accessKeyAddress,
+        expiry,
+        limits,
+        signature: SignatureEnvelope.from(signature),
+        type,
+    });
+}
+/** @internal */
+// biome-ignore lint/correctness/noUnusedVariables: _
+function fromBase(parameters) {
+    const { keyType = 'secp256k1', parentAddress, source = 'privateKey', } = parameters;
+    const address = parentAddress ?? Address.fromPublicKey(parameters.publicKey);
+    const publicKey = PublicKey.toHex(parameters.publicKey, {
+        includePrefix: false,
+    });
+    const storage = Storage.from(parameters.storage ?? Storage.memory(), { key: `tempo.ts:${address.toLowerCase()}` });
+    async function sign({ hash }) {
+        const signature = await parameters.sign({ hash });
+        if (parentAddress)
+            return SignatureEnvelope.serialize(SignatureEnvelope.from({
+                userAddress: parentAddress,
+                inner: SignatureEnvelope.from(signature),
+                type: 'keychain',
+            }));
+        return signature;
+    }
+    return {
+        address: Address.checksum(address),
+        keyType,
+        sign,
+        async signAuthorization(parameters) {
+            const { chainId, nonce } = parameters;
+            const address = parameters.contractAddress ?? parameters.address;
+            const signature = await sign({
+                hash: hashAuthorization({ address, chainId, nonce }),
+            });
+            const envelope = SignatureEnvelope.from(signature);
+            if (envelope.type !== 'secp256k1')
+                throw new Error('Unsupported signature type. Expected `secp256k1` but got `' +
+                    envelope.type +
+                    '`.');
+            const { r, s, yParity } = envelope.signature;
+            return {
+                address,
+                chainId,
+                nonce,
+                r: Hex.fromNumber(r, { size: 32 }),
+                s: Hex.fromNumber(s, { size: 32 }),
+                yParity,
+            };
+        },
+        async signMessage(parameters) {
+            const { message } = parameters;
+            const signature = await sign({ hash: hashMessage(message) });
+            const envelope = SignatureEnvelope.from(signature);
+            return SignatureEnvelope.serialize(envelope);
+        },
+        async signTransaction(transaction, options) {
+            const { serializer = Transaction.serialize } = options ?? {};
+            const keyAuthorization = (await storage?.getItem('pendingKeyAuthorization')) ?? undefined;
+            if (keyAuthorization && !transaction.keyAuthorization) {
+                ;
+                transaction.keyAuthorization = keyAuthorization;
+                await storage.removeItem('pendingKeyAuthorization');
+            }
+            const signature = await sign({
+                hash: keccak256(await serializer(transaction)),
+            });
+            const envelope = SignatureEnvelope.from(signature);
+            return await serializer(transaction, envelope);
+        },
+        async signTypedData(typedData) {
+            const signature = await sign({ hash: hashTypedData(typedData) });
+            const envelope = SignatureEnvelope.from(signature);
+            return SignatureEnvelope.serialize(envelope);
+        },
+        publicKey,
+        source,
+        storage,
+        type: 'local',
+    };
+}
+/** @internal */
+// biome-ignore lint/correctness/noUnusedVariables: _
+function fromRoot(parameters) {
+    const account = fromBase(parameters);
+    return {
+        ...account,
+        source: 'root',
+        async assignKeyAuthorization(keyAuthorization) {
+            account.storage.setItem('pendingKeyAuthorization', keyAuthorization);
+        },
+        async signKeyAuthorization(key, parameters = {}) {
+            const { expiry, limits } = parameters;
+            const { accessKeyAddress, keyType: type } = key;
+            const signature = await account.sign({
+                hash: KeyAuthorization.getSignPayload({
+                    address: accessKeyAddress,
+                    expiry,
+                    limits,
+                    type,
+                }),
+            });
+            const keyAuthorization = KeyAuthorization.from({
+                address: accessKeyAddress,
+                expiry,
+                limits,
+                signature: SignatureEnvelope.from(signature),
+                type,
+            });
+            return keyAuthorization;
+        },
+    };
+}
+// biome-ignore lint/correctness/noUnusedVariables: _
+function fromAccessKey(parameters) {
+    const { access } = parameters;
+    const { address: parentAddress } = parseAccount(access);
+    const account = fromBase({ ...parameters, parentAddress });
+    return {
+        ...account,
+        accessKeyAddress: Address.fromPublicKey(parameters.publicKey),
+        source: 'accessKey',
+    };
+}
+// biome-ignore lint/correctness/noUnusedVariables: _
+function from(parameters) {
+    const { access } = parameters;
+    if (access)
+        return fromAccessKey(parameters);
+    return fromRoot(parameters);
+}
 //# sourceMappingURL=Account.js.map

package/dist/viem/Account.js.map

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

package/dist/viem/Actions/account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../../src/viem/Actions/account.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,MAAM,CAAA;AACpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AAG9E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAGxD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAsB,UAAU,CAAC,KAAK,SAAS,KAAK,GAAG,SAAS,EAC9D,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,EAChC,UAAU,EAAE,UAAU,CAAC,UAAU,GAChC,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,CAwDjC;AAED,MAAM,CAAC,OAAO,WAAW,UAAU,CAAC;IAClC,KAAY,UAAU,GAAG,SAAS,CAAC,oBAAoB,EAAE,SAAS,CAAC,CAAA;IAEnE,KAAY,WAAW,GAAG,oBAAoB,CAAA;CAC/C"}
+{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../../src/viem/Actions/account.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,MAAM,CAAA;AACpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AAG9E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAGxD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAsB,UAAU,CAAC,KAAK,SAAS,KAAK,GAAG,SAAS,EAC9D,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,EAChC,UAAU,EAAE,UAAU,CAAC,UAAU,GAChC,OAAO,CAAC,UAAU,CAAC,WAAW,CAAC,CAsDjC;AAED,MAAM,CAAC,OAAO,WAAW,UAAU,CAAC;IAClC,KAAY,UAAU,GAAG,SAAS,CAAC,oBAAoB,EAAE,SAAS,CAAC,CAAA;IAEnE,KAAY,WAAW,GAAG,oBAAoB,CAAA;CAC/C"}

package/dist/viem/Actions/account.js

@@ -55,9 +55,8 @@ export async function verifyHash(client, parameters) {
     })();
     const [envelope, userAddress] = (() => {
         const envelope = SignatureEnvelope.from(signature);
-        // TODO: add once we have key auth
-        // if (envelope.type === 'keychain')
-        //   return [envelope.inner, envelope.userAddress]
+        if (envelope.type === 'keychain')
+            return [envelope.inner, envelope.userAddress];
         return [envelope, undefined];
     })();
     if (envelope.type === 'p256')
@@ -74,8 +73,8 @@ export async function verifyHash(client, parameters) {
             publicKey: envelope.publicKey,
             signature: envelope.signature,
         });
-    // TODO: add once we have key auth
-    // if (envelope.type === 'keychain') throw new Error('not supported')
+    if (envelope.type === 'keychain')
+        throw new Error('not supported');
     const address = parameters.address ??
         userAddress ??
         Secp256k1.recoverAddress({

package/dist/viem/Actions/account.js.map

@@ -1 +1 @@
-{"version":3,"file":"account.js","sourceRoot":"","sources":["../../../src/viem/Actions/account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAA;AAC9B,OAAO,KAAK,GAAG,MAAM,QAAQ,CAAA;AAC7B,OAAO,KAAK,IAAI,MAAM,SAAS,CAAA;AAC/B,OAAO,KAAK,YAAY,MAAM,iBAAiB,CAAA;AAG/C,OAAO,EAAE,UAAU,IAAI,eAAe,EAAE,MAAM,cAAc,CAAA;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAEtC,OAAO,KAAK,iBAAiB,MAAM,+BAA+B,CAAA;AAElE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,MAAgC,EAChC,UAAiC;IAEjC,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAA;IAE3B,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE;QACtB,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAA;QACtC,IAAI,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC;YAAE,OAAO,SAAS,CAAA;QAC7C,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,GAAG,IAAI,SAAS,IAAI,GAAG,IAAI,SAAS;YACvE,OAAO,iBAAiB,CAAC,SAAS,CAAC;gBACjC,IAAI,EAAE,WAAW;gBACjB,SAAS,EAAE;oBACT,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;oBACtB,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;oBACtB,OAAO,EAAE,SAAS,CAAC,OAAQ;iBAC5B;aACF,CAAC,CAAA;QACJ,OAAO,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;IACjC,CAAC,CAAC,EAAE,CAAA;IAEJ,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE;QACpC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAClD,kCAAkC;QAClC,oCAAoC;QACpC,kDAAkD;QAClD,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;IAC9B,CAAC,CAAC,EAAE,CAAA;IAEJ,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM;QAC1B,OAAO,IAAI,CAAC,MAAM,CAAC;YACjB,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,QAAQ,CAAC,SAAS;YAC7B,SAAS,EAAE,QAAQ,CAAC,SAAS;YAC7B,IAAI,EAAE,QAAQ,CAAC,OAAO;SACvB,CAAC,CAAA;IACJ,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU;QAC9B,OAAO,YAAY,CAAC,MAAM,CAAC;YACzB,SAAS,EAAE,IAAI;YACf,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,SAAS,EAAE,QAAQ,CAAC,SAAS;YAC7B,SAAS,EAAE,QAAQ,CAAC,SAAS;SAC9B,CAAC,CAAA;IACJ,kCAAkC;IAClC,qEAAqE;IAErE,MAAM,OAAO,GACX,UAAU,CAAC,OAAO;QAClB,WAAW;QACX,SAAS,CAAC,cAAc,CAAC;YACvB,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,QAAQ,CAAC,SAAS;SAC9B,CAAC,CAAA;IAEJ,OAAO,MAAM,SAAS,CACpB,MAAM,EACN,eAAe,EACf,YAAY,CACb,CAAC,EAAE,GAAG,UAAU,EAAE,OAAO,EAAW,CAAC,CAAA;AACxC,CAAC"}
+{"version":3,"file":"account.js","sourceRoot":"","sources":["../../../src/viem/Actions/account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAA;AAC9B,OAAO,KAAK,GAAG,MAAM,QAAQ,CAAA;AAC7B,OAAO,KAAK,IAAI,MAAM,SAAS,CAAA;AAC/B,OAAO,KAAK,YAAY,MAAM,iBAAiB,CAAA;AAG/C,OAAO,EAAE,UAAU,IAAI,eAAe,EAAE,MAAM,cAAc,CAAA;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAEtC,OAAO,KAAK,iBAAiB,MAAM,+BAA+B,CAAA;AAElE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,MAAgC,EAChC,UAAiC;IAEjC,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAA;IAE3B,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE;QACtB,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAA;QACtC,IAAI,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC;YAAE,OAAO,SAAS,CAAA;QAC7C,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,GAAG,IAAI,SAAS,IAAI,GAAG,IAAI,SAAS;YACvE,OAAO,iBAAiB,CAAC,SAAS,CAAC;gBACjC,IAAI,EAAE,WAAW;gBACjB,SAAS,EAAE;oBACT,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;oBACtB,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;oBACtB,OAAO,EAAE,SAAS,CAAC,OAAQ;iBAC5B;aACF,CAAC,CAAA;QACJ,OAAO,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;IACjC,CAAC,CAAC,EAAE,CAAA;IAEJ,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE;QACpC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAClD,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU;YAC9B,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAA;QAC/C,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;IAC9B,CAAC,CAAC,EAAE,CAAA;IAEJ,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM;QAC1B,OAAO,IAAI,CAAC,MAAM,CAAC;YACjB,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,QAAQ,CAAC,SAAS;YAC7B,SAAS,EAAE,QAAQ,CAAC,SAAS;YAC7B,IAAI,EAAE,QAAQ,CAAC,OAAO;SACvB,CAAC,CAAA;IACJ,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU;QAC9B,OAAO,YAAY,CAAC,MAAM,CAAC;YACzB,SAAS,EAAE,IAAI;YACf,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,SAAS,EAAE,QAAQ,CAAC,SAAS;YAC7B,SAAS,EAAE,QAAQ,CAAC,SAAS;SAC9B,CAAC,CAAA;IACJ,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU;QAAE,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;IAElE,MAAM,OAAO,GACX,UAAU,CAAC,OAAO;QAClB,WAAW;QACX,SAAS,CAAC,cAAc,CAAC;YACvB,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,QAAQ,CAAC,SAAS;SAC9B,CAAC,CAAA;IAEJ,OAAO,MAAM,SAAS,CACpB,MAAM,EACN,eAAe,EACf,YAAY,CACb,CAAC,EAAE,GAAG,UAAU,EAAE,OAAO,EAAW,CAAC,CAAA;AACxC,CAAC"}