@ayanworks/polygon-did-registry-contract 2.0.1-alpha.2 → 2.0.1-alpha.3

package/contracts/PolygonDidRegistry.sol

@@ -19,33 +19,41 @@ contract PolygonDidRegistry {
     modifier onlyController(address _id) {
         require(
             polyDIDs[_id].controller == msg.sender,
-            "message sender is not the controller of the DID Doc"
+            'message sender is not the controller of the DID Doc'
         );
         _;
     }
     mapping(address => PolyDID) polyDIDs;
     mapping(uint256 => address) activeDIDs;
     mapping(address => uint256) activeAddress;
+
     event DIDCreated(address id, string doc);
     event DIDUpdated(address id, string doc);
-    event DIDDeleted(address id);
     event TransferOwnership(address newOwner);
+    event ResourceAdded(
+        address _id,
+        string _resourceId,
+        string _resourcePayload
+    );
+
     bool private initialized;
 
     /**
      *@dev initializes the ownership of contract
      **/
 
+    mapping(address => string[]) private keysById;
+    mapping(address => mapping(string => string)) resourceData;
+
     function initialize() public {
-        require(!initialized, "Contract instance has already been initialized");
+        require(!initialized, 'Contract instance has already been initialized');
         initialized = true;
         owner = msg.sender;
         totalDIDs = 0;
-        deletedDID = 0;
     }
 
     modifier onlyOwner() {
-        require(msg.sender == owner, "message sender is not the owner");
+        require(msg.sender == owner, 'message sender is not the owner');
         _;
     }
 
@@ -54,17 +62,15 @@ contract PolygonDidRegistry {
      *@param _newOwner - Address of the new owner to whom the ownership needs to be passed
      **/
 
-    function transferOwnership(address _newOwner)
-        public
-        onlyOwner
-        returns (string memory)
-    {
+    function transferOwnership(
+        address _newOwner
+    ) public onlyOwner returns (string memory) {
         if (owner != _newOwner) {
             owner = _newOwner;
             emit TransferOwnership(owner);
-            return ("Ownership transferred successfully");
+            return ('Ownership transferred successfully');
         } else {
-            return ("Ownership cannot be transferred to the same account");
+            return ('Ownership cannot be transferred to the same account');
         }
     }
 
@@ -82,7 +88,10 @@ contract PolygonDidRegistry {
      *@param _doc - A string object that holds the DID Doc
      */
 
-    function createDID(address _id, string memory _doc)
+    function createDID(
+        address _id,
+        string memory _doc
+    )
         public
         returns (
             address controller,
@@ -112,32 +121,23 @@ contract PolygonDidRegistry {
      *@param _id - Address that refers to the DID doc position
      */
 
-    function getDIDDoc(address _id) public view returns (string memory) {
-        return polyDIDs[_id].didDoc;
-    }
-
-    /**
-     *@dev Reads total number of DIDs and total number of active DIDs from Chain
-     */
+    function getDIDDoc(
+        address _id
+    ) public view returns (string memory, string[] memory) {
+        string[] memory result = new string[](keysById[_id].length);
 
-    function getTotalNumberOfDIDs()
-        public
-        view
-        returns (uint256 _totalDIDs, uint256 _activeDIDs)
-    {
-        return (totalDIDs, (totalDIDs - deletedDID));
+        for (uint256 i = 0; i < keysById[_id].length; i++) {
+            result[i] = resourceData[_id][keysById[_id][i]];
+        }
+        return (polyDIDs[_id].didDoc, result);
     }
 
     /**
-     *@dev Reads total number of DIDs deleted from Chain
+     *@dev Reads total number of DIDs and total number of active DIDs from Chain
      */
 
-    function getTotalNumberOfDeletedDIDs()
-        public
-        view
-        returns (uint256 _deletedDID)
-    {
-        return deletedDID;
+    function getTotalNumberOfDIDs() public view returns (uint256 _totalDIDs) {
+        return (totalDIDs);
     }
 
     /**
@@ -146,11 +146,9 @@ contract PolygonDidRegistry {
      *@return _did - returns the DID Doc assciated with the index. Returns null if the DID Doc is deleted.
      */
 
-    function getDIDDOcByIndex(uint256 _index)
-        public
-        view
-        returns (string memory)
-    {
+    function getDIDDocByIndex(
+        uint256 _index
+    ) public view returns (string memory) {
         return polyDIDs[activeDIDs[_index]].didDoc;
     }
 
@@ -160,7 +158,10 @@ contract PolygonDidRegistry {
      *@param _doc - A String that holds the DID doc
      */
 
-    function updateDIDDoc(address _id, string memory _doc)
+    function updateDIDDoc(
+        address _id,
+        string memory _doc
+    )
         public
         onlyController(_id)
         returns (
@@ -182,14 +183,52 @@ contract PolygonDidRegistry {
     }
 
     /**
-     *@dev To delete a DID from chain
-     *@param _id - Address that refers to the DID doc that need to be deleted
+     *@dev To add linked resource in the DID doc
+     *@param _id - Address that refers to the DID doc
+     *@param _resourceId - Id that refers to the resource
+     */
+    function addResource(
+        address _id,
+        string memory _resourceId,
+        string memory _resourcePayload
+    )
+        public
+        onlyController(_id)
+        returns (address, string memory, string memory)
+    {
+        resourceData[_id][_resourceId] = _resourcePayload;
+        keysById[_id].push(_resourceId);
+        emit ResourceAdded(_id, _resourceId, _resourcePayload);
+        return (_id, _resourceId, _resourcePayload);
+    }
+
+    /**
+     *@dev Reads DID linked resource from Chain
+     *@param _id - Address that refers to the DID doc
+     *@param _resourceId - Id that refers to a specific resource
      */
 
-    function deleteDIDDoc(address _id) public onlyController(_id) {
-        delete polyDIDs[_id];
-        delete activeDIDs[activeAddress[_id]];
-        ++deletedDID;
-        emit DIDDeleted(_id);
+    function getResource(
+        address _id,
+        string memory _resourceId
+    ) public view returns (string memory) {
+        return resourceData[_id][_resourceId];
+    }
+
+    /**
+     *@dev Reads all DID linked resource for a specific DID from Chain
+     *@param _id - Address that refers to the DID doc
+     */
+
+    function getAllResources(
+        address _id
+    ) public view returns (string[] memory) {
+        string[] memory result = new string[](keysById[_id].length);
+
+        for (uint256 i = 0; i < keysById[_id].length; i++) {
+            result[i] = resourceData[_id][keysById[_id][i]];
+        }
+
+        return result;
     }
-}
+}

package/hardhat.config.js

@@ -0,0 +1,28 @@
+/**
+ * @type import('hardhat/config').HardhatUserConfig
+ */
+
+// import 'hardhat';
+require('@nomicfoundation/hardhat-ethers')
+require('@openzeppelin/hardhat-upgrades')
+
+require('dotenv/config')
+
+module.exports = {
+  solidity: {
+    version: '0.8.16',
+    settings: {
+      optimizer: {
+        enabled: true,
+        runs: 200,
+      },
+    },
+  },
+  networks: {
+    hardhat: {},
+    mumbai: {
+      url: process.env.RPCURL, // Update with Mumbai Matic RPC URL
+      accounts: [`0x${process.env.SIGNER}`],
+    },
+  },
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ayanworks/polygon-did-registry-contract",
-  "version": "2.0.1-alpha.2",
+  "version": "2.0.1-alpha.3",
   "description": "Smart Contract to register DID on Polygon",
   "main": "build/index.js",
   "directories": {
@@ -17,24 +17,23 @@
     "check-format": "pnpm prettier --list-different",
     "check-types": "pnpm build --noEmit",
     "format": "pnpm prettier --write",
-    "release": "git status && release-it"
+    "release": "release-it"
   },
   "license": "MIT",
   "devDependencies": {
-    "@openzeppelin/truffle-upgrades": "^1.15.0",
-    "@truffle/hdwallet-provider": "^2.0.10",
+    "@nomicfoundation/hardhat-ethers": "^3.0.5",
+    "@openzeppelin/hardhat-upgrades": "^3.0.1",
     "@types/fs-extra": "^11.0.1",
     "@types/node": "^18.17.0",
     "dotenv": "^16.0.2",
     "eslint": "^8.23.1",
     "ethers": "^6.9.0",
     "fs-extra": "^11.1.1",
-    "ganache-cli": "6.12.2",
+    "hardhat": "^2.19.4",
     "mocha": "^7.0.0",
     "prettier": "^3.0.2",
     "release-it": "^16.3.0",
     "solc": "^0.8.21",
-    "truffle": "^5.5.20",
     "ts-node": "^10.9.1",
     "typescript": "^5.1.6"
   },
@@ -52,5 +51,6 @@
   "bugs": {
     "url": "https://github.com/ayanworks/polygon-did-registry-contract/issues"
   },
-  "homepage": "https://github.com/ayanworks/polygon-did-registry-contract#readme"
+  "homepage": "https://github.com/ayanworks/polygon-did-registry-contract#readme",
+  "dependencies": {}
 }

package/scripts/deploy.js

@@ -0,0 +1,31 @@
+const { ethers, upgrades } = require('hardhat')
+
+async function main() {
+  try {
+    console.log('Deploying the smart contract...')
+    const PolygonDidRegistry =
+      await ethers.getContractFactory('PolygonDidRegistry')
+
+    // To deploy the initial upgradable smart contract
+
+    // const contract = await upgrades.deployProxy(PolygonDidRegistry, {
+    //   initializer: 'initialize',
+    // })
+
+    const contract = await upgrades.upgradeProxy(
+      process.env.CONTRACT_ADDRESS,
+      PolygonDidRegistry,
+      {
+        initializer: 'initialize',
+      },
+    )
+
+    await contract.waitForDeployment()
+
+    console.log('Contract address::', contract.target)
+  } catch (error) {
+    console.error('Error deploying contract:', error.message)
+  }
+}
+
+main()

package/sst-config.json

@@ -1,3 +1 @@
-{
-  "sourceHash": "0xd34bb18b8a1a061e975b0850a1887bacdf0b8891d51e51399492bb038c05ff96"
-}
+{"sourceHash":"0xb57d8b09722fddffbc5855f1dfba236305522e3e11aa91722f77789c16a9629b"}

package/migrations/1_initial_migration.js

@@ -1,5 +0,0 @@
-const Migrations = artifacts.require('Migrations')
-
-module.exports = function (deployer) {
-  deployer.deploy(Migrations)
-}

package/migrations/2_deploy_contract.js

@@ -1,8 +0,0 @@
-const { deployProxy } = require('@openzeppelin/truffle-upgrades')
-
-const PolygonDidRegistry = artifacts.require('PolygonDidRegistry')
-
-module.exports = async function (deployer) {
-  const instance = await deployProxy(PolygonDidRegistry, { deployer })
-  console.log('Deployed', instance.address)
-}

package/truffle-config.js

@@ -1,68 +0,0 @@
-/**
- * Use this file to configure your truffle project. It's seeded with some
- * common settings for different networks and features like migrations,
- * compilation and testing. Uncomment the ones you need or modify
- * them to suit your project as necessary.
- *
- * More information about configuration can be found at:
- *
- * trufflesuite.com/docs/advanced/configuration
- *
- * To deploy via Infura you'll need a wallet provider (like @truffle/hdwallet-provider)
- * to sign your transactions before they're sent to a remote public node. Infura accounts
- * are available for free at: infura.io/register.
- *
- * You'll also need a mnemonic - the twelve word phrase the wallet uses to generate
- * public/private key pairs. If you're publishing your code to GitHub make sure you load this
- * phrase from a file you've .gitignored so it doesn't accidentally become public.
- *
- */
-const HDWalletProvider = require('@truffle/hdwallet-provider')
-require('dotenv').config()
-
-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(process.env.SIGNER, process.env.RPCURL)
-      },
-      network_id: '80001',
-    },
-    matic_mainnet: {
-      provider: function () {
-        return new HDWalletProvider(process.env.SIGNER, process.env.RPCURL)
-      },
-      network_id: '137',
-    },
-  },
-
-  // Set default mocha options here, use special reporters etc.
-  mocha: {
-    // timeout: 100000
-  },
-
-  // Configure your compilers
-  compilers: {
-    solc: {
-      version: '0.8.16', // Fetch exact version from solc-bin (default: truffle's version)
-    },
-  },
-
-  db: {
-    enabled: false,
-  },
-}