Skip to content

Commit cf71ad1

Browse files
authored
Merge pull request #38 from flare-foundation/Durango_upgrade
Durango upgrade
2 parents 9e53e19 + cce0bd8 commit cf71ad1

File tree

16 files changed

+250
-183
lines changed

16 files changed

+250
-183
lines changed

.github/workflows/go.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Go
1717
uses: actions/setup-go@v5
1818
with:
19-
go-version: "1.21"
19+
go-version: "1.22"
2020

2121
- name: Download modules
2222
run: go mod download

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,5 @@ config.*.toml
2121
# Logs
2222
/logs
2323

24+
# Other files
25+
.DS_Store

.vscode/launch.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,15 @@
5757
"program": "${workspaceFolder}/indexer/main/indexer.go",
5858
"args": ["--config", "${workspaceFolder}/config.flare.toml"],
5959
"cwd": "${workspaceFolder}"
60+
},
61+
{
62+
"name": "Launch Services (mainnet)",
63+
"type": "go",
64+
"request": "launch",
65+
"mode": "auto",
66+
"program": "${workspaceFolder}/services/main/services.go",
67+
"args": ["--config", "${workspaceFolder}/config.flare_services.toml"],
68+
"cwd": "${workspaceFolder}"
6069
}
6170
]
6271
}

database/types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ const (
2727
PChainTransformSubnetTx PChainTxType = "TRANSFORM_SUBNET_TX"
2828
PChainAddPermissionlessValidatorTx PChainTxType = "ADD_PERMISSIONLESS_VALIDATOR_TX"
2929
PChainAddPermissionlessDelegatorTx PChainTxType = "ADD_PERMISSIONLESS_DELEGATOR_TX"
30+
PChainBaseTx PChainTxType = "BASE_TX"
3031
PChainUnknownTx PChainTxType = "UNKNOWN_TX"
3132
)
3233

dockerfile.indexer

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# build executable
2-
FROM golang:1.21 AS builder
2+
FROM golang:1.22 AS builder
33

44
WORKDIR /build
55

dockerfile.services

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# build executable
2-
FROM golang:1.21 AS builder
2+
FROM golang:1.22 AS builder
33

44
WORKDIR /build
55

go.mod

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
module flare-indexer
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/BurntSushi/toml v1.2.1
7-
github.com/ava-labs/avalanchego v1.10.0
8-
github.com/ava-labs/coreth v0.12.0-rc.2
7+
github.com/ava-labs/avalanchego v1.11.1
8+
github.com/ava-labs/coreth v0.13.0-rc.0
99
github.com/bradleyjkemp/cupaloy v2.3.0+incompatible
1010
github.com/davidebianchi/gswagger v0.9.0
1111
github.com/deckarep/golang-set/v2 v2.1.0
12-
github.com/ethereum/go-ethereum v1.10.26
12+
github.com/ethereum/go-ethereum v1.12.0
1313
github.com/getkin/kin-openapi v0.115.0
1414
github.com/go-playground/validator/v10 v10.12.0
1515
github.com/go-sql-driver/mysql v1.7.0
16-
github.com/google/go-cmp v0.5.9
16+
github.com/google/go-cmp v0.6.0
1717
github.com/gorilla/mux v1.8.0
1818
github.com/kelseyhightower/envconfig v1.4.0
1919
github.com/pkg/errors v0.9.1
2020
github.com/prometheus/client_golang v1.14.0
2121
github.com/rs/cors v1.8.3
22-
github.com/stretchr/testify v1.8.2
22+
github.com/stretchr/testify v1.8.4
2323
github.com/swaggest/swgui v1.6.3
2424
github.com/ybbus/jsonrpc/v3 v3.1.1
25-
go.uber.org/zap v1.24.0
26-
golang.org/x/exp v0.0.0-20230116083435-1de6713980de
25+
go.uber.org/zap v1.26.0
26+
golang.org/x/exp v0.0.0-20231127185646-65229373498e
2727
gopkg.in/natefinch/lumberjack.v2 v2.2.1
2828
gorm.io/driver/mysql v1.4.5
2929
gorm.io/gorm v1.25.0
@@ -39,31 +39,30 @@ require (
3939
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
4040
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4141
github.com/davecgh/go-spew v1.1.1 // indirect
42-
github.com/deckarep/golang-set v1.8.0 // indirect
4342
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
43+
github.com/fsnotify/fsnotify v1.6.0 // indirect
4444
github.com/ghodss/yaml v1.0.0 // indirect
45-
github.com/go-logr/logr v1.2.3 // indirect
45+
github.com/go-logr/logr v1.3.0 // indirect
4646
github.com/go-logr/stdr v1.2.2 // indirect
4747
github.com/go-ole/go-ole v1.2.6 // indirect
4848
github.com/go-openapi/jsonpointer v0.19.5 // indirect
4949
github.com/go-openapi/swag v0.21.1 // indirect
5050
github.com/go-playground/locales v0.14.1 // indirect
5151
github.com/go-playground/universal-translator v0.18.1 // indirect
52-
github.com/go-stack/stack v1.8.0 // indirect
53-
github.com/golang/mock v1.6.0 // indirect
54-
github.com/golang/protobuf v1.5.2 // indirect
55-
github.com/golang/snappy v0.0.4 // indirect
52+
github.com/go-stack/stack v1.8.1 // indirect
53+
github.com/golang/protobuf v1.5.3 // indirect
54+
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
55+
github.com/google/renameio/v2 v2.0.0 // indirect
5656
github.com/google/uuid v1.3.0 // indirect
5757
github.com/gorilla/rpc v1.2.0 // indirect
5858
github.com/gorilla/websocket v1.5.0 // indirect
5959
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 // indirect
60-
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
60+
github.com/holiman/uint256 v1.2.2-0.20230321075855-87b91420868c // indirect
6161
github.com/iancoleman/orderedmap v0.2.0 // indirect
6262
github.com/invopop/yaml v0.2.0 // indirect
6363
github.com/jinzhu/inflection v1.0.0 // indirect
6464
github.com/jinzhu/now v1.1.5 // indirect
6565
github.com/josharian/intern v1.0.0 // indirect
66-
github.com/kr/pretty v0.3.0 // indirect
6766
github.com/leodido/go-urn v1.2.2 // indirect
6867
github.com/mailru/easyjson v0.7.7 // indirect
6968
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
@@ -77,12 +76,9 @@ require (
7776
github.com/prometheus/client_model v0.3.0 // indirect
7877
github.com/prometheus/common v0.39.0 // indirect
7978
github.com/prometheus/procfs v0.9.0 // indirect
80-
github.com/rjeczalik/notify v0.9.3 // indirect
8179
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
8280
github.com/shurcooL/httpgzip v0.0.0-20190720172056-320755c1c1b0 // indirect
83-
github.com/spaolacci/murmur3 v1.1.0 // indirect
84-
github.com/supranational/blst v0.3.11-0.20220920110316-f72618070295 // indirect
85-
github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a // indirect
81+
github.com/supranational/blst v0.3.11 // indirect
8682
github.com/tklauser/go-sysconf v0.3.11 // indirect
8783
github.com/tklauser/numcpus v0.6.0 // indirect
8884
github.com/yusufpapurcu/wmi v1.2.2 // indirect
@@ -94,19 +90,21 @@ require (
9490
go.opentelemetry.io/otel/sdk v1.11.2 // indirect
9591
go.opentelemetry.io/otel/trace v1.11.2 // indirect
9692
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
97-
go.uber.org/atomic v1.10.0 // indirect
98-
go.uber.org/multierr v1.9.0 // indirect
99-
golang.org/x/crypto v0.7.0 // indirect
100-
golang.org/x/net v0.8.0 // indirect
101-
golang.org/x/sync v0.1.0 // indirect
102-
golang.org/x/sys v0.7.0 // indirect
103-
golang.org/x/term v0.6.0 // indirect
104-
golang.org/x/text v0.8.0 // indirect
93+
go.uber.org/mock v0.4.0 // indirect
94+
go.uber.org/multierr v1.10.0 // indirect
95+
golang.org/x/crypto v0.17.0 // indirect
96+
golang.org/x/net v0.19.0 // indirect
97+
golang.org/x/sync v0.5.0 // indirect
98+
golang.org/x/sys v0.15.0 // indirect
99+
golang.org/x/term v0.15.0 // indirect
100+
golang.org/x/text v0.14.0 // indirect
105101
golang.org/x/time v0.3.0 // indirect
106102
gonum.org/v1/gonum v0.12.0 // indirect
107-
google.golang.org/genproto v0.0.0-20230113154510-dbe35b8444a5 // indirect
108-
google.golang.org/grpc v1.52.0 // indirect
109-
google.golang.org/protobuf v1.28.1 // indirect
103+
google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
104+
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
105+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
106+
google.golang.org/grpc v1.58.3 // indirect
107+
google.golang.org/protobuf v1.31.0 // indirect
110108
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
111109
gopkg.in/yaml.v2 v2.4.0 // indirect
112110
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)