From 7770a3f8b0d3f58c448a2b7c3956646177f8b802 Mon Sep 17 00:00:00 2001
From: David Turner <novalis@novalis.org>
Date: Wed, 30 Mar 2022 15:02:30 -0400
Subject: [PATCH 1/2] Proto, tx_rollup: Remove bogus extra deposit in test

---
 .../test/integration/operations/test_tx_rollup.ml            | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/proto_alpha/lib_protocol/test/integration/operations/test_tx_rollup.ml b/src/proto_alpha/lib_protocol/test/integration/operations/test_tx_rollup.ml
index 03f6ad3eb52e..8063e4d6b25a 100644
--- a/src/proto_alpha/lib_protocol/test/integration/operations/test_tx_rollup.ml
+++ b/src/proto_alpha/lib_protocol/test/integration/operations/test_tx_rollup.ml
@@ -4738,11 +4738,6 @@ module Withdraw = struct
     deposit b >>=? fun b ->
     deposit b >>=? fun b ->
     deposit b >>=? fun b ->
-    let fee = Test_tez.of_int 10 in
-    let parameters = print_deposit_arg (`Typed tx_rollup) (`Hash pkh) in
-    Op.transaction ~fee (B b) account1 account1 Tez.zero ~parameters
-    >>=? fun operation ->
-    Block.bake ~operation b >>=? fun b ->
     Nat_ticket.withdrawal
       (B b)
       ~ticketer:deposit_contract
-- 
GitLab


From e3688f59238de4d2b3350c383c65cbca4d8da580 Mon Sep 17 00:00:00 2001
From: David Turner <novalis@novalis.org>
Date: Wed, 30 Mar 2022 15:25:24 -0400
Subject: [PATCH 2/2] Proto,Tx_rollup: Test multiple large deposits to
 different destinations

---
 .../integration/operations/test_tx_rollup.ml  | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/src/proto_alpha/lib_protocol/test/integration/operations/test_tx_rollup.ml b/src/proto_alpha/lib_protocol/test/integration/operations/test_tx_rollup.ml
index 8063e4d6b25a..5a2c22a2fec1 100644
--- a/src/proto_alpha/lib_protocol/test/integration/operations/test_tx_rollup.ml
+++ b/src/proto_alpha/lib_protocol/test/integration/operations/test_tx_rollup.ml
@@ -4799,6 +4799,69 @@ module Withdraw = struct
       ~previous_message_result
     >>=? fun _ -> return_unit
 
+  (** [test_deposit_multiple_destinations_at_limit] checks that we can
+      deposit the maximum number of tickets to multiple destinations ]
+      without overflowing. *)
+  let test_deposit_multiple_destinations_at_limit () =
+    let max = Int64.max_int in
+    let (_, _, pkh1) = gen_l2_account () in
+    let (_, _, pkh2) = gen_l2_account () in
+    context_init1 () >>=? fun (b, account1) ->
+    originate b account1 >>=? fun (b, tx_rollup) ->
+    Nat_ticket.init_deposit_contract (Z.of_int64 max) b account1
+    >>=? fun (deposit_contract, _script, b) ->
+    let deposit_pkh = assert_some @@ Contract.is_implicit account1 in
+    let deposit b pkh =
+      let pkh_str = Tx_rollup_l2_address.to_b58check pkh in
+      Nat_ticket.deposit_op b tx_rollup pkh_str account1 deposit_contract
+      >>=? fun operation -> Block.bake ~operation b
+    in
+    deposit b pkh1 >>=? fun b ->
+    deposit b pkh2 >>=? fun b ->
+    Incremental.begin_construction b >>=? fun i ->
+    Nat_ticket.ticket_hash (B b) ~ticketer:deposit_contract ~tx_rollup
+    >>=? fun ticket_hash ->
+    let make_deposit pkh =
+      Tx_rollup_message.make_deposit
+        deposit_pkh
+        (Tx_rollup_l2_address.Indexable.value pkh)
+        ticket_hash
+        (Tx_rollup_l2_qty.of_int64_exn max)
+    in
+    let (deposit1, _) = make_deposit pkh1 in
+    let (deposit2, _) = make_deposit pkh2 in
+    Rejection.init_l2_store () >>= fun store ->
+    (* For the first deposit, we have no withdraws *)
+    make_and_check_correct_commitment
+      (I i)
+      tx_rollup
+      account1
+      store
+      deposit1
+      (tx_level 0l)
+      []
+      ~previous_message_result:Rejection.previous_message_result
+    >>=? fun (i, previous_message_result) ->
+    l2_parameters (I i) >>=? fun l2_parameters ->
+    (* Finally, we apply the deposit manually to have the good resulting store
+       for next operations *)
+    Rejection.Apply.apply_message store l2_parameters deposit1
+    >>= fun (store, _) ->
+    Rejection.commit_store store >>= fun store ->
+    (* For the second deposit, still no withdraws. *)
+    make_and_check_correct_commitment
+      (I i)
+      tx_rollup
+      account1
+      store
+      deposit2
+      (tx_level 1l)
+      []
+      ~previous_message_result
+    >>=? fun (i, _) ->
+    ignore i ;
+    return_unit
+
   let tests =
     [
       Tztest.tztest "Test withdraw" `Quick test_valid_withdraw;
@@ -4831,6 +4894,10 @@ module Withdraw = struct
         "Test deposits overflowing to withdrawals"
         `Quick
         test_deposit_overflow_to_withdrawal;
+      Tztest.tztest
+        "Test deposit to multiple destinations don't overflow"
+        `Quick
+        test_deposit_multiple_destinations_at_limit;
       Tztest.tztest
         "Test multiple withdrawals from the same batch and from different \
          batches"
-- 
GitLab