Skip to content
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

chore: merge upstream #2

Merged
merged 7 commits into from
May 7, 2024
Merged

chore: merge upstream #2

merged 7 commits into from
May 7, 2024

Conversation

evilrobot-01
Copy link

No description provided.

evilrobot-01 and others added 4 commits May 3, 2024 19:58
* chore: pin rust channel to version used for polkadot

* style: formatting using rust version

* refactor: address clippy warnings

* ci: add workflow

* ci: add missing packages

* ci: various fixes

* ci: use cache
* fix(base): delivery fees

* fix(base): declare WeightInfo for every pallet

* style(base): fmt

* style(base): undo fmt

* fix(base): remove example zombienet file

* fix(base): Add treasury clarification

* fix(base): weights & benchmarks

* fix: remove erroneous pallets

* docs: add benchmark comment for consistency

* fix(runtime): use unit type for weightinfo for consistency

* docs(runtime): add additional context

* fix(xcm): filter teleports to disable

---------

Co-authored-by: Frank Bell <[email protected]>
@evilrobot-01 evilrobot-01 requested review from al3mart, AlexD10S, peterwht and Daanvdplas and removed request for al3mart May 6, 2024 11:04
@evilrobot-01 evilrobot-01 force-pushed the frank/merge-upstream branch from 14afa7d to 8b998ae Compare May 6, 2024 14:14
…merge-upstream

# Conflicts:
#	node/src/chain_spec.rs
#	runtime/src/lib.rs
#	runtime/src/xcm_config.rs
@evilrobot-01 evilrobot-01 force-pushed the frank/merge-upstream branch from 7d53b16 to 7dc4c3b Compare May 6, 2024 14:21
@evilrobot-01 evilrobot-01 merged commit d697d06 into main May 7, 2024
5 checks passed
@evilrobot-01 evilrobot-01 deleted the frank/merge-upstream branch May 7, 2024 22:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants