Merge pull request #17 from lightclient/add-event

Add logging to system contracts

Author: lightclient

lib/forge-std

@@ -141,6 +141,23 @@ check_input:
   swap1                 ;; [slot, target[16:48], ..]
   sstore                ;; [..]
 
+
+  ;; Assemble log data.
+  caller                ;; [caller, ..]
+  push1 96              ;; [96, caller, ..]
+  shl                   ;; [caller, ..]
+  push0                 ;; [0, caller, ..]
+  mstore                ;; [..]
+  push1 INPUT_SIZE      ;; [size, ..]
+  push0                 ;; [ost, size, ..]
+  push1 20              ;; [dest, ost, size, ..]
+  calldatacopy          ;; [..]
+
+  ;; Log record.
+  push1 RECORD_SIZE     ;; [size, ..]
+  push0                 ;; [idx, size, ..]
+  log0                  ;; [..]
+
   ;; Increment queue tail over last and write to storage.
   push1 1               ;; [1, tail_idx]
   add                   ;; [tail_idx+1]

src/consolidations/main.eas

@@ -142,6 +142,22 @@ check_input:
   swap1                 ;; [slot, pk2_am, ..]
   sstore                ;; [..]
 
+  ;; Assemble log data.
+  caller                ;; [caller, ..]
+  push1 96              ;; [96, caller, ..]
+  shl                   ;; [caller, ..]
+  push0                 ;; [0, caller, ..]
+  mstore                ;; [..]
+  push1 INPUT_SIZE      ;; [size, ..]
+  push0                 ;; [ost, size, ..]
+  push1 20              ;; [dest, ost, size, ..]
+  calldatacopy          ;; [..]
+
+  ;; Log record.
+  push1 RECORD_SIZE     ;; [size, ..]
+  push0                 ;; [idx, size, ..]
+  log0                  ;; [..]
+
   ;; Increment queue tail over last and write to storage.
   push1 1               ;; [1, tail_idx]
   add                   ;; [tail_idx+1]

src/withdrawals/main.eas

@@ -32,8 +32,19 @@ contract ConsolidationTest is Test {
   // request count is accepted and read successfully.
   function testConsolidation() public {
     bytes memory data = hex"111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222";
+
+    vm.expectEmitAnonymous(false, false, false, false, true);
+    assembly {
+      let ptr := mload(0x40)
+      mstore(ptr, shl(96, address()))
+      mstore(add(ptr, 20), mload(add(data, 32)))
+      mstore(add(ptr, 52), mload(add(data, 64)))
+      mstore(add(ptr, 84), mload(add(data, 96)))
+      log0(ptr, 116)
+    }
+
     (bool ret,) = addr.call{value: 2}(data);
-    assertEq(ret, true);
+    assertEq(ret, true, "call failed");
     assertStorage(count_slot, 1, "unexpected request count");
     assertExcess(0);
 

test/Consolidation.t.sol.in

@@ -34,6 +34,16 @@ contract WithdrawalsTest is Test {
   // count is accepted and read successfully.
   function testWithdrawal() public {
     bytes memory data = hex"1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112222222222222222";
+
+    vm.expectEmitAnonymous(false, false, false, false, true);
+    assembly {
+      let ptr := mload(0x40)
+      mstore(ptr, shl(96, address()))
+      mstore(add(ptr, 20), mload(add(data, 32)))
+      mstore(add(ptr, 52), mload(add(data, 64)))
+      log0(ptr, 76)
+    }
+
     (bool ret,) = addr.call{value: 2}(data);
     assertEq(ret, true);
     assertStorage(count_slot, 1, "unexpected request count");