diff --git a/README.md b/README.md index 9e38330f44..71a707b7d2 100644 --- a/README.md +++ b/README.md @@ -1,318 +1,70 @@ -## BNB Smart Chain +# BSC Client -The goal of BNB Smart Chain is to bring programmability and interoperability to BNB Beacon Chain. In order to embrace the existing popular community and advanced technology, it will bring huge benefits by staying compatible with all the existing smart contracts on Ethereum and Ethereum tooling. And to achieve that, the easiest solution is to develop based on go-ethereum fork, as we respect the great work of Ethereum very much. +## Background -BNB Smart Chain starts its development based on go-ethereum fork. So you may see many toolings, binaries and also docs are based on Ethereum ones, such as the name “geth”. +The Greenfield Community has introduced the Block Archiver(https://github.com/bnb-chain/greenfield-bsc-archiver), +BSC historical block data is now accessible on Greenfield. To fullfill the need of BSC node operators requiring full sync from the genesis block, +and provide a more efficient synchronization, the Greenfield Peer is introduced. -[![API Reference]( -https://pkg.go.dev/badge/github.com/ethereum/go-ethereum -)](https://pkg.go.dev/github.com/ethereum/go-ethereum?tab=doc) -[![Discord](https://img.shields.io/badge/discord-join%20chat-blue.svg)](https://discord.gg/z2VpC455eU) +## How Greenfield Peer Works -But from that baseline of EVM compatible, BNB Smart Chain introduces a system of 21 validators with Proof of Staked Authority (PoSA) consensus that can support short block time and lower fees. The most bonded validator candidates of staking will become validators and produce blocks. The double-sign detection and other slashing logic guarantee security, stability, and chain finality. +The diagram below illustrates the functionality of the Greenfield Peer. While the Greenfield peer does not participate in +other operations within the BSC network, it solely provides block data to BSC nodes. It does not persist any data on its own; +instead, when it receives requests (GetBodies and GetHeaders) from other BSC nodes, it fetches a bundle of blocks (# of blocks determined +by the Block Archiver Service) from Greenfield and caches them in memory. This ensures the Greenfield peer delivers block data +to BSC nodes efficiently. -Cross-chain transfer and other communication are possible due to native support of interoperability. Relayers and on-chain contracts are developed to support that. BNB Beacon Chain DEX remains a liquid venue of the exchange of assets on both chains. This dual-chain architecture will be ideal for users to take advantage of the fast trading on one side and build their decentralized apps on the other side. **The BNB Smart Chain** will be: +![gnfd peer](/resource/greenfield-peer.png) -- **A self-sovereign blockchain**: Provides security and safety with elected validators. -- **EVM-compatible**: Supports all the existing Ethereum tooling along with faster finality and cheaper transaction fees. -- **Interoperable**: Comes with efficient native dual chain communication; Optimized for scaling high-performance dApps that require fast and smooth user experience. -- **Distributed with on-chain governance**: Proof of Staked Authority brings in decentralization and community participants. As the native token, BNB will serve as both the gas of smart contract execution and tokens for staking. +## How to Run Greenfield Peer -More details in [White Paper](https://www.bnbchain.org/en#smartChain). - -## Key features - -### Proof of Staked Authority -Although Proof-of-Work (PoW) has been approved as a practical mechanism to implement a decentralized network, it is not friendly to the environment and also requires a large size of participants to maintain the security. - -Proof-of-Authority(PoA) provides some defense to 51% attack, with improved efficiency and tolerance to certain levels of Byzantine players (malicious or hacked). -Meanwhile, the PoA protocol is most criticized for being not as decentralized as PoW, as the validators, i.e. the nodes that take turns to produce blocks, have all the authorities and are prone to corruption and security attacks. - -Other blockchains, such as EOS and Cosmos both, introduce different types of Deputy Proof of Stake (DPoS) to allow the token holders to vote and elect the validator set. It increases the decentralization and favors community governance. - -To combine DPoS and PoA for consensus, BNB Smart Chain implement a novel consensus engine called Parlia that: - -1. Blocks are produced by a limited set of validators. -2. Validators take turns to produce blocks in a PoA manner, similar to Ethereum's Clique consensus engine. -3. Validator set are elected in and out based on a staking based governance on BNB Beacon Chain. -4. The validator set change is relayed via a cross-chain communication mechanism. -5. Parlia consensus engine will interact with a set of [system contracts](https://docs.bnbchain.org/bnb-smart-chain/staking/overview/#system-contracts) to achieve liveness slash, revenue distributing and validator set renewing func. - - -### Light Client of BNB Beacon Chain - -To achieve the cross-chain communication from BNB Beacon Chain to BNB Smart Chain, need introduce a on-chain light client verification algorithm. -It contains two parts: - -1. [Stateless Precompiled contracts](https://github.com/bnb-chain/bsc/blob/master/core/vm/contracts_lightclient.go) to do tendermint header verification and Merkle Proof verification. -2. [Stateful solidity contracts](https://github.com/bnb-chain/bsc-genesis-contract/blob/master/contracts/TendermintLightClient.sol) to store validator set and trusted appHash. - -## Native Token - -BNB will run on BNB Smart Chain in the same way as ETH runs on Ethereum so that it remains as `native token` for BSC. This means, -BNB will be used to: - -1. pay `gas` to deploy or invoke Smart Contract on BSC -2. perform cross-chain operations, such as transfer token assets across BNB Smart Chain and BNB Beacon Chain. - -## Building the source - -Many of the below are the same as or similar to go-ethereum. - -For prerequisites and detailed build instructions please read the [Installation Instructions](https://geth.ethereum.org/docs/getting-started/installing-geth). - -Building `geth` requires both a Go (version 1.21 or later) and a C compiler (GCC 5 or higher). You can install -them using your favourite package manager. Once the dependencies are installed, run +### Build ```shell make geth ``` -or, to build the full suite of utilities: +### Config the connection to Block archiver -```shell -make all -``` +The Greenfield Peer will integrate with Block Archiver as backend, so need to config the Block Archiver service in the config file. +take the following config for testnet Block-Archiver as an example: -If you get such error when running the node with self built binary: -```shell -Caught SIGILL in blst_cgo_init, consult /bindinds/go/README.md. -``` -please try to add the following environment variables and build again: -```shell -export CGO_CFLAGS="-O -D__BLST_PORTABLE__" -export CGO_CFLAGS_ALLOW="-O -D__BLST_PORTABLE__" +```toml +[Eth.BlockArchiverConfig] +RPCAddress = "https://gnfd-bsc-archiver-testnet.bnbchain.org" +SPAddress = "https://gnfd-testnet-sp2.bnbchain.org" +BucketName = "testnet-bsc-block" +BlockCacheSize = 1000000 ``` -## Executables +- RPCAddress: the RPC address of the Block Archiver service +- SPAddress: the SP address of the bucket on Greenfield which serves the block data +- BucketName: the bucket name on Greenfield which serves the block data +- BlockCacheSize: the cache size of the block data, note that Greenfield Peer will cache the block data in memory -The bsc project comes with several wrappers/executables found in the `cmd` -directory. +### Run -| Command | Description | -| :--------: | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| **`geth`** | Main BNB Smart Chain client binary. It is the entry point into the BSC network (main-, test- or private net), capable of running as a full node (default), archive node (retaining all historical state) or a light node (retrieving data live). It has the same and more RPC and other interface as go-ethereum and can be used by other processes as a gateway into the BSC network via JSON RPC endpoints exposed on top of HTTP, WebSocket and/or IPC transports. `geth --help` and the [CLI page](https://geth.ethereum.org/docs/interface/command-line-options) for command line options. | -| `clef` | Stand-alone signing tool, which can be used as a backend signer for `geth`. | -| `devp2p` | Utilities to interact with nodes on the networking layer, without running a full blockchain. | -| `abigen` | Source code generator to convert Ethereum contract definitions into easy to use, compile-time type-safe Go packages. It operates on plain [Ethereum contract ABIs](https://docs.soliditylang.org/en/develop/abi-spec.html) with expanded functionality if the contract bytecode is also available. However, it also accepts Solidity source files, making development much more streamlined. Please see our [Native DApps](https://geth.ethereum.org/docs/dapp/native-bindings) page for details. | -| `bootnode` | Stripped down version of our Ethereum client implementation that only takes part in the network node discovery protocol, but does not run any of the higher level application protocols. It can be used as a lightweight bootstrap node to aid in finding peers in private networks. | -| `evm` | Developer utility version of the EVM (Ethereum Virtual Machine) that is capable of running bytecode snippets within a configurable environment and execution mode. Its purpose is to allow isolated, fine-grained debugging of EVM opcodes (e.g. `evm --code 60ff60ff --debug run`). | -| `rlpdump` | Developer utility tool to convert binary RLP ([Recursive Length Prefix](https://ethereum.org/en/developers/docs/data-structures-and-encoding/rlp)) dumps (data encoding used by the Ethereum protocol both network as well as consensus wise) to user-friendlier hierarchical representation (e.g. `rlpdump --hex CE0183FFFFFFC4C304050583616263`). | - -## Running `geth` - -Going through all the possible command line flags is out of scope here (please consult our -[CLI Wiki page](https://geth.ethereum.org/docs/fundamentals/command-line-options)), -but we've enumerated a few common parameter combos to get you up to speed quickly -on how you can run your own `geth` instance. - -### Hardware Requirements - -The hardware must meet certain requirements to run a full node on mainnet: -- VPS running recent versions of Mac OS X, Linux, or Windows. -- IMPORTANT 3 TB(Dec 2023) of free disk space, solid-state drive(SSD), gp3, 8k IOPS, 500 MB/S throughput, read latency <1ms. (if node is started with snap sync, it will need NVMe SSD) -- 16 cores of CPU and 64 GB of memory (RAM) -- Suggest m5zn.6xlarge or r7iz.4xlarge instance type on AWS, c2-standard-16 on Google cloud. -- A broadband Internet connection with upload/download speeds of 5 MB/S - -The requirement for testnet: -- VPS running recent versions of Mac OS X, Linux, or Windows. -- 500G of storage for testnet. -- 4 cores of CPU and 16 gigabytes of memory (RAM). - -### Steps to Run a Fullnode - -#### 1. Download the pre-build binaries -```shell -# Linux -wget $(curl -s https://api.github.com/repos/bnb-chain/bsc/releases/latest |grep browser_ |grep geth_linux |cut -d\" -f4) -mv geth_linux geth -chmod -v u+x geth - -# MacOS -wget $(curl -s https://api.github.com/repos/bnb-chain/bsc/releases/latest |grep browser_ |grep geth_mac |cut -d\" -f4) -mv geth_macos geth -chmod -v u+x geth -``` - -#### 2. Download the config files ```shell -//== mainnet -wget $(curl -s https://api.github.com/repos/bnb-chain/bsc/releases/latest |grep browser_ |grep mainnet |cut -d\" -f4) -unzip mainnet.zip - -//== testnet -wget $(curl -s https://api.github.com/repos/bnb-chain/bsc/releases/latest |grep browser_ |grep testnet |cut -d\" -f4) -unzip testnet.zip +./geth --config ./config.toml --datadir ./node ``` -#### 3. Download snapshot -Download latest chaindata snapshot from [here](https://github.com/bnb-chain/bsc-snapshots). Follow the guide to structure your files. - -Note: If you encounter difficulties downloading the chaindata snapshot and prefer to synchronize from the genesis block on the Chapel testnet, remember to include the additional flag `--chapel` when initially launching Geth. - -#### 4. Start a full node -```shell -./geth --config ./config.toml --datadir ./node --cache 8000 --rpc.allow-unprotected-txs --history.transactions 0 - -## It is recommend to run fullnode with `--tries-verify-mode none` if you want high performance and care little about state consistency -## It will run with Hash-Base Storage Scheme by default -./geth --config ./config.toml --datadir ./node --cache 8000 --rpc.allow-unprotected-txs --history.transactions 0 --tries-verify-mode none +## How to interact with Greenfield Peer as a BSC node -## It runs fullnode with Path-Base Storage Scheme. -## It will enable inline state prune, keeping the latest 90000 blocks' history state by default. -./geth --config ./config.toml --datadir ./node --cache 8000 --rpc.allow-unprotected-txs --history.transactions 0 --tries-verify-mode none --state.scheme path -``` +Configure your BSC node to connect to the Greenfield Peer by adjusting the settings in your configuration file. -#### 5. Monitor node status +Navigate to the P2P section of your BSC node configuration file and specify the enode info of the Greenfield Peer. -Monitor the log from **./node/bsc.log** by default. When the node has started syncing, should be able to see the following output: -```shell -t=2022-09-08T13:00:27+0000 lvl=info msg="Imported new chain segment" blocks=1 txs=177 mgas=17.317 elapsed=31.131ms mgasps=556.259 number=21,153,429 hash=0x42e6b54ba7106387f0650defc62c9ace3160b427702dab7bd1c5abb83a32d8db dirty="0.00 B" -t=2022-09-08T13:00:29+0000 lvl=info msg="Imported new chain segment" blocks=1 txs=251 mgas=39.638 elapsed=68.827ms mgasps=575.900 number=21,153,430 hash=0xa3397b273b31b013e43487689782f20c03f47525b4cd4107c1715af45a88796e dirty="0.00 B" -t=2022-09-08T13:00:33+0000 lvl=info msg="Imported new chain segment" blocks=1 txs=197 mgas=19.364 elapsed=34.663ms mgasps=558.632 number=21,153,431 hash=0x0c7872b698f28cb5c36a8a3e1e315b1d31bda6109b15467a9735a12380e2ad14 dirty="0.00 B" +```toml +# other configurations are omitted +... +[Node.P2P] +MaxPeers = 1 +NoDiscovery = true +TrustedNodes = [] +StaticNodes = ["${enode_info}"] +... ``` -#### 6. Interact with fullnode -Start up `geth`'s built-in interactive [JavaScript console](https://geth.ethereum.org/docs/interface/javascript-console), -(via the trailing `console` subcommand) through which you can interact using [`web3` methods](https://web3js.readthedocs.io/en/) -(note: the `web3` version bundled within `geth` is very old, and not up to date with official docs), -as well as `geth`'s own [management APIs](https://geth.ethereum.org/docs/rpc/server). -This tool is optional and if you leave it out you can always attach to an already running -`geth` instance with `geth attach`. - -#### 7. More - -More details about [running a node](https://docs.bnbchain.org/bnb-smart-chain/developers/node_operators/full_node/) and [becoming a validator](https://docs.bnbchain.org/bnb-smart-chain/validator/create-val/) - -*Note: Although some internal protective measures prevent transactions from -crossing over between the main network and test network, you should always -use separate accounts for play and real money. Unless you manually move -accounts, `geth` will by default correctly separate the two networks and will not make any -accounts available between them.* - -### Configuration - -As an alternative to passing the numerous flags to the `geth` binary, you can also pass a -configuration file via: - -```shell -$ geth --config /path/to/your_config.toml -``` - -To get an idea of how the file should look like you can use the `dumpconfig` subcommand to -export your existing configuration: - -```shell -$ geth --your-favourite-flags dumpconfig -``` - -### Programmatically interfacing `geth` nodes - -As a developer, sooner rather than later you'll want to start interacting with `geth` and the -BSC network via your own programs and not manually through the console. To aid -this, `geth` has built-in support for a JSON-RPC based APIs ([standard APIs](https://ethereum.github.io/execution-apis/api-documentation/) -and [`geth` specific APIs](https://geth.ethereum.org/docs/interacting-with-geth/rpc)). -These can be exposed via HTTP, WebSockets and IPC (UNIX sockets on UNIX based -platforms, and named pipes on Windows). - -The IPC interface is enabled by default and exposes all the APIs supported by `geth`, -whereas the HTTP and WS interfaces need to manually be enabled and only expose a -subset of APIs due to security reasons. These can be turned on/off and configured as -you'd expect. - -HTTP based JSON-RPC API options: - -* `--http` Enable the HTTP-RPC server -* `--http.addr` HTTP-RPC server listening interface (default: `localhost`) -* `--http.port` HTTP-RPC server listening port (default: `8545`) -* `--http.api` API's offered over the HTTP-RPC interface (default: `eth,net,web3`) -* `--http.corsdomain` Comma separated list of domains from which to accept cross origin requests (browser enforced) -* `--ws` Enable the WS-RPC server -* `--ws.addr` WS-RPC server listening interface (default: `localhost`) -* `--ws.port` WS-RPC server listening port (default: `8546`) -* `--ws.api` API's offered over the WS-RPC interface (default: `eth,net,web3`) -* `--ws.origins` Origins from which to accept WebSocket requests -* `--ipcdisable` Disable the IPC-RPC server -* `--ipcapi` API's offered over the IPC-RPC interface (default: `admin,debug,eth,miner,net,personal,txpool,web3`) -* `--ipcpath` Filename for IPC socket/pipe within the datadir (explicit paths escape it) - -You'll need to use your own programming environments' capabilities (libraries, tools, etc) to -connect via HTTP, WS or IPC to a `geth` node configured with the above flags and you'll -need to speak [JSON-RPC](https://www.jsonrpc.org/specification) on all transports. You -can reuse the same connection for multiple requests! - -**Note: Please understand the security implications of opening up an HTTP/WS based -transport before doing so! Hackers on the internet are actively trying to subvert -BSC nodes with exposed APIs! Further, all browser tabs can access locally -running web servers, so malicious web pages could try to subvert locally available -APIs!** - -### Operating a private network -- [BSC-Deploy](https://github.com/bnb-chain/node-deploy/): deploy tool for setting up both BNB Beacon Chain, BNB Smart Chain and the cross chain infrastructure between them. -- [BSC-Docker](https://github.com/bnb-chain/bsc-docker): deploy tool for setting up local BSC cluster in container. - - -## Running a bootnode - -Bootnodes are super-lightweight nodes that are not behind a NAT and are running just discovery protocol. When you start up a node it should log your enode, which is a public identifier that others can use to connect to your node. - -First the bootnode requires a key, which can be created with the following command, which will save a key to boot.key: - -``` -bootnode -genkey boot.key -``` - -This key can then be used to generate a bootnode as follows: - -``` -bootnode -nodekey boot.key -addr :30311 -network bsc -``` - -The choice of port passed to -addr is arbitrary. -The bootnode command returns the following logs to the terminal, confirming that it is running: - -``` -enode://3063d1c9e1b824cfbb7c7b6abafa34faec6bb4e7e06941d218d760acdd7963b274278c5c3e63914bd6d1b58504c59ec5522c56f883baceb8538674b92da48a96@127.0.0.1:0?discport=30311 -Note: you're using cmd/bootnode, a developer tool. -We recommend using a regular node as bootstrap node for production deployments. -INFO [08-21|11:11:30.687] New local node record seq=1,692,616,290,684 id=2c9af1742f8f85ce ip= udp=0 tcp=0 -INFO [08-21|12:11:30.753] New local node record seq=1,692,616,290,685 id=2c9af1742f8f85ce ip=54.217.128.118 udp=30311 tcp=0 -INFO [09-01|02:46:26.234] New local node record seq=1,692,616,290,686 id=2c9af1742f8f85ce ip=34.250.32.100 udp=30311 tcp=0 -``` - -## Contribution - -Thank you for considering helping out with the source code! We welcome contributions -from anyone on the internet, and are grateful for even the smallest of fixes! - -If you'd like to contribute to bsc, please fork, fix, commit and send a pull request -for the maintainers to review and merge into the main code base. If you wish to submit -more complex changes though, please check up with the core devs first on [our discord channel](https://discord.gg/bnbchain) -to ensure those changes are in line with the general philosophy of the project and/or get -some early feedback which can make both your efforts much lighter as well as our review -and merge procedures quick and simple. - -Please make sure your contributions adhere to our coding guidelines: - - * Code must adhere to the official Go [formatting](https://golang.org/doc/effective_go.html#formatting) - guidelines (i.e. uses [gofmt](https://golang.org/cmd/gofmt/)). - * Code must be documented adhering to the official Go [commentary](https://golang.org/doc/effective_go.html#commentary) - guidelines. - * Pull requests need to be based on and opened against the `master` branch. - * Commit messages should be prefixed with the package(s) they modify. - * E.g. "eth, rpc: make trace configs optional" - -Please see the [Developers' Guide](https://geth.ethereum.org/docs/developers/geth-developer/dev-guide) -for more details on configuring your environment, managing project dependencies, and -testing procedures. - -## License +the `enode_info` for BSC Testnet and Mainnet can be found in the [network-info](https://docs.bnbchain.org/bnb-greenfield/for-developers/data-archive/greenfield-peer) page. -The bsc library (i.e. all code outside of the `cmd` directory) is licensed under the -[GNU Lesser General Public License v3.0](https://www.gnu.org/licenses/lgpl-3.0.en.html), -also included in our repository in the `COPYING.LESSER` file. -The bsc binaries (i.e. all code inside of the `cmd` directory) is licensed under the -[GNU General Public License v3.0](https://www.gnu.org/licenses/gpl-3.0.en.html), also -included in our repository in the `COPYING` file. diff --git a/core/blockarchiver/config.go b/core/blockarchiver/config.go index 567b1a585e..3dcc41929f 100644 --- a/core/blockarchiver/config.go +++ b/core/blockarchiver/config.go @@ -8,5 +8,5 @@ type BlockArchiverConfig struct { } var DefaultBlockArchiverConfig = BlockArchiverConfig{ - BlockCacheSize: 5000, + BlockCacheSize: 50000, } diff --git a/core/blockarchiver/service.go b/core/blockarchiver/service.go index 9bb3e7542f..5e100e4eb5 100644 --- a/core/blockarchiver/service.go +++ b/core/blockarchiver/service.go @@ -12,9 +12,9 @@ import ( ) const ( - GetBlockRetry = 3 - GetBlockRetryInterval = 2 * time.Second - RPCTimeout = 10 * time.Second + GetBlockTimeout = 5 * time.Second + + RPCTimeout = 30 * time.Second ) var _ BlockArchiver = (*BlockArchiverService)(nil) @@ -89,8 +89,7 @@ func (c *BlockArchiverService) GetLatestHeader() (*types.Header, error) { // GetBlockByNumber returns the block by number func (c *BlockArchiverService) GetBlockByNumber(number uint64) (*types.Body, *types.Header, error) { - log.Info("get block by number", "number", number) - // check if the block is in the cache + log.Debug("get block by number", "number", number) hash, found := c.hashCache.Get(number) if found { log.Debug("GetBlockByNumber found in cache", number) @@ -105,25 +104,26 @@ func (c *BlockArchiverService) GetBlockByNumber(number uint64) (*types.Body, *ty // getBlockByNumber returns the block by number func (c *BlockArchiverService) getBlockByNumber(number uint64) (*types.Body, *types.Header, error) { - // to avoid concurrent fetching of the same bundle of blocks(), rangeCache applies here, + // to avoid concurrent fetching of the same bundle of blocks, requestLock applies here // if the number is within any of the ranges, should not fetch the bundle from the block archiver service but // wait for a while and fetch from the cache if c.requestLock.IsWithinAnyRange(number) { - log.Info("getBlockByNumber is within any range", number) - // wait for a while, and fetch from the cache - for retry := 0; retry < GetBlockRetry; retry++ { - hash, found := c.hashCache.Get(number) - if found { - body, foundB := c.bodyCache.Get(hash) - header, foundH := c.headerCache.Get(hash) - if foundB && foundH { - return body, header, nil + log.Debug("getBlockByNumber is within any range", number) + if blockRange := c.requestLock.GetRangeForNumber(number); blockRange != nil { + select { + case <-blockRange.done: + hash, found := c.hashCache.Get(number) + if found { + body, foundB := c.bodyCache.Get(hash) + header, foundH := c.headerCache.Get(hash) + if foundB && foundH { + return body, header, nil + } } + case <-time.After(GetBlockTimeout): + return nil, nil, errors.New("block not found") } - time.Sleep(GetBlockRetryInterval) } - // if still not found - return nil, nil, errors.New("block not found") } // fetch the bundle range log.Info("fetching bundle of blocks", "number", number) @@ -155,7 +155,7 @@ func (c *BlockArchiverService) getBlockByNumber(number uint64) (*types.Body, *ty var body *types.Body var header *types.Header - log.Info("populating block cache", "start", start, "end", end) + log.Debug("populating block cache", "start", start, "end", end) for _, b := range blocks { block, err := convertBlock(b) if err != nil { @@ -175,9 +175,7 @@ func (c *BlockArchiverService) getBlockByNumber(number uint64) (*types.Body, *ty // GetBlockByHash returns the block by hash func (c *BlockArchiverService) GetBlockByHash(hash common.Hash) (*types.Body, *types.Header, error) { - log.Info("get block by hash", "hash", hash.Hex()) - log.Info(hash.Hex()) - // check if the block is in the cach + log.Debug("get block by hash", "hash", hash.Hex()) body, foundB := c.bodyCache.Get(hash) header, foundH := c.headerCache.Get(hash) if foundB && foundH { @@ -203,7 +201,7 @@ func (c *BlockArchiverService) GetBlockByHash(hash common.Hash) (*types.Body, *t } func (c *BlockArchiverService) cacheStats() { - for range time.NewTicker(10 * time.Second).C { + for range time.NewTicker(1 * time.Minute).C { log.Info("block archiver cache stats", "bodyCache", c.bodyCache.Len(), "headerCache", c.headerCache.Len(), "hashCache", c.hashCache.Len()) } } diff --git a/core/blockarchiver/types.go b/core/blockarchiver/types.go index 0f84b37823..4bc2c1b960 100644 --- a/core/blockarchiver/types.go +++ b/core/blockarchiver/types.go @@ -110,49 +110,73 @@ type GeneralBlock struct { type Range struct { from uint64 to uint64 + // done is a channel closed when the range is removed + done chan struct{} } // RequestLock is a lock for making sure we don't fetch the same bundle concurrently type RequestLock struct { - rangeMap map[uint64]Range - lookupMap map[uint64]bool + // TODO + // there is tradeoff between using a Map or List of ranges, in this case, the lookup needs to be populated every + // time a new range is added, but the lookup is faster. If we use a list, we need to iterate over the list to check + // if the number is within any of the ranges, but we don't need to populate the lookup every time a new range is added. + rangeMap map[uint64]*Range + lookupMap map[uint64]*Range mu sync.RWMutex } // NewRequestLock creates a new RequestLock func NewRequestLock() *RequestLock { return &RequestLock{ - rangeMap: make(map[uint64]Range), - lookupMap: make(map[uint64]bool), + rangeMap: make(map[uint64]*Range), + lookupMap: make(map[uint64]*Range), } } // IsWithinAnyRange checks if the number is within any of the cached ranges -func (rc *RequestLock) IsWithinAnyRange(num uint64) bool { - rc.mu.RLock() - defer rc.mu.RUnlock() - _, exists := rc.lookupMap[num] +func (rl *RequestLock) IsWithinAnyRange(num uint64) bool { + rl.mu.RLock() + defer rl.mu.RUnlock() + _, exists := rl.lookupMap[num] return exists } // AddRange adds a new range to the cache -func (rc *RequestLock) AddRange(from, to uint64) { - rc.mu.Lock() - defer rc.mu.Unlock() - rc.rangeMap[from] = Range{from, to} +func (rl *RequestLock) AddRange(from, to uint64) { + rl.mu.Lock() + defer rl.mu.Unlock() + newRange := &Range{ + from: from, + to: to, + done: make(chan struct{}), + } + rl.rangeMap[from] = newRange + // provide fast lookup for i := from; i <= to; i++ { - rc.lookupMap[i] = true + rl.lookupMap[i] = newRange } } // RemoveRange removes a range from the cache -func (rc *RequestLock) RemoveRange(from, to uint64) { - rc.mu.Lock() - defer rc.mu.Unlock() - delete(rc.rangeMap, from) +func (rl *RequestLock) RemoveRange(from, to uint64) { + rl.mu.Lock() + defer rl.mu.Unlock() + + r, exists := rl.rangeMap[from] + if !exists { + return + } + delete(rl.rangeMap, from) for i := from; i <= to; i++ { - delete(rc.lookupMap, i) + delete(rl.lookupMap, i) } + close(r.done) +} + +func (rl *RequestLock) GetRangeForNumber(number uint64) *Range { + rl.mu.RLock() + defer rl.mu.RUnlock() + return rl.lookupMap[number] } func ParseBundleName(bundleName string) (uint64, uint64, error) { diff --git a/eth/ethconfig/config.go b/eth/ethconfig/config.go index 4706f31c83..91845579bf 100644 --- a/eth/ethconfig/config.go +++ b/eth/ethconfig/config.go @@ -50,7 +50,7 @@ var FullNodeGPO = gasprice.Config{ // Defaults contains default settings for use on the BSC main net. var Defaults = Config{ - SyncMode: downloader.SnapSync, + SyncMode: downloader.NoSync, NetworkId: 0, // enable auto configuration of networkID == chainID TxLookupLimit: 2350000, TransactionHistory: 2350000, diff --git a/resource/greenfield-peer.png b/resource/greenfield-peer.png new file mode 100644 index 0000000000..8b0e046f25 Binary files /dev/null and b/resource/greenfield-peer.png differ