switch to npm dependency for solidity-merkle-trees

polytope-labs · Jul 22, 2024 · 728f725 · 728f725
1 parent 57e1627
commit 728f725
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "lib/solidity-merkle-trees"]
-	path = lib/solidity-merkle-trees
-	url = https://github.com/polytope-labs/solidity-merkle-trees
 [submodule "lib/openzeppelin-contracts"]
 	path = lib/openzeppelin-contracts
 	url = https://github.com/openzeppelin/openzeppelin-contracts

diff --git a/lib/solidity-merkle-trees b/lib/solidity-merkle-trees
diff --git a/package.json b/package.json
@@ -28,6 +28,7 @@
     "bridges"
   ],
   "dependencies": {
+    "@polytope-labs/solidity-merkle-trees": "^0.2.1",
     "prettier": "^3.3.3",
     "prettier-plugin-solidity": "^1.3.1"
   }

diff --git a/remappings.txt b/remappings.txt
@@ -1,2 +1,2 @@
 openzeppelin/=lib/openzeppelin-contracts/contracts/
-solidity-merkle-trees/=lib/solidity-merkle-trees/src/
+solidity-merkle-trees/=node_modules/@polytope-labs/solidity-merkle-trees/src/
diff --git a/yarn.lock b/yarn.lock
@@ -2,6 +2,11 @@
 # yarn lockfile v1
 
 
+"@polytope-labs/solidity-merkle-trees@^0.2.1":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@polytope-labs/solidity-merkle-trees/-/solidity-merkle-trees-0.2.1.tgz#7c3399c071ee246df92f37b8cebc9f545a915917"
+  integrity sha512-aoJbZXWgIDgvwWEXQL3cEqFAXdTzaOxo3r373LMOtm8W/v9RnRNVW/gplWQGVZs+tvdwGP9Sp6ToKknIIPwQ5g==
+
 "@solidity-parser/parser@^0.17.0":
   version "0.17.0"
   resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.17.0.tgz#52a2fcc97ff609f72011014e4c5b485ec52243ef"