Revert message address indexing. (#2002)

* Revert message address indexing. * Fix for indexed keyword being where it shouldn't. * Fix for deployment. --------- Co-authored-by: StefanIliev545 <[email protected]>
ten-protocol · Aug 1, 2024 · 7b62b2e · 7b62b2e
1 parent 65d9646
commit 7b62b2e
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 53 deletions.
diff --git a/contracts/deployment_scripts/testnet/layer2/001_whitelist_tokens.ts b/contracts/deployment_scripts/testnet/layer2/001_whitelist_tokens.ts
@@ -54,7 +54,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     const topic = hre.ethers.id(eventSignature)
 
     // Get the interface for the event in order to convert it to cross chain message.
-    let eventIface = new hre.ethers.Interface([ `event LogMessagePublished(address indexed,uint64,uint32,uint32,bytes,uint8)`]);
+    let eventIface = new hre.ethers.Interface([ `event LogMessagePublished(address,uint64,uint32,uint32,bytes,uint8)`]);
 
     // This function converts the logs from transaction receipts into cross chain messages
     function getXChainMessages(result: Receipt) {

diff --git a/contracts/generated/CrossChainMessenger/CrossChainMessenger.go b/contracts/generated/CrossChainMessenger/CrossChainMessenger.go
diff --git a/contracts/generated/EthereumBridge/EthereumBridge.go b/contracts/generated/EthereumBridge/EthereumBridge.go
diff --git a/contracts/generated/ManagementContract/ManagementContract.go b/contracts/generated/ManagementContract/ManagementContract.go
diff --git a/contracts/generated/MerkleTreeMessageBus/MerkleTreeMessageBus.go b/contracts/generated/MerkleTreeMessageBus/MerkleTreeMessageBus.go
diff --git a/contracts/generated/MessageBus/MessageBus.go b/contracts/generated/MessageBus/MessageBus.go
diff --git a/contracts/generated/ObsERC20/ObsERC20.go b/contracts/generated/ObsERC20/ObsERC20.go
diff --git a/contracts/generated/ObscuroBridge/ObscuroBridge.go b/contracts/generated/ObscuroBridge/ObscuroBridge.go
diff --git a/contracts/generated/WrappedERC20/WrappedERC20.go b/contracts/generated/WrappedERC20/WrappedERC20.go
diff --git a/contracts/src/messaging/IMessageBus.sol b/contracts/src/messaging/IMessageBus.sol
@@ -12,7 +12,7 @@ interface IMessageBus {
     // The enclave listens for it on the deployed message bus addresses.
     event LogMessagePublished
     (
-        address indexed sender, 
+        address sender, 
         uint64 sequence, 
         uint32 nonce, 
         uint32 topic, 

diff --git a/contracts/test/bridge-test.ts b/contracts/test/bridge-test.ts
@@ -79,7 +79,7 @@ describe("Bridge", function () {
 
       const eventSignature = "LogMessagePublished(address,uint64,uint32,uint32,bytes,uint8)";
       const topic = ethers.id(eventSignature)
-      let eventIface = new ethers.Interface([ `event LogMessagePublished(address indexed,uint64,uint32,uint32,bytes,uint8)`]);
+      let eventIface = new ethers.Interface([ `event LogMessagePublished(address,uint64,uint32,uint32,bytes,uint8)`]);
 
       const receipt = (await  tx.wait())!!;
 
@@ -283,7 +283,7 @@ describe("Bridge", function () {
 
       await expect(event).to.not.be.undefined;
 
-      let eventIface = new ethers.Interface([ `event LogMessagePublished(address indexed,uint64,uint32,uint32,bytes,uint8)`]);
+      let eventIface = new ethers.Interface([ `event LogMessagePublished(address,uint64,uint32,uint32,bytes,uint8)`]);
 
       const decodedEvent = eventIface.parseLog({
         topics: event!.topics!.map((v)=>v),

diff --git a/go/enclave/crosschain/common.go b/go/enclave/crosschain/common.go
@@ -109,16 +109,11 @@ 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)