Merged
Conversation
* Upgrade polkadot-v0.9.31 * Update authority/src/lib.rs Co-authored-by: Xiliang Chen <xlchen1291@gmail.com> * fix tests Co-authored-by: Xiliang Chen <xlchen1291@gmail.com>
* Update Readme Plasm Network rebranded last year to Astar Network Source: https://medium.com/astar-network/plasm-rebrands-to-astar-network-in-pursuit-of-becoming-a-polkadot-native-dapp-hub-6db3121c4f13 * Update README.md Change order
…-stack#834) * feat(tokens): Refactor hooks into single trait * feat(tokens): Add post-hooks for Transfer and Deposit * chore(tokens): improve mutation hook naming
* fix(tokens): PostDeposit hook * test(tokens): posthook correctness * fix(tokens): use `assert` instead of `ensure` in mock posthooks
…b3-stack#841) * refactor: make weight argument in xtokens be of type WeightLimit * refactor: rename dest_weight -> dest_weight_limit
* prevent nested DelayedOrigin * fix deps * Update authority/src/tests.rs Co-authored-by: zjb0807 <zjb0807@qq.com> * allow nested DelayedOrigin * update docstring * typo fix Co-authored-by: zjb0807 <zjb0807@qq.com>
* Add try-runtime feature for orml-payments * Add features
* Update README.md Update modules description * Update README.md Further updates on description.
* Update github actions * trigger GitHub actions
* Changed `vested_transfer` extrinsic behavior. Fixed self-vesting case (`from` == `to`) when it was possible to self-freeze funds above the current account balance. * added test for self-vesting case
* build: upgrade to polkadot v0.9.36 Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> * style: fix formatting Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> * fix: polkadot dependency references Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> * build: use released cumulus Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> * fix: make asset_exists return false Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
* Fix payments on-idle (open-web3-stack#868) * fix payments on-idle * update comment * Switch to Rust-1.66 (open-web3-stack#869) * feat: derive MEL for Value enum (open-web3-stack#867) * feat: impl MEL for Value enum * fmt: fix * feat:Make the XcmTransfer trait support transfer_multiasset_with_fee (open-web3-stack#870) * update bencher deps (open-web3-stack#872) * add BenchmarkError::Weightless (open-web3-stack#873) * add BenchmarkError::Weightless * Update benchmarking/src/lib.rs Co-authored-by: zjb0807 <zjb0807@qq.com> Co-authored-by: zjb0807 <zjb0807@qq.com> * Update jsonrpsee 0.16.2 (open-web3-stack#876) * Update jsonrpsee 0.16.2 * fix clippy * fix clippy Co-authored-by: William Freudenberger <w.freude@icloud.com> Co-authored-by: NingBo Wang <2536935847@qq.com> Co-authored-by: Ermal Kaleci <ermalkaleci@gmail.com> Co-authored-by: Andrew Plaza <aplaza@liquidthink.net>
mateuszaaa
requested changes
Feb 1, 2023
Member
mateuszaaa
left a comment
mateuszaaa
left a comment
There was a problem hiding this comment.
Looks like a lot of conflits that has been not resolved properly ?
for example
removal of transfer_multiasset_with_fee from traits/src/xcm_transfer.rs
or modifications in bencher directory comparing to vanilla impl.
please make sure that as a result of
git diff parity/polkadot-v0.9.36 --stat
lists only files we actully modified, that makes pr review much easier, and reduces possibility of missing something some important change
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
15 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.