mirror/erigon-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/erigon-pulse.git synced 2024-12-21 11:10:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move mdbx to new org (#8061)

Browse Source
This commit is contained in:
Alex Sharov 2023-08-24 18:00:24 +07:00 committed by GitHub
parent ece8010d0d
commit 2b6c21fddb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/evm/staterunner.go
View File

@ -25,10 +25,10 @@ import (
"path/filepath"
"github.com/c2h5oh/datasize"
mdbx2 "github.com/erigontech/mdbx-go/mdbx"
libcommon "github.com/ledgerwatch/erigon-lib/common"
"github.com/ledgerwatch/erigon-lib/kv/mdbx"
"github.com/ledgerwatch/log/v3"
mdbx2 "github.com/torquem-ch/mdbx-go/mdbx"
"github.com/urfave/cli/v2"
"github.com/ledgerwatch/erigon/core/state"

2
cmd/integration/commands/root.go
View File

@ -8,9 +8,9 @@ import (
"strings"
"github.com/c2h5oh/datasize"
"github.com/erigontech/mdbx-go/mdbx"
"github.com/ledgerwatch/log/v3"
"github.com/spf13/cobra"
"github.com/torquem-ch/mdbx-go/mdbx"
"golang.org/x/sync/semaphore"
"github.com/ledgerwatch/erigon-lib/kv"

2
eth/stagedsync/exec3.go
View File

@ -15,6 +15,7 @@ import (
"github.com/VictoriaMetrics/metrics"
"github.com/c2h5oh/datasize"
"github.com/erigontech/mdbx-go/mdbx"
"github.com/ledgerwatch/erigon-lib/chain"
"github.com/ledgerwatch/erigon-lib/common"
"github.com/ledgerwatch/erigon-lib/common/datadir"
@ -28,7 +29,6 @@ import (
state2 "github.com/ledgerwatch/erigon-lib/state"
"github.com/ledgerwatch/erigon/common/math"
"github.com/ledgerwatch/log/v3"
"github.com/torquem-ch/mdbx-go/mdbx"
"golang.org/x/sync/errgroup"
"github.com/ledgerwatch/erigon/cmd/state/exec22"

4
go.mod
View File

@ -3,12 +3,12 @@ module github.com/ledgerwatch/erigon
go 1.19
require (
github.com/ledgerwatch/erigon-lib v0.0.0-20230824013233-e1092200ca9c
github.com/erigontech/mdbx-go v0.27.13
github.com/ledgerwatch/erigon-lib v0.0.0-20230824105739-bb50dc264a82
github.com/ledgerwatch/erigon-snapshot v1.2.1-0.20230818153427-cc16b83a89be
github.com/ledgerwatch/log/v3 v3.9.0
github.com/ledgerwatch/secp256k1 v1.0.0
github.com/ledgerwatch/trackerslist v1.1.0 // indirect
github.com/torquem-ch/mdbx-go v0.27.10
)
require (

8
go.sum
View File

@ -250,6 +250,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
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/fjl/gencodec v0.0.0-20220412091415-8bb9e558978c h1:CndMRAH4JIwxbW8KYq6Q+cGWcGHz0FjGR3QqcInWcW0=
github.com/fjl/gencodec v0.0.0-20220412091415-8bb9e558978c/go.mod h1:AzA8Lj6YtixmJWL+wkKoBGsLWy9gFrAzi4g+5bCKwpY=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
@ -499,8 +501,8 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/kylelemons/godebug v0.0.0-20170224010052-a616ab194758 h1:0D5M2HQSGD3PYPwICLl+/9oulQauOuETfgFvhBDffs0=
github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c=
github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8=
github.com/ledgerwatch/erigon-lib v0.0.0-20230824013233-e1092200ca9c h1:JNCDCA0Hu3LDI+oiYrNOsKTRS4WFMXrTLj6L39/uapE=
github.com/ledgerwatch/erigon-lib v0.0.0-20230824013233-e1092200ca9c/go.mod h1:EZWlbnNoZrIERSNag2z7U3LpwBPCgzDzxhDxbgzLRjw=
github.com/ledgerwatch/erigon-lib v0.0.0-20230824105739-bb50dc264a82 h1:1N0e5NA6TDCCiUQWXa2BqwH7S69q3wtFyS4Zt6a9wVM=
github.com/ledgerwatch/erigon-lib v0.0.0-20230824105739-bb50dc264a82/go.mod h1:cZCBh1EKp4waIUHEmt6j0nf0K2qnqBiPueaHMUjAAP8=
github.com/ledgerwatch/erigon-snapshot v1.2.1-0.20230818153427-cc16b83a89be h1:6/4MXkk5AoKUHivIpCokHOX/WV9L7tXgURp1k8KfmSM=
github.com/ledgerwatch/erigon-snapshot v1.2.1-0.20230818153427-cc16b83a89be/go.mod h1:3AuPxZc85jkehh/HA9h8gabv5MSi3kb/ddtzBsTVJFo=
github.com/ledgerwatch/log/v3 v3.9.0 h1:iDwrXe0PVwBC68Dd94YSsHbMgQ3ufsgjzXtFNFVZFRk=
@ -851,8 +853,6 @@ github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+Kd
github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI=
github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms=
github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4=
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/ugorji/go v1.1.13/go.mod h1:jxau1n+/wyTGLQoCkjok9r5zFa/FxT6eI5HiHKQszjc=
github.com/ugorji/go/codec v1.1.13 h1:013LbFhocBoIqgHeIHKlV4JWYhqogATYWZhIcH0WHn4=
github.com/ugorji/go/codec v1.1.13/go.mod h1:oNVt3Dq+FO91WNQ/9JnHKQP2QJxTzoN7wCBFCq1OeuU=

2
p2p/enode/nodedb.go
View File

@ -37,7 +37,7 @@ import (
"github.com/ledgerwatch/erigon/rlp"
"github.com/ledgerwatch/log/v3"
mdbx1 "github.com/torquem-ch/mdbx-go/mdbx"
mdbx1 "github.com/erigontech/mdbx-go/mdbx"
)
// Keys in the node database.

2
tests/testdata

@ -1 +1 @@
Subproject commit 9b6382b122140b5479a4ff6152ccf1459440ddff
Subproject commit 291118cf69f33a4a89f2f61c7bf5fe0e62c9c2f8

4
tools.go
View File

@ -17,9 +17,9 @@ package tools
// build tag 'trick_go_mod_tidy' - is used to hide warnings of IDEA (because we can't import `main` packages in go)
import (
_ "github.com/erigontech/mdbx-go"
_ "github.com/erigontech/mdbx-go/mdbxdist"
_ "github.com/fjl/gencodec"
_ "github.com/torquem-ch/mdbx-go"
_ "github.com/torquem-ch/mdbx-go/mdbxdist"
_ "github.com/ugorji/go/codec/codecgen"
_ "google.golang.org/grpc/cmd/protoc-gen-go-grpc"
)

2
turbo/backup/backup.go
View File

@ -11,12 +11,12 @@ import (
"time"
"github.com/c2h5oh/datasize"
"github.com/erigontech/mdbx-go/mdbx"
common2 "github.com/ledgerwatch/erigon-lib/common"
"github.com/ledgerwatch/erigon-lib/common/dbg"
"github.com/ledgerwatch/erigon-lib/kv"
mdbx2 "github.com/ledgerwatch/erigon-lib/kv/mdbx"
"github.com/ledgerwatch/log/v3"
"github.com/torquem-ch/mdbx-go/mdbx"
"golang.org/x/exp/maps"
"golang.org/x/sync/errgroup"
"golang.org/x/sync/semaphore"