Skip to content

Commit

Permalink
Merge branch 'main' into kirugan/starknet_getCompiledCasm
Browse files Browse the repository at this point in the history
  • Loading branch information
kirugan authored Oct 30, 2024
2 parents dcd80d5 + 3093ca8 commit 3ad1501
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ config/
.envrc
# Default path for Juno DB files. It will get created if you follow the
# README and/or run `./build/juno` command.
juno/
/juno/
p2p-dbs
2 changes: 1 addition & 1 deletion cmd/juno/juno.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ const (
defaultGRPCPort = 6064
defaultRemoteDB = ""
defaultRPCMaxBlockScan = math.MaxUint
defaultCacheSizeMb = 8
defaultCacheSizeMb = 1024
defaultMaxHandles = 1024
defaultGwAPIKey = ""
defaultCNName = ""
Expand Down
8 changes: 4 additions & 4 deletions cmd/juno/juno_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func TestConfigPrecedence(t *testing.T) {
defaultPendingPollInterval := 5 * time.Second
defaultMaxVMs := uint(3 * runtime.GOMAXPROCS(0))
defaultRPCMaxBlockScan := uint(math.MaxUint)
defaultMaxCacheSize := uint(8)
defaultMaxCacheSize := uint(1024)
defaultMaxHandles := 1024
defaultCallMaxSteps := uint(4_000_000)
defaultGwTimeout := 5 * time.Second
Expand All @@ -76,7 +76,7 @@ func TestConfigPrecedence(t *testing.T) {
"custom network all flags": {
inputArgs: []string{
"--log-level", "debug", "--http-port", "4576", "--http-host", "0.0.0.0",
"--db-path", "/home/.juno", "--pprof", "--db-cache-size", "8",
"--db-path", "/home/.juno", "--pprof", "--db-cache-size", "1024",
"--cn-name", "custom", "--cn-feeder-url", "awesome_feeder_url", "--cn-gateway-url", "awesome_gateway_url",
"--cn-l1-chain-id", "0x1", "--cn-l2-chain-id", "SN_AWESOME",
"--cn-unverifiable-range", "0,10",
Expand Down Expand Up @@ -336,7 +336,7 @@ http-port: 4576
"all flags without config file": {
inputArgs: []string{
"--log-level", "debug", "--http-port", "4576", "--http-host", "0.0.0.0",
"--db-path", "/home/.juno", "--network", "sepolia-integration", "--pprof", "--db-cache-size", "8",
"--db-path", "/home/.juno", "--network", "sepolia-integration", "--pprof", "--db-cache-size", "1024",
},
expectedConfig: &node.Config{
LogLevel: utils.DEBUG,
Expand Down Expand Up @@ -424,7 +424,7 @@ pprof: true
pprof-host: 0.0.0.0
pprof-port: 6064
pending-poll-interval: 5s
db-cache-size: 8
db-cache-size: 1024
`,
inputArgs: []string{
"--log-level", "error", "--http", "--http-port", "4577", "--http-host", "127.0.0.1", "--ws", "--ws-port", "4577", "--ws-host", "127.0.0.1",
Expand Down
6 changes: 3 additions & 3 deletions docs/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions node/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@ func New(cfg *Config, version string) (*Node, error) { //nolint:gocyclo,funlen

var p2pService *p2p.Service
if cfg.P2P {
if cfg.Network != utils.Sepolia {
return nil, fmt.Errorf("P2P can only be used for %v network. Provided network: %v", utils.Sepolia, cfg.Network)
if cfg.Network == utils.Mainnet {
return nil, fmt.Errorf("P2P cannot be used on %v network", utils.Mainnet)
}
log.Warnw("P2P features enabled. Please note P2P is in experimental stage")

Expand Down
2 changes: 1 addition & 1 deletion rpc/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ func (h *Handler) MethodsV0_7() ([]jsonrpc.Method, string) { //nolint: funlen
},
{
Name: "starknet_specVersion",
Handler: h.SpecVersion,
Handler: h.SpecVersionV0_7,
},
{
Name: "juno_subscribeNewHeads",
Expand Down

0 comments on commit 3ad1501

Please sign in to comment.