chore: up

iosh · Oct 27, 2024 · 60488b8 · 60488b8
1 parent f88cbe4
commit 60488b8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/src/actions/wallet/signTransaction.ts b/src/actions/wallet/signTransaction.ts
@@ -31,9 +31,9 @@ import {
   type AssertRequestErrorType,
   assertRequest,
 } from '../../utils/transaction/assertRequest.js'
+import type { GetTransactionType } from '../../utils/transaction/getTransactionType.js'
 import { type GetChainIdErrorType, getChainId } from '../public/getChainId.js'
-
-type SignTransactionRequest<
+export type SignTransactionRequest<
   chain extends Chain | undefined = Chain | undefined,
 > = UnionOmit<FormattedTransactionRequest<chain>, 'from'>
 
@@ -42,7 +42,10 @@ export type SignTransactionParameters<
   account extends Account | undefined,
   request extends SignTransactionRequest<chain> = SignTransactionRequest<chain>,
 > = request & GetAccountParameter<account> & GetChainParameter<chain>
-export type SignTransactionReturnType = TransactionSerialized
+
+export type SignTransactionReturnType<
+  request extends SignTransactionRequest = SignTransactionRequest,
+> = TransactionSerialized<GetTransactionType<request>>
 
 export type SignTransactionErrorType =
   | ParseAccountErrorType
@@ -61,7 +64,7 @@ export async function signTransaction<
 >(
   client: Client<Transport, chain, account>,
   parameters: SignTransactionParameters<chain, account, request>,
-): Promise<SignTransactionReturnType> {
+): Promise<SignTransactionReturnType<request>> {
   const {
     account: account_ = client.account,
     chain = client.chain,
@@ -97,7 +100,7 @@ export async function signTransaction<
         chainId,
       } as TransactionSerializable,
       { serializer: client.chain?.serializers?.transaction },
-    ) as Promise<SignTransactionReturnType>
+    ) as Promise<SignTransactionReturnType<request>>
   }
 
   return await client.request(

diff --git a/src/clients/decorators/wallet.ts b/src/clients/decorators/wallet.ts
@@ -60,6 +60,7 @@ import {
 
 import {
   type SignTransactionParameters,
+  type SignTransactionRequest,
   type SignTransactionReturnType,
   signTransaction,
 } from '../../actions/wallet/signTransaction.js'
@@ -135,9 +136,12 @@ export type WalletActions<
   signMessage: (
     args: SignMessageParameters<TAccount>,
   ) => Promise<SignMessageReturnType>
-  signTransaction: (
-    args: SignTransactionParameters<TChain, TAccount>,
-  ) => Promise<SignTransactionReturnType>
+  signTransaction: <
+    const request extends
+      SignTransactionRequest<TChain> = SignTransactionRequest<TChain>,
+  >(
+    args: SignTransactionParameters<TChain, TAccount, request>,
+  ) => Promise<SignTransactionReturnType<request>>
   signTypedData: <
     const TTypedData extends TypedData | { [key: string]: unknown },
     TPrimaryType extends string,

diff --git a/src/utils/abi/decodeEventLog.ts b/src/utils/abi/decodeEventLog.ts
@@ -120,11 +120,15 @@ export function decodeEventLog<
   const [signature, ...argTopics] = topics
   if (!signature) throw new AbiEventSignatureEmptyTopicsError({ docsPath })
 
-  const abiItem = abi.find(
-    (x) =>
-      x.type === 'event' &&
-      signature === toEventSelector(formatAbiItem(x) as EventDefinition),
-  )
+  const abiItem = (() => {
+    if (abi.length === 1) return abi[0]
+    return abi.find(
+      (x) =>
+        x.type === 'event' &&
+        signature === toEventSelector(formatAbiItem(x) as EventDefinition),
+    )
+  })()
+
   if (!(abiItem && 'name' in abiItem) || abiItem.type !== 'event')
     throw new AbiEventSignatureNotFoundError(signature, { docsPath })