fix(runtime): trie viewer view contract code and call function by pugachAG · Pull Request #15437 · near/nearcore

pugachAG · 2026-03-23T13:03:42Z

Fix view_account_contract_code (ViewCode RPC): was using AccountContractAccessExt::code which reads raw bytes from the trie, returning the magic bytes blob instead of actual wallet contract WASM for legacy ETH implicit accounts. Now uses RuntimeContractIdentifier::resolve() which correctly handles all contract types: local contracts, global contracts (by hash and by account id), and legacy ETH wallet contracts.
Fix call_function (view function calls): was using hardcoded PROTOCOL_VERSION to resolve the runtime config instead of view_state.current_protocol_version, which could return incorrect config for the actual protocol version of the block being queried.
Store RuntimeConfigStore on TrieViewer and pass it via new() instead of creating a new one on every call. Make max_gas_burnt_view an Option<Gas> that resolves from the runtime config for the current protocol version when not explicitly set.
Remove now-unused AccountContractAccessExt trait.

codecov · 2026-03-23T13:10:50Z

Codecov Report

❌ Patch coverage is 77.17391% with 21 lines in your changes missing coverage. Please review.
✅ Project coverage is 69.09%. Comparing base (d071938) to head (a8e652a).
⚠️ Report is 1 commits behind head on master.

Files with missing lines	Patch %	Lines
chain/chain/src/runtime/mod.rs	73.52%	5 Missing and 4 partials ⚠️
tools/state-viewer/src/commands.rs	0.00%	7 Missing ⚠️
runtime/runtime/src/state_viewer/mod.rs	88.88%	2 Missing and 3 partials ⚠️

Additional details and impacted files

@@           Coverage Diff           @@
##           master   #15437   +/-   ##
=======================================
  Coverage   69.09%   69.09%           
=======================================
  Files         936      936           
  Lines      210309   210355   +46     
  Branches   210309   210355   +46     
=======================================
+ Hits       145314   145355   +41     
- Misses      58991    58997    +6     
+ Partials     6004     6003    -1

Flag	Coverage Δ
pytests-nightly	`1.16% <0.00%> (-0.01%)`	⬇️
unittests	`68.44% <77.17%> (+<0.01%)`	⬆️
unittests-nightly	`68.62% <77.17%> (+<0.01%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

…code The ViewCode RPC query used AccountContractAccessExt::code which reads raw bytes from the trie. This returned incorrect results for legacy ETH implicit accounts (magic bytes blob instead of actual wallet contract WASM) and didn't handle all global contract edge cases. Replace with RuntimeContractIdentifier::resolve() which already handles all contract resolution cases correctly. Store chain_id and RuntimeConfigStore on TrieViewer to support the resolution. Also simplify call_function to reuse these stored fields. Co-Authored-By: Claude Opus 4.6 <[email protected]>

Copilot

Pull request overview

This PR updates the runtime trie viewer to correctly resolve and return executable contract code for all contract types (including legacy ETH implicit wallet accounts and global contracts), and fixes view-function execution to use the runtime config for the queried block’s protocol version.

Changes:

Reworks view_account_contract_code to use RuntimeContractIdentifier::resolve() instead of reading raw trie bytes, fixing legacy ETH implicit wallet code resolution.
Fixes call_function to use view_state.current_protocol_version when selecting runtime config, and caches RuntimeConfigStore on TrieViewer.
Removes the now-unused AccountContractAccessExt helper trait.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
runtime/runtime/src/state_viewer/mod.rs	Correct contract code resolution + protocol-version-aware view gas selection; stores `RuntimeConfigStore` on `TrieViewer`.
runtime/runtime/src/contract_code.rs	Removes `AccountContractAccessExt` (no longer needed with identifier-based resolution).
integration-tests/src/user/runtime_user.rs	Updates `RuntimeUser` to call new `view_account_contract_code` signature (adds protocol version + chain id args).
integration-tests/src/tests/runtime/state_viewer.rs	Updates `TrieViewer::new` call sites to pass a `RuntimeConfigStore`.
chain/chain/src/runtime/mod.rs	Constructs `TrieViewer` with a shared `RuntimeConfigStore`; updates ViewCode path to call new viewer API (but currently passes `PROTOCOL_VERSION`).

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-24T09:45:39Z

+    fn max_gas_burnt_view(&self, protocol_version: ProtocolVersion) -> Gas {
+        self.max_gas_burnt_view.unwrap_or_else(|| {
+            self.runtime_config_store
+                .get_config(protocol_version)
+                .wasm_config
+                .limit_config
+                .max_gas_burnt
+        })


The struct field max_gas_burnt_view and the helper method max_gas_burnt_view(&self, ...) share the same name. This is easy to misread and may trigger clippy::same_name_method depending on the lint set used in CI. Consider renaming the method to something like resolved_max_gas_burnt_view (or renaming the field) to avoid ambiguity.

wacban

LGTM, but see comment about protocol version

wacban · 2026-03-24T09:48:24Z

+        self.trie_viewer.view_account_contract_code(
+            &state_update,
+            account_id,
+            PROTOCOL_VERSION,


this seems wrong, why not use the protocol version matching the state root?

yes, missed that, fixing now

Co-Authored-By: Claude Opus 4.6 <[email protected]>

- Fix `view_account_contract_code` (ViewCode RPC): was using `AccountContractAccessExt::code` which reads raw bytes from the trie, returning the magic bytes blob instead of actual wallet contract WASM for legacy ETH implicit accounts. Now uses `RuntimeContractIdentifier::resolve()` which correctly handles all contract types: local contracts, global contracts (by hash and by account id), and legacy ETH wallet contracts. - Fix `call_function` (view function calls): was using hardcoded `PROTOCOL_VERSION` to resolve the runtime config instead of `view_state.current_protocol_version`, which could return incorrect config for the actual protocol version of the block being queried. - Store `RuntimeConfigStore` on `TrieViewer` and pass it via `new()` instead of creating a new one on every call. Make `max_gas_burnt_view` an `Option<Gas>` that resolves from the runtime config for the current protocol version when not explicitly set. - Remove now-unused `AccountContractAccessExt` trait. --------- Co-authored-by: Claude Opus 4.6 <[email protected]>

…ract test - Extend test_eth_implicit_global_contract_mainnet_upgrade to verify ViewCode and CallFunction (get_nonce) RPC queries before and after the PV 82 -> 83 protocol upgrade, covering the code paths fixed in #15437. - At PV 82: verify ViewCode returns the legacy localnet wallet contract WASM and get_nonce returns 0. - At PV 83: verify ViewCode returns the deployed global contract WASM for both old (magic-bytes) and new ETH implicit accounts, get_nonce returns 0 before and 1 after rlp_execute. - Refactor NodeRunner::run_jsonrpc_query into run_with_jsonrpc_client (generic, takes closure) and a new run_jsonrpc_query that directly accepts RpcQueryRequest, simplifying all query call sites. Co-Authored-By: Claude Opus 4.6 <[email protected]>

…ract test (#15446) Extend `test_eth_implicit_global_contract_mainnet_upgrade` to verify ViewCode and CallFunction (`get_nonce`) RPC queries before and after the PV 82 -> 83 protocol upgrade, covering the code paths fixed in #15437. - At PV 82: verify ViewCode returns the legacy localnet wallet contract WASM and `get_nonce` returns 0. - At PV 83: verify ViewCode returns the deployed global contract WASM for both old (magic-bytes) and new ETH implicit accounts, `get_nonce` returns 0 before and 1 after `rlp_execute`. - Refactor `NodeRunner::run_jsonrpc_query` into `run_with_jsonrpc_client` (generic, takes closure) and a new `run_jsonrpc_query` that directly accepts `RpcQueryRequest`, simplifying all query call sites. Co-authored-by: Claude Opus 4.6 <[email protected]>

pugachAG force-pushed the fix-view-account-contract-code branch from 0d92ea6 to 7f0573c Compare March 23, 2026 22:00

pugachAG changed the base branch from master to fix-record-contract-call March 23, 2026 22:00

pugachAG force-pushed the fix-view-account-contract-code branch 2 times, most recently from 93014d7 to aa1a154 Compare March 23, 2026 22:30

Base automatically changed from fix-record-contract-call to master March 23, 2026 22:30

pugachAG force-pushed the fix-view-account-contract-code branch 2 times, most recently from 8a69c21 to 34f5f40 Compare March 24, 2026 09:35

pugachAG changed the title ~~fix(runtime): use RuntimeContractIdentifier in view_account_contract_code~~ fix(runtime): fix view_account_contract_code and call_function in TrieViewer Mar 24, 2026

pugachAG changed the title ~~fix(runtime): fix view_account_contract_code and call_function in TrieViewer~~ fix(runtime): TrieViewer view contract code and call function Mar 24, 2026

pugachAG requested a review from wacban March 24, 2026 09:38

pugachAG changed the title ~~fix(runtime): TrieViewer view contract code and call function~~ fix(runtime): trie viewer view contract code and call function Mar 24, 2026

pugachAG force-pushed the fix-view-account-contract-code branch from 34f5f40 to c89f56e Compare March 24, 2026 09:39

pugachAG marked this pull request as ready for review March 24, 2026 09:39

pugachAG requested a review from a team as a code owner March 24, 2026 09:39

Copilot AI review requested due to automatic review settings March 24, 2026 09:40

Copilot started reviewing on behalf of pugachAG March 24, 2026 09:40 View session

Copilot AI reviewed Mar 24, 2026

View reviewed changes

wacban approved these changes Mar 24, 2026

View reviewed changes

refactor(runtime): use protocol version from epoch in view queries

a8e652a

Co-Authored-By: Claude Opus 4.6 <[email protected]>

pugachAG enabled auto-merge March 24, 2026 10:14

pugachAG added this pull request to the merge queue Mar 24, 2026

Merged via the queue into master with commit 9700906 Mar 24, 2026
32 checks passed

pugachAG deleted the fix-view-account-contract-code branch March 24, 2026 10:43

pugachAG mentioned this pull request Mar 24, 2026

test(runtime): verify view contract calls in eth implicit global contract test #15446

Merged

VanBarbascu mentioned this pull request Apr 15, 2026

Release tracker: 2.11.1 #15582

Open

25 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix(runtime): trie viewer view contract code and call function#15437

fix(runtime): trie viewer view contract code and call function#15437
pugachAG merged 2 commits into
masterfrom
fix-view-account-contract-code

pugachAG commented Mar 23, 2026 •

edited

Loading

Uh oh!

codecov Bot commented Mar 23, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Copilot AI Mar 24, 2026

Uh oh!

Uh oh!

wacban left a comment

Uh oh!

wacban Mar 24, 2026

Uh oh!

pugachAG Mar 24, 2026

Uh oh!

pugachAG Mar 24, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

pugachAG commented Mar 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov Bot commented Mar 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Copilot AI Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

wacban left a comment

Choose a reason for hiding this comment

Uh oh!

wacban Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

pugachAG Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

pugachAG Mar 24, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

pugachAG commented Mar 23, 2026 •

edited

Loading

codecov Bot commented Mar 23, 2026 •

edited

Loading