Skip to content

Commit

Permalink
Merge pull request #403 from multiversx/new-libs-2024.12.23
Browse files Browse the repository at this point in the history 
Integrated new dependencies 2024.12.23
  • Loading branch information
@iulianpascalau
iulianpascalau authored Dec 27, 2024
2 parents e01da85 + 5b7832f commit 2eb7c1e
Show file tree
Hide file tree
Showing 10 changed files with 105 additions and 92 deletions.
4 changes: 3 additions & 1 deletion cmd/bridge/config/config.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@
[P2P]
Port = "37373-38383"
InitialPeerList = []
ProtocolID = "/erd/relay/1.0.0"
ProtocolIDs = [
"/multiversx/evm",
]
[P2P.Transports]
QUICAddress = "" # optional QUIC address. If this transport should be activated, should be in this format: /ip4/0.0.0.0/udp/%d/quic-v1
WebSocketAddress = "" # optional WebSocket address. If this transport should be activated, should be in this format: /ip4/0.0.0.0/tcp/%d/ws
Expand Down
2 changes: 1 addition & 1 deletion cmd/bridge/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ func buildNetMessenger(cfg config.Config, marshalizer marshal.Marshalizer) (p2p.
peerDiscoveryConfig := p2pConfig.KadDhtPeerDiscoveryConfig{
Enabled: true,
RefreshIntervalInSec: 5,
ProtocolID: cfg.P2P.ProtocolID,
ProtocolIDs: cfg.P2P.ProtocolIDs,
InitialPeerList: cfg.P2P.InitialPeerList,
BucketSize: 0,
RoutingTableRefreshIntervalInSec: 300,
Expand Down
2 changes: 1 addition & 1 deletion config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ type GasStationConfig struct {
type ConfigP2P struct {
Port string
InitialPeerList []string
ProtocolID string
ProtocolIDs []string
Transports p2pConfig.P2PTransportConfig
AntifloodConfig config.AntifloodConfig
ResourceLimiter p2pConfig.P2PResourceLimiterConfig
Expand Down
8 changes: 6 additions & 2 deletions config/tomlConfigs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ func TestConfigs(t *testing.T) {
P2P: ConfigP2P{
Port: "10010",
InitialPeerList: make([]string, 0),
ProtocolID: "/erd/relay/1.0.0",
ProtocolIDs: []string{
"/erd/relay/1.0.0",
},
Transports: p2pConfig.P2PTransportConfig{
TCP: config.TCPProtocolConfig{
ListenAddress: "/ip4/0.0.0.0/tcp/%d",
Expand Down Expand Up @@ -280,7 +282,9 @@ func TestConfigs(t *testing.T) {
[P2P]
Port = "10010"
InitialPeerList = []
ProtocolID = "/erd/relay/1.0.0"
ProtocolIDs = [
"/erd/relay/1.0.0",
]
[P2P.Transports]
QUICAddress = "" # optional QUIC address. If this transport should be activated, should be in this format: /ip4/0.0.0.0/udp/%d/quic-v1
WebSocketAddress = "" # optional WebSocket address. If this transport should be activated, should be in this format: /ip4/0.0.0.0/tcp/%d/ws
Expand Down
0 docker/docker-compose.yaml → docker/docker-compose-dapps.yml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion docker/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3.9"

services:
chain-simulator:
image: multiversx/chainsimulator:v1.7.13-patch2-fix1
image: multiversx/chainsimulator:v1.8.6
ports:
- 8085:8085
volumes:
Expand Down
3 changes: 1 addition & 2 deletions factory/storageFactory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ import (

// CreateUnitStorer based on the config and the working directory
func CreateUnitStorer(config config.StorageConfig, workingDir string) (core.Storer, error) {
dbConfigHandler := factory.NewDBConfigHandler(config.DB)
persisterCreator, err := factory.NewPersisterFactory(dbConfigHandler)
persisterCreator, err := factory.NewPersisterFactory(config.DB)
if err != nil {
return nil, err
}
Expand Down
55 changes: 28 additions & 27 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ go 1.20
require (
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792
github.com/ethereum/go-ethereum v1.13.15
github.com/gin-contrib/cors v1.4.0
github.com/gin-contrib/cors v1.6.0
github.com/gin-contrib/pprof v1.4.0
github.com/gin-gonic/gin v1.9.1
github.com/multiversx/mx-chain-communication-go v1.0.14
github.com/multiversx/mx-chain-core-go v1.2.20
github.com/multiversx/mx-chain-crypto-go v1.2.11
github.com/multiversx/mx-chain-go v1.7.13-patch2
github.com/multiversx/mx-chain-logger-go v1.0.14
github.com/multiversx/mx-sdk-go v1.4.1
github.com/multiversx/mx-chain-communication-go v1.1.1
github.com/multiversx/mx-chain-core-go v1.2.23
github.com/multiversx/mx-chain-crypto-go v1.2.12
github.com/multiversx/mx-chain-go v1.8.6
github.com/multiversx/mx-chain-logger-go v1.0.15
github.com/multiversx/mx-sdk-go v1.4.5
github.com/pelletier/go-toml v1.9.3
github.com/stretchr/testify v1.8.4
github.com/urfave/cli v1.22.10
Expand All @@ -31,9 +31,10 @@ require (
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
github.com/btcsuite/btcd/btcutil v1.1.3 // indirect
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect
github.com/bytedance/sonic v1.9.1 // 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-20221115062448-fe3a3abad311 // indirect
github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
github.com/chenzhuoyu/iasm v0.9.1 // indirect
github.com/cockroachdb/errors v1.8.1 // indirect
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f // indirect
github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593 // indirect
Expand All @@ -60,7 +61,7 @@ require (
github.com/flynn/noise v1.0.0 // indirect
github.com/francoispqt/gojay v1.2.13 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff // indirect
github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
Expand All @@ -69,7 +70,7 @@ require (
github.com/go-ole/go-ole v1.3.0 // 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.14.0 // indirect
github.com/go-playground/validator/v10 v10.19.0 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/goccy/go-json v0.10.2 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
Expand Down Expand Up @@ -106,11 +107,11 @@ require (
github.com/jbenet/goprocess v0.1.4 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.16.5 // indirect
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
github.com/koron/go-ssdp v0.0.4 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/leodido/go-urn v1.2.4 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
github.com/libp2p/go-cidranger v1.1.0 // indirect
github.com/libp2p/go-flow-metrics v0.1.0 // indirect
Expand All @@ -127,7 +128,7 @@ require (
github.com/libp2p/go-yamux/v4 v4.0.0 // indirect
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/miekg/dns v1.1.54 // indirect
Expand All @@ -151,14 +152,14 @@ require (
github.com/multiformats/go-multistream v0.4.1 // indirect
github.com/multiformats/go-varint v0.0.7 // indirect
github.com/multiversx/concurrent-map v0.1.4 // indirect
github.com/multiversx/mx-chain-es-indexer-go v1.4.21 // indirect
github.com/multiversx/mx-chain-scenario-go v1.4.3 // indirect
github.com/multiversx/mx-chain-storage-go v1.0.15 // indirect
github.com/multiversx/mx-chain-vm-common-go v1.5.12 // indirect
github.com/multiversx/mx-chain-vm-go v1.5.29 // indirect
github.com/multiversx/mx-chain-vm-v1_2-go v1.2.67 // indirect
github.com/multiversx/mx-chain-vm-v1_3-go v1.3.68 // indirect
github.com/multiversx/mx-chain-vm-v1_4-go v1.4.97 // indirect
github.com/multiversx/mx-chain-es-indexer-go v1.7.10 // indirect
github.com/multiversx/mx-chain-scenario-go v1.4.4 // indirect
github.com/multiversx/mx-chain-storage-go v1.0.18 // indirect
github.com/multiversx/mx-chain-vm-common-go v1.5.16 // indirect
github.com/multiversx/mx-chain-vm-go v1.5.37 // indirect
github.com/multiversx/mx-chain-vm-v1_2-go v1.2.68 // indirect
github.com/multiversx/mx-chain-vm-v1_3-go v1.3.69 // indirect
github.com/multiversx/mx-chain-vm-v1_4-go v1.4.98 // indirect
github.com/multiversx/mx-components-big-int v1.0.0 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/onsi/ginkgo/v2 v2.11.0 // indirect
Expand All @@ -167,7 +168,7 @@ require (
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
github.com/pborman/uuid v1.2.1 // indirect
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
github.com/pelletier/go-toml/v2 v2.1.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/polydawn/refmt v0.89.0 // indirect
Expand Down Expand Up @@ -197,7 +198,7 @@ require (
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/tyler-smith/go-bip39 v1.1.0 // indirect
github.com/ugorji/go/codec v1.2.11 // indirect
github.com/ugorji/go/codec v1.2.12 // indirect
github.com/urfave/cli/v2 v2.27.1 // indirect
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
github.com/whyrusleeping/timecache v0.0.0-20160911033111-cfcb2f1abfee // indirect
Expand All @@ -211,18 +212,18 @@ require (
go.uber.org/fx v1.19.2 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/arch v0.3.0 // indirect
golang.org/x/arch v0.7.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.15.0 // indirect
gonum.org/v1/gonum v0.11.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/go-playground/validator.v8 v8.18.2 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading

0 comments on commit 2eb7c1e

Please sign in to comment.