From ece8db186b78ea118b557b29427c976bd8dff171 Mon Sep 17 00:00:00 2001 From: Chrysostomos Nanakos Date: Thu, 8 Jan 2026 16:17:07 +0200 Subject: [PATCH] refactor!: remove unused dependencies Signed-off-by: Chrysostomos Nanakos --- .gitmodules | 18 ------------------ Makefile | 8 ++++---- build.nims | 3 +-- codex/utils/json.nim | 4 ---- vendor/logos-storage-contracts-eth | 1 - vendor/logos-storage-proofs-circuits | 1 - vendor/nim-circom-compat | 1 - vendor/nim-leopard | 1 - 8 files changed, 5 insertions(+), 32 deletions(-) delete mode 160000 vendor/logos-storage-contracts-eth delete mode 160000 vendor/logos-storage-proofs-circuits delete mode 160000 vendor/nim-circom-compat delete mode 160000 vendor/nim-leopard diff --git a/.gitmodules b/.gitmodules index e5beeb1e..7b0d8fc9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -156,9 +156,6 @@ url = https://github.com/status-im/nim-taskpools.git ignore = untracked branch = stable -[submodule "vendor/nim-leopard"] - path = vendor/nim-leopard - url = https://github.com/status-im/nim-leopard.git [submodule "vendor/logos-storage-nim-dht"] path = vendor/logos-storage-nim-dht url = https://github.com/logos-storage/logos-storage-nim-dht.git @@ -173,11 +170,6 @@ [submodule "vendor/nim-eth"] path = vendor/nim-eth url = https://github.com/status-im/nim-eth -[submodule "vendor/logos-storage-contracts-eth"] - path = vendor/logos-storage-contracts-eth - url = https://github.com/logos-storage/logos-storage-contracts-eth.git - ignore = untracked - branch = master [submodule "vendor/nim-protobuf-serialization"] path = vendor/nim-protobuf-serialization url = https://github.com/status-im/nim-protobuf-serialization @@ -198,16 +190,6 @@ [submodule "vendor/constantine"] path = vendor/constantine url = https://github.com/mratsim/constantine.git -[submodule "vendor/nim-circom-compat"] - path = vendor/nim-circom-compat - url = https://github.com/logos-storage/nim-circom-compat.git - ignore = untracked - branch = master -[submodule "vendor/logos-storage-proofs-circuits"] - path = vendor/logos-storage-proofs-circuits - url = https://github.com/logos-storage/logos-storage-proofs-circuits.git - ignore = untracked - branch = master [submodule "vendor/nim-serde"] path = vendor/nim-serde url = https://github.com/logos-storage/nim-serde.git diff --git a/Makefile b/Makefile index 380814a4..b5becc2e 100644 --- a/Makefile +++ b/Makefile @@ -240,15 +240,15 @@ libstorage: ifeq ($(STATIC), 1) echo -e $(BUILD_MSG) "build/$@.a" && \ - $(ENV_SCRIPT) nim libstorageStatic $(NIM_PARAMS) -d:LeopardCmakeFlags="\"-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release\"" codex.nims + $(ENV_SCRIPT) nim libstorageStatic $(NIM_PARAMS) -DCMAKE_BUILD_TYPE=Release\"" codex.nims else ifeq ($(detected_OS),Windows) echo -e $(BUILD_MSG) "build/$@.dll" && \ - $(ENV_SCRIPT) nim libstorageDynamic $(NIM_PARAMS) -d:LeopardCmakeFlags="\"-G \\\"MSYS Makefiles\\\" -DCMAKE_BUILD_TYPE=Release\"" codex.nims + $(ENV_SCRIPT) nim libstorageDynamic $(NIM_PARAMS) \\\"MSYS Makefiles\\\" -DCMAKE_BUILD_TYPE=Release\"" codex.nims else ifeq ($(detected_OS),macOS) echo -e $(BUILD_MSG) "build/$@.dylib" && \ - $(ENV_SCRIPT) nim libstorageDynamic $(NIM_PARAMS) -d:LeopardCmakeFlags="\"-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release\"" codex.nims + $(ENV_SCRIPT) nim libstorageDynamic $(NIM_PARAMS) -DCMAKE_BUILD_TYPE=Release\"" codex.nims else echo -e $(BUILD_MSG) "build/$@.so" && \ - $(ENV_SCRIPT) nim libstorageDynamic $(NIM_PARAMS) -d:LeopardCmakeFlags="\"-DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release\"" codex.nims + $(ENV_SCRIPT) nim libstorageDynamic $(NIM_PARAMS) -DCMAKE_BUILD_TYPE=Release\"" codex.nims endif endif # "variables.mk" was not included diff --git a/build.nims b/build.nims index a8e35405..8db548cf 100644 --- a/build.nims +++ b/build.nims @@ -37,13 +37,12 @@ proc buildLibrary(name: string, srcDir = "./", params = "", `type` = "dynamic") exec "nim c" & " --out:build/" & lib_name & " --threads:on --app:lib --opt:size --noMain --mm:refc --header --d:metrics " & "--nimMainPrefix:libstorage -d:noSignalHandler " & - "-d:LeopardExtraCompilerFlags=-fPIC " & "-d:chronicles_runtime_filtering " & + "-d:chronicles_runtime_filtering " & "-d:chronicles_log_level=TRACE " & params & " " & srcDir & name & ".nim" else: exec "nim c" & " --out:build/" & name & ".a --threads:on --app:staticlib --opt:size --noMain --mm:refc --header --d:metrics " & "--nimMainPrefix:libstorage -d:noSignalHandler " & - "-d:LeopardExtraCompilerFlags=-fPIC " & "-d:chronicles_runtime_filtering " & "-d:chronicles_log_level=TRACE " & params & " " & srcDir & name & ".nim" diff --git a/codex/utils/json.nim b/codex/utils/json.nim index 5bd16846..a4aa3012 100644 --- a/codex/utils/json.nim +++ b/codex/utils/json.nim @@ -1,6 +1,5 @@ import std/options import std/typetraits -from pkg/ethers import Address from pkg/libp2p import Cid, PeerId, SignedPeerRecord, MultiAddress, AddressInfo, init, `$` import pkg/contractabi @@ -32,6 +31,3 @@ func `%`*(obj: AddressInfo): JsonNode = func `%`*(obj: MultiAddress): JsonNode = % $obj - -func `%`*(address: ethers.Address): JsonNode = - % $address diff --git a/vendor/logos-storage-contracts-eth b/vendor/logos-storage-contracts-eth deleted file mode 160000 index e159ceee..00000000 --- a/vendor/logos-storage-contracts-eth +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e159ceee44e91f216533a16e9f14cfd91dee0e02 diff --git a/vendor/logos-storage-proofs-circuits b/vendor/logos-storage-proofs-circuits deleted file mode 160000 index 82de3564..00000000 --- a/vendor/logos-storage-proofs-circuits +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 82de35640d2b05557143354c9a0f28ff81cd5fec diff --git a/vendor/nim-circom-compat b/vendor/nim-circom-compat deleted file mode 160000 index a5d6f766..00000000 --- a/vendor/nim-circom-compat +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a5d6f76654616ed981beb1104997f519ca79c7ed diff --git a/vendor/nim-leopard b/vendor/nim-leopard deleted file mode 160000 index 0478b12d..00000000 --- a/vendor/nim-leopard +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0478b12df90cbbe531efa69422cff67b5a3a5d93