* enhance macro decl_storage()

* update the state root hash

* fix one comment