From 9379e5fded9bef0e4809528c7bf99d3f9a861aa4 Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Thu, 24 Aug 2023 17:56:50 +0700 Subject: [PATCH 1/2] save --- kv/helpers.go | 2 +- kv/mdbx/kv_mdbx.go | 2 +- kv/mdbx/util.go | 2 +- txpool/txpooluitl/all_components.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kv/helpers.go b/kv/helpers.go index a1f8d71ee..727a140a1 100644 --- a/kv/helpers.go +++ b/kv/helpers.go @@ -24,8 +24,8 @@ import ( "sync/atomic" "time" + "github.com/erigontech/mdbx-go/mdbx" "github.com/ledgerwatch/erigon-lib/common" - "github.com/torquem-ch/mdbx-go/mdbx" ) func DefaultPageSize() uint64 { diff --git a/kv/mdbx/kv_mdbx.go b/kv/mdbx/kv_mdbx.go index f9dbb69a9..847f772f2 100644 --- a/kv/mdbx/kv_mdbx.go +++ b/kv/mdbx/kv_mdbx.go @@ -30,6 +30,7 @@ import ( "time" "github.com/c2h5oh/datasize" + "github.com/erigontech/mdbx-go/mdbx" stack2 "github.com/go-stack/stack" "github.com/ledgerwatch/erigon-lib/common/dbg" "github.com/ledgerwatch/erigon-lib/kv" @@ -37,7 +38,6 @@ import ( "github.com/ledgerwatch/erigon-lib/kv/order" "github.com/ledgerwatch/log/v3" "github.com/pbnjay/memory" - "github.com/torquem-ch/mdbx-go/mdbx" "golang.org/x/exp/maps" "golang.org/x/sync/semaphore" ) diff --git a/kv/mdbx/util.go b/kv/mdbx/util.go index c6daf23a1..ca16ee273 100644 --- a/kv/mdbx/util.go +++ b/kv/mdbx/util.go @@ -17,9 +17,9 @@ package mdbx import ( + mdbxbind "github.com/erigontech/mdbx-go/mdbx" "github.com/ledgerwatch/erigon-lib/kv" "github.com/ledgerwatch/log/v3" - mdbxbind "github.com/torquem-ch/mdbx-go/mdbx" ) func MustOpen(path string) kv.RwDB { diff --git a/txpool/txpooluitl/all_components.go b/txpool/txpooluitl/all_components.go index b0ef862a1..be776b2c5 100644 --- a/txpool/txpooluitl/all_components.go +++ b/txpool/txpooluitl/all_components.go @@ -22,9 +22,9 @@ import ( "time" "github.com/c2h5oh/datasize" + mdbx2 "github.com/erigontech/mdbx-go/mdbx" "github.com/holiman/uint256" "github.com/ledgerwatch/log/v3" - mdbx2 "github.com/torquem-ch/mdbx-go/mdbx" "github.com/ledgerwatch/erigon-lib/chain" "github.com/ledgerwatch/erigon-lib/direct" From bb50dc264a824f59b6d103a65e2ae0f99e8e035b Mon Sep 17 00:00:00 2001 From: "alex.sharov" Date: Thu, 24 Aug 2023 17:57:39 +0700 Subject: [PATCH 2/2] save --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 51083423c..299204692 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,11 @@ module github.com/ledgerwatch/erigon-lib go 1.19 require ( + github.com/erigontech/mdbx-go v0.27.13 github.com/ledgerwatch/interfaces v0.0.0-20230818152001-a8f70b6e9ac6 github.com/ledgerwatch/log/v3 v3.9.0 github.com/ledgerwatch/secp256k1 v1.0.0 github.com/ledgerwatch/trackerslist v1.1.0 - github.com/torquem-ch/mdbx-go v0.27.10 ) require ( diff --git a/go.sum b/go.sum index 4d2514534..17f74b229 100644 --- a/go.sum +++ b/go.sum @@ -129,6 +129,8 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/erigontech/mdbx-go v0.27.13 h1:smwJTQDaHwQ+kJoE8V+0NAiEm5u8cmJig/0HnqsFtHs= +github.com/erigontech/mdbx-go v0.27.13/go.mod h1:FAMxbOgqOnRDx51j8HjuJZIgznbDwjX7LItd+/UWyA4= github.com/frankban/quicktest v1.9.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y= github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -384,8 +386,6 @@ github.com/tidwall/btree v1.6.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EU github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/torquem-ch/mdbx-go v0.27.10 h1:iwb8Wn9gse4MEYIltAna+pxMPCY7hA1/5LLN/Qrcsx0= -github.com/torquem-ch/mdbx-go v0.27.10/go.mod h1:T2fsoJDVppxfAPTLd1svUgH1kpPmeXdPESmroSHcL1E= github.com/valyala/fastrand v1.1.0 h1:f+5HkLW4rsgzdNoleUOB69hyT9IlD2ZQh9GyDMfb5G8= github.com/valyala/fastrand v1.1.0/go.mod h1:HWqCzkrkg6QXT8V2EXWvXCoow7vLwOFN002oeRzjapQ= github.com/valyala/histogram v1.2.0 h1:wyYGAZZt3CpwUiIb9AU/Zbllg1llXyrtApRS815OLoQ=