From e50541912be313f4db445f63b9dd67b3416cf23b Mon Sep 17 00:00:00 2001
From: Hendrik Hofstadt <hendrik@certus.one>
Date: Tue, 21 Dec 2021 14:36:00 +0100
Subject: [PATCH] Fix NFT URI length and parsing (#628)

* Fix NFT bridge parsing and limit URI length

Change-Id: I71e728bbe35cfb8f10b86d53475f7e1c68b2866a

* Update NFTBridge.sol

* Update NFTBridge.sol
---
 ethereum/contracts/nft/NFTBridge.sol | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/ethereum/contracts/nft/NFTBridge.sol b/ethereum/contracts/nft/NFTBridge.sol
index f2f171bf..4354ba0e 100644
--- a/ethereum/contracts/nft/NFTBridge.sol
+++ b/ethereum/contracts/nft/NFTBridge.sol
@@ -196,6 +196,9 @@ contract NFTBridge is NFTBridgeGovernance {
     }
 
     function encodeTransfer(NFTBridgeStructs.Transfer memory transfer) public pure returns (bytes memory encoded) {
+        // There is a global limit on 200 bytes of tokenURI in Wormhole due to Solana
+        require(bytes(transfer.uri).length <= 200, "tokenURI must not exceed 200 bytes");
+
         encoded = abi.encodePacked(
             uint8(1),
             transfer.tokenAddress,
@@ -232,20 +235,21 @@ contract NFTBridge is NFTBridgeGovernance {
 
         transfer.tokenID = encoded.toUint256(index);
         index += 32;
-
-        uint8 len_uri = encoded.toUint8(index);
+        
+        // Ignore length due to malformatted payload
         index += 1;
+        transfer.uri = string(encoded.slice(index, encoded.length - index - 34));
 
-        transfer.uri = string(encoded.slice(index, len_uri));
-        index += len_uri;
-
-        transfer.to = encoded.toBytes32(index);
-        index += 32;
+        // From here we read backwards due malformatted package
+        index = encoded.length;
 
+        index -= 2;
         transfer.toChain = encoded.toUint16(index);
-        index += 2;
 
-        require(encoded.length == index, "invalid Transfer");
+        index -= 32;
+        transfer.to = encoded.toBytes32(index);
+
+        //require(encoded.length == index, "invalid Transfer");
     }
 
     function onERC721Received(
@@ -269,4 +273,4 @@ contract NFTBridge is NFTBridgeGovernance {
         }
         return string(array);
     }
-}
\ No newline at end of file
+}