patch address & topics parsing in parseLog

Author: RnkSngh

bindings/go/crossl2prover/CrossL2Prover.go

@@ -150,6 +150,8 @@ struct Proof {
 }
 
 library Ibc {
+    error invalidAddressBytes();
+
     // https://github.com/open-ibc/ibcx-go/blob/ef80dd6784fd/modules/core/24-host/keys.go#L135
     function channelProofKey(string calldata portId, bytes32 channelId) external pure returns (bytes memory proofKey) {
         proofKey = abi.encodePacked("channelEnds/ports/", portId, "/channels/", toStr(channelId));
@@ -288,6 +290,15 @@ library Ibc {
         outStr = string(buffer);
     }
 
+    function bytesToAddr(bytes memory a) public pure returns (address addr) {
+        if (a.length != 20) {
+            revert invalidAddressBytes();
+        }
+        assembly {
+            addr := mload(add(a, 20))
+        }
+    }
+
     function parseLog(uint256 logIndex, bytes memory receiptRLP)
         internal
         pure
@@ -315,11 +326,13 @@ library Ibc {
         // }
         RLPReader.RLPItem[] memory log = RLPReader.readList(RLPReader.readList(receipt[3])[logIndex]);
 
-        emittingContract = address(uint160(uint256(bytes32(RLPReader.readBytes(log[0])))));
+        emittingContract = bytesToAddr(RLPReader.readBytes(log[0]));
+
         RLPReader.RLPItem[] memory encodedTopics = RLPReader.readList(log[1]);
         unindexedData = (RLPReader.readBytes(log[2])); // This is the raw unindexed data. in this case it's
             // just an abi encoded uint64
 
+        topics = new bytes[](encodedTopics.length);
         for (uint256 i = 0; i < encodedTopics.length; i++) {
             topics[i] = RLPReader.readBytes(encodedTopics[i]);
         }

contracts/libs/Ibc.sol

@@ -1,6 +1,6 @@
 {
   "name": "@open-ibc/vibc-core-smart-contracts",
-  "version": "4.0.18",
+  "version": "4.0.19",
   "main": "dist/index.js",
   "bin": {
     "verify-vibc-core-smart-contracts": "./dist/scripts/verify-contract-script.js",

package.json

@@ -74,6 +74,7 @@ export interface IbcInterface extends Interface {
     nameOrSignature:
       | "ackProofKey"
       | "ackProofValue"
+      | "bytesToAddr"
       | "channelProofKey"
       | "channelProofKeyMemory"
       | "channelProofValue"
@@ -93,6 +94,10 @@ export interface IbcInterface extends Interface {
     functionFragment: "ackProofValue",
     values: [BytesLike]
   ): string;
+  encodeFunctionData(
+    functionFragment: "bytesToAddr",
+    values: [BytesLike]
+  ): string;
   encodeFunctionData(
     functionFragment: "channelProofKey",
     values: [string, BytesLike]
@@ -138,6 +143,10 @@ export interface IbcInterface extends Interface {
     functionFragment: "ackProofValue",
     data: BytesLike
   ): Result;
+  decodeFunctionResult(
+    functionFragment: "bytesToAddr",
+    data: BytesLike
+  ): Result;
   decodeFunctionResult(
     functionFragment: "channelProofKey",
     data: BytesLike
@@ -223,6 +232,8 @@ export interface Ibc extends BaseContract {
 
   ackProofValue: TypedContractMethod<[ack: BytesLike], [string], "view">;
 
+  bytesToAddr: TypedContractMethod<[a: BytesLike], [string], "view">;
+
   channelProofKey: TypedContractMethod<
     [portId: string, channelId: BytesLike],
     [string],
@@ -297,6 +308,9 @@ export interface Ibc extends BaseContract {
   getFunction(
     nameOrSignature: "ackProofValue"
   ): TypedContractMethod<[ack: BytesLike], [string], "view">;
+  getFunction(
+    nameOrSignature: "bytesToAddr"
+  ): TypedContractMethod<[a: BytesLike], [string], "view">;
   getFunction(
     nameOrSignature: "channelProofKey"
   ): TypedContractMethod<