From 6413090071ebdba97be429e9cbc0852d1ef9c193 Mon Sep 17 00:00:00 2001 From: Hussein Ait Lahcen Date: Tue, 10 Dec 2024 11:57:27 +0100 Subject: [PATCH] chore: remove no longer required bls-eth-go/blst this library was used for our custom bls12 precompile that we ditched to reuse the cosmwasm bls12 precompile from v2.0+ --- flake.lock | 94 +-------------------------------------- flake.nix | 23 ---------- tools/libblst/libblst.nix | 71 ----------------------------- typos.toml | 1 - uniond/uniond.nix | 27 +---------- 5 files changed, 3 insertions(+), 213 deletions(-) delete mode 100644 tools/libblst/libblst.nix diff --git a/flake.lock b/flake.lock index 8c67f3f235..6acd73eb00 100644 --- a/flake.lock +++ b/flake.lock @@ -23,42 +23,6 @@ "type": "github" } }, - "bls-eth-go": { - "flake": false, - "locked": { - "lastModified": 1704351134, - "narHash": "sha256-PpBs308170CHZt809QIdyy93D5x+5WTL7hlPytJrpXM=", - "ref": "refs/tags/v1.33.0", - "rev": "eb66a90ff51d7c982d668d6942e89815a8f7e323", - "revCount": 335, - "submodules": true, - "type": "git", - "url": "https://github.com/herumi/bls-eth-go-binary" - }, - "original": { - "ref": "refs/tags/v1.33.0", - "submodules": true, - "type": "git", - "url": "https://github.com/herumi/bls-eth-go-binary" - } - }, - "blst": { - "flake": false, - "locked": { - "lastModified": 1691598027, - "narHash": "sha256-oqljy+ZXJAXEB/fJtmB8rlAr4UXM+Z2OkDa20gpILNA=", - "owner": "supranational", - "repo": "blst", - "rev": "3dd0f804b1819e5d03fb22ca2e6fac105932043a", - "type": "github" - }, - "original": { - "owner": "supranational", - "repo": "blst", - "rev": "3dd0f804b1819e5d03fb22ca2e6fac105932043a", - "type": "github" - } - }, "cometbls": { "flake": false, "locked": { @@ -584,8 +548,6 @@ "root": { "inputs": { "arion": "arion", - "bls-eth-go": "bls-eth-go", - "blst": "blst", "cometbls": "cometbls", "cosmosproto": "cosmosproto", "cosmossdk": "cosmossdk", @@ -621,11 +583,8 @@ "v0_25_0": "v0_25_0", "wasmd": "wasmd", "wasmvm": "wasmvm", - "wasmvm-1_5_0": "wasmvm-1_5_0", - "wasmvm-2_0_0": "wasmvm-2_0_0", "wasmvm-2_1_2": "wasmvm-2_1_2", - "wasmvm-2_1_3": "wasmvm-2_1_3", - "wasmvm-2_2_0": "wasmvm-2_2_0" + "wasmvm-2_1_3": "wasmvm-2_1_3" } }, "rust-overlay": { @@ -853,40 +812,6 @@ "type": "github" } }, - "wasmvm-1_5_0": { - "flake": false, - "locked": { - "lastModified": 1698746477, - "narHash": "sha256-l0cNF0YjviEl/JLJ4VdvDtIGuAYyFfncVo83ROfQFD8=", - "owner": "CosmWasm", - "repo": "wasmvm", - "rev": "2041b184c146f278157d195361bc6cc6b56cc9d4", - "type": "github" - }, - "original": { - "owner": "CosmWasm", - "ref": "v1.5.0", - "repo": "wasmvm", - "type": "github" - } - }, - "wasmvm-2_0_0": { - "flake": false, - "locked": { - "lastModified": 1710250586, - "narHash": "sha256-OmETCXyhCXWOEW/emf1ZruLMPlH8iLvM8xrqFoDaxnw=", - "owner": "CosmWasm", - "repo": "wasmvm", - "rev": "5307690b77a5fef2da3747ec72abe8f29664aeca", - "type": "github" - }, - "original": { - "owner": "CosmWasm", - "ref": "v2.0.0", - "repo": "wasmvm", - "type": "github" - } - }, "wasmvm-2_1_2": { "flake": false, "locked": { @@ -920,23 +845,6 @@ "repo": "wasmvm", "type": "github" } - }, - "wasmvm-2_2_0": { - "flake": false, - "locked": { - "lastModified": 1729869383, - "narHash": "sha256-dXLpgzsRw6j0foLAtzXc4apCWc4t9P0i+cuSdoZ5Gnk=", - "owner": "CosmWasm", - "repo": "wasmvm", - "rev": "2b79acde904d975904c2674fef3b30ac011bcf30", - "type": "github" - }, - "original": { - "owner": "CosmWasm", - "ref": "v2.2.0-rc.2", - "repo": "wasmvm", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 0d4fc6f382..df7bb2f2b6 100644 --- a/flake.nix +++ b/flake.nix @@ -43,16 +43,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # Prysm bls12-381 native for eth LC aggregate/verify custom query - blst = { - url = "github:supranational/blst?rev=3dd0f804b1819e5d03fb22ca2e6fac105932043a"; - flake = false; - }; - bls-eth-go = { - url = "git+https://github.com/herumi/bls-eth-go-binary?ref=refs/tags/v1.33.0&submodules=1"; - flake = false; - }; - ibc-go = { url = "github:unionlabs/ibc-go-union?rev=bfabb646cf7384bd33ee672f51a0e1325f545c10"; flake = false; @@ -83,14 +73,6 @@ url = "github:CosmWasm/wasmvm/v1.5.4"; flake = false; }; - wasmvm-1_5_0 = { - url = "github:CosmWasm/wasmvm/v1.5.0"; - flake = false; - }; - wasmvm-2_0_0 = { - url = "github:CosmWasm/wasmvm/v2.0.0"; - flake = false; - }; wasmvm-2_1_2 = { url = "github:CosmWasm/wasmvm/v2.1.2"; flake = false; @@ -99,10 +81,6 @@ url = "github:CosmWasm/wasmvm/v2.1.3"; flake = false; }; - wasmvm-2_2_0 = { - url = "github:CosmWasm/wasmvm/v2.2.0-rc.2"; - flake = false; - }; stargaze = { url = "git+https://github.com/public-awesome/stargaze?ref=main&submodules=1"; flake = false; @@ -249,7 +227,6 @@ ./tools/tools.nix ./tools/wasm-light-client.nix ./tools/libwasmvm/libwasmvm.nix - ./tools/libblst/libblst.nix ./tools/tidy/tidy.nix ./tools/rust/rust.nix ./tools/rust/crane.nix diff --git a/tools/libblst/libblst.nix b/tools/libblst/libblst.nix deleted file mode 100644 index 42fd681282..0000000000 --- a/tools/libblst/libblst.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ inputs, ... }: -{ - perSystem = - { pkgs, ... }: - let - enableShared = !pkgs.stdenv.hostPlatform.isStatic; - in - with pkgs; - { - packages.libblst = stdenv.mkDerivation rec { - pname = "blst"; - version = inputs.blst.shortRev; - src = inputs.blst; - buildPhase = - '' - ./build.sh - '' - + lib.optionalString enableShared '' - ./build.sh -shared - ''; - installPhase = '' - mkdir -p $out/{lib,include} - for lib in libblst.{a,so,dylib}; do - if [ -f $lib ]; then - cp $lib $out/lib/ - fi - done - cp bindings/{blst.h,blst_aux.h} $out/include - - for lib in blst.dll; do - if [ -f $lib ]; then - mkdir -p $out/bin - cp $lib $out/bin/ - fi - done - - mkdir -p $out/lib/pkgconfig - cat < $out/lib/pkgconfig/libblst.pc - prefix=$out - exec_prefix=\''${prefix} - libdir=\''${exec_prefix}/lib - includedir=\''${prefix}/include - - Name: libblst - Description: ${meta.description} - URL: ${meta.homepage} - Version: ${version} - - Cflags: -I\''${includedir} - Libs: -L\''${libdir} -lblst - Libs.private: - EOF - ''; - # ensure we have the right install id set. Otherwise the library - # wouldn't be found during install. The alternative would be to work - # lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libblst.dylib"; - # into the setup.sh - postFixup = lib.optionalString (stdenv.isDarwin && enableShared) '' - install_name_tool -id $out/lib/libblst.dylib $out/lib/libblst.dylib - ''; - enableParallelBuilding = true; - doCheck = true; - meta = with lib; { - description = "Multilingual BLS12-381 signature library"; - homepage = "https://github.com/supranational/blst"; - license = licenses.isc; - platforms = platforms.all; - }; - }; - }; -} diff --git a/typos.toml b/typos.toml index 7cdebfe909..f6de84b722 100644 --- a/typos.toml +++ b/typos.toml @@ -862,7 +862,6 @@ files.extend-exclude = [ "legendres" = "legendres" "legos" = "legos" "lerp" = "lerp" -"libblst" = "libblst" "libc" = "libc" "libclang" = "libclang" "libcxx" = "libcxx" diff --git a/uniond/uniond.nix b/uniond/uniond.nix index 43d91c08c6..10bb3c222a 100644 --- a/uniond/uniond.nix +++ b/uniond/uniond.nix @@ -1,5 +1,4 @@ -{ inputs, ... }: -{ +_: { perSystem = { pkgs, @@ -16,8 +15,7 @@ }: let libwasmvm = self'.packages.libwasmvm-2_1_3; - CGO_CFLAGS = "-I${self'.packages.libblst}/include -I${self'.packages.libblst.src}/src -I${self'.packages.libblst.src}/build -I${self'.packages.bls-eth.src}/bls/include -O"; - CGO_LDFLAGS = "-z noexecstack -static -L${goPkgs.musl}/lib -L${libwasmvm}/lib -L${self'.packages.bls-eth}/lib -s -w"; + CGO_LDFLAGS = "-z noexecstack -static -L${goPkgs.musl}/lib -L${libwasmvm}/lib -s -w"; mkUniondImage = uniond: @@ -42,26 +40,6 @@ in { packages = { - bls-eth = - let - isAarch64 = (builtins.head (pkgs.lib.splitString "-" system)) == "aarch64"; - in - pkgs.pkgsStatic.stdenv.mkDerivation { - pname = "bls-eth"; - version = inputs.bls-eth-go.shortRev; - src = inputs.bls-eth-go; - nativeBuildInputs = [ - pkgs.pkgsStatic.nasm - ] ++ (pkgs.lib.optionals isAarch64 [ pkgs.llvmPackages_9.libcxxClang ]); - installPhase = '' - mkdir -p $out/lib - ls -al bls/lib/linux/ - mv bls/lib/linux/${if isAarch64 then "arm64" else "amd64"}/*.a $out/lib - ''; - enableParallelBuilding = true; - doCheck = true; - }; - # Statically link on Linux using `pkgsStatic`, dynamically link on Darwin using normal `pkgs`. uniond = (if pkgs.stdenv.isLinux then goPkgs.pkgsStatic.buildGo123Module else goPkgs.buildGo123Module) @@ -83,7 +61,6 @@ // ( if pkgs.stdenv.isLinux then { - inherit CGO_CFLAGS; inherit CGO_LDFLAGS; nativeBuildInputs = [ goPkgs.musl ]; ldflags = [