Merge pull request #17 from lightclient/add-event

Add logging to system contracts
lightclient · Aug 20, 2024 · ee61e80 · ee61e80
2 parents dea4517 + d338503
commit ee61e80
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 2 deletions.
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/src/consolidations/main.eas b/src/consolidations/main.eas
@@ -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]

diff --git a/src/withdrawals/main.eas b/src/withdrawals/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]

diff --git a/test/Consolidation.t.sol.in b/test/Consolidation.t.sol.in
@@ -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);
 

diff --git a/test/Withdrawal.t.sol.in b/test/Withdrawal.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");
+1 −0		.gitattributes
+6 −12		.github/workflows/ci.yml
+3 −1		.github/workflows/sync.yml
+0 −3		.gitmodules
+1 −1		README.md
+3 −3		foundry.toml
+0 −1		lib/ds-test
+1 −1		package.json
+635 −0		scripts/vm.py
+518 −225		src/StdAssertions.sol
+25 −10		src/StdChains.sol
+2 −2		src/StdCheats.sol
+18 −3		src/StdInvariant.sol
+7 −11		src/StdJson.sol
+202 −107		src/StdStorage.sol
+179 −0		src/StdToml.sol
+1 −1		src/StdUtils.sol
+4 −4		src/Test.sol
+1,526 −493		src/Vm.sol
+401 −382		src/console.sol
+1 −1,555		src/console2.sol
+51 −33		src/mocks/MockERC20.sol
+46 −36		src/mocks/MockERC721.sol
+693 −4		src/safeconsole.sol
+39 −909		test/StdAssertions.t.sol
+36 −26		test/StdChains.t.sol
+19 −11		test/StdCheats.t.sol
+3 −1		test/StdError.t.sol
+49 −0		test/StdJson.t.sol
+8 −8		test/StdMath.t.sol
+167 −11		test/StdStorage.t.sol
+49 −0		test/StdToml.t.sol
+20 −20		test/StdUtils.t.sol
+3 −3		test/Vm.t.sol
+8 −0		test/fixtures/test.json
+6 −0		test/fixtures/test.toml
+1 −1		test/mocks/MockERC20.t.sol
+1 −1		test/mocks/MockERC721.t.sol