fix: types

src/chains/celo/types.ts

@@ -111,7 +111,7 @@ export type CeloTransactionRequest =
 export type CeloTransactionSerializable =
   | TransactionSerializableCIP42
   | TransactionSerializableCIP64
-  | TransactionSerializable
+  | CeloTransactionSerializableBase
 
 export type CeloTransactionSerialized<
   TType extends CeloTransactionType = 'legacy',
@@ -247,9 +247,17 @@ export type TransactionSerializableCIP64<
   FeeValuesEIP1559<TQuantity> & {
     accessList?: AccessList
     feeCurrency?: Address
+    gatewayFee?: undefined
+    gatewayFeeRecipient?: undefined
     chainId: number
     type?: 'cip64'
   }
 
+export type CeloTransactionSerializableBase = TransactionSerializable & {
+  feeCurrency?: undefined
+  gatewayFee?: undefined
+  gatewayFeeRecipient?: undefined
+}
+
 export type TransactionSerializedCIP42 = `0x7c${string}`
 export type TransactionSerializedCIP64 = `0x7b${string}`

src/chains/celo/utils.ts

@@ -45,37 +45,31 @@ export function isEIP1559(
 export function isCIP42(
   transaction: CeloTransactionSerializable | CeloTransactionRequest,
 ): transaction is TransactionSerializableCIP42 {
-  const tx = transaction as TransactionSerializableCIP42
-
   // Enable end-user to force the tx to be considered as a cip42
-  if (tx.type === 'cip42') {
+  if (transaction.type === 'cip42') {
     return true
   }
 
   return (
     isEIP1559(transaction) &&
-    (isPresent(tx.feeCurrency) ||
-      isPresent(tx.gatewayFeeRecipient) ||
-      isPresent(tx.gatewayFee))
+    (isPresent(transaction.feeCurrency) ||
+      isPresent(transaction.gatewayFeeRecipient) ||
+      isPresent(transaction.gatewayFee))
   )
 }
 
 export function isCIP64(
   transaction: CeloTransactionSerializable | CeloTransactionRequest,
 ): transaction is TransactionSerializableCIP64 {
-  const tx = transaction as TransactionSerializableCIP64
-
   // Enable end-user to force the tx to be considered as a cip64
-  if (tx.type === 'cip64') {
+  if (transaction.type === 'cip64') {
     return true
   }
 
   return (
     isEIP1559(transaction) &&
-    isPresent(tx.feeCurrency) &&
-    // @ts-expect-error Property 'gatewayFee' does not exist on type 'TransactionSerializableCIP64'
-    isEmpty(tx.gatewayFee) &&
-    // @ts-expect-error Property 'gatewayFeeRecipient' does not exist on type 'TransactionSerializableCIP64'
-    isEmpty(tx.gatewayFeeRecipient)
+    isPresent(transaction.feeCurrency) &&
+    isEmpty(transaction.gatewayFee) &&
+    isEmpty(transaction.gatewayFeeRecipient)
   )
 }