@sidhujag/sysweb3-keyring 2.1.9 → 2.1.11

package/types/ledger/types.d.ts

@@ -37,16 +37,16 @@ export interface IEvmMethods {
         s: string;
         v: string;
     }>;
-    signPersonalMessage: ({ message, accountIndex, }: {
+    signPersonalMessage: (request: {
         accountIndex: number;
         message: string;
         expectedAddress: string;
-    }) => Promise<string>;
-    signTypedData: ({ version, data, accountIndex, }: {
+    }, authority: HardwareTransactionAuthority) => Promise<string>;
+    signTypedData: (request: {
         accountIndex: number;
         data: any;
         expectedAddress: string;
         version: SignTypedDataVersion;
-    }) => Promise<string>;
+    }, authority: HardwareTransactionAuthority) => Promise<string>;
 }
 export {};

package/types/transactions/ethereum.d.ts

@@ -6,6 +6,7 @@ import { CustomJsonRpcProvider } from '../providers';
 import { IResponseFromSendErcSignedTransaction, ISendSignedErc20TransactionProps, ISendSignedErc721TransactionProps, ISendSignedErc1155TransactionProps, IReviewedEvmTokenApproval, IEthereumTransactions, IEvmCancellationOptions, IEvmReplacementOptions, EvmFormattedSendArguments, SimpleTransactionRequest, KeyringAccountType, accountType, IGasParams } from '../types';
 import { type PreparedEvmTransaction } from './evm-envelope';
 import { type CaptureEvmSubmission } from './evm-submission';
+import { type HardwareTransactionAuthority } from '../hardware-transaction-authority';
 import { type EvmDigestSignOptions, type PreparedSoftwareEvmSigningRequest, type PreparedEvmSigningOptions } from './prepared-evm';
 import type { LedgerKeyring } from '../ledger';
 import type { TrezorKeyring } from '../trezor';
@@ -52,7 +53,8 @@ export declare class EthereumTransactions<TLedger extends EthereumLedgerSigner |
     private submitSignedHardwareTransaction;
     get web3Provider(): CustomJsonRpcProvider;
     private ensureProvidersInitialized;
-    signTypedData: (addr: string, typedData: TypedDataV1 | TypedMessage<any>, version: SignTypedDataVersion) => Promise<string>;
+    private captureMessageSigning;
+    signTypedData: (addr: string, typedData: TypedDataV1 | TypedMessage<any>, version: SignTypedDataVersion, authority: HardwareTransactionAuthority) => Promise<string>;
     verifyUtxoAddress: (accountIndex: number, currency: string, slip44: number) => Promise<string | undefined>;
     verifyTypedSignature: (data: TypedDataV1 | TypedMessage<any>, signature: string, version: SignTypedDataVersion) => string;
     signPreparedEvmTransaction(input: PreparedSoftwareEvmSigningRequest, options: PreparedEvmSigningOptions): Readonly<{
@@ -63,7 +65,7 @@ export declare class EthereumTransactions<TLedger extends EthereumLedgerSigner |
         transaction: PreparedEvmTransaction;
     }>;
     ethSign: (params: string[], input: EvmDigestSignOptions) => Promise<string>;
-    signPersonalMessage: (params: string[]) => Promise<string>;
+    signPersonalMessage: (params: string[], authority: HardwareTransactionAuthority) => Promise<string>;
     parsePersonalMessage: (hexMsg: string) => string;
     verifyPersonalMessage: (message: string, sign: string) => string;
     getEncryptedPubKey: () => string;

package/types/transactions/prepared-evm.d.ts

@@ -6,6 +6,7 @@ export type EvmSigningIdentity = Readonly<{
 }>;
 export declare function snapshotEvmSigningIdentity(input: unknown): EvmSigningIdentity;
 export type EvmDigestSignOptions = Readonly<{
+    signal: AbortSignal;
     selectedAccount: EvmSigningIdentity;
     targetAccount: EvmSigningIdentity;
     assertCurrent(): void;

package/types/trezor/connect.d.ts

@@ -2,7 +2,8 @@ import type { HardwareTransactionAuthority } from '../hardware-transaction-autho
 import type { TrezorCalls, TrezorHost, TrezorMethod } from './host-types';
 type Client = TrezorCalls;
 type TransactionMethod = 'ethereumSignTransaction' | 'signTransaction';
-type ForwardedMethod = Exclude<TrezorMethod, TransactionMethod>;
+type SigningMethod = TransactionMethod | 'signMessage' | 'ethereumSignMessage' | 'ethereumSignTypedData';
+type ForwardedMethod = Exclude<TrezorMethod, SigningMethod>;
 type Compatible<T> = T extends {
     success: false;
 } ? T & {
@@ -29,7 +30,15 @@ export type ConnectionEvent = {
     type: 'model';
     model: string;
 };
+export type TrezorSigningSession = {
+    [Name in SigningMethod]: CompatibleCall<Client[Name]>;
+} & {
+    init(): Promise<void>;
+    dispose(): Promise<void>;
+    getFeatures: CompatibleCall<Client['getFeatures']>;
+};
 export type TrezorConnection = Calls & {
+    withOwnedSigning<Result>(authority: HardwareTransactionAuthority, operation: (session: TrezorSigningSession) => Promise<Result>): Promise<Result>;
     ethereumSignTransactionOwned: (request: Parameters<Client['ethereumSignTransaction']>[0], authority: HardwareTransactionAuthority) => ReturnType<CompatibleCall<Client['ethereumSignTransaction']>>;
     signTransactionOwned: (request: Parameters<Client['signTransaction']>[0], authority: HardwareTransactionAuthority) => ReturnType<CompatibleCall<Client['signTransaction']>>;
     init: () => Promise<void>;

package/types/trezor/index.d.ts

@@ -1,8 +1,9 @@
-import { TypedMessage, SignTypedDataVersion, TypedDataV1 } from '@metamask/eth-sig-util';
+import { SignTypedDataVersion } from '@metamask/eth-sig-util';
 import { Psbt } from 'bitcoinjs-lib';
 import { Buffer } from 'buffer';
 import type { HardwareTransactionAuthority } from '../hardware-transaction-authority';
 import type { TrezorConnection } from './connect';
+import type { LedgerTypedData } from '../ledger/host-types';
 import type { AccountInfo, EthereumTransaction, EthereumTransactionEIP1559 } from '@trezor/connect-webextension';
 export interface TrezorControllerState {
     hdPath: string;
@@ -28,6 +29,7 @@ export declare class TrezorKeyring {
      * Initialize Trezor script.
      */
     init(assertCurrent?: () => void): Promise<boolean>;
+    private initSigning;
     /**
      * Execute operation with automatic retry
      */
@@ -144,26 +146,34 @@ export declare class TrezorKeyring {
      * @param index - index of account for path derivation
      * @returns signature object
      */
-    signMessage({ index, message, coin, slip44, address, }: {
+    signMessage(request: {
         address: string;
         coin: string;
-        index?: number;
-        message?: string;
+        index: number;
+        message: string;
         slip44: number;
-    }): Promise<unknown>;
-    private _signUtxoPersonalMessage;
-    private _signEthPersonalMessage;
-    private _sanitizeData;
+    }, authority: HardwareTransactionAuthority): Promise<(import("@trezor/type-utils").Err<import("@trezor/connect-common/lib/constants/errors").SerializedError> & {
+        payload: {
+            error: string;
+            code?: string;
+        };
+    }) | import("@trezor/connect-webextension").OkWithDevice<{
+        address: string;
+        signature: string;
+    }> | {
+        signature: string;
+        success: boolean;
+    }>;
     private _transformTypedData;
     /**
      * EIP-712 Sign Typed Data
      */
-    signTypedData({ version, address, data, index, }: {
+    signTypedData(request: {
         address: string;
-        data: TypedMessage<any> | TypedDataV1;
+        data: LedgerTypedData;
         index: number;
         version: SignTypedDataVersion;
-    }): Promise<string>;
+    }, authority: HardwareTransactionAuthority): Promise<string>;
     /**
      * Verify UTXO address by displaying it on the Trezor device
      * @param accountIndex - The account index

package/types/types.d.ts

@@ -135,7 +135,7 @@ export interface IEthereumTransactions {
     getGasLimit: (toAddress: string) => Promise<number>;
     getGasOracle?: () => Promise<any>;
     getRecommendedNonce: (address: string) => Promise<number>;
-    signTypedData: (addr: string, typedData: TypedDataV1 | TypedMessage<any>, version: SignTypedDataVersion) => Promise<string>;
+    signTypedData: (addr: string, typedData: TypedDataV1 | TypedMessage<any>, version: SignTypedDataVersion, authority: import('./hardware-transaction-authority').HardwareTransactionAuthority) => Promise<string>;
     importAccount: (mnemonicOrPrivKey: string) => EvmLocalAccount;
     parsePersonalMessage: (hexMsg: string) => string;
     sendFormattedTransaction: (...args: EvmFormattedSendArguments) => Promise<TransactionResponse>;
@@ -152,7 +152,7 @@ export interface IEthereumTransactions {
         transaction?: TransactionResponse;
         error?: boolean;
     }>;
-    signPersonalMessage: (params: string[]) => Promise<string>;
+    signPersonalMessage: (params: string[], authority: import('./hardware-transaction-authority').HardwareTransactionAuthority) => Promise<string>;
     verifyTypedSignature: (data: TypedDataV1 | TypedMessage<any>, signature: string, version: SignTypedDataVersion) => string;
     verifyUtxoAddress: (accountIndex: number, currency: string, slip44: number) => Promise<string | undefined>;
     setWeb3Provider: (network: INetwork) => void;