fix: tracing ID generation mismatch (#1349)

Author: karlem

contracts/Makefile

@@ -110,8 +110,8 @@ node_modules: package.json pnpm-lock.yaml
 	touch node_modules
 
 build: node_modules | forge
-	forge build
-	FOUNDRY_SRC=sdk forge build
+	forge build --names
+	forge build sdk --names
 
 test: node_modules test/helpers/SelectorLibrary.sol | forge
 	forge test -vvv --ffi

contracts/sdk/IpcContract.sol

@@ -86,7 +86,7 @@ abstract contract IpcExchange is IIpcHandler, Ownable, ReentrancyGuard {
             })
         );
         // Add the message to the list of inflights
-        bytes32 id = envelope.toHash();
+        bytes32 id = envelope.toTracingId();
         inflightMsgs[id] = envelope;
     }
 

contracts/test/sdk/IpcContract.t.sol

@@ -122,7 +122,7 @@ contract IpcExchangeTest is Test {
             localNonce: 0
         });
 
-        resultMsg = ResultMsg({outcome: OutcomeType.Ok, id: callEnvelope.toHash(), ret: bytes("")});
+        resultMsg = ResultMsg({outcome: OutcomeType.Ok, id: callEnvelope.toTracingId(), ret: bytes("")});
 
         resultEnvelope = IpcEnvelope({
             kind: IpcMsgKind.Result,
@@ -196,8 +196,8 @@ contract IpcExchangeTest is Test {
         vm.deal(address(this), 1000);
         exch.performIpcCall_(ipcAddressA, callMsg, 1);
         // assert that we stored the correct callEnvelope in the correlation map.
-        IpcEnvelope memory correlated = exch.getInflight(callEnvelope.toHash());
-        require(correlated.toHash() == callEnvelope.toHash());
+        IpcEnvelope memory correlated = exch.getInflight(callEnvelope.toTracingId());
+        require(correlated.toTracingId() == callEnvelope.toTracingId());
 
         vm.startPrank(gateway);
 
@@ -213,14 +213,15 @@ contract IpcExchangeTest is Test {
         bytes32[] memory ids = new bytes32[](3);
         for (uint64 i = 0; i < 3; i++) {
             callEnvelope.localNonce = i;
+            callEnvelope.originalNonce = i;
             vm.mockCall(
                 gateway,
                 abi.encodeWithSelector(IGateway.sendContractXnetMessage.selector),
                 abi.encode(callEnvelope)
             );
             exch.performIpcCall_(ipcAddressA, callMsg, 1);
 
-            bytes32 id = callEnvelope.toHash();
+            bytes32 id = callEnvelope.toTracingId();
             require(exch.getInflight(id).value != 0, "envelope not found in correlation map");
 
             ids[i] = id;
@@ -254,8 +255,8 @@ contract IpcExchangeTest is Test {
         resultEnvelope.message = abi.encode(resultMsg);
 
         // assert that we stored the correct callEnvelope in the correlation map.
-        IpcEnvelope memory correlated = exch.getInflight(callEnvelope.toHash());
-        require(correlated.toHash() == callEnvelope.toHash());
+        IpcEnvelope memory correlated = exch.getInflight(callEnvelope.toTracingId());
+        require(correlated.toTracingId() == callEnvelope.toTracingId());
 
         // Simulate an OK incoming result.
         exch.handleIpcMessage(resultEnvelope);