Skip to content

Commit

Permalink
Merge commit '2f329bc9c2dd58a47352e7afcebefa4660f5188f' into joshy-el…
Browse files Browse the repository at this point in the history 
…ections-in-slot-prediction
  • Loading branch information
@JoshOrndorff
JoshOrndorff committed Sep 7, 2021
2 parents 93f337d + 2f329bc commit 4765a30
Show file tree
Hide file tree
Showing 68 changed files with 7,184 additions and 8,270 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ jobs:
run: |
POLKADOT_COMMIT=${{ needs.set-tags.outputs.polkadot_commit }}
DOCKER_TAG="purestake/moonbase-relay-testnet:sha-$POLKADOT_COMMIT"
POLKADOT_EXISTS=docker manifest inspect $DOCKER_TAG > /dev/null && \
echo "true" || echo "false"
POLKADOT_EXISTS=$(docker manifest inspect $DOCKER_TAG > /dev/null && \
echo "true" || echo "false")
if [[ "$POLKADOT_EXISTS" == "false" ]]; then
# $POLKADOT_COMMIT is used to build the relay image
./scripts/build-alphanet-relay-image.sh
Expand Down
50 changes: 26 additions & 24 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Docker images are published for every tagged release. Learn more with `moonbeam

```bash
# Join the public testnet
docker run --network="host" purestake/moonbeam:v0.11.2 --chain alphanet
docker run --network="host" purestake/moonbeam:v0.11.3 --chain alphanet
```

You can find more detailed instructions to [run a full node in our TestNet](https://docs.moonbeam.network/node-operators/networks/full-node/)
Expand All @@ -27,7 +27,7 @@ service.

```bash
# Run a dev service node.
docker run --network="host" purestake/moonbeam:v0.11.2 --dev
docker run --network="host" purestake/moonbeam:v0.11.3 --dev
```

For more information, see our detailed instructions to [run a development node](https://docs.moonbeam.network/getting-started/local-node/setting-up-a-node/)
Expand All @@ -38,10 +38,10 @@ The command above will start the node in instant seal mode. It creates a block w

```bash
# Author a block every 6 seconds.
docker run --network="host" purestake/moonbeam:v0.11.2 --dev --sealing 6000
docker run --network="host" purestake/moonbeam:v0.11.3 --dev --sealing 6000

# Manually control the block authorship and finality
docker run --network="host" purestake/moonbeam:v0.11.2 --dev --sealing manual
docker run --network="host" purestake/moonbeam:v0.11.3 --dev --sealing manual
```

### Prefunded Development Addresses
Expand Down
2 changes: 1 addition & 1 deletion client/rpc-core/txpool/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ jsonrpc-derive = "14.0.3"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"

fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four" }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four-transaction-cost-fix" }
8 changes: 4 additions & 4 deletions client/rpc/debug/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ sp-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot

moonbeam-rpc-core-debug = { path = "../../rpc-core/debug" }
moonbeam-rpc-primitives-debug = { path = "../../../primitives/rpc/debug" }
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four" }
fc-db = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four", features = ["rpc_binary_search_estimate"] }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four" }
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four-transaction-cost-fix" }
fc-db = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four-transaction-cost-fix" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four-transaction-cost-fix", features = ["rpc_binary_search_estimate"] }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four-transaction-cost-fix" }
9 changes: 3 additions & 6 deletions client/rpc/debug/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,16 +319,15 @@ where
Ok(result)
}
Err(e) => Err(e),
_ => Err(internal_err(format!(
"Bug: Api and result versions must match"
))),
_ => Err(internal_err("Bug: Api and result versions must match")),
}
}
}
single::TraceType::CallList { .. } => {
if runtime_version.spec_version >= V2_RUNTIME_VERSION && api_version >= 3 {
let mut proxy = proxy::v2::call_list::Listener::default();
proxy.using(f)?;
proxy.finish_transaction();
proxy::formats::blockscout::Response::build(proxy)
.ok_or("Trace result is empty.")
.map_err(|e| internal_err(format!("{:?}", e)))
Expand All @@ -346,9 +345,7 @@ where
Ok(result)
}
Err(e) => Err(e),
_ => Err(internal_err(format!(
"Bug: Api and result versions must match"
))),
_ => Err(internal_err("Bug: Api and result versions must match")),
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions client/rpc/trace/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four" }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four-transaction-cost-fix" }
moonbeam-rpc-primitives-debug = { path = "../../../primitives/rpc/debug" }

# Client and RPC
jsonrpc-core = "15.0.0"
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" }
sc-transaction-graph = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four", features = ["rpc_binary_search_estimate"] }
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four" }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four-transaction-cost-fix", features = ["rpc_binary_search_estimate"] }
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four-transaction-cost-fix" }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four-transaction-cost-fix" }
moonbeam-rpc-core-trace = { path = "../../rpc-core/trace" }
2 changes: 1 addition & 1 deletion client/rpc/txpool/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ frame-system = { git = "https://github.com/paritytech/substrate", branch = "polk
serde = { version = "1.0", features = ["derive"] }

moonbeam-rpc-primitives-txpool = { path = "../../../primitives/rpc/txpool" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four", features = ["rpc_binary_search_estimate"] }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonriver-phase-four-transaction-cost-fix", features = ["rpc_binary_search_estimate"] }
2 changes: 1 addition & 1 deletion node/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = 'moonbeam'
description = 'Moonbeam Collator'
homepage = 'https://moonbeam.network'
license = 'GPL-3.0-only'
version = '0.11.2'
version = '0.11.3'
authors = ["PureStake"]
edition = '2018'

Expand Down
2 changes: 1 addition & 1 deletion node/cli-opt/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = 'moonbeam-cli-opt'
homepage = 'https://moonbeam.network'
license = 'GPL-3.0-only'
version = '0.11.2'
version = '0.11.3'
authors = ["PureStake"]
edition = '2018'

Expand Down
2 changes: 1 addition & 1 deletion node/cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "moonbeam-cli"
version = "0.11.2"
version = "0.11.3"
authors = ["PureStake"]
edition = "2018"

Expand Down
Loading

0 comments on commit 4765a30

Please sign in to comment.