Merge branch 'manta' into manta

Manta-Network · Nov 27, 2023 · 1688359 · 1688359
2 parents 80a8009 + 5a4cd1f
commit 1688359
Show file tree

Hide file tree

Showing 38 changed files with 1,019 additions and 335 deletions.
diff --git a/.github/workflows/integration_test_calamari.yml b/.github/workflows/integration_test_calamari.yml
@@ -10,7 +10,7 @@ concurrency:
   cancel-in-progress: true
 env:
   DEBIAN_FRONTEND: noninteractive
-  POLKADOT_BINARY: https://github.com/paritytech/polkadot/releases/download/v1.0.0/polkadot
+  POLKADOT_BINARY: https://github.com/paritytech/polkadot/releases/download/v1.3.0/polkadot
 jobs:
   print-rust-versions:
     if: contains(github.event.pull_request.labels.*.name, 'A-calamari')

diff --git a/.github/workflows/integration_test_manta.yml b/.github/workflows/integration_test_manta.yml
@@ -10,7 +10,7 @@ concurrency:
   cancel-in-progress: true
 env:
   DEBIAN_FRONTEND: noninteractive
-  POLKADOT_BINARY: https://github.com/paritytech/polkadot/releases/download/v1.0.0/polkadot
+  POLKADOT_BINARY: https://github.com/paritytech/polkadot/releases/download/v1.3.0/polkadot
 jobs:
   print-rust-versions:
     if: contains(github.event.pull_request.labels.*.name, 'A-manta')

diff --git a/.github/workflows/metadata_diff.yml b/.github/workflows/metadata_diff.yml
@@ -78,7 +78,7 @@ jobs:
           chmod +x $HOME/manta
       - name: Fetch and chmod old release binary
         run: |
-          curl -L -o $HOME/polkadot https://github.com/paritytech/polkadot/releases/download/v1.0.0/polkadot
+          curl -L -o $HOME/polkadot https://github.com/paritytech/polkadot/releases/download/v1.3.0/polkadot
           chmod +x $HOME/polkadot
           ls -ahl $HOME/
       - name: stop sccache server

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,6 @@
 # CHANGELOG
-## v4.4.0-2
-### Changed
-- [\#1258](https://github.com/Manta-Network/Manta/pull/1258) Allow pallet-assets transfers [CA]
 
-## v4.4.0-1
+## v4.5.0
 ### Added
 - [\#1240](https://github.com/Manta-Network/Manta/pull/1240) :sparkle: org `arc-runner` patch 1 [MACA]
 - [\#1241](https://github.com/Manta-Network/Manta/pull/1241) :bug: arc-runner patch 1.1 [MACA]
@@ -12,12 +9,23 @@
 - [\#1244](https://github.com/Manta-Network/Manta/pull/1244) more lottery tests [MACA]
 - [\#1250](https://github.com/Manta-Network/Manta/pull/1250) :wrench: allow all benchmarks to be triggered on feature branch
 - [\#1249](https://github.com/Manta-Network/Manta/pull/1249) Add zombienet examples
+- [\#1261](https://github.com/Manta-Network/Manta/pull/1261) Add Farming functionality to Lottery
+
+### Changed
+- [\#1235](https://github.com/Manta-Network/Manta/pull/1235) Update reference hardware and lower CI machine specs [MACA]
+- [\#1237](https://github.com/Manta-Network/Manta/pull/1237) Zombienet migration [MACA]
+- [\#1192](https://github.com/Manta-Network/Manta/pull/1192) Rebenchmark mantaSbt [MACA]
+- [\#1254](https://github.com/Manta-Network/Manta/pull/1254) Allow all xtokens extrinsics in calamari [CA]
 
 ### Fixed
 - [\#1234](https://github.com/Manta-Network/Manta/pull/1234) Serialize/deserialize vfr key [MACA]
 - [\#1191](https://github.com/Manta-Network/Manta/pull/1191) Fix metadata diff checker workflow [MACA]
 - [\#1243](https://github.com/Manta-Network/Manta/pull/1243) Add manta docker image to publish
+- [\#1236](https://github.com/Manta-Network/Manta/pull/1236) Update Asset metadata call to not have dummy parameters [MACA]
 - [\#1253](https://github.com/Manta-Network/Manta/pull/1253) Fix benchmark [CA]
+- [\#1260](https://github.com/Manta-Network/Manta/pull/1260) fix manta testnet dns
+- [\#1265](https://github.com/Manta-Network/Manta/pull/1265) update Cargo.lock [CA]
+- [\#1266](https://github.com/Manta-Network/Manta/pull/1266) Update changelog [CA]
 
 ## v4.4.0
 ### Added

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -9,7 +9,7 @@ license = 'GPL-3.0'
 name = 'manta'
 repository = 'https://github.com/Manta-Network/Manta/'
 rust-version = '1.62'
-version = '4.4.0'
+version = '4.5.0'
 
 [package.metadata.docs.rs]
 targets = ['x86_64-unknown-linux-gnu']

diff --git a/node/src/chain_specs/calamari.rs b/node/src/chain_specs/calamari.rs
@@ -238,6 +238,7 @@ fn calamari_dev_genesis(
             min_deposit: 5_000 * KMA,
             min_withdraw: 5_000 * KMA,
             gas_reserve: 10_000 * KMA,
+            farming_pool_params: Default::default(),
         },
     }
 }

diff --git a/node/src/chain_specs/manta/mod.rs b/node/src/chain_specs/manta/mod.rs
@@ -130,6 +130,7 @@ fn manta_devnet_genesis(genesis_collators: Vec<Collator>) -> GenesisConfig {
             min_deposit: 500 * MANTA,
             min_withdraw: 10 * MANTA,
             gas_reserve: 1_000 * MANTA,
+            farming_pool_params: Default::default(),
         },
         parachain_info: manta_runtime::ParachainInfoConfig {
             parachain_id: MANTA_PARACHAIN_ID.into(),

diff --git a/node/src/chain_specs/manta/public_testnet_genesis.rs b/node/src/chain_specs/manta/public_testnet_genesis.rs
@@ -25,39 +25,39 @@ pub fn genesis_spec() -> MantaChainSpec {
     let genesis_collators: Vec<Collator> = vec![
         Collator::new(
             hex!("0c9429df04f4c051d022a262d5c786d4cde9688bd230c139814f935f14709975").into(),
-            Some("/dns/c1.calamari.seabird.systems/tcp/30433/p2p/12D3KooWGdvxcAc9KK4ihY4GhC6Mh9QEFiqfVMvHBKHs7HYACPMm".parse().unwrap()),
+            Some("/dns/c1.manta.seabird.systems/tcp/30433/p2p/12D3KooWGdvxcAc9KK4ihY4GhC6Mh9QEFiqfVMvHBKHs7HYACPMm".parse().unwrap()),
             SessionKeys::new((
                 hex!("0c9429df04f4c051d022a262d5c786d4cde9688bd230c139814f935f14709975").unchecked_into(),
                 hex!("0c9429df04f4c051d022a262d5c786d4cde9688bd230c139814f935f14709975").unchecked_into()
             ))
         ),
         Collator::new(
             hex!("969bf93aac86684a129d71ab97335a8f462b46516d916c9b62bbf3c1ac2d860e").into(),
-            Some("/dns/c2.calamari.seabird.systems/tcp/30433/p2p/12D3KooWRC2JTv5UdGqesaCwP61CeohNmNQk6jBQUK2AB3PmSsNZ".parse().unwrap()),
+            Some("/dns/c2.manta.seabird.systems/tcp/30433/p2p/12D3KooWRC2JTv5UdGqesaCwP61CeohNmNQk6jBQUK2AB3PmSsNZ".parse().unwrap()),
             SessionKeys::new((
                 hex!("969bf93aac86684a129d71ab97335a8f462b46516d916c9b62bbf3c1ac2d860e").unchecked_into(),
                 hex!("969bf93aac86684a129d71ab97335a8f462b46516d916c9b62bbf3c1ac2d860e").unchecked_into()
             ))
         ),
         Collator::new(
             hex!("2234305637d7b6c529caf0169870b2319ece97d59bff1c2c1258dfbeffee9620").into(),
-            Some("/dns/c3.calamari.seabird.systems/tcp/30433/p2p/12D3KooWBWE83sP71QNfhPJr6umSWRyV2rF3tG1ZtauMyEyLprC3".parse().unwrap()),
+            Some("/dns/c3.manta.seabird.systems/tcp/30433/p2p/12D3KooWBWE83sP71QNfhPJr6umSWRyV2rF3tG1ZtauMyEyLprC3".parse().unwrap()),
             SessionKeys::new((
                 hex!("2234305637d7b6c529caf0169870b2319ece97d59bff1c2c1258dfbeffee9620").unchecked_into(),
                 hex!("2234305637d7b6c529caf0169870b2319ece97d59bff1c2c1258dfbeffee9620").unchecked_into()
             ))
         ),
         Collator::new(
             hex!("543074b204c62b78c366486839dd0cd7d07f16f3d0226bbcc8a3b41d4a88887a").into(),
-            Some("/dns/c4.calamari.seabird.systems/tcp/30433/p2p/12D3KooWCvAKZDGGd3B81QRhJh8a3TsNbojEtdH8WF2p8mFsVyv1".parse().unwrap()),
+            Some("/dns/c4.manta.seabird.systems/tcp/30433/p2p/12D3KooWCvAKZDGGd3B81QRhJh8a3TsNbojEtdH8WF2p8mFsVyv1".parse().unwrap()),
             SessionKeys::new((
                 hex!("543074b204c62b78c366486839dd0cd7d07f16f3d0226bbcc8a3b41d4a88887a").unchecked_into(),
                 hex!("543074b204c62b78c366486839dd0cd7d07f16f3d0226bbcc8a3b41d4a88887a").unchecked_into()
             ))
         ),
         Collator::new(
             hex!("acc4608e1c31f3f98ea1a0f3a8a74ade8aca396f269c26c1dd9019e812b11503").into(),
-            Some("/dns/c5.calamari.seabird.systems/tcp/30433/p2p/12D3KooWQghBNgKanHtS4pCwBGeexw2QPvfgV15eMjr2YckVHCAD".parse().unwrap()),
+            Some("/dns/c5.manta.seabird.systems/tcp/30433/p2p/12D3KooWQghBNgKanHtS4pCwBGeexw2QPvfgV15eMjr2YckVHCAD".parse().unwrap()),
             SessionKeys::new((
                 hex!("acc4608e1c31f3f98ea1a0f3a8a74ade8aca396f269c26c1dd9019e812b11503").unchecked_into(),
                 hex!("acc4608e1c31f3f98ea1a0f3a8a74ade8aca396f269c26c1dd9019e812b11503").unchecked_into()

diff --git a/pallets/asset-manager/Cargo.toml b/pallets/asset-manager/Cargo.toml
@@ -5,7 +5,7 @@ homepage = "https://manta.network"
 license = "GPL-3.0"
 name = "pallet-asset-manager"
 repository = 'https://github.com/Manta-Network/Manta/'
-version = '4.4.0'
+version = '4.5.0'
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false }

diff --git a/pallets/collator-selection/Cargo.toml b/pallets/collator-selection/Cargo.toml
@@ -7,7 +7,7 @@ license = 'GPL-3.0'
 name = 'manta-collator-selection'
 readme = 'README.md'
 repository = 'https://github.com/Manta-Network/Manta/'
-version = '4.4.0'
+version = '4.5.0'
 
 [package.metadata.docs.rs]
 targets = ['x86_64-unknown-linux-gnu']

diff --git a/pallets/farming/Cargo.toml b/pallets/farming/Cargo.toml
@@ -6,7 +6,7 @@ homepage = "https://manta.network"
 license = "GPL-3.0"
 name = "pallet-farming"
 repository = 'https://github.com/Manta-Network/Manta/'
-version = "4.4.0"
+version = "4.5.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false, features = ["derive"] }

diff --git a/pallets/farming/rpc/Cargo.toml b/pallets/farming/rpc/Cargo.toml
@@ -5,7 +5,7 @@ homepage = "https://manta.network"
 license = "GPL-3.0"
 name = "pallet-farming-rpc-api"
 repository = 'https://github.com/Manta-Network/Manta/'
-version = "4.4.0"
+version = "4.5.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false, features = ["derive"] }

diff --git a/pallets/farming/rpc/runtime-api/Cargo.toml b/pallets/farming/rpc/runtime-api/Cargo.toml
@@ -5,7 +5,7 @@ homepage = "https://manta.network"
 license = "GPL-3.0"
 name = "pallet-farming-rpc-runtime-api"
 repository = 'https://github.com/Manta-Network/Manta/'
-version = "4.4.0"
+version = "4.5.0"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false, features = ["derive"] }