Skip to content

Commit

Permalink
Merge pull request #630 from maticnetwork/arpit/master-to-qa
Browse files Browse the repository at this point in the history
RPC fix for coinbase address
  • Loading branch information
temaniarpit27 authored Dec 15, 2022
2 parents 5eebbfa + 9b2407a commit 7217f79
Show file tree
Hide file tree
Showing 25 changed files with 479 additions and 213 deletions.
4 changes: 3 additions & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

# Documentation

- [The new command line interface](./cli)
[The new command line interface (CLI)](./cli) in this version of Bor aims to give users more control over the codebase when interacting with and starting a node. We have made every effort to keep most of the flags similar to the old CLI, except for a few notable changes. One major change is the use of the --config flag, which previously represented fields without available flags. It now represents all flags available to the user, and will overwrite any other flags if provided. As a node operator, you still have the flexibility to modify flags as needed. Please note that this change does not affect the internal functionality of the node, and it remains compatible with Geth and the Ethereum Virtual Machine (EVM).

## Additional notes

Expand All @@ -11,6 +11,8 @@
$ bor server <flags>
```

See [here](./cli/server.md) for more flag details.

- The `bor dumpconfig` sub-command prints the default configurations, in the TOML format, on the terminal. One can `pipe (>)` this to a file (say `config.toml`) and use it to start bor.

- A toml file now can be used instead of flags and can contain all configuration for the node to run. To simply run bor with a configuration file, the following command can be used.
Expand Down
4 changes: 4 additions & 0 deletions docs/cli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@

- [```server```](./server.md)

- [```snapshot```](./snapshot.md)

- [```snapshot prune-state```](./snapshot_prune-state.md)

- [```status```](./status.md)

- [```version```](./version.md)
2 changes: 1 addition & 1 deletion docs/cli/account_import.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ The ```account import``` command imports an account in Json format to the Bor da

- ```datadir```: Path of the data directory to store information

- ```keystore```: Path of the data directory to store information
- ```keystore```: Path of the data directory to store keys
2 changes: 1 addition & 1 deletion docs/cli/account_list.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ The `account list` command lists all the accounts in the Bor data directory.

- ```datadir```: Path of the data directory to store information

- ```keystore```: Path of the data directory to store information
- ```keystore```: Path of the data directory to store keys
2 changes: 1 addition & 1 deletion docs/cli/account_new.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ The `account new` command creates a new local account file on the Bor data direc

- ```datadir```: Path of the data directory to store information

- ```keystore```: Path of the data directory to store information
- ```keystore```: Path of the data directory to store keys
10 changes: 5 additions & 5 deletions docs/cli/bootnode.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

## Options

- ```listen-addr```: listening address of bootnode (<ip>:<port>)
- ```listen-addr```: listening address of bootnode (<ip>:<port>) (default: 0.0.0.0:30303)

- ```v5```: Enable UDP v5
- ```v5```: Enable UDP v5 (default: false)

- ```log-level```: Log level (trace|debug|info|warn|error|crit)
- ```log-level```: Log level (trace|debug|info|warn|error|crit) (default: info)

- ```nat```: port mapping mechanism (any|none|upnp|pmp|extip:<IP>)
- ```nat```: port mapping mechanism (any|none|upnp|pmp|extip:<IP>) (default: none)

- ```node-key```: file or hex node key

- ```save-key```: path to save the ecdsa private key

- ```dry-run```: validates parameters and prints bootnode configurations, but does not start bootnode
- ```dry-run```: validates parameters and prints bootnode configurations, but does not start bootnode (default: false)
4 changes: 2 additions & 2 deletions docs/cli/chain_sethead.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ The ```chain sethead <number>``` command sets the current chain to a certain blo

## Options

- ```address```: Address of the grpc endpoint
- ```address```: Address of the grpc endpoint (default: 127.0.0.1:3131)

- ```yes```: Force set head
- ```yes```: Force set head (default: false)
2 changes: 1 addition & 1 deletion docs/cli/debug_block.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ The ```bor debug block <number>``` command will create an archive containing tra

## Options

- ```address```: Address of the grpc endpoint
- ```address```: Address of the grpc endpoint (default: 127.0.0.1:3131)

- ```output```: Output directory
4 changes: 2 additions & 2 deletions docs/cli/debug_pprof.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ The ```debug pprof <enode>``` command will create an archive containing bor ppro

## Options

- ```address```: Address of the grpc endpoint
- ```address```: Address of the grpc endpoint (default: 127.0.0.1:3131)

- ```seconds```: seconds to trace
- ```seconds```: seconds to trace (default: 2)

- ```output```: Output directory
4 changes: 2 additions & 2 deletions docs/cli/peers_add.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ The ```peers add <enode>``` command joins the local client to another remote pee

## Options

- ```address```: Address of the grpc endpoint
- ```address```: Address of the grpc endpoint (default: 127.0.0.1:3131)

- ```trusted```: Add the peer as a trusted
- ```trusted```: Add the peer as a trusted (default: false)
2 changes: 1 addition & 1 deletion docs/cli/peers_list.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ The ```peers list``` command lists the connected peers.

## Options

- ```address```: Address of the grpc endpoint
- ```address```: Address of the grpc endpoint (default: 127.0.0.1:3131)
4 changes: 2 additions & 2 deletions docs/cli/peers_remove.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ The ```peers remove <enode>``` command disconnects the local client from a conne

## Options

- ```address```: Address of the grpc endpoint
- ```address```: Address of the grpc endpoint (default: 127.0.0.1:3131)

- ```trusted```: Add the peer as a trusted
- ```trusted```: Add the peer as a trusted (default: false)
2 changes: 1 addition & 1 deletion docs/cli/peers_status.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ The ```peers status <peer id>``` command displays the status of a peer by its id

## Options

- ```address```: Address of the grpc endpoint
- ```address```: Address of the grpc endpoint (default: 127.0.0.1:3131)
2 changes: 1 addition & 1 deletion docs/cli/removedb.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ The ```bor removedb``` command will remove the blockchain and state databases at

## Options

- ```address```: Address of the grpc endpoint
- ```address```: Address of the grpc endpoint (default: 127.0.0.1:3131)

- ```datadir```: Path of the data directory to store information
Loading

0 comments on commit 7217f79

Please sign in to comment.