diff --git a/Cargo.lock b/Cargo.lock index b2d3f6a..ad97a99 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -71,7 +71,7 @@ checksum = "e35cc5b8887b993ba4975a23b6e098ee10db50e8e23ee3a9523035b7ca35b53b" dependencies = [ "ahash 0.8.12", "solana-epoch-schedule", - "solana-hash", + "solana-hash 2.3.0", "solana-pubkey", "solana-sha256-hasher", "solana-svm-feature-set", @@ -150,7 +150,7 @@ dependencies = [ "serde", "serde_json", "solana-gossip", - "solana-hash", + "solana-hash 3.0.0", "solana-keypair", "solana-serde", "solana-signer", @@ -170,7 +170,7 @@ version = "2.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f03b445b2c9c4f6438d977f996780806339ae9bbc4bcc9af8bbd9ddc1148778a" dependencies = [ - "solana-hash", + "solana-hash 2.3.0", "solana-message", "solana-packet", "solana-pubkey", @@ -5494,7 +5494,7 @@ dependencies = [ "solana-epoch-schedule", "solana-fee-calculator", "solana-genesis-config", - "solana-hash", + "solana-hash 2.3.0", "solana-lattice-hash", "solana-measure", "solana-message", @@ -5546,6 +5546,15 @@ dependencies = [ "parking_lot 0.12.4", ] +[[package]] +name = "solana-atomic-u64" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a933ff1e50aff72d02173cfcd7511bd8540b027ee720b75f353f594f834216d0" +dependencies = [ + "parking_lot 0.12.4", +] + [[package]] name = "solana-big-mod-exp" version = "2.2.1" @@ -5576,8 +5585,8 @@ checksum = "a1a0801e25a1b31a14494fc80882a036be0ffd290efc4c2d640bfcca120a4672" dependencies = [ "blake3", "solana-define-syscall", - "solana-hash", - "solana-sanitize", + "solana-hash 2.3.0", + "solana-sanitize 2.2.1", ] [[package]] @@ -5591,7 +5600,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_derive", - "solana-sanitize", + "solana-sanitize 2.2.1", "solana-time-utils", ] @@ -5640,7 +5649,7 @@ dependencies = [ "solana-clock", "solana-cpi", "solana-curve25519", - "solana-hash", + "solana-hash 2.3.0", "solana-instruction", "solana-keccak-hasher", "solana-loader-v3-interface", @@ -5695,7 +5704,7 @@ dependencies = [ "agave-feature-set", "solana-bpf-loader-program", "solana-compute-budget-program", - "solana-hash", + "solana-hash 2.3.0", "solana-loader-v4-program", "solana-program-runtime", "solana-pubkey", @@ -5739,7 +5748,7 @@ dependencies = [ "solana-cluster-type", "solana-commitment-config", "solana-derivation-path", - "solana-hash", + "solana-hash 2.3.0", "solana-keypair", "solana-message", "solana-native-token", @@ -5776,7 +5785,7 @@ dependencies = [ "solana-commitment-config", "solana-connection-cache", "solana-epoch-info", - "solana-hash", + "solana-hash 2.3.0", "solana-instruction", "solana-keypair", "solana-measure", @@ -5810,7 +5819,7 @@ dependencies = [ "solana-account", "solana-commitment-config", "solana-epoch-info", - "solana-hash", + "solana-hash 2.3.0", "solana-instruction", "solana-keypair", "solana-message", @@ -5843,7 +5852,7 @@ checksum = "7ace9fea2daa28354d107ea879cff107181d85cd4e0f78a2bedb10e1a428c97e" dependencies = [ "serde", "serde_derive", - "solana-hash", + "solana-hash 2.3.0", ] [[package]] @@ -6053,7 +6062,7 @@ dependencies = [ "rand 0.8.5", "rayon", "serde", - "solana-hash", + "solana-hash 2.3.0", "solana-measure", "solana-merkle-tree", "solana-metrics", @@ -6084,7 +6093,7 @@ checksum = "86b575d3dd323b9ea10bb6fe89bf6bf93e249b215ba8ed7f68f1a3633f384db7" dependencies = [ "serde", "serde_derive", - "solana-hash", + "solana-hash 2.3.0", "solana-sdk-ids", "solana-sdk-macro", "solana-sysvar-id", @@ -6097,7 +6106,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96c5fd2662ae7574810904585fd443545ed2b568dbd304b25a31e79ccc76e81b" dependencies = [ "siphasher 0.3.11", - "solana-hash", + "solana-hash 2.3.0", "solana-pubkey", ] @@ -6124,7 +6133,7 @@ dependencies = [ "serde_derive", "solana-address-lookup-table-interface", "solana-clock", - "solana-hash", + "solana-hash 2.3.0", "solana-instruction", "solana-keccak-hasher", "solana-message", @@ -6163,7 +6172,7 @@ dependencies = [ "ahash 0.8.12", "lazy_static", "solana-epoch-schedule", - "solana-hash", + "solana-hash 2.3.0", "solana-pubkey", "solana-sha256-hasher", ] @@ -6218,7 +6227,7 @@ dependencies = [ "solana-cluster-type", "solana-epoch-schedule", "solana-fee-calculator", - "solana-hash", + "solana-hash 2.3.0", "solana-inflation", "solana-keypair", "solana-logger", @@ -6266,7 +6275,7 @@ dependencies = [ "solana-connection-cache", "solana-entry", "solana-epoch-schedule", - "solana-hash", + "solana-hash 2.3.0", "solana-keypair", "solana-ledger", "solana-logger", @@ -6281,7 +6290,7 @@ dependencies = [ "solana-rayon-threadlimit", "solana-rpc-client", "solana-runtime", - "solana-sanitize", + "solana-sanitize 2.2.1", "solana-serde-varint", "solana-sha256-hasher", "solana-short-vec", @@ -6321,11 +6330,22 @@ dependencies = [ "js-sys", "serde", "serde_derive", - "solana-atomic-u64", - "solana-sanitize", + "solana-atomic-u64 2.2.1", + "solana-sanitize 2.2.1", "wasm-bindgen", ] +[[package]] +name = "solana-hash" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a063723b9e84c14d8c0d2cdf0268207dc7adecf546e31251f9e07c7b00b566c" +dependencies = [ + "five8", + "solana-atomic-u64 3.0.0", + "solana-sanitize 3.0.0", +] + [[package]] name = "solana-inflation" version = "2.2.1" @@ -6365,7 +6385,7 @@ dependencies = [ "solana-instruction", "solana-program-error", "solana-pubkey", - "solana-sanitize", + "solana-sanitize 2.2.1", "solana-sdk-ids", "solana-serialize-utils", "solana-sysvar-id", @@ -6379,8 +6399,8 @@ checksum = "c7aeb957fbd42a451b99235df4942d96db7ef678e8d5061ef34c9b34cae12f79" dependencies = [ "sha3", "solana-define-syscall", - "solana-hash", - "solana-sanitize", + "solana-hash 2.3.0", + "solana-sanitize 2.2.1", ] [[package]] @@ -6476,7 +6496,7 @@ dependencies = [ "solana-entry", "solana-epoch-schedule", "solana-genesis-config", - "solana-hash", + "solana-hash 2.3.0", "solana-instruction", "solana-keypair", "solana-measure", @@ -6628,7 +6648,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4b1c019497aa4936234d33d857d8984986fc7134e99a5d1379b997d6552cf04" dependencies = [ "fast-math", - "solana-hash", + "solana-hash 2.3.0", "solana-sha256-hasher", ] @@ -6644,10 +6664,10 @@ dependencies = [ "serde", "serde_derive", "solana-bincode", - "solana-hash", + "solana-hash 2.3.0", "solana-instruction", "solana-pubkey", - "solana-sanitize", + "solana-sanitize 2.2.1", "solana-sdk-ids", "solana-short-vec", "solana-system-interface", @@ -6722,7 +6742,7 @@ dependencies = [ "serde", "serde_derive", "solana-fee-calculator", - "solana-hash", + "solana-hash 2.3.0", "solana-pubkey", "solana-sha256-hasher", ] @@ -6734,7 +6754,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cde971a20b8dbf60144d6a84439dda86b5466e00e2843091fe731083cda614da" dependencies = [ "solana-account", - "solana-hash", + "solana-hash 2.3.0", "solana-nonce", "solana-sdk-ids", ] @@ -6746,9 +6766,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b526398ade5dea37f1f147ce55dae49aa017a5d7326606359b0445ca8d946581" dependencies = [ "num_enum", - "solana-hash", + "solana-hash 2.3.0", "solana-packet", - "solana-sanitize", + "solana-sanitize 2.2.1", "solana-sha256-hasher", "solana-signature", "solana-signer", @@ -6788,7 +6808,7 @@ dependencies = [ "rand 0.8.5", "rayon", "serde", - "solana-hash", + "solana-hash 2.3.0", "solana-message", "solana-metrics", "solana-packet", @@ -6870,7 +6890,7 @@ dependencies = [ "serde_derive", "solana-account-info", "solana-address-lookup-table-interface", - "solana-atomic-u64", + "solana-atomic-u64 2.2.1", "solana-big-mod-exp", "solana-bincode", "solana-blake3-hasher", @@ -6884,7 +6904,7 @@ dependencies = [ "solana-example-mocks", "solana-feature-gate-interface", "solana-fee-calculator", - "solana-hash", + "solana-hash 2.3.0", "solana-instruction", "solana-instructions-sysvar", "solana-keccak-hasher", @@ -6903,7 +6923,7 @@ dependencies = [ "solana-program-pack", "solana-pubkey", "solana-rent", - "solana-sanitize", + "solana-sanitize 2.2.1", "solana-sdk-ids", "solana-sdk-macro", "solana-secp256k1-recover", @@ -6994,7 +7014,7 @@ dependencies = [ "solana-epoch-rewards", "solana-epoch-schedule", "solana-fee-structure", - "solana-hash", + "solana-hash 2.3.0", "solana-instruction", "solana-last-restart-slot", "solana-log-collector", @@ -7037,10 +7057,10 @@ dependencies = [ "rand 0.8.5", "serde", "serde_derive", - "solana-atomic-u64", + "solana-atomic-u64 2.2.1", "solana-decode-error", "solana-define-syscall", - "solana-sanitize", + "solana-sanitize 2.2.1", "solana-sha256-hasher", "wasm-bindgen", ] @@ -7220,7 +7240,7 @@ dependencies = [ "solana-epoch-info", "solana-epoch-schedule", "solana-feature-gate-interface", - "solana-hash", + "solana-hash 2.3.0", "solana-instruction", "solana-message", "solana-pubkey", @@ -7264,7 +7284,7 @@ checksum = "b2bd5b1ccc7fc945a9b0adad091836ee18b7688afd6979889849d5404254a14f" dependencies = [ "solana-account", "solana-commitment-config", - "solana-hash", + "solana-hash 2.3.0", "solana-message", "solana-nonce", "solana-pubkey", @@ -7369,7 +7389,7 @@ dependencies = [ "solana-fee-structure", "solana-genesis-config", "solana-hard-forks", - "solana-hash", + "solana-hash 2.3.0", "solana-inflation", "solana-instruction", "solana-keypair", @@ -7446,7 +7466,7 @@ dependencies = [ "log", "solana-compute-budget", "solana-compute-budget-instruction", - "solana-hash", + "solana-hash 2.3.0", "solana-message", "solana-pubkey", "solana-sdk-ids", @@ -7463,6 +7483,12 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61f1bc1357b8188d9c4a3af3fc55276e56987265eb7ad073ae6f8180ee54cecf" +[[package]] +name = "solana-sanitize" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927e833259588ac8f860861db0f6e2668c3cc46d917798ade116858960acfe8a" + [[package]] name = "solana-sbpf" version = "0.11.1" @@ -7592,7 +7618,7 @@ checksum = "817a284b63197d2b27afdba829c5ab34231da4a9b4e763466a003c40ca4f535e" dependencies = [ "solana-instruction", "solana-pubkey", - "solana-sanitize", + "solana-sanitize 2.2.1", ] [[package]] @@ -7603,7 +7629,7 @@ checksum = "0037386961c0d633421f53560ad7c80675c0447cba4d1bb66d60974dd486c7ea" dependencies = [ "sha2 0.10.9", "solana-define-syscall", - "solana-hash", + "solana-hash 2.3.0", ] [[package]] @@ -7622,7 +7648,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afd3db0461089d1ad1a78d9ba3f15b563899ca2386351d38428faa5350c60a98" dependencies = [ "solana-hard-forks", - "solana-hash", + "solana-hash 2.3.0", "solana-sha256-hasher", ] @@ -7637,7 +7663,7 @@ dependencies = [ "serde", "serde-big-array", "serde_derive", - "solana-sanitize", + "solana-sanitize 2.2.1", ] [[package]] @@ -7659,7 +7685,7 @@ checksum = "0c8691982114513763e88d04094c9caa0376b867a29577939011331134c301ce" dependencies = [ "serde", "serde_derive", - "solana-hash", + "solana-hash 2.3.0", "solana-sdk-ids", "solana-sysvar-id", ] @@ -7791,7 +7817,7 @@ dependencies = [ "protobuf-src", "serde", "solana-account-decoder", - "solana-hash", + "solana-hash 2.3.0", "solana-instruction", "solana-message", "solana-pubkey", @@ -7866,7 +7892,7 @@ dependencies = [ "solana-account", "solana-clock", "solana-fee-structure", - "solana-hash", + "solana-hash 2.3.0", "solana-instruction", "solana-instructions-sysvar", "solana-loader-v3-interface", @@ -7939,7 +7965,7 @@ version = "2.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e6f46c247cb7a345e72468ba2bcdf69d464f8fdae7bf6366cd31d6e2d7692d6" dependencies = [ - "solana-hash", + "solana-hash 2.3.0", "solana-message", "solana-pubkey", "solana-sdk-ids", @@ -7996,7 +8022,7 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5bd98a25e5bcba8b6be8bcbb7b84b24c2a6a8178d7fb0e3077a916855ceba91a" dependencies = [ - "solana-hash", + "solana-hash 2.3.0", "solana-keypair", "solana-message", "solana-pubkey", @@ -8024,7 +8050,7 @@ dependencies = [ "solana-epoch-rewards", "solana-epoch-schedule", "solana-fee-calculator", - "solana-hash", + "solana-hash 2.3.0", "solana-instruction", "solana-instructions-sysvar", "solana-last-restart-slot", @@ -8033,7 +8059,7 @@ dependencies = [ "solana-program-memory", "solana-pubkey", "solana-rent", - "solana-sanitize", + "solana-sanitize 2.2.1", "solana-sdk-ids", "solana-sdk-macro", "solana-slot-hashes", @@ -8067,7 +8093,7 @@ dependencies = [ "solana-commitment-config", "solana-connection-cache", "solana-epoch-info", - "solana-hash", + "solana-hash 2.3.0", "solana-instruction", "solana-keypair", "solana-message", @@ -8155,12 +8181,12 @@ dependencies = [ "serde", "serde_derive", "solana-bincode", - "solana-hash", + "solana-hash 2.3.0", "solana-instruction", "solana-keypair", "solana-message", "solana-pubkey", - "solana-sanitize", + "solana-sanitize 2.2.1", "solana-sdk-ids", "solana-short-vec", "solana-signature", @@ -8196,7 +8222,7 @@ dependencies = [ "serde", "serde_derive", "solana-instruction", - "solana-sanitize", + "solana-sanitize 2.2.1", ] [[package]] @@ -8234,7 +8260,7 @@ dependencies = [ "solana-account-decoder", "solana-address-lookup-table-interface", "solana-clock", - "solana-hash", + "solana-hash 2.3.0", "solana-instruction", "solana-loader-v2-interface", "solana-loader-v3-interface", @@ -8332,7 +8358,7 @@ dependencies = [ "semver", "serde", "serde_derive", - "solana-sanitize", + "solana-sanitize 2.2.1", "solana-serde-varint", ] @@ -8349,7 +8375,7 @@ dependencies = [ "solana-account", "solana-bincode", "solana-clock", - "solana-hash", + "solana-hash 2.3.0", "solana-instruction", "solana-keypair", "solana-packet", @@ -8377,7 +8403,7 @@ dependencies = [ "serde_derive", "solana-clock", "solana-decode-error", - "solana-hash", + "solana-hash 2.3.0", "solana-instruction", "solana-pubkey", "solana-rent", @@ -8405,7 +8431,7 @@ dependencies = [ "solana-bincode", "solana-clock", "solana-epoch-schedule", - "solana-hash", + "solana-hash 2.3.0", "solana-instruction", "solana-keypair", "solana-packet", diff --git a/Cargo.toml b/Cargo.toml index 7044bd2..727df96 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ path = "src/main.rs" [dependencies] # upstream solana dependencies solana-gossip = "~2.3" -solana-hash = "~2.3" +solana-hash = "~3.0" solana-keypair = "~2.2" solana-serde = "~2.2" solana-signer = "~2.2"