ext-costs moved to logic config extracted #1417

lexfrl · 2019-10-07T15:01:30Z

The goal is to remove duplication of RuntimeFees in wasm_config and in runtime_config (see testnet.json changes). Would be glad to get ideas on how to make it better..

MaksymZavershynskyi

This change looks logical. What concerns do you have?

MaksymZavershynskyi · 2019-10-21T19:51:28Z

runtime/near-vm-logic/src/config.rs

@@ -1,13 +1,12 @@
 use crate::types::Gas;
-use near_runtime_fees::RuntimeFeesConfig;
 use serde::{Deserialize, Serialize};
 use std::collections::hash_map::DefaultHasher;
 use std::hash::{Hash, Hasher};

 #[derive(Clone, Debug, Hash, Serialize, Deserialize)]
 pub struct Config {


Might want to rename it to WasmConfig to make the code outside this crate easier to read.

VMConfig would be better I think.

MaksymZavershynskyi · 2019-10-21T20:00:11Z

runtime/near-vm-logic/tests/test_registers.rs

@@ -85,8 +91,9 @@ fn test_max_register_memory_limit() {
    let context = get_context(vec![], false);
    let config = Config::free();
    let promise_results = vec![];
+    let fees = RuntimeFeesConfig::default();


Should we have RuntimeFeesConfig::free() here?

lexfrl · 2019-10-23T11:29:22Z

VMLogicBuilder was introduced as well to reduce setup boilerplate in tests.

MaksymZavershynskyi

Lots of reformating, check my comment on rustfmt

MaksymZavershynskyi · 2019-10-23T17:18:41Z

chain/epoch_manager/src/lib.rs

@@ -992,17 +994,7 @@ mod tests {
        epoch_manager
            .record_block_info(
                &h[1],


Could you check whether you have https://github.com/nearprotocol/nearcore/blob/master/rustfmt.toml in ~/.config/rustfmt/ ?

Nope, I don't have ~/.config/rustfmt/ . I've started to use Idea, maybe that's why..

FYI ~/.config/rustfmt/ is independent on IDE, it is just where rustfmt looks for config.

of course. But who knows, maybe idea does more magic. But I checked it, rust fmt really wants to format it! You can check it by running cargo fmt check on staging branch.

* Dont panic for check balance (#1493) * Introduce BalanceMismatch error * Merge branch 'staging' of github.com:nearprotocol/nearcore into dont-panic-for-check-balance * Merge branch 'staging' of github.com:nearprotocol/nearcore into dont-panic-for-check-balance * Merge bug * Merge branch 'staging' into dont-panic-for-check-balance * Merge refs/heads/staging into dont-panic-for-check-balance * Merge refs/heads/staging into dont-panic-for-check-balance * Merge refs/heads/staging into dont-panic-for-check-balance * Merge branch 'staging' of github.com:nearprotocol/nearcore into dont-panic-for-check-balance * Merge branch 'dont-panic-for-check-balance' of github.com:nearprotocol/nearcore into dont-panic-for-check-balance * Merge master into staging (#1511) * Give more money to test.near (#1467) * Give more money to test.near * Bump version * Reset state and bump version (#1499) * Bump version for Borsh (#1502) * Fix boot node in start_testnet.py (#1505) * Reduce total supply and adjust parameters (#1508) * Update dependency to avoid vulnerabilities (#1509) * Update dependency to avoid vulnerabilities * Remove serde_cbor * pytest for remote node (#1437) * gcloud lib and init/start cluster * Merge branch 'staging' into pytest-remote * a few fixes * almost done * a few more fix * Merge branch 'staging' into pytest-remote * more fix * more tests * more fix and tests * Merge branch 'staging' into pytest-remote * Merge branch 'staging' into pytest-remote * Merge refs/heads/staging into pytest-remote * Merge refs/heads/staging into pytest-remote * Merge refs/heads/staging into pytest-remote * Merge refs/heads/staging into pytest-remote * Merge refs/heads/staging into pytest-remote * Merge refs/heads/staging into pytest-remote * Merge refs/heads/staging into pytest-remote * Merge branch 'staging' into pytest-remote * Merge branch 'staging' into pytest-remote * add requirements.txt * a few fixes * remote version of block_production works * Merge branch 'pytest-remote' of github.com:nearprotocol/nearcore into pytest-remote * Merge branch 'staging' into pytest-remote * update requirements.txt * Remove some unnecessary unsafe code (#1512) * Remove some unnecessary unsafe code * Merge refs/heads/staging into remove-unsafe-code * Merge refs/heads/staging into remove-unsafe-code * Chaos Monkey now messes up with network (#1514) * Chaos Monkey now messes up with network * Fixing a typo * Adding missing shell command * Marking `local_network` monkey as existing * Adding one of the new tests that was previously missing * Handle head method for status check (#1513) * fix head status check * Merge branch 'staging' into handle-head-method * Merge refs/heads/staging into handle-head-method * Merge refs/heads/staging into handle-head-method * recover system coredump by Misha for minimize docker image (#1528) * recover system coredump by Misha for minimize docker image * Move rewards to runtime (#1497) * Move validator rewards to runtime * Merge branch 'staging' of github.com:nearprotocol/nearcore into move-rewards-to-runtime * Merge branch 'staging' of github.com:nearprotocol/nearcore into move-rewards-to-runtime * Update runtime/runtime/src/lib.rs Co-Authored-By: Maksym Zavershynskyi <35039879+nearmax@users.noreply.github.com> * Merge branch 'staging' of github.com:nearprotocol/nearcore into move-rewards-to-runtime * Merge branch 'move-rewards-to-runtime' of github.com:nearprotocol/nearcore into move-rewards-to-runtime * Merge branch 'staging' into move-rewards-to-runtime * Merge refs/heads/staging into move-rewards-to-runtime * Fix a dependency (#1527) * Fix a dependency eth-secp256k1 got renamed to parity-secp256k1 * Merge refs/heads/staging into fix_build * update rust-toolchain (#1529) * update rust-toolchain * Fix some warnings (#1530) * Fix some warnings * More warnings * Introduced `chunk` API (#1524) * Introduced `chunk` API * Saving genesis chunks to make consistent output from chunks RPC * Bump near-vm-* to 0.3.1 (#1541) * Nit * Bump to 0.3.1 * Nit * working coredump for docker (#1531) * working coredump for docker * Merge branch 'staging' into docker-coredump * Merge refs/heads/staging into docker-coredump * Update dependencies (#1532) * Update dependencies * Merge master into staging (#1534) * Give more money to test.near (#1467) * Give more money to test.near * Bump version * Reset state and bump version (#1499) * Bump version for Borsh (#1502) * Fix boot node in start_testnet.py (#1505) * Reduce total supply and adjust parameters (#1508) * Remove all warnings (#1516) * Add more bootnodes (#1525) * Genesis csv to Genesis json tool + key generator (#1462) * WIP * Code to read token holders from the file * Minimal code that reads genesis from csv and converts it to json * Tool for generating key pairs * Make csv-parser a runnable binary * Merge * Merge branch 'staging' into genesis-mainnet * Merge * Merge branch 'genesis-mainnet' of https://github.com/nearprotocol/nearcore into genesis-mainnet * Merge branch 'staging' into genesis-mainnet * Merge branch 'staging' into genesis-mainnet * Nit * Merge branch 'genesis-mainnet' of https://github.com/nearprotocol/nearcore into genesis-mainnet * Merge branch 'staging' into genesis-mainnet * Merge refs/heads/staging into genesis-mainnet * Merge refs/heads/staging into genesis-mainnet * Merge refs/heads/staging into genesis-mainnet * Merge refs/heads/staging into genesis-mainnet * Merge refs/heads/staging into genesis-mainnet * Merge refs/heads/staging into genesis-mainnet * Merge refs/heads/staging into genesis-mainnet * Merge refs/heads/staging into genesis-mainnet * Merge refs/heads/staging into genesis-mainnet * Merge refs/heads/staging into genesis-mainnet * Merge refs/heads/staging into genesis-mainnet * Merge refs/heads/staging into genesis-mainnet * Merge refs/heads/staging into genesis-mainnet * Merge refs/heads/staging into genesis-mainnet * Merge refs/heads/staging into genesis-mainnet * Merge refs/heads/staging into genesis-mainnet * Merge refs/heads/staging into genesis-mainnet * Merge refs/heads/staging into genesis-mainnet * Merge refs/heads/staging into genesis-mainnet * Rpc transaction routing (#1544) * Rpc transaction routing * Transaction status routing * Merge branch 'staging' into rpc-tx-routing * Revert changes to runtime * Fix test * A python test for rpc tx forwarding * fix pytest * use SizedCache * Add RequestRouted Address comments * Fix keypair generation problem when directory does not exist (#1556) * Fix some issues related to genesis and running nodes (#1557) * Do not always override bootnodes * Add genesis time to Row * bump rpc polling timeout to 10s * toolchain set to nightly-2019-10-04 (#1539) * Revert profile-overrides syntax after toolchain downgrade (#1558) * Chaos Monkey now restarts nodes (#1554) Two new modes in chaos monkey: - `node_restart` ocasionally restarts one of the nodes that are initially running (but always just one) - `node_set` maintains an extra set of nodes (which are initially shut down), and prediodically restarts them arbitrarily, ocasionally also wiping out their data folders. * fix a few queries which was work for only one node by aggregate (#1563) * fix a few queries which was work for only one node by aggregate * Merge branch 'staging' into fix-dashboard * Cargo bug workaround (#1564) * Remove mock feature * Bump versions * Script to publish runtime packages * Merge branch 'staging' into wasm32_fix * Fix bad test in near-vm-logic (#1565) * Fix bad test in near-vm-logic * Merge refs/heads/staging into bad_test * adding genesis tools for stakewars into dockerfile (#1567) * adding genesis tools for stakewars into dockerfile * Merge branch 'staging' into genesis-tool-docker * Merge refs/heads/staging into genesis-tool-docker * Fix unused return values in serialization (#1568) * Fix unused return values in serialization * Merge refs/heads/staging into bad_borsh * Update borsh to 0.2.9 (#1566) * Update borsh to 0.2.9 * Merge refs/heads/staging into update_borsh * Merge refs/heads/staging into update_borsh * Merge refs/heads/staging into update_borsh * Merge refs/heads/staging into update_borsh * update bootnode ip (#1569) * update bootnode ip * Merge branch 'staging' into update-bootnode * Merge refs/heads/staging into update-bootnode * Fix chunk producer kickout (#1571) * Fix chunk producer kickout * fix genesis * fix initialization * Script to start nodes for stakewars (#1572) * Scripts to start nodes for stakewars * change chain-id * fix quotes * do not override if genesis already exists * ext-costs moved to logic config extracted (#1417) * gas_counter moved to mod * instrumented runtime with gas counter * hash256 per-byte gas counting added * block_timestamp test added and fix tests * fix genesis config * ext-costs moved to logic config extracted * rename Config -> VMConfig * #49: cargo fmt all & add CI check (#1574) * Fix typo: Secp2561KSignature -> Secp256K1Signature (#1518) * do not remove docker build to avoid sudo (#1583) * do not remove docker build to avoid sudo * Improve genesis tools (#1562) * Improve genesis tools * Merge refs/heads/staging into improve-genesis-tools * Merge refs/heads/staging into improve-genesis-tools * Merge refs/heads/staging into improve-genesis-tools * Merge refs/heads/staging into improve-genesis-tools * Merge refs/heads/staging into improve-genesis-tools * extract verification code * Merge branch 'staging' into improve-genesis-tools * Merge branch 'staging' into improve-genesis-tools * Merge refs/heads/staging into improve-genesis-tools * Code ownership for genesis tools (#1584) * Code ownership for genesis tools * Merge branch 'staging' into genesis-ownerhsip * Disable ban for abusing peers. (#1585) * Add option to generate signer keys to file (#1587)

lexfrl added 6 commits October 2, 2019 14:34

gas_counter moved to mod

076ebac

instrumented runtime with gas counter

285df5e

hash256 per-byte gas counting added

a3b995d

block_timestamp test added and fix tests

e714fec

fix genesis config

9597233

ext-costs moved to logic config extracted

9b843d3

weekly-digest bot mentioned this pull request Oct 11, 2019

Weekly Digest (4 October, 2019 - 11 October, 2019) #1445

Closed

lexfrl requested a review from MaksymZavershynskyi October 21, 2019 08:56

MaksymZavershynskyi reviewed Oct 21, 2019

View reviewed changes

merge staging and VMLogicBuilder added

a1afe56

lexfrl changed the base branch from fckt/ext-costs to staging October 22, 2019 17:36

lexfrl marked this pull request as ready for review October 22, 2019 17:37

lexfrl requested review from evgenykuzyakov, ilblackdragon and SkidanovAlex as code owners October 22, 2019 17:37

lexfrl force-pushed the fckt/configs-refactoring branch 3 times, most recently from 49d9127 to 0edade4 Compare October 22, 2019 20:48

rename Config -> VMConfig

590ddee

lexfrl force-pushed the fckt/configs-refactoring branch from 0edade4 to 590ddee Compare October 23, 2019 09:30

merge staging

a473783

lexfrl requested a review from MaksymZavershynskyi October 23, 2019 11:27

MaksymZavershynskyi suggested changes Oct 23, 2019

View reviewed changes

MaksymZavershynskyi approved these changes Oct 25, 2019

View reviewed changes

Merge branch 'staging' into fckt/configs-refactoring

a5bcd72

lexfrl force-pushed the fckt/configs-refactoring branch 3 times, most recently from bd6717d to af1c002 Compare October 26, 2019 12:03

Merge branch 'staging' into fckt/configs-refactoring

09cb620

lexfrl force-pushed the fckt/configs-refactoring branch from af1c002 to 09cb620 Compare October 28, 2019 09:42

Merge branch 'staging' into fckt/configs-refactoring

11bc1f6

lexfrl force-pushed the fckt/configs-refactoring branch from 551df73 to 11bc1f6 Compare October 28, 2019 12:57

lexfrl merged commit 6a00875 into staging Oct 28, 2019

ilblackdragon deleted the fckt/configs-refactoring branch April 16, 2020 08:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ext-costs moved to logic config extracted #1417

ext-costs moved to logic config extracted #1417

lexfrl commented Oct 7, 2019

MaksymZavershynskyi left a comment

MaksymZavershynskyi Oct 21, 2019

lexfrl Oct 22, 2019

MaksymZavershynskyi Oct 21, 2019

lexfrl commented Oct 23, 2019

MaksymZavershynskyi left a comment

MaksymZavershynskyi Oct 23, 2019

lexfrl Oct 24, 2019

MaksymZavershynskyi Oct 24, 2019

lexfrl Oct 24, 2019

ext-costs moved to logic config extracted #1417

ext-costs moved to logic config extracted #1417

Conversation

lexfrl commented Oct 7, 2019

MaksymZavershynskyi left a comment

Choose a reason for hiding this comment

MaksymZavershynskyi Oct 21, 2019

Choose a reason for hiding this comment

lexfrl Oct 22, 2019

Choose a reason for hiding this comment

MaksymZavershynskyi Oct 21, 2019

Choose a reason for hiding this comment

lexfrl commented Oct 23, 2019

MaksymZavershynskyi left a comment

Choose a reason for hiding this comment

MaksymZavershynskyi Oct 23, 2019

Choose a reason for hiding this comment

lexfrl Oct 24, 2019

Choose a reason for hiding this comment

MaksymZavershynskyi Oct 24, 2019

Choose a reason for hiding this comment

lexfrl Oct 24, 2019

Choose a reason for hiding this comment