1. 25 Aug, 2020 1 commit
    • Hero Bird's avatar
      Sync with Substrate RC6 (#478) · ba5aed19
      Hero Bird authored
      
      
      * [core] remove get_runtime_storage and invoke_runtime
      
      * [core] invalidate all implementations and usages of ext functions
      
      * [core] adjust ext_ functions in ext.rs
      
      * [core] add ReturnFlags to public API
      
      * [core] remove off-chain impls for get_runtime_storage and invoke_runtime
      
      * [core] rename ext::ext_input -> ext::input
      
      * [core] change return type of get_contract_storage
      
      Previously returned Option<Result<R>> and now returns Result<Option<R>>.
      This change is more pragmatic.
      
      * [core] add conversion from ext::Error to EnvError
      
      * [core] on-chain: add new utilities for static buffer modifications
      
      - EncodeScope: for efficiently appending encoded values
      - ScopedBuffer: for efficiently chunking buffers
      
      * [core] add impls for on-chain property getters
      
      * [core] remove no longer needed utiltiy function
      
      * [core] on-chain: new impl for invoke_contract and eval_contract
      
      * [core] on-chain: new impl for get_contract_storage
      
      * [core] on-chain: new impl for decode_input
      
      We should also rename this to simply "input" later.
      
      * [core] on-chain: new impl for output
      
      Now also uses the new ReturnFlags abstraction.
      
      * [core] on-chain: new impl for instantiate_contract
      
      * [core] on-chain: remove unused API
      
      * [core] on-chain: move EncodeScope and ScopedBuffer to buffer.rs
      
      * [core] on-chain: implement rest of the on-chain API
      
      * [core] add ScopedBuffer::take_bytes
      
      * [core] Add Env::call_chain_extension trait method
      
      * [core] remove unused helper methods
      
      * [core] on-chain: simplify static buffer
      
      - No more length
      - No more encodable
      - Only full range access
      
      * [core] add env::call_chain_extension public API
      
      * [core] rename Env::output -> return_value
      
      * [core] off-chain: adjust a bunch of off-chain methods to new interfaces
      
      * [core] off-chain: adjust get_contract_storage return type
      
      * [core] off-chain: remove RuntimeCallHandler and RuntimeStorage facilities
      
      * [core] off-chain: adjust some tests
      
      * [core] off-chain: remove OffCall utility type
      
      * [core] off-chain: implement chain extension handler
      
      * [core] adjust panic message
      
      * [core] apply rustfmt
      
      * [core] apply clippy suggestion
      
      * [core] off-chain: re-export ChainExtension and ChainSpec types from test API
      
      * [core] on-chain: retain panic messages
      
      * [core] rename ext_ to seal_ for all on-chain functions
      
      * [alloc] fix some warnings and add some minor comments
      
      * [core] add wasm_import_module = "seal0"
      
      * [core] introduce new Seal error codes
      
      * [core] directly return ReturnCode from C-FII
      
      * [core] make transfer return Result
      
      * [core] improve some doc comments
      
      * rename some old errors to their new names
      
      * [core] remove unused env errors and rename some off-chain errors
      
      * [core] fix bug in ReturnFlags::set_reverted (formerly known as set_trapped)
      
      * [core] avoid From impl for () for OffChainError
      
      * [lang] adjust lang layer for changes in core
      
      - Remove invoke_runtime
      - Remove get_runtime_storage
      - Rename gas_price -> weight_to_fee
      - Add ReturnFlags to return_value call
      
      * [core] turn redundant asserts into debug_assert
      
      * [core] be more strict when handling ext::get_storage error
      
      * [core] implement clippy suggestion
      
      * [examples] remove no longer useful runtime-storage contract
      
      We no longer support the get_runtime_storage host function.
      It will eventually be reintroduced at a later point through chain extensions.
      
      * [core] disable chain extensions by default
      
      Can be enabled by experimental crate feature:
      - unstable_chain_extensions
      
      * [lang] apply clippy suggestion to use matches! macro
      
      * [core] fix docs for ext_return
      
      Co-authored-by: Alexander Theißen's avatarAlexander Theißen <alex.theissen@me.com>
      
      * [core] fix return type of api::return_value
      
      Not sure why the compiler didn't mention this return type failure ...
      
      Co-authored-by: Alexander Theißen's avatarAlexander Theißen <alex.theissen@me.com>
      
      * [core] fix doc comment of Env::return_value
      
      * [core] introduce RawReturnCode as a layer between Seal error codes and ink!
      
      * [alloc] make #[alloc_error_handler] private
      
      * [alloc, core] move alloc_handler from ink_alloc to ink_core
      
      * [core] replace useless intermediate ReturnCode type
      
      * [core] rename RawReturnCode -> ReturnCode
      
      * [core] apply rustfmt
      
      * [core] apply rustfmt
      
      * [core] off-chain: rename invoke -> eval for chain extension calling
      
      * [core] use Ptr32 and Ptr32Mut to encapsulate pointer -> u32 conversions
      
      * [core] make new Ptr32 and Ptr32Mut abstractions more type safe
      
      Co-authored-by: Alexander Theißen's avatarAlexander Theißen <alex.theissen@me.com>
      ba5aed19
  2. 02 Jul, 2020 1 commit
    • Andrew Jones's avatar
      [core] add gas arg to ext_gas_price (#461) · 2456fdd2
      Andrew Jones authored
      * add gas argument
      
      * Add gas parameter to ext_gas_price
      
      * Fix up gas_price offchain api
      
      * Fix up env_access api
      
      * Emulate gas price calculation
      
      * Make clippy happy
      
      * Use Saturating impl for emulating gas price calculation offchain
      
      * Fmt
      
      * Add offchain gas_price test
      
      * Make clippy happy
      2456fdd2
  3. 17 Jun, 2020 2 commits
    • Hero Bird's avatar
      Avoid heap allocations for contract dispatch (#449) · f5b3c481
      Hero Bird authored
      * [core] add Env::decode_input
      
      * [lang/macro] remove unneeded crate dependencies
      
      # Conflicts:
      #	lang/macro/Cargo.toml
      
      * [lang, lang/macro] add message dispatcher type code generation
      
      * [lang/macro] add constructor dispatch enum code generation
      
      * [lang] add executor functions and Execute trait
      
      * [core] add decode_input to public env API
      
      * [lang] fix incorrect trait bound in execute_message
      
      * [lang/macro] add code generation for ink_lang::Execute
      
      * [lang/macro] integrate Execute trait impls into contract dispatch
      
      * [lang/macro] fix bug with constructors and messages with multiple inputs
      
      * [lang] apply rustfmt
      
      * [lang/macro] apply rustfmt + fix clippy warnings
      
      * [lang] remove testable module
      
      * [lang] clean-up lang module after implementing new dispatch codegen
      
      # Conflicts:
      #	lang/src/dispatcher.rs
      
      * [lang] re-enable alloc init and finalize
      
      * [lang] apply rustfmt
      
      * [core] remove Env::input function
      
      It has been deprecated. Users should use Env::decode_input function instead.
      
      # Conflicts:
      #	core/src/env/engine/off_chain/mod.rs
      
      * [core, examples] fix move of CallData to env::test API
      
      * [core] apply rustfmt
      
      * [examples] fix examples Selector::from_str -> new
      
      * [examples] fix multisig_plain doc-test import
      
      * [examples] apply rustfmt to multisig_plain example
      
      * [lang/macro] resolve some code dupes
      f5b3c481
    • Hero Bird's avatar
      Integrate new Key and KeyPtr types into rest of ink! (#447) · d095dd07
      Hero Bird authored
      * [primitives] add scale::{Encode, Decode} impls for Key
      
      * [primitives] add #[inline] annotations to scale::{Encode, Decode} impls for Key
      
      * [primitives] remove old Key and old KeyPtr abstractions
      
      # Conflicts:
      #	primitives/src/key.rs
      
      * [abi] adjust codebase to new Key and KeyPtr abstractions
      
      * [core] first step towards new Key and KeyPtr abstractions
      
      * [primitives] add core::ops::Add impl to Key for testing
      
      * [primitives] add Add impls for ref and value Key
      
      * [primitives] add Key::as_bytes for little-endian architectures
      
      * [primitives] add HasType{Id, Def} for Key
      
      * [core] adjust ink_core::env for Key and KeyPtr changes
      
      * [core] adjust ink_core::storage2 for Key and KeyPtr changes
      
      * [lang] adjust ink_lang for Key and KeyPtr changes
      
      * [lang/macro] adjust for Key and KeyPtr changes
      
      * [core] fix lazy_cell Debug unit test
      
      * [primitives] remove type_metadata impls, add scale_info impl
      
      * [abi, core] update unit tests for Key changes
      
      * [primitives] rename key2 -> key and key_ptr2 -> key_ptr module
      
      * [primitives] rename bench functions key2 -> key
      
      * [primitives] use Fields::unnamed
      d095dd07
  4. 13 Jun, 2020 1 commit
    • Hero Bird's avatar
      Avoid heap memory allocations for cross-contract calls and instantiations (#439) · 870095c8
      Hero Bird authored
      * [core] add ExecutionInput abstraction
      
      * [core, lang] adjust env and lang abstractions for call builder changes
      
      * [lang/macro] adjust cross-call codegen to use new call infrastructure
      
      * [core] add #[inline] to many call infrastructure functions
      
      * [core, lang] apply rustfmt
      
      * [core, lang, lang/macro] avoid heap mem alloc for instantiations as well
      
      * [core] add inline annotations to some instantation infrastructure
      
      * [core] fix clippy warning
      
      * [core] apply rustfmt
      
      * [examples] fix multisig_plain example contract
      
      * [examples] apply rustfmt
      870095c8
  5. 09 Jun, 2020 1 commit
  6. 25 Mar, 2020 1 commit
    • Hero Bird's avatar
      Initial implementation of high-level hashing infrastructure (#363) · b5a693bb
      Hero Bird authored
      
      
      * [core] initial implementation of high-level hashing infrastructure
      
      * [core] apply rustfmt
      
      * [core] add doc-comment to state some potential optimization
      
      * [core] add Wrap as another built-in way of creating an InputBuffer instance
      
      * [core] make &mut T implement InputBuffer if T: InputBuffer
      
      * [core] publicly export Wrap
      
      * [core] remove the two simple forms of all hash functions
      
      * [core] add extensive docs with examples to all hash functions
      
      * [core] fix doc tests
      
      * [core] fix bug in InputBuffer impl of Wrap
      
      * [core] add asserts to hash doc tests
      
      * [core] apply rustfmt
      
      * [core] simplify doc tests
      
      * [core] adjust doc comments for raw hashes
      
      * [core] improve docs
      
      * [core] add missing internal docs
      
      * [core] rename InputBuffer -> Accumulator
      
      * [core] apply rustfmt
      
      * [core] make Accumulator impl more explicit
      
      Co-Authored-By: default avatarNikolay Volf <nikvolf@gmail.com>
      
      * [core] make Accumulator impl less explicit
      
      Co-Authored-By: default avatarNikolay Volf <nikvolf@gmail.com>
      
      * [core] make Accumulator impl less explicit
      
      Co-Authored-By: default avatarNikolay Volf <nikvolf@gmail.com>
      
      * [core] make Accumulator impl less explicit
      
      Co-Authored-By: default avatarNikolay Volf <nikvolf@gmail.com>
      
      * [core] remove minor code dupe
      
      * [core] completely refactor hash module
      
      * [core] remove XX hash from low-level and high-level API
      
      * [core] fix typo in docs
      
      * [core] fix macro generated docs
      
      Co-authored-by: default avatarNikolay Volf <nikvolf@gmail.com>
      b5a693bb
  7. 21 Mar, 2020 1 commit
    • Hero Bird's avatar
      Implement crypto hash functions supported by contracts pallet (#360) · e0204021
      Hero Bird authored
      * [core] implement crypto hash functions supported by contracts pallet
      
      * [core] fix clippy warnings
      
      * [core] add unit tests for new crypto hashes
      
      * [core] refactor unit tests for crypto hashes
      
      * [core] make hash functions return their hash through output buffer
      
      * [core] update docs of hash APIs
      
      * [core] put hash API in its own sub-module of env
      
      * [core] fix on-chain hash implementations
      
      * [core] apply rustfmt
      e0204021
  8. 17 Mar, 2020 2 commits
  9. 03 Feb, 2020 1 commit
    • Hero Bird's avatar
      Implementation of ink! env (revision 3) (#312) · 321fe03a
      Hero Bird authored
      
      
      * [core] initial implementation of env revision 3
      
      * add engine abstraction layer and implement api functions
      
      * add support for dispatch_call to env3
      
      * add missing invoke_runtime to api.rs
      
      * [core] fix restore_contract docs
      
      * [core] initial implementation of off-chain environment
      
      * [core] clean-up of env3 fundamental types
      
      * [core] add WasmEnv::reset_buffer
      
      * show test submodule of env3 when compiling with rustdoc
      
      * [core] initial implementation of the off-chain env instance
      
      Also many other adjustments.
      
      * [core] further enhancements to off-chain env
      
      * [core] implement untyped Env for off-chain environment
      
      * [core] implemented a good chunk of TypedEnv for the off-chain environment
      
      * [core] minor improvements to env3
      
      * [core] further improvements and additions to test-api of env3
      
      * [core] remove former test-api file
      
      * [core] env3: add support for ext_tombstone_deposit
      
      * [core] env3: add setting of rent allowance in off-chain env
      
      * [core] env3: remove buffer.rs
      
      * [core] env3: remove property.rs
      
      * [core] env3: mark some TypedEnv methods as not-todo
      
      * [core] env3: enable off-chain api for non test/doc builds
      
      * [core] env3: use a static buffer instead of Vec<u8>
      
      * [core] env3: move static buffer into its own module
      
      * fix doc comment
      
      Co-Authored-By: Michael Müller's avatarMichael Müller <mich@elmueller.net>
      
      * [core] env3: add missing license header
      
      * [core] env3: remove deprecated doc note
      
      * [core] env3: add off-chain {set/get}_runtime_storage
      
      * [core] env3: add off-chain invoke_runtime dispatch
      
      This also enables support for registering custom runtime call handlers.
      
      * [core] env3: slightly improve env3::random docs comment
      
      * [core] env3: move off-chain errors under EnvError
      
      * [core] env3: add ext_random support for the off-chain environment
      
      * [core] env3: minor clean ups
      
      * [core] env3: improve TypedEncoded::assign
      
      * [core] env3: un-mut some variables
      
      * [core] env3: fix some clippy warnings
      
      * [core] env3: add past_printlns to off-chain test api
      
      * [core] env3: minor refactoring
      
      * [core] env3: apply rustfmt
      
      * [core] env3: clean up of call and instantiate contract
      
      * [core] env3: rename moment -> time_stamp
      
      * [core] env3: make get_runtime_storage return a Result instead of RetCode
      
      * [core] env3: remove unneeded import
      
      * [core] env3: add some trait impls for EnvTypes::Hash
      
      * [core] env3: remove last remaining usages of RetCode
      
      * [core] env3: refactor some errors
      
      * [core] env3: document the EnvError enum
      
      * [core] env3: add impls for fire methods on call and create builders
      
      * [core] env3: add doc comment to past_printlns
      
      * [core] env3: apply rustfmt
      
      * [core] env3: update license headers
      
      * [core] env3: support querying and emitting of events in off-chain env
      
      * [core] env3: missing license header adjustment
      
      * [core] env3: apply rustfmt
      
      * [core] env3: rename some methods in off-chain test-api
      
      * [core] env3: add doc comment to test::emitted_events
      
      * [core] env3: add stub for test::advance_block
      
      * [core] env3: rename some more test API methods
      
      * [core] env3: initialize entropy of block randomly
      
      * [core] env3: extend EnvTypes trait bounds
      
      This change makes the trait bounds more similar to what Substrate defines.
      
      * [core] env3: document SimpleArithmetic trait
      
      * [core] env3: add From<u32> to SimpleArithmetic trait
      
      * [core] env3: made some trait bounds more explicit in SimpleArithmetic trait
      
      * [core] env3: add comment describing potential future extensions to SimpleArithmetic trait
      
      * [core] env3: rename EnvTypes::Moment to TimeStamp
      
      * [core] env3: add block_time to ChainSpec
      
      * [core] env3: remove CodeDb again
      
      Not needed right now. Maybe re-added at a later point.
      
      * [core] env3: apply rustfmt
      
      * [core] env3: implement off-chain test::advance_block
      
      * [core] env3: fix bug in off-chain test::advance_block impl
      
      * [core] env3: made SimpleArithmetic trait more explicit towards Output types
      
      * [core] env3: add default initialization routines for off-chain environment
      
      * [core] env3: remove test::create_user_account for now
      
      * [core] env3: fix missing renaming from Moment -> TimeStamp
      
      * [core] env3: impl PartialEq and Eq for off-chain error types
      
      * [core] env3: add test::run_test for off-chain testing with default setup
      
      * [core] env3: fix several minor bugs with the off-chain environment
      
      * [core] convert key.rs tests to new env3
      
      * [core] remove commented out code in key.rs tests
      
      * [core] evn3: add test::get_contract_storage_rw
      
      * [core] use env3 instead of env1 in storage cells
      
      * [core] integrate env3 into storage::TypedChunk
      
      * [core] remove storage::RawChunk and NonCloneMarker
      
      * [core] adjust SyncChunk slightly for TypedChunk modifications
      
      * [core] simplify transitioned env3 tests for TypedChunk
      
      * [core] transition tests for SynChunk to env3
      
      * [core] transition storage::Stash tests to env3
      
      * [core] transition storage::HashMap tests to env3
      
      * [core] transition storage::BinaryHeap tests to env3
      
      * [lang] remove the entire ink! lang crate
      
      It has been deprecated for a whole while.
      
      * [model] remove ink! model crate entirely
      
      It has been deprecated for a whole while.
      
      * [core] remove the old env1 sub-module of ink_core
      
      It has been deprecated for a whole while.
      
      * [examples] remove model examples
      
      * [examples] remove lang examples
      
      * [examples] remove core examples
      
      * remove "If given too few endowment" from docs
      
      Co-Authored-By: Andrew Jones's avatarAndrew Jones <ascjones@gmail.com>
      
      * fix doc comment
      
      Co-Authored-By: Andrew Jones's avatarAndrew Jones <ascjones@gmail.com>
      
      * fix doc comment
      
      Co-Authored-By: Andrew Jones's avatarAndrew Jones <ascjones@gmail.com>
      
      * [lang2] initial steps towards basing on env3 instead of env2
      
      With this commit `cargo contract build` already works.
      However, cargo test etc. are still broken.
      
      * [lang2] make macros work for `cargo test`
      
      * [core, lang2] make contracts compile as ink-as-dependency
      
      * [lang2] make events work for ink_lang2 on env3
      
      * [lang2] remove AccessEnv - no longer needed
      
      * [core] remove env2
      
      * [lang2] fix tests
      
      - Fix warning in ink_lang2
      - Remove no longer needed test case
      - Adjust some passing tests after default module import removal
      
      * [*] apply rustfmt
      
      * [lang2] silence unused warning for now
      
      * [core] rename {create|Create}* to {instantiate|Instantiate}*
      
      - CreateBuilder -> InstantiateBuilder
      - CreateParams -> InstantiateParams
      - create -> instantiate
      
      * [core] rename endowment -> transferred_value for CallBuilder/Params
      
      * [examples] adjust Delegator contracts for recents changes
      
      * [core] rename now_in_ms -> block_timestamp
      
      * [core] follow-up of the call renamings (transferred_value)
      
      * [lang2] rename now_in_ms -> block_timestamp
      
      * [examples] move examples out of the examples/lang2 folder
      
      * [examples] fix runtime-storage example contract
      
      * [examples] fix Flipper contract
      
      * [examples] fix Incrementer contract
      
      * [examples] fix Erc20 contract
      
      * [utils] add Key and byte_utils to ink_utils
      
      * [utils -> primitives] rename ink_utils -> ink_primitives
      
      * [*] move all links from ink_utils -> ink_primitives
      
      * [primitives] update Cargo.toml description
      
      * [*] use ink_primitives::Key remove ink_core::Key
      
      * [primitives] refactor new crate, make it more usable in ink! context
      
      * [*] relink to ink_primitives for Key usage
      
      * [abi] refactor macros and relink to ink_primitives::Key
      
      * [lang2] fix usage of renamed Create{Builder, Params}
      
      * [examples] fix examples under recent changes with ink_primitives
      
      * [*] apply rustfmt
      
      * [lang2/macro] remove deprecated feature usage of proc_macro_hygiene
      
      * [examples] remove deprecated proc_macro_hygiene feature
      
      * [core] remove test_utils
      
      * [core] rename env3 to env
      
      * [*] rename all usages of env3 to env
      
      * [core] fix feature usage in num-traits of ink_core Cargo.toml
      
      * [*] update README
      
      * [primitives] conditionally compile type_metadata from ink_primitives
      
      * [core] make env::get_contract_storage return Option<Result<T>>
      
      * [core] fix some faulty doc comments
      
      * [ci] fix GitLab CI
      
      * [primitives] fix no_std compilation
      
      * [primitives] fix warning
      
      * [core] make `rand` dependency optional for `std` crate feature
      
      * [core] remove the test-env crate feature from the ink_core crate
      
      * [core,primitives] move some tests from primitives to core
      
      * [lang] move lang2/ to lang/
      
      * [*] rename all instances of ink_lang2 or lang2 to ink_lang or lang
      
      * [lang/macro] fix ink_primitives dependency
      
      * [*] apply rustfmt
      
      * [core] fix clippy warning
      
      * [ci] eliminate README from examples CI checks
      
      * [examples] apply rustfmt
      
      * [lang/macro] improve event codegen
      
      * [core] rename TimeStamp/time_stamp to Timestamp/timestamp
      
      * [lang] remove unused extern crate alloc
      
      * [core] rename env::address to env::account_id
      
      * [lang] perform renamings on ink_lang::EnvAccess but with deprecation instead of removal
      
      * [core] fix missing time_stamp renamings
      
      * [lang] fix missing TimeStamp renamings
      
      * improve doc comment
      
      Co-Authored-By: Andrew Jones's avatarAndrew Jones <ascjones@gmail.com>
      
      * improve doc comment
      
      Co-Authored-By: Andrew Jones's avatarAndrew Jones <ascjones@gmail.com>
      
      * rename create_contract -> instantiate_contract
      
      Co-Authored-By: Andrew Jones's avatarAndrew Jones <ascjones@gmail.com>
      
      * rename create_contract -> instantiate_contract
      
      Co-Authored-By: Andrew Jones's avatarAndrew Jones <ascjones@gmail.com>
      
      * improve doc comment
      
      Co-Authored-By: Andrew Jones's avatarAndrew Jones <ascjones@gmail.com>
      
      * impr
      
      Co-Authored-By: Andrew Jones's avatarAndrew Jones <ascjones@gmail.com>
      
      * improve doc comment
      
      Co-Authored-By: Andrew Jones's avatarAndrew Jones <ascjones@gmail.com>
      
      * improve doc comment
      
      Co-Authored-By: Andrew Jones's avatarAndrew Jones <ascjones@gmail.com>
      
      * improve doc comment
      
      Co-Authored-By: Andrew Jones's avatarAndrew Jones <ascjones@gmail.com>
      
      * rename endowment -> transferred_value
      
      Co-Authored-By: Andrew Jones's avatarAndrew Jones <ascjones@gmail.com>
      
      * improve doc comment
      
      Co-Authored-By: Andrew Jones's avatarAndrew Jones <ascjones@gmail.com>
      
      * rename create_contract -> instantiate_contract
      
      Co-Authored-By: Andrew Jones's avatarAndrew Jones <ascjones@gmail.com>
      
      * rename create_contract -> instantiate_contract
      
      Co-Authored-By: Andrew Jones's avatarAndrew Jones <ascjones@gmail.com>
      
      * rename time stamp to timestamp
      
      Co-Authored-By: Andrew Jones's avatarAndrew Jones <ascjones@gmail.com>
      
      * rename SRML to env in docs
      
      Co-Authored-By: Andrew Jones's avatarAndrew Jones <ascjones@gmail.com>
      
      * remove SRML word from docs
      
      Co-Authored-By: Andrew Jones's avatarAndrew Jones <ascjones@gmail.com>
      
      * remove SRML word from docs
      
      Co-Authored-By: Andrew Jones's avatarAndrew Jones <ascjones@gmail.com>
      
      * [lang] fix doc comment for filtered_keys in restore_contract
      
      * [core] rename create_contract -> instantiate_contract
      
      * [core] rename create_contract -> instantiate_contract
      
      * [core] fix some renamings around endowment -> transferred_value
      
      * [lang] rename create_contract -> instantiate_contract follow-up
      
      * [core] apply rustfmt
      
      * [core] improve restore_contract doc comment
      
      * [core, lang] link to ink_core::env::* doc comments from all api places
      
      * [core] apply rustfmt
      
      Co-authored-by: Michael Müller's avatarMichael Müller <mich@elmueller.net>
      Co-authored-by: Andrew Jones's avatarAndrew Jones <ascjones@gmail.com>
      321fe03a