fix claim membership

julienbrg · julienbrg · commit febcc3496892 · 2024-12-06T12:49:15.000+01:00
diff --git a/contracts/NFT.sol b/contracts/NFT.sol
@@ -38,7 +38,6 @@ contract NFT is
     ) ERC721(_name, _symbol) Ownable(initialOwner) EIP712(_name, "1") {
         for (uint i; i < _firstMembers.length; i++) {
             safeMint(_firstMembers[i], _uri);
-            _delegate(_firstMembers[i], _firstMembers[i]);
         }
     }
 
diff --git a/contracts/variants/crosschain/NFT.sol b/contracts/variants/crosschain/NFT.sol
@@ -95,20 +95,15 @@ contract NFT is
         home = _home;
         for (uint i; i < _firstMembers.length; i++) {
             _govMint(_firstMembers[i], _uri);
-            _delegate(_firstMembers[i], _firstMembers[i]);
         }
     }
 
-    /**
-     * @notice Adds a new member on home chain
-     * @dev Only callable by owner (governance) on home chain
-     * @param to Address to mint token to
-     * @param uri Token metadata URI
-     */
+    /// @notice Adds a new member to the DAO
+    /// @dev Mints a new NFT to the specified address
+    /// @param to The address of the new member
+    /// @param uri The metadata URI for the new NFT
     function safeMint(address to, string memory uri) public onlyOwner onlyHomeChain {
-        uint256 nonce = _proofStorage.incrementNonce(uint8(OperationType.MINT));
         _govMint(to, uri);
-        emit MembershipClaimed(_nextTokenId - 1, to, nonce);
     }
 
     /**
@@ -173,9 +168,17 @@ contract NFT is
             .verifyAndClaimProof(proof, address(this), _proofStorage);
 
         if (operationType == uint8(OperationType.MINT)) {
-            (address to, string memory uri) = abi.decode(params, (address, string));
-            _govMint(to, uri);
-            emit MembershipClaimed(_nextTokenId - 1, to, nonce);
+            (uint256 tokenId, address owner, string memory uri) = abi.decode(
+                params,
+                (uint256, address, string)
+            );
+
+            try this.ownerOf(tokenId) returns (address) {
+                revert("Token already exists");
+            } catch {
+                _govMint(owner, uri);
+                emit MembershipClaimed(_nextTokenId - 1, owner, nonce);
+            }
         } else if (operationType == uint8(OperationType.BURN)) {
             uint256 tokenId = abi.decode(params, (uint256));
             address owner = ownerOf(tokenId);
diff --git a/contracts/variants/crosschain/ProofHandler.sol b/contracts/variants/crosschain/ProofHandler.sol
@@ -9,7 +9,7 @@ pragma solidity ^0.8.20;
  * @custom:security-contact julien@strat.cc
  */
 library ProofHandler {
-    /// @notice Tracks which proofs have been applied on each chain
+    /// @notice Tracks which proofs have been applied and nonces for operations that require them
     struct ProofStorage {
         mapping(bytes32 => bool) updateAppliedOnChain;
         mapping(uint8 => uint256) currentNonce;
@@ -23,7 +23,7 @@ library ProofHandler {
      * @param contractAddress Address of contract generating the proof
      * @param operationType Type of operation being performed
      * @param params Operation parameters
-     * @param nonce Current nonce for this operation type
+     * @param nonce Current nonce for this operation type (0 for nonce-free operations)
      * @return proof Encoded proof data
      */
     function generateProof(
@@ -60,10 +60,6 @@ library ProofHandler {
             (uint8, bytes, uint256, bytes32)
         );
 
-        bytes32 proofHash = keccak256(proof);
-        require(!storage_.updateAppliedOnChain[proofHash], "Proof already claimed");
-        require(nonce == storage_.currentNonce[operationType] + 1, "Invalid nonce");
-
         bytes32 message = keccak256(
             abi.encodePacked(contractAddress, operationType, params, nonce)
         );
@@ -72,8 +68,14 @@ library ProofHandler {
         );
         require(digest == expectedDigest, "Invalid proof");
 
-        storage_.updateAppliedOnChain[proofHash] = true;
-        storage_.currentNonce[operationType] = nonce;
+        if (operationType > 1) {
+            bytes32 proofHash = keccak256(proof);
+            require(!storage_.updateAppliedOnChain[proofHash], "Proof already claimed");
+            require(nonce == storage_.currentNonce[operationType] + 1, "Invalid nonce");
+
+            storage_.updateAppliedOnChain[proofHash] = true;
+            storage_.currentNonce[operationType] = nonce;
+        }
 
         emit ProofClaimed(operationType, params, nonce);
 
@@ -90,6 +92,7 @@ library ProofHandler {
         ProofStorage storage storage_,
         uint8 operationType
     ) public view returns (uint256 nonce) {
+        if (operationType <= 1) return 0; // MINT or BURN operations don't use nonces
         return storage_.currentNonce[operationType] + 1;
     }
 
@@ -103,6 +106,7 @@ library ProofHandler {
         ProofStorage storage storage_,
         uint8 operationType
     ) public returns (uint256 nonce) {
+        if (operationType <= 1) return 0; // MINT or BURN operations don't use nonces
         storage_.currentNonce[operationType]++;
         return storage_.currentNonce[operationType];
     }
diff --git a/dao.config.ts b/dao.config.ts
@@ -20,6 +20,6 @@ export const manifesto =
     "https://bafkreifnnreoxxgkhty7v2w3qwiie6cfxpv3vcco2xldekfvbiem3nm6dm.ipfs.w3s.link/"
 export const daoName = "Test DAO"
 export const votingDelay = 0
-export const votingPeriod = 30
+export const votingPeriod = 60
 export const votingThreshold = 1
 export const quorum = 5
diff --git a/deploy/deploy-crosschain-gov.ts b/deploy/deploy-crosschain-gov.ts
@@ -20,7 +20,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     const { deployments, getNamedAccounts } = hre
     const { deterministic } = deployments
     const { deployer } = await getNamedAccounts()
-    const salt = "-v10"
+    const salt = "-v1"
 
     function wait(ms: number): Promise<void> {
         return new Promise(resolve => setTimeout(resolve, ms))
@@ -52,7 +52,8 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
             },
             salt: hre.ethers.id("NFT" + salt),
             log: true,
-            waitConfirmations: 1
+            waitConfirmations: 1,
+            gasLimit: 10000000
         }
     )
 
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -37,51 +37,58 @@ const config: HardhatUserConfig = {
                 SEPOLIA_RPC_ENDPOINT_URL ||
                 "https://ethereum-sepolia.publicnode.com",
             accounts:
-                SIGNER_PRIVATE_KEY !== undefined ? [SIGNER_PRIVATE_KEY] : []
+                SIGNER_PRIVATE_KEY !== undefined ? [SIGNER_PRIVATE_KEY] : [],
+            allowUnlimitedContractSize: true
         },
         optimism: {
             chainId: 10,
             url:
                 OPTIMISM_MAINNET_RPC_ENDPOINT_URL ||
                 "https://mainnet.optimism.io",
             accounts:
-                SIGNER_PRIVATE_KEY !== undefined ? [SIGNER_PRIVATE_KEY] : []
+                SIGNER_PRIVATE_KEY !== undefined ? [SIGNER_PRIVATE_KEY] : [],
+            allowUnlimitedContractSize: true
         },
         base: {
             chainId: 8453,
             url: BASE_MAINNET_RPC_ENDPOINT_URL || "https://mainnet.base.org",
             accounts:
-                SIGNER_PRIVATE_KEY !== undefined ? [SIGNER_PRIVATE_KEY] : []
+                SIGNER_PRIVATE_KEY !== undefined ? [SIGNER_PRIVATE_KEY] : [],
+            allowUnlimitedContractSize: true
         },
         arbitrum: {
             chainId: 42161,
             url:
                 ARBITRUM_MAINNET_RPC_ENDPOINT_URL ||
                 "https://endpoints.omniatech.io/v1/arbitrum/one/public",
             accounts:
-                SIGNER_PRIVATE_KEY !== undefined ? [SIGNER_PRIVATE_KEY] : []
+                SIGNER_PRIVATE_KEY !== undefined ? [SIGNER_PRIVATE_KEY] : [],
+            allowUnlimitedContractSize: true
         },
         opSepolia: {
             chainId: 11155420,
             url:
                 OP_SEPOLIA_RPC_ENDPOINT_URL ||
                 "https://ethereum-sepolia.publicnode.com",
             accounts:
-                SIGNER_PRIVATE_KEY !== undefined ? [SIGNER_PRIVATE_KEY] : []
+                SIGNER_PRIVATE_KEY !== undefined ? [SIGNER_PRIVATE_KEY] : [],
+            allowUnlimitedContractSize: true
         },
         baseSepolia: {
             chainId: 84532,
             url: BASE_SEPOLIA_RPC_ENDPOINT_URL || "https://sepolia.base.org",
             accounts:
-                SIGNER_PRIVATE_KEY !== undefined ? [SIGNER_PRIVATE_KEY] : []
+                SIGNER_PRIVATE_KEY !== undefined ? [SIGNER_PRIVATE_KEY] : [],
+            allowUnlimitedContractSize: true
         },
         arbitrumSepolia: {
             chainId: 421614,
             url:
                 ARBITRUM_SEPOLIA_RPC_ENDPOINT_URL ||
                 "https://sepolia-rollup.arbitrum.io/rpc",
             accounts:
-                SIGNER_PRIVATE_KEY !== undefined ? [SIGNER_PRIVATE_KEY] : []
+                SIGNER_PRIVATE_KEY !== undefined ? [SIGNER_PRIVATE_KEY] : [],
+            allowUnlimitedContractSize: true
         }
     },
     solidity: {
@@ -90,7 +97,8 @@ const config: HardhatUserConfig = {
             optimizer: {
                 enabled: true,
                 runs: 200
-            }
+            },
+            viaIR: false
         }
     },
     sourcify: {
diff --git a/proofs.json b/proofs.json
@@ -1,8 +1,8 @@
 [
   {
-    "tokenId": 2,
-    "proof": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001479e565e88c0cbb734674eed176f8240c7c5119ff57026359ae3e30fd043d01d00000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000bdc0e420ab9ba144213588a95fa1e5e63ceff1be0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000005268747470733a2f2f6261666b726569636a36326c35787536706b3278783778376e3662377270756e78623465686c6837666576796a6170696433353536736d757a34792e697066732e7733732e6c696e6b2f0000000000000000000000000000",
+    "tokenId": 4,
+    "proof": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000001b166dfd5dc554d84d8799c90435ab210f94c8c624aa98d0c47305f5ece2168e00000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000004000000000000000000000000bdc0e420ab9ba144213588a95fa1e5e63ceff1be0000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000005268747470733a2f2f6261666b726569636a36326c35787536706b3278783778376e3662377270756e78623465686c6837666576796a6170696433353536736d757a34792e697066732e7733732e6c696e6b2f0000000000000000000000000000",
     "owner": "0xBDC0E420aB9ba144213588A95fa1E5e63CEFf1bE",
-    "nonce": 1
+    "nonce": 0
   }
 ]
diff --git a/scenario.sh b/scenario.sh
@@ -1,26 +1,22 @@
 #!/bin/bash
 
-# echo "Running unit tests..."
-# pnpm test
+pnpm test
 
-# echo "Deploying to Sepolia..."
-# pnpm crosschain:sepolia
+pnpm crosschain:sepolia
 
-# echo "Deploying to Optimism Sepolia..."
-# pnpm crosschain:opSepolia
+pnpm crosschain:opSepolia
 
-# echo "Checking token existence..."
-# npx hardhat run scripts/check-token-existence.ts
+echo "Checking token existence..."
+npx hardhat run scripts/check-token-existence.ts
 
-# echo "Creating proposal..."
-# npx hardhat run scripts/propose.ts --network sepolia
+echo "Creating proposal..."
+npx hardhat run scripts/propose.ts --network sepolia
 
-export TOKENID=2
+# export TOKENID=2
 
 npx hardhat run scripts/check-token-existence.ts
 
-# The propose.ts script writes TOKENID to .env
-# Load the TOKENID from .env
+Load the TOKENID from .env
 if [ -f .env ]; then
     source .env
     if [ -z "$TOKENID" ]; then
@@ -46,5 +42,14 @@ echo "Claiming proof..."
 npx hardhat run scripts/claim-membership.ts --network opSepolia
 
 # Check token existence
-echo "Checking token existence..."
-npx hardhat run scripts/check-token-existence.ts --network sepolia
+npx hardhat run scripts/check-token-existence.ts --network sepolia
+
+sed -i.bak '/^TOKENID=/d' .env
+echo "TOKENID=0" >> .env
+source .env
+
+echo "Using Token ID: $TOKENID"
+
+npx hardhat run scripts/verify-metadata-proof.ts --network sepolia
+
+npx hardhat run scripts/claim-metadata-update.ts --network opSepolia
diff --git a/scripts/claim-membership.ts b/scripts/claim-membership.ts
@@ -12,7 +12,7 @@ async function main() {
     const NFT_ADDRESS = deploymentsNFT.address
     const network = hre.network.name
 
-    // Setup provider and signer for target chain
+    // Setup provider and signer
     const provider = new ethers.JsonRpcProvider(getRpcUrl(network))
     const signer = new ethers.Wallet(process.env.SIGNER_PRIVATE_KEY, provider)
 
@@ -21,20 +21,7 @@ async function main() {
 
     const nft = NFT__factory.connect(NFT_ADDRESS, signer)
 
-    // Get current nonce state on target chain
-    const OPERATION_TYPE = 0 // MINT operation
-    const proofSlot = ethers.keccak256(
-        ethers.solidityPacked(
-            ["uint8", "uint256"],
-            [OPERATION_TYPE, 0] // mapping key and base slot
-        )
-    )
-    const nonceData = await provider.getStorage(nft.target, proofSlot)
-    const currentNonce = parseInt(nonceData, 16)
-    console.log("\nCurrent nonce on target chain:", currentNonce)
-    const nextNonce = currentNonce + 1
-
-    // Load proofs from file
+    // Load proof from file
     const proofsPath = path.resolve(__dirname, "../proofs.json")
     if (!fs.existsSync(proofsPath)) {
         throw new Error(
@@ -43,24 +30,8 @@ async function main() {
     }
     const proofs = JSON.parse(fs.readFileSync(proofsPath, "utf8"))
 
-    // Check which tokens already exist on target chain
-    const existingTokens = new Set()
-    for (const proof of proofs) {
-        try {
-            const owner = await nft.ownerOf(proof.tokenId)
-            existingTokens.add(proof.tokenId)
-            console.log(
-                `Token ${proof.tokenId} already exists, owned by ${owner}`
-            )
-        } catch (e) {
-            // Token doesn't exist
-        }
-    }
-
-    // Claim tokens that don't exist yet
+    // Try to claim each proof
     for (const proof of proofs) {
-        if (existingTokens.has(proof.tokenId)) continue
-
         console.log(`\nClaiming token ${proof.tokenId}...`)
         try {
             // Simulate first
@@ -89,39 +60,28 @@ async function main() {
         } catch (error: any) {
             console.error(`\nFailed to claim token ${proof.tokenId}:`)
             if (error.data) {
-                const decodedError = nft.interface.parseError(error.data)
-                console.error("Error reason:", decodedError?.args[0])
-            } else {
-                console.error(error)
+                try {
+                    const decodedError = nft.interface.parseError(error.data)
+                    console.error("Error reason:", decodedError)
+                } catch (e) {
+                    console.error(error)
+                }
             }
         }
     }
 }
 
+// Helper to get RPC URL
 function getRpcUrl(network: string): string {
     switch (network) {
         case "opSepolia":
-            if (!process.env.OP_SEPOLIA_RPC_ENDPOINT_URL) {
-                throw new Error("OP_SEPOLIA_RPC_ENDPOINT_URL not set in .env")
-            }
-            return process.env.OP_SEPOLIA_RPC_ENDPOINT_URL
+            return process.env.OP_SEPOLIA_RPC_ENDPOINT_URL || ""
         case "baseSepolia":
-            if (!process.env.BASE_SEPOLIA_RPC_ENDPOINT_URL) {
-                throw new Error("BASE_SEPOLIA_RPC_ENDPOINT_URL not set in .env")
-            }
-            return process.env.BASE_SEPOLIA_RPC_ENDPOINT_URL
+            return process.env.BASE_SEPOLIA_RPC_ENDPOINT_URL || ""
         case "arbitrumSepolia":
-            if (!process.env.ARBITRUM_SEPOLIA_RPC_ENDPOINT_URL) {
-                throw new Error(
-                    "ARBITRUM_SEPOLIA_RPC_ENDPOINT_URL not set in .env"
-                )
-            }
-            return process.env.ARBITRUM_SEPOLIA_RPC_ENDPOINT_URL
+            return process.env.ARBITRUM_SEPOLIA_RPC_ENDPOINT_URL || ""
         case "sepolia":
-            if (!process.env.SEPOLIA_RPC_ENDPOINT_URL) {
-                throw new Error("SEPOLIA_RPC_ENDPOINT_URL not set in .env")
-            }
-            return process.env.SEPOLIA_RPC_ENDPOINT_URL
+            return process.env.SEPOLIA_RPC_ENDPOINT_URL || ""
         default:
             throw new Error(`Unsupported network: ${network}`)
     }
diff --git a/scripts/claim-metadata-update.ts b/scripts/claim-metadata-update.ts
diff --git a/scripts/verify-metadata-proof.ts b/scripts/verify-metadata-proof.ts
diff --git a/scripts/verify-proof.ts b/scripts/verify-proof.ts
diff --git a/test/Gov-crosschain.ts b/test/Gov-crosschain.ts

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@ contract NFT is`
`38`	`38`	`) ERC721(_name, _symbol) Ownable(initialOwner) EIP712(_name, "1") {`
`39`	`39`	`for (uint i; i < _firstMembers.length; i++) {`
`40`	`40`	`safeMint(_firstMembers[i], _uri);`
`41`		`- _delegate(_firstMembers[i], _firstMembers[i]);`
`42`	`41`	`}`
`43`	`42`	`}`
`44`	`43`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`		`- "tokenId": 2,`
`4`		- "proof": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001479e565e88c0cbb734674eed176f8240c7c5119ff57026359ae3e30fd043d01d00000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000bdc0e420ab9ba144213588a95fa1e5e63ceff1be0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000005268747470733a2f2f6261666b726569636a36326c35787536706b3278783778376e3662377270756e78623465686c6837666576796a6170696433353536736d757a34792e697066732e7733732e6c696e6b2f0000000000000000000000000000",
	`3`	`+ "tokenId": 4,`
	`4`	+ "proof": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000001b166dfd5dc554d84d8799c90435ab210f94c8c624aa98d0c47305f5ece2168e00000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000004000000000000000000000000bdc0e420ab9ba144213588a95fa1e5e63ceff1be0000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000005268747470733a2f2f6261666b726569636a36326c35787536706b3278783778376e3662377270756e78623465686c6837666576796a6170696433353536736d757a34792e697066732e7733732e6c696e6b2f0000000000000000000000000000",
`5`	`5`	`"owner": "0xBDC0E420aB9ba144213588A95fa1E5e63CEFf1bE",`
`6`		`- "nonce": 1`
	`6`	`+ "nonce": 0`
`7`	`7`	`}`
`8`	`8`	`]`