This repository has been archived by the owner on Jul 4, 2022. It is now read-only.
Chore/bt 127 merge substrate #70
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Export GRANDPA AuthorityPair when full_crypto is enabled (#4872) * Export crypto_full feature in primitives/finality-grandpa * Export GRANDPA AuthorityPair when full_crypto is enabled * Create Benchmarking Setup for Identity Pallet #4695 (#4818) * Starting * closer * Compiles! * comments * Create seperate mock * Remove changes to test env * Fix step calculation * Add host function * Add runtime api * compiles * Update to use offchain timestamp * Gives a result * added some CLI wip * make generic * Update instance * Remove CLI stuff * Remove last cli stuff * undo more changes * Update benchmarks * Update Cargo.lock * remove test * Move loop out of runtime * Benchmarking externalities * Benchmarking state * Implemented commit * Make CLI work, move loop back into runtime * Wipe resets to genesis * Speedup benchmarks * Use enum to select extrinsic within pallet * CLI controls which module and extrinsic to call * Select a pallet with cli * Add steps and repeats to cli * Output as CSV format * Introduce benchmark pallet * Append bench * Use Results * fix merge * Clear Identity benchmark * Bench request judgment and cancel request * Add final benchmarks * Fix CSV output * Start cleaning up for PR * Bump numbers in `wasmtime` integration tests. * More docs * Add rockdb feature to bench * Fix formatting issues * Add test feature to bench * Add test feature to bench * Add rocksdb feature flag * Update bench.rs Co-authored-by: Arkadiy Paronyan <[email protected]> Co-authored-by: Gavin Wood <[email protected]> * Fix vesting logic (#4864) * Fix vesting logic * Bump runtime version * Docs. * Update trie-db to the latest (#4874) * Fix timer panics in the wasm light client (#4561) * Make WASM browser thing compile * Fix * updated exit-future (github repo) * Switch to broadcast crate * Migrate client/cli * Switch exit-future to modernize branch * Small changes * Switch to cargo version and fix fg tests * fix basic-authorship * Fix crash on grafana macro * Fix grafana macro * Switch node python version * Disable record_metrics_slice in grafana macro on wasm * Update client/grafana-data-source/src/lib.rs * Revert "Update client/grafana-data-source/src/lib.rs" This reverts commit 888009a8e0b7051bd4bfbbfdb0448bcf2e2aae93. * Add wasm support for state machine * Switch to my own libp2p version * Revert "Switch to my own libp2p version" This reverts commit ce613871b59264b3165b45c37943e6560240daa7. * Revert "Add wasm support for state machine" This reverts commit de7eaa0694d9534fc3b164621737968e9a6a7c5f. * Add sc-browser * Squash * remove sc-browser * Fix keystore on wasm * stubs for removed functions to make env compatible with old runtimes * Add test (that doesn't work) * Fix build scripts * Revert basic-authorship due to no panics * Revert cli/informant * Revert consensus * revert offchain * Update utils/browser/Cargo.toml Co-Authored-By: Benjamin Kampmann <[email protected]> * export console functions * Add new chainspec * Fix ws in chain spec * revert chainspec * Fix chainspec * Use an Option<PathBuf> in keystore instead of cfg flags * Remove crud * Only use wasm-timer for instant and systemtime * Remove telemetry changes * Assuming this is ok * Add a KeystoreConfig * Add stubs back in * Update libp2p * Revert "Add stubs back in" This reverts commit 4690cf1882aa0f99f7f00a58c4080c8aa9b77c36. * Remove commented js again * Bump kvdb-web version * Fix cli * Switch branch on futures-timer * Fix tests * Remove sc-client test build in check-web-wasm because there isn't a good way to build futures-timer with wasm-bindgen support in the build * Remove more things ^^ * Switch branch on futures-timer back * Put DB io stats behind a cfg flag * Fix things * Don't timeout transports on wasm * Update branch of futures-timer and fix bad merge * Spawn informant * Fix network test * Fix delay resets * Changes * Fix tests * use wasm_timer for transaction pool * Fixes * Switch futures-timer to crates * Only diagnose futures on native * Fix sc-network-test tests * Select log level in js * Fix syncing ;^) * Allow disabling colours in the informant * Use OutputFormat enum for informant * MallocSizeOf impl on transaction pool broke stuff because wasm_timer::Instant doesnt impl it so just revert the transaction pool to master * Update futures-diagnose * Revert "MallocSizeOf impl on transaction pool broke stuff because wasm_timer::Instant doesnt impl it so just revert the transaction pool to master" This reverts commit baa4ffc94fd968b6660a2c17ba8113e06af15548. * Pass whole chain spec in start_client * Get Instant::now to work in transaction pool again * Informant dep reordering Co-authored-by: Pierre Krieger <[email protected]> Co-authored-by: Bastian Köcher <[email protected]> Co-authored-by: Svyatoslav Nikolsky <[email protected]> Co-authored-by: Benjamin Kampmann <[email protected]> Co-authored-by: Demi Obenour <[email protected]> * Don't expose `Benchmarking` host functions by default (#4875) * Don't expose `Benchmarking` host functions by default * Fix tests Co-authored-by: Shawn Tabrizi <[email protected]> * Add trace on import block. (#4871) * Refactor and document allocator (#4855) * Clarify code a bit. * Move code around. * Introduce `Order`. * Introduce `Link` structure. * Get rid of ptr_offset This is beneficial since ptr_offset is essentially makes us handle two different address spaces, global (i.e. `mem`) and heap local and without it things are becoming simpler. * Rename PREFIX_SIZE to HEADER_SIZE. This will come in the next commits. * Introduce a separate `Memory` trait. This is not necessary, but will come in handy for the upcoming changes. * Rename `ptr` to `header_ptr` where makes sense. * Introduce a `Header` type. * Make `bump` dumber. This allows us to pull `HEADER_SIZE` to see that we actually allocate `order.size() + HEADER_SIZE`. * Clean up. * Introduce a freelists struct. * Update documentation. * Make Sized requirement optional to make the PR truly back-compatible. * Apply suggestions from code review Co-Authored-By: Gavin Wood <[email protected]> * Apply suggestions from code review Co-Authored-By: Bastian Köcher <[email protected]> Co-authored-by: Gavin Wood <[email protected]> Co-authored-by: Bastian Köcher <[email protected]> * Avoid challenging those that can't be suspended anyway (#4804) * Merge branch 'gav-split-balanecs-vesting' into gav-upsub # Conflicts: # Cargo.lock # cli/Cargo.toml # collator/Cargo.toml # primitives/Cargo.toml # runtime/common/Cargo.toml # runtime/common/src/claims.rs # runtime/kusama/Cargo.toml # runtime/polkadot/Cargo.toml # service/Cargo.toml * Fix tests * Add trait to get module and call names. (#4854) * Add trait to get module and call names. Co-authored-by: Bastian Köcher <[email protected]> * Fix runtime-interface tests on windows (#4805) * update primitive types to 0.6.2 (#4866) * Run offchain workers at hash, not number. (#4878) * Run offchain workers at particular hash, not number. * Don't run if not new best. * Don't run if not new best. * Update client/service/src/builder.rs Co-Authored-By: Nikolay Volf <[email protected]> * Update client/service/src/builder.rs Co-Authored-By: Nikolay Volf <[email protected]> * Update client/service/src/builder.rs Co-authored-by: Nikolay Volf <[email protected]> * Use prefixed iterator from trie. (#4858) * Add support for json output in subkey (#4882) * Add support for json output in subkey * Updates as per code review * Apply suggestions from code review Co-Authored-By: Nikolay Volf <[email protected]> * Apply suggestions from code review Co-Authored-By: Bastian Köcher <[email protected]> * Clean up error handler as per code review * Apply suggestions from code review Co-Authored-By: Marcio Diaz <[email protected]> * Fix compilation error * Remove accidental file commit Co-authored-by: Nikolay Volf <[email protected]> Co-authored-by: Bastian Köcher <[email protected]> Co-authored-by: Marcio Diaz <[email protected]> * impl Randomness trait for Babe and remove unused RandomBeacon trait (#4886) * impl Randomness trait for Babe and remove unused RandomBeacon trait * bump runtime version * Pause Kademlia if too many connections (#4828) * Pause Kademlia if too many connections * Fix test * Update client/network/src/discovery.rs Co-Authored-By: Toralf Wittner <[email protected]> * Change the limit Co-authored-by: Toralf Wittner <[email protected]> * Refactor tx factory 1 (#4870) * Remove modes. * Refactor. * pallet-evm: optional nonce parameter (#4893) * pallet-evm: optional nonce parameter * Consume all gases when nonce mismatches * Bump node runtime version * Increase the penality for being offline (#4889) * Add a sub command to generate a node key file (#4884) * Add a sub command to generate a node key file in the format required by a substrate node * Update lock file * Apply suggestions from code review Co-Authored-By: Bastian Köcher <[email protected]> * Updates as per code review Co-authored-by: Bastian Köcher <[email protected]> * Benchmark Timestamp Pallet (#4891) * Add selected_benchmark! macro. * Use selected_benchmark! in Identity pallet. * Implement timestamp pallet benchmark. * Fix some nits. * Bump impl_version. * Add command-line flag to enable yamux flow control. (#4892) * Add command-line flag to enable yamux flow control. We never enabled proper flow-control for yamux streams which may cause stream buffers to exceed their configured limit when the stream producer outpaces the stream consumer. By switching the window update mode to on-read, producers will only receive more sending credit when all data has been consumed from the stream buffer. Using this option creates backpressure on producers. However depending on the protocol there is a risk of deadlock, if both endpoints concurrently attempt to send more data than they have credit for and neither side reads before finishing their writes. To facilitate proper testing, this PR adds a command-line flag `use-yamux-flow-control`. * Replace comment with generic message. * Do not allow zero Existential Deposit when using Balances (#4894) * Add non-zero ed check on Balances genesis * Update ED from 0 to 1 * bump impl * bump spec * Found remove more ed = 0 * Fix some contract tests * Use ctx.overlay.set_balance for contracts * Fix staking test * Remove obsolete logic * Allow death of payout account in society * Update frame/balances/src/lib.rs Co-Authored-By: Bastian Köcher <[email protected]> * Dont create genesis balances if balance is zero in transaction payment pallet Co-authored-by: Bastian Köcher <[email protected]> Co-authored-by: Gavin Wood <[email protected]> * network: Use "one shot" protocol handler. (#3520) * network: Use "one shot" protocol handler. Add two new `NetworkBehaviour`s, one handling remote block requests and another one to handle light client requests (both local and from remote). The change is motivated by the desire to use multiple substreams of a single connection for different protocols. To achieve this, libp2p's `OneShotHandler` is used as a protocol handler in each behaviour. It will open a fresh substream for the duration of the request and close it afterwards. For block requests, we currently only handle incoming requests from remote and tests are missing. For light client handling we support incoming requests from remote and also ported a substantial amount of functionality over from `light_dispatch.rs` (including several tests). However the result lacks in at least two aspects: (1) We require external updates w.r.t. the best block per peer and currently nothing updates this information. (2) We carry a lot of peer-related state around. Both aspects could be simplified by externalising peer selection and just requiring a specific peer ID where the request should be sent to. We still have to maintain some peer related state due to the way libp2p's swarm and network behaviour work (e.g. we must make sure to always issue `NetworkBehaviourAction::SendEvent`s to peers we are connected to, otherwise the actions die a silent death. Another change implemented here is the use of protocol buffers as the encoding for network messages. Certain individual fields of messages are still SCALE encoded. There has been some discussion about this in another PR (paritytech/substrate#3452), so far without resolution. * Uncomment `Behaviour::light_client_request`. * Add license headers. * Benchmark the Balances Pallet (#4879) * Initial transfer bench * Add best case * Transfer keep alive * Set balance benchmarks * Bump impl * Fix text Co-authored-by: Gavin Wood <[email protected]> * client/network-gossip: Integrate GossipEngine tasks into Future impl (#4767) `GossipEngine` spawns two tasks, one for a periodic tick, one to forward messages from the network to subscribers. These tasks hold an `Arc` to a `GossipEngineInner`. To reduce the amount of shared ownership (locking) this patch integrates the two tasks into a `Future` implementation on the `GossipEngine` struct. This `Future` implementation can now be called from a single owner, e.g. the `finality-grandpa` `NetworkBridge`. As a side effect this removes the requirement on the `network-gossip` crate to spawn tasks and thereby removes the requirement on the `finality-grandpa` crate to spawn any tasks. This is part of a greater effort to reduce the number of owners of components within `finality-grandpa`, `network` and `network-gossip` as well as to reduce the amount of unbounded channels. For details see d4fbb89, f0c1852 and 5afc777. * add some more docs on PreRuntime digests (#4896) * serialize partial_fee into string (#4898) * serialize partial_fee into string * implement deserialize * bump version * add sr25519 bench (#4905) * Fix chain-spec and make sure it does not breaks again (#4906) * Fix chain-spec and make sure it does not breaks again * REview feedback * Full block import benchmark (#4865) * full block import benchmark * try rocksdb cache * add profiling helper * use random keyring instead of zero caching * update docs * add more io stats * remove last sentence * add ci job to see * Update primitives/keyring/src/sr25519.rs Co-Authored-By: Marcio Diaz <[email protected]> * switch to 100tx-block * remove ci script Co-authored-by: Marcio Diaz <[email protected]> * Per-things trait. (#4904) * Give perthigns the trait it always deserved. * Make staking and phragmen work with the new generic per_thing * Make everything work together 🔨 * a bit of cleanup * Clean usage * Bump. * Fix name * fix grumbles * hopefully fix the ui test * Some grumbles * revamp traits again * Better naming again. * executor: Migrate wasmtime backend to a high-level API (#4686) * Migrate wasmtime backend to wasmtime-api * Port to a newer version of wasmtime * Update to the latest changes. * Rejig the sandbox module a bit * Materialze * Fixes. * executor wasm_runtime fix * Refactor everything * More refactoring * Even more refactorings * More cleaning. * Update to the latest wasmtime * Reformat * Renames * Refactoring and comments. * Docs * Rename FunctionExecutor to host. * Imrpove docs. * fmt * Remove panic * Assert the number of arguments are equal between wasmtime and hostfunc. * Comment a possible panic if there is no corresponding value variant. * Check signature of the entrypoint. * Use git version of wasmtime * Refine and doc the sandbox code. * Comment RefCells. * Update wasmtime to the latest-ish master. This may solve a problem with segfaults. * Apply suggestions from code review Co-Authored-By: Tomasz Drwięga <[email protected]> * Use full SHA1 hash of wasmtime commit. * Add a panic message. * Add some documentation * Update wasmtime version to include SIGSEGV fix * Update to crates.io version of wasmtime * Make it work. * Move the creation of memory into `InstanceWrapper::new` * Make `InstanceWrapper` !Send & !Sync * Avoid using `take_mut` * Update client/executor/wasmtime/Cargo.toml Co-Authored-By: Bastian Köcher <[email protected]> * Limit maximum size of memory. * Rename `init_state` to `with_initialized_state` Co-authored-by: Tomasz Drwięga <[email protected]> Co-authored-by: Bastian Köcher <[email protected]> * reference sc-service with rocksdb feature (#4918) * pallet-evm: add support for transaction-level create2 (#4907) * pallet-evm: add support for transaction-level create2 * Bump runtime version * Switch to FunctionOf for weights * pallet-evm: refactor duplicate code in call/create/create2 (#4922) * pallet-evm: refactor duplicate code in call/create/create2 * Bump runtime version * Adds a test to ensure that we clear the heap between calls into runtime (#4903) * Adds a test to ensure that we clear the heap between calls into runtime The tests shows that we currently not clearing the heap in wasmtime. For now we don't run the test for wasmtime. * Fix compilation * Composite accounts (#4820) * Basic account composition. * Add try_mutate_exists * De-duplicate * Refactor away the UpdateBalanceOutcome * Expunge final UpdateBalanceOutcome refs * Refactor transfer * Refactor reservable currency stuff. * Test with the alternative setup. * Fixes * Test with both setups. * Fixes * Fix * Fix macros * Make indices opt-in * Remove CreationFee, and make indices opt-in. * Fix construct_runtime * Fix last few bits * Fix tests * Update trait impls * Don't hardcode the system event * Make tests build and fix some stuff. * Pointlessly bump runtime version * Fix benchmark * Another fix * Whitespace * Make indices module economically safe * Migrations for indices. * Fix * Whilespace * Trim defunct migrations * Remove unused storage item * More contains_key fixes * Docs. * Bump runtime * Remove unneeded code * Fix test * Fix test * Update frame/balances/src/lib.rs Co-Authored-By: Shawn Tabrizi <[email protected]> * Fix ED logic * Repatriate reserved logic * Typo * Fix typo * Update frame/system/src/lib.rs Co-Authored-By: Shawn Tabrizi <[email protected]> * Update frame/system/src/lib.rs Co-Authored-By: Shawn Tabrizi <[email protected]> * Last few fixes * Another fix * Build fix Co-authored-by: Bastian Köcher <[email protected]> Co-authored-by: Jaco Greeff <[email protected]> Co-authored-by: Shawn Tabrizi <[email protected]> * Allow to distinguish out of gas from other traps (#4883) * contracts: Allow to distinguish out of gas from other traps When a contract encounters a runtime error a wasm trap is triggered and the execution is halted. Currently, no matter what was the cause for the trap it is always reported as: DispatchError::Other("contract trapped during execution"). However, the trap that is triggered if a contract exhausts its gas budget is particulary interesting. Therefore we add a seperate error message for this cause: DispatchError::Other("ran out of gas during contract execution"). A test is added hat executes a contract that never terminates. Therefore it always exhausts is gas budget. * fixup! contracts: Allow to distinguish out of gas from other traps Remove overlong lines. * fixup! contracts: Allow to distinguish out of gas from other traps Rename Contract to Contracts * Adds fork-awareness and finalization notifications to transaction pool watchers. (#4740) * adds finalization support to sc-transaction-pool using MaintainedTransactionPool for finalization events * adds TransactionStatus::Retracted, notify watchers of retracted blocks, finalized now finalizes, transactions for current finalized -> last finalized block * adds last_finalized to ChainApi, use generic BlockT for ChainEvent * fix tests * Apply suggestions from code review Co-Authored-By: Tomasz Drwięga <[email protected]> * tests * fix tests, docs, lazily dedupe pruned hashes * fix tests, Cargo.lock * Apply suggestions from code review Co-Authored-By: Tomasz Drwięga <[email protected]> * remove tree_route, last_finalized from ChainApi, add block hash to Finalization and Retracted events * prune finality watchers * fix tests * remove HeaderBackend bound from FullChainApi * code style nits, terminate stream in finality_timeout Co-authored-by: Tomasz Drwięga <[email protected]> * Adds `with_pair!` macro to application-crypto (#4885) * Adds `with_pair!` macro to application-crypto This macro will "generate" the given code only when the crypto pair is available. So, when either the `std` or the `full_crypto` feature is enabled. * Fix example * Remove rename for finalized event and add some docs. (#4930) * Remove rename for finalized event. * ADd some docs. * Document timeout. * Reverted #4820 (substrate), add doughnut and delegatedDispatchVerifier to substrate runtime declarations Co-authored-by: h4x3rotab <[email protected]> Co-authored-by: Shawn Tabrizi <[email protected]> Co-authored-by: Arkadiy Paronyan <[email protected]> Co-authored-by: Gavin Wood <[email protected]> Co-authored-by: Cecile Tonglet <[email protected]> Co-authored-by: Ashley <[email protected]> Co-authored-by: Pierre Krieger <[email protected]> Co-authored-by: Bastian Köcher <[email protected]> Co-authored-by: Svyatoslav Nikolsky <[email protected]> Co-authored-by: Benjamin Kampmann <[email protected]> Co-authored-by: Demi Obenour <[email protected]> Co-authored-by: Marcio Diaz <[email protected]> Co-authored-by: Sergei Pepyakin <[email protected]> Co-authored-by: Nikolay Volf <[email protected]> Co-authored-by: Tomasz Drwięga <[email protected]> Co-authored-by: cheme <[email protected]> Co-authored-by: Hayden Bakkum <[email protected]> Co-authored-by: Robert Habermeier <[email protected]> Co-authored-by: Toralf Wittner <[email protected]> Co-authored-by: Wei Tang <[email protected]> Co-authored-by: Max Inden <[email protected]> Co-authored-by: Xiliang Chen <[email protected]> Co-authored-by: Kian Paimani <[email protected]> Co-authored-by: Jaco Greeff <[email protected]> Co-authored-by: Alexander Theißen <[email protected]> Co-authored-by: Seun Lanlege <[email protected]>
* substrate/master: (100 commits) Cargo.toml fixups for the release (#4975) Update the documentation for `secp256k1_ecdsa_recover*` (#5019) Remove `NetworkSpecialization` (#4665) Add tests & Service's Configuration has optional fields that shouldn't be optional (#4842) Add gitlab job for publishing draft releases (#5009) Removes use of sc_client::Client from sc_consensus_babe (#5014) Wait for RPC server to cleanup on shutdown (#5004) Open one substream for each notifications protocol (#4909) node, node-template: disable GRANDPA observer (#5011) Make sure we use libp2p 0.16.1 (#5017) aura: remove unneeded SlotDuration struct and rename digest -> digests (#4958) babe: directly using append_u64 in transcript instead of to_le_bytes (#5005) Un-deprecate ValidateUnsigned (#5003) CI: Add example CI job template to .gitlab-ci.yml (#5012) Benchmark macro (#4962) Remove deprecated API (#4993) Unsigned transactions should also note weight (#4998) Offchain Workers: Example Pallet (#4989) Clean up the public API of sc-network-gossip (#5001) `vesting_balance` returns `Option` (#4987) ... # Conflicts: # Cargo.lock # bin/node-template/node/src/service.rs # bin/node-template/pallets/template/src/mock.rs # bin/node-template/runtime/Cargo.toml # bin/node/cli/Cargo.toml # bin/node/cli/bin/main.rs # bin/node/cli/src/service.rs # bin/node/cli/tests/check_block_works.rs # bin/node/cli/tests/purge_chain_works.rs # bin/node/cli/tests/running_the_node_and_interrupt.rs # bin/node/executor/Cargo.toml # bin/node/executor/src/lib.rs # bin/node/executor/tests/basic.rs # bin/node/runtime/Cargo.toml # bin/node/runtime/src/lib.rs # bin/node/testing/Cargo.toml # bin/node/testing/benches/import.rs # bin/node/transaction-factory/src/lib.rs # bin/utils/subkey/Cargo.toml # client/authority-discovery/Cargo.toml # client/cli/Cargo.toml # client/cli/src/lib.rs # client/cli/src/params.rs # client/consensus/aura/Cargo.toml # client/executor/wasmtime/src/instance_wrapper.rs # client/finality-grandpa/src/communication/mod.rs # client/finality-grandpa/src/lib.rs # client/finality-grandpa/src/observer.rs # client/finality-grandpa/src/tests.rs # client/informant/Cargo.toml # client/network-gossip/Cargo.toml # client/network-gossip/src/bridge.rs # client/network/Cargo.toml # client/network/src/behaviour.rs # client/network/src/protocol.rs # client/network/src/protocol/block_requests.rs # client/network/src/protocol/generic_proto/behaviour.rs # client/network/src/protocol/generic_proto/handler.rs # client/network/src/protocol/light_client_handler.rs # client/network/src/protocol/schema/api.v1.proto # client/network/src/service.rs # client/network/src/transport.rs # client/peerset/src/lib.rs # client/rpc-api/Cargo.toml # client/service/Cargo.toml # client/service/src/builder.rs # client/service/src/chain_ops.rs # client/service/src/lib.rs # client/telemetry/Cargo.toml # client/transaction-pool/Cargo.toml # client/transaction-pool/graph/Cargo.toml # client/transaction-pool/graph/src/listener.rs # client/transaction-pool/graph/src/pool.rs # client/transaction-pool/src/lib.rs # client/transaction-pool/src/testing/pool.rs # docs/CODE_OF_CONDUCT.adoc # docs/CONTRIBUTING.adoc # docs/SECURITY.md # docs/Structure.adoc # frame/assets/src/lib.rs # frame/aura/src/mock.rs # frame/authorship/src/lib.rs # frame/babe/src/mock.rs # frame/balances/src/benchmarking.rs # frame/balances/src/lib.rs # frame/balances/src/tests.rs # frame/balances/src/tests_local.rs # frame/collective/src/lib.rs # frame/contracts/src/exec.rs # frame/contracts/src/tests.rs # frame/democracy/src/lib.rs # frame/elections-phragmen/src/lib.rs # frame/elections/src/mock.rs # frame/evm/Cargo.toml # frame/example/src/lib.rs # frame/executive/Cargo.toml # frame/executive/src/lib.rs # frame/finality-tracker/src/lib.rs # frame/generic-asset/src/lib.rs # frame/generic-asset/src/mock.rs # frame/grandpa/src/mock.rs # frame/identity/src/benchmarking.rs # frame/identity/src/lib.rs # frame/im-online/src/mock.rs # frame/indices/src/lib.rs # frame/indices/src/mock.rs # frame/membership/src/lib.rs # frame/nicks/src/lib.rs # frame/offences/src/mock.rs # frame/randomness-collective-flip/src/lib.rs # frame/recovery/src/mock.rs # frame/scored-pool/src/mock.rs # frame/session/src/mock.rs # frame/society/src/lib.rs # frame/society/src/mock.rs # frame/staking/Cargo.toml # frame/staking/src/lib.rs # frame/staking/src/mock.rs # frame/support/src/traits.rs # frame/system/src/lib.rs # frame/timestamp/Cargo.toml # frame/timestamp/src/benchmarking.rs # frame/timestamp/src/lib.rs # frame/transaction-payment/src/lib.rs # frame/treasury/src/lib.rs # frame/utility/src/lib.rs # frame/vesting/src/lib.rs # primitives/allocator/src/freeing_bump.rs # primitives/core/Cargo.toml # primitives/finality-grandpa/Cargo.toml # primitives/runtime/Cargo.toml # primitives/runtime/src/generic/unchecked_extrinsic.rs # primitives/runtime/src/testing.rs # primitives/state-machine/Cargo.toml # primitives/transaction-pool/src/pool.rs # test-utils/runtime/src/lib.rs # test-utils/runtime/transaction-pool/Cargo.toml # utils/browser/Cargo.toml # utils/grafana-data-source/test/Cargo.toml # utils/prometheus/Cargo.toml
…#68) * Uncouple emptying gas_meter from updating the gas spent for the block.
…ge_substrate * substrate/master: (102 commits) Add storage root recalculation time to benchmarks (#5035) Lazy reaping (#4895) Cargo.toml fixups for the release (#4975) Update the documentation for `secp256k1_ecdsa_recover*` (#5019) Remove `NetworkSpecialization` (#4665) Add tests & Service's Configuration has optional fields that shouldn't be optional (#4842) Add gitlab job for publishing draft releases (#5009) Removes use of sc_client::Client from sc_consensus_babe (#5014) Wait for RPC server to cleanup on shutdown (#5004) Open one substream for each notifications protocol (#4909) node, node-template: disable GRANDPA observer (#5011) Make sure we use libp2p 0.16.1 (#5017) aura: remove unneeded SlotDuration struct and rename digest -> digests (#4958) babe: directly using append_u64 in transcript instead of to_le_bytes (#5005) Un-deprecate ValidateUnsigned (#5003) CI: Add example CI job template to .gitlab-ci.yml (#5012) Benchmark macro (#4962) Remove deprecated API (#4993) Unsigned transactions should also note weight (#4998) Offchain Workers: Example Pallet (#4989) ... # Conflicts: # Cargo.lock # bin/node-template/node/src/service.rs # bin/node-template/pallets/template/src/mock.rs # bin/node-template/runtime/Cargo.toml # bin/node-template/runtime/src/lib.rs # bin/node/cli/Cargo.toml # bin/node/cli/bin/main.rs # bin/node/cli/src/service.rs # bin/node/cli/tests/common.rs # bin/node/cli/tests/purge_chain_works.rs # bin/node/cli/tests/running_the_node_and_interrupt.rs # bin/node/executor/src/lib.rs # bin/node/executor/tests/basic.rs # bin/node/executor/tests/fees.rs # bin/node/executor/tests/submit_transaction.rs # bin/node/runtime/Cargo.toml # bin/node/runtime/src/lib.rs # bin/node/transaction-factory/src/lib.rs # client/cli/src/lib.rs # client/cli/src/params.rs # client/transaction-pool/src/testing/pool.rs # frame/assets/src/lib.rs # frame/aura/src/mock.rs # frame/authority-discovery/src/lib.rs # frame/authorship/src/lib.rs # frame/babe/src/mock.rs # frame/balances/Cargo.toml # frame/balances/src/lib.rs # frame/balances/src/mock.rs # frame/balances/src/tests.rs # frame/balances/src/tests_composite.rs # frame/balances/src/tests_local.rs # frame/benchmarking/src/lib.rs # frame/benchmarking/src/utils.rs # frame/collective/src/lib.rs # frame/contracts/src/account_db.rs # frame/contracts/src/exec.rs # frame/contracts/src/lib.rs # frame/contracts/src/tests.rs # frame/democracy/src/lib.rs # frame/elections-phragmen/src/lib.rs # frame/elections/src/mock.rs # frame/example-offchain-worker/src/tests.rs # frame/example/src/lib.rs # frame/executive/Cargo.toml # frame/executive/src/lib.rs # frame/finality-tracker/src/lib.rs # frame/generic-asset/src/lib.rs # frame/generic-asset/src/mock.rs # frame/grandpa/src/mock.rs # frame/identity/src/lib.rs # frame/im-online/src/mock.rs # frame/indices/src/mock.rs # frame/membership/src/lib.rs # frame/nicks/src/lib.rs # frame/offences/src/mock.rs # frame/randomness-collective-flip/src/lib.rs # frame/recovery/src/lib.rs # frame/recovery/src/mock.rs # frame/scored-pool/src/mock.rs # frame/session/src/mock.rs # frame/society/src/mock.rs # frame/staking/Cargo.toml # frame/staking/src/lib.rs # frame/staking/src/mock.rs # frame/support/src/storage/migration.rs # frame/support/src/traits.rs # frame/system/benches/bench.rs # frame/system/src/lib.rs # frame/system/src/offchain.rs # frame/timestamp/src/lib.rs # frame/transaction-payment/src/lib.rs # frame/treasury/src/lib.rs # frame/utility/src/lib.rs # frame/vesting/src/lib.rs # primitives/runtime/Cargo.toml # primitives/runtime/src/testing.rs # test-utils/runtime/src/lib.rs # utils/frame/benchmarking-cli/src/lib.rs # utils/grafana-data-source/test/Cargo.toml
this fixed error when running integration tests for node cli
* Event NewAccount is only creates a new account with 0 amount of money, and is moved to system/frame_system. In the test, NewAccount(who, amount) is now split into NewAccount(who) and Endow(who, amount)
|
Can you please make the review job easier by listing the files you needed to touch for the merge? |
…_substrate * origin/develop: Uncouple emptying gas_meter from updating the gas spent for the block (#68)
|
Superseded by #72 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge from Substrate upstream
Notable changes and high-risk areas:
change to
grandpa_config = grandpa::GrandpaParamsRemoved: UpdateBalanceOutcome
Changed OnReapAccount into OnKillAccount
Moved OnNewAccount, OnKillAccount, and AccountData from Balances to System
Added AccountStore to Balances
Made some changes to chain_ops
Reverted our changes to TestXt and added new DoughnutTestXt that support AccountId types that aren't hardcoded to u64
Event NewAccount only creates a new account with 0 amount of money and is moved to system/frame_system. In the test, NewAccount(who, amount) is now split into NewAccount(who) and Endow(who, amount)
Cherry picked changelist: a64dd52
this fixed error when running integration tests for node cli