feat: add simplest order matching (#12)

Author: olehmisar

packages/contracts/noir/lob_router/src/lib.nr

@@ -3,14 +3,28 @@ mod LobRouter {
         context: &mut common::Context,
         seller_secret_key: Field,
         seller_note: erc20::Erc20NoteConsumptionInputs,
-        seller_amount: common::TokenAmount,
+        seller_order: crate::Order,
         seller_randomness: Field,
         buyer_secret_key: Field,
         buyer_note: erc20::Erc20NoteConsumptionInputs,
-        buyer_amount: common::TokenAmount,
+        buyer_order: crate::Order,
         buyer_randomness: Field,
     ) {
-        // TODO(security): orders must be signed by parties and the prices should match
+        // TODO(security): orders must be signed by parties
+
+        assert(
+            seller_order.sell_amount == buyer_order.buy_amount,
+            "seller order amount does not match buyer order amount",
+        );
+        assert(
+            seller_order.buy_amount == buyer_order.sell_amount,
+            "buyer order amount does not match seller order amount",
+        );
+        let seller_amount = seller_order.sell_amount;
+        let buyer_amount = seller_order.buy_amount;
+        assert(seller_amount.token == seller_note.note.amount.token, "invalid seller note token");
+        assert(buyer_amount.token == buyer_note.note.amount.token, "invalid buyer note token");
+
         erc20::Token::transfer(
             context,
             seller_secret_key,
@@ -32,3 +46,11 @@ mod LobRouter {
         );
     }
 }
+
+pub struct Order {
+    pub sell_amount: common::TokenAmount,
+    pub buy_amount: common::TokenAmount,
+    /// Hide order contents from other parties and outside world
+    // TODO(perf): not sure if this is needed because orders are secret shared in an MPC network
+    pub randomness: Field,
+}

packages/contracts/noir/lob_router_swap/Prover1.toml

@@ -1,14 +1,13 @@
 seller_secret_key = "0x118f09bc73ec486db2030077142f2bceba2a4d4c9e0f6147d776f8ca8ec02ff1"
-seller_randomness = "0x182b64fb6668fe979510b16b36a7e9468e7a5063c1912e48f7a206d28e4d8e6a"
-
+seller_randomness = "0x0b0caedd7f1d06928a708301d43f00811de6c3894a1f8acfdfc3752bc32c9f91"
 
 [tree_roots]
-note_hash_root = "0x25c912389a3b4dae01c0c9ce451affa51175104d34fb0741cb2ded0c690ce0c6"
+note_hash_root = "0x26cb85e05fd3cd1fbd91297569b8b8780a8ab5ed65107fb1e96d785c911f9fda"
 nullifier_root = "0x0aa63c509390ad66ecd821998aabb16a818bcc5db5cf4accc0ce1821745244e9"
 
 [seller_note]
 note_sibling_path = [
-  "0x127d42b3838a09a1d2a77d51d45efc2d872f7441434c8d73a2a65addeb63a26f",
+  "0x26a278428101c2dbba8f872d9a5e3f70507c085e3df8671ac4951ac86f3440bf",
   "0x0b63a53787021a4a962a452c2921b3663aff1ffd8d5510540f8e659e782956f1",
   "0x0e34ac2c09f45a503d2908bcb12f1cbae5fa4065759c88d501c097506a8b2290",
   "0x21f9172d72fdcdafc312eee05cf5092980dda821da5b760a9fb8dbdf607c8a20",
@@ -52,18 +51,18 @@ note_sibling_path = [
 note_index = "0x0"
 
 [seller_note.nullifier_low_leaf_preimage]
-nullifier = "3502761326491897903912307329680840616114346130080727477006195110249521578463"
-next_nullifier = "4622624008295404567211139969641762687984164848421786975202499265153077664709"
-next_index = "37"
+nullifier = "13830031299663409915258849247374171055586994045724027710947409933442635819679"
+next_nullifier = "14448247143185075808205507000294482673348150188671637055844838122639309371309"
+next_index = "54"
 
 [seller_note.nullifier_low_leaf_membership_witness]
-leaf_index = "11"
+leaf_index = "16"
 sibling_path = [
-  "9592323143927693440852487918340834996926447034477944741845172904821136138140",
-  "5497606502829525072786717709301021256722113035609372121941390198982065775880",
-  "12013063095546063372417655624755911539489891906351320936318682923960676894657",
-  "10285196304867229525576259386556584044657339834734116745467765038834977104298",
-  "2903488935950838990208405343998070456796334091752591474019785544969867651224",
+  "18612157520988203038829918955464149978245584422880519644509407060774751013869",
+  "12324420131452739431074831828474476646824710186358500890131801772704214614256",
+  "6183856203401291583559187713266357947024267372151080140631247835359697422923",
+  "13090692521104750119417174288415102276391152553208717353765562027256507892105",
+  "5598734783864514682111263155111541308279258928439310216065335426757541199664",
   "3766428923666518331463526421481938811267455056246707954327363314469768904474",
   "796074195456137668475057404256202455048248910468542119987582633322559749494",
   "20567739078944838550556895816409602128127282297589578747131836752205066334747",
@@ -102,16 +101,28 @@ sibling_path = [
 ]
 
 [seller_note.note]
-randomness = "0x0737cddb7da2fbd46f2fa3eabafd8f7c67b0930d5a91bb86def7057e0eef6715"
+randomness = "0x07c1f0f96711747754a2932b1102e02b83f2eac65762db6278d447dd1f111efa"
 
 [seller_note.note.owner]
 inner = "0x28c7eef33d7e5d31b9d2cc09c783294d91c36e05b7b815d96549f91fe0d3b0d4"
 
 [seller_note.note.amount.token]
-inner = "0x2279B7A0a67DB372996a5FaB50D91eAA73d2eBe6"
+inner = "0x8A791620dd6260079BF849Dc5567aDC3F2FdC318"
 
 [seller_note.note.amount.amount]
 value = "100"
 
-[seller_amount]
+[seller_order]
+randomness = "0x0b0caedd7f1d06928a708301d43f00811de6c3894a1f8acfdfc3752bc32c9f91"
+
+[seller_order.sell_amount.token]
+inner = "0x8A791620dd6260079BF849Dc5567aDC3F2FdC318"
+
+[seller_order.sell_amount.amount]
 value = "70"
+
+[seller_order.buy_amount.token]
+inner = "0x610178dA211FEF7D417bC0e6FeD39F05609AD788"
+
+[seller_order.buy_amount.amount]
+value = "2"

packages/contracts/noir/lob_router_swap/Prover2.toml

@@ -1,9 +1,9 @@
 buyer_secret_key = "0x2120f33c0d324bfe571a18c1d5a1c9cdc6db60621e35bc78be1ced339f936a71"
-buyer_randomness = "0x134fc3cd998fcbba3e4826e491da44a0b0e41072baadc927e21544b69ba7f91e"
+buyer_randomness = "0x1170de694d6d728817d9bb8ac5d92198e60e34c33c57e1915682e3f541461059"
 
 [buyer_note]
 note_sibling_path = [
-  "0x24e551d406fc3f56d3b74a5a58c83645f9ad424e384e0fd97e5cf309a4695ab3",
+  "0x1a0351e9ad9a380c68ef5300baabd7b40b34c912577bd9d012e2df9fef45264a",
   "0x0b63a53787021a4a962a452c2921b3663aff1ffd8d5510540f8e659e782956f1",
   "0x0e34ac2c09f45a503d2908bcb12f1cbae5fa4065759c88d501c097506a8b2290",
   "0x21f9172d72fdcdafc312eee05cf5092980dda821da5b760a9fb8dbdf607c8a20",
@@ -47,19 +47,19 @@ note_sibling_path = [
 note_index = "0x1"
 
 [buyer_note.nullifier_low_leaf_preimage]
-nullifier = "14955778689319551303378818347778024347630018933433821705130993688099992966438"
-next_nullifier = "16244632380179304245573134952201909709066181424366511358474662925880755537391"
-next_index = "63"
+nullifier = "3020367463424511551486341097408743328878406344336466401765430080394102349391"
+next_nullifier = "3163318570942166511124552723585457577379612198132068460434913196460425889368"
+next_index = "60"
 
 [buyer_note.nullifier_low_leaf_membership_witness]
-leaf_index = "44"
+leaf_index = "14"
 sibling_path = [
-  "19153318808262274360025480944602576430653382995793665568014074536604617664453",
-  "12204236326854526973223496557357200239778090370172071879236879436466357624621",
-  "405351999194507832591771161941330294949683334785194602943911205188154186380",
-  "2959426397026183366069050464650984242887556596265649681973607242888685387779",
-  "2492782479763675264093896873817694335040885070876443070196661113661962129135",
-  "7997675936567769706222583500490338185379747281415057124249902920940843577209",
+  "1513595028644017075204557416826288607860918101548629507045554740956732507395",
+  "1697818760348717895994122047875291423154940241675140322766248342327844012824",
+  "16835990894927923730876449688911465722193030824506892140772366596798846027145",
+  "10285196304867229525576259386556584044657339834734116745467765038834977104298",
+  "2903488935950838990208405343998070456796334091752591474019785544969867651224",
+  "3766428923666518331463526421481938811267455056246707954327363314469768904474",
   "796074195456137668475057404256202455048248910468542119987582633322559749494",
   "20567739078944838550556895816409602128127282297589578747131836752205066334747",
   "2915761020738377646169465098196184536995852317462848975418156916828302972897",
@@ -97,16 +97,28 @@ sibling_path = [
 ]
 
 [buyer_note.note]
-randomness = "0x28eae219c97727f63d73b3cd468d3325302536239c824ca1bcfed2941c8d6ded"
+randomness = "0x1af08c095db372d1373088e89772122824ecdb13dfc27754f32b00d4974d4f01"
 
 [buyer_note.note.owner]
 inner = "0x2b7bd70beb13e310f4593dbc807332acba0f01c4586f17cf984eedd7e1437414"
 
 [buyer_note.note.amount.token]
-inner = "0x8A791620dd6260079BF849Dc5567aDC3F2FdC318"
+inner = "0x610178dA211FEF7D417bC0e6FeD39F05609AD788"
 
 [buyer_note.note.amount.amount]
 value = "10"
 
-[buyer_amount]
-value = "3"
+[buyer_order]
+randomness = "0x1170de694d6d728817d9bb8ac5d92198e60e34c33c57e1915682e3f541461059"
+
+[buyer_order.sell_amount.token]
+inner = "0x610178dA211FEF7D417bC0e6FeD39F05609AD788"
+
+[buyer_order.sell_amount.amount]
+value = "2"
+
+[buyer_order.buy_amount.token]
+inner = "0x8A791620dd6260079BF849Dc5567aDC3F2FdC318"
+
+[buyer_order.buy_amount.amount]
+value = "70"

packages/contracts/noir/lob_router_swap/src/main.nr

@@ -3,12 +3,12 @@ fn main(
     // seller
     seller_secret_key: Field,
     seller_note: erc20::Erc20NoteConsumptionInputs,
-    seller_amount: common::TokenAmount,
+    seller_order: lob_router::Order,
     seller_randomness: Field,
     // buyer
     buyer_secret_key: Field,
     buyer_note: erc20::Erc20NoteConsumptionInputs,
-    buyer_amount: common::TokenAmount,
+    buyer_order: lob_router::Order,
     buyer_randomness: Field,
 ) -> pub common::Result<4, 2> {
     let mut context = common::Context::from(tree_roots);
@@ -17,11 +17,11 @@ fn main(
         &mut context,
         seller_secret_key,
         seller_note,
-        seller_amount,
+        seller_order,
         seller_randomness,
         buyer_secret_key,
         buyer_note,
-        buyer_amount,
+        buyer_order,
         buyer_randomness,
     );
 

packages/contracts/sdk/LobService.ts

@@ -56,22 +56,33 @@ export class LobService {
       randomness: buyerRandomness,
     });
 
+    const seller_order = {
+      sell_amount: await params.sellerAmount.toNoir(),
+      buy_amount: await params.buyerAmount.toNoir(),
+      randomness: sellerRandomness,
+    };
+    const buyer_order = {
+      sell_amount: await params.buyerAmount.toNoir(),
+      buy_amount: await params.sellerAmount.toNoir(),
+      randomness: buyerRandomness,
+    };
+
     const input = {
       tree_roots: await this.trees.getTreeRoots(),
       seller_secret_key: params.sellerSecretKey,
       seller_note: await this.poolErc20.toNoteConsumptionInputs(
         params.sellerSecretKey,
         params.sellerNote,
       ),
-      seller_amount: await params.sellerAmount.toNoir(),
+      seller_order,
       seller_randomness: sellerRandomness,
 
       buyer_secret_key: params.buyerSecretKey,
       buyer_note: await this.poolErc20.toNoteConsumptionInputs(
         params.buyerSecretKey,
         params.buyerNote,
       ),
-      buyer_amount: await params.buyerAmount.toNoir(),
+      buyer_order,
       buyer_randomness: buyerRandomness,
     };
     const { proof } = await prove("swap", swapCircuit, input);