mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-04 11:03:48 +00:00
* ethdb/pebble: fix nil callbacks (#26650) * eth/downloader: fix timeout resurrection panic (#26652) * common/prque, eth/downloader: fix timeout resurrection panic * common/prque: revert -1 hack for les, temporaryly! * core/state, trie: remove unused error-return from trie Commit operation (#26641) * go.mod: update pebble to latest master (#26654) * core/vm: set tracer-observable `value` of a delegatecall to match parent `value` (#26632) This is a breaking change in the tracing hooks API as well as semantics of the callTracer: - CaptureEnter hook provided a nil value argument in case of DELEGATECALL. However to stay consistent with how delegate calls behave in EVM this hook is changed to pass in the value of the parent call. - callTracer will return parent call's value for DELEGATECALL frames. --------- Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * ethdb: add benchmark test suite (#26659) * params: schedule shanghai fork on sepolia (#26662) * params: schedule shanghai fork on sepolia * params: u64 -> newUint64 * eth/filters: avoid block body retrieval when no matching logs (#25199) Logs stored on disk have minimal information. Contextual information such as block number, index of log in block, index of transaction in block are filled in upon request. We can fill in all these fields only having the block header and list of receipts. But determining the transaction hash of a log requires the block body. The goal of this PR is postponing this retrieval until we are sure we the transaction hash. It happens often that the header bloom filter signals there might be matches in a block, but after actually checking them reveals the logs do not match. We want to avoid fetching the body in this case. Note that this changes the semantics of Backend.GetLogs. Downstream callers of GetLogs now assume log context fields have not been derived, and need to call DeriveFields on the logs if necessary. * eth/tracers: more fork overrides in traceBlockToFile (#26655) This change allows all post-Berlin forks to be specified as overrides for futureForkBlock in the config parameter for traceBlockToFile. * tests/fuzzers: supply gnark multiexp config, fixes #26669 (#26670) This change fixes a fuzzer which broke when we updated the gnark dependency earlier. * cmd/devp2p: reduce output of node crawler (#26674) Our discovery crawler spits out a huge amount of logs, most of which is pretty non-interesting. This change moves the very verbose output to Debug, and adds a 8-second status log message giving the general idea about what's going on. * params: update mainnet + rinkeby CHT (#26677) This change updates the CHT entries for mainnet and rinkeby * eth/filters: replace atomic pointer with value (#26689) * eth/filters: replace atomic.Pointer * fix * improve Co-authored-by: Martin Holst Swende <martin@swende.se> --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * p2p/dnsdisc: fix tests with Go 1.20 (#26690) * eth/catalyst: return error if withdrawals are nil post-shanghai (#26691) Spec: https://github.com/ethereum/execution-apis/blob/main/src/engine/shanghai.md#request * ethdb/pebble: Fix `MemTableStopWritesThreshold` (#26692) MemTableStopWritesThreshold was set to the max size of all memtables before blocking writing but should be set to the max number of memtables. This is documented [here](https://github.com/cockroachdb/pebble/blob/master/options.go#L738-L742). * eth/downloader: handle missing withdrawals if empty list is expected (#26675) This PR relaxes the block body ingress handling a bit: if block body withdrawals are missing (but expected to be empty), the body withdrawals are set to 'empty list' before being passed to upper layers. This fixes an issue where a block passed from EthereumJS to geth was deemed invalid. * params: go-ethereum v1.11.0 stable * params: begin v1.11.1 release cycle * travis, build: update Go to 1.20.1 (#26653) travis, build: update Go to 1.20 * core: check genesis state presence by disk read (#26703) * core, eth/downloader: make body validation more strict (#26704) * eth/downloader: fix empty-body case in queue fetchresult (#26707) * eth/downloader: fix typo (#26716) * all: remove deprecated uses of math.rand (#26710) This PR is a (superior) alternative to https://github.com/ethereum/go-ethereum/pull/26708, it handles deprecation, primarily two specific cases. `rand.Seed` is typically used in two ways - `rand.Seed(time.Now().UnixNano())` -- we seed it, just to be sure to get some random, and not always get the same thing on every run. This is not needed, with global seeding, so those are just removed. - `rand.Seed(1)` this is typically done to ensure we have a stable test. If we rely on this, we need to fix up the tests to use a deterministic prng-source. A few occurrences like this has been replaced with a proper custom source. `rand.Read` has been replaced by `crypto/rand`.`Read` in this PR. * params: go-ethereum v1.11.1 stable * params: begin v1.11.2 release cycle * eth/catalyst: send INVALID instead of INVALID_BLOCK_HASH (#26696) This change will break one hive test, but pass another and it will be the better way going forward * ci: disable coverage reporting in appveyor and travis * eth/catalyst: request too large error (#26722) The method `GetPayloadBodiesByRangeV1` now returns "-38004: Too large request" error if the requested range is too large, according to spec Co-authored-by: Martin Holst Swende <martin@swende.se> * core/trie: remove trie tracer (#26665) This PR contains a small portion of the full pbss PR, namely Remove the tracer from trie (and comitter), and instead using an accessList. Related changes to the Nodeset. --------- Co-authored-by: Gary Rong <garyrong0905@gmail.com> * rpc: fix unmarshaling of null result in CallContext (#26723) The change fixes unmarshaling of JSON null results into json.RawMessage. --------- Co-authored-by: Jason Yuan <jason.yuan@curvegrid.com> Co-authored-by: Jason Yuan <jason.yuan869@gmail.com> * build: ship bootstrapper Go along with builder for PPA (#26731) * build: fix setting env var, temp early exit * build: fix gobootstrap path for the PPA * build: add some PPA debug logs, sigh * internal/build: revert raising the chunk size for PPA * build: yet another weird PPA fix * build: fix (finaly?) the PPA env vars for Go bootstrapping * build: fix Go 1.19.0 bootstrapper issues on 386 PPA * build: enable Lunar Lobster PPA builds * Revert "core/trie: remove trie tracer (#26665)" (#26732) This reverts commit7c749c947a. * cmd/geth: clarify dumpconfig options (#26729) Clarifies the documentation around dumpconfi Signed-off-by: Sungwoo Kim <git@sung-woo.kim> * core, eth: merge snap-sync chain download progress logs (#26676) * core: fix accessor mismatch for genesis state (#26747) * core/rawdb: expose chain freezer constructor without internals (#26748) * all: use unified emptyRootHash and emptyCodeHash (#26718) The EmptyRootHash and EmptyCodeHash are defined everywhere in the codebase, this PR replaces all of them with unified one defined in core/types package, and also defines constants for TxRoot, WithdrawalsRoot and UncleRoot * eth/filters: fix a breaking change and return rpctransaction (#26757) * eth/filters: fix a breaking change and return rpctransaction * eth/filters: fix test cases --------- Co-authored-by: Catror <me@catror.com> * common/math: allow HexOrDecimal to accept unquoted decimals too (#26758) * params: release Geth v1.11.2 * params: begin v.1.11.3 release cycle * log: improve documentation (#26753) Add usage examples * core/rawdb, node: use standalone flock dependency (#26633) * eth: use the last announced finalized block as the sync ancient limit (#26685) * cmd/devp2p: faster crawling + less verbose dns updates (#26697) This improves the speed of DHT crawling by using concurrent requests. It also removes logging of individual DNS updates. * eth/tracers: add native flatCallTracer (aka parity style tracer) (#26377) Adds support for a native call tracer with the Parity format, which outputs call frames in a flat array. This tracer accepts the following options: - `convertParityErrors: true` will convert error messages to match those of Parity - `includePrecompiles: true` will report all calls to precompiles. The default matches Parity's behavior where CALL and STATICCALLs to precompiles are excluded Incompatibilities with Parity include: - Parity removes the result object in case of failure. This behavior is maintained with the exception of reverts. Revert output usually contains useful information, i.e. Solidity revert reason. - The `gasUsed` field accounts for intrinsic gas (e.g. 21000 for simple transfers) and refunds unlike Parity - Block rewards are not reported Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * core: improve withdrawal index assignment in GenerateChain (#26756) This fixes an issue where the withdrawal index was not calculated correctly for multiple withdrawals in a single block. Co-authored-by: Gary Rong <garyrong0905@gmail.com> Co-authored-by: Felix Lange <fjl@twurst.com> * ethdb/pebble: fix range compaction (#26771) * ethdb/pebble: fix range compaction * ethdb/pebble: add comment * ethdb/pebble: fix max memorytable size (#26776) * ethclient: include withdrawals in ethclient block responses (#26778) * include withdrawals in ethclient responses * omit empty withdrawals array in json serialization * all: change chain head markers from block to header (#26777) * core/rawdb, ethdb/pebble: disable pebble on openbsd (#26801) * core: fix a merge fault (#26802) * README, go.mod, event, internal/version: bump min Go to 1.19 (#26803) * travi: remove strange leftover Go version * core, params: schedule Shanghai on goerli (#26795) * core: params: schedule Shanghai on goerli * core/forkid: fix comment * eth: remove admin.peers[i].eth.head and difficulty (#26804) * core/types: add EffectiveGasPrice in Receipt (#26713) This change adds a struct field EffectiveGasPrice in types.Receipt. The field is present in RPC responses, but not in the Go struct, and thus can't easily be accessed via ethclient. Co-authored-by: PulsarAI <dev@pulsar-systems.fi> * core, eth/catalyst: fix race conditions in tests (#26790) Fixes a race in TestNewPayloadOnInvalidTerminalBlock where setting the TTD raced with the miner. Solution: set the TTD on the blockchain config not the genesis config. Also fixes a race in CopyHeader which resulted in race reports all over the place. * metrics: improve accuracy of CPU gauges (#26793) This PR changes metrics collection to actually measure the time interval between collections, rather than assume 3 seconds. I did some ad hoc profiling, and on slower hardware (eg, my Raspberry Pi 4) I routinely saw intervals between 3.3 - 3.5 seconds, with some being as high as 4.5 seconds. This will generally cause the CPU gauge readings to be too high, and in some cases can cause impossibly large values for the CPU load metrics (eg. greater than 400 for a 4 core CPU). --------- Co-authored-by: Felix Lange <fjl@twurst.com> * ethclient: fix panic when requesting missing blocks (#26817) This fixes a regression introduced by #26723. Fixes #26816. * core, miner: revert block gas counter in case of invalid transaction (#26799) This change fixes a flaw where, in certain scenarios, the block sealer did not accurately reset the remaining gas after failing to include an invalid transaction. Fixes #26791 * internal/ethapi: add tests for transaction types JSON marshal/unmarshal (#26667) Checks that Transaction.MarshalJSON and newRPCTransaction JSON output can be parsed by Transaction.UnmarshalJSON --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * cmd/evm: correct `alloc` for `t8n` testdata (#26822) Fixes a minor error in the testdata * eth/tracers/native: set created address to nil in case of failure (#26779) Fixes #26073 * accounts/usbwallet: mitigate ledger app chunking issue (#26773) This PR mitigates an issue with Ledger's on-device RLP deserialization, see https://github.com/LedgerHQ/app-ethereum/issues/409 Ledger's RLP deserialization code does not validate the length of the RLP list received, and it may prematurely enter the signing flow when a APDU chunk boundary falls immediately before the EIP-155 chain_id when deserializing a transaction. Since the chain_id is uninitialized, it is 0 during this signing flow. This may cause the user to accidentally sign the transaction with chain_id = 0. That signature would be returned from the device 1 packet earlier than expected by the communication loop. The device blocks the second-to-last packet waiting for the signer flow, and then errors on the successive packet (which contains the chain_id, zeroed r, and zeroed s) Since the signature's early arrival causes successive errors during the communication process, geth does not parse the improper signature produced by the device, and therefore no improperly-signed transaction can be created. User funds are not at risk. We mitigate by selecting the highest chunk size that leaves at least 4 bytes in the final chunk. * beacon/engine: don't omit empty withdrawals in ExecutionPayloadBodies (#26698) This ensures the "withdrawals" field will always be present in responses to getPayloadBodiesByRangeV1 and getPayloadBodiesByHashV1. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * build: update to go 1.20.2 (#26824) * params: go-ethereum v1.11.3 stable * params: begin v1.11.4 release cycle * core/rawdb: find smallest block stored in key-value store when chain gapped (#26719) This change prints out more information about the problem, in the case where geth detects a gap between leveldb and ancients, so we can determine more exactly where the gap is (what the first missing is). Also prints out more metadata. --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * signer/core: accept all solidity primitive types for EIP-712 signing (#26770) Accept all primitive types in Solidity for EIP-712 from intN, uintN, intN[], uintN[] for N as 0 to 256 in multiples of 8 --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * params: remove EF azure bootnodes (#26828) * core/vm: use golang native big.Int (#26834) reverts #26021, to use the upstream bigint instead. * core/vm: fix typo in comment (#26838) fixes eip 220 -> 2200 * core/forkid: fix issue in validation test (#26544) This changes the test to match the comment description. Using timestampedConfig in this test case is incorrect, the comment says 'local is at Gray Glacier' and isn't aware of more forks. * cmd/evm: update readmes for the tests (#26841) * core, core/types: plain Message struct (#25977) Here, the core.Message interface turns into a plain struct and types.Message gets removed. This is a breaking change to packages core and core/types. While we do not promise API stability for package core, we do for core/types. An exception can be made for types.Message, since it doesn't have any purpose apart from invoking the state transition in package core. types.Message was also marked deprecated by the same commit it got added in,4dca5d4db7(November 2016). The core.Message interface was added in December 2014, in commitdb494170dc, for the purpose of 'testing' state transitions. It's the same change that made transaction struct fields private. Before that, the state transition used *types.Transaction directly. Over time, multiple implementations of the interface accrued across different packages, since constructing a Message is required whenever one wants to invoke the state transition. These implementations all looked very similar, a struct with private fields exposing the fields as accessor methods. By changing Message into a struct with public fields we can remove all these useless interface implementations. It will also hopefully simplify future changes to the type with less updates to apply across all of go-ethereum when a field is added to Message. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * travis: only build PPAs nightly, not on every push, too heavy (#26846) * p2p: small comment typo (#26850) Update server.go * core: add Timestamp method in BlockGen (#26844) Since forks are now scheduled by block time, it can be necessary to check the timestamp of a block while generating transactions. * core/txpool: implement additional DoS defenses (#26648) This adds two new rules to the transaction pool: - A future transaction can not evict a pending transaction. - A transaction can not overspend available funds of a sender. --- Co-authored-by: dwn1998 <42262393+dwn1998@users.noreply.github.com> Co-authored-by: Martin Holst Swende <martin@swende.se> * params: go-ethereum v1.11.4 stable * params: begin v1.11.5 release cycle * tests: define `MuirGlacier` fork (#26856) add muir glacier to t8n * code/vm: fix comment typo (#26865) it should be constantinople rather than contantinople * core: minor code refactor (#26852) * core: refactor code * core: drop it from this anonymous goroutine func * core/txpool: use priceList.Put instead of heap.Push (#26863) Minor refactor to use the 'intended' accessor * eth: return error if 'safe' or 'finalized' tag used pre-merge (#26862) Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Felix Lange <fjl@twurst.com> * .travis.yml: reenable PPA build on tag push (#26873) * core/state, trie: port changes from PBSS (#26763) * p2p/discover: pass invalid discv5 packets to Unhandled channel (#26699) This makes it possible to run another protocol alongside discv5, by reading unhandled packets from the channel. * all: update links in documentation (#26882) Co-authored-by: Stephen Flynn <stephen.flynn@gapac.com> * Increase websocket frame size (from erigon rpc client) (#26883) This increases the maximum allowed message size to 32MB. Originally submitted at https://github.com/ledgerwatch/erigon/pull/2739 example block failure: https://etherscan.io/tx/0x1317d973a55cedf9b0f2df6ea48e8077dd176f5444a3423368a46d6e4db89982#internal * cmd/devp2p, cmd/geth: add version in --help output (#26895) Not sure why this was removed, it's pretty useful to see the version also in --help. * core: show db error-info in case of mismatched hash root (#26870) When a database failure occurs, bubble it up a into statedb, and report it in suitable places, such as during a 'bad block' report. * consensus: improve consensus engine definition (#26871) Makes clear the distinction between Finalize and FinalizedAndAssemble: - In Finalize function, a series of state operations are applied according to consensus rules. The statedb is mutated and the root hash can be checked and compared afterwards. This function should be used in block processing(receive afrom network and apply it locally) but not block generation. - In FinalizeAndAssemble function, after applying state mutations, the block is also to be assembled with the latest state root computed, updating the header. This function should be used in block generation only. * eth/catalyst: increase update consensus timeout (#26840) Increases the time between consensus updates that we give the CL before we start warning the user. * internal/ethapi: avoid int overflow in GetTransactionReceipt (#26911) * trie, accounts/abi: add error-checks (#26914) * rlp: support for uint256 (#26898) This adds built-in support in package rlp for encoding, decoding and generating code dealing with uint256.Int. --------- Co-authored-by: Felix Lange <fjl@twurst.com> * eth: fix output file permissions in admin_exportChain (#26912) * api: Use 0700 file permissions for ExportChain * change perm to 0644 * Update api.go --------- Co-authored-by: Felix Lange <fjl@twurst.com> * trie: reduce unit test time (#26918) * core/txpool: use atomic int added in go1.19 (#26913) Makes use of atomic.Uint64 instead of atomic by pointer * params: schedule shanghai fork on mainnet (#26908) Schedules the shanghai hardfork on timestamp 1681338455 as discussed on ACDE 157: https://github.com/ethereum/execution-specs/pull/727 * core/txpool: allow future local transactions (#26930) Local transactions should not be subject to the "future shouldn't churn pending txs" rule * params: go-ethereum v1.11.5 stable * params: begin v1.11.6 release cycle * build: allow building nightly archives via cron jobs (#26938) * log: add special casing of uint256 into the logger (#26936) * core/rawdb: use atomic int added in go1.19 (#26935) * core/vm: expose jumptable constructors (#26880) When interacting with geth as a library to e.g. produce state tests, it is desirable to obtain the consensus-correct jumptable definition for a given fork. This changes adds accessors so the instructionset can be obtained and characteristics about opcodes can be inspected. * eth/catalyst: fix races (#26950) * core/rawdb: update freezertable read meter (#26946) The meter for "for measuring the effective amount of data read" within the freezertable was never updated. This change remedies that. --------- Signed-off-by: jsvisa <delweng@gmail.com> * cmd/evm, tests: record preimages if dump is expected (#26955) With #25287 we made it so that preimages were not recorded by default. This had the side effect that the evm command is no longer able to dump state since it does a preimage lookup to determine the address represented by a key. This change enables the recording of preimages when the dump command is given. * core/state: add account address to Trie slot accessors (#26934) This changes the Trie interface to add the plain account address as a parameter to all storage-related methods. After the introduction of the TryAccount* functions, TryGet, TryUpdate and TryDelete are now only meant to read an account's storage. In their current form, they assume that an account storage is stored in a separate trie, and that the hashing of the slot is independent of its account's address. The proposed structure for a stateless storage breaks these two assumptions: the hashing of a slot key requires the address and all slots and accounts are stored in a single trie. This PR therefore adds an address parameter to the interface. It is ignored in the MPT version, so this change has no functional impact, however it will reduce the diff size when merging verkle trees. * metrics: add cpu counters (#26796) This PR adds counter metrics for the CPU system and the Geth process. Currently the only metrics available for these items are gauges. Gauges are fine when the consumer scrapes metrics data at the same interval as Geth produces new values (every 3 seconds), but it is likely that most consumers will not scrape that often. Intervals of 10, 15, or maybe even 30 seconds are probably more common. So the problem is, how does the consumer estimate what the CPU was doing in between scrapes. With a counter, it's easy ... you just subtract two successive values and divide by the time to get a nice, accurate average. But with a gauge, you can't do that. A gauge reading is an instantaneous picture of what was happening at that moment, but it gives you no idea about what was going on between scrapes. Taking an average of values is meaningless. * metrics/influxdb: use smaller dependency and reuse code between v1 and v2 reporters (#26963) This change switches to use the smaller influxdata/influxdb1-client package instead of depending on the whole infuxdb package. The new smaller client is very similar to the influxdb-v2 client, which made it possible to refactor the two reporters to reuse code a lot more. * eth/gasprice: change feehistory input type from int to uint64 (#26922) Change input param type from int to uint64 * go.mod: update golang.org/x/tools (#26960) * rlp/rlpgen: print want/expect output string if mismatch (#26932) Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> * ethclient: ensure returned subscription is nil on error (#26976) * core/state, trie: remove Try prefix in Trie accessors (#26975) This change renames StateTrie methods to remove the Try* prefix. We added the Trie methods with prefix 'Try' a long time ago, working around the problem that most existing methods of Trie did not return the database error. This weird naming convention has persisted until now. Co-authored-by: Gary Rong <garyrong0905@gmail.com> * metrics/librato: ensure resp.body closed (#26969) This change ensures that we call Close on a http response body, in various places in the source code (mostly tests) * core/vm: use atomic.Bool (#26951) Make use of new atomic types --------- Co-authored-by: Felix Lange <fjl@twurst.com> Co-authored-by: Martin Holst Swende <martin@swende.se> * core/bloombits: use atomic type (#26993) * core/state: use atomic.Bool (#26992) * graphql: fix data races (#26965) Fixes multiple data races caused by the fact that resolving fields are done concurrently by the graphql library. It also enforces caching at the stateobject level for account fields. * eth/tracers/native: prevent panic for LOG edge-cases (#26848) This PR fixes OOM panic in the callTracer as well as panicing on opcode validation errors (e.g. stack underflow) in callTracer and prestateTracer. Co-authored-by: Martin Holst Swende <martin@swende.se> * internal/debug: add log.logfmt flag to set logging to use logfmt (#26970) * docs: update outdated DeriveSha docs comment (#26968) * remove @gballet as a GraphQL codeowner (#27012) * core: use atomic type (#27011) * graphql: revert storage access regression (#27007) * cmd/geth: Add `--log.format` cli param (#27001) Removes the new --log.logfmt directive and hides --log.json, replacing both with log.format=(json|logfmt|terminal). The hidden log.json option is still respected if log.format is not specified for backwards compatibility. Co-authored-by: Martin Holst Swende <martin@swende.se> * ethdb/pebble: use atomic type (#27014) * common: fix json marshaller MixedcaseAddress (#26998) Fix the json marshaller of MixedcaseAddress * eth/catalyst: improve consensus heartbeat (#26896) improve the heartbeat function that is no longer suitable in the current situation Co-authored-by: “openex27” <“openexkevin@gmail.com”> * miner: use atomic type (#27013) Use the new typed atomics in the miner package * accounts/abi/bind: handle UnpackLog with zero topics (#26920) Adds error handling for the case that UnpackLog or UnpackLogIntoMap is called with a log that has zero topics. --------- Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * cmd/evm: use correct parent number for t8n base fee calculation (#27032) Currently the t8n tool uses the same block number for the current block and its parent while calculating the base fee. This causes incorrect base fee calculation for the london fork block. This commit sets the parent block number to be one less than the current block number * go.mod : update snappy (#27027) * common: delete MakeName (#27023) common,p2p: remove unused function MakeName * cmd/geth: enable log rotation (#26843) This change enables log rotation, which can be activated using the flag --log.rotate. Additional parameters that can be given are: - log.maxsize to set maximum size before files are rotated, - log.maxbackups to set how many files are retailed, - log.maxage to configure max age of rotated files, - log.compress whether to compress rotated files The way to configure location of the logfile(s) is left unchanged, via the `log.logfile` parameter. --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * cmd, miner, signer: avoid panic if keystore is not available (#27039) * cmd, miner, singer: avoid panic if keystore is not available * cmd/geth: print warning instead of panic * test/fuzzers: fuzz rlp handling of big.Int and uint256.Int (#26917) test/fuzzers: fuzz rlp handling of big.Lnt and uint256.Int * core/txpool: move some validation to outside of mutex (#27006) Currently, most of transaction validation while holding the txpool mutex: one exception being an early-on signature check. This PR changes that, so that we do all non-stateful checks before we entering the mutex area. This means they can be performed in parallel, and to enable that, certain fields have been made atomic bools and uint64. * eth/downloader: use atomic types (#27030) * eth/downloader: use atomic type * Update eth/downloader/downloader_test.go Co-authored-by: Martin Holst Swende <martin@swende.se> * Update eth/downloader/downloader_test.go Co-authored-by: Martin Holst Swende <martin@swende.se> --------- Co-authored-by: Martin Holst Swende <martin@swende.se> * core/vm: clarify comment (#27045) * consensus, core/typer: add 4844 excessDataGas to header, tie it to Cancun (#27046) * consensus/misc, params: add EIP-4844 blobfee conversions (#27041) * consensus/misc, params: add EIP-4844 blobfee conversions * consensus/misc: pull in fakeExponential test cases * consensus/misc: reuse bigints * consensus/misc: nit renames, additional larger testcase --------- Co-authored-by: Roberto Bayardo <bayardo@alum.mit.edu> Co-authored-by: Martin Holst Swende <martin@swende.se> * eth/tracers: report correct gasLimit in call tracers (#27029) This includes a semantic change to the `callTracer` as well as `flatCallTracer`. The value of field `gas` in the **first** call frame will change as follows: - It previously contained gas available after initial deductions (i.e. tx costs) - It will now contain the full tx gasLimit value Signed-off-by: jsvisa <delweng@gmail.com> * all: remove debug-field from vm config (#27048) This PR removes the Debug field from vmconfig, making it so that if a tracer is set, debug=true is implied. --------- Co-authored-by: 0xTylerHolmes <tyler@ethereum.org> Co-authored-by: Sina Mahmoodi <1591639+s1na@users.noreply.github.com> * metrics: make gauge_float64 and counter_float64 lock free (#27025) Makes the float-gauges lock-free name old time/op new time/op delta CounterFloat64Parallel-8 1.45µs ±10% 0.85µs ± 6% -41.65% (p=0.008 n=5+5) --------- Co-authored-by: Exca-DK <dev@DESKTOP-RI45P4J.localdomain> Co-authored-by: Martin Holst Swende <martin@swende.se> * eth/tracers: use atomic type (#27031) Use the new atomic types in package eth/tracers --------- Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> * build: upgrade -dlgo version to Go 1.20.3 * core/txpool: disallow future churn by remote txs (#26907) Prior to this change, it was possible that transactions are erroneously deemed as 'future' although they are in fact 'pending', causing them to be dropped due to 'future' not being allowed to replace 'pending'. This change fixes that, by doing a more in-depth inspection of the queue. * core, miner: drop transactions from the same sender when error occurs (#27038) This PR unifies the error handling in miner. Whenever an error occur while applying a transaction, the transaction should be regarded as invalid and all following transactions from the same sender not executable because of the nonce restriction. The only exception is the `nonceTooLow` error which is handled separately. * params: new sepolia bootnodes (#27099) New sepolia bootnodes managed by EF devops * cmd/devp2p: fix erroneous log output in crawler (#27089) cmd/devp2p: fix log of ignored recent nodes counter * signer/core: rename testdata files (#27063) Sets a meaningful name on test-files * core: fix comment to reflect function name (#27070) * params: remove `EIP150Hash` from chainconfig (#27087) The EIP150Hash was an idea where, after the fork, we hardcoded the forked hash as an extra defensive mechanism. It wasn't really used, since forks weren't contentious and for all the various testnets and private networks it's been a hassle to have around. This change removes that config field. --------- Signed-off-by: jsvisa <delweng@gmail.com> * p2p: access embedded fields of Server directly (#27078) * consensus/ethash: use atomic type (#27068) * cmd/devp2p: make crawler-route53-updater less verbose (#27116) Follow-up to #26697, makes the crawler less verbose on route53-based scenarios. It also changes the loglevel from debug to info on Updates, which are typically the root, and can be interesting to see. * cmd/geth: rename --vmodule to --log.vmodule (#27071) renames `--vmodule` to `--log.vmodule`, and prints a warning if the old form is used. * core/vm: order opcodes properly (#27113) * metrics: use atomic type (#27121) * all: refactor trie API (#26995) In this PR, all TryXXX(e.g. TryGet) APIs of trie are renamed to XXX(e.g. Get) with an error returned. The original XXX(e.g. Get) APIs are renamed to MustXXX(e.g. MustGet) and does not return any error -- they print a log output. A future PR will change the behaviour to panic on errorrs. * params: go-ethereum v1.11.6 stable * dev: chg: regression changes for bor after merge * dev: chg: more regression changes for bor after merge * dev: chg: txpool_test regression changes after merge * dev: chg: gomock re-generate mocks for backend interface * dev: chg: regression changes after develop is merged into upstream-merge * dev: chg: further fixes merging develop into upstream-merge * dev: chg: apply changes to NewParallelBlockChain * dev: chg: solve some TODOs * dev: fix: CreateConsensusEngine for new ethereum objects * dev: fix: NewParallelBlockChain using Genesis * dev: fix: build ci.go * dev: fix: thelper and tparallel lint * dev: fix: http related and nilnil lint errors * dev: fix: ineffassign lint errors * dev: chg: comment position fix * dev: fix: govet lint errors * dev: fix: error related lint issues * dev: fix: bodyclose lint issues * dev: fix: some wsl lint issues * dev: fix: more wsl lint issues * dev: fix: errorcheck lint issues * dev: fix: solve more lint issues * dev: fix: more wsl lint issues * dev: fix: more errcheck lint issues * dev: fix: most of wsl lint issues * dev: fix: all remaining lint issues * dev: fix: t.Parallel called multiple times * dev: fix: tests failing due to t.Parallel * fix : runtime testcases * fix : testcase : config, addTxWithChain, burnAmount * fix : ethhash bor burn contract * fix : genspec config * fix : freezer, TestStateProcessorErrors * core,eth,miner: fix initial test cases (#922) * fix : TestTransactionIndices, testBeaconSync * fix : TestBeaconSync66 * core,eth: fix TestDeduplication, TestSyncAccountPerformance, TestTraceTransaction * fix : TestTxIndexer * rm : multiple coinbase balance * fix : testCommitInterruptExperimentBor * adding balance send to burntcontract back * Fix header encoding test * core,eth/tracers: fix TestPrestateWithDiffModeTracer * consensus/bor,eth/filters,miner,params,tests: fix mocks * fix : TestGraphQLConcurrentResolvers * fix : TestBuildPayload * common,core,miner: fix goleaks,duplicate init and inconsistent mutex (un)locks * fix : lint * fix : lint * fix : test-integration * fix : test-integration * core: restore AddFeeTransferLog post miner tipping * fix : TestGraphQLConcurrentResolvers * fix : deadlocks * rm: t.parallel from testQueueTimeLimiting tests * Merge branch 'develop' into mardizzone/upstream-merge * fix : lint * fix : test-integration * fix : TxDependency * add rpc.enabledeprecatedpersonal flag --------- Signed-off-by: Sungwoo Kim <git@sung-woo.kim> Signed-off-by: jsvisa <delweng@gmail.com> Co-authored-by: Péter Szilágyi <peterke@gmail.com> Co-authored-by: Martin Holst Swende <martin@swende.se> Co-authored-by: Chris Ziogas <ziogaschr@gmail.com> Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> Co-authored-by: rjl493456442 <garyrong0905@gmail.com> Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> Co-authored-by: Sina Mahmoodi <1591639+s1na@users.noreply.github.com> Co-authored-by: Darioush Jalali <darioush.jalali@avalabs.org> Co-authored-by: Felix Lange <fjl@twurst.com> Co-authored-by: Patrick O'Grady <prohb125@gmail.com> Co-authored-by: ucwong <ucwong@126.com> Co-authored-by: Roman Krasiuk <rokrassyuk@gmail.com> Co-authored-by: Jason Yuan <jason.yuan@curvegrid.com> Co-authored-by: Jason Yuan <jason.yuan869@gmail.com> Co-authored-by: Sungwoo Kim <git@sung-woo.kim> Co-authored-by: Yier <90763233+yierx@users.noreply.github.com> Co-authored-by: Catror <me@catror.com> Co-authored-by: Nate Armstrong <naterarmstrong@gmail.com> Co-authored-by: Dan Cline <6798349+Rjected@users.noreply.github.com> Co-authored-by: Peter (bitfly) <1674920+peterbitfly@users.noreply.github.com> Co-authored-by: PulsarAI <dev@pulsar-systems.fi> Co-authored-by: turboboost55 <7891737+turboboost55@users.noreply.github.com> Co-authored-by: Adrian Sutton <adrian@symphonious.net> Co-authored-by: Guruprasad Kamath <48196632+gurukamath@users.noreply.github.com> Co-authored-by: James Prestwich <10149425+prestwich@users.noreply.github.com> Co-authored-by: Daniel Fernandes <711733+daferna@users.noreply.github.com> Co-authored-by: Rafael Matias <rafael@skyle.net> Co-authored-by: xiyang <90125263+JBossBC@users.noreply.github.com> Co-authored-by: Roberto Bayardo <bayardo@alum.mit.edu> Co-authored-by: panicalways <113693386+panicalways@users.noreply.github.com> Co-authored-by: dwn1998 <42262393+dwn1998@users.noreply.github.com> Co-authored-by: s7v7nislands <s7v7nislands@gmail.com> Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com> Co-authored-by: Stephen Flynn <ssflynn@gmail.com> Co-authored-by: Stephen Flynn <stephen.flynn@gapac.com> Co-authored-by: Jonathan Otto <jonathan.otto@gmail.com> Co-authored-by: Delweng <delweng@gmail.com> Co-authored-by: Guillaume Ballet <3272758+gballet@users.noreply.github.com> Co-authored-by: aaronbuchwald <aaron.buchwald56@gmail.com> Co-authored-by: ucwong <ethereum2k@gmail.com> Co-authored-by: norwnd <112318969+norwnd@users.noreply.github.com> Co-authored-by: jwasinger <j-wasinger@hotmail.com> Co-authored-by: Adrian Sutton <adrian@oplabs.co> Co-authored-by: David Murdoch <187813+davidmurdoch@users.noreply.github.com> Co-authored-by: openex <openexkevin@gmail.com> Co-authored-by: “openex27” <“openexkevin@gmail.com”> Co-authored-by: sudeep <sudeepdino008@gmail.com> Co-authored-by: joohhnnn <68833933+joohhnnn@users.noreply.github.com> Co-authored-by: 0xTylerHolmes <tyler@ethereum.org> Co-authored-by: Exca-DK <85954505+Exca-DK@users.noreply.github.com> Co-authored-by: Exca-DK <dev@DESKTOP-RI45P4J.localdomain> Co-authored-by: Marius Kjærstad <mkjaerstad@protonmail.com> Co-authored-by: Parithosh Jayanthi <parithosh@indenwolken.xyz> Co-authored-by: noel <72006780+0x00Duke@users.noreply.github.com> Co-authored-by: Taeguk Kwon <xornrbboy@gmail.com> Co-authored-by: Anusha <63559942+anusha-ctrl@users.noreply.github.com> Co-authored-by: Alex Beregszaszi <alex@rtfs.hu> Co-authored-by: Shivam Sharma <shivam691999@gmail.com> Co-authored-by: Raneet Debnath <35629432+Raneet10@users.noreply.github.com> Co-authored-by: Raneet Debnath <raneetdebnath10@gmail.com> Co-authored-by: Jerry <jerrycgh@gmail.com> Co-authored-by: Manav Darji <manavdarji.india@gmail.com>
1266 lines
32 KiB
Go
1266 lines
32 KiB
Go
// Copyright 2014 The go-ethereum Authors
|
|
// This file is part of the go-ethereum library.
|
|
//
|
|
// The go-ethereum library is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Lesser General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// The go-ethereum library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
// Package p2p implements the Ethereum p2p network protocols.
|
|
package p2p
|
|
|
|
import (
|
|
"bytes"
|
|
"crypto/ecdsa"
|
|
"encoding/hex"
|
|
"errors"
|
|
"fmt"
|
|
"net"
|
|
"sort"
|
|
"sync"
|
|
"sync/atomic"
|
|
"time"
|
|
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/common/mclock"
|
|
"github.com/ethereum/go-ethereum/crypto"
|
|
"github.com/ethereum/go-ethereum/event"
|
|
"github.com/ethereum/go-ethereum/log"
|
|
"github.com/ethereum/go-ethereum/p2p/discover"
|
|
"github.com/ethereum/go-ethereum/p2p/enode"
|
|
"github.com/ethereum/go-ethereum/p2p/enr"
|
|
"github.com/ethereum/go-ethereum/p2p/nat"
|
|
"github.com/ethereum/go-ethereum/p2p/netutil"
|
|
)
|
|
|
|
const (
|
|
defaultDialTimeout = 15 * time.Second
|
|
|
|
// This is the fairness knob for the discovery mixer. When looking for peers, we'll
|
|
// wait this long for a single source of candidates before moving on and trying other
|
|
// sources.
|
|
discmixTimeout = 5 * time.Second
|
|
|
|
// Connectivity defaults.
|
|
defaultMaxPendingPeers = 50
|
|
defaultDialRatio = 3
|
|
|
|
// This time limits inbound connection attempts per source IP.
|
|
inboundThrottleTime = 30 * time.Second
|
|
|
|
// Maximum time allowed for reading a complete message.
|
|
// This is effectively the amount of time a connection can be idle.
|
|
frameReadTimeout = 30 * time.Second
|
|
|
|
// Maximum amount of time allowed for writing a complete message.
|
|
frameWriteTimeout = 20 * time.Second
|
|
)
|
|
|
|
var errServerStopped = errors.New("server stopped")
|
|
|
|
// Config holds Server options.
|
|
type Config struct {
|
|
// This field must be set to a valid secp256k1 private key.
|
|
PrivateKey *ecdsa.PrivateKey `toml:"-"`
|
|
|
|
// MaxPeers is the maximum number of peers that can be
|
|
// connected. It must be greater than zero.
|
|
MaxPeers int
|
|
|
|
// MaxPendingPeers is the maximum number of peers that can be pending in the
|
|
// handshake phase, counted separately for inbound and outbound connections.
|
|
// Zero defaults to preset values.
|
|
MaxPendingPeers int `toml:",omitempty"`
|
|
|
|
// DialRatio controls the ratio of inbound to dialed connections.
|
|
// Example: a DialRatio of 2 allows 1/2 of connections to be dialed.
|
|
// Setting DialRatio to zero defaults it to 3.
|
|
DialRatio int `toml:",omitempty"`
|
|
|
|
// NoDiscovery can be used to disable the peer discovery mechanism.
|
|
// Disabling is useful for protocol debugging (manual topology).
|
|
NoDiscovery bool
|
|
|
|
// DiscoveryV5 specifies whether the new topic-discovery based V5 discovery
|
|
// protocol should be started or not.
|
|
DiscoveryV5 bool `toml:",omitempty"`
|
|
|
|
// Name sets the node name of this server.
|
|
Name string `toml:"-"`
|
|
|
|
// BootstrapNodes are used to establish connectivity
|
|
// with the rest of the network.
|
|
BootstrapNodes []*enode.Node
|
|
|
|
// BootstrapNodesV5 are used to establish connectivity
|
|
// with the rest of the network using the V5 discovery
|
|
// protocol.
|
|
BootstrapNodesV5 []*enode.Node `toml:",omitempty"`
|
|
|
|
// Static nodes are used as pre-configured connections which are always
|
|
// maintained and re-connected on disconnects.
|
|
StaticNodes []*enode.Node
|
|
|
|
// Trusted nodes are used as pre-configured connections which are always
|
|
// allowed to connect, even above the peer limit.
|
|
TrustedNodes []*enode.Node
|
|
|
|
// Connectivity can be restricted to certain IP networks.
|
|
// If this option is set to a non-nil value, only hosts which match one of the
|
|
// IP networks contained in the list are considered.
|
|
NetRestrict *netutil.Netlist `toml:",omitempty"`
|
|
|
|
// NodeDatabase is the path to the database containing the previously seen
|
|
// live nodes in the network.
|
|
NodeDatabase string `toml:",omitempty"`
|
|
|
|
// Protocols should contain the protocols supported
|
|
// by the server. Matching protocols are launched for
|
|
// each peer.
|
|
Protocols []Protocol `toml:"-" json:"-"`
|
|
|
|
// If ListenAddr is set to a non-nil address, the server
|
|
// will listen for incoming connections.
|
|
//
|
|
// If the port is zero, the operating system will pick a port. The
|
|
// ListenAddr field will be updated with the actual address when
|
|
// the server is started.
|
|
ListenAddr string
|
|
|
|
// If DiscAddr is set to a non-nil value, the server will use ListenAddr
|
|
// for TCP and DiscAddr for the UDP discovery protocol.
|
|
DiscAddr string
|
|
|
|
// If set to a non-nil value, the given NAT port mapper
|
|
// is used to make the listening port available to the
|
|
// Internet.
|
|
NAT nat.Interface `toml:",omitempty"`
|
|
|
|
// If Dialer is set to a non-nil value, the given Dialer
|
|
// is used to dial outbound peer connections.
|
|
Dialer NodeDialer `toml:"-"`
|
|
|
|
// If NoDial is true, the server will not dial any peers.
|
|
NoDial bool `toml:",omitempty"`
|
|
|
|
// If EnableMsgEvents is set then the server will emit PeerEvents
|
|
// whenever a message is sent to or received from a peer
|
|
EnableMsgEvents bool
|
|
|
|
// Logger is a custom logger to use with the p2p.Server.
|
|
Logger log.Logger `toml:",omitempty"`
|
|
|
|
clock mclock.Clock
|
|
|
|
// TxArrivalWait is the duration (ms) that the node will wait after seeing
|
|
// an announced transaction before explicitly requesting it
|
|
TxArrivalWait time.Duration
|
|
}
|
|
|
|
// Server manages all peer connections.
|
|
type Server struct {
|
|
// Config fields may not be modified while the server is running.
|
|
Config
|
|
|
|
// Hooks for testing. These are useful because we can inhibit
|
|
// the whole protocol stack.
|
|
newTransport func(net.Conn, *ecdsa.PublicKey) transport
|
|
newPeerHook func(*Peer)
|
|
listenFunc func(network, addr string) (net.Listener, error)
|
|
|
|
lock sync.Mutex // protects running
|
|
running bool
|
|
|
|
listener net.Listener
|
|
ourHandshake *protoHandshake
|
|
loopWG sync.WaitGroup // loop, listenLoop
|
|
peerFeed event.Feed
|
|
log log.Logger
|
|
|
|
nodedb *enode.DB
|
|
localnode *enode.LocalNode
|
|
ntab *discover.UDPv4
|
|
DiscV5 *discover.UDPv5
|
|
discmix *enode.FairMix
|
|
dialsched *dialScheduler
|
|
|
|
// Channels into the run loop.
|
|
quit chan struct{}
|
|
addtrusted chan *enode.Node
|
|
removetrusted chan *enode.Node
|
|
peerOp chan peerOpFunc
|
|
peerOpDone chan struct{}
|
|
delpeer chan peerDrop
|
|
checkpointPostHandshake chan *conn
|
|
checkpointAddPeer chan *conn
|
|
|
|
// State of run loop and listenLoop.
|
|
inboundHistory expHeap
|
|
}
|
|
|
|
type peerOpFunc func(map[enode.ID]*Peer)
|
|
|
|
type peerDrop struct {
|
|
*Peer
|
|
err error
|
|
requested bool // true if signaled by the peer
|
|
}
|
|
|
|
type connFlag int32
|
|
|
|
const (
|
|
dynDialedConn connFlag = 1 << iota
|
|
staticDialedConn
|
|
inboundConn
|
|
trustedConn
|
|
)
|
|
|
|
// conn wraps a network connection with information gathered
|
|
// during the two handshakes.
|
|
type conn struct {
|
|
fd net.Conn
|
|
transport
|
|
node *enode.Node
|
|
flags connFlag
|
|
cont chan error // The run loop uses cont to signal errors to SetupConn.
|
|
caps []Cap // valid after the protocol handshake
|
|
name string // valid after the protocol handshake
|
|
}
|
|
|
|
type transport interface {
|
|
// The two handshakes.
|
|
doEncHandshake(prv *ecdsa.PrivateKey) (*ecdsa.PublicKey, error)
|
|
doProtoHandshake(our *protoHandshake) (*protoHandshake, error)
|
|
// The MsgReadWriter can only be used after the encryption
|
|
// handshake has completed. The code uses conn.id to track this
|
|
// by setting it to a non-nil value after the encryption handshake.
|
|
MsgReadWriter
|
|
// transports must provide Close because we use MsgPipe in some of
|
|
// the tests. Closing the actual network connection doesn't do
|
|
// anything in those tests because MsgPipe doesn't use it.
|
|
close(err error)
|
|
}
|
|
|
|
func (c *conn) String() string {
|
|
s := c.flags.String()
|
|
if (c.node.ID() != enode.ID{}) {
|
|
s += " " + c.node.ID().String()
|
|
}
|
|
|
|
s += " " + c.fd.RemoteAddr().String()
|
|
|
|
return s
|
|
}
|
|
|
|
func (f connFlag) String() string {
|
|
s := ""
|
|
if f&trustedConn != 0 {
|
|
s += "-trusted"
|
|
}
|
|
|
|
if f&dynDialedConn != 0 {
|
|
s += "-dyndial"
|
|
}
|
|
|
|
if f&staticDialedConn != 0 {
|
|
s += "-staticdial"
|
|
}
|
|
|
|
if f&inboundConn != 0 {
|
|
s += "-inbound"
|
|
}
|
|
|
|
if s != "" {
|
|
s = s[1:]
|
|
}
|
|
|
|
return s
|
|
}
|
|
|
|
func (c *conn) is(f connFlag) bool {
|
|
flags := connFlag(atomic.LoadInt32((*int32)(&c.flags)))
|
|
return flags&f != 0
|
|
}
|
|
|
|
func (c *conn) set(f connFlag, val bool) {
|
|
for {
|
|
oldFlags := connFlag(atomic.LoadInt32((*int32)(&c.flags)))
|
|
|
|
flags := oldFlags
|
|
if val {
|
|
flags |= f
|
|
} else {
|
|
flags &= ^f
|
|
}
|
|
|
|
if atomic.CompareAndSwapInt32((*int32)(&c.flags), int32(oldFlags), int32(flags)) {
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
// LocalNode returns the local node record.
|
|
func (srv *Server) LocalNode() *enode.LocalNode {
|
|
return srv.localnode
|
|
}
|
|
|
|
// Peers returns all connected peers.
|
|
func (srv *Server) Peers() []*Peer {
|
|
var ps []*Peer
|
|
|
|
srv.doPeerOp(func(peers map[enode.ID]*Peer) {
|
|
for _, p := range peers {
|
|
ps = append(ps, p)
|
|
}
|
|
})
|
|
|
|
return ps
|
|
}
|
|
|
|
// This function retrieves the peers that are not trusted-peers
|
|
func (srv *Server) getNonTrustedPeers() []*Peer {
|
|
allPeers := srv.Peers()
|
|
|
|
nontrustedPeers := []*Peer{}
|
|
|
|
for _, peer := range allPeers {
|
|
if !peer.Info().Network.Trusted {
|
|
nontrustedPeers = append(nontrustedPeers, peer)
|
|
}
|
|
}
|
|
|
|
return nontrustedPeers
|
|
}
|
|
|
|
// SetMaxPeers sets the maximum number of peers that can be connected
|
|
func (srv *Server) SetMaxPeers(maxPeers int) {
|
|
currentPeers := srv.getNonTrustedPeers()
|
|
if len(currentPeers) > maxPeers {
|
|
peersToDrop := currentPeers[maxPeers:]
|
|
for _, peer := range peersToDrop {
|
|
log.Warn("CurrentPeers more than MaxPeers", "removing", peer.ID())
|
|
srv.RemovePeer(peer.Node())
|
|
}
|
|
}
|
|
|
|
srv.MaxPeers = maxPeers
|
|
}
|
|
|
|
// PeerCount returns the number of connected peers.
|
|
func (srv *Server) PeerCount() int {
|
|
var count int
|
|
|
|
srv.doPeerOp(func(ps map[enode.ID]*Peer) {
|
|
count = len(ps)
|
|
})
|
|
|
|
return count
|
|
}
|
|
|
|
// AddPeer adds the given node to the static node set. When there is room in the peer set,
|
|
// the server will connect to the node. If the connection fails for any reason, the server
|
|
// will attempt to reconnect the peer.
|
|
func (srv *Server) AddPeer(node *enode.Node) {
|
|
srv.dialsched.addStatic(node)
|
|
}
|
|
|
|
// RemovePeer removes a node from the static node set. It also disconnects from the given
|
|
// node if it is currently connected as a peer.
|
|
//
|
|
// This method blocks until all protocols have exited and the peer is removed. Do not use
|
|
// RemovePeer in protocol implementations, call Disconnect on the Peer instead.
|
|
func (srv *Server) RemovePeer(node *enode.Node) {
|
|
var (
|
|
ch chan *PeerEvent
|
|
sub event.Subscription
|
|
)
|
|
// Disconnect the peer on the main loop.
|
|
srv.doPeerOp(func(peers map[enode.ID]*Peer) {
|
|
srv.dialsched.removeStatic(node)
|
|
|
|
if peer := peers[node.ID()]; peer != nil {
|
|
ch = make(chan *PeerEvent, 1)
|
|
sub = srv.peerFeed.Subscribe(ch)
|
|
|
|
peer.Disconnect(DiscRequested)
|
|
}
|
|
})
|
|
// Wait for the peer connection to end.
|
|
if ch != nil {
|
|
defer sub.Unsubscribe()
|
|
|
|
for ev := range ch {
|
|
if ev.Peer == node.ID() && ev.Type == PeerEventTypeDrop {
|
|
return
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
// AddTrustedPeer adds the given node to a reserved trusted list which allows the
|
|
// node to always connect, even if the slot are full.
|
|
func (srv *Server) AddTrustedPeer(node *enode.Node) {
|
|
select {
|
|
case srv.addtrusted <- node:
|
|
case <-srv.quit:
|
|
}
|
|
}
|
|
|
|
// RemoveTrustedPeer removes the given node from the trusted peer set.
|
|
func (srv *Server) RemoveTrustedPeer(node *enode.Node) {
|
|
select {
|
|
case srv.removetrusted <- node:
|
|
case <-srv.quit:
|
|
}
|
|
// Disconnect the peer if maxPeers is breached.
|
|
srv.SetMaxPeers(srv.MaxPeers)
|
|
}
|
|
|
|
// SubscribeEvents subscribes the given channel to peer events
|
|
func (srv *Server) SubscribeEvents(ch chan *PeerEvent) event.Subscription {
|
|
return srv.peerFeed.Subscribe(ch)
|
|
}
|
|
|
|
// Self returns the local node's endpoint information.
|
|
func (srv *Server) Self() *enode.Node {
|
|
srv.lock.Lock()
|
|
ln := srv.localnode
|
|
srv.lock.Unlock()
|
|
|
|
if ln == nil {
|
|
return enode.NewV4(&srv.PrivateKey.PublicKey, net.ParseIP("0.0.0.0"), 0, 0)
|
|
}
|
|
|
|
return ln.Node()
|
|
}
|
|
|
|
// Stop terminates the server and all active peer connections.
|
|
// It blocks until all active connections have been closed.
|
|
func (srv *Server) Stop() {
|
|
srv.lock.Lock()
|
|
if !srv.running {
|
|
srv.lock.Unlock()
|
|
return
|
|
}
|
|
|
|
srv.running = false
|
|
if srv.listener != nil {
|
|
// this unblocks listener Accept
|
|
srv.listener.Close()
|
|
}
|
|
|
|
close(srv.quit)
|
|
srv.lock.Unlock()
|
|
srv.loopWG.Wait()
|
|
}
|
|
|
|
// sharedUDPConn implements a shared connection. Write sends messages to the underlying connection while read returns
|
|
// messages that were found unprocessable and sent to the unhandled channel by the primary listener.
|
|
type sharedUDPConn struct {
|
|
*net.UDPConn
|
|
unhandled chan discover.ReadPacket
|
|
}
|
|
|
|
// ReadFromUDP implements discover.UDPConn
|
|
func (s *sharedUDPConn) ReadFromUDP(b []byte) (n int, addr *net.UDPAddr, err error) {
|
|
packet, ok := <-s.unhandled
|
|
if !ok {
|
|
return 0, nil, errors.New("connection was closed")
|
|
}
|
|
|
|
l := len(packet.Data)
|
|
if l > len(b) {
|
|
l = len(b)
|
|
}
|
|
|
|
copy(b[:l], packet.Data[:l])
|
|
|
|
return l, packet.Addr, nil
|
|
}
|
|
|
|
// Close implements discover.UDPConn
|
|
func (s *sharedUDPConn) Close() error {
|
|
return nil
|
|
}
|
|
|
|
// Start starts running the server.
|
|
// Servers can not be re-used after stopping.
|
|
func (srv *Server) Start() (err error) {
|
|
srv.lock.Lock()
|
|
defer srv.lock.Unlock()
|
|
|
|
if srv.running {
|
|
return errors.New("server already running")
|
|
}
|
|
|
|
srv.running = true
|
|
srv.log = srv.Logger
|
|
|
|
if srv.log == nil {
|
|
srv.log = log.Root()
|
|
}
|
|
|
|
if srv.clock == nil {
|
|
srv.clock = mclock.System{}
|
|
}
|
|
|
|
if srv.NoDial && srv.ListenAddr == "" {
|
|
srv.log.Warn("P2P server will be useless, neither dialing nor listening")
|
|
}
|
|
|
|
// static fields
|
|
if srv.PrivateKey == nil {
|
|
return errors.New("Server.PrivateKey must be set to a non-nil key")
|
|
}
|
|
|
|
if srv.newTransport == nil {
|
|
srv.newTransport = newRLPX
|
|
}
|
|
|
|
if srv.listenFunc == nil {
|
|
srv.listenFunc = net.Listen
|
|
}
|
|
|
|
srv.quit = make(chan struct{})
|
|
srv.delpeer = make(chan peerDrop)
|
|
srv.checkpointPostHandshake = make(chan *conn)
|
|
srv.checkpointAddPeer = make(chan *conn)
|
|
srv.addtrusted = make(chan *enode.Node)
|
|
srv.removetrusted = make(chan *enode.Node)
|
|
srv.peerOp = make(chan peerOpFunc)
|
|
srv.peerOpDone = make(chan struct{})
|
|
|
|
if err := srv.setupLocalNode(); err != nil {
|
|
return err
|
|
}
|
|
|
|
if srv.ListenAddr != "" {
|
|
if err := srv.setupListening(); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
if err := srv.setupDiscovery(); err != nil {
|
|
return err
|
|
}
|
|
|
|
srv.setupDialScheduler()
|
|
|
|
srv.loopWG.Add(1)
|
|
go srv.run()
|
|
|
|
return nil
|
|
}
|
|
|
|
func (srv *Server) setupLocalNode() error {
|
|
// Create the devp2p handshake.
|
|
pubkey := crypto.FromECDSAPub(&srv.PrivateKey.PublicKey)
|
|
|
|
srv.ourHandshake = &protoHandshake{Version: baseProtocolVersion, Name: srv.Name, ID: pubkey[1:]}
|
|
for _, p := range srv.Protocols {
|
|
srv.ourHandshake.Caps = append(srv.ourHandshake.Caps, p.cap())
|
|
}
|
|
|
|
sort.Sort(capsByNameAndVersion(srv.ourHandshake.Caps))
|
|
|
|
// Create the local node.
|
|
db, err := enode.OpenDB(srv.NodeDatabase)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
srv.nodedb = db
|
|
srv.localnode = enode.NewLocalNode(db, srv.PrivateKey)
|
|
srv.localnode.SetFallbackIP(net.IP{127, 0, 0, 1})
|
|
// TODO: check conflicts
|
|
for _, p := range srv.Protocols {
|
|
for _, e := range p.Attributes {
|
|
srv.localnode.Set(e)
|
|
}
|
|
}
|
|
|
|
switch srv.NAT.(type) {
|
|
case nil:
|
|
// No NAT interface, do nothing.
|
|
case nat.ExtIP:
|
|
// ExtIP doesn't block, set the IP right away.
|
|
ip, _ := srv.NAT.ExternalIP()
|
|
srv.localnode.SetStaticIP(ip)
|
|
default:
|
|
// Ask the router about the IP. This takes a while and blocks startup,
|
|
// do it in the background.
|
|
srv.loopWG.Add(1)
|
|
|
|
go func() {
|
|
defer srv.loopWG.Done()
|
|
|
|
if ip, err := srv.NAT.ExternalIP(); err == nil {
|
|
srv.localnode.SetStaticIP(ip)
|
|
}
|
|
}()
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (srv *Server) setupDiscovery() error {
|
|
srv.discmix = enode.NewFairMix(discmixTimeout)
|
|
|
|
// Add protocol-specific discovery sources.
|
|
added := make(map[string]bool)
|
|
for _, proto := range srv.Protocols {
|
|
if proto.DialCandidates != nil && !added[proto.Name] {
|
|
srv.discmix.AddSource(proto.DialCandidates)
|
|
|
|
added[proto.Name] = true
|
|
}
|
|
}
|
|
|
|
// Don't listen on UDP endpoint if DHT is disabled.
|
|
if srv.NoDiscovery && !srv.DiscoveryV5 {
|
|
return nil
|
|
}
|
|
|
|
listenAddr := srv.ListenAddr
|
|
|
|
// Use an alternate listening address for UDP if
|
|
// a custom discovery address is configured.
|
|
if srv.DiscAddr != "" {
|
|
listenAddr = srv.DiscAddr
|
|
}
|
|
|
|
addr, err := net.ResolveUDPAddr("udp", listenAddr)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
conn, err := net.ListenUDP("udp", addr)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
realaddr := conn.LocalAddr().(*net.UDPAddr)
|
|
srv.log.Debug("UDP listener up", "addr", realaddr)
|
|
|
|
if srv.NAT != nil {
|
|
if !realaddr.IP.IsLoopback() {
|
|
srv.loopWG.Add(1)
|
|
|
|
go func() {
|
|
nat.Map(srv.NAT, srv.quit, "udp", realaddr.Port, realaddr.Port, "ethereum discovery")
|
|
srv.loopWG.Done()
|
|
}()
|
|
}
|
|
}
|
|
|
|
srv.localnode.SetFallbackUDP(realaddr.Port)
|
|
|
|
// Discovery V4
|
|
var unhandled chan discover.ReadPacket
|
|
|
|
var sconn *sharedUDPConn
|
|
|
|
if !srv.NoDiscovery {
|
|
if srv.DiscoveryV5 {
|
|
unhandled = make(chan discover.ReadPacket, 100)
|
|
sconn = &sharedUDPConn{conn, unhandled}
|
|
}
|
|
|
|
cfg := discover.Config{
|
|
PrivateKey: srv.PrivateKey,
|
|
NetRestrict: srv.NetRestrict,
|
|
Bootnodes: srv.BootstrapNodes,
|
|
Unhandled: unhandled,
|
|
Log: srv.log,
|
|
}
|
|
|
|
ntab, err := discover.ListenV4(conn, srv.localnode, cfg)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
srv.ntab = ntab
|
|
srv.discmix.AddSource(ntab.RandomNodes())
|
|
}
|
|
|
|
// Discovery V5
|
|
if srv.DiscoveryV5 {
|
|
cfg := discover.Config{
|
|
PrivateKey: srv.PrivateKey,
|
|
NetRestrict: srv.NetRestrict,
|
|
Bootnodes: srv.BootstrapNodesV5,
|
|
Log: srv.log,
|
|
}
|
|
|
|
var err error
|
|
|
|
if sconn != nil {
|
|
srv.DiscV5, err = discover.ListenV5(sconn, srv.localnode, cfg)
|
|
} else {
|
|
srv.DiscV5, err = discover.ListenV5(conn, srv.localnode, cfg)
|
|
}
|
|
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (srv *Server) setupDialScheduler() {
|
|
config := dialConfig{
|
|
self: srv.localnode.ID(),
|
|
maxDialPeers: srv.maxDialedConns(),
|
|
maxActiveDials: srv.MaxPendingPeers,
|
|
log: srv.Logger,
|
|
netRestrict: srv.NetRestrict,
|
|
dialer: srv.Dialer,
|
|
clock: srv.clock,
|
|
}
|
|
if srv.ntab != nil {
|
|
config.resolver = srv.ntab
|
|
}
|
|
|
|
if config.dialer == nil {
|
|
config.dialer = tcpDialer{&net.Dialer{Timeout: defaultDialTimeout}}
|
|
}
|
|
|
|
srv.dialsched = newDialScheduler(config, srv.discmix, srv.SetupConn)
|
|
for _, n := range srv.StaticNodes {
|
|
srv.dialsched.addStatic(n)
|
|
}
|
|
}
|
|
|
|
func (srv *Server) maxInboundConns() int {
|
|
return srv.MaxPeers - srv.maxDialedConns()
|
|
}
|
|
|
|
func (srv *Server) maxDialedConns() (limit int) {
|
|
if srv.NoDial || srv.MaxPeers == 0 {
|
|
return 0
|
|
}
|
|
|
|
if srv.DialRatio == 0 {
|
|
limit = srv.MaxPeers / defaultDialRatio
|
|
} else {
|
|
limit = srv.MaxPeers / srv.DialRatio
|
|
}
|
|
|
|
if limit == 0 {
|
|
limit = 1
|
|
}
|
|
|
|
return limit
|
|
}
|
|
|
|
func (srv *Server) setupListening() error {
|
|
// Launch the listener.
|
|
listener, err := srv.listenFunc("tcp", srv.ListenAddr)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
srv.listener = listener
|
|
srv.ListenAddr = listener.Addr().String()
|
|
|
|
// Update the local node record and map the TCP listening port if NAT is configured.
|
|
if tcp, ok := listener.Addr().(*net.TCPAddr); ok {
|
|
srv.localnode.Set(enr.TCP(tcp.Port))
|
|
|
|
if !tcp.IP.IsLoopback() && srv.NAT != nil {
|
|
srv.loopWG.Add(1)
|
|
|
|
go func() {
|
|
nat.Map(srv.NAT, srv.quit, "tcp", tcp.Port, tcp.Port, "ethereum p2p")
|
|
srv.loopWG.Done()
|
|
}()
|
|
}
|
|
}
|
|
|
|
srv.loopWG.Add(1)
|
|
go srv.listenLoop()
|
|
|
|
return nil
|
|
}
|
|
|
|
// doPeerOp runs fn on the main loop.
|
|
func (srv *Server) doPeerOp(fn peerOpFunc) {
|
|
select {
|
|
case srv.peerOp <- fn:
|
|
<-srv.peerOpDone
|
|
case <-srv.quit:
|
|
}
|
|
}
|
|
|
|
// run is the main loop of the server.
|
|
func (srv *Server) run() {
|
|
srv.log.Info("Started P2P networking", "self", srv.localnode.Node().URLv4())
|
|
defer srv.loopWG.Done()
|
|
defer srv.nodedb.Close()
|
|
defer srv.discmix.Close()
|
|
defer srv.dialsched.stop()
|
|
|
|
var (
|
|
peers = make(map[enode.ID]*Peer)
|
|
inboundCount = 0
|
|
trusted = make(map[enode.ID]bool, len(srv.TrustedNodes))
|
|
)
|
|
// Put trusted nodes into a map to speed up checks.
|
|
// Trusted peers are loaded on startup or added via AddTrustedPeer RPC.
|
|
for _, n := range srv.TrustedNodes {
|
|
trusted[n.ID()] = true
|
|
}
|
|
|
|
running:
|
|
for {
|
|
select {
|
|
case <-srv.quit:
|
|
// The server was stopped. Run the cleanup logic.
|
|
break running
|
|
|
|
case n := <-srv.addtrusted:
|
|
// This channel is used by AddTrustedPeer to add a node
|
|
// to the trusted node set.
|
|
srv.log.Trace("Adding trusted node", "node", n)
|
|
trusted[n.ID()] = true
|
|
if p, ok := peers[n.ID()]; ok {
|
|
p.rw.set(trustedConn, true)
|
|
}
|
|
|
|
case n := <-srv.removetrusted:
|
|
// This channel is used by RemoveTrustedPeer to remove a node
|
|
// from the trusted node set.
|
|
srv.log.Trace("Removing trusted node", "node", n)
|
|
delete(trusted, n.ID())
|
|
if p, ok := peers[n.ID()]; ok {
|
|
p.rw.set(trustedConn, false)
|
|
}
|
|
|
|
case op := <-srv.peerOp:
|
|
// This channel is used by Peers and PeerCount.
|
|
op(peers)
|
|
srv.peerOpDone <- struct{}{}
|
|
|
|
case c := <-srv.checkpointPostHandshake:
|
|
// A connection has passed the encryption handshake so
|
|
// the remote identity is known (but hasn't been verified yet).
|
|
if trusted[c.node.ID()] {
|
|
// Ensure that the trusted flag is set before checking against MaxPeers.
|
|
c.flags |= trustedConn
|
|
}
|
|
// TODO: track in-progress inbound node IDs (pre-Peer) to avoid dialing them.
|
|
c.cont <- srv.postHandshakeChecks(peers, inboundCount, c)
|
|
|
|
case c := <-srv.checkpointAddPeer:
|
|
// At this point the connection is past the protocol handshake.
|
|
// Its capabilities are known and the remote identity is verified.
|
|
err := srv.addPeerChecks(peers, inboundCount, c)
|
|
if err == nil {
|
|
// The handshakes are done and it passed all checks.
|
|
p := srv.launchPeer(c)
|
|
peers[c.node.ID()] = p
|
|
srv.log.Debug("Adding p2p peer", "peercount", len(peers), "id", p.ID(), "conn", c.flags, "addr", p.RemoteAddr(), "name", p.Name())
|
|
srv.dialsched.peerAdded(c)
|
|
if p.Inbound() {
|
|
inboundCount++
|
|
}
|
|
}
|
|
c.cont <- err
|
|
|
|
case pd := <-srv.delpeer:
|
|
// A peer disconnected.
|
|
d := common.PrettyDuration(mclock.Now() - pd.created)
|
|
delete(peers, pd.ID())
|
|
srv.log.Debug("Removing p2p peer", "peercount", len(peers), "id", pd.ID(), "duration", d, "req", pd.requested, "err", pd.err)
|
|
srv.dialsched.peerRemoved(pd.rw)
|
|
if pd.Inbound() {
|
|
inboundCount--
|
|
}
|
|
}
|
|
}
|
|
|
|
srv.log.Trace("P2P networking is spinning down")
|
|
|
|
// Terminate discovery. If there is a running lookup it will terminate soon.
|
|
if srv.ntab != nil {
|
|
srv.ntab.Close()
|
|
}
|
|
|
|
if srv.DiscV5 != nil {
|
|
srv.DiscV5.Close()
|
|
}
|
|
// Disconnect all peers.
|
|
for _, p := range peers {
|
|
p.Disconnect(DiscQuitting)
|
|
}
|
|
// Wait for peers to shut down. Pending connections and tasks are
|
|
// not handled here and will terminate soon-ish because srv.quit
|
|
// is closed.
|
|
for len(peers) > 0 {
|
|
p := <-srv.delpeer
|
|
p.log.Trace("<-delpeer (spindown)")
|
|
delete(peers, p.ID())
|
|
}
|
|
}
|
|
|
|
func (srv *Server) postHandshakeChecks(peers map[enode.ID]*Peer, inboundCount int, c *conn) error {
|
|
switch {
|
|
case !c.is(trustedConn) && len(peers) >= srv.MaxPeers:
|
|
return DiscTooManyPeers
|
|
case !c.is(trustedConn) && c.is(inboundConn) && inboundCount >= srv.maxInboundConns():
|
|
return DiscTooManyPeers
|
|
case peers[c.node.ID()] != nil:
|
|
return DiscAlreadyConnected
|
|
case c.node.ID() == srv.localnode.ID():
|
|
return DiscSelf
|
|
default:
|
|
return nil
|
|
}
|
|
}
|
|
|
|
func (srv *Server) addPeerChecks(peers map[enode.ID]*Peer, inboundCount int, c *conn) error {
|
|
// Drop connections with no matching protocols.
|
|
if len(srv.Protocols) > 0 && countMatchingProtocols(srv.Protocols, c.caps) == 0 {
|
|
return DiscUselessPeer
|
|
}
|
|
// Repeat the post-handshake checks because the
|
|
// peer set might have changed since those checks were performed.
|
|
return srv.postHandshakeChecks(peers, inboundCount, c)
|
|
}
|
|
|
|
// listenLoop runs in its own goroutine and accepts
|
|
// inbound connections.
|
|
func (srv *Server) listenLoop() {
|
|
srv.log.Debug("TCP listener up", "addr", srv.listener.Addr())
|
|
|
|
// The slots channel limits accepts of new connections.
|
|
tokens := defaultMaxPendingPeers
|
|
if srv.MaxPendingPeers > 0 {
|
|
tokens = srv.MaxPendingPeers
|
|
}
|
|
|
|
slots := make(chan struct{}, tokens)
|
|
for i := 0; i < tokens; i++ {
|
|
slots <- struct{}{}
|
|
}
|
|
|
|
// Wait for slots to be returned on exit. This ensures all connection goroutines
|
|
// are down before listenLoop returns.
|
|
defer srv.loopWG.Done()
|
|
defer func() {
|
|
for i := 0; i < cap(slots); i++ {
|
|
<-slots
|
|
}
|
|
}()
|
|
|
|
for {
|
|
// Wait for a free slot before accepting.
|
|
<-slots
|
|
|
|
var (
|
|
fd net.Conn
|
|
err error
|
|
lastLog time.Time
|
|
)
|
|
|
|
for {
|
|
fd, err = srv.listener.Accept()
|
|
if netutil.IsTemporaryError(err) {
|
|
if time.Since(lastLog) > 1*time.Second {
|
|
srv.log.Debug("Temporary read error", "err", err)
|
|
|
|
lastLog = time.Now()
|
|
}
|
|
|
|
time.Sleep(time.Millisecond * 200)
|
|
|
|
continue
|
|
} else if err != nil {
|
|
srv.log.Debug("Read error", "err", err)
|
|
slots <- struct{}{}
|
|
|
|
return
|
|
}
|
|
|
|
break
|
|
}
|
|
|
|
remoteIP := netutil.AddrIP(fd.RemoteAddr())
|
|
if err := srv.checkInboundConn(remoteIP); err != nil {
|
|
srv.log.Debug("Rejected inbound connection", "addr", fd.RemoteAddr(), "err", err)
|
|
fd.Close()
|
|
slots <- struct{}{}
|
|
|
|
continue
|
|
}
|
|
|
|
if remoteIP != nil {
|
|
var addr *net.TCPAddr
|
|
if tcp, ok := fd.RemoteAddr().(*net.TCPAddr); ok {
|
|
addr = tcp
|
|
}
|
|
|
|
fd = newMeteredConn(fd, true, addr)
|
|
srv.log.Trace("Accepted connection", "addr", fd.RemoteAddr())
|
|
}
|
|
|
|
go func() {
|
|
srv.SetupConn(fd, inboundConn, nil)
|
|
slots <- struct{}{}
|
|
}()
|
|
}
|
|
}
|
|
|
|
func (srv *Server) checkInboundConn(remoteIP net.IP) error {
|
|
if remoteIP == nil {
|
|
return nil
|
|
}
|
|
// Reject connections that do not match NetRestrict.
|
|
if srv.NetRestrict != nil && !srv.NetRestrict.Contains(remoteIP) {
|
|
return fmt.Errorf("not in netrestrict list")
|
|
}
|
|
// Reject Internet peers that try too often.
|
|
now := srv.clock.Now()
|
|
srv.inboundHistory.expire(now, nil)
|
|
|
|
if !netutil.IsLAN(remoteIP) && srv.inboundHistory.contains(remoteIP.String()) {
|
|
return fmt.Errorf("too many attempts")
|
|
}
|
|
|
|
srv.inboundHistory.add(remoteIP.String(), now.Add(inboundThrottleTime))
|
|
|
|
return nil
|
|
}
|
|
|
|
// SetupConn runs the handshakes and attempts to add the connection
|
|
// as a peer. It returns when the connection has been added as a peer
|
|
// or the handshakes have failed.
|
|
func (srv *Server) SetupConn(fd net.Conn, flags connFlag, dialDest *enode.Node) error {
|
|
c := &conn{fd: fd, flags: flags, cont: make(chan error)}
|
|
if dialDest == nil {
|
|
c.transport = srv.newTransport(fd, nil)
|
|
} else {
|
|
c.transport = srv.newTransport(fd, dialDest.Pubkey())
|
|
}
|
|
|
|
err := srv.setupConn(c, flags, dialDest)
|
|
if err != nil {
|
|
c.close(err)
|
|
}
|
|
|
|
return err
|
|
}
|
|
|
|
func (srv *Server) setupConn(c *conn, flags connFlag, dialDest *enode.Node) error {
|
|
// Prevent leftover pending conns from entering the handshake.
|
|
srv.lock.Lock()
|
|
running := srv.running
|
|
srv.lock.Unlock()
|
|
|
|
if !running {
|
|
return errServerStopped
|
|
}
|
|
|
|
// If dialing, figure out the remote public key.
|
|
if dialDest != nil {
|
|
dialPubkey := new(ecdsa.PublicKey)
|
|
if err := dialDest.Load((*enode.Secp256k1)(dialPubkey)); err != nil {
|
|
err = errors.New("dial destination doesn't have a secp256k1 public key")
|
|
srv.log.Trace("Setting up connection failed", "addr", c.fd.RemoteAddr(), "conn", c.flags, "err", err)
|
|
|
|
return err
|
|
}
|
|
}
|
|
|
|
// Run the RLPx handshake.
|
|
remotePubkey, err := c.doEncHandshake(srv.PrivateKey)
|
|
if err != nil {
|
|
srv.log.Trace("Failed RLPx handshake", "addr", c.fd.RemoteAddr(), "conn", c.flags, "err", err)
|
|
return err
|
|
}
|
|
|
|
if dialDest != nil {
|
|
c.node = dialDest
|
|
} else {
|
|
c.node = nodeFromConn(remotePubkey, c.fd)
|
|
}
|
|
|
|
clog := srv.log.New("id", c.node.ID(), "addr", c.fd.RemoteAddr(), "conn", c.flags)
|
|
err = srv.checkpoint(c, srv.checkpointPostHandshake)
|
|
|
|
if err != nil {
|
|
clog.Trace("Rejected peer", "err", err)
|
|
return err
|
|
}
|
|
|
|
// Run the capability negotiation handshake.
|
|
phs, err := c.doProtoHandshake(srv.ourHandshake)
|
|
if err != nil {
|
|
clog.Trace("Failed p2p handshake", "err", err)
|
|
return err
|
|
}
|
|
|
|
if id := c.node.ID(); !bytes.Equal(crypto.Keccak256(phs.ID), id[:]) {
|
|
clog.Trace("Wrong devp2p handshake identity", "phsid", hex.EncodeToString(phs.ID))
|
|
return DiscUnexpectedIdentity
|
|
}
|
|
|
|
c.caps, c.name = phs.Caps, phs.Name
|
|
|
|
err = srv.checkpoint(c, srv.checkpointAddPeer)
|
|
if err != nil {
|
|
clog.Trace("Rejected peer", "err", err)
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func nodeFromConn(pubkey *ecdsa.PublicKey, conn net.Conn) *enode.Node {
|
|
var ip net.IP
|
|
|
|
var port int
|
|
|
|
if tcp, ok := conn.RemoteAddr().(*net.TCPAddr); ok {
|
|
ip = tcp.IP
|
|
port = tcp.Port
|
|
}
|
|
|
|
return enode.NewV4(pubkey, ip, port, port)
|
|
}
|
|
|
|
// checkpoint sends the conn to run, which performs the
|
|
// post-handshake checks for the stage (posthandshake, addpeer).
|
|
func (srv *Server) checkpoint(c *conn, stage chan<- *conn) error {
|
|
select {
|
|
case stage <- c:
|
|
case <-srv.quit:
|
|
return errServerStopped
|
|
}
|
|
|
|
return <-c.cont
|
|
}
|
|
|
|
func (srv *Server) launchPeer(c *conn) *Peer {
|
|
p := newPeer(srv.log, c, srv.Protocols)
|
|
if srv.EnableMsgEvents {
|
|
// If message events are enabled, pass the peerFeed
|
|
// to the peer.
|
|
p.events = &srv.peerFeed
|
|
}
|
|
|
|
go srv.runPeer(p)
|
|
|
|
return p
|
|
}
|
|
|
|
// runPeer runs in its own goroutine for each peer.
|
|
func (srv *Server) runPeer(p *Peer) {
|
|
if srv.newPeerHook != nil {
|
|
srv.newPeerHook(p)
|
|
}
|
|
|
|
srv.peerFeed.Send(&PeerEvent{
|
|
Type: PeerEventTypeAdd,
|
|
Peer: p.ID(),
|
|
RemoteAddress: p.RemoteAddr().String(),
|
|
LocalAddress: p.LocalAddr().String(),
|
|
})
|
|
|
|
// Run the per-peer main loop.
|
|
remoteRequested, err := p.run()
|
|
|
|
// Announce disconnect on the main loop to update the peer set.
|
|
// The main loop waits for existing peers to be sent on srv.delpeer
|
|
// before returning, so this send should not select on srv.quit.
|
|
srv.delpeer <- peerDrop{p, err, remoteRequested}
|
|
|
|
// Broadcast peer drop to external subscribers. This needs to be
|
|
// after the send to delpeer so subscribers have a consistent view of
|
|
// the peer set (i.e. Server.Peers() doesn't include the peer when the
|
|
// event is received).
|
|
srv.peerFeed.Send(&PeerEvent{
|
|
Type: PeerEventTypeDrop,
|
|
Peer: p.ID(),
|
|
Error: err.Error(),
|
|
RemoteAddress: p.RemoteAddr().String(),
|
|
LocalAddress: p.LocalAddr().String(),
|
|
})
|
|
}
|
|
|
|
// NodeInfo represents a short summary of the information known about the host.
|
|
type NodeInfo struct {
|
|
ID string `json:"id"` // Unique node identifier (also the encryption key)
|
|
Name string `json:"name"` // Name of the node, including client type, version, OS, custom data
|
|
Enode string `json:"enode"` // Enode URL for adding this peer from remote peers
|
|
ENR string `json:"enr"` // Ethereum Node Record
|
|
IP string `json:"ip"` // IP address of the node
|
|
Ports struct {
|
|
Discovery int `json:"discovery"` // UDP listening port for discovery protocol
|
|
Listener int `json:"listener"` // TCP listening port for RLPx
|
|
} `json:"ports"`
|
|
ListenAddr string `json:"listenAddr"`
|
|
Protocols map[string]interface{} `json:"protocols"`
|
|
}
|
|
|
|
// NodeInfo gathers and returns a collection of metadata known about the host.
|
|
func (srv *Server) NodeInfo() *NodeInfo {
|
|
// Gather and assemble the generic node infos
|
|
node := srv.Self()
|
|
info := &NodeInfo{
|
|
Name: srv.Name,
|
|
Enode: node.URLv4(),
|
|
ID: node.ID().String(),
|
|
IP: node.IP().String(),
|
|
ListenAddr: srv.ListenAddr,
|
|
Protocols: make(map[string]interface{}),
|
|
}
|
|
info.Ports.Discovery = node.UDP()
|
|
info.Ports.Listener = node.TCP()
|
|
info.ENR = node.String()
|
|
|
|
// Gather all the running protocol infos (only once per protocol type)
|
|
for _, proto := range srv.Protocols {
|
|
if _, ok := info.Protocols[proto.Name]; !ok {
|
|
nodeInfo := interface{}("unknown")
|
|
if query := proto.NodeInfo; query != nil {
|
|
nodeInfo = proto.NodeInfo()
|
|
}
|
|
|
|
info.Protocols[proto.Name] = nodeInfo
|
|
}
|
|
}
|
|
|
|
return info
|
|
}
|
|
|
|
// PeersInfo returns an array of metadata objects describing connected peers.
|
|
func (srv *Server) PeersInfo() []*PeerInfo {
|
|
// Gather all the generic and sub-protocol specific infos
|
|
infos := make([]*PeerInfo, 0, srv.PeerCount())
|
|
|
|
for _, peer := range srv.Peers() {
|
|
if peer != nil {
|
|
infos = append(infos, peer.Info())
|
|
}
|
|
}
|
|
// Sort the result array alphabetically by node identifier
|
|
for i := 0; i < len(infos); i++ {
|
|
for j := i + 1; j < len(infos); j++ {
|
|
if infos[i].ID > infos[j].ID {
|
|
infos[i], infos[j] = infos[j], infos[i]
|
|
}
|
|
}
|
|
}
|
|
|
|
return infos
|
|
}
|