Skip to content

Commit

Permalink
Bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
@vldm
vldm committed Dec 27, 2021
1 parent 51aedf3 commit 3b9df1e
Show file tree
Hide file tree
Showing 29 changed files with 61 additions and 38 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock
View file

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

2 changes: 1 addition & 1 deletion accounts-bench/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ solana-logger = { path = "../logger", version = "=1.6.14" }
solana-runtime = { path = "../runtime", version = "=1.6.14" }
solana-measure = { path = "../measure", version = "=1.6.14" }
solana-sdk = { path = "../sdk", version = "=1.6.14" }
solana-version = { path = "../version", version = "=0.4.3" }
solana-version = { path = "../version", version = "=0.4.4" }
rand = "0.7.0"
clap = "2.33.1"
crossbeam-channel = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion accounts-cluster-bench/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ solana-faucet = { path = "../faucet", version = "=1.6.14" }
solana-runtime = { path = "../runtime", version = "=1.6.14" }
solana-sdk = { path = "../sdk", version = "=1.6.14" }
solana-transaction-status = { path = "../transaction-status", version = "=1.6.14" }
solana-version = { path = "../version", version = "=0.4.3" }
solana-version = { path = "../version", version = "=0.4.4" }
spl-token-v2-0 = { package = "spl-token", version = "=3.1.1", features = ["no-entrypoint"] }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion banking-bench/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ solana-logger = { path = "../logger", version = "=1.6.14" }
solana-runtime = { path = "../runtime", version = "=1.6.14" }
solana-measure = { path = "../measure", version = "=1.6.14" }
solana-sdk = { path = "../sdk", version = "=1.6.14" }
solana-version = { path = "../version", version = "=0.4.3" }
solana-version = { path = "../version", version = "=0.4.4" }

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
2 changes: 1 addition & 1 deletion bench-exchange/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ solana-metrics = { path = "../metrics", version = "=1.6.14" }
solana-net-utils = { path = "../net-utils", version = "=1.6.14" }
solana-runtime = { path = "../runtime", version = "=1.6.14" }
solana-sdk = { path = "../sdk", version = "=1.6.14" }
solana-version = { path = "../version", version = "=0.4.3" }
solana-version = { path = "../version", version = "=0.4.4" }

[dev-dependencies]
solana-local-cluster = { path = "../local-cluster", version = "=1.6.14" }
Expand Down
2 changes: 1 addition & 1 deletion bench-streamer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ solana-clap-utils = { path = "../clap-utils", version = "=1.6.14" }
solana-streamer = { path = "../streamer", version = "=1.6.14" }
solana-logger = { path = "../logger", version = "=1.6.14" }
solana-net-utils = { path = "../net-utils", version = "=1.6.14" }
solana-version = { path = "../version", version = "=0.4.3" }
solana-version = { path = "../version", version = "=0.4.4" }

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
2 changes: 1 addition & 1 deletion bench-tps-evm/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ solana-measure = { path = "../measure", version = "1.4.0" }
solana-net-utils = { path = "../net-utils", version = "1.4.0" }
solana-runtime = { path = "../runtime", version = "1.4.0" }
solana-sdk = { path = "../sdk", version = "1.4.0" }
solana-version = { path = "../version", version = "=0.4.3" }
solana-version = { path = "../version", version = "=0.4.4" }
solana-evm-loader-program = { path = "../evm-utils/programs/evm_loader" }
rand_isaac = "0.1.1"
simple_logger = "1.11"
Expand Down
2 changes: 1 addition & 1 deletion bench-tps/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ solana-measure = { path = "../measure", version = "=1.6.14" }
solana-net-utils = { path = "../net-utils", version = "=1.6.14" }
solana-runtime = { path = "../runtime", version = "=1.6.14" }
solana-sdk = { path = "../sdk", version = "=1.6.14" }
solana-version = { path = "../version", version = "=0.4.3" }
solana-version = { path = "../version", version = "=0.4.4" }

[dev-dependencies]
serial_test = "0.4.0"
Expand Down
2 changes: 1 addition & 1 deletion cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ solana-remote-wallet = { path = "../remote-wallet", version = "=1.6.14" }
solana-sdk = { path = "../sdk", version = "=1.6.14" }
solana-stake-program = { path = "../programs/stake", version = "=1.6.14" }
solana-transaction-status = { path = "../transaction-status", version = "=1.6.14" }
solana-version = { path = "../version", version = "=0.4.3" }
solana-version = { path = "../version", version = "=0.4.4" }
solana-vote-program = { path = "../programs/vote", version = "=1.6.14" }
spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
thiserror = "1.0.21"
Expand Down
2 changes: 1 addition & 1 deletion client/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ solana-faucet = { path = "../faucet", version = "=1.6.14" }
solana-net-utils = { path = "../net-utils", version = "=1.6.14" }
solana-sdk = { path = "../sdk", version = "=1.6.14" }
solana-transaction-status = { path = "../transaction-status", version = "=1.6.14" }
solana-version = { path = "../version", version = "=0.4.3" }
solana-version = { path = "../version", version = "=0.4.4" }
solana-vote-program = { path = "../programs/vote", version = "=1.6.14" }
solana-stake-program = { path = "../programs/stake", version = "=1.6.14" }
solana-runtime = { path = "../runtime", version = "=1.6.14" }
Expand Down
2 changes: 1 addition & 1 deletion dos/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ solana-logger = { path = "../logger", version = "=1.6.14" }
solana-net-utils = { path = "../net-utils", version = "=1.6.14" }
solana-runtime = { path = "../runtime", version = "=1.6.14" }
solana-sdk = { path = "../sdk", version = "=1.6.14" }
solana-version = { path = "../version", version = "=0.4.3" }
solana-version = { path = "../version", version = "=0.4.4" }
solana-client = { path = "../client", version = "=1.6.14" }

[package.metadata.docs.rs]
Expand Down
43 changes: 33 additions & 10 deletions evm-utils/evm-state/src/storage/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,8 @@ impl Storage {
/// Mark slot as removed, also find root_hash that correspond to this bank, and decrement its counter.
/// Return root_hash if it counter == 0 after removing
pub fn purge_slot(&self, slot: u64) -> Result<Option<H256>> {
// TODO: clever retry on purge slot failure (if transaction conflict).
// TODO: also make some retry on RootCleanup manager.
if !self.gc_enabled {
return Ok(None);
}
Expand Down Expand Up @@ -362,12 +364,12 @@ impl Storage {
/// Our garbage collection counts only references of child objects.
/// Because root_hash has no parents it should be handled separately.
///
/// Increment root_link reference counter.
/// This method introduce a link between slot and root.
/// Increment root_link reference counter, and mark slot.
///
/// This operation is used in two cases:
/// 1. When our root tree is modified, and new root_hash is produced.
/// 2. When we insert new account_state object - this object contain reference to storage_root, which should be registered too. (this one was inlined)
/// 1. When new bank is created.
/// 2. When bank change it's root (reset_slot_root flag is provided).
// Save info. slot -> root_hash
// Increment root_hash references counter.
pub fn register_slot(&self, slot: u64, root: H256, reset_slot_root: bool) -> Result<()> {
Expand All @@ -376,12 +378,14 @@ impl Storage {
}
let slots_cf = self.cf::<SlotsRoots>();
let trie = self.rocksdb_trie_handle();
let mut tx = self.db().transaction();

info!("Register slot:{} root:{}", slot, root);
let purge_root = if let Some(data) = tx.get_cf(slots_cf, &slot.to_be_bytes())? {

const NUM_RETRY: usize = 500; // ~10ms-100ms
let purge_root = if let Some(data) = self.db().get_cf(slots_cf, &slot.to_be_bytes())? {
let purge_root = H256::from_slice(data.as_ref());
if !reset_slot_root {
// root should be changed only on purpose, and changed to different value
if !reset_slot_root || root == purge_root {
error!(
"Slot was already registered, but reset_slot_root wasn't set, slot: {}, previous: {}, new:{}",
slot, purge_root, root
Expand All @@ -392,13 +396,32 @@ impl Storage {
} else {
None
};
tx.put_cf(slots_cf, &slot.to_be_bytes(), root.as_ref())?;
trie.db.increase(&mut tx, root)?;
tx.commit()?;

let retry = || -> Result<_> {
let mut tx = self.db().transaction();
tx.put_cf(slots_cf, &slot.to_be_bytes(), root.as_ref())?;
trie.db.increase(&mut tx, root)?;
tx.commit()?;
Ok(())
};
let mut complete = None;
for retry_count in 0..NUM_RETRY {
complete = Some(retry().map(|v| (v, retry_count)));
match complete.as_ref().unwrap() {
Ok(_) => break,
Err(e) => log::trace!(
"Error during transaction execution retry_count:{} reason:{}",
retry_count + 1,
e
),
}
}
complete.expect("Retry should save completion artifact.")?;

if let Some(purge_root) = purge_root {
let trie = self.rocksdb_trie_handle();
if trie.gc_unpin_root(purge_root) {
// TODO: Propagate cleanup to outer level.
RootCleanup::new(&self, vec![purge_root]).cleanup()?;
}
}
Expand Down
2 changes: 1 addition & 1 deletion faucet/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ solana-cli-config = { path = "../cli-config", version = "=1.6.14" }
solana-logger = { path = "../logger", version = "=1.6.14" }
solana-metrics = { path = "../metrics", version = "=1.6.14" }
solana-sdk = { path = "../sdk", version = "=1.6.14" }
solana-version = { path = "../version", version = "=0.4.3" }
solana-version = { path = "../version", version = "=0.4.4" }
spl-memo = { version = "=3.0.1", features = ["no-entrypoint"] }
thiserror = "1.0"
tokio = { version = "1", features = ["full"] }
Expand Down
2 changes: 1 addition & 1 deletion genesis/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ solana-logger = { path = "../logger", version = "=1.6.14" }
solana-runtime = { path = "../runtime", version = "=1.6.14" }
solana-sdk = { path = "../sdk", version = "=1.6.14" }
solana-stake-program = { path = "../programs/stake", version = "=1.6.14" }
solana-version = { path = "../version", version = "=0.4.3" }
solana-version = { path = "../version", version = "=0.4.4" }
solana-vest-program = { path = "../programs/vest", version = "=1.6.14" }
solana-vote-program = { path = "../programs/vote", version = "=1.6.14" }

Expand Down
2 changes: 1 addition & 1 deletion gossip/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ solana-core = { path = "../core", version = "=1.6.14" }
solana-logger = { path = "../logger", version = "=1.6.14" }
solana-net-utils = { path = "../net-utils", version = "=1.6.14" }
solana-sdk = { path = "../sdk", version = "=1.6.14" }
solana-version = { path = "../version", version = "=0.4.3" }
solana-version = { path = "../version", version = "=0.4.4" }

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
2 changes: 1 addition & 1 deletion install/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ solana-client = { path = "../client", version = "=1.6.14" }
solana-config-program = { path = "../programs/config", version = "=1.6.14" }
solana-logger = { path = "../logger", version = "=1.6.14" }
solana-sdk = { path = "../sdk", version = "=1.6.14" }
solana-version = { path = "../version", version = "=0.4.3" }
solana-version = { path = "../version", version = "=0.4.4" }
tar = "0.4.28"
tempfile = "3.1.0"
url = "2.1.1"
Expand Down
2 changes: 1 addition & 1 deletion keygen/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ solana-clap-utils = { path = "../clap-utils", version = "=1.6.14" }
solana-cli-config = { path = "../cli-config", version = "=1.6.14" }
solana-remote-wallet = { path = "../remote-wallet", version = "=1.6.14" }
solana-sdk = { path = "../sdk", version = "=1.6.14" }
solana-version = { path = "../version", version = "=0.4.3" }
solana-version = { path = "../version", version = "=0.4.4" }
tiny-bip39 = "0.7.0"

[[bin]]
Expand Down
2 changes: 1 addition & 1 deletion ledger-tool/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ solana-sdk = { path = "../sdk", version = "=1.6.14" }
solana-stake-program = { path = "../programs/stake", version = "=1.6.14" }
solana-storage-bigtable = { path = "../storage-bigtable", version = "=1.6.14" }
solana-transaction-status = { path = "../transaction-status", version = "=1.6.14" }
solana-version = { path = "../version", version = "=0.4.3" }
solana-version = { path = "../version", version = "=0.4.4" }
solana-vote-program = { path = "../programs/vote", version = "=1.6.14" }

tempfile = "3.1.0"
Expand Down
2 changes: 1 addition & 1 deletion log-analyzer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ serde = "1.0.122"
serde_json = "1.0.56"
solana-clap-utils = { path = "../clap-utils", version = "=1.6.14" }
solana-logger = { path = "../logger", version = "=1.6.14" }
solana-version = { path = "../version", version = "=0.4.3" }
solana-version = { path = "../version", version = "=0.4.4" }

[[bin]]
name = "solana-log-analyzer"
Expand Down
2 changes: 1 addition & 1 deletion merkle-root-bench/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ solana-logger = { path = "../logger", version = "=1.6.14" }
solana-runtime = { path = "../runtime", version = "=1.6.14" }
solana-measure = { path = "../measure", version = "=1.6.14" }
solana-sdk = { path = "../sdk", version = "=1.6.14" }
solana-version = { path = "../version", version = "=0.4.3" }
solana-version = { path = "../version", version = "=0.4.4" }
clap = "2.33.1"

[package.metadata.docs.rs]
Expand Down
2 changes: 1 addition & 1 deletion net-utils/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ serde_derive = "1.0.103"
socket2 = "0.3.17"
solana-clap-utils = { path = "../clap-utils", version = "=1.6.14" }
solana-logger = { path = "../logger", version = "=1.6.14" }
solana-version = { path = "../version", version = "=0.4.3" }
solana-version = { path = "../version", version = "=0.4.4" }
tokio = { version = "1", features = ["full"] }
url = "2.1.1"

Expand Down
2 changes: 1 addition & 1 deletion poh-bench/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ solana-ledger = { path = "../ledger", version = "=1.6.14" }
solana-sdk = { path = "../sdk", version = "=1.6.14" }
solana-clap-utils = { path = "../clap-utils", version = "=1.6.14" }
solana-measure = { path = "../measure", version = "=1.6.14" }
solana-version = { path = "../version", version = "=0.4.3" }
solana-version = { path = "../version", version = "=0.4.4" }
solana-perf = { path = "../perf", version = "=1.6.14" }

[package.metadata.docs.rs]
Expand Down
2 changes: 1 addition & 1 deletion runtime/store-tool/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ publish = false
[dependencies]
log = { version = "0.4.11" }
solana-logger = { path = "../../logger", version = "=1.6.14" }
solana-version = { path = "../../version", version = "=0.4.3" }
solana-version = { path = "../../version", version = "=0.4.4" }
solana-measure = { path = "../../measure", version = "=1.6.14" }
solana-runtime = { path = "..", version = "=1.6.14" }
solana-sdk = { path = "../../sdk", version = "=1.6.14" }
Expand Down
2 changes: 1 addition & 1 deletion stake-monitor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ solana-metrics = { path = "../metrics", version = "=1.6.14" }
solana-sdk = { path = "../sdk", version = "=1.6.14" }
solana-stake-program = { path = "../programs/stake", version = "=1.6.14" }
solana-transaction-status = { path = "../transaction-status", version = "=1.6.14" }
solana-version = { path = "../version", version = "=0.4.3" }
solana-version = { path = "../version", version = "=0.4.4" }

[dev-dependencies]
serial_test = "0.4.0"
Expand Down
2 changes: 1 addition & 1 deletion sys-tuner/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ log = "0.4.11"
libc = "0.2.81"
solana-clap-utils = { path = "../clap-utils", version = "=1.6.14" }
solana-logger = { path = "../logger", version = "=1.6.14" }
solana-version = { path = "../version", version = "=0.4.3" }
solana-version = { path = "../version", version = "=0.4.4" }

[target."cfg(unix)".dependencies]
unix_socket2 = "0.5.4"
Expand Down
2 changes: 1 addition & 1 deletion tokens/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ solana-runtime = { path = "../runtime", version = "=1.6.14" }
solana-sdk = { path = "../sdk", version = "=1.6.14" }
solana-stake-program = { path = "../programs/stake", version = "=1.6.14" }
solana-transaction-status = { path = "../transaction-status", version = "=1.6.14" }
solana-version = { path = "../version", version = "=0.4.3" }
solana-version = { path = "../version", version = "=0.4.4" }
spl-associated-token-account-v1-0 = { package = "spl-associated-token-account", version = "=1.0.2" }
spl-token-v2-0 = { package = "spl-token", version = "=3.1.1", features = ["no-entrypoint"] }
tempfile = "3.1.0"
Expand Down
2 changes: 1 addition & 1 deletion validator/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ solana-net-utils = { path = "../net-utils", version = "=1.6.14" }
solana-perf = { path = "../perf", version = "=1.6.14" }
solana-runtime = { path = "../runtime", version = "=1.6.14" }
solana-sdk = { path = "../sdk", version = "=1.6.14" }
solana-version = { path = "../version", version = "=0.4.3" }
solana-version = { path = "../version", version = "=0.4.4" }
solana-vote-program = { path = "../programs/vote", version = "=1.6.14" }
symlink = "0.1.0"

Expand Down
2 changes: 1 addition & 1 deletion version/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "solana-version"
version = "0.4.3"
version = "0.4.4"
license = "Apache-2.0"
edition = "2018"

Expand Down
2 changes: 1 addition & 1 deletion watchtower/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ solana-logger = { path = "../logger", version = "=1.6.14" }
solana-metrics = { path = "../metrics", version = "=1.6.14" }
solana-notifier = { path = "../notifier", version = "=1.6.14" }
solana-sdk = { path = "../sdk", version = "=1.6.14" }
solana-version = { path = "../version", version = "=0.4.3" }
solana-version = { path = "../version", version = "=0.4.4" }

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

0 comments on commit 3b9df1e

Please sign in to comment.