@ayanworks/polygon-did-registry-contract 0.0.1 → 0.0.2

package/contracts/PolygonDidRegistry.sol

@@ -1,10 +1,16 @@
-pragma solidity ^0.5.1;
+/**
+ *Submitted for verification at polygonscan.com on 2021-12-29
+*/
+
+//SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
 
 /**
  *@title PolygonDidRegistry
  *@dev Smart Contract for Polygon DID Method
  */
 contract PolygonDidRegistry {
+    address owner;
     struct PolyDID {
         address controller;
         uint256 created;
@@ -22,20 +28,40 @@ contract PolygonDidRegistry {
     event DidCreated(address id, string doc);
     event DidUpdated(address id, string doc);
     event DidDeleted(address id);
+    event TransferOwnership(address newOwner);
+
+    constructor (){
+        owner = msg.sender;
+    }
+
+    modifier onlyOwner(){
+        require( msg.sender == owner, "message sender is not the owner");
+        _;
+    }
+
+    function transferOwnership(address newOwner)public onlyOwner() returns (string memory){
+        if(owner != newOwner){
+            owner = newOwner;
+            emit TransferOwnership(owner);
+            return ("Ownership transffered successfully");
+        }
+        else {
+            return ("New Owner address is equal to original owner address");
+        }
+    }
 
     /**
      *@dev Register a new DID
      *@param _id - Address that will refer the DID doc
      *@param _doc - A string object that holds the DID Doc
-     *@return returns the controller, created and updated time stamp and DID Document
      */
     function createDID(address _id, string memory _doc)
         public
         returns (address controller, uint256 created, uint256 updated, string memory did_doc)
     {
         did[_id].controller = msg.sender;
-        did[_id].created = now;
-        did[_id].updated = now;
+        did[_id].created = block.timestamp;
+        did[_id].updated = block.timestamp;
         did[_id].did_doc = _doc;
         emit DidCreated(_id, _doc);
         return (did[_id].controller, did[_id].created, did[_id].updated, did[_id].did_doc);
@@ -53,14 +79,13 @@ contract PolygonDidRegistry {
      *@dev To Update the DID doc
      *@param _id - Address that refers to the DID doc
      *@param _doc - A String that holds the DID doc
-     *@return returns the controller, created and updated time stamp and DID Document
      */
     function updateDID(address _id, string memory _doc)
         public
         onlyController(_id) returns(address controller, uint256 created, uint256 updated, string memory did_doc)
     {
         did[_id].did_doc = _doc;
-        did[_id].updated = now;
+        did[_id].updated = block.timestamp;
         emit DidUpdated(_id, _doc);
         return (did[_id].controller, did[_id].created, did[_id].updated, did[_id].did_doc);
     }
@@ -73,4 +98,4 @@ contract PolygonDidRegistry {
         delete did[_id];
         emit DidDeleted(_id);
     }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ayanworks/polygon-did-registry-contract",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Smart Contract to register DID on Polygon",
   "main": "build/contracts/PolygonDidRegistry.json",
   "directories": {
@@ -15,21 +15,22 @@
   "dependencies": {
     "ganache-cli": "6.8.1",
     "mocha": "^7.0.0",
-    "solc": "0.5.1",
+    "solc": "0.8.0",
     "ethers": "^4.0.41",
     "fs-extra": "8.1.0"
   },
   "devDependencies": {},
   "repository": {
     "type": "git",
-    "url": "git+https://gitlab.com/polygon-did/polygon-did-registry-contract.git"
+    "url": "git+https://github.com/ayanworks/polygon-did-registry-contract"
   },
   "keywords": [
     "did-method"
   ],
-  "author": "Shashank Kulkarni <shashank.kulkarni@ayanworks.com>",
+  "author": "Ajay Jadhav <ajay@ayanworks.com>",
+  "contributors": ["Anusha Garg <anusha.garg@ayanworks.com>, Shashank Kulkarni <shashank.kulkarni@ayanworks.com>"],
   "bugs": {
-    "url": "https://gitlab.com/polygon-did/polygon-did-registry-contract/issues"
+    "url": "https://github.com/ayanworks/polygon-did-registry-contract/issues"
   },
-  "homepage": "https://gitlab.com/polygon-did/polygon-did-registry-contract#readme"
+  "homepage": "https://github.com/ayanworks/polygon-did-registry-contract#readme"
 }

package/test/polygon_did_registry_test.js

@@ -7,9 +7,10 @@ const assert = require('assert');
 const provider = new ethers.providers.Web3Provider(ganache.provider({ gasLimit: 8000000 }));
 
 // Initializing the build files
-const PolygonDIDRegistryJSON = require('../build/PolygonDIDRegistry_PolygonDIDRegistry.json');
+const PolygonDIDRegistryJSON = require('../build/PolygonDidRegistry_PolygonDidRegistry.json');
+// const { it } = require('ethers/wordlists');
 
-let accounts, PolygonDIDRegistryInstance;
+let accounts, PolygonDIDRegistryInstance, PolygonDIDRegistryInstance_test;
 
 // Describing the 1st Test
 // This will setup Ganache with some test address
@@ -31,7 +32,6 @@ describe('Basic Contract Testing', () => {
     // Describing a SubTest case
     describe('Setting up the contract', async () => {
 
-        // 1st Test case for the SubTest case
         it('This Deploys Polygon Smart contract from 1st account with no Parameters/Constructor', async () => {
 
             // Creating a contract factory for deploying contract. 
@@ -41,7 +41,7 @@ describe('Basic Contract Testing', () => {
                 provider.getSigner(accounts[0])
             );
             PolygonDIDRegistryInstance = await PolygonDIDRegistry.deploy();
-
+            PolygonDIDRegistryInstance_test = new ethers.Contract(PolygonDIDRegistryInstance.address, PolygonDIDRegistryJSON.abi, provider.getSigner(accounts[1]));
             assert.ok(PolygonDIDRegistryInstance.address, 'conract address should be present');
         });
 
@@ -50,7 +50,6 @@ describe('Basic Contract Testing', () => {
     // Describing the 3rd Test case
     describe('Checking the Create function in Contract', async () => {
 
-        // Initializing the 1st sub test 
         it('This should store the DID doc on Contract and will read and check if the value stored is correct', async () => {
 
             // This will send the value to local ganache blockchain
@@ -70,13 +69,18 @@ describe('Basic Contract Testing', () => {
                 doc,
                 'value set must be able to get'
             );
+
+            assert.notEqual(
+                currentValue,
+                null,
+                'value should not be empty'
+            );
         });
     });
 
     // Describing the 4th Test case
     describe('Checking the Update function in Contract', async () => {
 
-        // Initializing the 1st sub test 
         it('This should update the DID doc on Contract and will read and check if the value stored is correct', async () => {
 
             // This will send the value to local ganache blockchain
@@ -99,17 +103,109 @@ describe('Basic Contract Testing', () => {
             );
         });
     });
+    //Describing test 5 to check if test fails if we update with different controller
+    describe('Checking update with wrong controller', async () => {
+
+        it('This should not update DID doc ', async () => {
+
+            const did = '0x2f65b747440deaf596892dfc7965040be8b99100';
+            const doc = '{"@context":"https://w3id.org/did/v1","id":"did:polygon:0x2f65b747440deaf596892dfc7965040be8b99100","verificationMethod":[{"id":"did:polygon:0x2f65b747440deaf596892dfc7965040be8b99100","type":"EcdsaSecp256k1VerificationKey2019","controller":"did:polygon:0x2f65b747440deaf596892dfc7965040be8c66666","publicKeyBase58":"NDaEdTguJV39Ns8BZkxQ3XR6GUinZAJfVoyEMkK9fP7XQmpSkT3UsLHB52cFpDqoM6m4Hevtba8pkmjvEG3Ur7ji"}]}';
+            try {
+                assert.ifError(
+                    //sending transaction using different controller
+                    await PolygonDIDRegistryInstance_test.functions.updateDID(did, doc));
+            } catch (error) {
+            }
+        });
+    });
 
-    // Describing the 5th Test case
+    // Describing the 6th Test case
     describe('Checking the Delete function in Contract', async () => {
 
-        // Initializing the 1st sub test 
-        it('This should delete the DID doc on Contract and will read and check if the value is now null', async () => {
+        it('This should delete the DID doc on Contract and will read and check if the value is now an empty string', async () => {
 
             // This will send the value to local ganache blockchain
             const did = '0x2f65b747440deaf596892dfc7965040be8b99100';
+            const tx = await PolygonDIDRegistryInstance.functions.deleteDID(did);
+
+            // Transfer confirmation
+            await tx.wait();
+
+            // Getting the set value in ganache blockchain
+            const currentValue = await PolygonDIDRegistryInstance.functions.getDID(did);
+
+            // Comparing the set value to confirm
+            assert.equal(
+                currentValue,
+                "",
+                'value should be matching'
+            );
+        });
+    });
+
+    // Describing the 7th Test case
+    describe('Checking the Create function in Contract', async () => {
+
+        it('This should store the DID doc on Contract and will read and check if the value stored is not null', async () => {
+
+            // This will send the value to local ganache blockchain
+            const did = '0x54ec7be8b24f7139f870f277cf99c527ff43892b';
+            const doc = '{"@context":"https://w3id.org/did/v1","id":"did:polygon:0x54ec7be8b24f7139f870f277cf99c527ff43892b","verificationMethod":[{"id":"did:polygon:0x54ec7be8b24f7139f870f277cf99c527ff43892b","type":"EcdsaSecp256k1VerificationKey2019","controller":"did:polygon:0x54ec7be8b24f7139f870f277cf99c527ff43892b","publicKeyBase58":"RwHysxjkzFdJDqi2irHRVRFHX9uUj5aVAXVoufnk5PDA4qcn1ejJMgGhqCsFdQqXRCTdi4TbEQFJjDUAdi2JvYmH"}]}';
+            const doctest = '{"@context":"https://w3id.org/did/v1","id":"did:polygon:0x2f65b747440deaf596892dfc7965040be8b99100","verificationMethod":[{"id":"did:polygon:0x2f65b747440deaf596892dfc7965040be8b99100","type":"EcdsaSecp256k1VerificationKey2019","controller":"did:polygon:0x2f65b747440deaf596892dfc7965040be8c66666","publicKeyBase58":"NDaEdTguJV39Ns8BZkxQ3XR6GUinZAJfVoyEMkK9fP7XQmpSkT3UsLHB52cFpDqoM6m4Hevtba8pkmjvEG3Ur7ji"}]}';
+            const tx = await PolygonDIDRegistryInstance.functions.createDID(did, doc);
+
+            // Transfer confirmation
+            await tx.wait();
+
+            // Getting the set value in ganache blockchain
+            const currentValue = await PolygonDIDRegistryInstance.functions.getDID(did);
+
+            // Checking value is not null
+
+            assert.notEqual(
+                currentValue,
+                doctest,
+                'value should not match'
+            );
+        });
+    });
+
+    // Describing the 8th Test case
+    describe('Checking the Update function in Contract', async () => {
+
+        it('This should update the DID doc on Contract and will read and check if the value stored has changed', async () => {
+
+            // This will send the value to local ganache blockchain
+            const did = '0x54ec7be8b24f7139f870f277cf99c527ff43892b';
+            //changed the controller
             const doc = '{"@context":"https://w3id.org/did/v1","id":"did:polygon:0x2f65b747440deaf596892dfc7965040be8b99100","verificationMethod":[{"id":"did:polygon:0x2f65b747440deaf596892dfc7965040be8b99100","type":"EcdsaSecp256k1VerificationKey2019","controller":"did:polygon:0x2f65b747440deaf596892dfc7965040be8c66666","publicKeyBase58":"NDaEdTguJV39Ns8BZkxQ3XR6GUinZAJfVoyEMkK9fP7XQmpSkT3UsLHB52cFpDqoM6m4Hevtba8pkmjvEG3Ur7ji"}]}';
+            const docoriginal = '{"@context":"https://w3id.org/did/v1","id":"did:polygon:0x54ec7be8b24f7139f870f277cf99c527ff43892b","verificationMethod":[{"id":"did:polygon:0x54ec7be8b24f7139f870f277cf99c527ff43892b","type":"EcdsaSecp256k1VerificationKey2019","controller":"did:polygon:0x54ec7be8b24f7139f870f277cf99c527ff43892b","publicKeyBase58":"RwHysxjkzFdJDqi2irHRVRFHX9uUj5aVAXVoufnk5PDA4qcn1ejJMgGhqCsFdQqXRCTdi4TbEQFJjDUAdi2JvYmH"}]}';
+            const tx = await PolygonDIDRegistryInstance.functions.updateDID(did, doc);
 
+            // Transfer confirmation
+            await tx.wait();
+
+            // Getting the set value in ganache blockchain
+            const currentValue = await PolygonDIDRegistryInstance.functions.getDID(did);
+
+            // Comparing the set value to confirm
+            assert.notEqual(
+                currentValue,
+                docoriginal,
+                'value should not match'
+            );
+        });
+    });
+
+
+    // Describing the 9th Test case
+    describe('Checking the Delete function in Contract', async () => {
+
+        it('This should delete the DID doc on Contract and will read and check if the value is now not equal to the updated doc', async () => {
+
+            // This will send the value to local ganache blockchain
+            const did = '0x54ec7be8b24f7139f870f277cf99c527ff43892b';
+            const doc = '{"@context":"https://w3id.org/did/v1","id":"did:polygon:0x2f65b747440deaf596892dfc7965040be8b99100","verificationMethod":[{"id":"did:polygon:0x2f65b747440deaf596892dfc7965040be8b99100","type":"EcdsaSecp256k1VerificationKey2019","controller":"did:polygon:0x2f65b747440deaf596892dfc7965040be8c66666","publicKeyBase58":"NDaEdTguJV39Ns8BZkxQ3XR6GUinZAJfVoyEMkK9fP7XQmpSkT3UsLHB52cFpDqoM6m4Hevtba8pkmjvEG3Ur7ji"}]}';
             const tx = await PolygonDIDRegistryInstance.functions.deleteDID(did);
 
             // Transfer confirmation

package/truffle-config.js

@@ -17,111 +17,111 @@
  * phrase from a file you've .gitignored so it doesn't accidentally become public.
  *
  */
-const HDWalletProvider = require("@truffle/hdwallet-provider");
-  const mnemonic = "Place your mnemonic here";
-// const HDWalletProvider = require('@truffle/hdwallet-provider');
-// const infuraKey = "fj4jll3k.....";
-//
-// const fs = require('fs');
-// const mnemonic = fs.readFileSync(".secret").toString().trim();
-
-module.exports = {
-  /**
-   * Networks define how you connect to your ethereum client and let you set the
-   * defaults web3 uses to send transactions. If you don't specify one truffle
-   * will spin up a development blockchain for you on port 9545 when you
-   * run `develop` or `test`. You can ask a truffle command to use a specific
-   * network from the command line, e.g
-   *
-   * $ truffle test --network <network-name>
-   */
-  
-
-  networks: {
-
-    development: {
-      host: "127.0.0.1", // Localhost (default: none)
-      port: 8545, // Standard Ethereum port (default: none)
-      network_id: "*", // Any network (default: none)
-    },
-    matic: {
-      provider: function () {
-        return new HDWalletProvider(mnemonic, "https://rpc-mumbai.matic.today");
-      },
-      network_id: '80001',
-    },
-    matic_mainnet: {
-      provider: function () {
-        return new HDWalletProvider(mnemonic, "https://rpc-mainnet.maticvigil.com/");
-      },
-      network_id: '137',
-    }
-
-    // Useful for testing. The `development` name is special - truffle uses it by default
-    // if it's defined here and no other network is specified at the command line.
-    // You should run a client (like ganache-cli, geth or parity) in a separate terminal
-    // tab if you use this network and you must also set the `host`, `port` and `network_id`
-    // options below to some value.
-    //
-    // development: {
-    //  host: "127.0.0.1",     // Localhost (default: none)
-    //  port: 8545,            // Standard Ethereum port (default: none)
-    //  network_id: "*",       // Any network (default: none)
-    // },
-    // Another network with more advanced options...
-    // advanced: {
-    // port: 8777,             // Custom port
-    // network_id: 1342,       // Custom network
-    // gas: 8500000,           // Gas sent with each transaction (default: ~6700000)
-    // gasPrice: 20000000000,  // 20 gwei (in wei) (default: 100 gwei)
-    // from: <address>,        // Account to send txs from (default: accounts[0])
-    // websocket: true        // Enable EventEmitter interface for web3 (default: false)
-    // },
-    // Useful for deploying to a public network.
-    // NB: It's important to wrap the provider as a function.
-    // ropsten: {
-    // provider: () => new HDWalletProvider(mnemonic, `https://ropsten.infura.io/v3/YOUR-PROJECT-ID`),
-    // network_id: 3,       // Ropsten's id
-    // gas: 5500000,        // Ropsten has a lower block limit than mainnet
-    // confirmations: 2,    // # of confs to wait between deployments. (default: 0)
-    // timeoutBlocks: 200,  // # of blocks before a deployment times out  (minimum/default: 50)
-    // skipDryRun: true     // Skip dry run before migrations? (default: false for public nets )
-    // },
-    // Useful for private networks
-    // private: {
-    // provider: () => new HDWalletProvider(mnemonic, `https://network.io`),
-    // network_id: 2111,   // This network is yours, in the cloud.
-    // production: true    // Treats this network as if it was a public net. (default: false)
-    // }
-  },
-
-  // Set default mocha options here, use special reporters etc.
-  mocha: {
-    // timeout: 100000
-  },
-
-  // Configure your compilers
-  compilers: {
-    solc: {
-      // version: "0.5.1",    // Fetch exact version from solc-bin (default: truffle's version)
-      // docker: true,        // Use "0.5.1" you've installed locally with docker (default: false)
-      // settings: {          // See the solidity docs for advice about optimization and evmVersion
-      //  optimizer: {
-      //    enabled: false,
-      //    runs: 200
-      //  },
-      //  evmVersion: "byzantium"
-      // }
-    }
-  },
-
-  // Truffle DB is currently disabled by default; to enable it, change enabled: false to enabled: true
-  //
-  // Note: if you migrated your contracts prior to enabling this field in your Truffle project and want
-  // those previously migrated contracts available in the .db directory, you will need to run the following:
-  // $ truffle migrate --reset --compile-all
-
-  db: {
-    enabled: false
-  }
-};
+ const HDWalletProvider = require("@truffle/hdwallet-provider");
+ const mnemonic = "";
+ // const HDWalletProvider = require('@truffle/hdwallet-provider');
+ // const infuraKey = "fj4jll3k.....";
+ //
+ // const fs = require('fs');
+ // const mnemonic = fs.readFileSync(".secret").toString().trim();
+ 
+ module.exports = {
+   /**
+    * Networks define how you connect to your ethereum client and let you set the
+    * defaults web3 uses to send transactions. If you don't specify one truffle
+    * will spin up a development blockchain for you on port 9545 when you
+    * run `develop` or `test`. You can ask a truffle command to use a specific
+    * network from the command line, e.g
+    *
+    * $ truffle test --network <network-name>
+    */
+ 
+ 
+   networks: {
+ 
+     development: {
+       host: "127.0.0.1", // Localhost (default: none)
+       port: 8545, // Standard Ethereum port (default: none)
+       network_id: "*", // Any network (default: none)
+     },
+     matic: {
+       provider: function () {
+         return new HDWalletProvider(mnemonic, "https://rpc-mumbai.matic.today");
+       },
+       network_id: '80001',
+     },
+     matic_mainnet: {
+       provider: function () {
+         return new HDWalletProvider(mnemonic, "https://rpc-mainnet.maticvigil.com/");
+       },
+       network_id: '137',
+     }
+ 
+     // Useful for testing. The `development` name is special - truffle uses it by default
+     // if it's defined here and no other network is specified at the command line.
+     // You should run a client (like ganache-cli, geth or parity) in a separate terminal
+     // tab if you use this network and you must also set the `host`, `port` and `network_id`
+     // options below to some value.
+     //
+     // development: {
+     //  host: "127.0.0.1",     // Localhost (default: none)
+     //  port: 8545,            // Standard Ethereum port (default: none)
+     //  network_id: "*",       // Any network (default: none)
+     // },
+     // Another network with more advanced options...
+     // advanced: {
+     // port: 8777,             // Custom port
+     // network_id: 1342,       // Custom network
+     // gas: 8500000,           // Gas sent with each transaction (default: ~6700000)
+     // gasPrice: 20000000000,  // 20 gwei (in wei) (default: 100 gwei)
+     // from: <address>,        // Account to send txs from (default: accounts[0])
+     // websocket: true        // Enable EventEmitter interface for web3 (default: false)
+     // },
+     // Useful for deploying to a public network.
+     // NB: It's important to wrap the provider as a function.
+     // ropsten: {
+     // provider: () => new HDWalletProvider(mnemonic, `https://ropsten.infura.io/v3/YOUR-PROJECT-ID`),
+     // network_id: 3,       // Ropsten's id
+     // gas: 5500000,        // Ropsten has a lower block limit than mainnet
+     // confirmations: 2,    // # of confs to wait between deployments. (default: 0)
+     // timeoutBlocks: 200,  // # of blocks before a deployment times out  (minimum/default: 50)
+     // skipDryRun: true     // Skip dry run before migrations? (default: false for public nets )
+     // },
+     // Useful for private networks
+     // private: {
+     // provider: () => new HDWalletProvider(mnemonic, `https://network.io`),
+     // network_id: 2111,   // This network is yours, in the cloud.
+     // production: true    // Treats this network as if it was a public net. (default: false)
+     // }
+   },
+ 
+   // Set default mocha options here, use special reporters etc.
+   mocha: {
+     // timeout: 100000
+   },
+ 
+   // Configure your compilers
+   compilers: {
+     solc: {
+       version: "0.8.0",    // Fetch exact version from solc-bin (default: truffle's version)
+       // docker: true,        // Use "0.5.1" you've installed locally with docker (default: false)
+       // settings: {          // See the solidity docs for advice about optimization and evmVersion
+       //  optimizer: {
+       //    enabled: false,
+       //    runs: 200
+       //  },
+       //  evmVersion: "byzantium"
+       // }
+     }
+   },
+ 
+   // Truffle DB is currently disabled by default; to enable it, change enabled: false to enabled: true
+   //
+   // Note: if you migrated your contracts prior to enabling this field in your Truffle project and want
+   // those previously migrated contracts available in the .db directory, you will need to run the following:
+   // $ truffle migrate --reset --compile-all
+ 
+   db: {
+     enabled: false
+   }
+ };