Skip to content

Bridging: Add pallet-assets #2354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
959037c
feat: add bridging targets to Makefile for cargo check and build
mattheworris Apr 22, 2025
5701123
wip: add bridging pallets to Cargo.toml for enhanced asset management
mattheworris Apr 22, 2025
5564680
Merge branch 'main' of github.com:frequency-chain/frequency into 2340…
mattheworris Apr 22, 2025
f6533f2
wip: add check-all target to Makefile and update Cargo.toml for bridg…
mattheworris Apr 22, 2025
0f5e55e
feat: integrate assets pallet for bridging functionality
mattheworris Apr 23, 2025
3051df2
Add frequency-lint-check dependency and include pallet_assets in benc…
mattheworris Apr 23, 2025
f8aa5fb
feat: add start-bridging target to Makefile for bridging initialization
mattheworris Apr 24, 2025
c8e3864
feat: add instant bridging command to init script and update Cargo.to…
mattheworris Apr 24, 2025
ef5ef82
refactor: update references to assets pallet as foreign assets in lib…
mattheworris Apr 24, 2025
bdd025f
Merge branch 'main' of github.com:frequency-chain/frequency into 2340…
mattheworris Apr 24, 2025
aa555f4
refactor: remove unused assets-common dependency from Cargo.toml and …
mattheworris Apr 24, 2025
1c3fbd5
Merge branch 'main' of github.com:frequency-chain/frequency into 2340…
mattheworris Apr 24, 2025
7322a43
refactor: remove commented-out dependencies and unused constants in C…
mattheworris Apr 25, 2025
02efb2a
refactor: update Makefile and Cargo.toml to enhance check-all target …
mattheworris Apr 25, 2025
8488dc3
Merge branch 'feat/eth-briding' of github.com:frequency-chain/frequen…
mattheworris Apr 25, 2025
e1a9146
feat: add support for westend bridging and new asset transaction paym…
mattheworris Apr 25, 2025
bc67eab
refactor: update Makefile and runtime files to improve bridging suppo…
mattheworris Apr 25, 2025
e965153
chore: trigger CI
mattheworris Apr 25, 2025
7126524
refactor: align frequency-bridging feature configuration across modules
mattheworris Apr 25, 2025
1e9c1b2
bug: fix features flags for frequency-bridging
mattheworris Apr 28, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock

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

3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/parityt
pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }

# Bridging Pallets
pallet-assets = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }

# polkadot
polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503" }
polkadot-parachain-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
Expand Down
33 changes: 29 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,16 @@ all: build
clean:
cargo clean

.PHONY: start start-frequency start-frequency-docker start-manual start-interval start-interval-short start-with-offchain start-frequency-with-offchain start-manual-with-offchain start-interval-with-offchain
.PHONY: start start-bridging start-bridging-westend start-frequency start-frequency-docker start-manual start-interval start-interval-short start-with-offchain start-frequency-with-offchain start-manual-with-offchain start-interval-with-offchain
start:
./scripts/init.sh start-frequency-instant

start-bridging:
./scripts/init.sh start-frequency-instant-bridging

start-bridging-westend:
./scripts/init.sh start-frequency-westend-bridging

start-paseo-relay:
./scripts/init.sh start-paseo-relay-chain

Expand Down Expand Up @@ -90,7 +96,7 @@ register:
onboard:
./scripts/init.sh onboard-frequency-paseo-local

.PHONY: onboard-res-local
.PHONY: onboard-debug
onboard-debug:
./scripts/init.sh onboard-res-local

Expand Down Expand Up @@ -244,7 +250,11 @@ docs:
docker-prune:
./scripts/prune_all.sh

.PHONY: check check-no-relay check-local check-testnet check-mainnet
.PHONY: check check-no-relay check-local check-testnet check-mainnet check-bridging
# Add a target to run all checks to check that all existing features work with the addition of 'frequency-bridging'
# which is an add-on feature and not mutually exclusive with the other features.
check-all: check check-no-relay check-local check-testnet check-mainnet check-bridging

check:
SKIP_WASM_BUILD= cargo check --features runtime-benchmarks,frequency-lint-check

Expand All @@ -260,11 +270,20 @@ check-testnet:
check-mainnet:
SKIP_WASM_BUILD= cargo check --features frequency

check-bridging:
SKIP_WASM_BUILD= cargo check --features frequency,frequency-bridging
SKIP_WASM_BUILD= cargo check --features frequency-testnet,frequency-bridging
SKIP_WASM_BUILD= cargo check --features frequency-local,frequency-bridging


.PHONY: js
js:
./scripts/generate_js_definitions.sh

.PHONY: build build-benchmarks build-no-relay build-local build-testnet build-mainnet build-testnet-release build-mainnet-release
.PHONY: build build-benchmarks build-no-relay build-local build-testnet build-mainnet build-testnet-release build-mainnet-release build-bridging-mainnet build-bridging-westend build-all

build-all: build build-benchmarks build-no-relay build-local build-testnet build-mainnet build-testnet-release build-mainnet-release build-bridging-mainnet build-bridging-westend

build:
cargo build --features frequency-no-relay

Expand All @@ -289,6 +308,12 @@ build-testnet-release:
build-mainnet-release:
cargo build --locked --features frequency --release

build-bridging-mainnet:
cargo build --features frequency,frequency-bridging

build-bridging-westend:
cargo build --features frequency-local,frequency-bridging

.PHONY: test e2e-tests e2e-tests-serial e2e-tests-only e2e-tests-load e2e-tests-load-only e2e-tests-testnet-paseo e2e-tests-paseo-local
test:
cargo test --workspace --features runtime-benchmarks,frequency-lint-check
Expand Down
1 change: 1 addition & 0 deletions runtime/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ frequency-testnet = []
frequency-local = []
frequency-no-relay = []
runtime-benchmarks = ["pallet-collective/runtime-benchmarks"]
frequency-bridging = []
std = [
"frame-support/std",
"frame-system/std",
Expand Down
Loading