From 8c5c967715df45e7d600a4caaf08c98418cf0481 Mon Sep 17 00:00:00 2001 From: jangko Date: Tue, 19 Jan 2021 09:24:39 +0700 Subject: [PATCH] bump submodules --- .github/workflows/ci.yml | 6 +++++- Makefile | 4 ++++ nimbus/vm/blscurve.nim | 4 ++-- vendor/news | 2 +- vendor/nim-bearssl | 2 +- vendor/nim-blscurve | 2 +- vendor/nim-chronicles | 2 +- vendor/nim-chronos | 2 +- vendor/nim-confutils | 2 +- vendor/nim-eth | 2 +- vendor/nim-faststreams | 2 +- vendor/nim-json-rpc | 2 +- vendor/nim-json-serialization | 2 +- vendor/nim-nat-traversal | 2 +- vendor/nim-secp256k1 | 2 +- vendor/nim-serialization | 2 +- vendor/nim-snappy | 2 +- vendor/nim-sqlite3-abi | 2 +- vendor/nim-stew | 2 +- vendor/nim-stint | 2 +- vendor/nimbus-build-system | 2 +- 21 files changed, 29 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 77a5e754b..10101c92f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -218,8 +218,10 @@ jobs: run: | if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then PLATFORM=x64 + USE_MIRACL=0 else PLATFORM=x86 + USE_MIRACL=1 fi NPROC="${{ matrix.target.NPROC }}" MAKEFLAGS="-j${NPROC} USE_SYSTEM_NIM=1 ARCH_OVERRIDE=$PLATFORM" @@ -239,13 +241,15 @@ jobs: if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then PLATFORM=x64 GOARCH=amd64 + USE_MIRACL=0 else PLATFORM=x86 GOARCH=386 + USE_MIRACL=1 fi export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib" NPROC="${{ matrix.target.NPROC }}" - MAKEFLAGS="-j${NPROC} NIMFLAGS="--parallelBuild:${NPROC}" USE_SYSTEM_NIM=1 ARCH_OVERRIDE=$PLATFORM" + MAKEFLAGS="-j${NPROC} NIMFLAGS="--parallelBuild:${NPROC}" USE_SYSTEM_NIM=1 ARCH_OVERRIDE=$PLATFORM USE_MIRACL=$USE_MIRACL" env CC=gcc make $MAKEFLAGS update env CC=gcc make $MAKEFLAGS build/nimbus --help diff --git a/Makefile b/Makefile index bcf3968d0..dadf0df13 100644 --- a/Makefile +++ b/Makefile @@ -64,6 +64,10 @@ else NIM_PARAMS := $(NIM_PARAMS) -d:release endif +ifneq ($(USE_MIRACL), 0) +NIM_PARAMS := $(NIM_PARAMS) -d:BLS_FORCE_BACKEND=miracl +endif + deps: | deps-common nat-libs nimbus.nims ifneq ($(USE_LIBBACKTRACE), 0) deps: | libbacktrace diff --git a/nimbus/vm/blscurve.nim b/nimbus/vm/blscurve.nim index ae5ab5b38..319467641 100644 --- a/nimbus/vm/blscurve.nim +++ b/nimbus/vm/blscurve.nim @@ -1,10 +1,10 @@ import blscurve/bls_backend, stint when BLS_BACKEND == Miracl: - import blscurve/miracl/[common, milagro, hash_to_curve, bls_signature_scheme] + import blscurve/miracl/[common, milagro, hash_to_curve, miracl_min_pubkey_sig_core] import map_to_curve_g1 export common - export bls_signature_scheme.subgroupCheck + export miracl_min_pubkey_sig_core.subgroupCheck type BLS_G1* = ECP_BLS12381 diff --git a/vendor/news b/vendor/news index 852b707b5..1d2ca5b05 160000 --- a/vendor/news +++ b/vendor/news @@ -1 +1 @@ -Subproject commit 852b707b5daa99c380b716c8efe49807b8bfd4f0 +Subproject commit 1d2ca5b059db7591c044d5d2fa5e5cd3e98b21a7 diff --git a/vendor/nim-bearssl b/vendor/nim-bearssl index ba5f46879..eebf730cc 160000 --- a/vendor/nim-bearssl +++ b/vendor/nim-bearssl @@ -1 +1 @@ -Subproject commit ba5f4687987817902c2727e30b35cb5ad1e61203 +Subproject commit eebf730ccda5b5fade2a8f48b3da1496f2c47ba5 diff --git a/vendor/nim-blscurve b/vendor/nim-blscurve index ab07ea092..f7d0341f8 160000 --- a/vendor/nim-blscurve +++ b/vendor/nim-blscurve @@ -1 +1 @@ -Subproject commit ab07ea092b6db3e242ec9bab0553e34d2fbfe22b +Subproject commit f7d0341f8044fec7603c4acec6774b529b036b32 diff --git a/vendor/nim-chronicles b/vendor/nim-chronicles index b9a7c6bb0..b42899070 160000 --- a/vendor/nim-chronicles +++ b/vendor/nim-chronicles @@ -1 +1 @@ -Subproject commit b9a7c6bb0733ce8c76f0ac8c7889c5e48e7c924f +Subproject commit b42899070a7daa5cf6f0843faf3d6d41659e9591 diff --git a/vendor/nim-chronos b/vendor/nim-chronos index ac9b3e304..9a420c6b0 160000 --- a/vendor/nim-chronos +++ b/vendor/nim-chronos @@ -1 +1 @@ -Subproject commit ac9b3e304f630a450efc996f47dc9e6133246a87 +Subproject commit 9a420c6b05840294ae2b42cea292f7f3e33397fc diff --git a/vendor/nim-confutils b/vendor/nim-confutils index 29c4a1870..c4cd4c247 160000 --- a/vendor/nim-confutils +++ b/vendor/nim-confutils @@ -1 +1 @@ -Subproject commit 29c4a1870f91a3d61996d6eb32c5b25088d8ff97 +Subproject commit c4cd4c24742284ed1c5786af6bd217a9ac398f9e diff --git a/vendor/nim-eth b/vendor/nim-eth index bc8a8947f..ab969f72c 160000 --- a/vendor/nim-eth +++ b/vendor/nim-eth @@ -1 +1 @@ -Subproject commit bc8a8947fc146cfb0765f407528669932e604d8a +Subproject commit ab969f72c142b78da75beb0eadbc079cba285ce3 diff --git a/vendor/nim-faststreams b/vendor/nim-faststreams index 87309f312..9138f6a8b 160000 --- a/vendor/nim-faststreams +++ b/vendor/nim-faststreams @@ -1 +1 @@ -Subproject commit 87309f3120d4e627082171a188324d3ee14d8986 +Subproject commit 9138f6a8bb9a089790319753895722c2569707b0 diff --git a/vendor/nim-json-rpc b/vendor/nim-json-rpc index dc3a2d33f..ded863fcb 160000 --- a/vendor/nim-json-rpc +++ b/vendor/nim-json-rpc @@ -1 +1 @@ -Subproject commit dc3a2d33fc49e8415323da146b60b5c7e07afd2c +Subproject commit ded863fcb1741483f285e3bbf27541efdc32c78c diff --git a/vendor/nim-json-serialization b/vendor/nim-json-serialization index 32f75d93b..7999d2522 160000 --- a/vendor/nim-json-serialization +++ b/vendor/nim-json-serialization @@ -1 +1 @@ -Subproject commit 32f75d93b0762328d1d85ce62cef84ed919ae31e +Subproject commit 7999d2522565d88499b9d7f99c4175a8eb3f2b41 diff --git a/vendor/nim-nat-traversal b/vendor/nim-nat-traversal index 24ba989cf..8994b67b0 160000 --- a/vendor/nim-nat-traversal +++ b/vendor/nim-nat-traversal @@ -1 +1 @@ -Subproject commit 24ba989cfcec00d16d7a9bf5e5691c77b3c9295f +Subproject commit 8994b67b07813955c61bebddf4bd2325439c3535 diff --git a/vendor/nim-secp256k1 b/vendor/nim-secp256k1 index a9d5cba69..ac9605487 160000 --- a/vendor/nim-secp256k1 +++ b/vendor/nim-secp256k1 @@ -1 +1 @@ -Subproject commit a9d5cba699a0ee636ad155ea0dc49747b24d2ea4 +Subproject commit ac96054870eb7cbc2cf72dd03fe5d5336b2e5dd9 diff --git a/vendor/nim-serialization b/vendor/nim-serialization index 474bdbf49..4e2ffe3f6 160000 --- a/vendor/nim-serialization +++ b/vendor/nim-serialization @@ -1 +1 @@ -Subproject commit 474bdbf49cf1634ba504888ad1a1927a2703bd3f +Subproject commit 4e2ffe3f6df5b753d7b11fef83cc5ee14f296c1c diff --git a/vendor/nim-snappy b/vendor/nim-snappy index 8455b825e..4c50008ab 160000 --- a/vendor/nim-snappy +++ b/vendor/nim-snappy @@ -1 +1 @@ -Subproject commit 8455b825e50be706eb689f7629dac7098d2d5da5 +Subproject commit 4c50008ab23db7197034d0146666c4a34447ab4d diff --git a/vendor/nim-sqlite3-abi b/vendor/nim-sqlite3-abi index 068ff3593..07039dd88 160000 --- a/vendor/nim-sqlite3-abi +++ b/vendor/nim-sqlite3-abi @@ -1 +1 @@ -Subproject commit 068ff3593c1582bf3d96b75dcf40fa72e3739b29 +Subproject commit 07039dd887c4e5b57367a16f4be3c18763be1d7b diff --git a/vendor/nim-stew b/vendor/nim-stew index ff524ed83..932fa6cef 160000 --- a/vendor/nim-stew +++ b/vendor/nim-stew @@ -1 +1 @@ -Subproject commit ff524ed832b9933760a5c500252323ec840951a6 +Subproject commit 932fa6cef129126064e8c6eda46dcca6fbd555ad diff --git a/vendor/nim-stint b/vendor/nim-stint index 9e49b0014..bae3fc6ee 160000 --- a/vendor/nim-stint +++ b/vendor/nim-stint @@ -1 +1 @@ -Subproject commit 9e49b00148884a01d61478ae5d2c69b543b93ceb +Subproject commit bae3fc6ee4f36a33849c9dafe5a52b9b6cdf672a diff --git a/vendor/nimbus-build-system b/vendor/nimbus-build-system index dbb7219f4..98b580a00 160000 --- a/vendor/nimbus-build-system +++ b/vendor/nimbus-build-system @@ -1 +1 @@ -Subproject commit dbb7219f44be9b918baf42651d7708c2889a111a +Subproject commit 98b580a00e99f24e3ce10ff9967e3b89b76ba1c6