test: fixed VeaMock to account for some encoding mismatch

Author: jaybuidl

contracts/src/gateway/mock/VeaMock.sol

@@ -7,6 +7,7 @@ import "@kleros/vea-contracts/interfaces/IFastBridgeReceiver.sol";
 
 contract VeaMock is IFastBridgeSender, IFastBridgeReceiver {
     /* solhint-disable */
+
     // ************************************* //
     // *        Function Modifiers         * //
     // ************************************* //
@@ -18,7 +19,17 @@ contract VeaMock is IFastBridgeSender, IFastBridgeReceiver {
      * @param _calldata The receiving domain encoded message data.
      */
     function sendFast(address _receiver, bytes memory _calldata) external {
-        _receiver.call(_calldata);
+        // Dirty workaround: Solidity does not support array slices for memory arrays and the sender interface cannot be changed.
+        (bytes4 selector, bytes memory payload) = this.decode(_calldata);
+
+        bytes32 sender = bytes32(uint256(uint160(msg.sender)));
+        bytes memory data = abi.encodePacked(selector, sender, payload);
+        (bool success, bytes memory res) = _receiver.call(data);
+        require(success, "Call failure");
+    }
+
+    function decode(bytes calldata data) external pure returns (bytes4, bytes memory) {
+        return (bytes4(data[:4]), data[4:]);
     }
 
     /**

contracts/test/integration/index.ts

@@ -110,7 +110,7 @@ describe("Integration tests", async () => {
     });
     const tx = await arbitrable.createDispute(2, "0x00", 0, { value: arbitrationCost });
     const trace = await network.provider.send("debug_traceTransaction", [tx.hash]);
-    const [disputeId] = ethers.utils.defaultAbiCoder.decode(["uint"], `0x${trace.returnValue}`);
+    const [disputeId] = ethers.utils.defaultAbiCoder.decode(["uint"], `0x${trace.returnValue}`); // get returned value from createDispute()
     console.log("Dispute Created");
     expect(tx).to.emit(foreignGateway, "DisputeCreation");
     expect(tx).to.emit(foreignGateway, "OutgoingDispute");
@@ -179,7 +179,7 @@ describe("Integration tests", async () => {
 
     const tx4 = await core.executeRuling(0);
     console.log("Ruling executed on KlerosCore");
-    expect(tx4).to.emit(arbitrable, "Ruling");
+    expect(tx4).to.emit(arbitrable, "Ruling").withArgs(foreignGateway.address, 1, 0);
   });
 
   async function mineBlocks(n) {

yarn.lock

@@ -2383,11 +2383,11 @@ __metadata:
   linkType: hard
 
 "@kleros/vea-contracts@npm:dev":
-  version: 0.1.3
-  resolution: "@kleros/vea-contracts@npm:0.1.3"
+  version: 0.1.9
+  resolution: "@kleros/vea-contracts@npm:0.1.9"
   dependencies:
     "@openzeppelin/contracts": ^4.8.0
-  checksum: 3ab8e03ed81b14c868850fc213681070bbd10931bb31a845a01d6636d3ec080c4533e48a848c405b1d59dbac0d8f5647f84212ca5e23099fe3744fa9ee1484c2
+  checksum: 191014204d21e832d55b9f50cffc07657a4e5d7e907fbe134b4b11f6ad53b92bff959b80d41c388e088d2c01c60c470bd7b115fd7a612c20fbd770fbdf31f90c
   languageName: node
   linkType: hard