Skip to content

Commit

Permalink
Merge branch 'manta' into workspace
Browse files Browse the repository at this point in the history
  • Loading branch information
Dengjianping authored Jan 9, 2024
2 parents 1863abe + dca8bdc commit 8800887
Show file tree
Hide file tree
Showing 228 changed files with 324 additions and 227 deletions.
2 changes: 1 addition & 1 deletion .github/resources/frame-weight-template.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion .github/resources/xcm-weight-template.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/integration_test_calamari.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ jobs:
- name: fetch and chmod polkadot
shell: bash
run: |
apt update && apt install -y curl jq wget
apt update && apt install -y curl jq wget git
if [[ ! -f "$HOME/.local/bin/polkadot" ]]; then
curl -L -o $HOME/.local/bin/polkadot ${{ env.POLKADOT_BINARY }}
chmod +x $HOME/.local/bin/polkadot
Expand Down Expand Up @@ -216,6 +216,8 @@ jobs:
- name: launch testnet
shell: bash
run: |
cd $GITHUB_WORKSPACE/zombienet-tool
git pull && git checkout v1.3.89
cd $GITHUB_WORKSPACE/zombienet-tool/javascript
yarn
npm run build
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/integration_test_manta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jobs:
- name: fetch and chmod polkadot
shell: bash
run: |
apt update && apt install -y curl jq wget
apt update && apt install -y curl jq wget git
if [[ ! -f "$HOME/.local/bin/polkadot" ]]; then
curl -L -o $HOME/.local/bin/polkadot ${{ env.POLKADOT_BINARY }}
chmod +x $HOME/.local/bin/polkadot
Expand Down Expand Up @@ -231,6 +231,8 @@ jobs:
- name: launch testnet
shell: bash
run: |
cd $GITHUB_WORKSPACE/zombienet-tool
git pull && git checkout v1.3.89
cd $GITHUB_WORKSPACE/zombienet-tool/javascript
yarn
npm run build
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/metadata_diff.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ jobs:
cat $GITHUB_WORKSPACE/zombienet/tests/0003-metadata-diff.toml
- name: launch testnet
run: |
cd $GITHUB_WORKSPACE/zombienet-tool
git pull && git checkout v1.3.89
cd $GITHUB_WORKSPACE/zombienet-tool/javascript
yarn
npm run build
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/runtime_upgrade_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,10 @@ jobs:
path: dev-tools
- name: launch testnet
run: |
sudo apt update
sudo apt install -y pkg-config libssl-dev protobuf-compiler curl build-essential clang git
cd ${{ github.workspace }}/zombienet-tool
git pull && git checkout v1.3.89
cd ${{ github.workspace }}/zombienet-tool/javascript
yarn
npm run build
Expand Down
2 changes: 1 addition & 1 deletion FILE_TEMPLATE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion node/build.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion node/src/aura_or_nimbus_consensus.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion node/src/builder.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion node/src/chain_specs/calamari.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion node/src/chain_specs/manta/local_testnets_geneses.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion node/src/chain_specs/manta/mainnet_genesis.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion node/src/chain_specs/manta/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion node/src/chain_specs/manta/public_testnet_genesis.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion node/src/chain_specs/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion node/src/cli.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion node/src/client.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion node/src/command.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion node/src/instant_finalize.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion node/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion node/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion node/src/rpc/calamari.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion node/src/rpc/manta.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion node/src/rpc/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion node/src/service.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/asset-manager/src/benchmarking.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/asset-manager/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/asset-manager/src/migrations.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/asset-manager/src/mock.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/asset-manager/src/tests.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/asset-manager/src/weights.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/collator-selection/src/benchmarking.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/collator-selection/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/collator-selection/src/migrations.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/collator-selection/src/mock.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/collator-selection/src/tests.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/collator-selection/src/weights.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/farming/rpc/runtime-api/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/farming/rpc/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/farming/src/benchmarking.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/farming/src/gauge.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/farming/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/farming/src/mock.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/farming/src/rewards.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/farming/src/tests.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/farming/src/weights.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/manta-pay/src/benchmark/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
4 changes: 2 additions & 2 deletions pallets/manta-pay/src/bin/precompute_coins.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -221,7 +221,7 @@ fn main() -> Result<()> {
writeln!(
target_file,
indoc! {r"
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/manta-pay/src/errors.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/manta-pay/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/manta-pay/src/mock.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/manta-pay/src/rpc.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/manta-pay/src/runtime.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/manta-pay/src/test/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/manta-pay/src/test/payment.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/manta-pay/src/test/storage.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/manta-pay/src/weights.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
2 changes: 1 addition & 1 deletion pallets/manta-sbt/src/benchmark/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2020-2023 Manta Network.
// Copyright 2020-2024 Manta Network.
// This file is part of Manta.
//
// Manta is free software: you can redistribute it and/or modify
Expand Down
Loading

0 comments on commit 8800887

Please sign in to comment.