Allow update deployment and mark a deployment latest for a project

contracts/ProjectRegistry.sol

@@ -58,7 +58,7 @@ contract ProjectRegistry is Initializable, OwnableUpgradeable, ERC721Upgradeable
     event UpdateProjectMetadata(address indexed owner, uint256 indexed projectId, string metadata);
 
     /// @notice Emitted when the latestDeploymentId of the project updated.
-    event UpdateProjectDeployment(address indexed owner, uint256 indexed projectId, bytes32 deploymentId, bytes32 metadata);
+    event UpdateProjectDeployment(address indexed owner, uint256 indexed projectId, bytes32 deploymentId, bytes32 metadata, bool updateLatest);
 
     /// @notice Emitted when service status changed with a specific deploymentId.
     event ServiceStatusChanged(address indexed indexer, bytes32 indexed deploymentId, ServiceStatus status);
@@ -168,16 +168,23 @@ contract ProjectRegistry is Initializable, OwnableUpgradeable, ERC721Upgradeable
     }
 
     /**
-     * @notice update the deployment of a project, if in the restrict mode, only creator allowed call this function
+     * @notice update or add the deployment of a project, only creator allowed call this function
      */
-    function updateDeployment(uint256 projectId, bytes32 deploymentId, bytes32 metadata) external {
+    function addOrUpdateDeployment(uint256 projectId, bytes32 deploymentId, bytes32 metadata, bool updateLatest) external {
         require(ownerOf(projectId) == msg.sender, 'PR004');
-        require(deploymentInfos[deploymentId].projectId == 0, 'PR003');
-
-        projectInfos[projectId].latestDeploymentId = deploymentId;
-        deploymentInfos[deploymentId] = DeploymentInfo(projectId, metadata);
+        require(deploymentInfos[deploymentId].projectId == 0 || deploymentInfos[deploymentId].projectId == projectId, 'PR007');
+        bool changed = false;
+        if (deploymentInfos[deploymentId].metadata != metadata) {
+            deploymentInfos[deploymentId] = DeploymentInfo(projectId, metadata);
+            changed = true;
+        }
 
-        emit UpdateProjectDeployment(msg.sender, projectId, deploymentId, metadata);
+        if (updateLatest && projectInfos[projectId].latestDeploymentId != deploymentId) {
+            projectInfos[projectId].latestDeploymentId = deploymentId;
+            changed = true;
+        }
+        require(changed, 'PR008');
+        emit UpdateProjectDeployment(msg.sender, projectId, deploymentId, metadata, updateLatest);
     }
 
     /**

contracts/interfaces/IProjectRegistry.sol

@@ -33,10 +33,11 @@ interface IProjectRegistry {
 
     function updateProjectMetadata(uint256 projectId, string memory metadataUri) external;
 
-    function updateDeployment(
+    function addOrUpdateDeployment(
         uint256 projectId,
         bytes32 deploymentId,
-        bytes32 metadata
+        bytes32 metadata,
+        bool updateLatest
     ) external;
 
     function startService(bytes32 deploymentId) external;

publish/ABI/ProjectRegistry.json

@@ -232,6 +232,12 @@
                 "internalType": "bytes32",
                 "name": "metadata",
                 "type": "bytes32"
+            },
+            {
+                "indexed": false,
+                "internalType": "bool",
+                "name": "updateLatest",
+                "type": "bool"
             }
         ],
         "name": "UpdateProjectDeployment",
@@ -275,6 +281,34 @@
         "stateMutability": "nonpayable",
         "type": "function"
     },
+    {
+        "inputs": [
+            {
+                "internalType": "uint256",
+                "name": "projectId",
+                "type": "uint256"
+            },
+            {
+                "internalType": "bytes32",
+                "name": "deploymentId",
+                "type": "bytes32"
+            },
+            {
+                "internalType": "bytes32",
+                "name": "metadata",
+                "type": "bytes32"
+            },
+            {
+                "internalType": "bool",
+                "name": "updateLatest",
+                "type": "bool"
+            }
+        ],
+        "name": "addOrUpdateDeployment",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
     {
         "inputs": [
             {
@@ -898,29 +932,6 @@
         "stateMutability": "nonpayable",
         "type": "function"
     },
-    {
-        "inputs": [
-            {
-                "internalType": "uint256",
-                "name": "projectId",
-                "type": "uint256"
-            },
-            {
-                "internalType": "bytes32",
-                "name": "deploymentId",
-                "type": "bytes32"
-            },
-            {
-                "internalType": "bytes32",
-                "name": "metadata",
-                "type": "bytes32"
-            }
-        ],
-        "name": "updateDeployment",
-        "outputs": [],
-        "stateMutability": "nonpayable",
-        "type": "function"
-    },
     {
         "inputs": [
             {

publish/revertcode.json

@@ -117,6 +117,7 @@
     "PR005": "can not stop indexing for NOTINDEXING services",
     "PR006": "cannot stop indexing with an ongoing service agreement",
     "PR007": "Inconsistent project id and deployment id",
+    "PR008": "deployment metadata not changed",
     "RD001": "Waiting Era",
     "RD002": "Era expired",
     "RD003": "Waiting next era",

test/ProjectRegistry.test.ts

@@ -168,12 +168,12 @@ describe('Project Registry Contract', () => {
             expect(tokenUri).to.equal(`ipfs://${newProjectMetadata}`);
         });
 
-        it('update project deploymenet should work', async () => {
+        it('add new deployment to project should work', async () => {
             const projectId = 1;
             const [metadata, deploymentId] = [deploymentMetadatas[1], deploymentIds[1]];
-            await expect(projectRegistry.updateDeployment(1, deploymentId, metadata))
+            await expect(projectRegistry.addOrUpdateDeployment(1, deploymentId, metadata, true))
                 .to.be.emit(projectRegistry, 'UpdateProjectDeployment')
-                .withArgs(wallet_0.address, projectId, deploymentId, metadata);
+                .withArgs(wallet_0.address, projectId, deploymentId, metadata, true);
 
             // check state changes
             const projectInfo = await projectRegistry.projectInfos(projectId);
@@ -184,7 +184,63 @@ describe('Project Registry Contract', () => {
             expect(deploymentInfo.metadata).to.equal(metadata);
         });
 
-        it('can update project and deployment with new account after owner transferred', async () => {
+        it('update deployment\'s metadata should work', async () => {
+            const projectId = 1;
+            const [metadata, deploymentId] = [deploymentMetadatas[1], deploymentIds[1]];
+            await expect(projectRegistry.addOrUpdateDeployment(1, deploymentId, metadata, true))
+                .to.be.emit(projectRegistry, 'UpdateProjectDeployment')
+                .withArgs(wallet_0.address, projectId, deploymentId, metadata, true);
+
+            await expect(projectRegistry.addOrUpdateDeployment(1, deploymentId, deploymentMetadatas[2], false))
+                .to.be.emit(projectRegistry, 'UpdateProjectDeployment')
+                .withArgs(wallet_0.address, projectId, deploymentId, deploymentMetadatas[2], false);
+
+            // check state changes
+            const projectInfo = await projectRegistry.projectInfos(projectId);
+            const deploymentInfo = await projectRegistry.deploymentInfos(deploymentId);
+            expect(projectInfo.latestDeploymentId).to.equal(deploymentId);
+            expect(projectInfo.projectType).to.equal(ProjectType.SUBQUERY);
+            expect(deploymentInfo.projectId).to.equal(projectId);
+            expect(deploymentInfo.metadata).to.equal(deploymentMetadatas[2]);
+        });
+
+        it('add deployment\'s metadata without marking it as latest should work', async () => {
+            const projectId = 1;
+            await projectRegistry.addOrUpdateDeployment(projectId, deploymentIds[1], deploymentMetadatas[1], true)
+            // check state changes
+            let projectInfo = await projectRegistry.projectInfos(projectId);
+            expect(projectInfo.latestDeploymentId).to.equal(deploymentIds[1]);
+            await expect(projectRegistry.addOrUpdateDeployment(projectId, deploymentIds[2], deploymentMetadatas[2], false))
+                .to.be.emit(projectRegistry, 'UpdateProjectDeployment')
+                .withArgs(wallet_0.address, projectId, deploymentIds[2], deploymentMetadatas[2], false);
+
+            // check state changes
+            projectInfo = await projectRegistry.projectInfos(projectId);
+            expect(projectInfo.latestDeploymentId).to.equal(deploymentIds[1]);
+            let deploymentInfo = await projectRegistry.deploymentInfos(deploymentIds[1]);
+            expect(deploymentInfo.projectId).to.equal(projectId);
+            expect(deploymentInfo.metadata).to.equal(deploymentMetadatas[1]);
+            deploymentInfo = await projectRegistry.deploymentInfos(deploymentIds[2]);
+            expect(deploymentInfo.projectId).to.equal(projectId);
+            expect(deploymentInfo.metadata).to.equal(deploymentMetadatas[2]);
+        });
+
+        it('update old deployment as latest should work', async () => {
+            const projectId = 1;
+            await projectRegistry.addOrUpdateDeployment(projectId, deploymentIds[1], deploymentMetadatas[1], true)
+            // check state changes
+            let projectInfo = await projectRegistry.projectInfos(projectId);
+            expect(projectInfo.latestDeploymentId).to.equal(deploymentIds[1]);
+            await expect(projectRegistry.addOrUpdateDeployment(projectId, deploymentIds[0], deploymentMetadatas[0], true))
+                .to.be.emit(projectRegistry, 'UpdateProjectDeployment')
+                .withArgs(wallet_0.address, projectId, deploymentIds[0], deploymentMetadatas[0], true);
+
+            // check state changes
+            projectInfo = await projectRegistry.projectInfos(projectId);
+            expect(projectInfo.latestDeploymentId).to.equal(deploymentIds[0]);
+        });
+
+        it('can add new deployment to project with new account after owner transferred', async () => {
             const projectId = 1;
             await projectRegistry.transferFrom(wallet_0.address, wallet_1.address, projectId);
             expect(await projectRegistry.ownerOf(projectId)).to.equal(wallet_1.address);
@@ -195,7 +251,7 @@ describe('Project Registry Contract', () => {
             expect(await projectRegistry.ownerOf(projectId)).to.equal(wallet_1.address);
             await projectRegistry.connect(wallet_1).updateProjectMetadata(projectId, newProjectMetadata);
             const [metadata, deploymentId] = [deploymentMetadatas[1], deploymentIds[1]];
-            await projectRegistry.connect(wallet_1).updateDeployment(projectId, deploymentId, metadata)
+            await projectRegistry.connect(wallet_1).addOrUpdateDeployment(projectId, deploymentId, metadata, true)
 
             // check state changes
             const tokenUri = await projectRegistry.tokenURI(projectId);
@@ -213,14 +269,29 @@ describe('Project Registry Contract', () => {
             await expect(
                 projectRegistry.connect(wallet_1).updateProjectMetadata(1, projectMetadata)
             ).to.be.revertedWith('PR004');
-            // no permission to update deployment
+            // no permission to add deployment
             await expect(
-                projectRegistry.connect(wallet_1).updateDeployment(1, deploymentIds[1], deploymentMetadatas[1])
+                projectRegistry.connect(wallet_1).addOrUpdateDeployment(1, deploymentIds[1], deploymentMetadatas[1],true)
             ).to.be.revertedWith('PR004');
-            // 
+            // no changes after the update
+            await expect(
+                projectRegistry.addOrUpdateDeployment(1, deploymentIds[0], deploymentMetadatas[0],true)
+            ).to.be.revertedWith('PR008');
+            await expect(
+                projectRegistry.addOrUpdateDeployment(1, deploymentIds[0], deploymentMetadatas[0],false)
+            ).to.be.revertedWith('PR008');
+
+            // deployment existed
+            await projectRegistry.addCreator(wallet_1.address);
+            await projectRegistry.connect(wallet_1).createProject(
+                projectMetadatas[1],
+                deploymentMetadatas[1],
+                deploymentIds[1],
+                ProjectType.SUBQUERY
+            );
             await expect(
-                projectRegistry.updateDeployment(1, deploymentId, deploymentMetadatas[1])
-            ).to.be.revertedWith('PR003');
+                projectRegistry.connect(wallet_1).addOrUpdateDeployment(2, deploymentId, deploymentMetadatas[1], true)
+            ).to.be.revertedWith('PR007');
         });
     });
 

test/constants.ts

@@ -13,7 +13,8 @@ export const POI = '0xab3921276c8067fe0c82def3e5ecfd8447f1961bc85768c2a56e6bd26d
 
 export const projectMetadatas = [
     'QmZGAZQ7e1oZgfuK4V29Fa5gveYK3G2zEwvUzTZKNvSBsm',
-    'QmeeqBHdVu7iYnhVE9ZiYEKTWe4jXVUD5pVoGXT6LbCP2t'
+    'QmeeqBHdVu7iYnhVE9ZiYEKTWe4jXVUD5pVoGXT6LbCP2t',
+    'QmeHdVHdVuHdVnhVE9ZiYEKTWe4jXVUD5HdVGXT6LbCHdV'
 ]
 
 export const metadatas = [
@@ -25,6 +26,7 @@ export const metadatas = [
 export const deploymentMetadatas = [
     '0xaec921276c8067fe0c82def3e5ecfd8447f1961bc85768c2a56e6bd26d3c0c55',
     '0xccc921276c8067fe0c82def3e5ecfd8447f1961bc85768c2a56e6bd26d3c0c55',
+    '0xccc921276c8067fe0c82def3e5ecfd8447f1961bc85768c2a56e6bd26d3c0c5a',
 ];
 
 export const deploymentIds = [