Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

set correct nonce when node creates a public transaction wrapping a private transaction #10391

Merged
merged 1 commit into from
Feb 22, 2019

Conversation

adetante
Copy link

@adetante adetante commented Feb 21, 2019

Set correct nonce value when creating a public transaction wrapping a private one.

fix #10390

@parity-cla-bot
Copy link

It looks like @adetante hasn't signed our Contributor License Agreement, yet.

The purpose of a CLA is to ensure that the guardian of a project's outputs has the necessary ownership or grants of rights over all contributions to allow them to distribute under the chosen licence.
Wikipedia

You can read and sign our full Contributor License Agreement at the following URL: https://cla.parity.io

Once you've signed, please reply to this thread with [clabot:check] to prove it.

Many thanks,

Parity Technologies CLA Bot

@jam10o-new jam10o-new added A0-pleasereview 🤓 Pull request needs code review. M4-core ⛓ Core client code / Rust. labels Feb 21, 2019
@adetante
Copy link
Author

[clabot:check]

@parity-cla-bot
Copy link

It looks like @adetante signed our Contributor License Agreement. 👍

Many thanks,

Parity Technologies CLA Bot

@5chdn 5chdn modified the milestones: 2.4, 2.5, 2.6 Feb 21, 2019
@grbIzl
Copy link
Collaborator

grbIzl commented Feb 22, 2019

Looks good to me. Again, @adetante thanks for finding and fixing!

@soc1c soc1c added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Feb 22, 2019
@soc1c soc1c changed the title fix #10390 set correct nonce when node creates a public transaction wrapping a private transaction Feb 22, 2019
@soc1c soc1c merged commit fcccbf3 into openethereum:master Feb 22, 2019
ascjones pushed a commit that referenced this pull request Apr 1, 2019
@niklasad1 niklasad1 mentioned this pull request Apr 1, 2019
8 tasks
soc1c pushed a commit that referenced this pull request Apr 1, 2019
* fix(rpc-types): replace uint and hash with `ethereum_types v0.4` (#10217)

* fix(rpc-types): remove uint and hash wrappers

* fix(tests)

* fix(cleanup)

* grumbles(rpc-api): revert `verify_signature`

* revert change of `U64` -> `u64`

* fix(cleanup after bad merge)

* chore(bump ethereum-types)

* fix(bad merge)

* feat(tests ethereum-types): add tests

* chore(update `ethereum-types` to 0.4.2)

* feat(tests for h256)

* chore(rpc): remove `ethbloom` import

Use re-export from `ethereum-types` instead

* fix(bad merge): remove `DefaultAccount` type

* doc(add TODO with issue link)

* chore(bump ethereum-types) (#10396)

Fixes a de-serialization bug in `ethereum-tyes`

* fix(light eth_gasPrice): ask network if not in cache (#10535)

* fix(light eth_gasPrice): ask N/W if not in cache

* fix(bad rebase)

* fix(light account response): update `tx_queue` (#10545)

* fix(bump dependencies) (#10540)

* cargo update -p log:0.4.5

* cargo update -p regex:1.0.5

* cargo update -p parking_lot

* cargo update -p serde_derive

* cargo update -p serde_json

* cargo update -p serde

* cargo update -p lazy_static

* cargo update -p num_cpus

* cargo update -p toml

# Conflicts:
#	Cargo.lock

* tx-pool: check transaction readiness before replacing (#10526)

* Update to vanilla tx pool error

* Prevent a non ready tx replacing a ready tx

* Make tests compile

* Test ready tx not replaced by future tx

* Transaction indirection

* Use StateReadiness to calculate Ready in `should_replace`

* Test existing txs from same sender are used to compute Readiness

* private-tx: Wire up ShouldReplace

* Revert "Use StateReadiness to calculate Ready in `should_replace`"

This reverts commit af9e69c

* Make replace generic so it works with private-tx

* Rename Replace and add missing docs

* ShouldReplace no longer mutable

* tx-pool: update to transaction-pool 2.0 from crates.io

* tx-pool: generic error type alias

* Exit early for first unmatching nonce

* Fix private-tx test, use existing write lock

* Use read lock for pool scoring

* fix #10390 (#10391)

* private-tx: replace error_chain (#10510)

* Update to vanilla tx pool error

* private-tx: remove error-chain, implement Error, derive Display

* private-tx: replace ErrorKind and bail!

* private-tx: add missing From impls and other compiler errors

* private-tx: use original tx-pool error

* Don't be silly cargo
ordian added a commit that referenced this pull request Apr 5, 2019
* master:
  fix #10390 (#10391)
  Fix to_pod storage trie value decoding (#10368)
  revert some changes, could be buggy (#10399)
  version: bump nightly to 2.5 (#10392)
  no-git for publish jobs, empty artifacts dir (#10393)
  fix(jni): bump to jni to 0.11 & remove unsafe impl (#10394)
  chore(bump ethereum-types) (#10396)
  Update to latest mem-db, hash-db and trie-db. (#10314)
  tx pool: always accept local transactions (#10375)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A8-looksgood 🦄 Pull request is reviewed well. M4-core ⛓ Core client code / Rust.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Incorrect nonce when node creates a public transaction wrapping a private transaction
6 participants