diff --git a/docs/programmers_guide/db_faq.md b/docs/programmers_guide/db_faq.md index b814a32343a..82778ce5526 100644 --- a/docs/programmers_guide/db_faq.md +++ b/docs/programmers_guide/db_faq.md @@ -5,7 +5,7 @@ There are 2 options exist: 1. call --private.api.addr there is grpc interface with low-level data access methods - can read any data in any order, - etc... Interface is here: https://github.com/ledgerwatch/interfaces/blob/master/remote/kv.proto + etc... Interface is here: https://github.com/erigontech/interfaces/blob/master/remote/kv.proto Go/C++/Rust libs already exist. Names of buckets and their format you can find in `erigon-lib/kv/tables.go` You can do such calls by network. 2. Read Erigon's db while Erigon is running - it's also ok - just need be careful - do not run too long read diff --git a/erigon-lib/Makefile b/erigon-lib/Makefile index 61688fa7821..a73cab47c4e 100644 --- a/erigon-lib/Makefile +++ b/erigon-lib/Makefile @@ -27,7 +27,7 @@ PROTOC_OS = linux endif PROTOC_INCLUDE = build/include/google -PROTO_PATH = vendor/github.com/ledgerwatch/interfaces +PROTO_PATH = vendor/github.com/erigontech/interfaces default: gen diff --git a/erigon-lib/go.mod b/erigon-lib/go.mod index 4b53326302f..a8fe1e864e6 100644 --- a/erigon-lib/go.mod +++ b/erigon-lib/go.mod @@ -5,9 +5,9 @@ go 1.21.0 toolchain go1.22.4 require ( + github.com/erigontech/interfaces v0.0.0-20240716134413-fc4152088ee6 github.com/erigontech/mdbx-go v0.38.4 github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240705135436-5d6d882b41f7 - github.com/ledgerwatch/interfaces v0.0.0-20240621204041-2092c22b6ef6 github.com/ledgerwatch/secp256k1 v1.0.0 github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 ) diff --git a/erigon-lib/go.sum b/erigon-lib/go.sum index 97bebece8c0..c00c0be47dd 100644 --- a/erigon-lib/go.sum +++ b/erigon-lib/go.sum @@ -282,8 +282,8 @@ github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7 github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240705135436-5d6d882b41f7 h1:N5yRJ5N5/LIVXFktADDEb6TvlwlIsZTZT0OSGb/rDg4= github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240705135436-5d6d882b41f7/go.mod h1:3AuPxZc85jkehh/HA9h8gabv5MSi3kb/ddtzBsTVJFo= -github.com/ledgerwatch/interfaces v0.0.0-20240621204041-2092c22b6ef6 h1:pQski/IYr3OM6iYdT3y5W6TX/uxEN79Idwbj8wacIug= -github.com/ledgerwatch/interfaces v0.0.0-20240621204041-2092c22b6ef6/go.mod h1:ugQv1QllJzBny3cKZKxUrSnykkjkBgm27eQM6dnGAcc= +github.com/erigontech/interfaces v0.0.0-20240716134413-fc4152088ee6 h1:R1AYJT2FeMEwvBcAuYw7QTezk8DpXTQjCN1y5o0YBvI= +github.com/erigontech/interfaces v0.0.0-20240716134413-fc4152088ee6/go.mod h1:N7OUkhkcagp9+7yb4ycHsG2VWCOmuJ1ONBecJshxtLE= github.com/ledgerwatch/secp256k1 v1.0.0 h1:Usvz87YoTG0uePIV8woOof5cQnLXGYa162rFf3YnwaQ= github.com/ledgerwatch/secp256k1 v1.0.0/go.mod h1:SPmqJFciiF/Q0mPt2jVs2dTr/1TZBTIA+kPMmKgBAak= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= diff --git a/erigon-lib/state/iters_mock.go b/erigon-lib/state/iters_mock.go index c4ee05bd7b0..6e8aa5a757d 100644 --- a/erigon-lib/state/iters_mock.go +++ b/erigon-lib/state/iters_mock.go @@ -15,7 +15,7 @@ import ( common "github.com/ledgerwatch/erigon-lib/common" kv "github.com/ledgerwatch/erigon-lib/kv" order "github.com/ledgerwatch/erigon-lib/kv/order" - iter "github.com/ledgerwatch/erigon-lib/kv/stream" + stream "github.com/ledgerwatch/erigon-lib/kv/stream" gomock "go.uber.org/mock/gomock" ) @@ -160,10 +160,10 @@ func (c *MockCanonicalsReaderTxNum2IDCall) DoAndReturn(f func(kv.Tx, uint64, com } // TxnIdsOfCanonicalBlocks mocks base method. -func (m *MockCanonicalsReader) TxnIdsOfCanonicalBlocks(arg0 kv.Tx, arg1, arg2 int, arg3 order.By, arg4 int) (iter.U64, error) { +func (m *MockCanonicalsReader) TxnIdsOfCanonicalBlocks(arg0 kv.Tx, arg1, arg2 int, arg3 order.By, arg4 int) (stream.U64, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "TxnIdsOfCanonicalBlocks", arg0, arg1, arg2, arg3, arg4) - ret0, _ := ret[0].(iter.U64) + ret0, _ := ret[0].(stream.U64) ret1, _ := ret[1].(error) return ret0, ret1 } @@ -181,19 +181,19 @@ type MockCanonicalsReaderTxnIdsOfCanonicalBlocksCall struct { } // Return rewrite *gomock.Call.Return -func (c *MockCanonicalsReaderTxnIdsOfCanonicalBlocksCall) Return(arg0 iter.U64, arg1 error) *MockCanonicalsReaderTxnIdsOfCanonicalBlocksCall { +func (c *MockCanonicalsReaderTxnIdsOfCanonicalBlocksCall) Return(arg0 stream.U64, arg1 error) *MockCanonicalsReaderTxnIdsOfCanonicalBlocksCall { c.Call = c.Call.Return(arg0, arg1) return c } // Do rewrite *gomock.Call.Do -func (c *MockCanonicalsReaderTxnIdsOfCanonicalBlocksCall) Do(f func(kv.Tx, int, int, order.By, int) (iter.U64, error)) *MockCanonicalsReaderTxnIdsOfCanonicalBlocksCall { +func (c *MockCanonicalsReaderTxnIdsOfCanonicalBlocksCall) Do(f func(kv.Tx, int, int, order.By, int) (stream.U64, error)) *MockCanonicalsReaderTxnIdsOfCanonicalBlocksCall { c.Call = c.Call.Do(f) return c } // DoAndReturn rewrite *gomock.Call.DoAndReturn -func (c *MockCanonicalsReaderTxnIdsOfCanonicalBlocksCall) DoAndReturn(f func(kv.Tx, int, int, order.By, int) (iter.U64, error)) *MockCanonicalsReaderTxnIdsOfCanonicalBlocksCall { +func (c *MockCanonicalsReaderTxnIdsOfCanonicalBlocksCall) DoAndReturn(f func(kv.Tx, int, int, order.By, int) (stream.U64, error)) *MockCanonicalsReaderTxnIdsOfCanonicalBlocksCall { c.Call = c.Call.DoAndReturn(f) return c } diff --git a/erigon-lib/tools.go b/erigon-lib/tools.go index 2e2a229184e..4c95526d272 100644 --- a/erigon-lib/tools.go +++ b/erigon-lib/tools.go @@ -33,15 +33,15 @@ 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/ledgerwatch/interfaces" - _ "github.com/ledgerwatch/interfaces/downloader" - _ "github.com/ledgerwatch/interfaces/execution" - _ "github.com/ledgerwatch/interfaces/p2psentinel" - _ "github.com/ledgerwatch/interfaces/p2psentry" - _ "github.com/ledgerwatch/interfaces/remote" - _ "github.com/ledgerwatch/interfaces/txpool" - _ "github.com/ledgerwatch/interfaces/types" - _ "github.com/ledgerwatch/interfaces/web3" + _ "github.com/erigontech/interfaces" + _ "github.com/erigontech/interfaces/downloader" + _ "github.com/erigontech/interfaces/execution" + _ "github.com/erigontech/interfaces/p2psentinel" + _ "github.com/erigontech/interfaces/p2psentry" + _ "github.com/erigontech/interfaces/remote" + _ "github.com/erigontech/interfaces/txpool" + _ "github.com/erigontech/interfaces/types" + _ "github.com/erigontech/interfaces/web3" _ "go.uber.org/mock/mockgen" _ "go.uber.org/mock/mockgen/model" _ "google.golang.org/grpc/cmd/protoc-gen-go-grpc"