Combined contract

.gitignore

@@ -9,4 +9,5 @@ out
 out.log
 broadcast
 dist
-ts-types
+ts-types
+ts-build

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "lib/wormhole-solidity-sdk"]
+	path = lib/wormhole-solidity-sdk
+	url = https://github.com/wormhole-foundation/wormhole-solidity-sdk.git
+	branch = sr-refactor

Makefile

@@ -1,31 +1,50 @@
-TEST_RPC = https://rpc.ankr.com/eth
+TEST_RPC = https://ethereum-rpc.publicnode.com
 
 tolib = $(addprefix lib/,$(firstword $(subst @, ,$(notdir $(1)))))
 
-define install_lib
-dependencies: $(call tolib,$(1))
+define install_lib_evm
+dependencies-evm: $(call tolib,$(1))
 
 $(call tolib,$(1)):
-	forge install $(1) --no-git --no-commit
+	forge install $(1) --no-git
 endef
 
 .DEFAULT_GOAL = build
-.PHONY: build test clean dependencies
+.PHONY: build* test* clean* dependencies*
 
-build: dependencies
-	forge build
+build: build-evm build-solana build-solana-ts
 
-test: dependencies
-	forge test --fork-url $(TEST_RPC) -vvvv
-#--match-test InitiateFullFuzz
+test: test-evm test-solana
+
+clean: clean-evm clean-solana
 
 LIB_DEPS = foundry-rs/forge-std
-LIB_DEPS += openzeppelin/openzeppelin-contracts@0457042d93d9dfd760dbaa06a4d2f1216fdbe297 #for gscd's optimizations
-LIB_DEPS += wormhole-foundation/wormhole-solidity-sdk@67ca81c
+LIB_DEPS += wormhole-foundation/wormhole-solidity-sdk@a7c8786
 
 # dynamically generate install rule for each lib dependency and add to depdenencies
-$(foreach dep,$(LIB_DEPS), $(eval $(call install_lib,$(dep))))
+$(foreach dep,$(LIB_DEPS), $(eval $(call install_lib_evm,$(dep))))
 
-clean:
+
+build-evm: dependencies-evm
+	forge build
+
+test-evm: dependencies-evm
+	forge test --fork-url $(TEST_RPC) -vvvv
+#--match-test InitiateFullFuzz
+
+clean-evm:
 	forge clean
 	rm -rf lib
+
+
+build-solana:
+	cd src/solana; anchor build
+
+build-solana-ts:
+	npm run build --prefix src/solana
+
+test-solana:
+	cd src/solana; anchor test
+
+clean-solana:
+	cd src/solana; anchor clean

foundry.toml

@@ -3,15 +3,14 @@ solc_version = "0.8.28"
 evm_version = "paris" # prevent use of PUSH0 opcode until it is widely supported
 optimizer = true
 via_ir = true
-extra_output = ["asm"]
+extra_output = ["asm", "metadata", "storageLayout", "evm.deployedBytecode.immutableReferences"]
 
 libs = [
     "lib",
 ]
 
 remappings = [
     "forge-std/=lib/forge-std/src/",
-    "@openzeppelin/=lib/openzeppelin-contracts/",
     "wormhole-sdk/=lib/wormhole-solidity-sdk/src/",
     "core-bridge/=src/",
 ]

package.json

@@ -0,0 +1 @@
+{}

src/evm/EIP712Encoding.sol

@@ -0,0 +1,90 @@
+// SPDX-License-Identifier: Apache 2
+
+pragma solidity ^0.8.0;
+
+import {eagerOr} from "wormhole-sdk/Utils.sol";
+import {BytesParsing} from "wormhole-sdk/libraries/BytesParsing.sol";
+import {VaaLib} from "wormhole-sdk/libraries/VaaLib.sol";
+
+bytes32 constant REGISTER_TYPE_HASH = keccak256(
+  "GuardianRegister(uint32 guardianSet,uint32 expirationTime,bytes32 id)"
+);
+
+interface IERC5267 {
+  function eip712Domain() external view returns (
+    bytes1 fields,
+    string memory name,
+    string memory version,
+    uint256 chainId,
+    address verifyingContract,
+    bytes32 salt,
+    uint256[] memory extensions
+  );
+}
+
+contract EIP712Encoding is IERC5267 {
+  bytes32 constant EIP712_DOMAIN_TYPE_HASH = keccak256(
+    "EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)"
+  );
+
+  string constant EIP712_NAME = "Wormhole VerificationV2";
+  string constant EIP712_VERSION = "1";
+
+  bytes32 constant EIP712_NAME_HASH = keccak256(bytes(EIP712_NAME));
+  bytes32 constant EIP712_VERSION_HASH = keccak256(bytes(EIP712_VERSION));
+
+  bytes32 private immutable _domainSeparator;
+
+  constructor () {
+    _domainSeparator = getDomainSeparator(block.chainid, address(this));
+  }
+
+  function eip712Domain() external view returns (
+    bytes1 fields,
+    string memory name,
+    string memory version,
+    uint256 chainId,
+    address verifyingContract,
+    bytes32 salt,
+    uint256[] memory extensions
+  ) {
+    return (
+      bytes1(0x0F),
+      EIP712_NAME,
+      EIP712_VERSION,
+      block.chainid,
+      address(this),
+      bytes32(0),
+      new uint256[](0)
+    );
+  }
+
+  function DOMAIN_SEPARATOR() external view returns (bytes32) {
+    return _domainSeparator;
+  }
+
+  function getDomainSeparator(
+    uint256 eth_chain_id, address verifyingContract
+  ) internal pure returns (bytes32) {
+    return keccak256(abi.encode(
+      EIP712_DOMAIN_TYPE_HASH,
+      EIP712_NAME_HASH,
+      EIP712_VERSION_HASH,
+      eth_chain_id,
+      verifyingContract
+    ));
+  }
+
+  function getRegisterGuardianDigest(
+    uint32 thresholdKeyIndex, uint32 expirationTime, bytes32 guardianId
+  ) public view returns (bytes32) {
+    bytes32 idHash = keccak256(abi.encode(
+      REGISTER_TYPE_HASH,
+      thresholdKeyIndex,
+      expirationTime,
+      guardianId
+    ));
+
+    return keccak256(abi.encodePacked("\x19\x01", _domainSeparator, idHash));
+  }
+}