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

Girazoki local assets #1279

Merged
merged 226 commits into from
Apr 4, 2022
Merged
Show file tree
Hide file tree
Changes from 217 commits
Commits
Show all changes
226 commits
Select commit Hold shift + click to select a range
423fd29
Add new instance of pallet-assets
girazoki Jan 7, 2022
933be07
start building allowance for local asset creation
girazoki Jan 7, 2022
d446b80
Local Asset creator implementation
girazoki Jan 7, 2022
81c79c9
Add local asset transactor
girazoki Jan 7, 2022
eddd76d
Add local asset
girazoki Jan 7, 2022
a07d465
Add dual support in moonbase
girazoki Jan 31, 2022
eb01f6a
Add tests for proving both representations are handled
girazoki Jan 31, 2022
ffa8a38
Typescript tests for reanchoring
girazoki Jan 31, 2022
566a294
Cleaning and documenting
girazoki Jan 31, 2022
4c0bc9c
More docu
girazoki Jan 31, 2022
77e6bbc
fix docu of teleports
girazoki Jan 31, 2022
fa488e4
EditorConfig
girazoki Jan 31, 2022
57c4304
more editorconfig
girazoki Jan 31, 2022
dd1d63c
Add selfreserve cross chain possibility to moonriver
girazoki Jan 31, 2022
653b0f2
Fix compilation error after cleanup
girazoki Jan 31, 2022
8e718c8
Merge remote-tracking branch 'upstream/girazoki-support-both-pre-and-…
girazoki Jan 31, 2022
b27c587
Add MOVR cross chain transferring to moonriver
girazoki Jan 31, 2022
38b6d99
clean more
girazoki Jan 31, 2022
0a6b94b
Merge remote-tracking branch 'upstream/girazoki-support-both-pre-and-…
girazoki Jan 31, 2022
e3d71ac
Merge remote-tracking branch 'upstream/master' into girazoki-local-as…
girazoki Feb 1, 2022
e6f58c8
Adapt to new schema with local and foreign assets
girazoki Feb 1, 2022
b1791ad
wip
girazoki Feb 1, 2022
d875f1d
Add small test
girazoki Feb 1, 2022
e17b387
wip working with assetId as nonce+account
girazoki Feb 3, 2022
f2cfd4f
wip test asset
girazoki Feb 3, 2022
df6ff1d
Re-use same precompiles for foreign and local assets but prevent some…
girazoki Feb 7, 2022
4351049
Mint test
girazoki Feb 7, 2022
99581b3
check balance too
girazoki Feb 7, 2022
5837a2e
All functions written
girazoki Feb 7, 2022
bb42eff
Test every single precompile func
girazoki Feb 7, 2022
1aefa9f
First typescript tests working
girazoki Feb 7, 2022
92dd1eb
Keep adding tests that work
girazoki Feb 7, 2022
20d8a45
First test suite ready
girazoki Feb 8, 2022
0e819ec
more and more tests
girazoki Feb 8, 2022
ca76ea6
Local assets final typescript tests
girazoki Feb 9, 2022
8f35b3e
Adapt to prefixes and fill moonriver too
girazoki Feb 9, 2022
0421be7
Merge remote-tracking branch 'upstream/master' into girazoki-enable-n…
girazoki Feb 11, 2022
6ed852c
Merge remote-tracking branch 'upstream/master' into girazoki-local-as…
girazoki Feb 11, 2022
db29206
Add back foreign assets tests
girazoki Feb 11, 2022
66989f0
unused import
girazoki Feb 11, 2022
1f21815
Remove hash dependency
girazoki Feb 14, 2022
b53273f
Make moonbeam compile
girazoki Feb 14, 2022
7f0a1a3
Adapt xcm tests and integration tests in moonbase
girazoki Feb 14, 2022
2a56b36
Tests and removal of is_sufficient for local assets
girazoki Feb 15, 2022
72c3760
Add couple of tests receiving local assets
girazoki Feb 15, 2022
ab30c13
fmt and asset-manager unitests
girazoki Feb 15, 2022
27238c3
Fix also asset precompile tests
girazoki Feb 15, 2022
d4dd812
Merge remote-tracking branch 'upstream/girazoki-enable-native-asset-c…
girazoki Feb 16, 2022
e46db63
Fix all unitests for moonbeam and moonriver runtimeS
girazoki Feb 16, 2022
6d692c9
Modify moonriver tests
girazoki Feb 16, 2022
8ffcf90
Use extrinsic index and parent hash to calculate asset id
girazoki Feb 16, 2022
55839d7
remove unused var
girazoki Feb 16, 2022
a357fe1
Prettier
girazoki Feb 16, 2022
ffd89aa
Make benchmark compile
girazoki Feb 16, 2022
9e47e28
Fix tests
girazoki Feb 17, 2022
d695b53
Remove unwraps and update comment
girazoki Feb 17, 2022
fc0c03f
Comments
girazoki Feb 17, 2022
2519a17
Remove it.only
girazoki Feb 17, 2022
4734c74
Remove authorization once registered
girazoki Feb 17, 2022
1707691
Benchmark authorize local asset creation
girazoki Feb 17, 2022
b85f813
Creation of local asset benchmarks
girazoki Feb 17, 2022
43a1853
Benchmarked new instructions
girazoki Feb 17, 2022
20c54ae
Merge remote-tracking branch 'upstream/girazoki-enable-native-asset-c…
girazoki Feb 17, 2022
858f980
Use new function maybe_total_supply
girazoki Feb 21, 2022
c378ae2
Update typescript tests
girazoki Feb 21, 2022
f5bd588
Improve comments
girazoki Feb 21, 2022
d2dbf52
uncomment evm
girazoki Feb 21, 2022
460a0d2
Merge remote-tracking branch 'upstream/master' into girazoki-local-as…
girazoki Feb 23, 2022
45982ad
More doc
girazoki Feb 23, 2022
8f1452a
Fix benchmarking
girazoki Feb 23, 2022
52bf2bd
prettier
girazoki Feb 23, 2022
5297f91
currency::MOVR
girazoki Feb 23, 2022
a13b4b6
Merge remote-tracking branch 'upstream/master' into girazoki-local-as…
girazoki Feb 24, 2022
44fd152
Fix typo in LocalAssetCreationAuthorization
girazoki Feb 24, 2022
d75b27a
Fix typo in authorize_local_assset
girazoki Feb 24, 2022
7971d17
Fix typo
girazoki Feb 24, 2022
ecd3e54
Leave weight of register_foreign_asset equal
girazoki Feb 24, 2022
69c7a38
Merge remote-tracking branch 'upstream/master' into girazoki-local-as…
girazoki Feb 25, 2022
5bde11f
Fix conflicts
girazoki Feb 25, 2022
88ee5c7
Benchmark compile
girazoki Mar 1, 2022
d9bcf43
Editorconfig
girazoki Mar 1, 2022
ae52d02
Editorconfig sources.ts
girazoki Mar 1, 2022
194e6cd
Editorconfig mock hrmp
girazoki Mar 1, 2022
acd6ec9
Editorconfig test precompile local assets
girazoki Mar 1, 2022
b380d18
Moonbase: add more integration tests
girazoki Mar 1, 2022
0bd7a4b
Moonriver: more tests
girazoki Mar 1, 2022
ddfde26
More tests
girazoki Mar 1, 2022
6bcc3f6
Fix test glmr cannot be sent through xcm
girazoki Mar 1, 2022
3b3622e
Merge remote-tracking branch 'upstream/master' into girazoki-local-as…
girazoki Mar 1, 2022
26fd576
FMT
girazoki Mar 1, 2022
de2aad9
Clean and fix typescript tests
girazoki Mar 2, 2022
2b3dca2
Merge remote-tracking branch 'upstream/master' into girazoki-local-as…
girazoki Mar 2, 2022
faa3608
Merge remote-tracking branch 'upstream/master' into girazoki-local-as…
girazoki Mar 3, 2022
ac1df95
start usign the local counter!
girazoki Mar 7, 2022
7866c22
Change runtime and tests
girazoki Mar 7, 2022
a81d179
Update typescript
girazoki Mar 7, 2022
ebe76e6
Merge remote-tracking branch 'upstream/master' into girazoki-local-as…
girazoki Mar 16, 2022
95395ec
Update typescript test
girazoki Mar 16, 2022
6c527c0
Merge remote-tracking branch 'upstream/master' into girazoki-local-as…
girazoki Mar 18, 2022
78bb389
Start
notlesh Mar 21, 2022
e859c4c
More version bumps
notlesh Mar 21, 2022
fe35467
Bump toolchain version
notlesh Mar 21, 2022
f772c79
Incremental progress
notlesh Mar 22, 2022
5544c7a
Start working on this
girazoki Mar 23, 2022
eb426b1
Make things a bit cleaner and include the evm removal
girazoki Mar 23, 2022
0336171
Further check in assets
girazoki Mar 23, 2022
f8fcd30
Fix integration tests
girazoki Mar 23, 2022
560aeba
FMT
girazoki Mar 23, 2022
e64038f
Unitest the new destroy asset
girazoki Mar 23, 2022
ce125dd
editorconfig
girazoki Mar 23, 2022
f2a970d
Test asset manager prettier
girazoki Mar 23, 2022
50db559
Merge remote-tracking branch 'upstream/master' into girazoki-local-as…
girazoki Mar 28, 2022
b3c5e0e
FMT
girazoki Mar 28, 2022
dae8b8a
Better doc
girazoki Mar 28, 2022
271275a
Doc better runtime parameters
girazoki Mar 28, 2022
0fa3b6d
fmt and editorconfig
girazoki Mar 28, 2022
c61e3af
change asset account deposit
girazoki Mar 28, 2022
778817a
Merge branch 'ability-to-destroy-asset' into girazoki-local-assets
girazoki Mar 28, 2022
1f4325a
Merge left overs from destroy asset
girazoki Mar 28, 2022
b1e5779
Prevent local assets from calling destroy directly
girazoki Mar 28, 2022
e8f3315
Default unimplemented for trait, making moonbeam runtime a bit cleaner
girazoki Mar 28, 2022
07c4c42
Add test destroy local asset
girazoki Mar 28, 2022
f8bbede
Create local asset to asset-manager typescript test
girazoki Mar 28, 2022
027d6ac
Use v0.9.18 branches
notlesh Mar 28, 2022
6a6cba9
Update Cargo.lock
notlesh Mar 28, 2022
26debf2
Update ethereum crate to 0.12
notlesh Mar 28, 2022
1edfbc0
Integration test for asset destroy local
girazoki Mar 28, 2022
022b7ad
More updated doc
girazoki Mar 28, 2022
2d90e31
More cleanup: use ConstBool from substrate
girazoki Mar 28, 2022
62a4441
change rocksdb weight for the proper associated type in frame system
girazoki Mar 28, 2022
d7eaeb4
Update Cargo.lock
notlesh Mar 28, 2022
80c7de6
Update nimbus
notlesh Mar 28, 2022
7a4a1bb
Update Cargo.lock
notlesh Mar 28, 2022
ddf6519
Bump ORML
notlesh Mar 28, 2022
db1e9b8
Import Reserve from xcm_primitives instead of orml_traits
notlesh Mar 28, 2022
9c38bfb
Bump crowdloan-rewards
notlesh Mar 28, 2022
d8f88cb
Remove u32_trait
notlesh Mar 28, 2022
8b297d5
Minimal orml_xtokens config
notlesh Mar 28, 2022
c10901b
Update Cargo.lock
notlesh Mar 28, 2022
d3d83e4
Remove creator from creation of local asset id
girazoki Mar 29, 2022
4c0a688
FMT
girazoki Mar 29, 2022
f343a6e
Comment why we dont need to store additioanl info in the case of loca…
girazoki Mar 29, 2022
6f1d20c
add copy for destroy witness associated type
girazoki Mar 29, 2022
6cf06a8
Add weight annotation explanation
girazoki Mar 29, 2022
d7c3421
FMT
girazoki Mar 29, 2022
063d971
Add comment on why we prevent calling destroy
girazoki Mar 29, 2022
d167470
More comments related to old reanchoring
girazoki Mar 29, 2022
335c83d
Add IsLocal and IsFOreign types
girazoki Mar 29, 2022
64d1f50
asset config for moonbase
girazoki Mar 29, 2022
5a71aaf
Separate asset config for moonriver
girazoki Mar 29, 2022
96e7fe7
Separate asset config in moonbeam runtime
girazoki Mar 29, 2022
b5b54d3
Increase deposits for local assets
girazoki Mar 29, 2022
5d6cf02
Remove ExecutiveBody
girazoki Mar 29, 2022
e136b09
ERC20 local extended interface
girazoki Mar 29, 2022
668a57a
Import parameter_types again
girazoki Mar 29, 2022
2bb89e5
Remove unused xcm dep
girazoki Mar 29, 2022
83f8e87
Fix integration tests
girazoki Mar 29, 2022
a996fb1
Creation deposit of 0 to run bechmark
girazoki Mar 29, 2022
ae8fcdf
Update weights and value of deposit used for benchmark
girazoki Mar 29, 2022
9038d82
Update error in weights
girazoki Mar 29, 2022
b00dc18
Correct fixing this time
girazoki Mar 29, 2022
acbf041
Add build_inprocess_relay_chain fn
notlesh Mar 29, 2022
184428a
Update Cargo.lock
notlesh Mar 29, 2022
86337e7
Bump scale-info (again)
notlesh Mar 29, 2022
dba4280
Use build_inprocess_relay_chain
notlesh Mar 29, 2022
908a7dd
Fix typo
notlesh Mar 29, 2022
dd12f59
Use blank CollatorOptions in StartFulLNodeParams
notlesh Mar 29, 2022
1df9850
Bump nimbus to 46c43d8
notlesh Mar 29, 2022
ad4c7e9
Bump nimbus to d68bf7
notlesh Mar 29, 2022
1fe2762
Add sync params to MappingSyncWorker
notlesh Mar 29, 2022
3596613
Incremental work to make tests build
notlesh Mar 30, 2022
c716369
Add orml-traits crate for tests
notlesh Mar 30, 2022
96bec73
Explicit integer types
notlesh Mar 30, 2022
37c8bad
Comment out xtokens tests for now
notlesh Mar 30, 2022
f74096a
Add some WeightInfo, remove some WeightInfo
notlesh Mar 30, 2022
b915022
More mock fixes
notlesh Mar 30, 2022
afd10f9
Remove TransactionStorageMode
notlesh Mar 30, 2022
15fd95d
Reflect EthBlockDataCacheTask changes in Frontier and plumb prometheu…
notlesh Mar 31, 2022
adfacc7
Restore pallet_evm WeightInfo in mocks
notlesh Mar 31, 2022
9b7bac0
Update Cargo.lock
notlesh Mar 31, 2022
637ddde
Bump frontier from 3e9d2b8 c65ff27
notlesh Mar 31, 2022
d0c5263
Use purestake evm branch moonbeam-polkadot-v0.9.18
notlesh Mar 31, 2022
8001899
Updates to use custom evm branch
notlesh Mar 31, 2022
5c9551a
Put reserve stuff in asset-manager
girazoki Mar 31, 2022
183cc8c
Start adapting runtimes to new sufficient local asset design
girazoki Mar 31, 2022
dec9726
Adapt moonriver too
girazoki Mar 31, 2022
33d70ab
adapt all runtimes and tests
girazoki Mar 31, 2022
079fa71
Asset as sufficients in typescript tests
girazoki Mar 31, 2022
867a34a
Fix benchmark
girazoki Mar 31, 2022
3c2282c
Fix unitests
girazoki Mar 31, 2022
a01b4e0
Add more comments
girazoki Mar 31, 2022
5fcb76e
Assetinfo tests
girazoki Mar 31, 2022
21665a9
FMT
girazoki Mar 31, 2022
1b7ecf0
Editorconfig
girazoki Mar 31, 2022
8946754
Update weights
girazoki Mar 31, 2022
b19ac2b
Add back wrongly removed Statemine test
girazoki Mar 31, 2022
222ad1d
Use built-in xcmp_queue weights
notlesh Mar 31, 2022
2859eee
Remove unused dependency
girazoki Apr 1, 2022
78f2b66
Point to fixed frontier version with-code evm
girazoki Apr 1, 2022
385e738
Add orml-traits again but without default-features
girazoki Apr 1, 2022
5609bc3
Fix xtokens precompiles tests
girazoki Apr 1, 2022
20ffa53
More graceful error plus removal of unused imports
girazoki Apr 1, 2022
2ea311b
Merge branch 'master' into notlesh-v0.9.18-deps-update
notlesh Apr 1, 2022
eed5f31
Chop long line
notlesh Apr 1, 2022
1802d65
Move write to inside branch
girazoki Apr 1, 2022
7d75b06
Toml sort
notlesh Apr 1, 2022
e65002d
Assert ts test storage with deposit
girazoki Apr 1, 2022
13227d1
cargo fmt
notlesh Apr 1, 2022
63a1e46
Clippy suggestions
notlesh Apr 1, 2022
d540b89
Optimize other extrinsic too
girazoki Apr 1, 2022
ee5a319
Merge remote-tracking branch 'upstream/notlesh-v0.9.18-deps-update' i…
girazoki Apr 1, 2022
c4df4de
Bump polkadot from 721282d to f0dc95a
notlesh Apr 1, 2022
c9704ba
Construct staking GenesisConfig without recursion
notlesh Apr 1, 2022
dd0d139
Another clippy suggestion
notlesh Apr 1, 2022
ebf3ed7
Add reads and writes from benchmarking to register-local-asset
girazoki Apr 1, 2022
ec235d9
Add comments to address PR reviews
girazoki Apr 1, 2022
0abc0cc
Merge remote-tracking branch 'upstream/notlesh-v0.9.18-deps-update' i…
girazoki Apr 1, 2022
cc8639f
Change hasher of LocalAssetDeposit
girazoki Apr 1, 2022
26ef800
Merge branch 'master' into girazoki-local-assets
notlesh Apr 1, 2022
f70438c
Remove duplicate definition
notlesh Apr 1, 2022
2bad6df
Comment about reverting in EVM code remove
girazoki Apr 2, 2022
955c117
Merge branch 'girazoki-local-assets' of https://github.com/PureStake/…
girazoki Apr 2, 2022
8012847
Add better test description
girazoki Apr 2, 2022
2597adc
Merge remote-tracking branch 'upstream/master' into girazoki-local-as…
girazoki Apr 4, 2022
7173d98
Test asset manager
girazoki Apr 4, 2022
53e1ef7
Merge remote-tracking branch 'upstream/master' into girazoki-local-as…
girazoki Apr 4, 2022
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
2,771 changes: 1,620 additions & 1,151 deletions Cargo.lock

Large diffs are not rendered by default.

7 changes: 3 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@ members = [
]

[patch.crates-io]
ethereum = { git = "https://github.com/purestake/ethereum", branch = "tgm-0.11.1-typeinfo-patch" }
evm = { git = "https://github.com/purestake/evm", branch = "moonbeam-polkadot-v0.9.17" }
evm-gasometer = { git = "https://github.com/purestake/evm", branch = "moonbeam-polkadot-v0.9.17" }
evm-runtime = { git = "https://github.com/purestake/evm", branch = "moonbeam-polkadot-v0.9.17" }
evm = { git = "https://github.com/purestake/evm", branch = "moonbeam-polkadot-v0.9.18" }
evm-gasometer = { git = "https://github.com/purestake/evm", branch = "moonbeam-polkadot-v0.9.18" }
evm-runtime = { git = "https://github.com/purestake/evm", branch = "moonbeam-polkadot-v0.9.18" }

# make sure dev builds with backtrace do
# not slow us down
Expand Down
6 changes: 3 additions & 3 deletions client/evm-tracing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repository = "https://github.com/PureStake/moonbeam/"
version = "0.1.0"

[dependencies]
ethereum-types = { version = "0.12.1" }
ethereum-types = { version = "0.13.1" }
hex = { version = "0.4", features = [ "serde" ] }
serde = { version = "1.0", features = [ "derive" ] }
serde_json = { version = "1.0" }
Expand All @@ -18,5 +18,5 @@ evm-tracing-events = { path = "../../primitives/rpc/evm-tracing-events" }
moonbeam-rpc-primitives-debug = { path = "../../primitives/rpc/debug" }

# Substrate
codec = { package = "parity-scale-codec", version = "2.2", default-features = false }
sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false }
sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
4 changes: 2 additions & 2 deletions client/rpc-core/debug/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repository = "https://github.com/PureStake/moonbeam/"
version = "0.1.0"

[dependencies]
ethereum-types = "0.12.1"
ethereum-types = "0.13.1"
futures = { version = "0.3", features = [ "compat" ] }
jsonrpc-core = "18.0.0"
jsonrpc-core-client = "18.0.0"
Expand All @@ -18,4 +18,4 @@ moonbeam-rpc-core-types = { path = "../types" }
serde = { version = "1.0", features = [ "derive" ] }
serde_json = "1.0"

sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
2 changes: 1 addition & 1 deletion client/rpc-core/trace/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repository = "https://github.com/PureStake/moonbeam/"
version = "0.6.0"

[dependencies]
ethereum-types = "0.12.1"
ethereum-types = "0.13.1"
futures = { version = "0.3.1", features = [ "compat" ] }
jsonrpc-core = "18.0.0"
jsonrpc-core-client = "18.0.0"
Expand Down
6 changes: 3 additions & 3 deletions client/rpc-core/txpool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ repository = "https://github.com/PureStake/moonbeam/"
version = "0.6.0"

[dependencies]
ethereum = { version = "0.11.1", default-features = false, features = [ "with-codec" ] }
ethereum-types = "0.12.1"
ethereum = { version = "0.12.0", default-features = false, features = [ "with-codec" ] }
ethereum-types = "0.13.1"
jsonrpc-core = "18.0.0"
jsonrpc-core-client = "18.0.0"
jsonrpc-derive = "18.0.0"
serde = { version = "1.0", features = [ "derive" ] }
serde_json = "1.0"

fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.18" }
2 changes: 1 addition & 1 deletion client/rpc-core/types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ repository = "https://github.com/PureStake/moonbeam/"
version = "0.1.0"

[dependencies]
ethereum-types = "0.12.1"
ethereum-types = "0.13.1"
serde = { version = "1.0", features = [ "derive" ] }
serde_json = "1.0"
28 changes: 14 additions & 14 deletions client/rpc/debug/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ moonbeam-rpc-core-types = { path = "../../rpc-core/types" }
moonbeam-rpc-primitives-debug = { path = "../../../primitives/rpc/debug" }

# Substrate
sc-client-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sc-utils = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sp-block-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sc-client-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sc-utils = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sp-block-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }

# Frontier
ethereum = { version = "0.11.1", default-features = false, features = [ "with-codec" ] }
ethereum-types = "0.12.1"
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" }
fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", features = [ "rpc_binary_search_estimate" ] }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" }
ethereum = { version = "0.12.0", default-features = false, features = [ "with-codec" ] }
ethereum-types = "0.13.1"
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.18" }
fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.18" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.18", features = [ "rpc_binary_search_estimate" ] }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.18" }
14 changes: 7 additions & 7 deletions client/rpc/finality/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ version = "0.1.0"
futures = { version = "0.3", features = [ "compat" ] }
jsonrpc-core = "18.0.0"
jsonrpc-derive = "18.0.0"
parity-scale-codec = "2.2"
parity-scale-codec = "3.0.0"
tokio = { version = "1.12.0", features = [ "sync", "time" ] }

fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" }
sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.18" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.18" }
sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
6 changes: 3 additions & 3 deletions client/rpc/manual-xcm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ futures = { version = "0.3", features = [ "compat" ] }
hex-literal = "0.3.3"
jsonrpc-core = "18.0.0"
jsonrpc-derive = "18.0.0"
parity-scale-codec = "2.2"
parity-scale-codec = "3.0.0"
tokio = { version = "1.12.0", features = [ "sync", "time" ] }
xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17", default-features = false }
xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.18", default-features = false }

cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.17" }
cumulus-primitives-core = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.18" }
34 changes: 17 additions & 17 deletions client/rpc/trace/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ repository = "https://github.com/PureStake/moonbeam/"
version = "0.6.0"

[dependencies]
ethereum = { version = "0.11.1", features = [ "with-codec" ] }
ethereum-types = "0.12.1"
ethereum = { version = "0.12.0", features = [ "with-codec" ] }
ethereum-types = "0.13.1"
futures = { version = "0.3" }
jsonrpc-core = "18.0.0"
serde = { version = "1.0", features = [ "derive" ] }
sha3 = "0.9"
tokio = { version = "1.10", features = [ "sync", "time" ] }
tracing = "0.1.25"
tracing = "0.1.32"

# Moonbeam
moonbeam-client-evm-tracing = { path = "../../evm-tracing" }
Expand All @@ -24,19 +24,19 @@ moonbeam-rpc-core-types = { path = "../../rpc-core/types" }
moonbeam-rpc-primitives-debug = { path = "../../../primitives/rpc/debug" }

# Substrate
sc-client-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sc-network = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sc-utils = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sp-block-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sp-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sc-client-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sc-network = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sc-utils = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sp-block-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sp-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }

# Frontier
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", features = [ "rpc_binary_search_estimate" ] }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17" }
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.18" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.18", features = [ "rpc_binary_search_estimate" ] }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.18" }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.18" }
20 changes: 10 additions & 10 deletions client/rpc/txpool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ moonbeam-rpc-core-txpool = { path = "../../rpc-core/txpool" }
moonbeam-rpc-primitives-txpool = { path = "../../../primitives/rpc/txpool" }

# Substrate
frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sc-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sc-transaction-pool-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
frame-system = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sc-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sc-transaction-pool-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sp-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sp-io = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }

# Frontier
ethereum-types = "0.12.1"
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", features = [ "rpc_binary_search_estimate" ] }
ethereum-types = "0.13.1"
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.18", features = [ "rpc_binary_search_estimate" ] }
6 changes: 3 additions & 3 deletions core-primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ version = "0.1.1"
[dependencies]
account = { path = "../primitives/account", default-features = false }

fp-self-contained = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.17", default-features = false }
sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false }
sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17", default-features = false }
fp-self-contained = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.18", default-features = false }
sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18", default-features = false }
sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18", default-features = false }

[features]
default = [ "std" ]
Expand Down
4 changes: 2 additions & 2 deletions node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ serde_json = "1.0"
tempfile = "3.2.0"

# Benchmarking
pallet-xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" }
xcm-builder = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.17" }
pallet-xcm = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.18" }
xcm-builder = { git = "https://github.com/purestake/polkadot", branch = "moonbeam-polkadot-v0.9.18" }

[features]
default = [ "moonbase-native", "moonbeam-native", "moonriver-native" ]
Expand Down
4 changes: 2 additions & 2 deletions node/cli-opt/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version = "0.21.0"
[dependencies]
clap = { version = "3.1", features = [ "derive" ] }
libsecp256k1 = "0.6"
primitive-types = "0.10.0"
primitive-types = "0.11.0"
sha3 = "0.9"
tiny-bip39 = "0.8"
tiny-hderive = "0.3.0"
Expand All @@ -18,4 +18,4 @@ tiny-hderive = "0.3.0"
account = { path = "../../primitives/account" }

# Substrate
sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.17" }
sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.18" }
Loading