Panic with RESOURCE_ERROR when inserting in a full tree

Author: Amxx

contracts/utils/structs/MerkleTree.sol

@@ -4,6 +4,7 @@ pragma solidity ^0.8.0;
 
 import {MerkleProof} from "../cryptography/MerkleProof.sol";
 import {Arrays} from "../Arrays.sol";
+import {Panic} from "../Panic.sol";
 
 /**
  * @dev A complete binary tree with the ability to sequentially insert leaves, changing them from a zero to a non-zero
@@ -33,11 +34,6 @@ library MerkleTree {
      */
     uint256 private constant MAX_DEPTH = 255;
 
-    /**
-     * @dev Leaf cannot be inserted because the tree is full.
-     */
-    error MerkleTreeFull();
-
     /**
      * @dev Merkle tree cannot be initialized because requested depth is to large.
      */
@@ -115,7 +111,7 @@ library MerkleTree {
         uint256 leafIndex = self.nextLeafIndex++;
 
         // Check if tree is full.
-        if (leafIndex == 1 << depth) revert MerkleTreeFull();
+        if (leafIndex == 1 << depth) Panic.panic(Panic.RESOURCE_ERROR);
 
         // Rebuild branch from leaf to root
         uint256 currentIndex = leafIndex;

test/utils/structs/Merkletree.test.js

@@ -1,6 +1,7 @@
 const { ethers } = require('hardhat');
 const { expect } = require('chai');
 const { loadFixture } = require('@nomicfoundation/hardhat-network-helpers');
+const { PANIC_CODES } = require('@nomicfoundation/hardhat-chai-matchers/panic');
 const { StandardMerkleTree } = require('@openzeppelin/merkle-tree');
 
 const makeTree = (leafs = [ethers.ZeroHash]) =>
@@ -32,7 +33,7 @@ describe('Merklee tree', function () {
   });
 
   it('setup', async function () {
-    const merkleTree = makeTree(Array(2 ** Number(DEPTH)).fill(ethers.ZeroHash));
+    const merkleTree = makeTree(Array.from({ length: 2 ** Number(DEPTH) }, () => ethers.ZeroHash));
 
     expect(await this.mock.getDepth()).to.equal(DEPTH);
     expect(await this.mock.getLength()).to.equal(LENGTH);
@@ -50,7 +51,7 @@ describe('Merklee tree', function () {
 
   describe('insert', function () {
     it('tree is correctly updated', async function () {
-      const leafs = Array(2 ** Number(DEPTH)).fill(ethers.ZeroHash);
+      const leafs = Array.from({ length: 2 ** Number(DEPTH) }, () => ethers.ZeroHash);
       const roots = [];
 
       // for each leaf slot
@@ -81,10 +82,9 @@ describe('Merklee tree', function () {
     });
 
     it('revert when tree is full', async function () {
-      for (let i = 0; i < 2 ** Number(DEPTH); ++i) {
-        await this.mock.insert(ethers.ZeroHash);
-      }
-      await expect(this.mock.insert(ethers.ZeroHash)).to.be.revertedWithCustomError(this.mock, 'MerkleTreeFull');
+      await Promise.all(Array.from({ length: 2 ** Number(DEPTH) }).map(() => this.mock.insert(ethers.ZeroHash)));
+
+      await expect(this.mock.insert(ethers.ZeroHash)).to.be.revertedWithPanic(PANIC_CODES.TOO_MUCH_MEMORY_ALLOCATED);
     });
   });
 });