Skip to content

Commit bd3183e

Browse files
committed
merge: master
1 parent fa491da commit bd3183e

Some content is hidden

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

83 files changed

+4226
-2128
lines changed

.github/scripts/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"license": "MIT",
55
"dependencies": {
66
"@polkadot/util-crypto": "^10.1.10",
7-
"octokit": "^2.0.7",
7+
"octokit": "^3.1.2",
88
"ts-node": "^10.9.1",
99
"typescript": "^4.8.4",
1010
"yargs": "^17.6.0"

.github/scripts/yarn.lock

+209-254
Large diffs are not rendered by default.

.github/workflows/rustdoc.yaml

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: rustdoc
2+
on:
3+
pull_request:
4+
types: [closed]
5+
branches:
6+
- master
7+
8+
jobs:
9+
rustdoc:
10+
runs-on: ubuntu-latest
11+
if: github.event.pull_request.merged == true
12+
steps:
13+
- name: Checkout code
14+
uses: actions/checkout@v3
15+
16+
- name: Install deps
17+
run: sudo apt -y install protobuf-compiler
18+
19+
- name: Install & display rust toolchain
20+
run: rustup show
21+
22+
- name: Check targets are installed correctly
23+
run: rustup target list --installed
24+
25+
- name: Build Documentation
26+
run: cargo doc --no-deps
27+
28+
- name: Push index.html
29+
run: echo "<meta http-equiv=\"refresh\" content=\"0; URL='./astar_collator/index.html'\" />" > ./target/doc/index.html
30+
31+
- name: Deploy Docs
32+
uses: peaceiris/actions-gh-pages@v3
33+
with:
34+
github_token: ${{ secrets.GITHUB_TOKEN }}
35+
publish_branch: gh-pages
36+
publish_dir: ./target/doc

Cargo.lock

+51-15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ pallet-evm-precompile-xvm = { path = "./precompiles/xvm", default-features = fal
296296
pallet-evm-precompile-dapps-staking = { path = "./precompiles/dapps-staking", default-features = false }
297297
pallet-evm-precompile-dapp-staking-v3 = { path = "./precompiles/dapp-staking-v3", default-features = false }
298298
pallet-evm-precompile-unified-accounts = { path = "./precompiles/unified-accounts", default-features = false }
299+
pallet-evm-precompile-dispatch-lockdrop = { path = "./precompiles/dispatch-lockdrop", default-features = false }
299300

300301
pallet-chain-extension-xvm = { path = "./chain-extensions/xvm", default-features = false }
301302
pallet-chain-extension-assets = { path = "./chain-extensions/pallet-assets", default-features = false }

README.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ For key management and validator rewards, consult our [validator guide online](h
8787

8888
## Run RPC Tests
8989

90-
RPC tests suite can be run for any release. To run tests go to https://github.com/AstarNetwork/Astar/actions/workflows/rpcTest.yml. Click Run workflow, in the dropdown input the release version tag you want to run the test suite. Then click the green Run workflow button to start the test suite.
90+
RPC tests suite can be run for any release. To run tests go to <https://github.com/AstarNetwork/Astar/actions/workflows/rpcTest.yml>. Click Run workflow, in the dropdown input the release version tag you want to run the test suite. Then click the green Run workflow button to start the test suite.
9191

9292
![Screenshot from 2022-07-07 15-28-46](https://user-images.githubusercontent.com/874046/177785570-330c6613-237d-4190-bfed-69876209daf6.png)
9393

@@ -102,19 +102,20 @@ Also `package` imports aren't properly propagated from root to sub-crates, so de
102102
Defining _features_ in the root `Cargo.toml` is additive with the features defined in concrete crate's `Cargo.toml`.
103103

104104
**Adding Dependency**
105+
105106
1. Check if the dependency is already defined in the root `Cargo.toml`
106107
1. if **yes**, nothing to do, just take note of the enabled features
107108
2. if **no**, add it (make sure to use `default-features = false` if dependency is used in _no_std_ context)
108109
2. Add `new_dependecy = { workspace = true }` to the required crate
109110
3. In case dependency is defined with `default-features = false` but you need it in _std_ context, add `features = ["std"]` to the required crate.
110-
111111

112112
## Further Reading
113113

114114
* [Official Documentation](https://docs.astar.network/)
115115
* [Whitepaper](https://github.com/AstarNetwork/plasmdocs/blob/master/wp/en.pdf)
116116
* [Whitepaper(JP)](https://github.com/AstarNetwork/plasmdocs/blob/master/wp/jp.pdf)
117-
* [Subtrate Developer Hub](https://substrate.dev/docs/en/)
117+
* [Substrate Developer Hub](https://substrate.dev/docs/en/)
118118
* [Substrate Glossary](https://substrate.dev/docs/en/knowledgebase/getting-started/glossary)
119119
* [Substrate Client Library Documentation](https://polkadot.js.org/docs/)
120120
* [Astar Network Audit Reports](https://github.com/AstarNetwork/Audits)
121+
* [Astar Code Documentation](https://astarnetwork.github.io/Astar/)

bin/collator/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "astar-collator"
3-
version = "5.29.0"
3+
version = "5.32.1"
44
description = "Astar collator implementation in Rust."
55
build = "build.rs"
66
default-run = "astar-collator"

0 commit comments

Comments
 (0)