Merge pull request #26 from 0xPolygonID/feature/iden3-contracts-2-0-1

update to "@iden3/contracts": "2.0.1"
0xPolygonID · Apr 16, 2024 · de37f7b · de37f7b
2 parents 2ba06e3 + d27d2e7
commit de37f7b
Show file tree

Hide file tree

Showing 7 changed files with 82 additions and 55 deletions.
diff --git a/on-chain-verification/contracts/ERC20Verifier.sol b/on-chain-verification/contracts/ERC20Verifier.sol
@@ -1,32 +1,44 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.16;
+pragma solidity 0.8.20;
 
-import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import {ERC20Upgradeable} from '@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol';
 import {PrimitiveTypeUtils} from "@iden3/contracts/lib/PrimitiveTypeUtils.sol";
 import {ICircuitValidator} from "@iden3/contracts/interfaces/ICircuitValidator.sol";
 import {ZKPVerifier} from "@iden3/contracts/verifiers/ZKPVerifier.sol";
 
-contract ERC20Verifier is ERC20, ZKPVerifier {
+contract ERC20Verifier is ERC20Upgradeable, ZKPVerifier {
     uint64 public constant TRANSFER_REQUEST_ID = 1;
 
     mapping(uint256 => address) public idToAddress;
     mapping(address => uint256) public addressToId;
 
-    uint256 public TOKEN_AMOUNT_FOR_AIRDROP_PER_ID =
-        5 * 10 ** uint256(decimals());
+    uint256 public TOKEN_AMOUNT_FOR_AIRDROP_PER_ID;
 
-    constructor(
-        string memory name_,
-        string memory symbol_
-    ) ERC20(name_, symbol_) {}
+    modifier beforeTransfer(address to) {
+        MainStorage storage s = _getMainStorage();
+        require(
+            s.proofs[to][TRANSFER_REQUEST_ID] == true,
+            "only identities who provided proof are allowed to receive tokens"
+        );
+        _;
+    }
+
+    function initialize(
+        string memory name,
+        string memory symbol
+    ) public initializer {
+        super.__ERC20_init(name, symbol);
+        super.__ZKPVerifier_init(_msgSender());
+        TOKEN_AMOUNT_FOR_AIRDROP_PER_ID = 5 * 10 ** uint256(decimals());
+    }
 
     function _beforeProofSubmit(
         uint64 /* requestId */,
         uint256[] memory inputs,
         ICircuitValidator validator
     ) internal view override {
         // check that  challenge input is address of sender
-        address addr = PrimitiveTypeUtils.int256ToAddress(
+        address addr = PrimitiveTypeUtils.uint256LEToAddress(
             inputs[validator.inputIndexOf("challenge")]
         );
         // this is linking between msg.sender and
@@ -56,14 +68,12 @@ contract ERC20Verifier is ERC20, ZKPVerifier {
         }
     }
 
-    function _beforeTokenTransfer(
-        address /* from */,
+    function _update(
+        address from /* from */,
         address to,
-        uint256 /* amount */
-    ) internal view override {
-        require(
-            proofs[to][TRANSFER_REQUEST_ID] == true,
-            "only identities who provided proof are allowed to receive tokens"
-        );
+        uint256 amount /* amount */
+    ) internal override beforeTransfer(to) {
+        super._update(from, to, amount);
     }
+
 }
diff --git a/on-chain-verification/contracts/Imports.sol b/on-chain-verification/contracts/Imports.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity 0.8.16;
+pragma solidity 0.8.20;
 
-import {CredentialAtomicQueryMTPValidator} from "@iden3/contracts/validators/CredentialAtomicQueryMTPValidator.sol";
-import {CredentialAtomicQuerySigValidator} from "@iden3/contracts/validators/CredentialAtomicQuerySigValidator.sol";
+import {CredentialAtomicQueryMTPV2Validator} from "@iden3/contracts/validators/CredentialAtomicQueryMTPV2Validator.sol";
+import {CredentialAtomicQuerySigV2Validator} from "@iden3/contracts/validators/CredentialAtomicQuerySigV2Validator.sol";
diff --git a/on-chain-verification/hardhat.config.js b/on-chain-verification/hardhat.config.js
@@ -3,7 +3,7 @@ require('dotenv').config();
 require('@openzeppelin/hardhat-upgrades');
 
 module.exports = {
-  solidity: "0.8.16",
+  solidity: "0.8.20",
   networks: {
     mumbai: {
       chainId: 80001,

diff --git a/on-chain-verification/package-lock.json b/on-chain-verification/package-lock.json
diff --git a/on-chain-verification/package.json b/on-chain-verification/package.json
@@ -10,10 +10,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@iden3/contracts": "1.4.5",
+    "@iden3/contracts": "2.0.1",
     "@nomiclabs/hardhat-waffle": "^2.0.3",
-    "@openzeppelin/contracts": "^4.7.3",
-    "@openzeppelin/contracts-upgradeable": "^4.7.3",
+    "@openzeppelin/contracts": "^5.0.1",
+    "@openzeppelin/contracts-upgradeable": "^5.0.1",
     "@openzeppelin/hardhat-upgrades": "^1.22.1",
     "dotenv": "^16.0.2",
     "solidity-bytes-utils": "^0.8.0",

diff --git a/on-chain-verification/scripts/deploy.js b/on-chain-verification/scripts/deploy.js
@@ -4,9 +4,9 @@ async function main() {
   const verifierSymbol = "zkERC20";
 
   const ERC20Verifier = await ethers.getContractFactory(verifierContract);
-  const erc20Verifier = await ERC20Verifier.deploy(
-    verifierName,
-    verifierSymbol
+  const erc20Verifier = await upgrades.deployProxy(
+    ERC20Verifier,
+    [verifierName, verifierSymbol]
   );
 
   await erc20Verifier.deployed();

diff --git a/on-chain-verification/scripts/deployValidators.js b/on-chain-verification/scripts/deployValidators.js
@@ -10,11 +10,11 @@ async function main() {
     const validators = [
         {
             verifierAddress: "0x357Bb671fEb5577d310410eab93291B4De04a834",
-            validatorContractName: "CredentialAtomicQueryMTPValidator",
+            validatorContractName: "CredentialAtomicQueryMTPV2Validator",
         },
         {
             verifierAddress: "0xf635aCA4E8B5268aA9Bf8E226907C27383fC9686",
-            validatorContractName: "CredentialAtomicQuerySigValidator",
+            validatorContractName: "CredentialAtomicQuerySigV2Validator",
         },
     ];
     const deployInfo = [];