Skip to content

Commit ba03f23

Browse files
committed
Merge branch 'devnet-ready' into spiigot/add-pallet-drand
2 parents 6d86c12 + c344fac commit ba03f23

20 files changed

+51119
-50906
lines changed

.github/workflows/hotfixes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
COMMENT_BODY=$(cat <<EOF
3939
## 🚨🚨🚨 HOTFIX DETECTED 🚨🚨🚨
4040
41-
It looks like you are trying to merge a hotfix PR into `main`. If this isn't what you wanted to do, and you just wanted to make a regular PR, please close this PR, base your changes off the `devnet-ready` branch and open a new PR into `devnet ready`.
41+
It looks like you are trying to merge a hotfix PR into \`main\`. If this isn't what you wanted to do, and you just wanted to make a regular PR, please close this PR, base your changes off the \`devnet-ready\` branch and open a new PR into \`devnet ready\`.
4242
4343
If you _are_ trying to merge a hotfix PR, please complete the following essential steps:
4444
1. [ ] go ahead and get this PR into \`main\` merged, so we can get the change in as quickly as possible!

Cargo.lock

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ syn = { version = "2.0.87", features = [
8080
] }
8181
quote = "1"
8282
proc-macro2 = { version = "1", features = ["span-locations"] }
83+
thiserror = "1.0"
8384
walkdir = "2"
8485

8586
subtensor-macros = { path = "support/macros" }
@@ -174,6 +175,7 @@ fp-account = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", de
174175
fc-storage = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
175176
fc-db = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
176177
fc-consensus = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
178+
fp-consensus = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
177179
fp-dynamic-fee = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
178180
fc-api = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
179181
fc-rpc = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ EXPOSE 30333 9933 9944
3838
FROM $BASE_IMAGE AS subtensor
3939

4040
# Copy all chainspec files
41-
COPY --from=builder /build/*.json /
41+
COPY --from=builder /build/chainspecs/*.json /
4242

4343
# Copy final binary
4444
COPY --from=builder /build/target/production/node-subtensor /usr/local/bin
File renamed without changes.

plain_spec_finney.json renamed to chainspecs/plain_spec_finney.json

Lines changed: 50760 additions & 50760 deletions
Large diffs are not rendered by default.

chainspecs/plain_spec_testfinney.json

Lines changed: 74 additions & 0 deletions
Large diffs are not rendered by default.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)