diff --git a/abi/CommitManagerV2.json b/abi/CommitManagerV2.json index 4b9788b9..8cc352ff 100644 --- a/abi/CommitManagerV2.json +++ b/abi/CommitManagerV2.json @@ -422,13 +422,13 @@ "anonymous": false, "inputs": [ { - "indexed": true, + "indexed": false, "internalType": "address", "name": "assetContract", "type": "address" }, { - "indexed": true, + "indexed": false, "internalType": "uint256", "name": "tokenId", "type": "uint256" @@ -452,7 +452,7 @@ "type": "uint16" }, { - "indexed": true, + "indexed": false, "internalType": "uint72", "name": "identityId", "type": "uint72" diff --git a/contracts/v2/CommitManagerV1.sol b/contracts/v2/CommitManagerV1.sol index 8fd19850..1f2aecb0 100644 --- a/contracts/v2/CommitManagerV1.sol +++ b/contracts/v2/CommitManagerV1.sol @@ -23,12 +23,12 @@ import {ServiceAgreementErrorsV2} from "./errors/ServiceAgreementErrorsV2.sol"; contract CommitManagerV2 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/deployments/gnosis_chiado_test_contracts.json b/deployments/gnosis_chiado_test_contracts.json index 404b1e94..d2c426df 100644 --- a/deployments/gnosis_chiado_test_contracts.json +++ b/deployments/gnosis_chiado_test_contracts.json @@ -205,11 +205,12 @@ "deployed": true }, "CommitManagerV1": { - "evmAddress": "0xc936B57e7f45cbC1Dde0802037F51FCDf7E40Dab", + "evmAddress": "0x1869a2155c1F5f7AfE5ac2C27595c04AA250D0B7", "version": "2.0.0", "gitBranch": "main", - "gitCommitHash": "06afb8b08c1f5afb779d1c89157021bc70f2fe98", - "deploymentTimestamp": 1707489017673, + "gitCommitHash": "4ae423f802d917c185c9ad846d6cc0f0c1af4513", + "deploymentBlock": 8197803, + "deploymentTimestamp": 1707731717431, "deployed": true }, "CommitManagerV1U1": { diff --git a/package-lock.json b/package-lock.json index f5b37147..155cf2e1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "dkg-evm-module", - "version": "4.2.3", + "version": "4.2.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "dkg-evm-module", - "version": "4.2.3", + "version": "4.2.4", "license": "Apache-2.0", "dependencies": { "@openzeppelin/contracts": "^4.9.3", diff --git a/package.json b/package.json index 76de4a97..546ba85f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dkg-evm-module", - "version": "4.2.3", + "version": "4.2.4", "description": "Smart contracts for OriginTrail V6", "main": "index.ts", "files": [ diff --git a/utils/helpers.ts b/utils/helpers.ts index a786ddc7..dcf67fc0 100644 --- a/utils/helpers.ts +++ b/utils/helpers.ts @@ -27,6 +27,7 @@ type ContractDeployments = { version: string; gitBranch: string; gitCommitHash: string; + deploymentBlock: number; deploymentTimestamp: number; deployed: boolean; }; @@ -211,7 +212,8 @@ export class Helpers { this.contractsForReinitialization.push(newContract.address); } - await this.updateDeploymentsJson(nameInHub, newContract.address); + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + await this.updateDeploymentsJson(nameInHub, newContract.address, newContract.receipt!.blockNumber); return await this.hre.ethers.getContractAt(this.getAbi(newContractName), newContract.address, deployer); } @@ -316,7 +318,7 @@ export class Helpers { this.contractDeployments = { contracts: {} }; } - public async updateDeploymentsJson(newContractName: string, newContractAddress: string) { + public async updateDeploymentsJson(newContractName: string, newContractAddress: string, deploymentBlock: number) { const contractABI = this.getAbi(newContractName); const isVersionedContract = contractABI.some( (abiEntry) => abiEntry.type === 'function' && abiEntry.name === 'version', @@ -337,6 +339,7 @@ export class Helpers { version: contractVersion, gitBranch: this.getCurrentGitBranch(), gitCommitHash: this.getCurrentGitCommitHash(), + deploymentBlock: deploymentBlock, deploymentTimestamp: Date.now(), deployed: true, };