Add Collectives Parachain

.gitlab-ci.yml

@@ -265,48 +265,71 @@ benchmarks-build:
   <<:                              *benchmarks-manual-refs
   script:
     - time cargo build --profile production --locked --features runtime-benchmarks
-    - mkdir artifacts
+    - mkdir -p artifacts
     - cp target/production/polkadot-parachain ./artifacts/
 
-benchmarks:
+.git-commit-push:                  &git-commit-push
+  - git status
+  # Set git config
+  - rm -rf .git/config
+  - git config --global user.email "${GITHUB_EMAIL}"
+  - git config --global user.name "${GITHUB_USER}"
+  - git config remote.origin.url "https://${GITHUB_USER}:${GITHUB_TOKEN}@github.com/paritytech/${CI_PROJECT_NAME}.git"
+  - git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
+  # push results to github
+  - git checkout -b $BRANCHNAME
+  - git add parachains/*
+  - git commit -m "[benchmarks] pr with weights"
+  - git push origin $BRANCHNAME
+
+benchmarks-statemint:
   stage:                           benchmarks-run
   before_script:
     - *rust-info-script
   <<:                              *collect-artifacts
   <<:                              *benchmarks-refs
   script:
-    - ./scripts/benchmarks-ci.sh assets statemine
-    - ./scripts/benchmarks-ci.sh assets statemint
-    - ./scripts/benchmarks-ci.sh assets westmint
-    - git status
-    - export BRANCHNAME="weights-${CI_COMMIT_BRANCH}"
-    # Set git config
+    - ./scripts/benchmarks-ci.sh assets statemine ./artifacts
+    - ./scripts/benchmarks-ci.sh assets statemint ./artifacts
+    - ./scripts/benchmarks-ci.sh assets westmint ./artifacts
+    - export BRANCHNAME="weights-statemint-${CI_COMMIT_BRANCH}"
+    - *git-commit-push
+    # create PR
+    - curl -u ${GITHUB_USER}:${GITHUB_TOKEN}
+      -d '{"title":"[benchmarks] Update weights for statemine/t","body":"This PR is generated automatically by CI.","head":"'$BRANCHNAME'","base":"'${CI_COMMIT_BRANCH}'"}'
+      -X POST https://api.github.com/repos/paritytech/${CI_PROJECT_NAME}/pulls
+  after_script:
     - rm -rf .git/config
-    - git config --global user.email "${GITHUB_EMAIL}"
-    - git config --global user.name "${GITHUB_USER}"
-    - git config remote.origin.url "https://${GITHUB_USER}:${GITHUB_TOKEN}@github.com/paritytech/${CI_PROJECT_NAME}.git"
-    - git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-    # push results to github
-    - git checkout -b $BRANCHNAME
-    - git add parachains/*
-    - git commit -m "[benchmarks] pr with weights"
-    - git push origin $BRANCHNAME
+  tags:
+    - weights
+
+benchmarks-collectives:
+  stage:                           benchmarks-run
+  before_script:
+    - *rust-info-script
+  <<:                              *collect-artifacts
+  <<:                              *benchmarks-refs
+  script:
+    - ./scripts/benchmarks-ci.sh collectives collectives-polkadot ./artifacts
+    - git status
+    - export BRANCHNAME="weights-collectives-${CI_COMMIT_BRANCH}"
+    - *git-commit-push
     # create PR
     - curl -u ${GITHUB_USER}:${GITHUB_TOKEN}
-      -d '{"title":"[benchmarks] Update weights","body":"This PR is generated automatically by CI.","head":"'$BRANCHNAME'","base":"'${CI_COMMIT_BRANCH}'"}'
+      -d '{"title":"[benchmarks] Update weights for collectives","body":"This PR is generated automatically by CI.","head":"'$BRANCHNAME'","base":"'${CI_COMMIT_BRANCH}'"}'
       -X POST https://api.github.com/repos/paritytech/${CI_PROJECT_NAME}/pulls
   after_script:
     - rm -rf .git/config
   tags:
     - weights
 
-publish-benchmarks-s3:
+publish-benchmarks-statemint-s3:   &publish-benchmarks
   stage:                           publish
   <<:                              *kubernetes-env
   image:                           paritytech/awscli:latest
   <<:                              *benchmarks-refs
   needs:
-    - job:                         benchmarks
+    - job:                         benchmarks-statemint
       artifacts:                   true
   variables:
     GIT_STRATEGY:                  none
@@ -320,6 +343,13 @@ publish-benchmarks-s3:
   after_script:
     - aws s3 ls s3://${BUCKET}/${PREFIX}/ --recursive --human-readable --summarize
 
+publish-benchmarks-collectives-s3:
+  <<:                              *publish-benchmarks
+  needs:
+    - job:                         benchmarks-collectives
+      artifacts:                   true
+
+
 #### stage:                        .post
 
 # This job cancels the whole pipeline if any of provided jobs fail.

Cargo.toml

@@ -34,6 +34,7 @@ members = [
 	"parachains/runtimes/assets/statemint",
 	"parachains/runtimes/assets/statemine",
 	"parachains/runtimes/assets/westmint",
+	"parachains/runtimes/collectives/collectives-polkadot",
 	"parachains/runtimes/contracts/contracts-rococo",
 	"test/client",
 	"test/relay-sproof-builder",

parachains/common/src/impls.rs

@@ -49,6 +49,23 @@ where
 	}
 }
 
+/*
+TODO:COLLECTIVES
+
+pub struct ToParentTreasury<R>(PhantomData<R>);
+impl<R> OnUnbalanced<NegativeImbalance<R>> for ToParentTreasury<R>
+where
+	R: pallet_balances::Config,
+	AccountIdOf<R>:
+		From<polkadot_primitives::v2::AccountId> + Into<polkadot_primitives::v2::AccountId>,
+	<R as frame_system::Config>::Event: From<pallet_balances::Event<R>>,
+{
+	fn on_unbalanced(amount: NegativeImbalance<R>) {
+		polkadot_xcm::Pallet::<R>::teleport();
+	}
+}
+*/
+
 /// Implementation of `OnUnbalanced` that deals with the fees by combining tip and fee and passing
 /// the result on to `ToStakingPot`.
 pub struct DealWithFees<R>(PhantomData<R>);