Fixing naming convention for pbss_config.toml's and reverting config.…

…toml to add not add pbss

packaging/templates/mainnet-v1/sentry/sentry/bor/config.toml

@@ -4,8 +4,7 @@ chain = "mainnet"
 # vmdebug = false
 datadir = "/var/lib/bor/data"
 # ancient = ""
-db.engine = "pebble"
-state.scheme = "path"
+# db.engine = "leveldb"
 # keystore = ""
 # "rpc.batchlimit" = 100
 # "rpc.returndatalimit" = 100000

packaging/templates/mainnet-v1/sentry/sentry/bor/pbss_config.toml

@@ -0,0 +1,177 @@
+chain = "mainnet"
+# identity = "node_name"
+# verbosity = 3
+# vmdebug = false
+datadir = "/var/lib/bor/data"
+# ancient = ""
+db.engine = "pebble"
+state.scheme = "path"
+# keystore = ""
+# "rpc.batchlimit" = 100
+# "rpc.returndatalimit" = 100000
+syncmode = "full"
+# gcmode = "full"
+# snapshot = true
+# ethstats = ""
+# devfakeauthor = false
+
+# ["eth.requiredblocks"]
+
+# [log]
+    # vmodule = ""
+    # json = false
+    # backtrace = ""
+    # debug = true
+    # enable-block-tracking = false
+
+[p2p]
+    maxpeers = 200
+    port = 30303
+    # maxpendpeers = 50
+    # bind = "0.0.0.0"
+    # nodiscover = false
+    # nat = "any"
+    # netrestrict = ""
+    # nodekey = ""
+    # nodekeyhex = ""
+    # txarrivalwait = "500ms"
+    # [p2p.discovery]
+        # v4disc = true
+        # v5disc = false
+        # bootnodes = []
+        # bootnodesv4 = []
+        # bootnodesv5 = []
+        # static-nodes = []
+        # trusted-nodes = ["<validator-ip>:<validator-p2p-port>"] # Recommended setting with sentry <> validator architecture
+        # dns = []
+
+# [heimdall]
+    # url = "http://localhost:1317"
+    # "bor.without" = false
+    # grpc-address = ""
+
+[txpool]
+    nolocals = true
+    pricelimit = 25000000000
+    accountslots = 16
+    globalslots = 32768
+    accountqueue = 16
+    globalqueue = 32768
+    lifetime = "1h30m0s"
+    # locals = []
+    # journal = ""
+    # rejournal = "1h0m0s"
+    # pricebump = 10
+
+[miner]
+    gaslimit = 30000000
+    gasprice = "25000000000"
+    # mine = false
+    # etherbase = ""
+    # extradata = ""
+    # recommit = "2m5s"
+    # commitinterrupt = true
+
+[jsonrpc]
+    ipcpath = "/var/lib/bor/bor.ipc"
+    # ipcdisable = false
+    # gascap = 50000000
+    # evmtimeout = "5s"
+    # txfeecap = 5.0
+    # allow-unprotected-txs = false
+    # enabledeprecatedpersonal = false
+    [jsonrpc.http]
+        enabled = true
+        port = 8545
+        host = "127.0.0.1"
+        api = ["eth", "net", "web3", "txpool", "bor"]
+        vhosts = ["*"]
+        corsdomain = ["*"]
+        # prefix = ""
+        # ep-size = 40
+        # ep-requesttimeout = "0s"
+    # [jsonrpc.ws]
+        # enabled = false
+        # port = 8546
+        # prefix = ""
+        # host = "localhost"
+        # api = ["web3", "net"]
+        # origins = ["*"]
+        # ep-size = 40
+        # ep-requesttimeout = "0s"
+    # [jsonrpc.graphql]
+        # enabled = false
+        # port = 0
+        # prefix = ""
+        # host = ""
+        # vhosts = ["*"]
+        # corsdomain = ["*"]
+    # [jsonrpc.auth]
+        # jwtsecret = ""
+        # addr = "localhost"
+        # port = 8551
+        # vhosts = ["localhost"]
+    # [jsonrpc.timeouts]
+        # read = "10s"
+        # write = "30s"
+        # idle = "2m0s"
+
+[gpo]
+    # blocks = 20
+    # percentile = 60
+    # maxheaderhistory = 1024
+    # maxblockhistory = 1024
+    # maxprice = "5000000000000"
+    ignoreprice = "25000000000"
+
+[telemetry]
+    metrics = true
+    # expensive = false
+    # prometheus-addr = ""
+    # opencollector-endpoint = ""
+    # [telemetry.influx]
+        # influxdb = false
+        # endpoint = ""
+        # database = ""
+        # username = ""
+        # password = ""
+        # influxdbv2 = false
+        # token = ""
+        # bucket = ""
+        # organization = ""
+    # [telemetry.influx.tags]
+
+[cache]
+    cache = 4096
+    # gc = 25
+    # snapshot = 10
+    # database = 50
+    # trie = 15
+    # noprefetch = false
+    # preimages = false
+    # txlookuplimit = 2350000
+    # blocklogs = 32
+    # timeout = "1h0m0s"
+    # fdlimit = 0
+
+# [accounts]
+    # unlock = []
+    # password = ""
+    # allow-insecure-unlock = false
+    # lightkdf = false
+    # disable-bor-wallet = false
+
+# [grpc]
+    # addr = ":3131"
+
+# [developer]
+    # dev = false
+    # period = 0
+    # gaslimit = 11500000
+
+# [pprof]
+#   pprof = false
+#   port = 6060
+#   addr = "127.0.0.1"
+#   memprofilerate = 524288
+#   blockprofilerate = 0

packaging/templates/mainnet-v1/sentry/validator/bor/config.toml

@@ -6,8 +6,7 @@ chain = "mainnet"
 # vmdebug = false
 datadir = "/var/lib/bor/data"
 # ancient = ""
-db.engine = "pebble"
-state.scheme = "path"
+# db.engine = "leveldb"
 # keystore = "$BOR_DIR/keystore"
 # "rpc.batchlimit" = 100
 # "rpc.returndatalimit" = 100000

packaging/templates/mainnet-v1/sentry/validator/bor/pbss_config.toml

@@ -0,0 +1,179 @@
+# NOTE: Update and uncomment: `keystore`, `password`, and `unlock` fields.
+
+chain = "mainnet"
+# identity = "node_name"
+# verbosity = 3
+# vmdebug = false
+datadir = "/var/lib/bor/data"
+# ancient = ""
+db.engine = "pebble"
+state.scheme = "path"
+# keystore = "$BOR_DIR/keystore"
+# "rpc.batchlimit" = 100
+# "rpc.returndatalimit" = 100000
+syncmode = "full"
+# gcmode = "full"
+# snapshot = true
+# ethstats = ""
+# devfakeauthor = false
+
+# ["eth.requiredblocks"]
+
+# [log]
+    # vmodule = ""
+    # json = false
+    # backtrace = ""
+    # debug = true
+    # enable-block-tracking = false
+
+[p2p]
+    maxpeers = 200
+    port = 30303
+    nodiscover = true
+    # maxpendpeers = 50
+    # bind = "0.0.0.0"
+    # nat = "any"
+    # netrestrict = ""
+    # nodekey = ""
+    # nodekeyhex = ""
+    # txarrivalwait = "500ms"
+    # [p2p.discovery]
+        # v4disc = true
+        # v5disc = false
+        # bootnodes = ["enode://b8f1cc9c5d4403703fbf377116469667d2b1823c0daf16b7250aa576bacf399e42c3930ccfcb02c5df6879565a2b8931335565f0e8d3f8e72385ecf4a4bf160a@3.36.224.80:30303", "enode://8729e0c825f3d9cad382555f3e46dcff21af323e89025a0e6312df541f4a9e73abfa562d64906f5e59c51fe6f0501b3e61b07979606c56329c020ed739910759@54.194.245.5:30303"]
+        # bootnodesv4 = []
+        # bootnodesv5 = []
+        # static-nodes = ["<sentry-ip>:<sentry-p2p-port>"] # Recommended setting with sentry <> validator architecture
+        # trusted-nodes = []
+        # dns = []
+
+# [heimdall]
+    # url = "http://localhost:1317"
+    # "bor.without" = false
+    # grpc-address = ""
+
+[txpool]
+    nolocals = true
+    pricelimit = 25000000000
+    accountslots = 16
+    globalslots = 32768
+    accountqueue = 16
+    globalqueue = 32768
+    lifetime = "1h30m0s"
+    # locals = []
+    # journal = ""
+    # rejournal = "1h0m0s"
+    # pricebump = 10
+
+[miner]
+    mine = true
+    gaslimit = 30000000
+    gasprice = "25000000000"
+    # etherbase = ""
+    # extradata = ""
+    # recommit = "2m5s"
+    # commitinterrupt = true
+
+[jsonrpc]
+    ipcpath = "/var/lib/bor/bor.ipc"
+    # ipcdisable = false
+    # gascap = 50000000
+    # evmtimeout = "5s"
+    # txfeecap = 5.0
+    # allow-unprotected-txs = false
+    # enabledeprecatedpersonal = false
+    [jsonrpc.http]
+        enabled = true
+        port = 8545
+        host = "127.0.0.1"
+        api = ["eth", "net", "web3", "txpool", "bor"]
+        vhosts = ["*"]
+        corsdomain = ["*"]
+        # prefix = ""
+        # ep-size = 40
+        # ep-requesttimeout = "0s"
+    # [jsonrpc.ws]
+        # enabled = false
+        # port = 8546
+        # prefix = ""
+        # host = "localhost"
+        # api = ["web3", "net"]
+        # origins = ["*"]
+        # ep-size = 40
+        # ep-requesttimeout = "0s"
+    # [jsonrpc.graphql]
+        # enabled = false
+        # port = 0
+        # prefix = ""
+        # host = ""
+        # vhosts = ["*"]
+        # corsdomain = ["*"]
+    # [jsonrpc.auth]
+        # jwtsecret = ""
+        # addr = "localhost"
+        # port = 8551
+        # vhosts = ["localhost"]
+    # [jsonrpc.timeouts]
+        # read = "10s"
+        # write = "30s"
+        # idle = "2m0s"
+
+[gpo]
+    # blocks = 20
+    # percentile = 60
+    # maxheaderhistory = 1024
+    # maxblockhistory = 1024
+    # maxprice = "5000000000000"
+    ignoreprice = "25000000000"
+
+[telemetry]
+    metrics = true
+    # expensive = false
+    # prometheus-addr = ""
+    # opencollector-endpoint = ""
+    # [telemetry.influx]
+        # influxdb = false
+        # endpoint = ""
+        # database = ""
+        # username = ""
+        # password = ""
+        # influxdbv2 = false
+        # token = ""
+        # bucket = ""
+        # organization = ""
+    # [telemetry.influx.tags]
+
+[cache]
+    cache = 4096
+    # gc = 25
+    # snapshot = 10
+    # database = 50
+    # trie = 15
+    # noprefetch = false
+    # preimages = false
+    # txlookuplimit = 2350000
+    # blocklogs = 32
+    # timeout = "1h0m0s"
+    # fdlimit = 0
+
+[accounts]
+    allow-insecure-unlock = true
+    # password = "$BOR_DIR/password.txt"
+    # unlock = ["$ADDRESS"]
+    # lightkdf = false
+    # disable-bor-wallet = false
+
+# [grpc]
+    # addr = ":3131"
+
+# [developer]
+    # dev = false
+    # period = 0
+    # gaslimit = 11500000
+
+# [pprof]
+#   pprof = false
+#   port = 6060
+#   addr = "127.0.0.1"
+#   memprofilerate = 524288
+#   blockprofilerate = 0

packaging/templates/mainnet-v1/without-sentry/bor/config.toml

@@ -6,8 +6,7 @@ chain = "mainnet"
 # vmdebug = false
 datadir = "/var/lib/bor/data"
 # ancient = ""
-db.engine = "pebble"
-state.scheme = "path"
+# db.engine = "leveldb"
 # keystore = "$BOR_DIR/keystore"
 # "rpc.batchlimit" = 100
 # "rpc.returndatalimit" = 100000