update dependencies

pinax-network · Mar 6, 2024 · 023c224 · 023c224
1 parent c61e5e8
commit 023c224
Show file tree

Hide file tree

Showing 14 changed files with 499 additions and 179 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -24,18 +24,8 @@ jobs:
         go-version: [ 1.21.x ]
 
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup SSH Keys and known_hosts
-        env:
-          SSH_AUTH_SOCK: /tmp/ssh_agent.sock
-        run: |
-          ssh-agent -a $SSH_AUTH_SOCK > /dev/null
-          ssh-add - <<< "${{ secrets.SSH_EOSN_DEPLOY_KEY }}"
-          git config --global url."git@github.com:pinax-network".insteadOf "https://github.com/pinax-network"
-          git config --global url."git@github.com:pomelo-io".insteadOf "https://github.com/pomelo-io"
-          git config --global url."git@github.com:eosnationftw".insteadOf "https://github.com/eosnationftw"    
-
+      - name: Checkout repository
+        uses: actions/checkout@v4
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
@@ -57,9 +47,6 @@ jobs:
           password: ${{secrets.GITHUB_TOKEN}}
 
       - name: Build & Push Docker Image
-        env:
-          GOPRIVATE: github.com/pinax-network,github.com/eosnationftw,github.com/pomelo-io
-          SSH_AUTH_SOCK: /tmp/ssh_agent.sock
         run: |
           cd api-service
           task build:docker
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -16,17 +16,8 @@ jobs:
         go-version: [ 1.21.x ]
         os: [ ubuntu-latest ]
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup SSH Keys and known_hosts
-        env:
-          SSH_AUTH_SOCK: /tmp/ssh_agent.sock
-        run: |
-          ssh-agent -a $SSH_AUTH_SOCK > /dev/null
-          ssh-add - <<< "${{ secrets.SSH_EOSN_DEPLOY_KEY }}"
-          git config --global url."git@github.com:pinax-network".insteadOf "https://github.com/pinax-network"
-          git config --global url."git@github.com:pomelo-io".insteadOf "https://github.com/pomelo-io"
-          git config --global url."git@github.com:eosnationftw".insteadOf "https://github.com/eosnationftw"    
+      - name: Checkout repo
+        uses: actions/checkout@v4
 
       - name: Set up Go
         uses: actions/setup-go@v5
@@ -42,9 +33,6 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build
-        env:
-          GOPRIVATE: github.com/pinax-network,github.com/eosnationftw,github.com/pomelo-io
-          SSH_AUTH_SOCK: /tmp/ssh_agent.sock
         run: |
           cd api-service
           task build
diff --git a/.github/workflows/golangci-lint.yaml b/.github/workflows/golangci-lint.yaml
@@ -18,17 +18,8 @@ jobs:
         os: [ ubuntu-latest ]
     name: lint
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup SSH Keys and known_hosts
-        env:
-          SSH_AUTH_SOCK: /tmp/ssh_agent.sock
-        run: |
-          ssh-agent -a $SSH_AUTH_SOCK > /dev/null
-          ssh-add - <<< "${{ secrets.SSH_EOSN_DEPLOY_KEY }}"
-          git config --global url."git@github.com:pinax-network".insteadOf "https://github.com/pinax-network"
-          git config --global url."git@github.com:pomelo-io".insteadOf "https://github.com/pomelo-io"
-          git config --global url."git@github.com:eosnationftw".insteadOf "https://github.com/eosnationftw"      
+      - name: Checkout repo
+        uses: actions/checkout@v4
 
       - uses: actions/setup-go@v5
         with:
@@ -45,9 +36,6 @@ jobs:
 
       - name: Run golangci-lint
         uses: golangci/golangci-lint-action@v4
-        env:
-          GOPRIVATE: github.com/pinax-network,github.com/eosnationftw,github.com/pomelo-io
-          SSH_AUTH_SOCK: /tmp/ssh_agent.sock
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
           version: v1.56

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ This repository contains several components:
 ## Substreams
 For source of block data, you need to have access to consensus layer substreams-enabled firehose endpoint for your chain, powered by [Beacon Firehose](https://github.com/pinax-network/firehose-beacon).
 
-You can either run your own stack (hard) or use endpoints provided by [Pinax](https://pinax.network/) (easy).
+You can either run your own stack or use endpoints provided by [Pinax](https://pinax.network/).
 
 Currently, the following chains are supported:
 - Ethereum: `eth-cl.substreams.pinax.network:443`

diff --git a/api-service/config/config.go b/api-service/config/config.go
@@ -1,7 +1,7 @@
 package config
 
 import (
-	base_config "github.com/eosnationftw/eosn-base-api/config"
+	base_config "github.com/pinax-network/golang-base/config"
 )
 
 type ChainConfig struct {

diff --git a/api-service/controllers/blobs.go b/api-service/controllers/blobs.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/eosnationftw/eosn-base-api/response"
 	"github.com/gin-gonic/gin"
+	"github.com/pinax-network/golang-base/response"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )

diff --git a/api-service/controllers/static.go b/api-service/controllers/static.go
@@ -3,8 +3,8 @@ package controllers
 import (
 	"blob-service/flags"
 
-	"github.com/eosnationftw/eosn-base-api/response"
 	"github.com/gin-gonic/gin"
+	"github.com/pinax-network/golang-base/response"
 )
 
 type VersionResponse struct {

diff --git a/api-service/go.mod b/api-service/go.mod
@@ -1,90 +1,91 @@
 module blob-service
 
-go 1.21
+go 1.22.0
 
 require (
-	github.com/eosnationftw/eosn-base-api v0.0.0-20231128121924-e3635999ed6a
-	github.com/eosnationftw/eosn-base-api/log v0.0.0-20231128121924-e3635999ed6a
 	github.com/friendsofgo/errors v0.9.2
-	github.com/gin-contrib/zap v0.2.0
+	github.com/gin-contrib/zap v1.1.0
 	github.com/gin-gonic/gin v1.9.1
-	github.com/golang/protobuf v1.5.3
+	github.com/golang/protobuf v1.5.4
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
+	github.com/pinax-network/golang-base v0.0.0-20240306170037-5dce44191aa3
+	github.com/pinax-network/golang-base/log v0.0.0-20240306170037-5dce44191aa3
 	github.com/streamingfast/substreams-sink-kv v0.1.3-0.20240214210842-435682b6b7f2
 	github.com/swaggo/files v1.0.1
 	github.com/swaggo/gin-swagger v1.6.0
 	github.com/swaggo/swag v1.16.3
-	go.uber.org/zap v1.26.0
-	golang.org/x/exp v0.0.0-20231127185646-65229373498e
-	google.golang.org/grpc v1.61.0
-	google.golang.org/protobuf v1.32.0
+	go.uber.org/zap v1.27.0
+	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225
+	google.golang.org/grpc v1.62.1
+	google.golang.org/protobuf v1.33.0
 )
 
 require (
-	github.com/Depado/ginprom v1.8.0 // indirect
+	github.com/Depado/ginprom v1.7.11 // indirect
 	github.com/KyleBanks/depth v1.2.1 // indirect
+	github.com/PuerkitoBio/purell v1.1.1 // indirect
+	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
 	github.com/auth0/go-jwt-middleware v1.0.1 // indirect
 	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/bytedance/sonic v1.10.2 // indirect
+	github.com/bytedance/sonic v1.11.2 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
 	github.com/chenzhuoyu/iasm v0.9.1 // indirect
 	github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/go-openapi/jsonpointer v0.20.2 // indirect
-	github.com/go-openapi/jsonreference v0.20.4 // indirect
-	github.com/go-openapi/spec v0.20.14 // indirect
-	github.com/go-openapi/swag v0.22.9 // indirect
+	github.com/go-openapi/jsonpointer v0.19.5 // indirect
+	github.com/go-openapi/jsonreference v0.19.6 // indirect
+	github.com/go-openapi/spec v0.20.4 // indirect
+	github.com/go-openapi/swag v0.19.15 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.16.0 // indirect
+	github.com/go-playground/validator/v10 v10.18.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/gofrs/uuid v4.4.0+incompatible // indirect
 	github.com/gorilla/css v1.0.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
-	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
+	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mailru/easyjson v0.7.6 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/microcosm-cc/bluemonday v1.0.25 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
-	github.com/prometheus/client_golang v1.17.0 // indirect
-	github.com/prometheus/client_model v0.5.0 // indirect
-	github.com/prometheus/common v0.45.0 // indirect
-	github.com/prometheus/procfs v0.12.0 // indirect
-	github.com/sagikazarmark/locafero v0.4.0 // indirect
-	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
-	github.com/sourcegraph/conc v0.3.0 // indirect
-	github.com/spf13/afero v1.11.0 // indirect
-	github.com/spf13/cast v1.6.0 // indirect
+	github.com/pelletier/go-toml/v2 v2.1.1 // indirect
+	github.com/prometheus/client_golang v1.16.0 // indirect
+	github.com/prometheus/client_model v0.4.0 // indirect
+	github.com/prometheus/common v0.44.0 // indirect
+	github.com/prometheus/procfs v0.11.0 // indirect
+	github.com/spf13/afero v1.9.5 // indirect
+	github.com/spf13/cast v1.5.1 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/spf13/viper v1.17.0 // indirect
-	github.com/subosito/gotenv v1.6.0 // indirect
+	github.com/spf13/viper v1.16.0 // indirect
+	github.com/subosito/gotenv v1.4.2 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	github.com/volatiletech/inflect v0.0.1 // indirect
 	github.com/volatiletech/null/v8 v8.1.2 // indirect
 	github.com/volatiletech/randomize v0.0.1 // indirect
 	github.com/volatiletech/strmangle v0.0.5 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/arch v0.6.0 // indirect
-	golang.org/x/crypto v0.19.0 // indirect
+	golang.org/x/arch v0.7.0 // indirect
+	golang.org/x/crypto v0.20.0 // indirect
 	golang.org/x/net v0.21.0 // indirect
 	golang.org/x/sys v0.17.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/tools v0.18.0 // indirect
-	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
+	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )