♻️ Start updating baseState

evmts · Nov 3, 2024 · 0147584 · 0147584
1 parent b451111
commit 0147584
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/packages/state/src/createBaseState.js b/packages/state/src/createBaseState.js
@@ -65,14 +65,14 @@ export const createBaseState = (options) => {
 	}
 	const genesisPromise = (
 		options.genesisState !== undefined && options.currentStateRoot === undefined
-			? generateCanonicalGenesis(state)(options.genesisState)
+			? (generateCanonicalGenesis?.(state)?.(options.genesisState) ?? Promise.resolve())
 			: Promise.resolve().then(() => {
-					if (options.currentStateRoot) {
-						state.setCurrentStateRoot(options.currentStateRoot)
-						return generateCanonicalGenesis(state)(options.genesisState ?? stateRoots.get(options.currentStateRoot))
-					}
-					return Promise.resolve()
-				})
+				if (options.currentStateRoot) {
+					state.setCurrentStateRoot(options.currentStateRoot)
+					return generateCanonicalGenesis?.(state)?.(options.genesisState ?? stateRoots.get(options.currentStateRoot)) ?? Promise.resolve()
+				}
+				return Promise.resolve()
+			})
 	).then(async () => {
 		await checkpoint(state)()
 		await commit(state)()