Use correct prefix needed by child trie in contract (#2292)

* resolve child trie usage

* update locks

* increase version

* fix test

* Revert "update locks"

This reverts commit 6f537458.