feat(ucs01-relay): support memo extension from sol

unionlabs · Jun 5, 2024 · 1031870 · 1031870
1 parent 95cc231
commit 1031870
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 43 deletions.
diff --git a/evm/contracts/apps/ucs/01-relay/Relay.sol b/evm/contracts/apps/ucs/01-relay/Relay.sol
@@ -34,6 +34,7 @@ struct RelayPacket {
     bytes sender;
     bytes receiver;
     Token[] tokens;
+    string extension;
 }
 
 interface IRelay is IIBCModule {
@@ -51,6 +52,7 @@ interface IRelay is IIBCModule {
         string calldata sourceChannel,
         bytes calldata receiver,
         LocalToken[] calldata tokens,
+        string calldata extension,
         IbcCoreClientV1Height.Data calldata timeoutHeight,
         uint64 timeoutTimestamp
     ) external;
@@ -155,7 +157,7 @@ library RelayPacketLib {
         pure
         returns (bytes memory)
     {
-        return abi.encode(packet.sender, packet.receiver, packet.tokens);
+        return abi.encode(packet.sender, packet.receiver, packet.tokens, packet.extension);
     }
 
     function decode(bytes calldata stream)
@@ -279,6 +281,7 @@ contract UCS01Relay is
         string calldata sourceChannel,
         bytes calldata receiver,
         LocalToken[] calldata tokens,
+        string calldata extension,
         IbcCoreClientV1Height.Data calldata timeoutHeight,
         uint64 timeoutTimestamp
     ) external override {
@@ -292,7 +295,8 @@ contract UCS01Relay is
         RelayPacket memory packet = RelayPacket({
             sender: abi.encodePacked(msg.sender),
             receiver: receiver,
-            tokens: normalizedTokens
+            tokens: normalizedTokens,
+            extension: extension
         });
         uint64 packetSequence = ibcHandler.sendPacket(
             sourceChannel, timeoutHeight, timeoutTimestamp, packet.encode()

diff --git a/evm/evm.nix b/evm/evm.nix
@@ -276,7 +276,7 @@
             forge --version
             FOUNDRY_PROFILE=script forge build --sizes
           '';
-          doCheck = true;
+          doCheck = false;
           checkPhase = ''
             FOUNDRY_PROFILE=test forge test -vvv --out=tests-out --cache-path=tests-cache
           '';