Merge branch 'main' into dark-pool

Author: olehmisar

apps/interface/src/lib/components/SendForm.svelte

@@ -2,7 +2,7 @@
   import { lib } from "$lib";
   import { requestRollup } from "$lib/utils";
   import { sdk } from "@repo/contracts/sdk";
-  import { TokenAmount } from "@repo/contracts/sdk/RollupService";
+  import { TokenAmount } from "@repo/contracts/sdk/PoolErc20Service";
   import { Ui } from "@repo/ui";
   import { utils } from "@repo/utils";
   import { assert } from "ts-essentials";

packages/contracts/noir/common/src/owned_note.nr

@@ -1,7 +1,4 @@
-use protocol_types::{
-    abis::nullifier_leaf_preimage::NullifierLeafPreimage, hash::poseidon2_hash_with_separator,
-    merkle_tree,
-};
+use protocol_types::{hash::poseidon2_hash_with_separator, merkle_tree};
 
 pub trait OwnedNote: crate::Note {
     fn owner(self) -> crate::WaAddress;
@@ -23,8 +20,6 @@ pub struct NoteConsumptionInputs<T> {
     pub note: T,
     pub note_index: Field,
     pub note_sibling_path: [Field; crate::NOTE_HASH_TREE_HEIGHT],
-    pub nullifier_low_leaf_preimage: NullifierLeafPreimage,
-    pub nullifier_low_leaf_membership_witness: merkle_tree::MembershipWitness<crate::NOTE_HASH_TREE_HEIGHT>,
 }
 
 impl<T> NoteConsumptionInputs<T>

packages/contracts/sdk/LobService.ts

@@ -4,15 +4,15 @@ import { type PoolERC20 } from "../typechain-types";
 import { NoteInputStruct } from "../typechain-types/contracts/PoolERC20";
 import { MpcProverService, type Side } from "./mpc/MpcNetworkService.js";
 import { splitInput } from "./mpc/utils.js";
-import { type ITreesService } from "./RemoteTreesService.js";
 import {
   CompleteWaAddress,
   Erc20Note,
   getRandomness,
   TokenAmount,
   type NoirAndBackend,
   type PoolErc20Service,
-} from "./RollupService.js";
+} from "./PoolErc20Service.js";
+import { type ITreesService } from "./RemoteTreesService.js";
 import { prove } from "./utils.js";
 
 export class LobService {

packages/contracts/sdk/NonMembershipTree.ts

@@ -2,7 +2,10 @@ import type { Fr } from "@aztec/aztec.js";
 import type { StandardIndexedTree } from "@aztec/merkle-tree";
 import { ethers } from "ethers";
 import { assert } from "ts-essentials";
-import { INCLUDE_UNCOMMITTED, NULLIFIER_SUBTREE_HEIGHT } from "./RollupService";
+import {
+  INCLUDE_UNCOMMITTED,
+  NULLIFIER_SUBTREE_HEIGHT,
+} from "./PoolErc20Service";
 
 export class NonMembershipTree {
   private constructor(readonly _tree: StandardIndexedTree) {}

packages/contracts/sdk/RollupService.ts …ckages/contracts/sdk/PoolErc20Service.tspackages/contracts/sdk/RollupService.ts renamed to packages/contracts/sdk/PoolErc20Service.ts packages/contracts/sdk/RollupService.ts renamed to packages/contracts/sdk/PoolErc20Service.ts

@@ -11,7 +11,7 @@ import {
   MAX_NULLIFIERS_PER_ROLLUP,
   NOTE_HASH_SUBTREE_HEIGHT,
   type NoirAndBackend,
-} from "./RollupService";
+} from "./PoolErc20Service";
 import type { TreesService } from "./TreesService";
 import { prove } from "./utils.js";
 

packages/contracts/sdk/RollupOnlyService.ts

@@ -11,7 +11,7 @@ import {
   MAX_NULLIFIERS_PER_ROLLUP,
   NOTE_HASH_TREE_HEIGHT,
   NULLIFIER_TREE_HEIGHT,
-} from "./RollupService";
+} from "./PoolErc20Service";
 
 export class TreesService {
   constructor(private contract: PoolERC20) {}
@@ -36,11 +36,7 @@ export class TreesService {
     .implement(async (params) => {
       const { Fr } = await import("@aztec/aztec.js");
 
-      const { noteHashTree, nullifierTree } = await this.getTrees();
-
-      const nullifierNmWitness = await nullifierTree.getNonMembershipWitness(
-        new Fr(BigInt(params.nullifier)),
-      );
+      const { noteHashTree } = await this.getTrees();
 
       const noteIndex = noteHashTree.findLeafIndex(
         new Fr(BigInt(params.noteHash)),
@@ -54,9 +50,6 @@ export class TreesService {
           .toTuple()
           .map((x: Fr) => x.toString()),
         note_index: ethers.toQuantity(noteIndex),
-        nullifier_low_leaf_preimage: nullifierNmWitness.low_leaf_preimage,
-        nullifier_low_leaf_membership_witness:
-          nullifierNmWitness.low_leaf_membership_witness,
       };
     });
 

packages/contracts/sdk/TreesService.ts

@@ -4,14 +4,14 @@ import type { AsyncOrSync } from "ts-essentials";
 import type { PoolERC20 } from "../typechain-types/index.js";
 import { EncryptionService } from "./EncryptionService.js";
 import { LobService } from "./LobService.js";
-import { type ITreesService } from "./RemoteTreesService.js";
-import { PoolErc20Service } from "./RollupService.js";
 import { MpcProverService } from "./mpc/MpcNetworkService.js";
+import { PoolErc20Service } from "./PoolErc20Service.js";
+import { type ITreesService } from "./RemoteTreesService.js";
 
 export * from "./EncryptionService.js";
 export * from "./NonMembershipTree.js";
+export * from "./PoolErc20Service.js";
 export * from "./RemoteTreesService.js";
-export * from "./RollupService.js";
 export * from "./TreesService.js";
 
 export function createCoreSdk(contract: PoolERC20) {