External interop poc

.github/workflows/abi_bindings_checker.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Install solc
         run: |
           source ./scripts/versions.sh
-          wget https://github.com/ethereum/solidity/releases/download/v$SOLIDITY_VERSION/solc-static-linux
+          wget https://github.com/ethereum/solidity/releases/download/v$AVALANCHE_SOLIDITY_VERSION/solc-static-linux
           chmod +x solc-static-linux
           sudo mv solc-static-linux /usr/local/bin/solc
 

.gitmodules

@@ -1,10 +1,13 @@
-[submodule "lib/forge-std"]
+[submodule "avalanche/lib/forge-std"]
 	branch = v1
-	path = lib/forge-std
+	path = avalanche/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "lib/openzeppelin-contracts-upgradeable"]
-	path = lib/openzeppelin-contracts-upgradeable
+[submodule "avalanche/lib/openzeppelin-contracts-upgradeable"]
+	path = avalanche/lib/openzeppelin-contracts-upgradeable
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
-[submodule "lib/subnet-evm"]
-	path = lib/subnet-evm
+[submodule "avalanche/lib/subnet-evm"]
+	path = avalanche/lib/subnet-evm
 	url = https://github.com/ava-labs/subnet-evm
+[submodule "ethereum/lib/forge-std"]
+	path = ethereum/lib/forge-std
+	url = https://github.com/foundry-rs/forge-std

abi-bindings/go/teleporter/TeleporterMessenger/packing.go

@@ -8,6 +8,7 @@ import (
 	"math/big"
 
 	"github.com/ava-labs/avalanchego/ids"
+	avalancheWarp "github.com/ava-labs/avalanchego/vms/platformvm/warp"
 	"github.com/ava-labs/libevm/common"
 	"github.com/ava-labs/subnet-evm/accounts/abi"
 	"github.com/pkg/errors"
@@ -91,6 +92,17 @@ func PackReceiveCrossChainMessage(messageIndex uint32, relayerRewardAddress comm
 	return abi.Pack("receiveCrossChainMessage", messageIndex, relayerRewardAddress)
 }
 
+// PackReceiveInterChainMessage packs a ReceiveInterChainMessageInput to form
+// a call to the receiveInterChainMessage function
+func PackReceiveInterChainMessage(messagePayload *avalancheWarp.Message, relayerRewardAddress common.Address) ([]byte, error) {
+	abi, err := TeleporterMessengerMetaData.GetAbi()
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get abi")
+	}
+
+	return abi.Pack("receiveInterChainMessage", messagePayload, relayerRewardAddress)
+}
+
 // PackCalculateMessageID packs input to form a call to the calculateMessageID function
 func PackCalculateMessageID(
 	sourceBlockchainID [32]byte,

contracts/teleporter/ITeleporterMessenger.sol → avalanche/contracts/teleporter/ITeleporterMessenger.sol

@@ -3,7 +3,7 @@
 
 // SPDX-License-Identifier: LicenseRef-Ecosystem
 
-pragma solidity 0.8.25;
+pragma solidity ^0.8.25;
 
 // A message receipt identifies the message that was delivered by its nonce,
 // and the address that can redeem the reward for that message.
@@ -26,7 +26,7 @@ struct TeleporterMessageInput {
     bytes message;
 }
 
-// Represents a message sent or received by an implementation of {ITeleporterMessenger}.
+// Represents a cross-chain message sent or received by an implementation of {ITeleporterMessenger}.
 struct TeleporterMessage {
     uint256 messageNonce;
     address originSenderAddress;
@@ -46,6 +46,27 @@ struct TeleporterFeeInfo {
     uint256 amount;
 }
 
+
+struct ICMSignature {
+    bytes signers;
+    bytes signature;
+}
+
+
+struct ICMUnsignedMessage {
+    uint32 avalancheNetworkID;
+    bytes32 avalancheSourceBlockchainID;
+    bytes payload;
+}
+
+/// A signed ICM message which carries a Teleporter message
+struct ICMMessage {
+    ICMUnsignedMessage unsignedMessage;
+    bytes unsignedMessageBytes;
+    ICMSignature signature;
+}
+
+
 /**
  * @dev Interface that describes functionalities for a cross-chain messenger implementing the Teleporter protcol.
  *
@@ -125,6 +146,7 @@ interface ITeleporterMessenger {
         TeleporterMessageInput calldata messageInput
     ) external returns (bytes32);
 
+
     /**
      * @notice Called by transactions to retry the sending of a cross-chain message.
      *
@@ -160,6 +182,12 @@ interface ITeleporterMessenger {
      */
     function receiveCrossChainMessage(uint32 messageIndex, address relayerRewardAddress) external;
 
+    /**
+     * @notice Receives an inter-chain message, and marks the `relayerRewardAddress` for fee reward for a successful delivery.
+     *
+     */
+    function receiveInterChainMessage(ICMMessage calldata icmMessage, address relayerRewardAddress) external;
+
     /**
      * @notice Retries the execution of a previously delivered message by verifying the payload matches
      * the hash of the payload originally delivered, and calling the destination address again.
@@ -187,7 +215,7 @@ interface ITeleporterMessenger {
         bytes32[] calldata messageIDs,
         TeleporterFeeInfo calldata feeInfo,
         address[] calldata allowedRelayerAddresses
-    ) external returns (bytes32);
+    ) external returns (bytes32); /**
 
     /**
      * @notice Sends any fee amount rewards for the given fee asset out to the caller.

avalanche/contracts/teleporter/IWarpExt.sol

@@ -0,0 +1,27 @@
+// (c) 2025, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+
+// SPDX-License-Identifier: LicenseRef-Ecosystem
+
+pragma solidity ^0.8.25;
+
+import {
+    WarpMessage,
+    IWarpMessenger
+} from "@avalabs/[email protected]/contracts/interfaces/IWarpMessenger.sol";
+import {ICMMessage} from "./ITeleporterMessenger.sol";
+
+/**
+ * @dev Interface that allows adapting the Warp interface. This is necessary for external interoperability
+ * since external chains do not receive Warp messages in their access lists.
+ */
+interface IWarpExt is IWarpMessenger {
+    /**
+     * @notice Depending on the chain this contract is deployed on, dispatch logic for
+     * getting the actual verified Warp message.
+     * @return message A verified Warp message.
+     */
+    function getVerifiedICMMessage(
+        ICMMessage calldata icmMessag3
+    ) external view returns (WarpMessage memory message);
+}

avalanche/contracts/teleporter/NativeWarp.sol

@@ -0,0 +1,47 @@
+// (c) 2025, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+
+// SPDX-License-Identifier: LicenseRef-Ecosystem
+
+pragma solidity 0.8.25;
+
+import {
+    WarpMessage,
+    WarpBlockHash,
+    IWarpMessenger
+} from "@avalabs/[email protected]/contracts/interfaces/IWarpMessenger.sol";
+import {ICMMessage} from "./ITeleporterMessenger.sol";
+import {IWarpExt} from "./IWarpExt.sol";
+
+contract WarpNative is IWarpExt {
+    /**
+     * @notice Warp precompile used for sending and receiving Warp messages.
+     */
+    IWarpMessenger public constant WARP_MESSENGER =
+        IWarpMessenger(0x0200000000000000000000000000000000000005);
+
+    function getVerifiedICMMessage(
+        ICMMessage calldata icmMessage
+    ) external view returns (WarpMessage memory message) {
+        revert("Todo");
+    }
+
+    function getVerifiedWarpMessage(uint32 index) external view returns (WarpMessage memory message, bool valid) {
+        return WARP_MESSENGER.getVerifiedWarpMessage(index);
+    }
+
+    function sendWarpMessage(bytes calldata payload) external returns (bytes32 messageID) {
+        return WARP_MESSENGER.sendWarpMessage(payload);
+    }
+
+    function getVerifiedWarpBlockHash(
+        uint32 index
+    ) external view returns (WarpBlockHash memory warpBlockHash, bool valid) {
+        return WARP_MESSENGER.getVerifiedWarpBlockHash(index);
+    }
+
+    function getBlockchainID() external view returns (bytes32 blockchainID) {
+        return WARP_MESSENGER.getBlockchainID();
+    }
+
+}