Skip to content

Commit 7b342a9

Browse files
authored
Merge branch 'LibertyDSNP:main' into main
2 parents 14c0700 + afa4490 commit 7b342a9

File tree

139 files changed

+3388
-2177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+3388
-2177
lines changed

.github/workflows/merge-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
username: ${{github.actor}}
101101
password: ${{secrets.GITHUB_TOKEN}}
102102
- name: Sanitize repo owner slug
103-
uses: actions/github-script@v6
103+
uses: actions/github-script@v7
104104
id: repo_slug
105105
with:
106106
result-encoding: string

.github/workflows/publish-dev-ci-base-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
username: ${{github.actor}}
3636
password: ${{secrets.GITHUB_TOKEN}}
3737
- name: Sanitize repo owner slug
38-
uses: actions/github-script@v6
38+
uses: actions/github-script@v7
3939
id: repo_slug
4040
with:
4141
result-encoding: string

.github/workflows/release.yml

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,8 @@ jobs:
179179
# arch: arm64
180180
runs-on: ${{matrix.os}}
181181
container: ghcr.io/libertydsnp/frequency/ci-base-image:1.0.0
182+
env:
183+
SIGNING_SUBKEY_FINGERPRINT: B6327D1474C6392032870E8EFA4FD1E73A0FE707
182184
steps:
183185
- name: Check Out Repo
184186
uses: actions/checkout@v4
@@ -212,10 +214,21 @@ jobs:
212214
with:
213215
gpg_private_key: ${{secrets.FREQUENCY_PGP_SECRET_SUBKEYS}}
214216
passphrase: ${{secrets.FREQUENCY_PGP_MASTER_KEY_PASSWORD}}
215-
fingerprint: B6327D1474C6392032870E8EFA4FD1E73A0FE707 # signing subkey
217+
fingerprint: ${{env.SIGNING_SUBKEY_FINGERPRINT}}
218+
- name: List GPG Keys
219+
run: gpg -k; gpg -K
220+
# The error in this step may be due to expired signing subkey
221+
# See https://github.com/LibertyDSNP/frequency/issues/1695
216222
- name: Generate Binary Signature
217223
working-directory: ${{env.BIN_DIR}}
218-
run: gpg --detach-sign --armor ${{env.RELEASE_BIN_FILENAME}}
224+
run: |
225+
gpg --version
226+
gpg --local-user ${{env.SIGNING_SUBKEY_FINGERPRINT}} \
227+
--sign --armor \
228+
--pinentry-mode=loopback \
229+
--passphrase="${{secrets.FREQUENCY_PGP_MASTER_KEY_PASSWORD}}" \
230+
--detach-sig \
231+
${{env.RELEASE_BIN_FILENAME}}
219232
- name: Verify Binary
220233
working-directory: ${{env.BIN_DIR}}
221234
run: gpg --verify ${{env.RELEASE_BIN_FILENAME}}.asc
@@ -773,7 +786,7 @@ jobs:
773786
message: Latest full release
774787
- name: Dispatch Auto-signer Workflow
775788
if: env.TEST_RUN != 'true'
776-
uses: actions/github-script@v6
789+
uses: actions/github-script@v7
777790
with:
778791
github-token: ${{secrets.GHA_WORKFLOW_TRIGGER}}
779792
script: |
@@ -883,7 +896,7 @@ jobs:
883896
fail-fast: true
884897
matrix:
885898
arch: [amd64]
886-
node: [collator-node-local, instant-seal-node]
899+
node: [collator-node-local, instant-seal-node, standalone-node]
887900
include:
888901
- node: collator-node-local
889902
network: local
@@ -893,6 +906,10 @@ jobs:
893906
network: dev
894907
build-profile: release
895908
release-file-name-prefix: frequency-dev
909+
- node: standalone-node
910+
network: dev
911+
build-profile: release
912+
release-file-name-prefix: frequency-dev
896913
- arch: amd64
897914
build-profile: release
898915
docker-platform: linux/amd64
@@ -1018,8 +1035,17 @@ jobs:
10181035
run: npm version --new-version "${{env.NEW_RELEASE_TAG}}" --no-git-tag-version
10191036
working-directory: js/api-augment/dist
10201037
- name: Release on NPM @latest
1021-
if: env.TEST_RUN != 'true'
1038+
if: env.TEST_RUN != 'true' &&
1039+
steps.is-full-release.outputs.is-full-release == 'true'
10221040
run: npm publish --tag latest --access public
10231041
working-directory: ./js/api-augment/dist
10241042
env:
10251043
NODE_AUTH_TOKEN: ${{secrets.NODE_AUTH_TOKEN}}
1044+
- name: Release Candidate on NPM
1045+
if: env.TEST_RUN != 'true' &&
1046+
steps.is-full-release.outputs.is-full-release != 'true'
1047+
run: npm publish --access public
1048+
working-directory: ./js/api-augment/dist
1049+
env:
1050+
NODE_AUTH_TOKEN: ${{secrets.NODE_AUTH_TOKEN}}
1051+

.github/workflows/verify-pr-commit.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,14 @@ jobs:
488488
context: .
489489
push: false
490490
file: ./docker/${{env.IMAGE_NAME}}.dockerfile
491+
- name: Build collator standalone
492+
env:
493+
IMAGE_NAME: standalone-node
494+
uses: docker/build-push-action@v5
495+
with:
496+
context: .
497+
push: false
498+
file: ./docker/${{env.IMAGE_NAME}}.dockerfile
491499
- name: Build collator image for local relay chain
492500
env:
493501
IMAGE_NAME: collator-node-local

Cargo.lock

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

Cargo.toml

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,144 @@ members = [
99
]
1010
resolver = "2"
1111

12+
[workspace.dependencies]
13+
log = { version = "0.4.17", default-features = false }
14+
env_logger = "0.10.0"
15+
twox-hash = { version = "1.6.3", default-features = false, features = ["digest_0_10"]}
16+
thiserror = "1.0.40"
17+
apache-avro = { version = "0.14.0", default-features = false }
18+
rand = "0.8.5"
19+
20+
# substrate wasm
21+
parity-scale-codec = { version = "3.6.1", default-features = false }
22+
frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
23+
frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
24+
frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
25+
frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
26+
frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
27+
frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
28+
frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
29+
sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
30+
sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
31+
sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
32+
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
33+
sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
34+
sp-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
35+
sp-weights = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
36+
sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
37+
scale-info = { version = "2.10.0", default-features = false, features = [
38+
"derive",
39+
] }
40+
sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
41+
sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
42+
sp-version = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
43+
chrono = { version = "0.4.24" }
44+
pretty_assertions = { version = "1.3.0" }
45+
smallvec = "1.11.0"
46+
numtoa = "0.2.4"
47+
enumflags2 = "0.7.7"
48+
serde = { version = "1.0", default-features = false }
49+
serial_test = { version = "0.9.0", default-features = false }
50+
51+
# substrate pallets
52+
pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
53+
pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
54+
pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
55+
pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
56+
pallet-democracy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
57+
pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
58+
pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
59+
pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
60+
pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
61+
pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
62+
pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
63+
pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
64+
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
65+
pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
66+
pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
67+
68+
# polkadot
69+
polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
70+
polkadot-parachain-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
71+
polkadot-runtime-common = {git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
72+
polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
73+
polkadot-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
74+
75+
# cumulus
76+
cumulus-client-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
77+
cumulus-client-collator = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
78+
cumulus-client-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
79+
cumulus-client-consensus-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
80+
cumulus-client-consensus-proposer = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
81+
cumulus-client-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
82+
cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
83+
cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
84+
cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
85+
cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
86+
cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
87+
88+
cumulus-pallet-aura-ext = {git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
89+
cumulus-pallet-parachain-system = {git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
90+
cumulus-pallet-session-benchmarking = {git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
91+
cumulus-primitives-aura = {git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
92+
cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
93+
cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
94+
cumulus-primitives-timestamp = {git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
95+
pallet-collator-selection = {git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
96+
parachain-info = {git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
97+
98+
# client
99+
derive_more = "0.99.17"
100+
futures = "0.3.25"
101+
hex = "0.4.3"
102+
hex-literal = "0.4.1"
103+
impl-serde = { version = "0.4.0", default-features = false }
104+
jsonrpsee = { version = "0.16.2", default-features = false }
105+
oorandom = "11.1.3"
106+
phf = { version = "0.11", default-features = false, features = ["macros"] }
107+
rayon = "1.5.3"
108+
serde_json = { version = "1.0.86", default-features = false }
109+
tokio = { version = "1.25.0", default-features = false }
110+
unicode-normalization = { version = "0.1.22", default-features = false }
111+
clap = { version = "4.2.5", features = ["derive"] }
112+
113+
frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
114+
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
115+
sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
116+
sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
117+
sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
118+
sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
119+
sc-client-db = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
120+
sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
121+
sc-consensus-manual-seal = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
122+
sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
123+
sc-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
124+
sc-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
125+
sc-network-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
126+
sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
127+
sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
128+
sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
129+
sc-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
130+
sc-sysinfo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
131+
sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
132+
sc-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
133+
sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
134+
sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
135+
sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
136+
sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
137+
sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
138+
sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
139+
sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
140+
sp-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
141+
sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
142+
sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
143+
sp-wasm-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
144+
substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
145+
substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
146+
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
147+
substrate-test-runtime-client = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
148+
try-runtime-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
149+
12150
[profile.release]
13151
panic = "unwind"
14152
lto = true

0 commit comments

Comments
 (0)