Revert back to 0.8.4 + PR feedback

ethereum/Makefile

@@ -41,7 +41,7 @@ lib/openzeppelin-contracts:
 	forge install openzeppelin/openzeppelin-contracts@0457042d93d9dfd760dbaa06a4d2f1216fdbe297 --no-git --no-commit
 
 lib/wormhole-solidity-sdk:
-	forge install wormhole-foundation/wormhole-solidity-sdk@b9e129e65d34827d92fceeed8c87d3ecdfc801d0 --no-git --no-commit
+	forge install djb15/wormhole-solidity-sdk@78f4b5e1d1ce4c36e43522c9205eb1e92fde7106 --no-git --no-commit
 
 dependencies: node_modules forge_dependencies
 

ethereum/contracts/Messages.sol

@@ -6,12 +6,10 @@ pragma experimental ABIEncoderV2;
 
 import "./Getters.sol";
 import "./Structs.sol";
-import "./libraries/external/BytesLib.sol";
-import "wormhole-solidity-sdk/libraries/BytesParsing.sol";
+import "wormhole-sdk/libraries/BytesParsing.sol";
 
 
 contract Messages is Getters {
-    using BytesLib for bytes;
     using BytesParsing for bytes;
 
     uint8 private constant ADDRESS_SIZE = 20; // in bytes
@@ -219,13 +217,7 @@ contract Messages is Getters {
         }
 
         /// @dev Verify the proposed vm.signatures against the guardianSet
-        (bool signaturesValid, string memory invalidReason) = verifySignatures(hash, signatures, guardianSet);
-        if(!signaturesValid){
-            return (false, invalidReason);
-        }
-
-        /// If we are here, we've validated the VM is a valid multi-sig that matches the current guardianSet.
-        return (true, "");
+        return verifySignatures(hash, signatures, guardianSet);
     }
 
     /**

ethereum/foundry.toml

@@ -1,5 +1,5 @@
 [profile.default]
-solc_version = "0.8.13"
+solc_version = "0.8.4"
 optimizer = true
 optimizer_runs = 200
 via_ir = false
@@ -17,6 +17,7 @@ remappings = [
     'ds-test/=lib/forge-std/lib/ds-test/src/',
     'forge-std/=lib/forge-std/src/',
     'truffle/=node_modules/truffle/',
+    'wormhole-sdk/=lib/wormhole-solidity-sdk/src/'
 ]
 
 [fmt]