Switch to npm for dependencies

.gitmodules

@@ -1,8 +1,3 @@
-[submodule "lib/openzeppelin-contracts"]
-	path = lib/openzeppelin-contracts
-	url = https://github.com/openzeppelin/openzeppelin-contracts
-	branch = master
-
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = [email protected]:foundry-rs/forge-std

README.md

@@ -4,13 +4,13 @@
 
 ## Interface
 
- - [`IIsmpHost`](src/IIsmpHost.sol) The ISMP Host interface
- - [`IDispatcher`](src/IDispatcher.sol) The ISMP Dispatcher interface
- - [`IHandler`](src/IHandler.sol) The ISMP Handler interface
- - [`IConsensusClient`](src/IConsensusClient.sol) The ConsensusClient interface
- - [`IIsmpModule`](src/IIsmpModule.sol) The ISMP Module interface
- - [`StateMachine`](src/StateMachine.sol) The State machine definitions
- - [`Message`](src/Message.sol) The protocol message types
+ - [`IIsmpHost`](interfaces/IIsmpHost.sol) The ISMP Host interface
+ - [`IDispatcher`](interfaces/IDispatcher.sol) The ISMP Dispatcher interface
+ - [`IHandler`](interfaces/IHandler.sol) The ISMP Handler interface
+ - [`IConsensusClient`](interfaces/IConsensusClient.sol) The ConsensusClient interface
+ - [`IIsmpModule`](interfaces/IIsmpModule.sol) The ISMP Module interface
+ - [`StateMachine`](interfaces/StateMachine.sol) The State machine definitions
+ - [`Message`](interfaces/Message.sol) The protocol message types
 
 
 ## License

src/IIsmpHost.sol → interfaces/IIsmpHost.sol

@@ -86,7 +86,9 @@ interface IIsmpHost is IDispatcher {
 	 * @notice collects the state commitment fee in the native tokens
 	 * @return the state commitment at `height`
 	 */
-	function stateCommitmentWithNative(StateMachineHeight memory height) external payable returns (StateCommitment memory);
+	function stateCommitmentWithNative(
+		StateMachineHeight memory height
+	) external payable returns (StateCommitment memory);
 
 	/**
 	 * @param height - state machine height

package.json

@@ -1,35 +1,36 @@
 {
-  "name": "@polytope-labs/ismp-solidity",
-  "version": "0.1.0",
-  "description": "Hyperbridge Solidity SDK for the Interoperable state machine protocol",
-  "author": "Polytope Labs <[email protected]>",
-  "license": "Apache-2.0",
-  "bugs": {
-    "url": "https://github.com/polytope-labs/ismp-solidity/issues"
-  },
-  "homepage": "https://github.com/polytope-labs/ismp-solidity#readme",
-  "directories": {
-    "lib": "src"
-  },
-  "files": [
-    "./src/**/*.sol"
-  ],
-  "scripts": {},
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/polytope-labs/ismp-solidity.git"
-  },
-  "keywords": [
-    "hyperbridge",
-    "ethereum",
-    "polkadot",
-    "interoperability",
-    "cross-chain",
-    "bridges"
-  ],
-  "dependencies": {
-    "@polytope-labs/solidity-merkle-trees": "^0.2.2",
-    "prettier": "^3.3.3",
-    "prettier-plugin-solidity": "^1.3.1"
-  }
+	"name": "@polytope-labs/ismp-solidity",
+	"version": "0.2.0",
+	"description": "Hyperbridge Solidity SDK for the Interoperable state machine protocol",
+	"author": "Polytope Labs <[email protected]>",
+	"license": "Apache-2.0",
+	"bugs": {
+		"url": "https://github.com/polytope-labs/ismp-solidity/issues"
+	},
+	"homepage": "https://github.com/polytope-labs/ismp-solidity#readme",
+	"directories": {
+		"lib": "src"
+	},
+	"files": [
+		"./src/**/*.sol"
+	],
+	"scripts": {},
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/polytope-labs/ismp-solidity.git"
+	},
+	"keywords": [
+		"hyperbridge",
+		"ethereum",
+		"polkadot",
+		"interoperability",
+		"cross-chain",
+		"bridges"
+	],
+	"dependencies": {
+		"@polytope-labs/solidity-merkle-trees": "^0.2.3",
+		"openzeppelin-solidity": "^4.8.1",
+		"prettier": "^3.3.3",
+		"prettier-plugin-solidity": "^1.3.1"
+	}
 }

remappings.txt

@@ -1,2 +1,2 @@
-openzeppelin/=lib/openzeppelin-contracts/contracts/
+openzeppelin/=node_modules/openzeppelin-solidity/contracts/
 @polytope-labs/solidity-merkle-trees/=node_modules/@polytope-labs/solidity-merkle-trees/src/

yarn.lock

@@ -2,16 +2,23 @@
 # yarn lockfile v1
 
 
-"@polytope-labs/solidity-merkle-trees@^0.2.2":
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/@polytope-labs/solidity-merkle-trees/-/solidity-merkle-trees-0.2.2.tgz#83c3f6ae1bf8d25beb381b34efc1c8de7c45a9fb"
-  integrity sha512-KVuFU5rjAvhIw4QpimbYDlHe8/w0H4eu1uRKQ18ScUs52WCao+niVK22zko25XHPhpmr1eKILoyfObr/DmLPXg==
+"@polytope-labs/solidity-merkle-trees@^0.2.3":
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/@polytope-labs/solidity-merkle-trees/-/solidity-merkle-trees-0.2.3.tgz#d8346c14190cf41574c20a34b333e26465932622"
+  integrity sha512-aUcUjVNX0CXJNk7pS0jpqbfhi3w9VUI21/3IyTOblw0iAmctkUGq5TDwQBR7zXZnuTxpXbBPPEuXW1uhI2BHDA==
+  dependencies:
+    openzeppelin-solidity "^4.8.1"
 
 "@solidity-parser/parser@^0.17.0":
   version "0.17.0"
   resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.17.0.tgz#52a2fcc97ff609f72011014e4c5b485ec52243ef"
   integrity sha512-Nko8R0/kUo391jsEHHxrGM07QFdnPGvlmox4rmH0kNiNAashItAilhy4Mv4pK5gQmW5f4sXAF58fwJbmlkGcVw==
 
+openzeppelin-solidity@^4.8.1:
+  version "4.8.1"
+  resolved "https://registry.yarnpkg.com/openzeppelin-solidity/-/openzeppelin-solidity-4.8.1.tgz#2ab492a5a53a5520401e94df36e43807de7a3b50"
+  integrity sha512-KM0pVpfrCBdifqN2ZeJZFvFuoGz3GmI4Ty/ceKNkcaf7VVWo/rLOfc5EiLh+Ukb5NadNmYo8WMeGhFA8hVWDpg==
+
 prettier-plugin-solidity@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/prettier-plugin-solidity/-/prettier-plugin-solidity-1.3.1.tgz#59944d3155b249f7f234dee29f433524b9a4abcf"