Skip to content

Commit

Permalink
Merge pull request #297 from mangata-finance/feature/orml-asset-registry
Browse files Browse the repository at this point in the history
add orml asset registry
  • Loading branch information
vanderian authored Sep 16, 2022
2 parents 39c4154 + f26d8e7 commit 2b4faff
Show file tree
Hide file tree
Showing 37 changed files with 1,629 additions and 1,920 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
name: Run clippy
run: |
./docker-cargo.sh fetch || ./docker-cargo.sh fetch || ./docker-cargo.sh fetch || ./docker-cargo.sh fetch || ./docker-cargo.sh fetch
./docker-cargo.sh clippy -p pallet-xyk -p pallet-assets-info -p pallet-bridge
./docker-cargo.sh clippy -p pallet-xyk -p pallet-bridge
unit-test:
name: Unit test
Expand All @@ -122,7 +122,7 @@ jobs:
name: Run unit tests
run: |
./docker-cargo.sh fetch || ./docker-cargo.sh fetch || ./docker-cargo.sh fetch || ./docker-cargo.sh fetch || ./docker-cargo.sh fetch
./docker-cargo.sh test -j2 -p pallet-bootstrap -p xyk-rpc -p pallet-xyk -p xyk-runtime-api -p pallet-bridge -p pallet-assets-info -p pallet-issuance -p pallet-multipurpose-liquidity -p xcm-asset-registry -p pallet-sudo-origin
./docker-cargo.sh test -j2 -p pallet-bootstrap -p xyk-rpc -p pallet-xyk -p xyk-runtime-api -p pallet-bridge -p pallet-issuance -p pallet-multipurpose-liquidity -p pallet-sudo-origin
# |cargo2junit | tee ut-results.xml
# sed -i '/<testsuite.*\/>$/d' ut-results.xml
Expand Down Expand Up @@ -160,7 +160,7 @@ jobs:
name: Run benchamrks
run: |
./docker-cargo.sh fetch || ./docker-cargo.sh fetch || ./docker-cargo.sh fetch || ./docker-cargo.sh fetch || ./docker-cargo.sh fetch
./docker-cargo.sh test -j2 --features=runtime-benchmarks -p pallet-bootstrap -p pallet-xyk -p xyk-runtime-api -p pallet-bridge -p pallet-assets-info -p pallet-issuance
./docker-cargo.sh test -j2 --features=runtime-benchmarks -p pallet-bootstrap -p pallet-xyk -p xyk-runtime-api -p pallet-bridge -p pallet-issuance
run-benchmarks:
name: Run runtime benchmarks
Expand Down Expand Up @@ -431,7 +431,7 @@ jobs:

- name: Docker ps
run: docker ps

- name: Sleep for 2 minutes
run: sleep 120s #close buffers of videos.

Expand Down Expand Up @@ -580,7 +580,7 @@ jobs:

- name: Docker ps
run: docker ps

- name: Sleep for 2 minutes
run: sleep 120s #close buffers of videos.

Expand Down
86 changes: 32 additions & 54 deletions Cargo.lock

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

6 changes: 4 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,15 @@ orml-unknown-tokens = { git = "https://github.com/mangata-finance//open-runtime-
orml-xtokens = { git = "https://github.com/mangata-finance//open-runtime-module-library", branch = "mangata-dev" }
orml-traits = { git = "https://github.com/mangata-finance//open-runtime-module-library", branch = "mangata-dev" }
orml-tokens = { git = "https://github.com/mangata-finance//open-runtime-module-library", branch = "mangata-dev" }
# orml-tokens = { path = "../open-runtime-module-library/tokens" }
orml-asset-registry = { git = "https://github.com/mangata-finance//open-runtime-module-library", branch = "mangata-dev" }
# orml-xcm = { path = "../open-runtime-module-library/xcm" }
# orml-xcm-support = { path = "../open-runtime-module-library/xcm-support" }
# orml-utilities = { path = "../open-runtime-module-library/utilities" }
# orml-unknown-tokens = { path = "../open-runtime-module-library/unknown-tokens" }
# orml-xtokens = { path = "../open-runtime-module-library/xtokens" }
# orml-traits = { path = "../open-runtime-module-library/traits" }
# orml-tokens = { path = "../open-runtime-module-library/tokens" }
# orml-asset-registry = { path = "../open-runtime-module-library/asset-registry" }

# patch generated by ./scripts/dev_manifest.sh
[patch."https://github.com/mangata-finance/snowbridge"]
Expand Down Expand Up @@ -1230,4 +1232,4 @@ pallet-vesting-mangata-rpc = { git = "https://github.com/mangata-finance//substr
# pallet-multisig = { path = "../substrate/frame/multisig" }
# pallet-society = { path = "../substrate/frame/society" }
# pallet-vesting-mangata-rpc-runtime-api = { path = "../substrate/frame/vesting-mangata/rpc/runtime-api" }
# pallet-vesting-mangata-rpc = { path = "../substrate/frame/vesting-mangata/rpc" }
# pallet-vesting-mangata-rpc = { path = "../substrate/frame/vesting-mangata/rpc" }
113 changes: 113 additions & 0 deletions launch/karura-mangata-oak.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
relaychain:
image: parity/polkadot:v0.9.27
chain: rococo-local
runtimeGenesisConfig:
configuration:
config:
validation_upgrade_cooldown: 10
validation_upgrade_delay: 10
hrmp_channel_max_capacity: 1000
hrmp_channel_max_total_size: 102400
hrmp_channel_max_message_size: 102400
hrmp:
preopenHrmpChannels: [
[2000, 2110, 1000, 102400],
[2110, 2000, 1000, 102400]
[2000, 2114, 1000, 102400],
[2114, 2000, 1000, 102400]
]

env:
RUST_LOG: x_tokens=trace,xcm=trace,xcmp_queue=trace,runtime=trace
flags:
- --rpc-methods=unsafe
- --wasm-execution=compiled
- --execution=wasm
nodes:
- name: alice
- name: bob
- name: charlie

parachains:
- image: acala/karura-node:2.8.0
chain:
base: karura-dev
collators:
- alice
- bob
sudo: alice
id: 2000
parachain: true
flags:
- --rpc-methods=unsafe
- --force-authoring
- --wasm-execution=compiled
- --execution=wasm
relaychainFlags:
- --wasm-execution=compiled
- --execution=wasm
env:
RUST_LOG: x_tokens=trace,xcm=trace,xcmp_queue=trace,runtime=trace
volumePath: /acala/data
nodes:
- flags:
- --alice
- flags:
- --bob

- image: mangatasolutions/mangata-node:dev
chain:
base: mangata-rococo-local-testnet
collators:
- alice
- bob
sudo: alice
disablePallets:
- balances
- collatorSelection
id: 2110
parachain: true
flags:
- --rpc-methods=unsafe
- --force-authoring
- --wasm-execution=compiled
- --execution=wasm
relaychainFlags:
- --wasm-execution=compiled
- --execution=wasm
env:
RUST_LOG: x_tokens=trace,xcm=trace,xcmp_queue=trace,runtime=trace
volumePath: /mangata/data
nodes:
- flags:
- --alice
- flags:
- --bob

- image: oaknetwork/turing:1.7.0
chain:
base: turing-dev
collators:
- alice
- bob
sudo: alice
disablePallets:
- collatorSelection
id: 2114
parachain: true
flags:
- --rpc-methods=unsafe
- --force-authoring
- --wasm-execution=compiled
- --execution=wasm
relaychainFlags:
- --wasm-execution=compiled
- --execution=wasm
env:
RUST_LOG: x_tokens=trace,xcm=trace,xcmp_queue=trace,runtime=trace
volumePath: /data
nodes:
- flags:
- --alice
- flags:
- --bob
Loading

0 comments on commit 2b4faff

Please sign in to comment.