Only tidy ups

src/chains/ethereum/ethereum/src/data-managers/block-manager.ts

@@ -228,11 +228,10 @@ export default class BlockManager extends Manager<Block> {
         ]);
         if (json) {
           const number = BigInt(json.number);
-          const timestamp = BigInt(json.timestamp);
           if (number <= fallback.blockNumber.toBigInt()) {
             const common = fallback.getCommonForBlock(this.#common, {
               number,
-              timestamp
+              timestamp: BigInt(json.timestamp)
             });
             return new Block(BlockManager.rawFromJSON(json, common), common);
           }

src/chains/ethereum/ethereum/src/forking/cache.ts

@@ -9,16 +9,10 @@ export class ForkCache extends Cache {
      * Looks up address in underlying trie.
      * @param address - Address of account
      */
-    const lookupAccount: (
-      address: Address
-    ) => Promise<Account | undefined> = async (address: Address) => {
+    const lookupAccount = async (address: Address) => {
       const rlp = await (trie as ForkTrie).get(address.buf);
-      return rlp ? Account.fromRlpSerializedAccount(rlp) : undefined;
-    };
-    super({
-      getCb: lookupAccount,
-      putCb: trie.put.bind(trie),
-      deleteCb: trie.del.bind(trie)
-    });
+      return rlp ? Account.fromRlpSerializedAccount(rlp) : new Account();
+    }
+    super({ getCb: lookupAccount, putCb: trie.put.bind(trie), deleteCb: trie.del.bind(trie) });
   }
 }

src/chains/ethereum/ethereum/src/forking/fork.ts

@@ -294,17 +294,12 @@ export class Fork {
             const hfTimestamp = BigInt(hf.timestamp);
             if (block.timestamp >= hfTimestamp) {
               hardfork = hf.name;
-            } else {
-              break;
-            }
-          } else if (hf.block) {
-            if (block.number >= BigInt(hf.block)) {
-              hardfork = hf.name;
-            } else {
-              break;
             }
+          } else if (hf.block && block.number >= BigInt(hf.block)) {
+            hardfork = hf.name;
           }
         }
+
         forkCommon = new Common({ chain: this.chainId, hardfork });
       } else {
         // we don't know about this chain or hardfork, so just carry on per usual,

src/chains/ethereum/transaction/src/transaction-serialization.ts

@@ -32,14 +32,16 @@ export function serializeRpcForDb(
   return serializeForDb(txData, blockHash, blockNumber, transactionIndex);
 }
 
+type SerializableTransaction = {
+  raw: TypedRawTransaction;
+  from: Address;
+  hash: Data;
+  effectiveGasPrice: Quantity;
+  type: Quantity;
+};
+
 export function serializeForDb(
-  tx: {
-    raw: TypedRawTransaction;
-    from: Address;
-    hash: Data;
-    effectiveGasPrice: Quantity;
-    type: Quantity;
-  },
+  tx: SerializableTransaction,
   blockHash: Data,
   blockNumber: Quantity,
   transactionIndex: Quantity
@@ -61,6 +63,7 @@ export function serializeForDb(
       tx.effectiveGasPrice.toBuffer()
     ]
   ];
+
   return encode(txAndExtraData);
 }