Skip to content
This repository was archived by the owner on Nov 6, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
4bc3642
Temp storage for the private state added
grbIzl Sep 12, 2018
b45ab28
Temp storage for the private state added
grbIzl Sep 12, 2018
e500400
Request message added
grbIzl Sep 12, 2018
89e85fb
Store and retrieve offchain state logic
grbIzl Mar 18, 2019
7e41d50
State sync cache
grbIzl Apr 10, 2019
53e063d
Private state column added to key value db
grbIzl Apr 23, 2019
36f7af1
Private state column added to key value db
grbIzl Apr 23, 2019
3fbd248
Indexing stored states via its hash
grbIzl Apr 23, 2019
698ca5f
Works with errors changed
grbIzl Apr 26, 2019
55d8af1
Private state stored into the local db
grbIzl Apr 26, 2019
763105c
Access to private state db added to sync io
grbIzl May 10, 2019
c85a87c
Private state db file added
grbIzl May 10, 2019
8216503
Rlp packets for retrieiving private state data added
grbIzl May 31, 2019
847df3c
Handling of private sync completed message
grbIzl May 31, 2019
960bf25
Test code fixed
grbIzl Jun 4, 2019
e4ab1ee
External flag for offchain storing added
grbIzl Jun 4, 2019
8e763f9
Test for private state sync added
grbIzl Jun 5, 2019
c1aa674
Saving private state logic corrected
grbIzl Jun 7, 2019
073f053
Migration code corrected
grbIzl Jun 13, 2019
a0561e7
Fixes after merge with master
grbIzl Jun 14, 2019
3e832c7
Merge with head
grbIzl Jul 3, 2019
9011626
Additional checks for slices
grbIzl Jul 3, 2019
75fced2
Log for private state retrieval added
grbIzl Jul 5, 2019
349b7a1
Limit time of retrieving private states
grbIzl Jul 23, 2019
44f55a4
Store required hashes for every request, mark them stale if needed
grbIzl Jul 29, 2019
86b9138
Store requested private state hashes and check received data
grbIzl Jul 30, 2019
70cd045
Log stale requests
grbIzl Jul 31, 2019
90f17d2
State insertion fix
grbIzl Aug 5, 2019
f8456f8
Refactoring of how logging passed to state store
grbIzl Aug 9, 2019
7b9370e
Heapsize removed, syncing hashes structure reworked
grbIzl Aug 9, 2019
97bd6d6
Check state length returned by contract
grbIzl Aug 9, 2019
3d95ab8
Get rid of OverlayDB
grbIzl Aug 12, 2019
ad000e3
hash-db version updated
grbIzl Aug 16, 2019
cdc11ae
Test fixed
grbIzl Aug 16, 2019
d003df8
One more test fixed
grbIzl Aug 16, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion ethcore/db/src/db.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@ pub const COL_ACCOUNT_BLOOM: Option<u32> = Some(5);
pub const COL_NODE_INFO: Option<u32> = Some(6);
/// Column for the light client chain.
pub const COL_LIGHT_CHAIN: Option<u32> = Some(7);
/// Column for the private transactions state.
pub const COL_PRIVATE_TRANSACTIONS_STATE: Option<u32> = Some(8);
/// Number of columns in DB
pub const NUM_COLUMNS: Option<u32> = Some(8);
pub const NUM_COLUMNS: Option<u32> = Some(9);

/// Modes for updating caches.
#[derive(Clone, Copy)]
Expand Down
5 changes: 5 additions & 0 deletions ethcore/private-tx/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ethabi = "8.0"
ethabi-contract = "8.0"
ethabi-derive = "8.0"
ethcore = { path = ".." }
ethcore-db = { path = "../db" }
ethcore-call-contract = { path = "../call-contract" }
ethcore-io = { path = "../../util/io" }
ethcore-miner = { path = "../../miner" }
Expand All @@ -23,9 +24,13 @@ ethkey = { path = "../../accounts/ethkey" }
fetch = { path = "../../util/fetch" }
futures = "0.1"
parity-util-mem = "0.2.0"
hash-db = "0.15.0"
keccak-hash = "0.2.0"
keccak-hasher = { path = "../../util/keccak-hasher" }
kvdb = "0.1"
log = "0.4"
machine = { path = "../machine" }
journaldb = { path = "../../util/journaldb" }
parity-bytes = "0.1"
parity-crypto = "0.4.0"
parking_lot = "0.8"
Expand Down
6 changes: 6 additions & 0 deletions ethcore/private-tx/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@ pub enum Error {
/// Account for signing requests to key server not set.
#[display(fmt = "Account for signing requests to key server not set.")]
KeyServerAccountNotSet,
/// Private state for the contract was not found in the local storage.
#[display(fmt = "Private state for the contract was not found in the local storage.")]
PrivateStateNotFound,
/// Cannot write state to the local database.
#[display(fmt = "Cannot write state to the local database.")]
DatabaseWriteError,
/// Encryption key is not found on key server.
#[display(fmt = "Encryption key is not found on key server for {}", _0)]
EncryptionKeyNotFound(Address),
Expand Down
Loading