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

Update to 0.9.42 #382

Merged
merged 104 commits into from
Mar 20, 2024
Merged
Show file tree
Hide file tree
Changes from 102 commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
7907069
first changes
gianfra-t Dec 12, 2023
6b21cc9
wip updating modified pallet configs
gianfra-t Dec 12, 2023
bb83de6
wip updating modified pallet configs 2
gianfra-t Dec 13, 2023
8055708
updgrade to v0.9.42 completed
gianfra-t Dec 14, 2023
b59dcb3
avoid using VeMinting pallet in farming
gianfra-t Dec 14, 2023
ace3cc2
re-run benchmarks pallet-xcm
gianfra-t Dec 14, 2023
531cbaf
modify default deposit limit for amplitude
gianfra-t Dec 15, 2023
8e3a548
fix for try-runtime features
gianfra-t Dec 29, 2023
f458136
merged with main
gianfra-t Dec 29, 2023
a9b64e1
reorg imports
gianfra-t Dec 29, 2023
d35ad45
merged with main
gianfra-t Jan 3, 2024
9ba6e33
merged with compile-with-try-runtime
gianfra-t Jan 3, 2024
9dc0dd7
fixes after merge with try-runtime fix
gianfra-t Jan 3, 2024
eaa4cbf
wip add custom update code, workaround for TakeFirstAsset trader
gianfra-t Jan 3, 2024
52ffc97
wip patching scheduler and xcm
gianfra-t Jan 5, 2024
64f49ca
patching 2
gianfra-t Jan 5, 2024
31fcc00
add storage versions
gianfra-t Jan 10, 2024
b91d0ce
Merge branch 'main' into update-to-0.9.42
gianfra-t Jan 10, 2024
ccdd089
fix for storage version definition
gianfra-t Jan 10, 2024
a3a795b
Use proper return values for vesting migration
ebma Jan 11, 2024
fd60b60
remove vesting migration since it is not needed
gianfra-t Jan 11, 2024
6a6e9d2
add transaction payment and vesting custom migrations to set version
gianfra-t Jan 11, 2024
aa3f7c8
rollback on version change, fix some spacewalk revision
gianfra-t Jan 11, 2024
4152f43
fix incorrect spacewalk revision, add variable writes for custom upgr…
gianfra-t Jan 11, 2024
6f3f9ac
add foucoco storage version updates
gianfra-t Jan 11, 2024
13f9321
use right number of reads for amplitude custom on runtime upgrade
gianfra-t Jan 11, 2024
b1ad3f1
WIP
bogdanS98 Jan 11, 2024
dd83e1b
Fmt
bogdanS98 Jan 11, 2024
3ff7277
Add comment
bogdanS98 Jan 11, 2024
dcc6a4b
Still wip
bogdanS98 Jan 12, 2024
d998215
Fmt
bogdanS98 Jan 12, 2024
0afee4a
Add doc comments
bogdanS98 Jan 12, 2024
a4a5cf5
Fix warning
ebma Jan 12, 2024
3e7b9bb
Address change requests
bogdanS98 Jan 12, 2024
edc4d94
Fmt
bogdanS98 Jan 12, 2024
1359c94
Add comment
bogdanS98 Jan 12, 2024
dc68751
Add fee for basic asset
bogdanS98 Jan 15, 2024
069d17e
Fmt
bogdanS98 Jan 15, 2024
67f3513
Return NoPrice error when price fetching fails
bogdanS98 Jan 15, 2024
beb234b
Add signed extension
bogdanS98 Jan 15, 2024
2479198
Add first iteration of mock
bogdanS98 Jan 26, 2024
449296a
Allow only XCM assets for buyout
bogdanS98 Jan 26, 2024
69a81c7
Update mock to only allow specific XCM assets
bogdanS98 Jan 26, 2024
b8cda83
Add tests and benchmarks - still wip
bogdanS98 Jan 30, 2024
95035a4
Fmt
bogdanS98 Jan 31, 2024
eebf511
Handle currency id in benchmarks
bogdanS98 Jan 31, 2024
a75ad1a
Update comments
bogdanS98 Jan 31, 2024
560268b
Remove benchmark comment
bogdanS98 Jan 31, 2024
be4f99a
Fix benchmarks and tests, add pallet to Foucoco, switch from UnixTime…
bogdanS98 Feb 1, 2024
19932f9
Merge remote-tracking branch 'origin' into 395-implement-pallet-that-…
bogdanS98 Feb 1, 2024
4aaee33
Fmt
bogdanS98 Feb 1, 2024
f2d1eda
Refactor dot currency id in tests
bogdanS98 Feb 2, 2024
8bae6e8
Small refactor for test attempt_buyout_after_buyout_limit_exceeded_fails
bogdanS98 Feb 2, 2024
11d9609
Update comments
bogdanS98 Feb 2, 2024
d224292
Small refactor
bogdanS98 Feb 2, 2024
e07318c
Add comment in Foucoco runtime
bogdanS98 Feb 2, 2024
fa68d4d
Add comment in Foucoco runtime
bogdanS98 Feb 2, 2024
de93547
Update comment
bogdanS98 Feb 2, 2024
9a19333
Update comment
bogdanS98 Feb 2, 2024
b2e2f17
Add signed extension to runtime
bogdanS98 Feb 2, 2024
f02fbc8
Add comment
bogdanS98 Feb 2, 2024
4fa8b91
Fix indentation in tests
bogdanS98 Feb 2, 2024
fe04294
Fix indentation in tests
bogdanS98 Feb 2, 2024
7c46f0b
Fix indentation in tests
bogdanS98 Feb 2, 2024
382b0d3
Fix indentation in tests
bogdanS98 Feb 2, 2024
66a86da
Update comment
bogdanS98 Feb 2, 2024
96af52c
Fix building project with runtime benchmarks flag
bogdanS98 Feb 2, 2024
d8c6738
Address change requests
bogdanS98 Feb 5, 2024
d31c2b0
Merge branch '395-implement-pallet-that-extends-our-current-treasury-…
bogdanS98 Feb 5, 2024
d4fcb93
Small refactor for asset registry benchmarks
bogdanS98 Feb 5, 2024
510b4ff
Fix compiler warning
bogdanS98 Feb 5, 2024
9e8f129
Address change requests
bogdanS98 Feb 5, 2024
f3ebd72
Update comment
bogdanS98 Feb 5, 2024
d020484
Optimise fetching oracle price for benchmarks and regenerate weights
bogdanS98 Feb 5, 2024
8352c1c
Merge branch '395-implement-pallet-that-extends-our-current-treasury-…
bogdanS98 Feb 5, 2024
470b0e7
Fmt
bogdanS98 Feb 5, 2024
5cc4cca
using fee per second value for relative fee adjusting
gianfra-t Feb 5, 2024
433206e
WIP
gianfra-t Feb 6, 2024
eb0de40
fixing xcm integration tests
gianfra-t Feb 6, 2024
420815f
fix pendulum integration tests, reuse v3 location
gianfra-t Feb 6, 2024
53bfb97
cleanup imports, reuse type for fee distribution
gianfra-t Feb 6, 2024
118b3d5
cleanup and format
gianfra-t Feb 6, 2024
e9f76e7
more cleanup
gianfra-t Feb 6, 2024
39ea1dc
Merge branch '395-implement-pallet-that-extends-our-current-treasury-…
gianfra-t Feb 6, 2024
d8674cf
more import cleaning and fixes after merging with future CustomMetada…
gianfra-t Feb 6, 2024
7ba5243
Merge branch 'main' into 393-use-fee_per_second-from-asset-metadata-i…
bogdanS98 Feb 7, 2024
87db579
moving implementation
gianfra-t Feb 16, 2024
dc679f1
Merge branch '393-use-fee_per_second-from-asset-metadata-in-xcm-confi…
gianfra-t Feb 16, 2024
fb74127
merged main
gianfra-t Feb 19, 2024
40628ce
modify expected fees in tests
gianfra-t Feb 19, 2024
d12ac51
added current xcm config to foucoco
gianfra-t Feb 19, 2024
b381318
removing unused constants
gianfra-t Feb 26, 2024
049c215
fully remove alice test account
gianfra-t Feb 27, 2024
cda5ffe
merged upstream
gianfra-t Feb 28, 2024
04583a8
merged with main
gianfra-t Feb 28, 2024
b084a87
use multipliers for fee expected constants in tests
gianfra-t Feb 28, 2024
ed05812
merged with fee per second
gianfra-t Feb 28, 2024
95f6f38
Update runtime/pendulum/src/lib.rs
gianfra-t Mar 1, 2024
68782d4
removal of comments, package-lock.json
gianfra-t Mar 1, 2024
3005534
merged with main
gianfra-t Mar 18, 2024
8aaa489
replace spacewalk dependencies
gianfra-t Mar 19, 2024
caf8bd4
fix to compile with try runtime
gianfra-t Mar 19, 2024
d7ac3ab
Revert "merged with fee per second"
gianfra-t Mar 20, 2024
7243901
remove todos with mock implementations to be safe
gianfra-t Mar 20, 2024
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,573 changes: 972 additions & 601 deletions Cargo.lock

Large diffs are not rendered by default.

18 changes: 12 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,21 @@ members = [
# need this because of bifrost farming dependency in runtime
# bifrost farming uses different orml-traits for orml-currencies
[patch."https://github.com/open-web3-stack/open-runtime-module-library"]
orml-traits = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch = "polkadot-v0.9.40" }
orml-traits = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch = "polkadot-v0.9.42" }

# need this because of bifrost farming dependency in runtime
# bifrost uses :
# orml packages { version = "0.4.1-dev" }
# zenlink packages { version = "*" }
[patch.crates-io]
orml-traits = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch = "polkadot-v0.9.40" }
orml-currencies = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch = "polkadot-v0.9.40" }
orml-tokens = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch = "polkadot-v0.9.40" }
zenlink-protocol = { git = "https://github.com/pendulum-chain/Zenlink-DEX-Module", branch = "polkadot-v0.9.40-protocol" }
zenlink-protocol-runtime-api = { git = "https://github.com/pendulum-chain/Zenlink-DEX-Module", branch = "polkadot-v0.9.40-protocol" }
orml-traits = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch = "polkadot-v0.9.42" }
orml-currencies = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch = "polkadot-v0.9.42" }
orml-tokens = { git = "https://github.com/open-web3-stack//open-runtime-module-library", branch = "polkadot-v0.9.42" }
zenlink-protocol = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", branch = "polkadot-v0.9.42" }
zenlink-protocol-runtime-api = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", branch = "polkadot-v0.9.42" }


[patch.'https://github.com/paritytech/substrate']
pallet-vesting = { git = "https://github.com/pendulum-chain/patch-pallet-vesting-transaction-storage", branch = "polkadot-v0.9.42" }
pallet-transaction-payment = { git = "https://github.com/pendulum-chain/patch-pallet-vesting-transaction-storage", branch = "polkadot-v0.9.42" }

125 changes: 63 additions & 62 deletions node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ codec = { package = "parity-scale-codec", version = "3.0.0" }
serde = { version = "1.0.145", features = ["derive"] }
jsonrpsee = { version = "0.16.2", features = ["server"] }

module-issue-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev = "bda384bcc6db3da88198c714851a261dcdea1063" }
module-oracle-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev = "bda384bcc6db3da88198c714851a261dcdea1063" }
module-redeem-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev = "bda384bcc6db3da88198c714851a261dcdea1063" }
module-replace-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev = "bda384bcc6db3da88198c714851a261dcdea1063" }
module-vault-registry-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev = "bda384bcc6db3da88198c714851a261dcdea1063" }
module-issue-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev = "3c03e759a6f600ea72d636d4f9cc4b05d633201c"}
module-oracle-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev = "3c03e759a6f600ea72d636d4f9cc4b05d633201c"}
module-redeem-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev = "3c03e759a6f600ea72d636d4f9cc4b05d633201c"}
module-replace-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev = "3c03e759a6f600ea72d636d4f9cc4b05d633201c"}
module-vault-registry-rpc = { git = "https://github.com/pendulum-chain/spacewalk", rev = "3c03e759a6f600ea72d636d4f9cc4b05d633201c"}
module-pallet-staking-rpc = { path = "../pallets/parachain-staking/rpc" }
spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", rev = "bda384bcc6db3da88198c714851a261dcdea1063" }
spacewalk-primitives = { git = "https://github.com/pendulum-chain/spacewalk", rev = "3c03e759a6f600ea72d636d4f9cc4b05d633201c"}

# Local
amplitude-runtime = { path = "../runtime/amplitude" }
Expand All @@ -30,71 +30,72 @@ pendulum-runtime = { path = "../runtime/pendulum" }
runtime-common = { path = "../runtime/common" }

# Substrate
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
pallet-multisig = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.40" }
pallet-treasury = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.40" }
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sc-network-sync = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
pallet-multisig = {git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42"}
pallet-treasury = {git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.42"}
pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sc-network-sync = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sc-sysinfo = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sc-transaction-pool-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sp-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
substrate-frame-rpc-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
try-runtime-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }

# Polkadot
polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.40" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.40" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.40" }
xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.40" }
polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.42" }
xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.42" }

# Cumulus
cumulus-client-cli = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.40" }
cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.40" }
cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.40" }
cumulus-client-network = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.40" }
cumulus-client-service = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.40" }
cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.40" }
cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.40" }
cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.40" }
cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.40" }
cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.40" }
cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.40" }
cumulus-client-cli = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.42" }
cumulus-client-consensus-aura = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.42" }
cumulus-client-consensus-common = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.42" }
cumulus-client-network = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.42" }
cumulus-client-service = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.42" }
cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.42" }
cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.42" }
cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.42" }
cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.42" }
cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.42" }
cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.42" }

#bifrost
bifrost-farming-rpc-api = { git = "https://github.com/pendulum-chain/bifrost", branch = "polkadot-v0.9.40-farming-add-currencyid-generic" }
bifrost-farming-rpc-runtime-api = { git = "https://github.com/pendulum-chain/bifrost", branch = "polkadot-v0.9.40-farming-add-currencyid-generic" }
bifrost-farming-rpc-api = { git = "https://github.com/pendulum-chain/bifrost", branch = "upgrade-v0.9.42" }
bifrost-farming-rpc-runtime-api = { git = "https://github.com/pendulum-chain/bifrost", branch = "upgrade-v0.9.42" }

zenlink-protocol = { git = "https://github.com/pendulum-chain/Zenlink-DEX-Module", branch = "polkadot-v0.9.40-protocol" }
zenlink-protocol-rpc = { git = "https://github.com/pendulum-chain/Zenlink-DEX-Module", branch = "polkadot-v0.9.40-protocol" }
zenlink-protocol-runtime-api = { git = "https://github.com/pendulum-chain/Zenlink-DEX-Module", branch = "polkadot-v0.9.40-protocol" }
zenlink-protocol = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", branch = "polkadot-v0.9.42" }
zenlink-protocol-rpc = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", branch = "polkadot-v0.9.42" }
zenlink-protocol-runtime-api = { git = "https://github.com/zenlinkpro/Zenlink-DEX-Module", branch = "polkadot-v0.9.42" }

[build-dependencies]
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.40" }
substrate-build-script-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }

[features]
default = []
Expand Down
3 changes: 2 additions & 1 deletion node/src/chain_spec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -537,8 +537,9 @@ fn foucoco_genesis(

let token_balances = balances
.iter()
.flat_map(|k| vec![(k.0.clone(), XCM(0), u128::pow(10, 18))])
.flat_map(|k| vec![(k.0.clone(), XCM(0), 10*u128::pow(10, 18)), (k.0.clone(), XCM(6), 10*u128::pow(10, 18)), (k.0.clone(), CurrencyId::StellarNative, 10*u128::pow(10, 18))])
.collect();


let stakers: Vec<_> = invulnerables
.iter()
Expand Down
32 changes: 27 additions & 5 deletions node/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ use sc_service::config::{BasePath, PrometheusConfig};
use sp_core::hexdisplay::HexDisplay;
use sp_runtime::traits::{AccountIdConversion, Block as BlockT};

#[cfg(feature = "try-runtime")]
use try_runtime_cli::block_building_info::substrate_info;

#[cfg(feature = "try-runtime")]
use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch};

use crate::{
chain_spec::{self, ParachainExtensions},
cli::{Cli, RelayChainCli, Subcommand},
Expand All @@ -23,6 +29,11 @@ use crate::{
},
};

#[cfg(feature = "try-runtime")]
/// The time internavel for block production on our chain in milliseconds (12
/// seconds to millis)
const BLOCK_TIME_MILLIS: u64 = 12 * 1_000;

#[derive(PartialEq, Eq)]
enum ChainIdentity {
Amplitude,
Expand Down Expand Up @@ -240,6 +251,8 @@ macro_rules! construct_async_run {
}}
}



/// Parse command line arguments into service configuration.
pub fn run() -> Result<()> {
let cli = Cli::from_args();
Expand Down Expand Up @@ -361,18 +374,27 @@ pub fn run() -> Result<()> {
// grab the task manager.
let registry = &runner.config().prometheus_config.as_ref().map(|cfg| &cfg.registry);
let task_manager =
TaskManager::new(runner.config().tokio_handle.clone(), *registry)
sc_service::TaskManager::new(runner.config().tokio_handle.clone(), *registry)
.map_err(|e| format!("Error: {:?}", e))?;

match runner.config().chain_spec.identify() {
ChainIdentity::Amplitude => runner.async_run(|config| {
Ok((cmd.run::<Block, AmplitudeRuntimeExecutor>(config), task_manager))
Ok((cmd.run::<Block, ExtendedHostFunctions<
sp_io::SubstrateHostFunctions,
<AmplitudeRuntimeExecutor as NativeExecutionDispatch>::ExtendHostFunctions,
>, _>(Some(substrate_info(BLOCK_TIME_MILLIS))), task_manager))
}),
ChainIdentity::Foucoco => runner.async_run(|config| {
Ok((cmd.run::<Block, FoucocoRuntimeExecutor>(config), task_manager))
Ok((cmd.run::<Block, ExtendedHostFunctions<
sp_io::SubstrateHostFunctions,
<FoucocoRuntimeExecutor as NativeExecutionDispatch>::ExtendHostFunctions,
>, _>(Some(substrate_info(BLOCK_TIME_MILLIS))), task_manager))
}),
ChainIdentity::Pendulum => runner.async_run(|config| {
Ok((cmd.run::<Block, PendulumRuntimeExecutor>(config), task_manager))
Ok((cmd.run::<Block, ExtendedHostFunctions<
sp_io::SubstrateHostFunctions,
<PendulumRuntimeExecutor as NativeExecutionDispatch>::ExtendHostFunctions,
>, _>(Some(substrate_info(BLOCK_TIME_MILLIS))), task_manager))
}),
}
} else {
Expand Down Expand Up @@ -405,7 +427,7 @@ pub fn run() -> Result<()> {
let id = ParaId::from(para_id);

let parachain_account =
AccountIdConversion::<polkadot_primitives::v2::AccountId>::into_account_truncating(&id);
AccountIdConversion::<polkadot_primitives::v4::AccountId>::into_account_truncating(&id);

let state_version = Cli::native_runtime_version(&config.chain_spec).state_version();
let block: Block = generate_genesis_block(&*config.chain_spec, state_version)
Expand Down
1 change: 1 addition & 0 deletions node/src/constants/foucoco.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ pub const COLLATOR_ADDITIONAL: Balance = 10 * UNIT;

pub const OFF_CHAIN_WORKER_ADDRESS: &str = "6m69vWMouLarYCbJGJisVaDDpfNGETkD5hsDWf2T7osW4Cn1";


pub const TOKEN_DECIMALS: u32 = 12;

pub const INITIAL_SUDO_SIGNATORIES: [&str; 5] = [
Expand Down
Loading
Loading