Skip to content

Commit 4540980

Browse files
authored
Merge Preprod for v1.6.4 (#593)
1 parent d89942b commit 4540980

File tree

15 files changed

+230
-133
lines changed

15 files changed

+230
-133
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ comma:=,
6060
space:= $() $()
6161
coverpkg=$(subst $(space),$(comma), $(filter-out %/mock %/assets, $(shell go list ./main/... ./sys/... ./storage/... ./service/...)))
6262

63-
startproxeus=PROXEUS_DATA_DIR=$(1)/data PROXEUS_SETTINGS_FILE=$(1)/settings/main.json PROXEUS_TEST_MODE=true artifacts/proxeus &
63+
startproxeus=PROXEUS_DATA_DIR=$(1)/data PROXEUS_SETTINGS_FILE=$(1)/settings/main.json PROXEUS_TEST_MODE=true artifacts/proxeus -ServiceAddress 0.0.0.0:1323 &
6464
stopproxeus=pkill proxeus
6565
startds=curl -s http://localhost:2115 > /dev/null || ( PROXEUS_DATA_DIR=$(1) docker-compose up -d document-service && touch $(1)/ds-started )
6666
startnodes=curl -s http://localhost:8011 > /dev/null || (PROXEUS_PLATFORM_DOMAIN=http://$(DOCKER_GATEWAY):1323 NODE_CRYPTO_RATES_URL=http://localhost:8011 REGISTER_RETRY_INTERVAL=1 docker-compose -f docker-compose.yml -f docker-compose-extra.override.yml up -d node-crypto-forex-rates && touch $(1)/nodes-started )
6767
startmongo=nc -z localhost 27017 2> /dev/null || (docker run -d -p 27017:27017 -p 27018:27018 -p 27019:27019 proxeus/mongo-dev-cluster && sleep 10 && touch $(1)/mongo-started)
68-
waitforproxeus=echo "Waiting for Proxeus to start" ; curl --head -X GET --retry 120 --retry-connrefused --retry-delay 1 --silent -o /dev/null http://localhost:1323 && echo "Proxeus started" || echo "Unable to start Proxeus"
68+
waitforproxeus=echo "Waiting for Proxeus to start" ; curl --head -X GET --retry 120 --retry-connrefused --retry-delay 1 --silent -o /dev/null http://0.0.0.0:1323 && echo "Proxeus started" || echo "Unable to start Proxeus"
6969

7070
ifeq ($(coverage),true)
7171
COVERAGE_OPTS=-coverprofile artifacts/[email protected] -coverpkg="$(coverpkg)"

go.mod

+12-13
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ require (
1313
github.com/dgrijalva/jwt-go v3.2.0+incompatible
1414
github.com/disintegration/imaging v1.6.2
1515
github.com/dop251/goja v0.0.0-20231027120936-b396bb4c349d
16-
github.com/ethereum/go-ethereum v1.14.0
16+
github.com/ethereum/go-ethereum v1.14.5
1717
github.com/fatih/structs v1.1.0 // indirect
1818
github.com/golang/mock v1.6.0
1919
github.com/google/go-querystring v1.1.0 // indirect
2020
github.com/google/renameio v1.0.1
21-
github.com/gorilla/sessions v1.2.2
21+
github.com/gorilla/sessions v1.3.0
2222
github.com/h2non/filetype v1.1.3
2323
github.com/imkira/go-interpol v1.1.0 // indirect
2424
github.com/labstack/gommon v0.4.2
25-
github.com/onsi/gomega v1.33.0
25+
github.com/onsi/gomega v1.33.1
2626
github.com/patrickmn/go-cache v2.1.0+incompatible
2727
github.com/pkg/errors v0.9.1
2828
github.com/robertkrimen/otto v0.4.0
@@ -32,8 +32,8 @@ require (
3232
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
3333
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
3434
go.etcd.io/bbolt v1.3.8 // indirect
35-
golang.org/x/crypto v0.22.0
36-
golang.org/x/net v0.24.0
35+
golang.org/x/crypto v0.24.0
36+
golang.org/x/net v0.26.0
3737
gopkg.in/gavv/httpexpect.v2 v2.16.0
3838
)
3939

@@ -61,19 +61,19 @@ require (
6161

6262
require (
6363
github.com/labstack/echo/v4 v4.12.0
64-
go.mongodb.org/mongo-driver v1.15.0
64+
go.mongodb.org/mongo-driver v1.15.1
6565
)
6666

6767
require (
68-
github.com/Microsoft/go-winio v0.6.1 // indirect
68+
github.com/Microsoft/go-winio v0.6.2 // indirect
6969
github.com/ajg/form v1.5.1 // indirect
7070
github.com/andybalholm/brotli v1.0.6 // indirect
7171
github.com/bits-and-blooms/bitset v1.11.0 // indirect
7272
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
7373
github.com/consensys/bavard v0.1.13 // indirect
7474
github.com/consensys/gnark-crypto v0.12.1 // indirect
7575
github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
76-
github.com/deckarep/golang-set/v2 v2.3.1 // indirect
76+
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
7777
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
7878
github.com/ethereum/c-kzg-4844 v1.0.0 // indirect
7979
github.com/fsnotify/fsnotify v1.7.0 // indirect
@@ -83,7 +83,7 @@ require (
8383
github.com/golang/protobuf v1.5.4 // indirect
8484
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
8585
github.com/google/go-cmp v0.6.0 // indirect
86-
github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a // indirect
86+
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
8787
github.com/google/uuid v1.4.0 // indirect
8888
github.com/gorilla/securecookie v1.1.2 // indirect
8989
github.com/holiman/uint256 v1.2.4 // indirect
@@ -101,12 +101,11 @@ require (
101101
github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0 // indirect
102102
github.com/yudai/gojsondiff v1.0.0 // indirect
103103
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
104-
golang.org/x/mod v0.17.0 // indirect
104+
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
105105
golang.org/x/sync v0.7.0 // indirect
106-
golang.org/x/sys v0.19.0 // indirect
107-
golang.org/x/text v0.14.0 // indirect
106+
golang.org/x/sys v0.21.0 // indirect
107+
golang.org/x/text v0.16.0 // indirect
108108
golang.org/x/time v0.5.0 // indirect
109-
golang.org/x/tools v0.20.0 // indirect
110109
gopkg.in/sourcemap.v1 v1.0.5 // indirect
111110
gopkg.in/yaml.v3 v3.0.1 // indirect
112111
moul.io/http2curl v1.0.1-0.20190925090545-5cd742060b0e // indirect

0 commit comments

Comments
 (0)