make contract sizes smaller

interfaces/IConsensusClient.sol

@@ -1,6 +1,9 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.17;
 
+import {StateMachineHeight} from "./Message.sol";
+
+
 // The state commiment identifies a commiment to some intermediate state in the state machine.
 // This contains some metadata about the state machine like it's own timestamp at the time of this commitment.
 struct StateCommitment {
@@ -12,15 +15,6 @@ struct StateCommitment {
 	bytes32 stateRoot;
 }
 
-// Identifies some state machine height. We allow for a state machine identifier here
-// as some consensus clients may track multiple, concurrent state machines.
-struct StateMachineHeight {
-	// the state machine identifier
-	uint256 stateMachineId;
-	// height of this state machine
-	uint256 height;
-}
-
 // An intermediate state in the series of state transitions undergone by a given state machine.
 struct IntermediateState {
 	// the state machine identifier

interfaces/IHandler.sol

@@ -2,7 +2,14 @@
 pragma solidity ^0.8.17;
 
 import {IIsmpHost} from "./IIsmpHost.sol";
-import {PostRequestMessage, PostResponseMessage, GetResponseMessage, PostRequestTimeoutMessage, PostResponseTimeoutMessage, GetTimeoutMessage} from "./Message.sol";
+import {
+	PostRequestMessage,
+	PostResponseMessage,
+	GetResponseMessage,
+	PostRequestTimeoutMessage,
+	PostResponseTimeoutMessage,
+	GetTimeoutMessage
+} from "./Message.sol";
 
 /*
  * @title The Ismp Handler

interfaces/IIsmpModule.sol

@@ -2,10 +2,8 @@
 pragma solidity ^0.8.17;
 
 import {PostRequest, PostResponse, GetResponse, GetRequest} from "./Message.sol";
-import {DispatchPost, DispatchPostResponse, DispatchGet} from "./IDispatcher.sol";
-import {IIsmpHost} from "./IIsmpHost.sol";
+import {DispatchPost, DispatchPostResponse, DispatchGet, IDispatcher} from "./IDispatcher.sol";
 
-import {Context} from "@openzeppelin/contracts/utils/Context.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 struct IncomingPostRequest {
@@ -85,7 +83,7 @@ abstract contract BaseIsmpModule is IIsmpModule {
 		address hostAddr = host();
 		if (hostAddr != address(0)) {
 			// approve the host infintely
-			IERC20(IIsmpHost(hostAddr).feeToken()).approve(hostAddr, type(uint256).max);
+			IERC20(IDispatcher(hostAddr).feeToken()).approve(hostAddr, type(uint256).max);
 		}
 	}
 
@@ -123,17 +121,17 @@ abstract contract BaseIsmpModule is IIsmpModule {
 
 	// @dev returns the quoted fee for a dispatch
 	function quote(DispatchPost memory post) public view returns (uint256) {
-		return post.fee + (post.body.length * IIsmpHost(host()).perByteFee());
+		return post.fee + (post.body.length * IDispatcher(host()).perByteFee());
 	}
 
 	// @dev returns the quoted fee for a dispatch
 	function quote(DispatchPostResponse memory res) public view returns (uint256) {
-		return res.fee + (res.response.length * IIsmpHost(host()).perByteFee());
+		return res.fee + (res.response.length * IDispatcher(host()).perByteFee());
 	}
 
 	// @dev returns the quoted fee for a dispatch
 	function quote(DispatchGet memory get) public view returns (uint256) {
-		return get.fee + (get.context.length * IIsmpHost(host()).perByteFee());
+		return get.fee + (get.context.length * IDispatcher(host()).perByteFee());
 	}
 
 	function onAccept(IncomingPostRequest calldata) external virtual onlyHost {

interfaces/Message.sol

@@ -1,9 +1,17 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.17;
 
-import {StateMachineHeight} from "./IConsensusClient.sol";
 import {StorageValue} from "@polytope-labs/solidity-merkle-trees/src/Types.sol";
 
+// Identifies some state machine height. We allow for a state machine identifier here
+// as some consensus clients may track multiple, concurrent state machines.
+struct StateMachineHeight {
+	// the state machine identifier
+	uint256 stateMachineId;
+	// height of this state machine
+	uint256 height;
+}
+
 struct PostRequest {
 	// the source state machine of this request
 	bytes source;

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@polytope-labs/ismp-solidity",
-	"version": "0.6.9",
+	"version": "0.7.0",
 	"description": "Hyperbridge Solidity SDK for the Interoperable state machine protocol",
 	"author": "Polytope Labs <[email protected]>",
 	"license": "Apache-2.0",