GRIN/grin-wallet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync to latest grin master and fix missing verifier_cache (#599)

Browse Source 
* Sync to latest grin master and fix missing verifier_cache

* Copy CI fixes from grin master
This commit is contained in:
trevyn
2021-04-05 13:14:10 +04:00
committed by GitHub
parent f7c65c7b84
commit e9e67884d6
6 changed files with 79 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+52 -63
View File
@@ -89,7 +89,7 @@ dependencies = [
"curve25519-dalek",
"hkdf",
"hmac 0.7.1",
"nom 5.1.2",
"nom",
"radix64",
"rand 0.7.3",
"scrypt",
@@ -108,7 +108,7 @@ checksum = "9edc5c56a290116d446475265057ff5bc44490f681ee15cb27111ed47d4afe78"
dependencies = [
"base64 0.11.0",
"cookie-factory",
"nom 5.1.2",
"nom",
]
[[package]]
@@ -269,13 +269,12 @@ checksum = "cdcf67bb7ba7797a081cd19009948ab533af7c355d5caf1d08c777582d351e9c"
[[package]]
name = "bindgen"
version = "0.52.0"
version = "0.56.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1c85344eb535a31b62f0af37be84441ba9e7f0f4111eb0530f43d15e513fe57"
checksum = "2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239"
dependencies = [
"bitflags 1.2.1",
"cexpr",
"cfg-if 0.1.10",
"clang-sys",
"clap",
"env_logger",
@@ -483,11 +482,11 @@ dependencies = [
[[package]]
name = "cexpr"
version = "0.3.6"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fce5b5fb86b0c57c20c834c1b412fd09c77c8a59b9473f86272709e78874cd1d"
checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27"
dependencies = [
"nom 4.2.3",
"nom",
]
[[package]]
@@ -528,9 +527,9 @@ dependencies = [
[[package]]
name = "clang-sys"
version = "0.28.1"
version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853"
checksum = "f54d78e30b388d4815220c8dd03fea5656b6c6d32adb59e89061552a102f8da1"
dependencies = [
"glob",
"libc",
@@ -600,21 +599,21 @@ dependencies = [
]
[[package]]
name = "croaring-mw"
version = "0.4.5"
name = "croaring"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bcdee571ce4bf3e49c382de29c38bd33b9fa871e1358c7749b9dcc5dc2776221"
checksum = "a00d14ad7d8cc067d7a5c93e8563791bfec3f7182361db955530db11d94ed63c"
dependencies = [
"byteorder",
"croaring-sys-mw",
"croaring-sys",
"libc",
]
[[package]]
name = "croaring-sys-mw"
version = "0.4.5"
name = "croaring-sys"
version = "0.4.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea52c177269fa54c526b054dac8e623721de18143ebfd2ea84ffc023d6c271ee"
checksum = "c5d6a46501bb403a61e43bc7cd19977b4f9c54efd703949b00259cc61afb5a86"
dependencies = [
"bindgen",
"cc",
@@ -919,12 +918,12 @@ dependencies = [
[[package]]
name = "env_logger"
version = "0.7.1"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f"
dependencies = [
"atty",
"humantime",
"humantime 2.1.0",
"log",
"regex",
"termcolor",
@@ -1176,8 +1175,8 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
[[package]]
name = "grin_api"
version = "5.0.0-beta.2"
source = "git+https://github.com/mimblewimble/grin?branch=master#f48a23655ded65285ab412ad22b8f6a7a0075e56"
version = "5.1.0-alpha.1"
source = "git+https://github.com/mimblewimble/grin?branch=master#f6ec77a592de04fcc4a78127822932ec7e18525c"
dependencies = [
"bytes",
"easy-jsonrpc-mw",
@@ -1209,14 +1208,14 @@ dependencies = [
[[package]]
name = "grin_chain"
version = "5.0.0-beta.2"
source = "git+https://github.com/mimblewimble/grin?branch=master#f48a23655ded65285ab412ad22b8f6a7a0075e56"
version = "5.1.0-alpha.1"
source = "git+https://github.com/mimblewimble/grin?branch=master#f6ec77a592de04fcc4a78127822932ec7e18525c"
dependencies = [
"bit-vec",
"bitflags 1.2.1",
"byteorder",
"chrono",
"croaring-mw",
"croaring",
"enum_primitive",
"failure",
"failure_derive",
@@ -1233,14 +1232,14 @@ dependencies = [
[[package]]
name = "grin_core"
version = "5.0.0-beta.2"
source = "git+https://github.com/mimblewimble/grin?branch=master#f48a23655ded65285ab412ad22b8f6a7a0075e56"
version = "5.1.0-alpha.1"
source = "git+https://github.com/mimblewimble/grin?branch=master#f6ec77a592de04fcc4a78127822932ec7e18525c"
dependencies = [
"blake2-rfc",
"byteorder",
"bytes",
"chrono",
"croaring-mw",
"croaring",
"enum_primitive",
"failure",
"failure_derive",
@@ -1260,8 +1259,8 @@ dependencies = [
[[package]]
name = "grin_keychain"
version = "5.0.0-beta.2"
source = "git+https://github.com/mimblewimble/grin?branch=master#f48a23655ded65285ab412ad22b8f6a7a0075e56"
version = "5.1.0-alpha.1"
source = "git+https://github.com/mimblewimble/grin?branch=master#f6ec77a592de04fcc4a78127822932ec7e18525c"
dependencies = [
"blake2-rfc",
"byteorder",
@@ -1282,8 +1281,8 @@ dependencies = [
[[package]]
name = "grin_p2p"
version = "5.0.0-beta.2"
source = "git+https://github.com/mimblewimble/grin?branch=master#f48a23655ded65285ab412ad22b8f6a7a0075e56"
version = "5.1.0-alpha.1"
source = "git+https://github.com/mimblewimble/grin?branch=master#f6ec77a592de04fcc4a78127822932ec7e18525c"
dependencies = [
"bitflags 1.2.1",
"bytes",
@@ -1304,8 +1303,8 @@ dependencies = [
[[package]]
name = "grin_pool"
version = "5.0.0-beta.2"
source = "git+https://github.com/mimblewimble/grin?branch=master#f48a23655ded65285ab412ad22b8f6a7a0075e56"
version = "5.1.0-alpha.1"
source = "git+https://github.com/mimblewimble/grin?branch=master#f6ec77a592de04fcc4a78127822932ec7e18525c"
dependencies = [
"blake2-rfc",
"chrono",
@@ -1322,9 +1321,9 @@ dependencies = [
[[package]]
name = "grin_secp256k1zkp"
version = "0.7.9"
version = "0.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4c2e7431d1999f02112c2383c9d33e7a6212947abfba92c87ab7283ba667a8b"
checksum = "daca5852d12dbd4df8b7b760eaad791d191ea546bf80c46b033bbcc650b35a5c"
dependencies = [
"arrayvec 0.3.25",
"cc",
@@ -1338,11 +1337,11 @@ dependencies = [
[[package]]
name = "grin_store"
version = "5.0.0-beta.2"
source = "git+https://github.com/mimblewimble/grin?branch=master#f48a23655ded65285ab412ad22b8f6a7a0075e56"
version = "5.1.0-alpha.1"
source = "git+https://github.com/mimblewimble/grin?branch=master#f6ec77a592de04fcc4a78127822932ec7e18525c"
dependencies = [
"byteorder",
"croaring-mw",
"croaring",
"failure",
"failure_derive",
"grin_core",
@@ -1358,8 +1357,8 @@ dependencies = [
[[package]]
name = "grin_util"
version = "5.0.0-beta.2"
source = "git+https://github.com/mimblewimble/grin?branch=master#f48a23655ded65285ab412ad22b8f6a7a0075e56"
version = "5.1.0-alpha.1"
source = "git+https://github.com/mimblewimble/grin?branch=master#f6ec77a592de04fcc4a78127822932ec7e18525c"
dependencies = [
"backtrace",
"base64 0.12.3",
@@ -1670,6 +1669,12 @@ dependencies = [
"quick-error",
]
[[package]]
name = "humantime"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
[[package]]
name = "hyper"
version = "0.13.7"
@@ -1890,11 +1895,11 @@ dependencies = [
[[package]]
name = "libloading"
version = "0.5.2"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a"
dependencies = [
"cc",
"cfg-if 1.0.0",
"winapi 0.3.9",
]
@@ -1974,7 +1979,7 @@ dependencies = [
"chrono",
"flate2",
"fnv",
"humantime",
"humantime 1.3.0",
"libc",
"log",
"log-mdc",
@@ -2172,16 +2177,6 @@ version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
[[package]]
name = "nom"
version = "4.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
dependencies = [
"memchr",
"version_check 0.1.5",
]
[[package]]
name = "nom"
version = "5.1.2"
@@ -2190,7 +2185,7 @@ checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
dependencies = [
"lexical-core",
"memchr",
"version_check 0.9.2",
"version_check",
]
[[package]]
@@ -3427,7 +3422,7 @@ checksum = "76971977e6121664ec1b960d1313aacfa75642adc93b9d4d53b247bd4cb1747e"
dependencies = [
"dirs 2.0.2",
"fnv",
"nom 5.1.2",
"nom",
"phf",
"phf_codegen",
]
@@ -3755,12 +3750,6 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
[[package]]
name = "version_check"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
[[package]]
name = "version_check"
version = "0.9.2"