diff --git a/Makefile b/Makefile index 3fcb2c37471f1af9f8749630acfb8d3e7821fead..c268aca2fc618f11214f307c414eac62dcdbc99e 100644 --- a/Makefile +++ b/Makefile @@ -92,16 +92,16 @@ headers: @echo "Run \"$(GOBIN)/integration\" to run headers download PoC." db-tools: - $(GOBUILD) -o $(GOBIN)/lmdb_stat -tags "mdbx" github.com/ledgerwatch/lmdb-go/cmd/lmdb_stat - $(GOBUILD) -o $(GOBIN)/lmdb_copy -tags "mdbx" github.com/ledgerwatch/lmdb-go/cmd/lmdb_copy + go mod vendor; cd vendor/github.com/ledgerwatch/lmdb-go/dist; DESTDIR=$(GOBIN) make clean mdb_stat mdb_copy mdb_dump mdb_load; cd ../../../../..; rm -rf vendor + $(GOBUILD) -o $(GOBIN)/lmdbgo_copy -tags "mdbx" github.com/ledgerwatch/lmdb-go/cmd/lmdb_copy + $(GOBUILD) -o $(GOBIN)/lmdbgo_stat -tags "mdbx" github.com/ledgerwatch/lmdb-go/cmd/lmdb_stat cd ethdb/mdbx/dist/ && make tools - cp ethdb/mdbx/dist/mdbx_stat $(GOBIN) + cp ethdb/mdbx/dist/mdbx_chk $(GOBIN) cp ethdb/mdbx/dist/mdbx_copy $(GOBIN) cp ethdb/mdbx/dist/mdbx_dump $(GOBIN) cp ethdb/mdbx/dist/mdbx_load $(GOBIN) - cp ethdb/mdbx/dist/mdbx_chk $(GOBIN) - @echo "Done building." + cp ethdb/mdbx/dist/mdbx_stat $(GOBIN) @echo "Run \"$(GOBIN)/lmdb_stat -h\" to get info about lmdb file." ethdb/mdbx/dist/libmdbx.a: diff --git a/cmd/hack/binary-deps/main.go b/cmd/hack/binary-deps/main.go index 443678f84fcb00363795b063fe5982d38918814e..2578cab238fb6b8aead411c018ac83a6aacce555 100644 --- a/cmd/hack/binary-deps/main.go +++ b/cmd/hack/binary-deps/main.go @@ -19,6 +19,7 @@ import ( _ "github.com/kevinburke/go-bindata" _ "github.com/ledgerwatch/lmdb-go/cmd/lmdb_copy" _ "github.com/ledgerwatch/lmdb-go/cmd/lmdb_stat" + _ "github.com/ledgerwatch/lmdb-go/dist" _ "github.com/ugorji/go/codec/codecgen" _ "golang.org/x/tools/cmd/stringer" _ "google.golang.org/grpc/cmd/protoc-gen-go-grpc" diff --git a/go.mod b/go.mod index 716c53dba6ecbc0afdcbf41af07be335ef511b9a..4b4688280edf25d63e44025550fc4c442330ff8a 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,7 @@ require ( github.com/julienschmidt/httprouter v1.2.0 github.com/karalabe/usb v0.0.0-20191104083709-911d15fe12a9 github.com/kevinburke/go-bindata v3.21.0+incompatible - github.com/ledgerwatch/lmdb-go v1.16.0 + github.com/ledgerwatch/lmdb-go v1.17.1 github.com/llgcode/draw2d v0.0.0-20200603164053-19660b984a28 github.com/logrusorgru/aurora v2.0.3+incompatible github.com/mattn/go-colorable v0.1.7 diff --git a/go.sum b/go.sum index 0d454cae1984556095f52d487e0495bbd5fbed6c..94f44269f41557ec2c49aebd4748f98548ecc994 100644 --- a/go.sum +++ b/go.sum @@ -497,8 +497,8 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kylelemons/godebug v0.0.0-20170224010052-a616ab194758/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/ledgerwatch/lmdb-go v1.16.0 h1:atkRK3rVgNd/vDV9ejpRoIB+D51h5+KqPjm4RMOiIaY= -github.com/ledgerwatch/lmdb-go v1.16.0/go.mod h1:NKRpCxksoTQPyxsUcBiVOe0135uqnJsnf6cElxmOL0o= +github.com/ledgerwatch/lmdb-go v1.17.1 h1:1Ridp9Pf4Ao3Db9JzpcwCDusWISwqhbghsg0Rj27GGw= +github.com/ledgerwatch/lmdb-go v1.17.1/go.mod h1:NKRpCxksoTQPyxsUcBiVOe0135uqnJsnf6cElxmOL0o= github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=