Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed best_ethereum_block() call parameters encoding #188

Merged
merged 2 commits into from
Jul 14, 2020
Merged

Fixed best_ethereum_block() call parameters encoding #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34c03de
fixed best_ethereum_block() params encoding
svyatonik Jul 14, 2020
140a7f5
updated versions
svyatonik Jul 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
190 changes: 95 additions & 95 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion bin/node/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ hex-literal = "0.2"

[dependencies.codec]
package = "parity-scale-codec"
version = "1.0.0"
version = "1.3.1"
default-features = false
features = ["derive"]

Expand Down Expand Up @@ -208,6 +208,7 @@ path = "../../../primitives/ethereum-poa"

[build-dependencies.wasm-builder-runner]
version = "1.0.5"
tag = 'v2.0.0-rc4'
package = "substrate-wasm-builder-runner"
git = "https://github.com/paritytech/substrate/"

Expand Down
2 changes: 1 addition & 1 deletion modules/currency-exchange/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"

[dependencies]
serde = { version = "1.0", optional = true }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false }
sp-currency-exchange = { path = "../../primitives/currency-exchange", default-features = false }

# Substrate Based Dependencies
Expand Down
2 changes: 1 addition & 1 deletion modules/ethereum-contract/builtin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"

# General dependencies

codec = { package = "parity-scale-codec", version = "1.0.0" }
codec = { package = "parity-scale-codec", version = "1.3.1" }
ethereum-types = "0.9.2"
finality-grandpa = "0.12.3"

Expand Down
2 changes: 1 addition & 1 deletion modules/ethereum/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"

[dependencies]
serde = { version = "1.0", optional = true }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false }
hex-literal = "0.2"
primitives = { package = "sp-bridge-eth-poa", path = "../../primitives/ethereum-poa", default-features = false }

Expand Down
2 changes: 1 addition & 1 deletion modules/substrate/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false }
serde = { version = "1.0", optional = true }
hash-db = { version = "0.15.2", default-features = false }

Expand Down
2 changes: 1 addition & 1 deletion primitives/currency-exchange/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"

[dependencies]
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false }

# Substrate Based Dependencies

Expand Down
2 changes: 1 addition & 1 deletion primitives/ethereum-poa/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ primitive-types = { version = "0.7", default-features = false, features = ["code
fixed-hash = { version = "0.5", default-features = false }
impl-rlp = { version = "0.2", default-features = false }
impl-serde = { version = "0.2.3", optional = true }
codec = { package = "parity-scale-codec", version = "1.0.0", default-features = false }
codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false }
rlp = { version = "0.4", default-features = false }
hash-db = { version = "0.15.2", default-features = false }
triehash = { version = "0.8.2", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion relays/ethereum/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ async-stream = "0.2.0"
async-trait = "0.1.36"
backoff = "0.1"
clap = { version = "2.33.1", features = ["yaml"] }
codec = { package = "parity-scale-codec", version = "1.0.0" }
codec = { package = "parity-scale-codec", version = "1.3.1" }
env_logger = "0.7.0"
ethabi = "12.0"
ethabi-contract = "11.0"
Expand Down
2 changes: 1 addition & 1 deletion relays/ethereum/src/substrate_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ impl SubstrateRpc for SubstrateRpcClient {

async fn best_ethereum_block(&self) -> Result<EthereumHeaderId> {
let call = ETH_API_BEST_BLOCK.to_string();
let data = Bytes("0x".into());
let data = Bytes(Vec::new());

let encoded_response = Substrate::state_call(&self.client, call, data, None).await?;
let decoded_response: (u64, sp_bridge_eth_poa::H256) = Decode::decode(&mut &encoded_response.0[..])?;
Expand Down