Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move from ledgerwatch to erigontech #84

Merged
merged 3 commits into from
Aug 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/go-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.20'
go-version: '1.21'
- run: go mod tidy
- uses: golangci/golangci-lint-action@v4
with:
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ necessarily want people to work for free.
For building the bleeding edge development branch:

```sh
git clone --recurse-submodules https://github.com/ledgerwatch/erigon.git
git clone --recurse-submodules https://github.com/erigontech/erigon.git
cd erigon
git checkout main
make erigon
Expand All @@ -102,14 +102,14 @@ Run the Node. The `<data_directory>` field will be the directory path to your da
./build/bin/erigon --datadir <data_directory> --chain sepolia
```

For more details check [Erigon documentation](https://github.com/ledgerwatch/erigon?tab=readme-ov-file#getting-started)
For more details check [Erigon documentation](https://github.com/erigontech/erigon?tab=readme-ov-file#getting-started)

To set and use a custom address and port, here a
[link to more information on this step](#how-to-run-an-erigon-node-that-can-be-connected-to-the-diagnostics-system)

## Diagnostics Set Up
```
git clone https://github.com/ledgerwatch/diagnostics.git
git clone https://github.com/erigontech/diagnostics.git
cd diagnostics
make build
```
Expand Down Expand Up @@ -158,7 +158,7 @@ Ensure that the Erigon node is already running and run the following command. Tw
```
./build/bin/erigon support <flags>
```
[Support command documentation](https://github.com/ledgerwatch/erigon/tree/main/turbo/app#support)
[Support command documentation](https://github.com/erigontech/erigon/tree/main/turbo/app#support)


#### Step 5:
Expand Down
7 changes: 4 additions & 3 deletions api/api_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ import (
"strconv"

"github.com/go-chi/chi/v5"
api_internal "github.com/ledgerwatch/diagnostics/api/internal"
"github.com/ledgerwatch/diagnostics/internal/erigon_node"
"github.com/ledgerwatch/diagnostics/internal/sessions"

api_internal "github.com/erigontech/diagnostics/api/internal"
"github.com/erigontech/diagnostics/internal/erigon_node"
"github.com/erigontech/diagnostics/internal/sessions"
)

var _ http.Handler = &APIHandler{}
Expand Down
9 changes: 5 additions & 4 deletions api/bridge_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ import (

"github.com/go-chi/chi/v5"
"github.com/gorilla/websocket"
"github.com/ledgerwatch/diagnostics"
"github.com/ledgerwatch/diagnostics/api/internal"
"github.com/ledgerwatch/diagnostics/internal/erigon_node"
"github.com/ledgerwatch/diagnostics/internal/sessions"
"github.com/pkg/errors"

"github.com/erigontech/diagnostics"
"github.com/erigontech/diagnostics/api/internal"
"github.com/erigontech/diagnostics/internal/erigon_node"
"github.com/erigontech/diagnostics/internal/sessions"
)

var _ http.Handler = &APIHandler{}
Expand Down
2 changes: 1 addition & 1 deletion api/internal/error.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"net/http"

"github.com/ledgerwatch/diagnostics"
"github.com/erigontech/diagnostics"
)

type Error struct {
Expand Down
7 changes: 4 additions & 3 deletions api/main_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ import (
"github.com/go-chi/chi/v5"
"github.com/go-chi/chi/v5/middleware"
"github.com/go-chi/cors"
"github.com/ledgerwatch/diagnostics/api/internal"
"github.com/ledgerwatch/diagnostics/internal/erigon_node"
"github.com/ledgerwatch/diagnostics/internal/sessions"

"github.com/erigontech/diagnostics/api/internal"
"github.com/erigontech/diagnostics/internal/erigon_node"
"github.com/erigontech/diagnostics/internal/sessions"
)

type APIServices struct {
Expand Down
6 changes: 3 additions & 3 deletions cmd/diagnostics/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"syscall"
"time"

"github.com/ledgerwatch/diagnostics/api"
"github.com/ledgerwatch/diagnostics/internal/logging"
"github.com/ledgerwatch/diagnostics/internal/sessions"
"github.com/erigontech/diagnostics/api"
"github.com/erigontech/diagnostics/internal/logging"
"github.com/erigontech/diagnostics/internal/sessions"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/ledgerwatch/diagnostics
module github.com/erigontech/diagnostics

go 1.21.5
go 1.21

require (
github.com/go-chi/chi/v5 v5.0.12
Expand Down
3 changes: 2 additions & 1 deletion internal/sessions/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ package sessions

import (
lru "github.com/hashicorp/golang-lru/v2"
"github.com/ledgerwatch/diagnostics/internal/erigon_node"

"github.com/erigontech/diagnostics/internal/erigon_node"
)

var _ CacheService = &Cache{}
Expand Down
2 changes: 1 addition & 1 deletion internal/sessions/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"sync"

"github.com/ledgerwatch/diagnostics/internal/erigon_node"
"github.com/erigontech/diagnostics/internal/erigon_node"
)

type ports struct {
Expand Down
4 changes: 2 additions & 2 deletions quicksetup.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ https://go.dev/doc/install
## Erigon Node Set Up
Clone the Erigon repository
```
git clone --recurse-submodules -j8 https://github.com/ledgerwatch/erigon.git
git clone --recurse-submodules -j8 https://github.com/erigontech/erigon.git
```

Change into the repo, and make sure you are on the ```devel``` branch
Expand All @@ -35,7 +35,7 @@ Run the Node

## Diagnostics Set Up
```
git clone https://github.com/ledgerwatch/diagnostics.git
git clone https://github.com/erigontech/diagnostics.git
cd diagnostics
make build
```
Expand Down