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

Update celo-blockchain #250

Merged
merged 4 commits into from
Feb 26, 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/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.17'
go-version: '1.19'

- name: Install dependencies
run: make deps
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# Stage 1: Build Rosetta
# Outputs: binary @ /rosetta/rosetta
#---------------------------------------------------------------------
FROM golang:1.17-alpine as builder
FROM golang:1.19-alpine as builder
WORKDIR /rosetta
RUN apk add --no-cache make gcc musl-dev linux-headers git

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ You will need the following three repositories cloned locally:

You also need the following dependencies to be met:

- `go >= 1.17`
- `go >= 1.19`
- `golangci` ([installation instructions](https://golangci-lint.run/usage/install/#local-installation)) (linter dependency for the Makefile)

#### Running Rosetta
Expand Down
2 changes: 1 addition & 1 deletion airgap/filterquery_marshall_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func TestFilterQueryMarshalling(t *testing.T) {
name: "Complete",
sample: FilterQueryParams{
Event: EpochRewardsDistributedToVoters,
Topics: [][]interface{}{[]interface{}{"0x00000011"}}, // these will be simple types always
Topics: [][]interface{}{{"0x00000011"}}, // these will be simple types always
FromBlock: big.NewInt(1000),
ToBlock: big.NewInt(2000),
},
Expand Down
10 changes: 5 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
module github.com/celo-org/rosetta

go 1.17
go 1.19

require (
github.com/celo-org/celo-blockchain v1.8.0
github.com/celo-org/kliento v0.2.1-0.20230912125702-70113468d45f
github.com/celo-org/celo-blockchain v1.8.1
github.com/celo-org/kliento v0.2.3
github.com/coinbase/rosetta-sdk-go v0.5.9
github.com/felixge/httpsnoop v1.0.4
github.com/gorilla/handlers v1.4.2
github.com/mattn/go-sqlite3 v1.14.9
github.com/onsi/gomega v1.10.1
github.com/spf13/cobra v1.0.0
github.com/spf13/cobra v1.5.0
github.com/spf13/viper v1.6.3
golang.org/x/crypto v0.17.0
golang.org/x/net v0.17.0
Expand Down Expand Up @@ -65,7 +65,7 @@ require (
github.com/spf13/afero v1.1.2 // indirect
github.com/spf13/cast v1.3.0 // indirect
github.com/spf13/jwalterweatherman v1.0.0 // indirect
github.com/spf13/pflag v1.0.3 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
github.com/tklauser/go-sysconf v0.3.5 // indirect
Expand Down
87 changes: 50 additions & 37 deletions go.sum

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions service/geth/geth.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"os"
"os/exec"
"path/filepath"
Expand Down Expand Up @@ -174,7 +173,7 @@ func (gs *gethService) setupStaticNodes() error {
return fmt.Errorf("Can't serialize static nodes: %w", err)
}
//nolint:gosec
if err = ioutil.WriteFile(gs.opts.StaticNodesFile(), staticNodesRaw, 0644); err != nil {
if err = os.WriteFile(gs.opts.StaticNodesFile(), staticNodesRaw, 0644); err != nil {
return fmt.Errorf("Can't serialize static nodes: %w", err)
}

Expand Down Expand Up @@ -300,7 +299,7 @@ func (gopts GethOpts) StaticNodesFile() string {
}

func chainConfigFromGenesisFile(genesisPath string) *params.ChainConfig {
data, err := ioutil.ReadFile(genesisPath)
data, err := os.ReadFile(genesisPath)
if err != nil {
log.Crit("Can't read genesis.json on DataDir", "genesisPath", genesisPath, "err", err)
}
Expand Down
Loading