Add conditions around solidity failure cases for hardhat network only

go-sdk/internal/sparse-merkle-tree/smt/errors.go

@@ -19,8 +19,8 @@ package smt
 import "errors"
 
 var (
-	// ErrMaxLevelsExceeded is used when a level is larger than the max
-	ErrMaxLevelsExceeded = errors.New("tree height is larger than max allowed (256)")
+	// ErrMaxLevelsNotInRange is used when a level is larger than the max
+	ErrMaxLevelsNotInRange = errors.New("tree height must be larger than zero and less than max allowed (256)")
 	// ErrNodeIndexAlreadyExists is used when a node index already exists.
 	ErrNodeIndexAlreadyExists = errors.New("key already exists")
 	// ErrKeyNotFound is used when a key is not found in the MerkleTree.

go-sdk/internal/sparse-merkle-tree/smt/merkletree.go

@@ -38,8 +38,8 @@ type sparseMerkleTree struct {
 }
 
 func NewMerkleTree(db core.Storage, maxLevels int) (core.SparseMerkleTree, error) {
-	if maxLevels > MAX_TREE_HEIGHT {
-		return nil, ErrMaxLevelsExceeded
+	if maxLevels <= 0 || maxLevels > MAX_TREE_HEIGHT {
+		return nil, ErrMaxLevelsNotInRange
 	}
 	mt := sparseMerkleTree{db: db, maxLevels: maxLevels}
 

go-sdk/internal/sparse-merkle-tree/smt/merkletree_test.go

@@ -0,0 +1,67 @@
+// Copyright © 2024 Kaleido, Inc.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package smt
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hyperledger-labs/zeto/go-sdk/internal/sparse-merkle-tree/storage"
+	"github.com/hyperledger-labs/zeto/go-sdk/pkg/sparse-merkle-tree/core"
+	"github.com/stretchr/testify/assert"
+)
+
+type mockStorage struct {
+	GetRootNodeIndex_customError bool
+}
+
+func (ms *mockStorage) GetRootNodeIndex() (core.NodeIndex, error) {
+	if ms.GetRootNodeIndex_customError {
+		return nil, fmt.Errorf("nasty error in get root")
+	}
+	return nil, storage.ErrNotFound
+}
+func (ms *mockStorage) UpsertRootNodeIndex(core.NodeIndex) error {
+	return fmt.Errorf("nasty error in upsert root")
+}
+func (ms *mockStorage) GetNode(core.NodeIndex) (core.Node, error) {
+	return nil, nil
+}
+func (ms *mockStorage) InsertNode(core.Node) error {
+	return nil
+}
+func (ms *mockStorage) Close() {}
+
+func TestNewMerkleTreeFailures(t *testing.T) {
+	db := &mockStorage{}
+	mt, err := NewMerkleTree(db, 0)
+	assert.EqualError(t, err, ErrMaxLevelsNotInRange.Error())
+	assert.Nil(t, mt)
+
+	mt, err = NewMerkleTree(nil, 257)
+	assert.Error(t, err, ErrMaxLevelsNotInRange.Error())
+	assert.Nil(t, mt)
+
+	mt, err = NewMerkleTree(db, 64)
+	assert.EqualError(t, err, "nasty error in upsert root")
+	assert.Nil(t, mt)
+
+	db.GetRootNodeIndex_customError = true
+	mt, err = NewMerkleTree(db, 64)
+	assert.EqualError(t, err, "nasty error in get root")
+	assert.Nil(t, mt)
+}

solidity/.gitignore

@@ -3,4 +3,5 @@ node_modules
 artifacts
 cache
 typechain-types
-ignition/deployments
+ignition/deployments
+.openzeppelin

solidity/scripts/deploy_cloneable.ts

@@ -8,14 +8,8 @@ export async function deployFungible(tokenName: string) {
   const { deployer, args, libraries } = await verifiersDeployer.deployDependencies();
 
   let zetoFactory;
-  const opts = {
-    kind: 'uups',
-    initializer: 'initialize',
-    unsafeAllow: ['delegatecall']
-  };
   if (libraries) {
     zetoFactory = await getLinkedContractFactory(tokenName, libraries);
-    opts.unsafeAllow.push('external-library-linking');
   } else {
     zetoFactory = await ethers.getContractFactory(tokenName)
   }
@@ -24,6 +18,9 @@ export async function deployFungible(tokenName: string) {
   await zetoImpl.waitForDeployment();
   await zetoImpl.connect(deployer).initialize(...args);
 
+  const tx3 = await zetoImpl.connect(deployer).setERC20(erc20.target);
+  await tx3.wait();
+
   console.log(`ERC20 deployed:     ${erc20.target}`);
   console.log(`ZetoToken deployed: ${zetoImpl.target}`);
 
@@ -36,14 +33,8 @@ export async function deployNonFungible(tokenName: string) {
   const { args, libraries } = await verifiersDeployer.deployDependencies();
 
   let zetoFactory;
-  const opts = {
-    kind: 'uups',
-    initializer: 'initialize',
-    unsafeAllow: ['delegatecall']
-  };
   if (libraries) {
     zetoFactory = await getLinkedContractFactory(tokenName, libraries);
-    opts.unsafeAllow.push('external-library-linking');
   } else {
     zetoFactory = await ethers.getContractFactory(tokenName)
   }

solidity/test/lib/deploy.ts

@@ -9,6 +9,15 @@ import { ethers } from 'hardhat';
 export async function deployZeto(tokenName: string) {
   let zeto, erc20, deployer;
 
+  // for testing with public chains, skip deployment if
+  // the contract address is provided
+  if (process.env.ZETO_ADDRESS && process.env.ERC20_ADDRESS) {
+    zeto = await ethers.getContractAt(tokenName, process.env.ZETO_ADDRESS);
+    erc20 = await ethers.getContractAt('SampleERC20', process.env.ERC20_ADDRESS);
+    deployer = (await ethers.getSigners())[0];
+    return { deployer, zeto, erc20 };
+  }
+
   let isFungible = false;
   const fungibility = (fungibilities as any)[tokenName];
   if (fungibility === 'fungible') {
@@ -28,6 +37,8 @@ export async function deployZeto(tokenName: string) {
     const result = await deployFunc(tokenName);
     ({ deployer, zetoImpl, erc20, args } = result as any);
 
+    // we want to test the effectiveness of the factory contract
+    // to create clones of the Zeto implementation contract
     const Factory = await ethers.getContractFactory("ZetoTokenFactory");
     const factory = await Factory.deploy();
     await factory.waitForDeployment();
@@ -49,6 +60,12 @@ export async function deployZeto(tokenName: string) {
       }
     }
     zeto = await ethers.getContractAt(tokenName, zetoAddress);
+
+    // set the ERC20 token for the fungible Zeto token
+    if (isFungible) {
+      const tx3 = await zeto.connect(deployer).setERC20(erc20.target);
+      await tx3.wait();
+    }
   }
 
   return { deployer, zeto, erc20 };

solidity/test/zeto_anon.ts

@@ -14,8 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import hre from 'hardhat';
-const { ethers } = hre;
+import { ethers, network } from 'hardhat';
 import { Signer, BigNumberish, AddressLike, ZeroAddress } from 'ethers';
 import { expect } from 'chai';
 import { loadCircuit, encodeProof, Poseidon } from "zeto-js";
@@ -45,6 +44,10 @@ describe("Zeto based fungible token with anonymity without encryption or nullifi
   let circuit: any, provingKey: any;
 
   before(async function () {
+    if (network.name !== 'hardhat') {
+      // accommodate for longer block times on public networks
+      this.timeout(120000);
+    }
     let [d, a, b, c] = await ethers.getSigners();
     deployer = d;
     Alice = await newUser(a);
@@ -53,18 +56,16 @@ describe("Zeto based fungible token with anonymity without encryption or nullifi
 
     ({ deployer, zeto, erc20 } = await deployZeto('Zeto_Anon'));
 
-    const tx3 = await zeto.connect(deployer).setERC20(erc20.target);
-    await tx3.wait();
-
     circuit = await loadCircuit('anon');
     ({ provingKeyFile: provingKey } = loadProvingKeys('anon'));
   });
 
   it("mint ERC20 tokens to Alice to deposit to Zeto should succeed", async function () {
+    const startingBalance = await erc20.balanceOf(Alice.ethAddress);
     const tx = await erc20.connect(deployer).mint(Alice.ethAddress, 100);
     await tx.wait();
-    const balance = await erc20.balanceOf(Alice.ethAddress);
-    expect(balance).to.equal(100);
+    const endingBalance = await erc20.balanceOf(Alice.ethAddress);
+    expect(endingBalance - startingBalance).to.be.equal(100);
 
     const tx1 = await erc20.connect(Alice.signer).approve(zeto.target, 100);
     await tx1.wait();
@@ -117,6 +118,8 @@ describe("Zeto based fungible token with anonymity without encryption or nullifi
   });
 
   it("Alice withdraws her UTXOs to ERC20 tokens should succeed", async function () {
+    const startingBalance = await erc20.balanceOf(Alice.ethAddress);
+
     // Alice proposes the output ERC20 tokens
     const outputCommitment = newUTXO(20, Alice);
 
@@ -127,44 +130,53 @@ describe("Zeto based fungible token with anonymity without encryption or nullifi
     await tx.wait();
 
     // Alice checks her ERC20 balance
-    const balance = await erc20.balanceOf(Alice.ethAddress);
-    expect(balance).to.equal(80);
-  });
-
-  it("Alice attempting to withdraw spent UTXOs should fail", async function () {
-    // Alice proposes the output ERC20 tokens
-    const outputCommitment = newUTXO(90, Alice);
-
-    const { inputCommitments, outputCommitments, encodedProof } = await prepareWithdrawProof(Alice, [utxo100, ZERO_UTXO], outputCommitment);
-
-    await expect(zeto.connect(Alice.signer).withdraw(10, inputCommitments, outputCommitments[0], encodedProof)).rejectedWith("UTXOAlreadySpent");
+    const endingBalance = await erc20.balanceOf(Alice.ethAddress);
+    expect(endingBalance - startingBalance).to.be.equal(80);
   });
 
-  it("mint existing unspent UTXOs should fail", async function () {
-    await expect(doMint(zeto, deployer, [utxo4])).rejectedWith("UTXOAlreadyOwned");
-  });
-
-  it("mint existing spent UTXOs should fail", async function () {
-    await expect(doMint(zeto, deployer, [utxo1])).rejectedWith("UTXOAlreadySpent");
-  });
-
-  it("transfer non-existing UTXOs should fail", async function () {
-    const nonExisting1 = newUTXO(10, Alice);
-    const nonExisting2 = newUTXO(20, Alice, nonExisting1.salt);
-    await expect(doTransfer(Alice, [nonExisting1, nonExisting2], [nonExisting1, nonExisting2], [Alice, Alice])).rejectedWith("UTXONotMinted");
-  });
-
-  it("transfer spent UTXOs should fail (double spend protection)", async function () {
-    // create outputs
-    const utxo5 = newUTXO(25, Bob);
-    const utxo6 = newUTXO(5, Alice, utxo5.salt);
-    await expect(doTransfer(Alice, [utxo1, utxo2], [utxo5, utxo6], [Bob, Alice])).rejectedWith("UTXOAlreadySpent")
-  });
+  describe('failure cases', function () {
+    // the following failure cases rely on the hardhat network
+    // to return the details of the errors. This is not possible
+    // on non-hardhat networks
+    if (network.name !== 'hardhat') {
+      return;
+    }
 
-  it("spend by using the same UTXO as both inputs should fail", async function () {
-    const utxo5 = newUTXO(20, Alice);
-    const utxo6 = newUTXO(10, Bob, utxo5.salt);
-    await expect(doTransfer(Bob, [utxo7, utxo7], [utxo5, utxo6], [Alice, Bob])).rejectedWith(`UTXODuplicate(${utxo7.hash.toString()}`);
+    it("Alice attempting to withdraw spent UTXOs should fail", async function () {
+      // Alice proposes the output ERC20 tokens
+      const outputCommitment = newUTXO(90, Alice);
+
+      const { inputCommitments, outputCommitments, encodedProof } = await prepareWithdrawProof(Alice, [utxo100, ZERO_UTXO], outputCommitment);
+
+      await expect(zeto.connect(Alice.signer).withdraw(10, inputCommitments, outputCommitments[0], encodedProof)).rejectedWith("UTXOAlreadySpent");
+    });
+
+    it("mint existing unspent UTXOs should fail", async function () {
+      await expect(doMint(zeto, deployer, [utxo4])).rejectedWith("UTXOAlreadyOwned");
+    });
+
+    it("mint existing spent UTXOs should fail", async function () {
+      await expect(doMint(zeto, deployer, [utxo1])).rejectedWith("UTXOAlreadySpent");
+    });
+
+    it("transfer non-existing UTXOs should fail", async function () {
+      const nonExisting1 = newUTXO(10, Alice);
+      const nonExisting2 = newUTXO(20, Alice, nonExisting1.salt);
+      await expect(doTransfer(Alice, [nonExisting1, nonExisting2], [nonExisting1, nonExisting2], [Alice, Alice])).rejectedWith("UTXONotMinted");
+    });
+
+    it("transfer spent UTXOs should fail (double spend protection)", async function () {
+      // create outputs
+      const utxo5 = newUTXO(25, Bob);
+      const utxo6 = newUTXO(5, Alice, utxo5.salt);
+      await expect(doTransfer(Alice, [utxo1, utxo2], [utxo5, utxo6], [Bob, Alice])).rejectedWith("UTXOAlreadySpent")
+    });
+
+    it("spend by using the same UTXO as both inputs should fail", async function () {
+      const utxo5 = newUTXO(20, Alice);
+      const utxo6 = newUTXO(10, Bob, utxo5.salt);
+      await expect(doTransfer(Bob, [utxo7, utxo7], [utxo5, utxo6], [Alice, Bob])).rejectedWith(`UTXODuplicate(${utxo7.hash.toString()}`);
+    });
   });
 
   async function doTransfer(signer: User, inputs: UTXO[], outputs: UTXO[], owners: User[]) {