mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-15 00:13:46 +00:00
* 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 * Use `big.Int#Set` instead of `big.Int#SetBytes` when possible (#896) There is no reason to make the bytes transformation and back to big int to assign a big int to another one. The `Set` method should be used instead. * 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 * fixed MVHashMap being enabled even when paralellUniverse is set to 0 (#900) * 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 * dev: chg: pos-1465: remove snyk and sonarqube (#908) * 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 * Fix worker tracing `nil` pointer exception (#899) The `baseFee` can be `nil` in certain situations, the tracing must not use `baseFee` unless it was checked otherwise if such case happen, Go is going to panic. * core,eth/tracers: fix TestPrestateWithDiffModeTracer * fixed go files * 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 * Move NumSpeculativeProcs from module variable to function parameter (#931) This will prevent data races when more than one parallel execution are running at the same time. * fix : test-integration * fix : test-integration * Calculate tx dependency only when mining is enabled (#935) * core: restore AddFeeTransferLog post miner tipping * fix : TestGraphQLConcurrentResolvers * mardizzone/POS-1605: go and deps upgrade (#929) * dev: chg: pos-1605: fix govulns by bumping golang version and replacing mongodb version * dev: chg: pos-1605: update some dependencies to solve dependabot vulns * dev: chg: update linter for compatibility with upgraded go version * dev: chg: update go version in golangci lintere * dev: chg: update go version in ci workflow, docker and travis * dev: chg: change govulncheck version to a stable fixed one * dev: chg: fix govulncheck version * dev: chg: remove vulncheck version * dev: chg: adapt tests based on go-ethereum for go version upgrade * dev: chg: use explicit go version for templum action * dev: chg: fix lint * dev: chg: fix lint * dev: chg: 1.20.x explicitly in packager * dev: chg: ignore some additional leak to be fixed * dev: chg: ignore some additional leak to be fixed * dev: chg: fix lint * rpc: add execution pool metrics (#919) * rpc: add execution pool metrics * rpc: stop execution pool and report metrics using ticker * fix lint * update go.mod, update metric report interval * handle empty workerpool case to fix tests * fix lint * refactor ep metrics collection based on each service * remove log * rpc: convert processed metric to histogram * lint * Moved TxDependency Metadata to ExtraData in Block Header (#930) * moved TxDependency Metadata to ExtraData in Block Header * updated unit tests * lints * small bug fix * small improvement * minor bug fix * addressed comments * bug fix, only using the BlockExtraData structure after the Parallel Universe HF * addressed comments * fixed an error * bug fix * encoding nil ValidatorBytes and TxDependency in prepare if the current block is not the last block of the sprint * bug fix * fix : deadlocks * rm: t.parallel from testQueueTimeLimiting tests * Merge branch 'develop' into mardizzone/upstream-merge * fix : lint * fix : test-integration * fix : TxDependency * Update discord link in README.md (#938) * add rpc.enabledeprecatedpersonal flag * Upstream merge from go-ethereum/v1.11.6 (#901) * 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> * Revert "Upstream merge from go-ethereum/v1.11.6 (#901)" This reverts commitbbfb2016fa. * bump version to v0.5.0-beta-1 * fix : goreleaser * add : mutex for stateObjects * chg : modify stateObjectsMu * bump : version to 0.5.0-beta-2 * Add mutex for currentState in TxPool * Revert "chg : modify stateObjectsMu" This reverts commit62208934ad. * Revert "add : mutex for stateObjects" This reverts commit4d5cdae2e6. * Bump version to 0.5.0-beta-3 * Minor fix * bump : version to 0.5.0-beta-4 * metrics/prometheus: fix count field of metric (#965) * bump version to 0.5.0-beta-5 * fix : eth_getLogs * fix : lint * bump : version to 0.5.0-beta-6 * bump : version to 0.5.0 --------- 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: rjl493456442 <garyrong0905@gmail.com> Co-authored-by: Sungwoo Kim <git@sung-woo.kim> Co-authored-by: Martin Holst Swende <martin@swende.se> 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: Chris Ziogas <ziogaschr@gmail.com> Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com> Co-authored-by: Dan Cline <6798349+Rjected@users.noreply.github.com> Co-authored-by: Felix Lange <fjl@twurst.com> Co-authored-by: Peter (bitfly) <1674920+peterbitfly@users.noreply.github.com> Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de> 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: Sina Mahmoodi <1591639+s1na@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: ucwong <ucwong@126.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: Darioush Jalali <darioush.jalali@avalabs.org> 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: marcello33 <marcelloardizzone@hotmail.it> Co-authored-by: Matthieu Vachon <matt@streamingfast.io> Co-authored-by: Pratik Patil <pratikspatil024@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: Alejandro Criado-Pérez <alejandro@criadoperez.com> Co-authored-by: Manav Darji <manavdarji.india@gmail.com> Co-authored-by: Arpit Temani <temaniarpit27@gmail.com> Co-authored-by: Anshal Shukla <53994948+anshalshukla@users.noreply.github.com> Co-authored-by: Patrick O'Grady <prohb125@gmail.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>
1151 lines
35 KiB
Go
1151 lines
35 KiB
Go
// Copyright 2018 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 scwallet
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"crypto/hmac"
|
|
"crypto/sha256"
|
|
"crypto/sha512"
|
|
"encoding/asn1"
|
|
"encoding/binary"
|
|
"errors"
|
|
"fmt"
|
|
"math/big"
|
|
"regexp"
|
|
"sort"
|
|
"strings"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/ethereum/go-ethereum"
|
|
"github.com/ethereum/go-ethereum/accounts"
|
|
"github.com/ethereum/go-ethereum/common"
|
|
"github.com/ethereum/go-ethereum/core/types"
|
|
"github.com/ethereum/go-ethereum/crypto"
|
|
"github.com/ethereum/go-ethereum/log"
|
|
pcsc "github.com/gballet/go-libpcsclite"
|
|
"github.com/status-im/keycard-go/derivationpath"
|
|
)
|
|
|
|
// ErrPairingPasswordNeeded is returned if opening the smart card requires pairing with a pairing
|
|
// password. In this case, the calling application should request user input to enter
|
|
// the pairing password and send it back.
|
|
var ErrPairingPasswordNeeded = errors.New("smartcard: pairing password needed")
|
|
|
|
// ErrPINNeeded is returned if opening the smart card requires a PIN code. In
|
|
// this case, the calling application should request user input to enter the PIN
|
|
// and send it back.
|
|
var ErrPINNeeded = errors.New("smartcard: pin needed")
|
|
|
|
// ErrPINUnblockNeeded is returned if opening the smart card requires a PIN code,
|
|
// but all PIN attempts have already been exhausted. In this case the calling
|
|
// application should request user input for the PUK and a new PIN code to set
|
|
// fo the card.
|
|
var ErrPINUnblockNeeded = errors.New("smartcard: pin unblock needed")
|
|
|
|
// ErrAlreadyOpen is returned if the smart card is attempted to be opened, but
|
|
// there is already a paired and unlocked session.
|
|
var ErrAlreadyOpen = errors.New("smartcard: already open")
|
|
|
|
// ErrPubkeyMismatch is returned if the public key recovered from a signature
|
|
// does not match the one expected by the user.
|
|
var ErrPubkeyMismatch = errors.New("smartcard: recovered public key mismatch")
|
|
|
|
var (
|
|
appletAID = []byte{0xA0, 0x00, 0x00, 0x08, 0x04, 0x00, 0x01, 0x01, 0x01}
|
|
// DerivationSignatureHash is used to derive the public key from the signature of this hash
|
|
DerivationSignatureHash = sha256.Sum256(common.Hash{}.Bytes())
|
|
)
|
|
|
|
// List of APDU command-related constants
|
|
const (
|
|
claISO7816 = 0
|
|
claSCWallet = 0x80
|
|
|
|
insSelect = 0xA4
|
|
insGetResponse = 0xC0
|
|
sw1GetResponse = 0x61
|
|
sw1Ok = 0x90
|
|
|
|
insVerifyPin = 0x20
|
|
insUnblockPin = 0x22
|
|
insExportKey = 0xC2
|
|
insSign = 0xC0
|
|
insLoadKey = 0xD0
|
|
insDeriveKey = 0xD1
|
|
insStatus = 0xF2
|
|
)
|
|
|
|
// List of ADPU command parameters
|
|
const (
|
|
P1DeriveKeyFromMaster = uint8(0x00)
|
|
P1DeriveKeyFromParent = uint8(0x01)
|
|
P1DeriveKeyFromCurrent = uint8(0x10)
|
|
statusP1WalletStatus = uint8(0x00)
|
|
statusP1Path = uint8(0x01)
|
|
signP1PrecomputedHash = uint8(0x00)
|
|
signP2OnlyBlock = uint8(0x00)
|
|
exportP1Any = uint8(0x00)
|
|
exportP2Pubkey = uint8(0x01)
|
|
)
|
|
|
|
// Minimum time to wait between self derivation attempts, even it the user is
|
|
// requesting accounts like crazy.
|
|
const selfDeriveThrottling = time.Second
|
|
|
|
// Wallet represents a smartcard wallet instance.
|
|
type Wallet struct {
|
|
Hub *Hub // A handle to the Hub that instantiated this wallet.
|
|
PublicKey []byte // The wallet's public key (used for communication and identification, not signing!)
|
|
|
|
lock sync.Mutex // Lock that gates access to struct fields and communication with the card
|
|
card *pcsc.Card // A handle to the smartcard interface for the wallet.
|
|
session *Session // The secure communication session with the card
|
|
log log.Logger // Contextual logger to tag the base with its id
|
|
|
|
deriveNextPaths []accounts.DerivationPath // Next derivation paths for account auto-discovery (multiple bases supported)
|
|
deriveNextAddrs []common.Address // Next derived account addresses for auto-discovery (multiple bases supported)
|
|
deriveChain ethereum.ChainStateReader // Blockchain state reader to discover used account with
|
|
deriveReq chan chan struct{} // Channel to request a self-derivation on
|
|
deriveQuit chan chan error // Channel to terminate the self-deriver with
|
|
}
|
|
|
|
// NewWallet constructs and returns a new Wallet instance.
|
|
func NewWallet(hub *Hub, card *pcsc.Card) *Wallet {
|
|
wallet := &Wallet{
|
|
Hub: hub,
|
|
card: card,
|
|
}
|
|
|
|
return wallet
|
|
}
|
|
|
|
// transmit sends an APDU to the smartcard and receives and decodes the response.
|
|
// It automatically handles requests by the card to fetch the return data separately,
|
|
// and returns an error if the response status code is not success.
|
|
func transmit(card *pcsc.Card, command *commandAPDU) (*responseAPDU, error) {
|
|
data, err := command.serialize()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
responseData, _, err := card.Transmit(data)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
response := new(responseAPDU)
|
|
if err = response.deserialize(responseData); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Are we being asked to fetch the response separately?
|
|
if response.Sw1 == sw1GetResponse && (command.Cla != claISO7816 || command.Ins != insGetResponse) {
|
|
return transmit(card, &commandAPDU{
|
|
Cla: claISO7816,
|
|
Ins: insGetResponse,
|
|
P1: 0,
|
|
P2: 0,
|
|
Data: nil,
|
|
Le: response.Sw2,
|
|
})
|
|
}
|
|
|
|
if response.Sw1 != sw1Ok {
|
|
return nil, fmt.Errorf("unexpected insecure response status Cla=%#x, Ins=%#x, Sw=%#x%x", command.Cla, command.Ins, response.Sw1, response.Sw2)
|
|
}
|
|
|
|
return response, nil
|
|
}
|
|
|
|
// applicationInfo encodes information about the smartcard application - its
|
|
// instance UID and public key.
|
|
type applicationInfo struct {
|
|
InstanceUID []byte `asn1:"tag:15"`
|
|
PublicKey []byte `asn1:"tag:0"`
|
|
}
|
|
|
|
// connect connects to the wallet application and establishes a secure channel with it.
|
|
// must be called before any other interaction with the wallet.
|
|
func (w *Wallet) connect() error {
|
|
w.lock.Lock()
|
|
defer w.lock.Unlock()
|
|
|
|
appinfo, err := w.doselect()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
channel, err := NewSecureChannelSession(w.card, appinfo.PublicKey)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
w.PublicKey = appinfo.PublicKey
|
|
w.log = log.New("url", w.URL())
|
|
w.session = &Session{
|
|
Wallet: w,
|
|
Channel: channel,
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// doselect is an internal (unlocked) function to send a SELECT APDU to the card.
|
|
func (w *Wallet) doselect() (*applicationInfo, error) {
|
|
response, err := transmit(w.card, &commandAPDU{
|
|
Cla: claISO7816,
|
|
Ins: insSelect,
|
|
P1: 4,
|
|
P2: 0,
|
|
Data: appletAID,
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
appinfo := new(applicationInfo)
|
|
if _, err := asn1.UnmarshalWithParams(response.Data, appinfo, "tag:4"); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return appinfo, nil
|
|
}
|
|
|
|
// ping checks the card's status and returns an error if unsuccessful.
|
|
func (w *Wallet) ping() error {
|
|
w.lock.Lock()
|
|
defer w.lock.Unlock()
|
|
|
|
// We can't ping if not paired
|
|
if !w.session.paired() {
|
|
return nil
|
|
}
|
|
|
|
if _, err := w.session.walletStatus(); err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// release releases any resources held by an open wallet instance.
|
|
func (w *Wallet) release() error {
|
|
if w.session != nil {
|
|
return w.session.release()
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// pair is an internal (unlocked) function for establishing a new pairing
|
|
// with the wallet.
|
|
func (w *Wallet) pair(puk []byte) error {
|
|
if w.session.paired() {
|
|
return fmt.Errorf("wallet already paired")
|
|
}
|
|
|
|
pairing, err := w.session.pair(puk)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if err = w.Hub.setPairing(w, &pairing); err != nil {
|
|
return err
|
|
}
|
|
|
|
return w.session.authenticate(pairing)
|
|
}
|
|
|
|
// Unpair deletes an existing wallet pairing.
|
|
func (w *Wallet) Unpair(pin []byte) error {
|
|
w.lock.Lock()
|
|
defer w.lock.Unlock()
|
|
|
|
if !w.session.paired() {
|
|
return fmt.Errorf("wallet %x not paired", w.PublicKey)
|
|
}
|
|
|
|
if err := w.session.verifyPin(pin); err != nil {
|
|
return fmt.Errorf("failed to verify pin: %s", err)
|
|
}
|
|
|
|
if err := w.session.unpair(); err != nil {
|
|
return fmt.Errorf("failed to unpair: %s", err)
|
|
}
|
|
|
|
if err := w.Hub.setPairing(w, nil); err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// URL retrieves the canonical path under which this wallet is reachable. It is
|
|
// user by upper layers to define a sorting order over all wallets from multiple
|
|
// backends.
|
|
func (w *Wallet) URL() accounts.URL {
|
|
return accounts.URL{
|
|
Scheme: w.Hub.scheme,
|
|
Path: fmt.Sprintf("%x", w.PublicKey[1:5]), // Byte #0 isn't unique; 1:5 covers << 64K cards, bump to 1:9 for << 4M
|
|
}
|
|
}
|
|
|
|
// Status returns a textual status to aid the user in the current state of the
|
|
// wallet. It also returns an error indicating any failure the wallet might have
|
|
// encountered.
|
|
func (w *Wallet) Status() (string, error) {
|
|
w.lock.Lock()
|
|
defer w.lock.Unlock()
|
|
|
|
// If the card is not paired, we can only wait
|
|
if !w.session.paired() {
|
|
return "Unpaired, waiting for pairing password", nil
|
|
}
|
|
// Yay, we have an encrypted session, retrieve the actual status
|
|
status, err := w.session.walletStatus()
|
|
if err != nil {
|
|
return fmt.Sprintf("Failed: %v", err), err
|
|
}
|
|
|
|
switch {
|
|
case !w.session.verified && status.PinRetryCount == 0 && status.PukRetryCount == 0:
|
|
return "Bricked, waiting for full wipe", nil
|
|
case !w.session.verified && status.PinRetryCount == 0:
|
|
return fmt.Sprintf("Blocked, waiting for PUK (%d attempts left) and new PIN", status.PukRetryCount), nil
|
|
case !w.session.verified:
|
|
return fmt.Sprintf("Locked, waiting for PIN (%d attempts left)", status.PinRetryCount), nil
|
|
case !status.Initialized:
|
|
return "Empty, waiting for initialization", nil
|
|
default:
|
|
return "Online", nil
|
|
}
|
|
}
|
|
|
|
// Open initializes access to a wallet instance. It is not meant to unlock or
|
|
// decrypt account keys, rather simply to establish a connection to hardware
|
|
// wallets and/or to access derivation seeds.
|
|
//
|
|
// The passphrase parameter may or may not be used by the implementation of a
|
|
// particular wallet instance. The reason there is no passwordless open method
|
|
// is to strive towards a uniform wallet handling, oblivious to the different
|
|
// backend providers.
|
|
//
|
|
// Please note, if you open a wallet, you must close it to release any allocated
|
|
// resources (especially important when working with hardware wallets).
|
|
func (w *Wallet) Open(passphrase string) error {
|
|
w.lock.Lock()
|
|
defer w.lock.Unlock()
|
|
|
|
// If the session is already open, bail out
|
|
if w.session.verified {
|
|
return ErrAlreadyOpen
|
|
}
|
|
// If the smart card is not yet paired, attempt to do so either from a previous
|
|
// pairing key or form the supplied PUK code.
|
|
if !w.session.paired() {
|
|
// If a previous pairing exists, only ever try to use that
|
|
if pairing := w.Hub.pairing(w); pairing != nil {
|
|
if err := w.session.authenticate(*pairing); err != nil {
|
|
return fmt.Errorf("failed to authenticate card %x: %s", w.PublicKey[:4], err)
|
|
}
|
|
// Pairing still ok, fall through to PIN checks
|
|
} else {
|
|
// If no passphrase was supplied, request the PUK from the user
|
|
if passphrase == "" {
|
|
return ErrPairingPasswordNeeded
|
|
}
|
|
// Attempt to pair the smart card with the user supplied PUK
|
|
if err := w.pair([]byte(passphrase)); err != nil {
|
|
return err
|
|
}
|
|
// Pairing succeeded, fall through to PIN checks. This will of course fail,
|
|
// but we can't return ErrPINNeeded directly here because we don't know whether
|
|
// a PIN check or a PIN reset is needed.
|
|
passphrase = ""
|
|
}
|
|
}
|
|
// The smart card was successfully paired, retrieve its status to check whether
|
|
// PIN verification or unblocking is needed.
|
|
status, err := w.session.walletStatus()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
// Request the appropriate next authentication data, or use the one supplied
|
|
switch {
|
|
case passphrase == "" && status.PinRetryCount > 0:
|
|
return ErrPINNeeded
|
|
case passphrase == "":
|
|
return ErrPINUnblockNeeded
|
|
case status.PinRetryCount > 0:
|
|
if !regexp.MustCompile(`^[0-9]{6,}$`).MatchString(passphrase) {
|
|
w.log.Error("PIN needs to be at least 6 digits")
|
|
return ErrPINNeeded
|
|
}
|
|
|
|
if err := w.session.verifyPin([]byte(passphrase)); err != nil {
|
|
return err
|
|
}
|
|
default:
|
|
if !regexp.MustCompile(`^[0-9]{12,}$`).MatchString(passphrase) {
|
|
w.log.Error("PUK needs to be at least 12 digits")
|
|
return ErrPINUnblockNeeded
|
|
}
|
|
|
|
if err := w.session.unblockPin([]byte(passphrase)); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
// Smart card paired and unlocked, initialize and register
|
|
w.deriveReq = make(chan chan struct{})
|
|
w.deriveQuit = make(chan chan error)
|
|
|
|
go w.selfDerive()
|
|
|
|
// Notify anyone listening for wallet events that a new device is accessible
|
|
go w.Hub.updateFeed.Send(accounts.WalletEvent{Wallet: w, Kind: accounts.WalletOpened})
|
|
|
|
return nil
|
|
}
|
|
|
|
// Close stops and closes the wallet, freeing any resources.
|
|
func (w *Wallet) Close() error {
|
|
// Ensure the wallet was opened
|
|
w.lock.Lock()
|
|
dQuit := w.deriveQuit
|
|
w.lock.Unlock()
|
|
|
|
// Terminate the self-derivations
|
|
var derr error
|
|
|
|
if dQuit != nil {
|
|
errc := make(chan error)
|
|
dQuit <- errc
|
|
derr = <-errc // Save for later, we *must* close the USB
|
|
}
|
|
// Terminate the device connection
|
|
w.lock.Lock()
|
|
defer w.lock.Unlock()
|
|
|
|
w.deriveQuit = nil
|
|
w.deriveReq = nil
|
|
|
|
if err := w.release(); err != nil {
|
|
return err
|
|
}
|
|
|
|
return derr
|
|
}
|
|
|
|
// selfDerive is an account derivation loop that upon request attempts to find
|
|
// new non-zero accounts.
|
|
func (w *Wallet) selfDerive() {
|
|
w.log.Debug("Smart card wallet self-derivation started")
|
|
defer w.log.Debug("Smart card wallet self-derivation stopped")
|
|
|
|
// Execute self-derivations until termination or error
|
|
var (
|
|
reqc chan struct{}
|
|
errc chan error
|
|
err error
|
|
)
|
|
|
|
for errc == nil && err == nil {
|
|
// Wait until either derivation or termination is requested
|
|
select {
|
|
case errc = <-w.deriveQuit:
|
|
// Termination requested
|
|
continue
|
|
case reqc = <-w.deriveReq:
|
|
// Account discovery requested
|
|
}
|
|
// Derivation needs a chain and device access, skip if either unavailable
|
|
w.lock.Lock()
|
|
if w.session == nil || w.deriveChain == nil {
|
|
w.lock.Unlock()
|
|
reqc <- struct{}{}
|
|
|
|
continue
|
|
}
|
|
|
|
pairing := w.Hub.pairing(w)
|
|
|
|
// Device lock obtained, derive the next batch of accounts
|
|
var (
|
|
paths []accounts.DerivationPath
|
|
nextAcc accounts.Account
|
|
|
|
nextPaths = append([]accounts.DerivationPath{}, w.deriveNextPaths...)
|
|
nextAddrs = append([]common.Address{}, w.deriveNextAddrs...)
|
|
|
|
context = context.Background()
|
|
)
|
|
|
|
for i := 0; i < len(nextAddrs); i++ {
|
|
for empty := false; !empty; {
|
|
// Retrieve the next derived Ethereum account
|
|
if nextAddrs[i] == (common.Address{}) {
|
|
if nextAcc, err = w.session.derive(nextPaths[i]); err != nil {
|
|
w.log.Warn("Smartcard wallet account derivation failed", "err", err)
|
|
break
|
|
}
|
|
|
|
nextAddrs[i] = nextAcc.Address
|
|
}
|
|
// Check the account's status against the current chain state
|
|
var (
|
|
balance *big.Int
|
|
nonce uint64
|
|
)
|
|
|
|
balance, err = w.deriveChain.BalanceAt(context, nextAddrs[i], nil)
|
|
if err != nil {
|
|
w.log.Warn("Smartcard wallet balance retrieval failed", "err", err)
|
|
break
|
|
}
|
|
|
|
nonce, err = w.deriveChain.NonceAt(context, nextAddrs[i], nil)
|
|
if err != nil {
|
|
w.log.Warn("Smartcard wallet nonce retrieval failed", "err", err)
|
|
break
|
|
}
|
|
// If the next account is empty, stop self-derivation, but add for the last base path
|
|
if balance.Sign() == 0 && nonce == 0 {
|
|
empty = true
|
|
|
|
if i < len(nextAddrs)-1 {
|
|
break
|
|
}
|
|
}
|
|
// We've just self-derived a new account, start tracking it locally
|
|
path := make(accounts.DerivationPath, len(nextPaths[i]))
|
|
copy(path[:], nextPaths[i][:])
|
|
paths = append(paths, path)
|
|
|
|
// Display a log message to the user for new (or previously empty accounts)
|
|
if _, known := pairing.Accounts[nextAddrs[i]]; !known || !empty || nextAddrs[i] != w.deriveNextAddrs[i] {
|
|
w.log.Info("Smartcard wallet discovered new account", "address", nextAddrs[i], "path", path, "balance", balance, "nonce", nonce)
|
|
}
|
|
|
|
pairing.Accounts[nextAddrs[i]] = path
|
|
|
|
// Fetch the next potential account
|
|
if !empty {
|
|
nextAddrs[i] = common.Address{}
|
|
nextPaths[i][len(nextPaths[i])-1]++
|
|
}
|
|
}
|
|
}
|
|
// If there are new accounts, write them out
|
|
if len(paths) > 0 {
|
|
err = w.Hub.setPairing(w, pairing)
|
|
}
|
|
// Shift the self-derivation forward
|
|
w.deriveNextAddrs = nextAddrs
|
|
w.deriveNextPaths = nextPaths
|
|
|
|
// Self derivation complete, release device lock
|
|
w.lock.Unlock()
|
|
|
|
// Notify the user of termination and loop after a bit of time (to avoid trashing)
|
|
reqc <- struct{}{}
|
|
|
|
if err == nil {
|
|
select {
|
|
case errc = <-w.deriveQuit:
|
|
// Termination requested, abort
|
|
case <-time.After(selfDeriveThrottling):
|
|
// Waited enough, willing to self-derive again
|
|
}
|
|
}
|
|
}
|
|
// In case of error, wait for termination
|
|
if err != nil {
|
|
w.log.Debug("Smartcard wallet self-derivation failed", "err", err)
|
|
errc = <-w.deriveQuit
|
|
}
|
|
errc <- err
|
|
}
|
|
|
|
// Accounts retrieves the list of signing accounts the wallet is currently aware
|
|
// of. For hierarchical deterministic wallets, the list will not be exhaustive,
|
|
// rather only contain the accounts explicitly pinned during account derivation.
|
|
func (w *Wallet) Accounts() []accounts.Account {
|
|
// Attempt self-derivation if it's running
|
|
reqc := make(chan struct{}, 1)
|
|
select {
|
|
case w.deriveReq <- reqc:
|
|
// Self-derivation request accepted, wait for it
|
|
<-reqc
|
|
default:
|
|
// Self-derivation offline, throttled or busy, skip
|
|
}
|
|
|
|
w.lock.Lock()
|
|
defer w.lock.Unlock()
|
|
|
|
if pairing := w.Hub.pairing(w); pairing != nil {
|
|
ret := make([]accounts.Account, 0, len(pairing.Accounts))
|
|
for address, path := range pairing.Accounts {
|
|
ret = append(ret, w.makeAccount(address, path))
|
|
}
|
|
|
|
sort.Sort(accounts.AccountsByURL(ret))
|
|
|
|
return ret
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (w *Wallet) makeAccount(address common.Address, path accounts.DerivationPath) accounts.Account {
|
|
return accounts.Account{
|
|
Address: address,
|
|
URL: accounts.URL{
|
|
Scheme: w.Hub.scheme,
|
|
Path: fmt.Sprintf("%x/%s", w.PublicKey[1:3], path.String()),
|
|
},
|
|
}
|
|
}
|
|
|
|
// Contains returns whether an account is part of this particular wallet or not.
|
|
func (w *Wallet) Contains(account accounts.Account) bool {
|
|
if pairing := w.Hub.pairing(w); pairing != nil {
|
|
_, ok := pairing.Accounts[account.Address]
|
|
return ok
|
|
}
|
|
|
|
return false
|
|
}
|
|
|
|
// Initialize installs a keypair generated from the provided key into the wallet.
|
|
func (w *Wallet) Initialize(seed []byte) error {
|
|
go w.selfDerive()
|
|
// DO NOT lock at this stage, as the initialize
|
|
// function relies on Status()
|
|
return w.session.initialize(seed)
|
|
}
|
|
|
|
// Derive attempts to explicitly derive a hierarchical deterministic account at
|
|
// the specified derivation path. If requested, the derived account will be added
|
|
// to the wallet's tracked account list.
|
|
func (w *Wallet) Derive(path accounts.DerivationPath, pin bool) (accounts.Account, error) {
|
|
w.lock.Lock()
|
|
defer w.lock.Unlock()
|
|
|
|
account, err := w.session.derive(path)
|
|
if err != nil {
|
|
return accounts.Account{}, err
|
|
}
|
|
|
|
if pin {
|
|
pairing := w.Hub.pairing(w)
|
|
pairing.Accounts[account.Address] = path
|
|
|
|
if err := w.Hub.setPairing(w, pairing); err != nil {
|
|
return accounts.Account{}, err
|
|
}
|
|
}
|
|
|
|
return account, nil
|
|
}
|
|
|
|
// SelfDerive sets a base account derivation path from which the wallet attempts
|
|
// to discover non zero accounts and automatically add them to list of tracked
|
|
// accounts.
|
|
//
|
|
// Note, self derivation will increment the last component of the specified path
|
|
// opposed to descending into a child path to allow discovering accounts starting
|
|
// from non zero components.
|
|
//
|
|
// Some hardware wallets switched derivation paths through their evolution, so
|
|
// this method supports providing multiple bases to discover old user accounts
|
|
// too. Only the last base will be used to derive the next empty account.
|
|
//
|
|
// You can disable automatic account discovery by calling SelfDerive with a nil
|
|
// chain state reader.
|
|
func (w *Wallet) SelfDerive(bases []accounts.DerivationPath, chain ethereum.ChainStateReader) {
|
|
w.lock.Lock()
|
|
defer w.lock.Unlock()
|
|
|
|
w.deriveNextPaths = make([]accounts.DerivationPath, len(bases))
|
|
for i, base := range bases {
|
|
w.deriveNextPaths[i] = make(accounts.DerivationPath, len(base))
|
|
copy(w.deriveNextPaths[i][:], base[:])
|
|
}
|
|
|
|
w.deriveNextAddrs = make([]common.Address, len(bases))
|
|
w.deriveChain = chain
|
|
}
|
|
|
|
// SignData requests the wallet to sign the hash of the given data.
|
|
//
|
|
// It looks up the account specified either solely via its address contained within,
|
|
// or optionally with the aid of any location metadata from the embedded URL field.
|
|
//
|
|
// If the wallet requires additional authentication to sign the request (e.g.
|
|
// a password to decrypt the account, or a PIN code o verify the transaction),
|
|
// an AuthNeededError instance will be returned, containing infos for the user
|
|
// about which fields or actions are needed. The user may retry by providing
|
|
// the needed details via SignDataWithPassphrase, or by other means (e.g. unlock
|
|
// the account in a keystore).
|
|
func (w *Wallet) SignData(account accounts.Account, mimeType string, data []byte) ([]byte, error) {
|
|
return w.signHash(account, crypto.Keccak256(data))
|
|
}
|
|
|
|
func (w *Wallet) signHash(account accounts.Account, hash []byte) ([]byte, error) {
|
|
w.lock.Lock()
|
|
defer w.lock.Unlock()
|
|
|
|
path, err := w.findAccountPath(account)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return w.session.sign(path, hash)
|
|
}
|
|
|
|
// SignTx requests the wallet to sign the given transaction.
|
|
//
|
|
// It looks up the account specified either solely via its address contained within,
|
|
// or optionally with the aid of any location metadata from the embedded URL field.
|
|
//
|
|
// If the wallet requires additional authentication to sign the request (e.g.
|
|
// a password to decrypt the account, or a PIN code o verify the transaction),
|
|
// an AuthNeededError instance will be returned, containing infos for the user
|
|
// about which fields or actions are needed. The user may retry by providing
|
|
// the needed details via SignTxWithPassphrase, or by other means (e.g. unlock
|
|
// the account in a keystore).
|
|
func (w *Wallet) SignTx(account accounts.Account, tx *types.Transaction, chainID *big.Int) (*types.Transaction, error) {
|
|
signer := types.LatestSignerForChainID(chainID)
|
|
hash := signer.Hash(tx)
|
|
|
|
sig, err := w.signHash(account, hash[:])
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return tx.WithSignature(signer, sig)
|
|
}
|
|
|
|
// SignDataWithPassphrase requests the wallet to sign the given hash with the
|
|
// given passphrase as extra authentication information.
|
|
//
|
|
// It looks up the account specified either solely via its address contained within,
|
|
// or optionally with the aid of any location metadata from the embedded URL field.
|
|
func (w *Wallet) SignDataWithPassphrase(account accounts.Account, passphrase, mimeType string, data []byte) ([]byte, error) {
|
|
return w.signHashWithPassphrase(account, passphrase, crypto.Keccak256(data))
|
|
}
|
|
|
|
func (w *Wallet) signHashWithPassphrase(account accounts.Account, passphrase string, hash []byte) ([]byte, error) {
|
|
if !w.session.verified {
|
|
if err := w.Open(passphrase); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
return w.signHash(account, hash)
|
|
}
|
|
|
|
// SignText requests the wallet to sign the hash of a given piece of data, prefixed
|
|
// by the Ethereum prefix scheme
|
|
// It looks up the account specified either solely via its address contained within,
|
|
// or optionally with the aid of any location metadata from the embedded URL field.
|
|
//
|
|
// If the wallet requires additional authentication to sign the request (e.g.
|
|
// a password to decrypt the account, or a PIN code o verify the transaction),
|
|
// an AuthNeededError instance will be returned, containing infos for the user
|
|
// about which fields or actions are needed. The user may retry by providing
|
|
// the needed details via SignHashWithPassphrase, or by other means (e.g. unlock
|
|
// the account in a keystore).
|
|
func (w *Wallet) SignText(account accounts.Account, text []byte) ([]byte, error) {
|
|
return w.signHash(account, accounts.TextHash(text))
|
|
}
|
|
|
|
// SignTextWithPassphrase implements accounts.Wallet, attempting to sign the
|
|
// given hash with the given account using passphrase as extra authentication
|
|
func (w *Wallet) SignTextWithPassphrase(account accounts.Account, passphrase string, text []byte) ([]byte, error) {
|
|
return w.signHashWithPassphrase(account, passphrase, crypto.Keccak256(accounts.TextHash(text)))
|
|
}
|
|
|
|
// SignTxWithPassphrase requests the wallet to sign the given transaction, with the
|
|
// given passphrase as extra authentication information.
|
|
//
|
|
// It looks up the account specified either solely via its address contained within,
|
|
// or optionally with the aid of any location metadata from the embedded URL field.
|
|
func (w *Wallet) SignTxWithPassphrase(account accounts.Account, passphrase string, tx *types.Transaction, chainID *big.Int) (*types.Transaction, error) {
|
|
if !w.session.verified {
|
|
if err := w.Open(passphrase); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
return w.SignTx(account, tx, chainID)
|
|
}
|
|
|
|
// findAccountPath returns the derivation path for the provided account.
|
|
// It first checks for the address in the list of pinned accounts, and if it is
|
|
// not found, attempts to parse the derivation path from the account's URL.
|
|
func (w *Wallet) findAccountPath(account accounts.Account) (accounts.DerivationPath, error) {
|
|
pairing := w.Hub.pairing(w)
|
|
if path, ok := pairing.Accounts[account.Address]; ok {
|
|
return path, nil
|
|
}
|
|
|
|
// Look for the path in the URL
|
|
if account.URL.Scheme != w.Hub.scheme {
|
|
return nil, fmt.Errorf("scheme %s does not match wallet scheme %s", account.URL.Scheme, w.Hub.scheme)
|
|
}
|
|
|
|
parts := strings.SplitN(account.URL.Path, "/", 2)
|
|
if len(parts) != 2 {
|
|
return nil, fmt.Errorf("invalid URL format: %s", account.URL)
|
|
}
|
|
|
|
if parts[0] != fmt.Sprintf("%x", w.PublicKey[1:3]) {
|
|
return nil, fmt.Errorf("URL %s is not for this wallet", account.URL)
|
|
}
|
|
|
|
return accounts.ParseDerivationPath(parts[1])
|
|
}
|
|
|
|
// Session represents a secured communication session with the wallet.
|
|
type Session struct {
|
|
Wallet *Wallet // A handle to the wallet that opened the session
|
|
Channel *SecureChannelSession // A secure channel for encrypted messages
|
|
verified bool // Whether the pin has been verified in this session.
|
|
}
|
|
|
|
// pair establishes a new pairing over this channel, using the provided secret.
|
|
func (s *Session) pair(secret []byte) (smartcardPairing, error) {
|
|
err := s.Channel.Pair(secret)
|
|
if err != nil {
|
|
return smartcardPairing{}, err
|
|
}
|
|
|
|
return smartcardPairing{
|
|
PublicKey: s.Wallet.PublicKey,
|
|
PairingIndex: s.Channel.PairingIndex,
|
|
PairingKey: s.Channel.PairingKey,
|
|
Accounts: make(map[common.Address]accounts.DerivationPath),
|
|
}, nil
|
|
}
|
|
|
|
// unpair deletes an existing pairing.
|
|
func (s *Session) unpair() error {
|
|
if !s.verified {
|
|
return fmt.Errorf("unpair requires that the PIN be verified")
|
|
}
|
|
|
|
return s.Channel.Unpair()
|
|
}
|
|
|
|
// verifyPin unlocks a wallet with the provided pin.
|
|
func (s *Session) verifyPin(pin []byte) error {
|
|
if _, err := s.Channel.transmitEncrypted(claSCWallet, insVerifyPin, 0, 0, pin); err != nil {
|
|
return err
|
|
}
|
|
|
|
s.verified = true
|
|
|
|
return nil
|
|
}
|
|
|
|
// unblockPin unblocks a wallet with the provided puk and resets the pin to the
|
|
// new one specified.
|
|
func (s *Session) unblockPin(pukpin []byte) error {
|
|
if _, err := s.Channel.transmitEncrypted(claSCWallet, insUnblockPin, 0, 0, pukpin); err != nil {
|
|
return err
|
|
}
|
|
|
|
s.verified = true
|
|
|
|
return nil
|
|
}
|
|
|
|
// release releases resources associated with the channel.
|
|
func (s *Session) release() error {
|
|
return s.Wallet.card.Disconnect(pcsc.LeaveCard)
|
|
}
|
|
|
|
// paired returns true if a valid pairing exists.
|
|
func (s *Session) paired() bool {
|
|
return s.Channel.PairingKey != nil
|
|
}
|
|
|
|
// authenticate uses an existing pairing to establish a secure channel.
|
|
func (s *Session) authenticate(pairing smartcardPairing) error {
|
|
if !bytes.Equal(s.Wallet.PublicKey, pairing.PublicKey) {
|
|
return fmt.Errorf("cannot pair using another wallet's pairing; %x != %x", s.Wallet.PublicKey, pairing.PublicKey)
|
|
}
|
|
|
|
s.Channel.PairingKey = pairing.PairingKey
|
|
s.Channel.PairingIndex = pairing.PairingIndex
|
|
|
|
return s.Channel.Open()
|
|
}
|
|
|
|
// walletStatus describes a smartcard wallet's status information.
|
|
type walletStatus struct {
|
|
PinRetryCount int // Number of remaining PIN retries
|
|
PukRetryCount int // Number of remaining PUK retries
|
|
Initialized bool // Whether the card has been initialized with a private key
|
|
}
|
|
|
|
// walletStatus fetches the wallet's status from the card.
|
|
func (s *Session) walletStatus() (*walletStatus, error) {
|
|
response, err := s.Channel.transmitEncrypted(claSCWallet, insStatus, statusP1WalletStatus, 0, nil)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
status := new(walletStatus)
|
|
if _, err := asn1.UnmarshalWithParams(response.Data, status, "tag:3"); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return status, nil
|
|
}
|
|
|
|
// derivationPath fetches the wallet's current derivation path from the card.
|
|
//
|
|
//lint:ignore U1000 needs to be added to the console interface
|
|
func (s *Session) derivationPath() (accounts.DerivationPath, error) {
|
|
response, err := s.Channel.transmitEncrypted(claSCWallet, insStatus, statusP1Path, 0, nil)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
buf := bytes.NewReader(response.Data)
|
|
path := make(accounts.DerivationPath, len(response.Data)/4)
|
|
|
|
return path, binary.Read(buf, binary.BigEndian, &path)
|
|
}
|
|
|
|
// initializeData contains data needed to initialize the smartcard wallet.
|
|
type initializeData struct {
|
|
PublicKey []byte `asn1:"tag:0"`
|
|
PrivateKey []byte `asn1:"tag:1"`
|
|
ChainCode []byte `asn1:"tag:2"`
|
|
}
|
|
|
|
// initialize initializes the card with new key data.
|
|
func (s *Session) initialize(seed []byte) error {
|
|
// Check that the wallet isn't currently initialized,
|
|
// otherwise the key would be overwritten.
|
|
status, err := s.Wallet.Status()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if status == "Online" {
|
|
return fmt.Errorf("card is already initialized, cowardly refusing to proceed")
|
|
}
|
|
|
|
s.Wallet.lock.Lock()
|
|
defer s.Wallet.lock.Unlock()
|
|
|
|
// HMAC the seed to produce the private key and chain code
|
|
mac := hmac.New(sha512.New, []byte("Bitcoin seed"))
|
|
mac.Write(seed)
|
|
seed = mac.Sum(nil)
|
|
|
|
key, err := crypto.ToECDSA(seed[:32])
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
id := initializeData{}
|
|
id.PublicKey = crypto.FromECDSAPub(&key.PublicKey)
|
|
id.PrivateKey = seed[:32]
|
|
id.ChainCode = seed[32:]
|
|
|
|
data, err := asn1.Marshal(id)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Nasty hack to force the top-level struct tag to be context-specific
|
|
data[0] = 0xA1
|
|
|
|
_, err = s.Channel.transmitEncrypted(claSCWallet, insLoadKey, 0x02, 0, data)
|
|
|
|
return err
|
|
}
|
|
|
|
// derive derives a new HD key path on the card.
|
|
func (s *Session) derive(path accounts.DerivationPath) (accounts.Account, error) {
|
|
startingPoint, path, err := derivationpath.Decode(path.String())
|
|
if err != nil {
|
|
return accounts.Account{}, err
|
|
}
|
|
|
|
var p1 uint8
|
|
|
|
switch startingPoint {
|
|
case derivationpath.StartingPointMaster:
|
|
p1 = P1DeriveKeyFromMaster
|
|
case derivationpath.StartingPointParent:
|
|
p1 = P1DeriveKeyFromParent
|
|
case derivationpath.StartingPointCurrent:
|
|
p1 = P1DeriveKeyFromCurrent
|
|
default:
|
|
return accounts.Account{}, fmt.Errorf("invalid startingPoint %d", startingPoint)
|
|
}
|
|
|
|
data := new(bytes.Buffer)
|
|
for _, segment := range path {
|
|
if err := binary.Write(data, binary.BigEndian, segment); err != nil {
|
|
return accounts.Account{}, err
|
|
}
|
|
}
|
|
|
|
_, err = s.Channel.transmitEncrypted(claSCWallet, insDeriveKey, p1, 0, data.Bytes())
|
|
if err != nil {
|
|
return accounts.Account{}, err
|
|
}
|
|
|
|
response, err := s.Channel.transmitEncrypted(claSCWallet, insSign, 0, 0, DerivationSignatureHash[:])
|
|
if err != nil {
|
|
return accounts.Account{}, err
|
|
}
|
|
|
|
sigdata := new(signatureData)
|
|
if _, err := asn1.UnmarshalWithParams(response.Data, sigdata, "tag:0"); err != nil {
|
|
return accounts.Account{}, err
|
|
}
|
|
|
|
rbytes, sbytes := sigdata.Signature.R.Bytes(), sigdata.Signature.S.Bytes()
|
|
sig := make([]byte, 65)
|
|
copy(sig[32-len(rbytes):32], rbytes)
|
|
copy(sig[64-len(sbytes):64], sbytes)
|
|
|
|
if err := confirmPublicKey(sig, sigdata.PublicKey); err != nil {
|
|
return accounts.Account{}, err
|
|
}
|
|
|
|
pub, err := crypto.UnmarshalPubkey(sigdata.PublicKey)
|
|
if err != nil {
|
|
return accounts.Account{}, err
|
|
}
|
|
|
|
return s.Wallet.makeAccount(crypto.PubkeyToAddress(*pub), path), nil
|
|
}
|
|
|
|
// keyExport contains information on an exported keypair.
|
|
//
|
|
//lint:ignore U1000 needs to be added to the console interface
|
|
type keyExport struct {
|
|
PublicKey []byte `asn1:"tag:0"`
|
|
PrivateKey []byte `asn1:"tag:1,optional"`
|
|
}
|
|
|
|
// publicKey returns the public key for the current derivation path.
|
|
//
|
|
//lint:ignore U1000 needs to be added to the console interface
|
|
func (s *Session) publicKey() ([]byte, error) {
|
|
response, err := s.Channel.transmitEncrypted(claSCWallet, insExportKey, exportP1Any, exportP2Pubkey, nil)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
keys := new(keyExport)
|
|
if _, err := asn1.UnmarshalWithParams(response.Data, keys, "tag:1"); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return keys.PublicKey, nil
|
|
}
|
|
|
|
// signatureData contains information on a signature - the signature itself and
|
|
// the corresponding public key.
|
|
type signatureData struct {
|
|
PublicKey []byte `asn1:"tag:0"`
|
|
Signature struct {
|
|
R *big.Int
|
|
S *big.Int
|
|
}
|
|
}
|
|
|
|
// sign asks the card to sign a message, and returns a valid signature after
|
|
// recovering the v value.
|
|
func (s *Session) sign(path accounts.DerivationPath, hash []byte) ([]byte, error) {
|
|
startTime := time.Now()
|
|
|
|
_, err := s.derive(path)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
deriveTime := time.Now()
|
|
|
|
response, err := s.Channel.transmitEncrypted(claSCWallet, insSign, signP1PrecomputedHash, signP2OnlyBlock, hash)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
sigdata := new(signatureData)
|
|
if _, err := asn1.UnmarshalWithParams(response.Data, sigdata, "tag:0"); err != nil {
|
|
return nil, err
|
|
}
|
|
// Serialize the signature
|
|
rbytes, sbytes := sigdata.Signature.R.Bytes(), sigdata.Signature.S.Bytes()
|
|
sig := make([]byte, 65)
|
|
copy(sig[32-len(rbytes):32], rbytes)
|
|
copy(sig[64-len(sbytes):64], sbytes)
|
|
|
|
// Recover the V value.
|
|
sig, err = makeRecoverableSignature(hash, sig, sigdata.PublicKey)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
log.Debug("Signed using smartcard", "deriveTime", deriveTime.Sub(startTime), "signingTime", time.Since(deriveTime))
|
|
|
|
return sig, nil
|
|
}
|
|
|
|
// confirmPublicKey confirms that the given signature belongs to the specified key.
|
|
func confirmPublicKey(sig, pubkey []byte) error {
|
|
_, err := makeRecoverableSignature(DerivationSignatureHash[:], sig, pubkey)
|
|
return err
|
|
}
|
|
|
|
// makeRecoverableSignature uses a signature and an expected public key to
|
|
// recover the v value and produce a recoverable signature.
|
|
func makeRecoverableSignature(hash, sig, expectedPubkey []byte) ([]byte, error) {
|
|
var libraryError error
|
|
|
|
for v := 0; v < 2; v++ {
|
|
sig[64] = byte(v)
|
|
if pubkey, err := crypto.Ecrecover(hash, sig); err == nil {
|
|
if bytes.Equal(pubkey, expectedPubkey) {
|
|
return sig, nil
|
|
}
|
|
} else {
|
|
libraryError = err
|
|
}
|
|
}
|
|
|
|
if libraryError != nil {
|
|
return nil, libraryError
|
|
}
|
|
|
|
return nil, ErrPubkeyMismatch
|
|
}
|