File tree Expand file tree Collapse file tree 9 files changed +18
-19
lines changed
Expand file tree Collapse file tree 9 files changed +18
-19
lines changed Original file line number Diff line number Diff line change 1818* (e2ee)[ #1413 ] ( https://github.com/crypto-org-chain/cronos/pull/1413 ) Add custom keyring implementation for e2ee module.
1919* (e2ee)[ #1415 ] ( https://github.com/crypto-org-chain/cronos/pull/1415 ) Add batch keys query for e2ee module.
2020* (e2ee)[ #1421 ] ( https://github.com/crypto-org-chain/cronos/pull/1421 ) Validate e2ee key when register.
21+ * (store) [ #1448 ] ( https://github.com/crypto-org-chain/cronos/pull/1448 ) Upgrade rocksdb to ` v9.1.1 ` .
2122
2223### Bug Fixes
2324
Original file line number Diff line number Diff line change 5050 } ;
5151 defaultPackage = packages . cronosd ;
5252 defaultApp = apps . cronosd ;
53- devShells = {
53+ devShells = rec {
5454 default = pkgs . mkShell {
5555 buildInputs = [
5656 defaultPackage . go
5757 pkgs . gomod2nix
5858 ] ;
5959 } ;
6060 rocksdb = pkgs . mkShell {
61- buildInputs = [
62- defaultPackage . go
63- pkgs . gomod2nix
61+ buildInputs = default . buildInputs ++ [
6462 pkgs . rocksdb
63+ pkgs . rocksdb . tools
6564 ] ;
6665 } ;
6766 full = pkgs . mkShell {
68- buildInputs = [
69- defaultPackage . go
70- pkgs . gomod2nix
71- pkgs . rocksdb
67+ buildInputs = rocksdb . buildInputs ++ [
7268 pkgs . test-env
7369 ] ;
7470 } ;
Original file line number Diff line number Diff line change @@ -36,7 +36,7 @@ require (
3636 github.com/gorilla/mux v1.8.1
3737 github.com/grpc-ecosystem/grpc-gateway v1.16.0
3838 github.com/hashicorp/go-metrics v0.5.3
39- github.com/linxGnu/grocksdb v1.8.14
39+ github.com/linxGnu/grocksdb v1.9.1
4040 github.com/spf13/cast v1.6.0
4141 github.com/spf13/cobra v1.8.0
4242 github.com/spf13/pflag v1.0.5
Original file line number Diff line number Diff line change @@ -858,8 +858,8 @@ github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6
858858github.zerozr99.workers.dev/libp2p/go-buffer-pool v0.1.0 /go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg =
859859github.zerozr99.workers.dev/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743 /go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM =
860860github.zerozr99.workers.dev/lightstep/lightstep-tracer-go v0.18.1 /go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4 =
861- github.com/linxGnu/grocksdb v1.8.14 h1:HTgyYalNwBSG/1qCQUIott44wU5b2Y9Kr3z7SK5OfGQ =
862- github.com/linxGnu/grocksdb v1.8.14 /go.mod h1:QYiYypR2d4v63Wj1adOOfzglnoII0gLj3PNh4fZkcFA =
861+ github.com/linxGnu/grocksdb v1.9.1 h1:LmwuHzsWglxJrIES9jvS2O1xTPD2nnKYhAQDx5dIyRo =
862+ github.com/linxGnu/grocksdb v1.9.1 /go.mod h1:QYiYypR2d4v63Wj1adOOfzglnoII0gLj3PNh4fZkcFA =
863863github.zerozr99.workers.dev/lyft/protoc-gen-validate v0.0.13 /go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ =
864864github.zerozr99.workers.dev/magiconair/properties v1.8.0 /go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ =
865865github.zerozr99.workers.dev/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY =
Original file line number Diff line number Diff line change @@ -455,8 +455,8 @@ schema = 3
455455 version = " v0.1.0"
456456 hash = " sha256-wQqGTtRWsfR9n0O/SXHVgECebbnNmHddxJIbG63OJBQ="
457457 [mod ."github .com/linxGnu/grocksdb" ]
458- version = " v1.8.14 "
459- hash = " sha256-dT647UzB25Ye1Gv6b9JEtJZjuWKdJo4D8kw9cB0W8gA ="
458+ version = " v1.9.1 "
459+ hash = " sha256-yRSGvZ5YeDqGOEmGPRSKxPjNoCQ/Xk/DMtNtutkbPGg ="
460460 [mod ."github .com/magiconair/properties" ]
461461 version = " v1.8.7"
462462 hash = " sha256-XQ2bnc2s7/IH3WxEO4GishZurMyKwEclZy1DXg+2xXc="
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ def test_versiondb_migration(cronos: Cronos):
1717 - verify change set and save snapshot
1818 - restore pruned application.db from the snapshot
1919 - replace node1's application.db with the restored one
20- - build versiondb for node0
20+ - rebuild versiondb for node0
2121 - start the nodes, now check:
2222 - the network can grow
2323 - node0 do support historical queries
@@ -60,6 +60,8 @@ def test_versiondb_migration(cronos: Cronos):
6060 print ("restore versiondb for node0" )
6161 sst_dir = tempfile .mkdtemp (dir = cronos .base_dir )
6262 print (cli0 .changeset_build_versiondb_sst (changeset_dir , sst_dir ))
63+ # ingest-versiondb-sst expects an empty database
64+ shutil .rmtree (cli0 .data_dir / "data/versiondb" )
6365 print (
6466 cli0 .changeset_ingest_versiondb_sst (
6567 cli0 .data_dir / "data/versiondb" , sst_dir , maximum_version = latest_version
Original file line number Diff line number Diff line change 2020
2121stdenv . mkDerivation ( finalAttrs : {
2222 pname = "rocksdb" ;
23- version = "8.11.3 " ;
23+ version = "9.1.1 " ;
2424
2525 src = fetchFromGitHub {
2626 owner = "facebook" ;
2727 repo = finalAttrs . pname ;
2828 rev = "v${ finalAttrs . version } " ;
29- hash = "sha256-OpEiMwGxZuxb9o3RQuSrwZMQGLhe9xLT1aa3HpI4KPs =" ;
29+ hash = "sha256-/Xf0bzNJPclH9IP80QNaABfhj4IAR5LycYET18VFCXc =" ;
3030 } ;
3131
3232 nativeBuildInputs = [ cmake ninja ] ;
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ require (
1717 github.com/cosmos/ibc-go/modules/capability v1.0.0
1818 github.com/crypto-org-chain/cronos/memiavl v0.0.3
1919 github.com/golang/snappy v0.0.4
20- github.com/linxGnu/grocksdb v1.8.14
20+ github.com/linxGnu/grocksdb v1.9.1
2121 github.com/spf13/cast v1.6.0
2222 github.com/spf13/cobra v1.8.0
2323 github.com/stretchr/testify v1.9.0
Original file line number Diff line number Diff line change @@ -466,8 +466,8 @@ github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6
466466github.zerozr99.workers.dev/libp2p/go-buffer-pool v0.1.0 /go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg =
467467github.zerozr99.workers.dev/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743 /go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM =
468468github.zerozr99.workers.dev/lightstep/lightstep-tracer-go v0.18.1 /go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4 =
469- github.com/linxGnu/grocksdb v1.8.14 h1:HTgyYalNwBSG/1qCQUIott44wU5b2Y9Kr3z7SK5OfGQ =
470- github.com/linxGnu/grocksdb v1.8.14 /go.mod h1:QYiYypR2d4v63Wj1adOOfzglnoII0gLj3PNh4fZkcFA =
469+ github.com/linxGnu/grocksdb v1.9.1 h1:LmwuHzsWglxJrIES9jvS2O1xTPD2nnKYhAQDx5dIyRo =
470+ github.com/linxGnu/grocksdb v1.9.1 /go.mod h1:QYiYypR2d4v63Wj1adOOfzglnoII0gLj3PNh4fZkcFA =
471471github.zerozr99.workers.dev/lyft/protoc-gen-validate v0.0.13 /go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ =
472472github.zerozr99.workers.dev/magiconair/properties v1.8.0 /go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ =
473473github.zerozr99.workers.dev/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY =
You can’t perform that action at this time.
0 commit comments