diff --git a/Cargo.lock b/Cargo.lock index 7aa07bac..e6f4880a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "agave-transaction-view" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "solana-sdk 2.1.0", "solana-svm-transaction", @@ -451,7 +451,6 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "block-padding", "generic-array", ] @@ -464,12 +463,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-padding" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" - [[package]] name = "borsh" version = "0.9.3" @@ -638,9 +631,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.17.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fd4c6dcc3b0aea2f5c0b4b82c2b15fe39ddbc76041a310848f4706edf76bb31" +checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" dependencies = [ "bytemuck_derive", ] @@ -950,6 +943,35 @@ dependencies = [ "zeroize", ] +[[package]] +name = "curve25519-dalek" +version = "4.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", + "fiat-crypto", + "rand_core 0.6.4", + "rustc_version", + "serde", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] + [[package]] name = "darling" version = "0.20.10" @@ -1101,7 +1123,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ - "curve25519-dalek", + "curve25519-dalek 3.2.1", "ed25519", "rand 0.7.3", "serde", @@ -1184,6 +1206,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da" +[[package]] +name = "fiat-crypto" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + [[package]] name = "filetime" version = "0.2.24" @@ -1597,9 +1625,9 @@ checksum = "4e6ba961c14e98151cd6416dd3685efe786a94c38bc1a535c06ceff0a1600813" [[package]] name = "indexmap" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -2714,9 +2742,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -2782,18 +2810,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "sha3" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" -dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "keccak", - "opaque-debug", -] - [[package]] name = "sha3" version = "0.10.8" @@ -2860,7 +2876,7 @@ dependencies = [ [[package]] name = "solana-account-decoder" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "Inflector", "base64 0.22.1", @@ -2884,7 +2900,7 @@ dependencies = [ [[package]] name = "solana-accounts-db" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "ahash 0.8.11", "bincode", @@ -2929,7 +2945,7 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "bincode", "bytemuck", @@ -2946,7 +2962,7 @@ dependencies = [ [[package]] name = "solana-atomic-u64" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "parking_lot", ] @@ -2954,7 +2970,7 @@ dependencies = [ [[package]] name = "solana-bn254" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "ark-bn254", "ark-ec", @@ -2968,7 +2984,7 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "bincode", "byteorder", @@ -2993,7 +3009,7 @@ dependencies = [ [[package]] name = "solana-bucket-map" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "bv", "bytemuck", @@ -3011,7 +3027,7 @@ dependencies = [ [[package]] name = "solana-builtins-default-costs" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "ahash 0.8.11", "lazy_static", @@ -3027,10 +3043,20 @@ dependencies = [ "solana-vote-program", ] +[[package]] +name = "solana-clock" +version = "2.1.0" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" +dependencies = [ + "serde", + "serde_derive", + "solana-sdk-macro 2.1.0", +] + [[package]] name = "solana-compute-budget" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "solana-sdk 2.1.0", ] @@ -3038,7 +3064,7 @@ dependencies = [ [[package]] name = "solana-compute-budget-program" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "solana-program-runtime", "solana-sdk 2.1.0", @@ -3047,7 +3073,7 @@ dependencies = [ [[package]] name = "solana-config-program" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "bincode", "chrono", @@ -3062,7 +3088,7 @@ dependencies = [ [[package]] name = "solana-cost-model" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "ahash 0.8.11", "lazy_static", @@ -3079,11 +3105,11 @@ dependencies = [ [[package]] name = "solana-curve25519" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "bytemuck", "bytemuck_derive", - "curve25519-dalek", + "curve25519-dalek 4.1.3", "solana-program 2.1.0", "thiserror", ] @@ -3091,7 +3117,7 @@ dependencies = [ [[package]] name = "solana-decode-error" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "num-traits", ] @@ -3099,12 +3125,23 @@ dependencies = [ [[package]] name = "solana-define-syscall" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" + +[[package]] +name = "solana-derivation-path" +version = "2.1.0" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" +dependencies = [ + "derivation-path", + "qstring", + "thiserror", + "uriparse", +] [[package]] name = "solana-fee" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "solana-sdk 2.1.0", "solana-svm-transaction", @@ -3140,10 +3177,27 @@ dependencies = [ "syn 2.0.74", ] +[[package]] +name = "solana-hash" +version = "2.1.0" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" +dependencies = [ + "borsh 1.5.1", + "bs58 0.5.1", + "bytemuck", + "bytemuck_derive", + "js-sys", + "serde", + "serde_derive", + "solana-atomic-u64", + "solana-sanitize", + "wasm-bindgen", +] + [[package]] name = "solana-inline-spl" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "bytemuck", "solana-program 2.1.0", @@ -3152,7 +3206,7 @@ dependencies = [ [[package]] name = "solana-lattice-hash" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "base64 0.22.1", "blake3", @@ -3162,9 +3216,10 @@ dependencies = [ [[package]] name = "solana-loader-v4-program" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "log", + "solana-bpf-loader-program", "solana-compute-budget", "solana-log-collector", "solana-measure", @@ -3177,7 +3232,7 @@ dependencies = [ [[package]] name = "solana-log-collector" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "log", ] @@ -3185,7 +3240,7 @@ dependencies = [ [[package]] name = "solana-measure" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "log", "solana-sdk 2.1.0", @@ -3194,7 +3249,7 @@ dependencies = [ [[package]] name = "solana-metrics" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "crossbeam-channel", "gethostname", @@ -3208,7 +3263,7 @@ dependencies = [ [[package]] name = "solana-msg" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "solana-define-syscall", ] @@ -3222,13 +3277,13 @@ checksum = "8b8a731ed60e89177c8a7ab05fe0f1511cedd3e70e773f288f9de33a9cfdc21e" [[package]] name = "solana-perf" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "ahash 0.8.11", "bincode", "bv", "caps", - "curve25519-dalek", + "curve25519-dalek 4.1.3", "dlopen2", "fnv", "lazy_static", @@ -3248,7 +3303,7 @@ dependencies = [ [[package]] name = "solana-poseidon" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "ark-bn254", "light-poseidon", @@ -3278,7 +3333,7 @@ dependencies = [ "cc", "console_error_panic_hook", "console_log", - "curve25519-dalek", + "curve25519-dalek 3.2.1", "getrandom 0.2.15", "itertools 0.10.5", "js-sys", @@ -3299,7 +3354,7 @@ dependencies = [ "serde_bytes", "serde_derive", "sha2 0.10.8", - "sha3 0.10.8", + "sha3", "solana-sdk-macro 2.0.0", "thiserror", "wasm-bindgen", @@ -3309,7 +3364,7 @@ dependencies = [ [[package]] name = "solana-program" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "base64 0.22.1", "bincode", @@ -3323,7 +3378,7 @@ dependencies = [ "bytemuck_derive", "console_error_panic_hook", "console_log", - "curve25519-dalek", + "curve25519-dalek 4.1.3", "getrandom 0.2.15", "js-sys", "lazy_static", @@ -3338,15 +3393,19 @@ dependencies = [ "serde_bytes", "serde_derive", "sha2 0.10.8", - "sha3 0.10.8", + "sha3", "solana-atomic-u64", + "solana-clock", "solana-decode-error", "solana-define-syscall", + "solana-hash", "solana-msg", "solana-program-memory", "solana-sanitize", "solana-sdk-macro 2.1.0", "solana-secp256k1-recover", + "solana-serde-varint", + "solana-sha256-hasher", "solana-short-vec", "thiserror", "wasm-bindgen", @@ -3355,7 +3414,7 @@ dependencies = [ [[package]] name = "solana-program-memory" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "num-traits", "solana-define-syscall", @@ -3364,7 +3423,7 @@ dependencies = [ [[package]] name = "solana-program-runtime" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "base64 0.22.1", "bincode", @@ -3392,7 +3451,7 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "lazy_static", "num_cpus", @@ -3401,7 +3460,7 @@ dependencies = [ [[package]] name = "solana-runtime" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "aquamarine", "arrayref", @@ -3484,7 +3543,7 @@ dependencies = [ [[package]] name = "solana-runtime-transaction" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "agave-transaction-view", "log", @@ -3498,7 +3557,7 @@ dependencies = [ [[package]] name = "solana-sanitize" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" [[package]] name = "solana-sdk" @@ -3541,7 +3600,7 @@ dependencies = [ "serde_json", "serde_with", "sha2 0.10.8", - "sha3 0.10.8", + "sha3", "siphasher", "solana-frozen-abi", "solana-frozen-abi-macro", @@ -3555,7 +3614,7 @@ dependencies = [ [[package]] name = "solana-sdk" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "bincode", "bitflags 2.6.0", @@ -3565,7 +3624,6 @@ dependencies = [ "bytemuck_derive", "byteorder", "chrono", - "derivation-path", "digest 0.10.7", "ed25519-dalek", "ed25519-dalek-bip32", @@ -3582,7 +3640,6 @@ dependencies = [ "num-traits", "num_enum", "pbkdf2", - "qstring", "rand 0.7.3", "rand 0.8.5", "serde", @@ -3591,18 +3648,19 @@ dependencies = [ "serde_json", "serde_with", "sha2 0.10.8", - "sha3 0.10.8", + "sha3", "siphasher", "solana-bn254", "solana-decode-error", + "solana-derivation-path", "solana-program 2.1.0", "solana-program-memory", "solana-sanitize", "solana-sdk-macro 2.1.0", "solana-secp256k1-recover", + "solana-serde-varint", "solana-short-vec", "thiserror", - "uriparse", "wasm-bindgen", ] @@ -3621,7 +3679,7 @@ dependencies = [ [[package]] name = "solana-sdk-macro" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "bs58 0.5.1", "proc-macro2", @@ -3632,7 +3690,7 @@ dependencies = [ [[package]] name = "solana-secp256k1-recover" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "borsh 1.5.1", "libsecp256k1", @@ -3646,10 +3704,28 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" +[[package]] +name = "solana-serde-varint" +version = "2.1.0" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" +dependencies = [ + "serde", +] + +[[package]] +name = "solana-sha256-hasher" +version = "2.1.0" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" +dependencies = [ + "sha2 0.10.8", + "solana-define-syscall", + "solana-hash", +] + [[package]] name = "solana-short-vec" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "serde", ] @@ -3657,7 +3733,7 @@ dependencies = [ [[package]] name = "solana-stake-program" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "bincode", "log", @@ -3672,7 +3748,7 @@ dependencies = [ [[package]] name = "solana-svm" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "itertools 0.12.1", "log", @@ -3686,10 +3762,10 @@ dependencies = [ "solana-loader-v4-program", "solana-log-collector", "solana-measure", - "solana-metrics", "solana-program-runtime", "solana-runtime-transaction", "solana-sdk 2.1.0", + "solana-svm-rent-collector", "solana-svm-transaction", "solana-system-program", "solana-timings", @@ -3701,7 +3777,7 @@ dependencies = [ [[package]] name = "solana-svm-rent-collector" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "solana-sdk 2.1.0", ] @@ -3709,7 +3785,7 @@ dependencies = [ [[package]] name = "solana-svm-transaction" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "solana-sdk 2.1.0", ] @@ -3717,7 +3793,7 @@ dependencies = [ [[package]] name = "solana-system-program" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "bincode", "log", @@ -3732,7 +3808,7 @@ dependencies = [ [[package]] name = "solana-timings" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "eager", "enum-iterator", @@ -3742,7 +3818,7 @@ dependencies = [ [[package]] name = "solana-transaction-status" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "Inflector", "base64 0.22.1", @@ -3768,7 +3844,7 @@ dependencies = [ [[package]] name = "solana-type-overrides" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "lazy_static", "rand 0.8.5", @@ -3777,7 +3853,7 @@ dependencies = [ [[package]] name = "solana-version" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "log", "semver", @@ -3785,12 +3861,13 @@ dependencies = [ "serde_derive", "solana-sanitize", "solana-sdk 2.1.0", + "solana-serde-varint", ] [[package]] name = "solana-vote" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "itertools 0.12.1", "log", @@ -3803,7 +3880,7 @@ dependencies = [ [[package]] name = "solana-vote-program" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "bincode", "log", @@ -3821,7 +3898,7 @@ dependencies = [ [[package]] name = "solana-zk-elgamal-proof-program" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "bytemuck", "num-derive", @@ -3835,24 +3912,25 @@ dependencies = [ [[package]] name = "solana-zk-sdk" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "aes-gcm-siv", "base64 0.22.1", "bincode", "bytemuck", "bytemuck_derive", - "curve25519-dalek", + "curve25519-dalek 4.1.3", "itertools 0.12.1", "lazy_static", "merlin", "num-derive", "num-traits", - "rand 0.7.3", + "rand 0.8.5", "serde", "serde_derive", "serde_json", - "sha3 0.9.1", + "sha3", + "solana-derivation-path", "solana-program 2.1.0", "solana-sdk 2.1.0", "subtle", @@ -3863,7 +3941,7 @@ dependencies = [ [[package]] name = "solana-zk-token-proof-program" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "bytemuck", "num-derive", @@ -3877,7 +3955,7 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" version = "2.1.0" -source = "git+https://github.com/firedancer-io/agave?rev=1e460f466da60a63c7308e267c053eec41dc1b1c#1e460f466da60a63c7308e267c053eec41dc1b1c" +source = "git+https://github.com/firedancer-io/agave?rev=f70ab5598ccd86b216c3928e4397bf4a5b58d723#f70ab5598ccd86b216c3928e4397bf4a5b58d723" dependencies = [ "aes-gcm-siv", "base64 0.22.1", @@ -3885,18 +3963,19 @@ dependencies = [ "bytemuck", "bytemuck_derive", "byteorder", - "curve25519-dalek", + "curve25519-dalek 4.1.3", "itertools 0.12.1", "lazy_static", "merlin", "num-derive", "num-traits", - "rand 0.7.3", + "rand 0.8.5", "serde", "serde_derive", "serde_json", - "sha3 0.9.1", + "sha3", "solana-curve25519", + "solana-derivation-path", "solana-program 2.1.0", "solana-sdk 2.1.0", "subtle", @@ -3929,6 +4008,7 @@ dependencies = [ "arrayref", "bincode", "blake3", + "bytemuck", "clap", "lazy_static", "libc", @@ -4917,20 +4997,19 @@ dependencies = [ [[package]] name = "zstd" -version = "0.11.2+zstd.1.5.2" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "7.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" dependencies = [ - "libc", "zstd-sys", ] diff --git a/Cargo.toml b/Cargo.toml index a3a9428e..7bfd6d3d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,6 +13,7 @@ crate-type = ["cdylib", "rlib"] [dependencies] arrayref = "0.3.8" blake3 = "1.5.1" +bytemuck = "1.17.1" serde = "1.0.209" bincode = "1.3.3" clap = { version = "4.5.2", features = ["derive"] } @@ -20,25 +21,25 @@ lazy_static = "1.4.0" prost = "0.13.1" prost-types = "0.13.1" libc = "0.2.155" -solana-address-lookup-table-program = { git = "https://github.com/firedancer-io/agave", rev = "1e460f466da60a63c7308e267c053eec41dc1b1c" } -solana-accounts-db = { git = "https://github.com/firedancer-io/agave", rev = "1e460f466da60a63c7308e267c053eec41dc1b1c" } -solana-bpf-loader-program = { git = "https://github.com/firedancer-io/agave", rev = "1e460f466da60a63c7308e267c053eec41dc1b1c" } -solana-compute-budget = { git = "https://github.com/firedancer-io/agave", rev = "1e460f466da60a63c7308e267c053eec41dc1b1c" } -solana-compute-budget-program = { git = "https://github.com/firedancer-io/agave", rev = "1e460f466da60a63c7308e267c053eec41dc1b1c" } -solana-config-program = { git = "https://github.com/firedancer-io/agave", rev = "1e460f466da60a63c7308e267c053eec41dc1b1c" } -solana-loader-v4-program = { git = "https://github.com/firedancer-io/agave", rev = "1e460f466da60a63c7308e267c053eec41dc1b1c" } -solana-log-collector = { git = "https://github.com/firedancer-io/agave", rev = "1e460f466da60a63c7308e267c053eec41dc1b1c" } -solana-program = { git = "https://github.com/firedancer-io/agave", rev = "1e460f466da60a63c7308e267c053eec41dc1b1c" } -solana-program-runtime = { git = "https://github.com/firedancer-io/agave", rev = "1e460f466da60a63c7308e267c053eec41dc1b1c" } -solana-runtime = { git = "https://github.com/firedancer-io/agave", rev = "1e460f466da60a63c7308e267c053eec41dc1b1c", features = ["dev-context-only-utils"] } -solana-stake-program = { git = "https://github.com/firedancer-io/agave", rev = "1e460f466da60a63c7308e267c053eec41dc1b1c" } -solana-system-program = { git = "https://github.com/firedancer-io/agave", rev = "1e460f466da60a63c7308e267c053eec41dc1b1c" } -solana-svm = { git = "https://github.com/firedancer-io/agave", rev = "1e460f466da60a63c7308e267c053eec41dc1b1c" } -solana-sdk = { git = "https://github.com/firedancer-io/agave", rev = "1e460f466da60a63c7308e267c053eec41dc1b1c" } -solana-timings = { git = "https://github.com/firedancer-io/agave", rev = "1e460f466da60a63c7308e267c053eec41dc1b1c" } -solana-vote-program = { git = "https://github.com/firedancer-io/agave", rev = "1e460f466da60a63c7308e267c053eec41dc1b1c" } -solana-zk-sdk = { git = "https://github.com/firedancer-io/agave", rev = "1e460f466da60a63c7308e267c053eec41dc1b1c" } -solana-zk-elgamal-proof-program = { git = "https://github.com/firedancer-io/agave", rev = "1e460f466da60a63c7308e267c053eec41dc1b1c" } +solana-address-lookup-table-program = { git = "https://github.com/firedancer-io/agave", rev = "f70ab5598ccd86b216c3928e4397bf4a5b58d723" } +solana-accounts-db = { git = "https://github.com/firedancer-io/agave", rev = "f70ab5598ccd86b216c3928e4397bf4a5b58d723" } +solana-bpf-loader-program = { git = "https://github.com/firedancer-io/agave", rev = "f70ab5598ccd86b216c3928e4397bf4a5b58d723" } +solana-compute-budget = { git = "https://github.com/firedancer-io/agave", rev = "f70ab5598ccd86b216c3928e4397bf4a5b58d723" } +solana-compute-budget-program = { git = "https://github.com/firedancer-io/agave", rev = "f70ab5598ccd86b216c3928e4397bf4a5b58d723" } +solana-config-program = { git = "https://github.com/firedancer-io/agave", rev = "f70ab5598ccd86b216c3928e4397bf4a5b58d723" } +solana-loader-v4-program = { git = "https://github.com/firedancer-io/agave", rev = "f70ab5598ccd86b216c3928e4397bf4a5b58d723" } +solana-log-collector = { git = "https://github.com/firedancer-io/agave", rev = "f70ab5598ccd86b216c3928e4397bf4a5b58d723" } +solana-program = { git = "https://github.com/firedancer-io/agave", rev = "f70ab5598ccd86b216c3928e4397bf4a5b58d723" } +solana-program-runtime = { git = "https://github.com/firedancer-io/agave", rev = "f70ab5598ccd86b216c3928e4397bf4a5b58d723" } +solana-runtime = { git = "https://github.com/firedancer-io/agave", rev = "f70ab5598ccd86b216c3928e4397bf4a5b58d723", features = ["dev-context-only-utils"] } +solana-stake-program = { git = "https://github.com/firedancer-io/agave", rev = "f70ab5598ccd86b216c3928e4397bf4a5b58d723" } +solana-system-program = { git = "https://github.com/firedancer-io/agave", rev = "f70ab5598ccd86b216c3928e4397bf4a5b58d723" } +solana-svm = { git = "https://github.com/firedancer-io/agave", rev = "f70ab5598ccd86b216c3928e4397bf4a5b58d723" } +solana-sdk = { git = "https://github.com/firedancer-io/agave", rev = "f70ab5598ccd86b216c3928e4397bf4a5b58d723" } +solana-timings = { git = "https://github.com/firedancer-io/agave", rev = "f70ab5598ccd86b216c3928e4397bf4a5b58d723" } +solana-vote-program = { git = "https://github.com/firedancer-io/agave", rev = "f70ab5598ccd86b216c3928e4397bf4a5b58d723" } +solana-zk-sdk = { git = "https://github.com/firedancer-io/agave", rev = "f70ab5598ccd86b216c3928e4397bf4a5b58d723" } +solana-zk-elgamal-proof-program = { git = "https://github.com/firedancer-io/agave", rev = "f70ab5598ccd86b216c3928e4397bf4a5b58d723" } solfuzz-agave-macro = { path = "macro" } thiserror = "1.0.61" log = "0.4.22" # without this, prost 0.11-0.13 complain @@ -48,8 +49,8 @@ prost-build = "0.13.1" [patch.crates-io] -solana-program = { git = "https://github.com/firedancer-io/agave", rev = "1e460f466da60a63c7308e267c053eec41dc1b1c" } -solana-zk-token-sdk = { git = "https://github.com/firedancer-io/agave", rev = "1e460f466da60a63c7308e267c053eec41dc1b1c" } +solana-program = { git = "https://github.com/firedancer-io/agave", rev = "f70ab5598ccd86b216c3928e4397bf4a5b58d723" } +solana-zk-token-sdk = { git = "https://github.com/firedancer-io/agave", rev = "f70ab5598ccd86b216c3928e4397bf4a5b58d723" } [features] # This feature is used to stub out certain parts of the agave runtime for fuzzing