Merge pull request #569 from Cerebellum-Network/release/7.3.6

Added mechanism to handle Remainder of Era Rewards

Author: ayushmishra2005

.github/workflows/publish-docker-image-to-dockerhub.yaml

@@ -12,12 +12,13 @@ jobs:
   tag-and-push:
     runs-on: [self-hosted, cere-network-xlarge]
     steps:
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v1
+      - name: Configure aws credentials
+        uses: aws-actions/configure-aws-credentials@v2
         with:
-          aws-access-key-id: ${{ secrets.DEV_NETWORK_AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.DEV_NETWORK_AWS_SECRET_ACCESS_KEY }}
+          role-to-assume: arn:aws:iam::${{ vars.SHARED_AWS_ACCOUNT_ID }}:role/github
+          role-session-name: ${{ github.event.repository.name }}
           aws-region: us-west-2
+
       - name: Login to Amazon ECR
         id: login-ecr
         uses: aws-actions/amazon-ecr-login@v1
@@ -30,6 +31,7 @@ jobs:
           docker image tag $ECR_REGISTRY/$ECR_REPOSITORY:$GITHUB_SHA $ECR_REGISTRY/$ECR_REPOSITORY:${GITHUB_REF##*/}
           docker image tag $ECR_REGISTRY/$ECR_REPOSITORY:$GITHUB_SHA $DOCKERHUB_REPOSITORY/$PACKAGE_NAME:latest
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:${GITHUB_REF##*/}
+
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:

CHANGELOG.md

@@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [C] Changes is `Cere` Runtime
 - [D] Changes is `Cere Dev` Runtime
 
+## [7.3.6]
+
+- [C,D] Added mechanism to handle Remainder of Era Rewards
+
 ## [7.3.5]
 
 - [C,D] Turn-Off Inflation and change reward source

Cargo.lock

@@ -1,5 +1,5 @@
 [workspace.package]
-version = "7.3.2"
+version = "7.3.6"
 authors = ["Cerebellum-Network"]
 edition = "2021"
 homepage = "https://cere.network/"

Cargo.toml

@@ -136,7 +136,7 @@ use ismp::{
 	host::StateMachine,
 	router::{Request, Response},
 };
-use pallet_treasury::PositiveImbalanceOf;
+use pallet_treasury::{NegativeImbalanceOf, PositiveImbalanceOf};
 use sp_core::H256;
 mod hyperbridge_ismp;
 mod weights;
@@ -164,7 +164,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	// and set impl_version to 0. If only runtime
 	// implementation changes and behavior does not, then leave spec_version as
 	// is and increment impl_version.
-	spec_version: 73108,
+	spec_version: 73109,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 24,
@@ -566,7 +566,14 @@ impl pallet_staking::BenchmarkingConfig for StakingBenchmarkingConfig {
 	type MaxNominators = ConstU32<1000>;
 	type MaxValidators = ConstU32<1000>;
 }
+pub struct BurnSource;
 
+impl OnUnbalanced<NegativeImbalanceOf<Runtime>> for BurnSource {
+	fn on_unbalanced(amount: NegativeImbalanceOf<Runtime>) {
+		// Burn the tokens (decrease total issuance)
+		drop(amount);
+	}
+}
 pub struct RewardSource;
 
 impl OnUnbalanced<PositiveImbalanceOf<Runtime>> for RewardSource {
@@ -593,7 +600,7 @@ impl pallet_staking::Config for Runtime {
 	type CurrencyBalance = Balance;
 	type UnixTime = Timestamp;
 	type CurrencyToVote = CurrencyToVote;
-	type RewardRemainder = Treasury;
+	type RewardRemainder = BurnSource;
 	type RuntimeEvent = RuntimeEvent;
 	type Slash = Treasury; // send the slashed funds to the treasury.
 	type Reward = RewardSource;

runtime/cere-dev/src/lib.rs

@@ -130,7 +130,7 @@ use ismp::{
 	host::StateMachine,
 	router::{Request, Response},
 };
-use pallet_treasury::PositiveImbalanceOf;
+use pallet_treasury::{NegativeImbalanceOf, PositiveImbalanceOf};
 use sp_core::H256;
 mod hyperbridge_ismp;
 mod weights;
@@ -159,7 +159,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	// and set impl_version to 0. If only runtime
 	// implementation changes and behavior does not, then leave spec_version as
 	// is and increment impl_version.
-	spec_version: 73108,
+	spec_version: 73109,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 24,
@@ -563,6 +563,15 @@ impl pallet_staking::BenchmarkingConfig for StakingBenchmarkingConfig {
 	type MaxValidators = ConstU32<1000>;
 }
 
+pub struct BurnSource;
+
+impl OnUnbalanced<NegativeImbalanceOf<Runtime>> for BurnSource {
+	fn on_unbalanced(amount: NegativeImbalanceOf<Runtime>) {
+		// Burn the tokens (decrease total issuance)
+		drop(amount);
+	}
+}
+
 pub struct RewardSource;
 
 impl OnUnbalanced<PositiveImbalanceOf<Runtime>> for RewardSource {
@@ -589,7 +598,7 @@ impl pallet_staking::Config for Runtime {
 	type CurrencyBalance = Balance;
 	type UnixTime = Timestamp;
 	type CurrencyToVote = CurrencyToVote;
-	type RewardRemainder = Treasury;
+	type RewardRemainder = BurnSource;
 	type RuntimeEvent = RuntimeEvent;
 	type Slash = Treasury; // send the slashed funds to the treasury.
 	type Reward = RewardSource;