Skip to content

Commit

Permalink
Merge branch 'dev' into aio-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Kailai-Wang committed Sep 19, 2024
2 parents 75fcd7f + 70e0977 commit 91ce6cf
Show file tree
Hide file tree
Showing 112 changed files with 10,254 additions and 315 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/benchmark-runtime-weights.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ on:
description: rococo
required: true
default: true
paseo:
type: boolean
description: paseo
required: true
default: true
pallets:
description: pallets to benchmark, * for all, or comma listed (e.g. frame-system,pallet-proxy)
default: "*"
Expand Down Expand Up @@ -84,6 +89,9 @@ jobs:
if [ "${{ github.event.inputs.rococo }}" = "true" ]; then
chain="$chain rococo"
fi
if [ "${{ github.event.inputs.paseo }}" = "true" ]; then
chain="$chain paseo"
fi
if [ "$chain" = "" ]; then
echo "::error::Please select at least one chain."
exit 1
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
options:
- litentry
- rococo
- paseo
ref:
description: The commit SHA or tag for checking out code
default: ""
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,7 @@ jobs:
chain:
- litentry
- rococo
- paseo
name: ${{ matrix.chain }}
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/create-release-draft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ on:
options:
- none
- rococo
- paseo
- litentry

env:
Expand Down Expand Up @@ -76,6 +77,7 @@ jobs:
matrix:
chain:
- rococo
- paseo
- litentry
name: ${{ matrix.chain }}
steps:
Expand Down
116 changes: 116 additions & 0 deletions Cargo.lock

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

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ members = [
'primitives/hex',
'runtime/litentry',
'runtime/rococo',
'runtime/paseo',
'runtime/common',
]
exclude = [
Expand Down Expand Up @@ -251,6 +252,7 @@ litentry-hex-utils = { path = "primitives/hex", default-features = false }
runtime-common = { path = "runtime/common", default-features = false }
litentry-parachain-runtime = { path = "runtime/litentry", default-features = false }
rococo-parachain-runtime = { path = "runtime/rococo", default-features = false }
paseo-parachain-runtime = { path = "runtime/paseo", default-features = false }
pallet-account-fix = { path = "pallets/account-fix", default-features = false }
pallet-asset-manager = { path = "pallets/xcm-asset-manager", default-features = false }
pallet-assets-handler = { path = "pallets/bridge/assets-handler", default-features = false }
Expand Down
15 changes: 11 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ build-runtime-litentry:
build-runtime-rococo:
cargo build --locked -p $(call pkgid, rococo-parachain-runtime) --release

.PHONY: build-runtime-paseo ## Build paseo release runtime
build-runtime-paseo:
cargo build --locked -p $(call pkgid, paseo-parachain-runtime) --release

.PHONY: build-docker-release ## Build docker image using cargo profile `release`
build-docker-release:
@./scripts/build-docker.sh release latest
Expand Down Expand Up @@ -72,6 +76,10 @@ launch-network-rococo:
launch-network-litentry:
@./scripts/launch-network.sh litentry

.PHONY: launch-network-paseo ## Launch a local litentry network with relaychain network
launch-network-paseo:
@./scripts/launch-network.sh paseo

# run tests

.PHONY: test-cargo-all ## cargo test --all
Expand All @@ -90,21 +98,21 @@ test-ts-litentry: launch-network-litentry
test-ts-rococo: launch-network-rococo
@./scripts/run-ts-test.sh rococo bridge evm

.PHONY: test-ts-paseo ## Run paseo ts tests without clean-up
test-ts-paseo: launch-network-paseo
@./scripts/run-ts-test.sh paseo bridge evm

# clean up

.PHONY: clean-network ## Clean up the network launched by 'launch-network'
clean-network:
@./scripts/clean-network.sh

# update dependencies

.PHONY: update-ts-dep ## update ts-tests dependencies
update-ts-dep:
@cd ts-tests && pnpm dlx npm-check-updates -u && pnpm install

# format

.PHONY: fmt ## (cargo, taplo, ts, solidity) fmt
fmt: fmt-cargo fmt-taplo fmt-ts fmt-contract

Expand Down Expand Up @@ -136,7 +144,6 @@ githooks:
git config core.hooksPath .githooks

# clippy

.PHONY: clippy ## cargo clippy
clippy:
SKIP_WASM_BUILD=1 cargo clippy --workspace --all-targets --all-features -- -D warnings
Expand Down
3 changes: 2 additions & 1 deletion bitacross-worker/litentry/primitives/src/validation_data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ use codec::{Decode, Encode, MaxEncodedLen};
use scale_info::TypeInfo;
use sp_runtime::{traits::ConstU32, BoundedVec};

pub type ValidationString = BoundedVec<u8, ConstU32<64>>;
// The size limit value should be 128 otherwise the message size will exceed the limit while link identity.
pub type ValidationString = BoundedVec<u8, ConstU32<128>>;

#[derive(Encode, Decode, Clone, Debug, PartialEq, Eq, TypeInfo, MaxEncodedLen)]
#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
Expand Down
Loading

0 comments on commit 91ce6cf

Please sign in to comment.