Merge remote-tracking branch 'soon-origin/master' into prio-scheduler…

…-crate

CHANGELOG.md

@@ -37,6 +37,19 @@ or
 tools-version = "1.43"
 ```
 The order of precedence for the chosen tools version goes: `--tools-version` argument, package version, workspace version, and finally default version.
+ * `package-metadata`: specify a program's id in Cargo.toml for easy consumption by downstream users and tools using `solana-package-metadata` (#1806). For example:
+```toml
+[package.metadata.solana]
+program-id = "MyProgram1111111111111111111111111111111111"
+```
+Can be consumed in the program crate:
+```rust
+solana_package_metadata::declare_id_with_package_metadata!("solana.program-id");
+```
+This is equivalent to writing:
+```rust
+solana_pubkey::declare_id!("MyProgram1111111111111111111111111111111111");
+```
  * `agave-validator`: Update PoH speed check to compare against current hash rate from a Bank (#2447)
  * `solana-test-validator`: Add `--clone-feature-set` flag to mimic features from a target cluster (#2480)
  * `solana-genesis`: the `--cluster-type` parameter now clones the feature set from the target cluster (#2587)

Cargo.toml

@@ -100,7 +100,6 @@ members = [
  "rpc-test",
  "runtime",
  "runtime-transaction",
- "sanitize",
  "sdk",
  "sdk/account",
  "sdk/account-info",
@@ -118,14 +117,18 @@ members = [
  "sdk/instruction",
  "sdk/macro",
  "sdk/msg",
+ "sdk/native-token",
+ "sdk/package-metadata",
  "sdk/package-metadata-macro",
  "sdk/program",
+ "sdk/program-entrypoint",
  "sdk/program-error",
  "sdk/program-memory",
  "sdk/program-option",
  "sdk/program-pack",
  "sdk/pubkey",
  "sdk/rent",
+ "sdk/sanitize",
  "sdk/serde-varint",
  "sdk/serialize-utils",
  "sdk/sha256-hasher",
@@ -407,6 +410,7 @@ solana-define-syscall = { path = "define-syscall", version = "=2.1.0" }
 solana-derivation-path = { path = "sdk/derivation-path", version = "=2.1.0" }
 solana-download-utils = { path = "download-utils", version = "=2.1.0" }
 solana-entry = { path = "entry", version = "=2.1.0" }
+solana-program-entrypoint = { path = "sdk/program-entrypoint", version = "=2.1.0" }
 solana-epoch-schedule = { path = "sdk/epoch-schedule", version = "=2.1.0" }
 solana-faucet = { path = "faucet", version = "=2.1.0" }
 solana-feature-set = { path = "sdk/feature-set", version = "=2.1.0" }
@@ -432,9 +436,11 @@ solana-measure = { path = "measure", version = "=2.1.0" }
 solana-merkle-tree = { path = "merkle-tree", version = "=2.1.0" }
 solana-metrics = { path = "metrics", version = "=2.1.0" }
 solana-msg = { path = "sdk/msg", version = "=2.1.0" }
+solana-native-token = { path = "sdk/native-token", version = "=2.1.0" }
 solana-net-utils = { path = "net-utils", version = "=2.1.0" }
 solana-nohash-hasher = "0.2.1"
 solana-notifier = { path = "notifier", version = "=2.1.0" }
+solana-package-metadata = { path = "sdk/package-metadata", version = "=2.1.0" }
 solana-package-metadata-macro = { path = "sdk/package-metadata-macro", version = "=2.1.0" }
 solana-perf = { path = "perf", version = "=2.1.0" }
 solana-poh = { path = "poh", version = "=2.1.0" }
@@ -453,7 +459,7 @@ solana-quic-client = { path = "quic-client", version = "=2.1.0" }
 solana-rayon-threadlimit = { path = "rayon-threadlimit", version = "=2.1.0" }
 solana-remote-wallet = { path = "remote-wallet", version = "=2.1.0", default-features = false }
 solana-rent = { path = "sdk/rent", version = "=2.1.0", default-features = false }
-solana-sanitize = { path = "sanitize", version = "=2.1.0" }
+solana-sanitize = { path = "sdk/sanitize", version = "=2.1.0" }
 solana-serde-varint = { path = "sdk/serde-varint", version = "=2.1.0" }
 solana-serialize-utils = { path = "sdk/serialize-utils", version = "=2.1.0" }
 solana-sha256-hasher = { path = "sdk/sha256-hasher", version = "=2.1.0" }

accounts-db/src/accounts.rs

@@ -81,12 +81,14 @@ impl Accounts {
  }
  }
 
+ /// Return loaded addresses and the deactivation slot.
+ /// If the table hasn't been deactivated, the deactivation slot is `u64::MAX`.
  pub fn load_lookup_table_addresses(
  &self,
  ancestors: &Ancestors,
  address_table_lookup: SVMMessageAddressTableLookup,
  slot_hashes: &SlotHashes,
- ) -> std::result::Result<LoadedAddresses, AddressLookupError> {
+ ) -> std::result::Result<(LoadedAddresses, Slot), AddressLookupError> {
  let table_account = self
  .accounts_db
  .load_with_fixed_root(ancestors, address_table_lookup.account_key)
@@ -98,18 +100,21 @@ impl Accounts {
  let lookup_table = AddressLookupTable::deserialize(table_account.data())
  .map_err(|_ix_err| AddressLookupError::InvalidAccountData)?;
 
- Ok(LoadedAddresses {
- writable: lookup_table.lookup(
- current_slot,
- address_table_lookup.writable_indexes,
- slot_hashes,
- )?,
- readonly: lookup_table.lookup(
- current_slot,
- address_table_lookup.readonly_indexes,
- slot_hashes,
- )?,
- })
+ Ok((
+ LoadedAddresses {
+ writable: lookup_table.lookup(
+ current_slot,
+ address_table_lookup.writable_indexes,
+ slot_hashes,
+ )?,
+ readonly: lookup_table.lookup(
+ current_slot,
+ address_table_lookup.readonly_indexes,
+ slot_hashes,
+ )?,
+ },
+ lookup_table.meta.deactivation_slot,
+ ))
  } else {
  Err(AddressLookupError::InvalidAccountOwner)
  }
@@ -806,10 +811,13 @@ mod tests {
  SVMMessageAddressTableLookup::from(&address_table_lookup),
  &SlotHashes::default(),
  ),
- Ok(LoadedAddresses {
- writable: vec![table_addresses[0]],
- readonly: vec![table_addresses[1]],
- }),
+ Ok((
+ LoadedAddresses {
+ writable: vec![table_addresses[0]],
+ readonly: vec![table_addresses[1]],
+ },
+ u64::MAX
+ )),
  );
  }