@lfdecentralizedtrust/zeto-contracts 0.2.2 → 0.5.1

package/contracts/zeto_anon_enc_nullifier.sol

@@ -15,245 +15,299 @@
 // limitations under the License.
 pragma solidity ^0.8.27;
 
-import {IZeto} from "./lib/interfaces/izeto.sol";
-import {Groth16Verifier_Deposit} from "./verifiers/verifier_deposit.sol";
-import {Groth16Verifier_WithdrawNullifier} from "./verifiers/verifier_withdraw_nullifier.sol";
-import {Groth16Verifier_WithdrawNullifierBatch} from "./verifiers/verifier_withdraw_nullifier_batch.sol";
-import {Groth16Verifier_AnonEncNullifier} from "./verifiers/verifier_anon_enc_nullifier.sol";
-import {Groth16Verifier_AnonEncNullifierBatch} from "./verifiers/verifier_anon_enc_nullifier_batch.sol";
-import {ZetoNullifier} from "./lib/zeto_nullifier.sol";
-import {ZetoFungibleWithdrawWithNullifiers} from "./lib/zeto_fungible_withdraw_nullifier.sol";
-import {Commonlib} from "./lib/common.sol";
-import {IZetoInitializable} from "./lib/interfaces/izeto_initializable.sol";
-import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
+import {Zeto_AnonNullifier} from "./zeto_anon_nullifier.sol";
+import {Commonlib} from "./lib/common/common.sol";
+import {IZetoInitializable} from "./lib/interfaces/IZetoInitializable.sol";
 
-uint256 constant INPUT_SIZE = 18;
-uint256 constant BATCH_INPUT_SIZE = 74;
-
-/// @title A sample implementation of a Zeto based fungible token with anonymity, encryption and history masking
+/// @title A sample implementation of a Zeto based fungible token with
+///        anonymity, encryption, and history masking via nullifiers.
 /// @author Kaleido, Inc.
+/// @notice Decimals: this token uses **4** decimals, inherited from
+///         {ZetoCommon.decimals}. Indexers and UIs reading this contract
+///         directly should treat balances accordingly.
 /// @dev The proof has the following statements:
 ///        - each value in the output commitments must be a positive number in the range 0 ~ (2\*\*40 - 1)
 ///        - the sum of the nullified values match the sum of output values
 ///        - the hashes in the input and output match the hash(value, salt, owner public key) formula
 ///        - the sender possesses the private BabyJubjub key, whose public key is part of the pre-image of the input commitment hashes, which match the corresponding nullifiers
-///        - the encrypted value in the input is derived from the receiver's UTXO value and encrypted with a shared secret using the ECDH protocol between the sender and receiver (this guarantees data availability for the receiver)
+///        - the encrypted value in the output is derived from the receiver's UTXO value and encrypted with a shared secret using the ECDH protocol between the sender and receiver
 ///        - the nullifiers represent input commitments that are included in a Sparse Merkle Tree represented by the root hash
-contract Zeto_AnonEncNullifier is
-    IZeto,
-    IZetoInitializable,
-    ZetoNullifier,
-    ZetoFungibleWithdrawWithNullifiers,
-    UUPSUpgradeable
-{
-    Groth16Verifier_AnonEncNullifier internal _verifier;
-    Groth16Verifier_AnonEncNullifierBatch internal _batchVerifier;
+contract Zeto_AnonEncNullifier is Zeto_AnonNullifier {
+    /// @dev Decoded proof payload for one `constructPublicInputs` call lives in
+    ///      {ZetoAnonEncNullifierStorage} (ERC-7201).
+
+    /// @dev Lock the implementation contract on construction. The parent
+    ///      {Zeto_AnonNullifier} already does this via its own constructor
+    ///      (which Solidity invokes as part of every leaf's deployment),
+    ///      but we restate it here so the H-2 protection survives any
+    ///      future refactor that changes the inheritance graph.
+    /// @custom:oz-upgrades-unsafe-allow constructor
+    constructor() {
+        _disableInitializers();
+    }
 
     function initialize(
-        string memory name,
-        string memory symbol,
+        string calldata name,
+        string calldata symbol,
         address initialOwner,
         IZetoInitializable.VerifiersInfo calldata verifiers
-    ) public initializer {
-        __ZetoNullifier_init(name, symbol, initialOwner);
-        __ZetoFungibleWithdrawWithNullifiers_init(
-            (Groth16Verifier_Deposit)(verifiers.depositVerifier),
-            (Groth16Verifier_WithdrawNullifier)(verifiers.withdrawVerifier),
-            (Groth16Verifier_WithdrawNullifierBatch)(
-                verifiers.batchWithdrawVerifier
-            )
-        );
-        _verifier = (Groth16Verifier_AnonEncNullifier)(verifiers.verifier);
-        _batchVerifier = (Groth16Verifier_AnonEncNullifierBatch)(
-            verifiers.batchVerifier
-        );
+    ) public virtual override initializer {
+        __ZetoAnonEncNullifier_init(name, symbol, initialOwner, verifiers);
     }
 
-    function _authorizeUpgrade(address) internal override onlyOwner {}
+    function __ZetoAnonEncNullifier_init(
+        string calldata name_,
+        string calldata symbol_,
+        address initialOwner,
+        IZetoInitializable.VerifiersInfo calldata verifiers
+    ) internal onlyInitializing {
+        __ZetoAnonNullifier_init(name_, symbol_, initialOwner, verifiers);
+    }
 
-    function constructPublicInputs(
+    function emitTransferEvent(
         uint256[] memory nullifiers,
         uint256[] memory outputs,
-        uint256 root,
-        uint256 encryptionNonce,
-        uint256[2] memory ecdhPublicKey,
-        uint256[] memory encryptedValues,
-        uint256 size
-    ) internal pure returns (uint256[] memory publicInputs) {
-        publicInputs = new uint256[](size);
-        uint256 piIndex = 0;
-        // copy the ecdh public key
-        for (uint256 i = 0; i < ecdhPublicKey.length; ++i) {
-            publicInputs[piIndex++] = ecdhPublicKey[i];
-        }
-        // copy the encrypted value, salt and parity bit
-        for (uint256 i = 0; i < encryptedValues.length; ++i) {
-            publicInputs[piIndex++] = encryptedValues[i];
-        }
-        // copy input commitments
-        for (uint256 i = 0; i < nullifiers.length; i++) {
-            publicInputs[piIndex++] = nullifiers[i];
-        }
-
-        // copy root
-        publicInputs[piIndex++] = root;
-
-        // populate enables
-        for (uint256 i = 0; i < nullifiers.length; i++) {
-            publicInputs[piIndex++] = (nullifiers[i] == 0) ? 0 : 1;
-        }
-
-        // copy output commitments
-        for (uint256 i = 0; i < outputs.length; i++) {
-            publicInputs[piIndex++] = outputs[i];
-        }
-
-        // copy encryption nonce
-        publicInputs[piIndex++] = encryptionNonce;
-        return publicInputs;
+        bytes memory proof,
+        bytes memory data
+    ) internal virtual override {
+        ZetoAnonEncNullifierStorage.DecodedProofEncNullifier memory dp;
+        (dp, ) = decodeProof_EncNullifier(proof);
+        emit UTXOTransferWithEncryptedValues(
+            nullifiers,
+            outputs,
+            dp.encryptionNonce,
+            dp.ecdhPublicKey,
+            dp.encryptedValues,
+            msg.sender,
+            data
+        );
     }
 
     /**
-     * @dev the main function of the contract, which transfers values from one account (represented by Babyjubjub public keys)
-     *      to one or more receiver accounts (also represented by Babyjubjub public keys). One of the two nullifiers may be zero
-     *      if the transaction only needs one UTXO to be spent. Equally one of the two outputs may be zero if the transaction
-     *      only needs to create one new UTXO.
+     * @dev Layout of `proof` (ABI-encoded tuple):
+     *        (uint256 root,
+     *         uint256 encryptionNonce,
+     *         uint256[2] ecdhPublicKey,
+     *         uint256[] encryptedValues,
+     *         Commonlib.Proof groth16Proof)
      *
-     * @param nullifiers Array of nullifiers that are secretly bound to UTXOs to be spent by the transaction.
-     * @param outputs Array of new UTXOs to generate, for future transactions to spend.
-     * @param root The root hash of the Sparse Merkle Tree that contains the nullifiers.
-     * @param proof A zero knowledge proof that the submitter is authorized to spend the inputs, and
-     *      that the outputs are valid in terms of obeying mass conservation rules.
-     *
-     * Emits a {UTXOTransferWithEncryptedValues} event.
+     *      Root validation is performed here whenever inputs are unlocked
+     *      so the proof bytes are decoded exactly once per transition
+     *      (mirrors the L-4 cleanup applied to {Zeto_AnonNullifier}).
      */
-    function transfer(
+    function constructPublicInputs(
         uint256[] memory nullifiers,
         uint256[] memory outputs,
-        uint256 root,
-        uint256 encryptionNonce,
-        uint256[2] memory ecdhPublicKey,
-        uint256[] memory encryptedValues,
-        Commonlib.Proof calldata proof,
-        bytes calldata data
-    ) public returns (bool) {
-        // Check and pad commitments
-        nullifiers = checkAndPadCommitments(nullifiers);
-        outputs = checkAndPadCommitments(outputs);
-        validateTransactionProposal(nullifiers, outputs, root, false);
+        bytes memory proof,
+        bool inputsLocked
+    )
+        internal
+        virtual
+        override
+        returns (uint256[] memory, Commonlib.Proof memory)
+    {
+        (
+            ZetoAnonEncNullifierStorage.DecodedProofEncNullifier memory dp,
+            Commonlib.Proof memory proofStruct
+        ) = decodeProof_EncNullifier(proof);
 
-        // Check the proof
-        if (nullifiers.length > 2 || outputs.length > 2) {
-            uint256[] memory publicInputs = constructPublicInputs(
-                nullifiers,
-                outputs,
-                root,
-                encryptionNonce,
-                ecdhPublicKey,
-                encryptedValues,
-                BATCH_INPUT_SIZE
-            );
-            // construct the public inputs for batchVerifier
-            uint256[BATCH_INPUT_SIZE] memory fixedSizeInputs;
-            for (uint256 i = 0; i < fixedSizeInputs.length; i++) {
-                fixedSizeInputs[i] = publicInputs[i];
-            }
+        if (!inputsLocked) {
+            validateRoot(dp.root);
+        }
+
+        ZetoAnonEncNullifierStorage.layout().dpe = dp;
+
+        uint256[] memory extra = extraInputs();
+        uint256 size = _calcSize_EncNullifier(
+            nullifiers,
+            outputs,
+            extra,
+            inputsLocked
+        );
 
-            // Check the proof using batchVerifier
-            require(
-                _batchVerifier.verifyProof(
-                    proof.pA,
-                    proof.pB,
-                    proof.pC,
-                    fixedSizeInputs
-                ),
-                "Invalid proof (batch)"
+        uint256[] memory publicInputs = new uint256[](size);
+        _fillPublicInputs_EncNullifier(
+            publicInputs,
+            nullifiers,
+            outputs,
+            extra,
+            inputsLocked
+        );
+        return (publicInputs, proofStruct);
+    }
+
+    function decodeProof_EncNullifier(
+        bytes memory proof
+    )
+        private
+        pure
+        returns (
+            ZetoAnonEncNullifierStorage.DecodedProofEncNullifier memory,
+            Commonlib.Proof memory
+        )
+    {
+        (
+            uint256 root,
+            uint256 encryptionNonce,
+            uint256[2] memory ecdhPublicKey,
+            uint256[] memory encryptedValues,
+            Commonlib.Proof memory proofStruct
+        ) = abi.decode(
+                proof,
+                (uint256, uint256, uint256[2], uint256[], Commonlib.Proof)
             );
-        } else {
-            uint256[] memory publicInputs = constructPublicInputs(
-                nullifiers,
-                outputs,
+        return (
+            ZetoAnonEncNullifierStorage.DecodedProofEncNullifier(
                 root,
                 encryptionNonce,
                 ecdhPublicKey,
-                encryptedValues,
-                INPUT_SIZE
+                encryptedValues
+            ),
+            proofStruct
+        );
+    }
+
+    /// @dev Public-inputs vector size. For unlocked spends the layout is
+    ///        ecdhPublicKey ++ encryptedValues ++ nullifiers ++ root
+    ///          ++ enabled-flags ++ extra ++ outputs ++ encryptionNonce
+    ///      For locked-input spends the nullifier-history (root + flags)
+    ///      portion of the witness is absent because locked inputs are
+    ///      raw UTXOs, not nullifiers; the encryption commitments and the
+    ///      output commitments still apply.
+    function _calcSize_EncNullifier(
+        uint256[] memory nullifiers,
+        uint256[] memory outputs,
+        uint256[] memory extra,
+        bool inputsLocked
+    ) internal view returns (uint256) {
+        if (inputsLocked) {
+            return
+                ZetoAnonEncNullifierStorage.layout().dpe.ecdhPublicKey.length +
+                ZetoAnonEncNullifierStorage.layout().dpe.encryptedValues.length +
+                nullifiers.length +
+                extra.length +
+                outputs.length +
+                1; // encryptionNonce
+        }
+        return
+            ZetoAnonEncNullifierStorage.layout().dpe.ecdhPublicKey.length +
+            ZetoAnonEncNullifierStorage.layout().dpe.encryptedValues.length +
+            (nullifiers.length * 2) + // nullifiers + enabled flags
+            1 + // root
+            extra.length +
+            outputs.length +
+            1; // encryptionNonce
+    }
+
+    function _fillPublicInputs_EncNullifier(
+        uint256[] memory publicInputs,
+        uint256[] memory nullifiers,
+        uint256[] memory outputs,
+        uint256[] memory extra,
+        bool inputsLocked
+    ) internal view {
+        uint256 piIndex = 0;
+        piIndex = _fillEcdhAndEncrypted(publicInputs, piIndex);
+        if (!inputsLocked) {
+            piIndex = _fillNullifiersAndRoot(publicInputs, nullifiers, piIndex);
+            piIndex = _fillEnablesAndExtra(
+                publicInputs,
+                nullifiers,
+                extra,
+                piIndex
             );
-            // construct the public inputs for verifier
-            uint256[INPUT_SIZE] memory fixedSizeInputs;
-            for (uint256 i = 0; i < fixedSizeInputs.length; i++) {
-                fixedSizeInputs[i] = publicInputs[i];
+        } else {
+            for (uint256 i = 0; i < nullifiers.length; i++) {
+                publicInputs[piIndex++] = nullifiers[i];
+            }
+            for (uint256 i = 0; i < extra.length; i++) {
+                publicInputs[piIndex++] = extra[i];
             }
-            // Check the proof
-            require(
-                _verifier.verifyProof(
-                    proof.pA,
-                    proof.pB,
-                    proof.pC,
-                    fixedSizeInputs
-                ),
-                "Invalid proof"
-            );
         }
+        _fillOutputsAndNonce(publicInputs, outputs, piIndex);
+    }
 
-        // accept the transaction to consume the input UTXOs and produce new UTXOs
-        uint256[] memory empty;
-        processInputsAndOutputs(nullifiers, outputs, empty, address(0));
+    function _fillEcdhAndEncrypted(
+        uint256[] memory publicInputs,
+        uint256 piIndex
+    ) internal view returns (uint256) {
+        for (uint256 i = 0; i < ZetoAnonEncNullifierStorage.layout().dpe.ecdhPublicKey.length; ++i) {
+            publicInputs[piIndex++] = ZetoAnonEncNullifierStorage.layout().dpe.ecdhPublicKey[i];
+        }
+        for (uint256 i = 0; i < ZetoAnonEncNullifierStorage.layout().dpe.encryptedValues.length; ++i) {
+            publicInputs[piIndex++] = ZetoAnonEncNullifierStorage.layout().dpe.encryptedValues[i];
+        }
+        return piIndex;
+    }
 
-        uint256[] memory encryptedValuesArray = new uint256[](
-            encryptedValues.length
-        );
-        for (uint256 i = 0; i < encryptedValues.length; ++i) {
-            encryptedValuesArray[i] = encryptedValues[i];
+    function _fillNullifiersAndRoot(
+        uint256[] memory publicInputs,
+        uint256[] memory nullifiers,
+        uint256 piIndex
+    ) internal view returns (uint256) {
+        for (uint256 i = 0; i < nullifiers.length; i++) {
+            publicInputs[piIndex++] = nullifiers[i];
         }
+        publicInputs[piIndex++] = ZetoAnonEncNullifierStorage.layout().dpe.root;
+        return piIndex;
+    }
 
-        emit UTXOTransferWithEncryptedValues(
-            nullifiers,
-            outputs,
-            encryptionNonce,
-            ecdhPublicKey,
-            encryptedValuesArray,
-            msg.sender,
-            data
-        );
-        return true;
+    function _fillEnablesAndExtra(
+        uint256[] memory publicInputs,
+        uint256[] memory nullifiers,
+        uint256[] memory extra,
+        uint256 piIndex
+    ) internal pure returns (uint256) {
+        for (uint256 i = 0; i < nullifiers.length; i++) {
+            publicInputs[piIndex++] = (nullifiers[i] == 0) ? 0 : 1;
+        }
+        for (uint256 i = 0; i < extra.length; i++) {
+            publicInputs[piIndex++] = extra[i];
+        }
+        return piIndex;
     }
 
-    function deposit(
-        uint256 amount,
+    function _fillOutputsAndNonce(
+        uint256[] memory publicInputs,
         uint256[] memory outputs,
-        Commonlib.Proof calldata proof,
-        bytes calldata data
-    ) public {
-        _deposit(amount, outputs, proof);
-        _mint(outputs, data);
+        uint256 piIndex
+    ) internal view {
+        for (uint256 i = 0; i < outputs.length; i++) {
+            publicInputs[piIndex++] = outputs[i];
+        }
+        publicInputs[piIndex++] = ZetoAnonEncNullifierStorage.layout().dpe.encryptionNonce;
     }
 
-    function withdraw(
-        uint256 amount,
-        uint256[] memory nullifiers,
-        uint256 output,
-        uint256 root,
-        Commonlib.Proof calldata proof,
-        bytes calldata data
-    ) public {
-        uint256[] memory outputs = new uint256[](nullifiers.length);
-        outputs[0] = output;
-        // Check and pad commitments
-        nullifiers = checkAndPadCommitments(nullifiers);
-        outputs = checkAndPadCommitments(outputs);
-        validateTransactionProposal(nullifiers, outputs, root, false);
+    function extraInputs()
+        internal
+        view
+        virtual
+        override
+        returns (uint256[] memory)
+    {
+        return new uint256[](0);
+    }
+}
+
+/// @dev ERC-7201 (`erc7201:zeto.storage.Zeto_AnonEncNullifier`).
+library ZetoAnonEncNullifierStorage {
+    struct DecodedProofEncNullifier {
+        uint256 root;
+        uint256 encryptionNonce;
+        uint256[2] ecdhPublicKey;
+        uint256[] encryptedValues;
+    }
 
-        _withdrawWithNullifiers(amount, nullifiers, output, root, proof);
-        uint256[] memory empty;
-        processInputsAndOutputs(nullifiers, outputs, empty, address(0));
-        emit UTXOWithdraw(amount, nullifiers, output, msg.sender, data);
+    struct Layout {
+        DecodedProofEncNullifier dpe;
     }
 
-    function mint(
-        uint256[] memory utxos,
-        bytes calldata data
-    ) public onlyOwner {
-        _mint(utxos, data);
+    bytes32 private constant STORAGE_LOCATION =
+        0x36fc6ea34fa875375a7d6586407c2399b00c74acd3ef1f71bd14e60259234b00;
+
+    function layout() internal pure returns (Layout storage $) {
+        assembly {
+            $.slot := STORAGE_LOCATION
+        }
     }
 }