Merge remote-tracking branch 'origin/master' into event-phases

.github/workflows/rust.yml

@@ -25,7 +25,7 @@ jobs:
 
     - name: download-substrate
       run: |
-          curl "https://releases.parity.io/substrate/x86_64-debian:stretch/v3.0.0/substrate/substrate" --output substrate --location
+          curl "https://releases.parity.io/substrate/x86_64-debian:stretch/latest/substrate/substrate" --output substrate --location
           chmod +x ./substrate
           mkdir -p ~/.local/bin
           mv substrate ~/.local/bin

.gitignore

@@ -1,3 +1,4 @@
 /target
 **/*.rs.bk
 Cargo.lock
+cargo-timing*

.rustfmt.toml

@@ -43,7 +43,7 @@ trailing_comma = "Vertical"
 match_block_trailing_comma = false
 blank_lines_upper_bound = 1
 blank_lines_lower_bound = 0
-edition = "2018" # changed
+edition = "2021" # changed
 version = "One"
 merge_derives = true
 use_try_shorthand = true # changed

CHANGELOG.md

@@ -9,105 +9,105 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [0.15.0] - 2021-03-15
 
 ### Added
-- implement variant of subscription that returns finalized storage changes - [#237](https://github.com/paritytech/substrate-subxt/pull/237)
-- implement session handling for unsubscribe in subxt-client - [#242](https://github.com/paritytech/substrate-subxt/pull/242)
+- implement variant of subscription that returns finalized storage changes - [#237](https://github.com/paritytech/subxt/pull/237)
+- implement session handling for unsubscribe in subxt-client - [#242](https://github.com/paritytech/subxt/pull/242)
 
 ### Changed
-- update jsonrpsee [#251](https://github.com/paritytech/substrate-subxt/pull/251)
-- return none if subscription returns early [#250](https://github.com/paritytech/substrate-subxt/pull/250)
-- export ModuleError and RuntimeError for downstream usage - [#246](https://github.com/paritytech/substrate-subxt/pull/246)
-- rpc client methods should be public for downstream usage - [#240](https://github.com/paritytech/substrate-subxt/pull/240)
-- re-export WasmExecutionMethod for downstream usage - [#239](https://github.com/paritytech/substrate-subxt/pull/239)
-- integration with jsonrpsee v2 - [#214](https://github.com/paritytech/substrate-subxt/pull/214)
-- expose wasm execution method on subxt client config - [#230](https://github.com/paritytech/substrate-subxt/pull/230)
-- Add hooks to register event types for decoding - [#227](https://github.com/paritytech/substrate-subxt/pull/227)
-- Substrate 3.0 - [#232](https://github.com/paritytech/substrate-subxt/pull/232)
+- update jsonrpsee [#251](https://github.com/paritytech/subxt/pull/251)
+- return none if subscription returns early [#250](https://github.com/paritytech/subxt/pull/250)
+- export ModuleError and RuntimeError for downstream usage - [#246](https://github.com/paritytech/subxt/pull/246)
+- rpc client methods should be public for downstream usage - [#240](https://github.com/paritytech/subxt/pull/240)
+- re-export WasmExecutionMethod for downstream usage - [#239](https://github.com/paritytech/subxt/pull/239)
+- integration with jsonrpsee v2 - [#214](https://github.com/paritytech/subxt/pull/214)
+- expose wasm execution method on subxt client config - [#230](https://github.com/paritytech/subxt/pull/230)
+- Add hooks to register event types for decoding - [#227](https://github.com/paritytech/subxt/pull/227)
+- Substrate 3.0 - [#232](https://github.com/paritytech/subxt/pull/232)
 
 ## [0.14.0] - 2021-02-05
 
-- Refactor event type decoding and declaration [#221](https://github.com/paritytech/substrate-subxt/pull/221)
-- Add Balances Locks [#197](https://github.com/paritytech/substrate-subxt/pull/197)
-- Add event Phase::Initialization [#215](https://github.com/paritytech/substrate-subxt/pull/215)
-- Make type explicit [#217](https://github.com/paritytech/substrate-subxt/pull/217)
-- Upgrade dependencies, bumps substrate to 2.0.1 [#219](https://github.com/paritytech/substrate-subxt/pull/219)
-- Export extra types [#212](https://github.com/paritytech/substrate-subxt/pull/212)
-- Enable retrieval of constants from rutnime metadata [#207](https://github.com/paritytech/substrate-subxt/pull/207)
-- register type sizes for u64 and u128 [#200](https://github.com/paritytech/substrate-subxt/pull/200)
-- Remove some substrate dependencies to improve compile time [#194](https://github.com/paritytech/substrate-subxt/pull/194)
-- propagate 'RuntimeError's to 'decode_raw_bytes' caller [#189](https://github.com/paritytech/substrate-subxt/pull/189)
-- Derive `Clone` for `PairSigner` [#184](https://github.com/paritytech/substrate-subxt/pull/184)
+- Refactor event type decoding and declaration [#221](https://github.com/paritytech/subxt/pull/221)
+- Add Balances Locks [#197](https://github.com/paritytech/subxt/pull/197)
+- Add event Phase::Initialization [#215](https://github.com/paritytech/subxt/pull/215)
+- Make type explicit [#217](https://github.com/paritytech/subxt/pull/217)
+- Upgrade dependencies, bumps substrate to 2.0.1 [#219](https://github.com/paritytech/subxt/pull/219)
+- Export extra types [#212](https://github.com/paritytech/subxt/pull/212)
+- Enable retrieval of constants from rutnime metadata [#207](https://github.com/paritytech/subxt/pull/207)
+- register type sizes for u64 and u128 [#200](https://github.com/paritytech/subxt/pull/200)
+- Remove some substrate dependencies to improve compile time [#194](https://github.com/paritytech/subxt/pull/194)
+- propagate 'RuntimeError's to 'decode_raw_bytes' caller [#189](https://github.com/paritytech/subxt/pull/189)
+- Derive `Clone` for `PairSigner` [#184](https://github.com/paritytech/subxt/pull/184)
 
 ## [0.13.0]
 
-- Make the contract call extrinsic work [#165](https://github.com/paritytech/substrate-subxt/pull/165)
-- Update to Substrate 2.0.0 [#173](https://github.com/paritytech/substrate-subxt/pull/173)
-- Display RawEvent data in hex [#168](https://github.com/paritytech/substrate-subxt/pull/168)
-- Add SudoUncheckedWeightCall [#167](https://github.com/paritytech/substrate-subxt/pull/167)
-- Add Add SetCodeWithoutChecksCall [#166](https://github.com/paritytech/substrate-subxt/pull/166)
-- Improve contracts pallet tests [#163](https://github.com/paritytech/substrate-subxt/pull/163)
-- Make Metadata types public [#162](https://github.com/paritytech/substrate-subxt/pull/162)
-- Fix option decoding and add basic sanity test [#161](https://github.com/paritytech/substrate-subxt/pull/161)
-- Add staking support [#160](https://github.com/paritytech/substrate-subxt/pull/161)
-- Decode option event arg [#158](https://github.com/paritytech/substrate-subxt/pull/158)
-- Remove unnecessary Sync bound [#172](https://github.com/paritytech/substrate-subxt/pull/172)
+- Make the contract call extrinsic work [#165](https://github.com/paritytech/subxt/pull/165)
+- Update to Substrate 2.0.0 [#173](https://github.com/paritytech/subxt/pull/173)
+- Display RawEvent data in hex [#168](https://github.com/paritytech/subxt/pull/168)
+- Add SudoUncheckedWeightCall [#167](https://github.com/paritytech/subxt/pull/167)
+- Add Add SetCodeWithoutChecksCall [#166](https://github.com/paritytech/subxt/pull/166)
+- Improve contracts pallet tests [#163](https://github.com/paritytech/subxt/pull/163)
+- Make Metadata types public [#162](https://github.com/paritytech/subxt/pull/162)
+- Fix option decoding and add basic sanity test [#161](https://github.com/paritytech/subxt/pull/161)
+- Add staking support [#160](https://github.com/paritytech/subxt/pull/161)
+- Decode option event arg [#158](https://github.com/paritytech/subxt/pull/158)
+- Remove unnecessary Sync bound [#172](https://github.com/paritytech/subxt/pull/172)
 
 ## [0.12.0]
 
-- Only return an error if the extrinsic failed. [#156](https://github.com/paritytech/substrate-subxt/pull/156)
-- Update to rc6. [#155](https://github.com/paritytech/substrate-subxt/pull/155)
-- Different assert. [#153](https://github.com/paritytech/substrate-subxt/pull/153)
-- Add a method to fetch an unhashed key, close #100 [#152](https://github.com/paritytech/substrate-subxt/pull/152)
-- Fix port number. [#151](https://github.com/paritytech/substrate-subxt/pull/151)
-- Implement the `concat` in `twox_64_concat` [#150](https://github.com/paritytech/substrate-subxt/pull/150)
-- Storage map iter [#148](https://github.com/paritytech/substrate-subxt/pull/148)
+- Only return an error if the extrinsic failed. [#156](https://github.com/paritytech/subxt/pull/156)
+- Update to rc6. [#155](https://github.com/paritytech/subxt/pull/155)
+- Different assert. [#153](https://github.com/paritytech/subxt/pull/153)
+- Add a method to fetch an unhashed key, close #100 [#152](https://github.com/paritytech/subxt/pull/152)
+- Fix port number. [#151](https://github.com/paritytech/subxt/pull/151)
+- Implement the `concat` in `twox_64_concat` [#150](https://github.com/paritytech/subxt/pull/150)
+- Storage map iter [#148](https://github.com/paritytech/subxt/pull/148)
 
 ## [0.11.0]
 
-- Fix build error, wabt 0.9.2 is yanked [#146](https://github.com/paritytech/substrate-subxt/pull/146)
-- Rc5 [#143](https://github.com/paritytech/substrate-subxt/pull/143)
-- Refactor: extract functions and types for creating extrinsics [#138](https://github.com/paritytech/substrate-subxt/pull/138)
-- event subscription example [#140](https://github.com/paritytech/substrate-subxt/pull/140)
-- Document the `Call` derive macro [#137](https://github.com/paritytech/substrate-subxt/pull/137)
-- Document the #[module] macro [#135](https://github.com/paritytech/substrate-subxt/pull/135)
-- Support authors api. [#134](https://github.com/paritytech/substrate-subxt/pull/134)
+- Fix build error, wabt 0.9.2 is yanked [#146](https://github.com/paritytech/subxt/pull/146)
+- Rc5 [#143](https://github.com/paritytech/subxt/pull/143)
+- Refactor: extract functions and types for creating extrinsics [#138](https://github.com/paritytech/subxt/pull/138)
+- event subscription example [#140](https://github.com/paritytech/subxt/pull/140)
+- Document the `Call` derive macro [#137](https://github.com/paritytech/subxt/pull/137)
+- Document the #[module] macro [#135](https://github.com/paritytech/subxt/pull/135)
+- Support authors api. [#134](https://github.com/paritytech/subxt/pull/134)
 
 ## [0.10.1] - 2020-06-19
 
-- Release client v0.2.0 [#133](https://github.com/paritytech/substrate-subxt/pull/133)
+- Release client v0.2.0 [#133](https://github.com/paritytech/subxt/pull/133)
 
 ## [0.10.0] - 2020-06-19
 
-- Upgrade to substrate rc4 release [#131](https://github.com/paritytech/substrate-subxt/pull/131)
-- Support unsigned extrinsics. [#130](https://github.com/paritytech/substrate-subxt/pull/130)
+- Upgrade to substrate rc4 release [#131](https://github.com/paritytech/subxt/pull/131)
+- Support unsigned extrinsics. [#130](https://github.com/paritytech/subxt/pull/130)
 
 ## [0.9.0] - 2020-06-25
 
-- Events sub [#126](https://github.com/paritytech/substrate-subxt/pull/126)
-- Improve error handling in proc-macros, handle DispatchError etc. [#123](https://github.com/paritytech/substrate-subxt/pull/123)
-- Support embedded full/light node clients. [#91](https://github.com/paritytech/substrate-subxt/pull/91)
-- Zero sized types [#121](https://github.com/paritytech/substrate-subxt/pull/121)
-- Fix optional store items. [#120](https://github.com/paritytech/substrate-subxt/pull/120)
-- Make signing fallable and asynchronous [#119](https://github.com/paritytech/substrate-subxt/pull/119)
+- Events sub [#126](https://github.com/paritytech/subxt/pull/126)
+- Improve error handling in proc-macros, handle DispatchError etc. [#123](https://github.com/paritytech/subxt/pull/123)
+- Support embedded full/light node clients. [#91](https://github.com/paritytech/subxt/pull/91)
+- Zero sized types [#121](https://github.com/paritytech/subxt/pull/121)
+- Fix optional store items. [#120](https://github.com/paritytech/subxt/pull/120)
+- Make signing fallable and asynchronous [#119](https://github.com/paritytech/subxt/pull/119)
 
 ## [0.8.0] - 2020-05-26
 
-- Update to Substrate release candidate [#116](https://github.com/paritytech/substrate-subxt/pull/116)
-- Update to alpha.8 [#114](https://github.com/paritytech/substrate-subxt/pull/114)
-- Refactors the api [#113](https://github.com/paritytech/substrate-subxt/pull/113)
+- Update to Substrate release candidate [#116](https://github.com/paritytech/subxt/pull/116)
+- Update to alpha.8 [#114](https://github.com/paritytech/subxt/pull/114)
+- Refactors the api [#113](https://github.com/paritytech/subxt/pull/113)
 
 ## [0.7.0] - 2020-05-13
 
-- Split subxt [#102](https://github.com/paritytech/substrate-subxt/pull/102)
-- Add support for RPC `state_getReadProof` [#106](https://github.com/paritytech/substrate-subxt/pull/106)
-- Update to substrate alpha.7 release [#105](https://github.com/paritytech/substrate-subxt/pull/105)
-- Double map and plain storage support, introduce macros [#93](https://github.com/paritytech/substrate-subxt/pull/93)
-- Raw payload return SignedPayload struct [#92](https://github.com/paritytech/substrate-subxt/pull/92)
+- Split subxt [#102](https://github.com/paritytech/subxt/pull/102)
+- Add support for RPC `state_getReadProof` [#106](https://github.com/paritytech/subxt/pull/106)
+- Update to substrate alpha.7 release [#105](https://github.com/paritytech/subxt/pull/105)
+- Double map and plain storage support, introduce macros [#93](https://github.com/paritytech/subxt/pull/93)
+- Raw payload return SignedPayload struct [#92](https://github.com/paritytech/subxt/pull/92)
 
 ## [0.6.0] - 2020-04-15
 
-- Raw extrinsic payloads in Client [#83](https://github.com/paritytech/substrate-subxt/pull/83)
-- Custom extras [#89](https://github.com/paritytech/substrate-subxt/pull/89)
-- Wrap and export BlockNumber [#87](https://github.com/paritytech/substrate-subxt/pull/87)
+- Raw extrinsic payloads in Client [#83](https://github.com/paritytech/subxt/pull/83)
+- Custom extras [#89](https://github.com/paritytech/subxt/pull/89)
+- Wrap and export BlockNumber [#87](https://github.com/paritytech/subxt/pull/87)
 - All substrate dependencies upgraded to `alpha.6`
 
 ## [0.5.0] - 2020-03-25

Cargo.toml

@@ -1,35 +1,33 @@
 [workspace]
-members = [".", "client", "proc-macro"]
+members = [".", "cli", "codegen", "macro"]
 
 [package]
-name = "substrate-subxt"
+name = "subxt"
 version = "0.15.0"
 authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
+edition = "2021"
 
 license = "GPL-3.0"
 readme = "README.md"
-repository = "https://github.com/paritytech/substrate-subxt"
-documentation = "https://docs.rs/substrate-subxt"
+repository = "https://github.com/paritytech/subxt"
+documentation = "https://docs.rs/subxt"
 homepage = "https://www.parity.io/"
 description = "Submit extrinsics (transactions) to a substrate node via RPC"
 keywords = ["parity", "substrate", "blockchain"]
 include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"]
 
 [features]
 default = ["tokio1"]
-client = ["substrate-subxt-client"]
 # jsonrpsee can be configured to use tokio02 or tokio1.
 tokio02 = ["jsonrpsee-http-client/tokio02", "jsonrpsee-ws-client/tokio02"]
 tokio1 = ["jsonrpsee-http-client/tokio1", "jsonrpsee-ws-client/tokio1"]
 
 [dependencies]
 async-trait = "0.1.49"
-codec = { package = "parity-scale-codec", version = "2.1", default-features = false, features = [
-    "derive",
-    "full",
-] }
-dyn-clone = "1.0.4"
+bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
+codec = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive", "full", "bit-vec"] }
+chameleon = "0.1.0"
+scale-info = { version = "1.0.0", features = ["bit-vec"] }
 futures = "0.3.13"
 hex = "0.4.3"
 jsonrpsee-proc-macros = "0.3.0"
@@ -43,20 +41,14 @@ serde_json = "1.0.64"
 thiserror = "1.0.24"
 url = "2.2.1"
 
-substrate-subxt-client = { version = "0.7.0", path = "client", optional = true }
-substrate-subxt-proc-macro = { version = "0.15.0", path = "proc-macro" }
+subxt-macro = { version = "0.1.0", path = "macro" }
 
-sp-application-crypto = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.10" }
-sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.10" }
-sp-rpc = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.10" }
-sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.10" }
-sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.10" }
-sp-version = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.10" }
+sp-arithmetic = { package = "sp-arithmetic", git = "https://github.com/paritytech/substrate/", branch = "master" }
+sp-core = { package = "sp-core", git = "https://github.com/paritytech/substrate/", branch = "master" }
+sp-runtime = { package = "sp-runtime", git = "https://github.com/paritytech/substrate/", branch = "master" }
+sp-version = { package = "sp-version", git = "https://github.com/paritytech/substrate/", branch = "master" }
 
-frame-metadata = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.10" }
-frame-support = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.10" }
-pallet-indices = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.10" }
-pallet-staking = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.10" }
+frame-metadata = "14.0.0"
 
 [dev-dependencies]
 assert_matches = "1.5.0"
@@ -65,6 +57,6 @@ env_logger = "0.8.3"
 tempdir = "0.3.7"
 wabt = "0.10.0"
 which = "4.0.2"
-sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.10" }
-frame-system = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.10" }
-pallet-balances = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.10" }
+
+sp-keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate/", branch = "master" }
+

FILE_TEMPLATE

@@ -1,5 +1,5 @@
 // Copyright 2019-2021 Parity Technologies (UK) Ltd.
-// This file is part of substrate-subxt.
+// This file is part of subxt.
 //
 // subxt is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -12,4 +12,4 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with substrate-subxt.  If not, see <http://www.gnu.org/licenses/>.
+// along with subxt.  If not, see <http://www.gnu.org/licenses/>.