Fix for processing of events.

contracts/src/management/ManagementContract.sol

@@ -26,6 +26,7 @@ contract ManagementContract is Initializable, OwnableUpgradeable {
     event ImportantContractAddressUpdated(string key, address newAddress);
     event SequencerEnclaveGranted(address enclaveID);
     event SequencerEnclaveRevoked(address enclaveID);
+    event RollupAdded(bytes32 rollupHash);
 
     // mapping of enclaveID to whether it is attested
     mapping(address => bool) private attested;
@@ -114,6 +115,7 @@ contract ManagementContract is Initializable, OwnableUpgradeable {
         require(sequencerEnclave[enclaveID], "enclaveID not a sequencer");
 
         AppendRollup(r);
+        emit RollupAdded(r.Hash);
     }
 
     // InitializeNetworkSecret kickstarts the network secret, can only be called once

go/enclave/crosschain/common.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"errors"
+	"fmt"
 	"strings"
 
 	"github.com/ethereum/go-ethereum/crypto"
@@ -108,11 +109,16 @@ func convertLogsToMessages(logs []types.Log, eventName string, messageBusABI abi
 	messages := make(common.CrossChainMessages, 0)
 
 	for _, log := range logs {
+		if len(log.Topics) != 2 {
+			return nil, fmt.Errorf("invalid number of topics in log: %d", len(log.Topics))
+		}
+
 		var event MessageBus.MessageBusLogMessagePublished
 		err := messageBusABI.UnpackIntoInterface(&event, eventName, log.Data)
 		if err != nil {
 			return nil, err
 		}
+		event.Sender = gethcommon.BytesToAddress(log.Topics[1].Bytes())
 
 		msg := createCrossChainMessage(event)
 		messages = append(messages, msg)
@@ -137,15 +143,19 @@ func ConvertLogsToValueTransfers(logs []types.Log, eventName string, messageBusA
 	messages := make(common.ValueTransferEvents, 0)
 
 	for _, log := range logs {
+		if len(log.Topics) != 3 {
+			return nil, fmt.Errorf("invalid number of topics in log: %d", len(log.Topics))
+		}
+
 		var event MessageBus.MessageBusValueTransfer
 		err := messageBusABI.UnpackIntoInterface(&event, eventName, log.Data)
 		if err != nil {
 			return nil, err
 		}
 
 		messages = append(messages, common.ValueTransferEvent{
-			Sender:   event.Sender,
-			Receiver: event.Receiver,
+			Sender:   gethcommon.BytesToAddress(log.Topics[1].Bytes()),
+			Receiver: gethcommon.BytesToAddress(log.Topics[2].Bytes()),
 			Amount:   event.Amount,
 			Sequence: event.Sequence,
 		})