state, worldstate, fixing block & trie so it's now in sync with c++ codebase