Merge pull request #228 from OriginTrail/6.2.0/devnet-contracts-redep…

…loyment 6.2.0/devnet contracts redeployment
OriginTrail · Feb 8, 2024 · 0fd41d7 · 0fd41d7
2 parents 6e43119 + d9e0de1
commit 0fd41d7
Show file tree

Hide file tree

Showing 8 changed files with 79 additions and 84 deletions.
diff --git a/abi/CommitManagerV1.json b/abi/CommitManagerV1.json
@@ -191,13 +191,13 @@
     "anonymous": false,
     "inputs": [
       {
-        "indexed": true,
+        "indexed": false,
         "internalType": "address",
         "name": "assetContract",
         "type": "address"
       },
       {
-        "indexed": true,
+        "indexed": false,
         "internalType": "uint256",
         "name": "tokenId",
         "type": "uint256"
@@ -221,7 +221,7 @@
         "type": "uint16"
       },
       {
-        "indexed": true,
+        "indexed": false,
         "internalType": "uint72",
         "name": "identityId",
         "type": "uint72"

diff --git a/abi/CommitManagerV1U1.json b/abi/CommitManagerV1U1.json
@@ -222,13 +222,13 @@
     "anonymous": false,
     "inputs": [
       {
-        "indexed": true,
+        "indexed": false,
         "internalType": "address",
         "name": "assetContract",
         "type": "address"
       },
       {
-        "indexed": true,
+        "indexed": false,
         "internalType": "uint256",
         "name": "tokenId",
         "type": "uint256"
@@ -258,7 +258,7 @@
         "type": "uint256"
       },
       {
-        "indexed": true,
+        "indexed": false,
         "internalType": "uint72",
         "name": "identityId",
         "type": "uint72"
@@ -277,13 +277,13 @@
     "anonymous": false,
     "inputs": [
       {
-        "indexed": true,
+        "indexed": false,
         "internalType": "address",
         "name": "assetContract",
         "type": "address"
       },
       {
-        "indexed": true,
+        "indexed": false,
         "internalType": "uint256",
         "name": "tokenId",
         "type": "uint256"

diff --git a/contracts/v1/CommitManagerV1.sol b/contracts/v1/CommitManagerV1.sol
@@ -22,12 +22,12 @@ import {ServiceAgreementStructsV1} from "./structs/ServiceAgreementStructsV1.sol
 
 contract CommitManagerV1 is Named, Versioned, ContractStatus, Initializable {
     event CommitSubmitted(
-        address indexed assetContract,
-        uint256 indexed tokenId,
+        address assetContract,
+        uint256 tokenId,
         bytes keyword,
         uint8 hashFunctionId,
         uint16 epoch,
-        uint72 indexed identityId,
+        uint72 identityId,
         uint40 score
     );
 

diff --git a/contracts/v1/CommitManagerV1U1.sol b/contracts/v1/CommitManagerV1U1.sol
@@ -26,18 +26,18 @@ import {ServiceAgreementErrorsV1U1} from "./errors/ServiceAgreementErrorsV1U1.so
 
 contract CommitManagerV1U1 is Named, Versioned, ContractStatus, Initializable {
     event CommitSubmitted(
-        address indexed assetContract,
-        uint256 indexed tokenId,
+        address assetContract,
+        uint256 tokenId,
         bytes keyword,
         uint8 hashFunctionId,
         uint16 epoch,
         uint256 stateIndex,
-        uint72 indexed identityId,
+        uint72 identityId,
         uint40 score
     );
     event StateFinalized(
-        address indexed assetContract,
-        uint256 indexed tokenId,
+        address assetContract,
+        uint256 tokenId,
         bytes keyword,
         uint8 hashFunctionId,
         uint16 epoch,

diff --git a/deployments/gnosis_chiado_dev_contracts.json b/deployments/gnosis_chiado_dev_contracts.json
@@ -17,19 +17,19 @@
       "version": "1.0.0"
     },
     "CommitManagerV1": {
-      "evmAddress": "0xD8934457A0dFF97b059E3370AEd30F280838f1E6",
+      "evmAddress": "0xE58754A57cCDDdbA5e3e1D6FC3B71f1e56E21EE4",
       "version": "2.0.0",
-      "gitBranch": "release/delegations",
-      "gitCommitHash": "5fcbdfba99d8b8b9d23d9e2277f73a1bfa70c50c",
-      "deploymentTimestamp": 1706798918693,
+      "gitBranch": "main",
+      "gitCommitHash": "dab8582c750eb8e189eff201a74eead1ca554fe7",
+      "deploymentTimestamp": 1707423228358,
       "deployed": true
     },
     "CommitManagerV1U1": {
-      "evmAddress": "0x786a9494a031D6221Ad4246fDcFf1dbA0CDb48fE",
+      "evmAddress": "0x686A2921FdAE4f76A84346687c433abeaadFEEA1",
       "version": "2.0.0",
-      "gitBranch": "release/delegations",
-      "gitCommitHash": "5fcbdfba99d8b8b9d23d9e2277f73a1bfa70c50c",
-      "deploymentTimestamp": 1706798926032,
+      "gitBranch": "main",
+      "gitCommitHash": "dab8582c750eb8e189eff201a74eead1ca554fe7",
+      "deploymentTimestamp": 1707423239349,
       "deployed": true
     },
     "ContentAsset": {
@@ -73,11 +73,11 @@
       "version": "1.0.1"
     },
     "Identity": {
-      "evmAddress": "0xB7203c97A4d9a9482fa741d2Ce81d5E7B7B64701",
-      "version": "1.0.1",
-      "gitBranch": "release/delegations",
-      "gitCommitHash": "5fcbdfba99d8b8b9d23d9e2277f73a1bfa70c50c",
-      "deploymentTimestamp": 1706798873457,
+      "evmAddress": "0xce97B252A54D9e709B28BdD1253d7173F34C980D",
+      "version": "1.1.0",
+      "gitBranch": "main",
+      "gitCommitHash": "dab8582c750eb8e189eff201a74eead1ca554fe7",
+      "deploymentTimestamp": 1707423198429,
       "deployed": true
     },
     "IdentityStorage": {
@@ -105,20 +105,20 @@
       "deployed": true
     },
     "ParametersStorage": {
-      "evmAddress": "0x95637cdd9b5a9442343Bd77c1A8be4a9090AdB1e",
-      "version": "1.1.0",
-      "gitBranch": "release/delegations",
-      "gitCommitHash": "5fcbdfba99d8b8b9d23d9e2277f73a1bfa70c50c",
-      "deploymentTimestamp": 1706798743324,
-      "deployed": false
+      "evmAddress": "0x71B3f71191EeFA7db1b6DF9e15AaaCA91c24F425",
+      "version": "1.1.1",
+      "gitBranch": "main",
+      "gitCommitHash": "dab8582c750eb8e189eff201a74eead1ca554fe7",
+      "deploymentTimestamp": 1707424228855,
+      "deployed": true
     },
     "Profile": {
-      "evmAddress": "0x1C0245DC80fe287B5Ac6a6a1E85ec230a56cc5ea",
-      "version": "1.0.2",
-      "gitBranch": "release/delegations",
-      "gitCommitHash": "5fcbdfba99d8b8b9d23d9e2277f73a1bfa70c50c",
-      "deploymentTimestamp": 1706798903277,
-      "deployed": false
+      "evmAddress": "0x528c29be521fbfde21065F14bD17c7dD149B2840",
+      "version": "1.1.0",
+      "gitBranch": "main",
+      "gitCommitHash": "dab8582c750eb8e189eff201a74eead1ca554fe7",
+      "deploymentTimestamp": 1707423218364,
+      "deployed": true
     },
     "ProfileStorage": {
       "evmAddress": "0xe70Fd17F76Eed679Ca8302f059ACf5551694f2fe",
@@ -209,12 +209,12 @@
       "deployed": true
     },
     "Staking": {
-      "evmAddress": "0xE4B3cf42BF9F4D796768deFa5B572C527dFe8C7f",
+      "evmAddress": "0xFEe25FF07Bd543BfC9aac7f81B02dD9bac91b2b6",
       "version": "2.0.0",
-      "gitBranch": "release/delegations",
-      "gitCommitHash": "5fcbdfba99d8b8b9d23d9e2277f73a1bfa70c50c",
-      "deploymentTimestamp": 1706798889242,
-      "deployed": false
+      "gitBranch": "main",
+      "gitCommitHash": "dab8582c750eb8e189eff201a74eead1ca554fe7",
+      "deploymentTimestamp": 1707423208422,
+      "deployed": true
     },
     "StakingStorage": {
       "evmAddress": "0x755DC8bBc61e907c2c1Cc1eD00da90a1e6945B69",

diff --git a/deployments/otp_devnet_contracts.json b/deployments/otp_devnet_contracts.json
@@ -15,22 +15,22 @@
       "substrateAddress": "5EMjsczYPSEzrw5Arq26AasXQftZQR8orQdpGDgCT7ZG4PUC"
     },
     "CommitManagerV1": {
-      "deployed": true,
-      "deploymentTimestamp": 1701163497636,
-      "evmAddress": "0x81f567B0fB7491b7aaC86A9CF719D7d6E74a30Be",
+      "evmAddress": "0x50691641D7491F58fC675E0F0753F73749b5890E",
+      "substrateAddress": "5EMjsczcHdaG781DM1zzhM43QzyK36osr6LNh5j6e55ACwfU",
+      "version": "1.0.2",
       "gitBranch": "main",
-      "gitCommitHash": "7c5fb6a77323e20d2a9be46e0533c9453300db4a",
-      "substrateAddress": "5EMjscznDTiuRgVpdyNRHn5AnXcmmzPjAfr2F6jU4fLnrS3Y",
-      "version": "1.0.1"
+      "gitCommitHash": "dab8582c750eb8e189eff201a74eead1ca554fe7",
+      "deploymentTimestamp": 1707424588113,
+      "deployed": true
     },
     "CommitManagerV1U1": {
-      "deployed": true,
-      "deploymentTimestamp": 1701163542497,
-      "evmAddress": "0x6602a94C854794E1bbAD9f01Dec4e5501BD29D2B",
+      "evmAddress": "0xb7179C8d1866072Af9801ABb54d75D11f7EaBAA2",
+      "substrateAddress": "5EMjsczxrxhNwvGcFHHnk6HqE5Zpu2sgUq1dw2NaLRDZEVPi",
+      "version": "1.0.2",
       "gitBranch": "main",
-      "gitCommitHash": "7c5fb6a77323e20d2a9be46e0533c9453300db4a",
-      "substrateAddress": "5EMjsczgcf6GQgirAzUxiYDe7eGn3Wq7L8VeCPWR8fDuDAc2",
-      "version": "1.0.1"
+      "gitCommitHash": "dab8582c750eb8e189eff201a74eead1ca554fe7",
+      "deploymentTimestamp": 1707424617618,
+      "deployed": true
     },
     "ContentAsset": {
       "deployed": true,
@@ -70,13 +70,13 @@
       "version": "1.0.1"
     },
     "Identity": {
-      "deployed": true,
-      "deploymentTimestamp": 1701163419846,
-      "evmAddress": "0x7122A4B61d5B30dD752B815f6677d773a5D4A5Bb",
+      "evmAddress": "0x811E547FF824e80Bc11373739Cd01eF8A361Ee2e",
+      "substrateAddress": "5EMjsczn3hRcUPxm8pJiKTarcXCtU9DrBwvH5wYavmf3yzPd",
+      "version": "1.1.0",
       "gitBranch": "main",
-      "gitCommitHash": "7c5fb6a77323e20d2a9be46e0533c9453300db4a",
-      "substrateAddress": "5EMjscziqwuRTdBbaYp8ap9SNkvFhH8gajJB3XhWpYNWD8kB",
-      "version": "1.0.1"
+      "gitCommitHash": "dab8582c750eb8e189eff201a74eead1ca554fe7",
+      "deploymentTimestamp": 1707424521891,
+      "deployed": true
     },
     "IdentityStorage": {
       "deployed": true,
@@ -93,27 +93,22 @@
       "version": null
     },
     "ParametersStorage": {
-      "deployed": true,
-      "deploymentTimestamp": 1701163255408,
-      "evmAddress": "0xe1BeA704E3c7F7C36ee183811D715d99D28cF6E5",
+      "evmAddress": "0xAA0A4c7401293AF77Ef98Ea7e65530C9693ED649",
+      "substrateAddress": "5EMjsczvFGvwJvhtwLUhjEhcn7MsuKb8iPkXYkUkLCU13khK",
+      "version": "1.1.1",
       "gitBranch": "main",
-      "gitCommitHash": "7c5fb6a77323e20d2a9be46e0533c9453300db4a",
-      "substrateAddress": "5EMjsd17QepjnRn9J6MCymbgLr5FpT2Vnjy5xCu8RF8FG8iD",
-      "variables": {
-        "epochLength": 3600,
-        "finalizationCommitsNumber": 3,
-        "updateCommitWindowDuration": 600
-      },
-      "version": "1.1.0"
+      "gitCommitHash": "dab8582c750eb8e189eff201a74eead1ca554fe7",
+      "deploymentTimestamp": 1707424498048,
+      "deployed": true
     },
     "Profile": {
-      "deployed": true,
-      "deploymentTimestamp": 1701163477064,
-      "evmAddress": "0x7529EfE81048d99d52a3aFbe4EB3E6b9fA31Aa90",
+      "evmAddress": "0x071A9e963677814875FeCbc8726876417130c256",
+      "substrateAddress": "5EMjsczMbgxpVH36EGKUEgTDM4HekWonvLyMXU4oM4qwPLMT",
+      "version": "1.1.0",
       "gitBranch": "main",
-      "gitCommitHash": "7c5fb6a77323e20d2a9be46e0533c9453300db4a",
-      "substrateAddress": "5EMjsczjemL1movMfLczuwmHkNPktcXgWryQSnRzXrE4tASr",
-      "version": "1.0.2"
+      "gitCommitHash": "dab8582c750eb8e189eff201a74eead1ca554fe7",
+      "deploymentTimestamp": 1707424555108,
+      "deployed": true
     },
     "ProfileStorage": {
       "deployed": true,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dkg-evm-module",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "description": "Smart contracts for OriginTrail V6",
   "main": "index.ts",
   "files": [