Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Asset Conversion release to westmint #2148

Merged
merged 75 commits into from
Jun 23, 2023
Merged

Asset Conversion release to westmint #2148

Show file tree
Hide file tree
Changes from 53 commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
7937347
Dex and payment by dex in westmint
gilescope Jan 27, 2023
011d55c
Wrap U256 type for now
gilescope Jan 31, 2023
06aea56
cargo fmt
gilescope Jan 31, 2023
4a934c3
We can now use U256
gilescope Feb 6, 2023
195343d
Rename PromotedBalance
gilescope Feb 7, 2023
7da2f5e
Merge branch 'master' into giles-dex-as-you-pay
gilescope Apr 12, 2023
dd051c8
name change
gilescope Apr 12, 2023
633972d
Merge branch 'master' into giles-dex-as-you-pay
gilescope Apr 12, 2023
7aff0ff
Updating the code to master.
gilescope Apr 19, 2023
1f818bb
cargo fmt
gilescope Apr 19, 2023
71d232b
Minimising changes and step towards getting benchmarks compiling
gilescope Apr 19, 2023
7384ec8
minimise diff
gilescope Apr 19, 2023
47e2c03
Update parachains/runtimes/assets/westmint/src/lib.rs
gilescope Apr 20, 2023
9d8cd2d
Update parachains/runtimes/assets/westmint/src/lib.rs
gilescope Apr 20, 2023
90ebef5
Update parachains/common/src/impls.rs
gilescope Apr 20, 2023
68749d0
Fix benchmark build
gilescope Apr 20, 2023
ecd3775
Add in AssetConversionAPI
gilescope Apr 21, 2023
5680a41
Merge branch 'master' into giles-dex-as-you-pay
gilescope Apr 26, 2023
f077e40
Handle dust
gilescope Apr 26, 2023
fa0691c
cargo fmt
gilescope Apr 26, 2023
754493d
Don't need to be explicit that it's AccountId32
gilescope Apr 26, 2023
971466a
Merge branch 'master' into giles-dex-as-you-pay
gilescope Apr 26, 2023
10ea7ba
remove pool setup fee
gilescope Apr 27, 2023
06c32a3
More natural way to specify native
gilescope Apr 27, 2023
3fbffa1
cargo fmt
gilescope May 2, 2023
6854cc1
Update parachains/runtimes/assets/westmint/src/lib.rs
jsidorenko May 9, 2023
181b1e2
Merge branch 'master' into giles-dex-as-you-pay
gilescope May 16, 2023
a91fc5f
Additional required impls
gilescope May 16, 2023
1e86574
either form of multilocation should be acceptable.
gilescope May 21, 2023
084bd2c
add call filter exclusion
gilescope May 21, 2023
e12c3cd
Merge branch 'master' into giles-dex-as-you-pay
gilescope May 22, 2023
3a8be24
Merge branch 'master' into giles-dex-as-you-pay
gilescope May 23, 2023
317b8c9
Merge branch 'master' into giles-dex-as-you-pay
gilescope May 24, 2023
625fb3d
Merge branch 'master' into giles-dex-as-you-pay
gilescope May 26, 2023
2ed9c58
Fix typo & try_convert now fails if native is converted
gilescope May 27, 2023
6b49a8e
Merge branch 'master' into giles-dex-as-you-pay
gilescope Jun 1, 2023
24ab261
merge master fixup
gilescope Jun 1, 2023
a11033a
Fix: HoldReason should be there.
gilescope Jun 1, 2023
17bde6f
Box MultiAssetId
gilescope Jun 2, 2023
074cb2c
Merge branch 'master' into giles-dex-as-you-pay
gilescope Jun 2, 2023
c5776a9
cargo fmt
gilescope Jun 2, 2023
df5c81b
update lock file
gilescope Jun 2, 2023
cc5c5c2
add std feature, update lock file
gilescope Jun 2, 2023
90c1e3a
need to turn on std on common
gilescope Jun 2, 2023
679c17b
adding in westmint tests
gilescope Jun 5, 2023
80ca7bb
WeightToFee must be from the destination chain.
gilescope Jun 5, 2023
4104baf
cargo fmt
gilescope Jun 5, 2023
8b6dbbd
account for higher ED on westmint
gilescope Jun 5, 2023
9065005
type removed as not used
gilescope Jun 5, 2023
7e1ed54
Merge branch 'master' into giles-dex-as-you-pay
gilescope Jun 5, 2023
eb9610a
cargo fmt
gilescope Jun 5, 2023
3c2f289
remove unused import
gilescope Jun 5, 2023
82833c4
minimising diff
gilescope Jun 5, 2023
80883a9
import needed only with feature enabled
gilescope Jun 7, 2023
f05f63c
use multilocation contains
gilescope Jun 7, 2023
d757d57
move the impls to separate file
gilescope Jun 7, 2023
6cab3d5
simplify on conversion
gilescope Jun 7, 2023
2de6b05
simplify on reverse conversion also.
gilescope Jun 7, 2023
bb24a2e
rename var
gilescope Jun 7, 2023
6cde079
clippy
gilescope Jun 8, 2023
abdd530
removed dead code
gilescope Jun 9, 2023
f085b1e
cargo fmt
gilescope Jun 9, 2023
6d28107
Merge branch 'master' into giles-dex-as-you-pay
gilescope Jun 15, 2023
b1f7e6d
Use pay by swap
gilescope Jun 16, 2023
ab6c2cd
review suggestions
gilescope Jun 16, 2023
50cb182
cargo fmt
gilescope Jun 16, 2023
bd16ba5
merge master
joepetrowski Jun 21, 2023
dd2747b
merge master
joepetrowski Jun 23, 2023
ea36313
Update parachains/runtimes/assets/asset-hub-westend/src/lib.rs
gilescope Jun 23, 2023
b2f7630
add benchmarks for new assets pallet
joepetrowski Jun 23, 2023
9bc098a
Merge remote-tracking branch 'origin' into giles-dex-as-you-pay
joepetrowski Jun 23, 2023
ee83ea3
revert common/src changes
joepetrowski Jun 23, 2023
464f917
need a concrete id
joepetrowski Jun 23, 2023
bb77fa5
more fixes
joepetrowski Jun 23, 2023
04d6262
lock
joepetrowski Jun 23, 2023
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
6 changes: 6 additions & 0 deletions Cargo.lock
View file
Open in desktop

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

5 changes: 5 additions & 0 deletions parachains/common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"], default-features = false }
scale-info = { version = "2.7.0", default-features = false, features = ["derive"] }
num-traits = { version = "0.2", default-features = false}

# Substrate
frame-support = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" }
Expand All @@ -19,6 +20,7 @@ pallet-asset-tx-payment = { git = "https://github.com/paritytech/substrate", def
pallet-assets = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" }
pallet-authorship = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" }
pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" }
pallet-asset-conversion = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" }
sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" }
sp-io = { git = "https://github.com/paritytech/substrate", default-features = false , branch = "master" }
Expand All @@ -33,6 +35,7 @@ xcm-executor = { git = "https://github.com/paritytech/polkadot", default-feature

# Cumulus
pallet-collator-selection = { path = "../../pallets/collator-selection", default-features = false }
cumulus-primitives-core = { path = "../../primitives/core", default-features = false }
cumulus-primitives-utility = { path = "../../primitives/utility", default-features = false }

[dev-dependencies]
Expand All @@ -47,6 +50,7 @@ default = ["std"]
std = [
"frame-support/std",
"frame-system/std",
"pallet-asset-conversion/std",
"pallet-asset-tx-payment/std",
gilescope marked this conversation as resolved.
Show resolved Hide resolved
"pallet-assets/std",
"pallet-authorship/std",
Expand All @@ -56,6 +60,7 @@ std = [
"sp-io/std",
"sp-std/std",
"pallet-collator-selection/std",
"cumulus-primitives-core/std",
"cumulus-primitives-utility/std",
"xcm/std",
"xcm-executor/std",
Expand Down
Loading