From 3615b9f4b5766f536040107bfd4fbd8069fceb57 Mon Sep 17 00:00:00 2001
From: Uladzislau Hubar <hubar.uladzislau@gmail.com>
Date: Fri, 9 Feb 2024 10:28:17 +0100
Subject: [PATCH 1/2] Fixed bug in _addStake function, added identityId to
 SharesMinted/Burned events

---
 abi/StakingV2.json       | 12 ++++++++++++
 contracts/v2/Staking.sol | 11 +++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/abi/StakingV2.json b/abi/StakingV2.json
index a0a29cff..d6b68a35 100644
--- a/abi/StakingV2.json
+++ b/abi/StakingV2.json
@@ -254,6 +254,12 @@
   {
     "anonymous": false,
     "inputs": [
+      {
+        "indexed": true,
+        "internalType": "uint72",
+        "name": "identityId",
+        "type": "uint72"
+      },
       {
         "indexed": true,
         "internalType": "address",
@@ -285,6 +291,12 @@
   {
     "anonymous": false,
     "inputs": [
+      {
+        "indexed": true,
+        "internalType": "uint72",
+        "name": "identityId",
+        "type": "uint72"
+      },
       {
         "indexed": true,
         "internalType": "address",
diff --git a/contracts/v2/Staking.sol b/contracts/v2/Staking.sol
index 9a15398f..2973c5ed 100644
--- a/contracts/v2/Staking.sol
+++ b/contracts/v2/Staking.sol
@@ -32,6 +32,7 @@ contract StakingV2 is Named, Versioned, ContractStatus, Initializable {
         uint96 newStake
     );
     event SharesMinted(
+        uint72 indexed identityId,
         address indexed sharesContractAddress,
         address indexed delegator,
         uint256 sharesMintedAmount,
@@ -54,6 +55,7 @@ contract StakingV2 is Named, Versioned, ContractStatus, Initializable {
     );
     event StakeWithdrawn(uint72 indexed identityId, bytes nodeId, address indexed staker, uint96 withdrawnStakeAmount);
     event SharesBurned(
+        uint72 indexed identityId,
         address indexed sharesContractAddress,
         address indexed delegator,
         uint256 sharesBurnedAmount,
@@ -157,7 +159,7 @@ contract StakingV2 is Named, Versioned, ContractStatus, Initializable {
             newStake,
             withdrawalPeriodEnd
         );
-        emit SharesBurned(address(sharesContract), msg.sender, sharesToBurn, sharesContract.totalSupply());
+        emit SharesBurned(identityId, address(sharesContract), msg.sender, sharesToBurn, sharesContract.totalSupply());
     }
 
     function withdrawStake(uint72 identityId) external {
@@ -291,13 +293,14 @@ contract StakingV2 is Named, Versioned, ContractStatus, Initializable {
         ss.setTotalStake(identityId, newStake);
         tknc.transferFrom(sender, address(ss), stakeAmount);
 
-        if (!sts.nodeExists(identityId) && newStake >= params.minimumStake())
+        if (!sts.nodeExists(identityId) && newStake >= params.minimumStake()) {
             if (sts.nodesCount() >= params.shardingTableSizeLimit()) revert ShardingTableErrors.ShardingTableIsFull();
 
-        shardingTableContract.insertNode(identityId);
+            shardingTableContract.insertNode(identityId);
+        }
 
         emit StakeIncreased(identityId, ps.getNodeId(identityId), sender, oldStake, newStake);
-        emit SharesMinted(address(sharesContract), sender, sharesMinted, sharesContract.totalSupply());
+        emit SharesMinted(identityId, address(sharesContract), sender, sharesMinted, sharesContract.totalSupply());
     }
 
     function _checkAdmin(uint72 identityId) internal view virtual {

From 1566b8fdb81d906e5ca4ee609b67a2a671bac4cf Mon Sep 17 00:00:00 2001
From: Uladzislau Hubar <hubar.uladzislau@gmail.com>
Date: Fri, 9 Feb 2024 10:31:26 +0100
Subject: [PATCH 2/2] Bumped package version

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f20acbd6..f5b37147 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "dkg-evm-module",
-  "version": "4.2.2",
+  "version": "4.2.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "dkg-evm-module",
-      "version": "4.2.2",
+      "version": "4.2.3",
       "license": "Apache-2.0",
       "dependencies": {
         "@openzeppelin/contracts": "^4.9.3",
diff --git a/package.json b/package.json
index 2bea0514..76de4a97 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dkg-evm-module",
-  "version": "4.2.2",
+  "version": "4.2.3",
   "description": "Smart contracts for OriginTrail V6",
   "main": "index.ts",
   "files": [