From 86e54325b8b7dbdd61c64b8bea7a8b264cc58fc6 Mon Sep 17 00:00:00 2001 From: Gabe Rodriguez Date: Thu, 30 Jan 2025 10:06:02 +0100 Subject: [PATCH 01/14] initial test setup --- .gitignore | 1 + Cargo.lock | 2000 +++++++++++++++++++++++++++-- program/Cargo.toml | 18 +- program/src/instruction.rs | 179 ++- program/src/processor.rs | 53 +- program/tests/test_create_mint.rs | 38 + program/tests/test_instruction.rs | 49 + 7 files changed, 2182 insertions(+), 156 deletions(-) create mode 100644 program/tests/test_create_mint.rs create mode 100644 program/tests/test_instruction.rs diff --git a/.gitignore b/.gitignore index 70487d2..4b79068 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ node_modules test-ledger dist +.idea diff --git a/Cargo.lock b/Cargo.lock index f14d95c..2ef5359 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,21 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "addr2line" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "aead" version = "0.5.2" @@ -50,6 +65,30 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + [[package]] name = "ark-bn254" version = "0.4.0" @@ -91,7 +130,7 @@ dependencies = [ "derivative", "digest 0.10.7", "itertools 0.10.5", - "num-bigint", + "num-bigint 0.4.6", "num-traits", "paste", "rustc_version", @@ -114,7 +153,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" dependencies = [ - "num-bigint", + "num-bigint 0.4.6", "num-traits", "proc-macro2", "quote", @@ -143,7 +182,7 @@ dependencies = [ "ark-serialize-derive", "ark-std", "digest 0.10.7", - "num-bigint", + "num-bigint 0.4.6", ] [[package]] @@ -179,18 +218,70 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +[[package]] +name = "ascii" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" + +[[package]] +name = "async-compression" +version = "0.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522" +dependencies = [ + "brotli", + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + [[package]] name = "autocfg" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +[[package]] +name = "backtrace" +version = "0.3.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +dependencies = [ + "addr2line", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", + "windows-targets 0.52.6", +] + [[package]] name = "base64" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + [[package]] name = "base64" version = "0.22.1" @@ -206,6 +297,27 @@ dependencies = [ "serde", ] +[[package]] +name = "bit-set" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + [[package]] name = "bitflags" version = "2.8.0" @@ -315,6 +427,27 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "brotli" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74fa05ad7d803d413eb8380983b092cbbaf9a85f151b871360e7b00cd7060b37" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + [[package]] name = "bs58" version = "0.5.1" @@ -366,6 +499,12 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +[[package]] +name = "bytes" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" + [[package]] name = "cc" version = "1.2.10" @@ -417,6 +556,19 @@ dependencies = [ "inout", ] +[[package]] +name = "combine" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680" +dependencies = [ + "ascii", + "byteorder", + "either", + "memchr", + "unreachable", +] + [[package]] name = "console_error_panic_hook" version = "0.1.7" @@ -443,6 +595,22 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + [[package]] name = "cpufeatures" version = "0.2.16" @@ -452,6 +620,30 @@ dependencies = [ "libc", ] +[[package]] +name = "crc32fast" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + [[package]] name = "crunchy" version = "0.2.3" @@ -602,6 +794,23 @@ dependencies = [ "subtle", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + +[[package]] +name = "eager" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abe71d579d1812060163dff96056261deb5bf6729b100fa2e36a68b9649ba3d3" + [[package]] name = "ed25519" version = "1.5.3" @@ -643,12 +852,70 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +[[package]] +name = "encoding_rs" +version = "0.8.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "enum-iterator" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fd242f399be1da0a5354aa462d57b4ab2b4ee0683cc552f7c007d2d12d36e94" +dependencies = [ + "enum-iterator-derive", +] + +[[package]] +name = "enum-iterator-derive" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + +[[package]] +name = "env_logger" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +dependencies = [ + "atty", + "humantime", + "log", + "regex", + "termcolor", +] + [[package]] name = "equivalent" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "errno" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + +[[package]] +name = "fastrand" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + [[package]] name = "feature-probe" version = "0.1.1" @@ -676,6 +943,16 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94474d15a76982be62ca8a39570dccce148d98c238ebb7408b0a21b2c4bdddc4" +[[package]] +name = "flate2" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + [[package]] name = "fnv" version = "1.0.7" @@ -697,6 +974,92 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + +[[package]] +name = "futures-executor" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + +[[package]] +name = "futures-sink" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + +[[package]] +name = "futures-task" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + +[[package]] +name = "futures-util" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -708,6 +1071,16 @@ dependencies = [ "version_check", ] +[[package]] +name = "gethostname" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "getrandom" version = "0.1.16" @@ -734,6 +1107,40 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "gimli" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hash32" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +dependencies = [ + "byteorder", +] + [[package]] name = "hashbrown" version = "0.13.2" @@ -749,6 +1156,15 @@ version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + [[package]] name = "hmac" version = "0.8.1" @@ -780,30 +1196,253 @@ dependencies = [ ] [[package]] -name = "ident_case" -version = "1.0.1" +name = "http" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] [[package]] -name = "indexmap" -version = "2.7.1" +name = "http-body" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ - "equivalent", - "hashbrown 0.15.2", + "bytes", + "http", + "pin-project-lite", ] [[package]] -name = "inout" -version = "0.1.3" +name = "httparse" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http", + "hyper", + "rustls", + "tokio", + "tokio-rustls", +] + +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + +[[package]] +name = "indexmap" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" +dependencies = [ + "equivalent", + "hashbrown 0.15.2", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" dependencies = [ "generic-array", ] +[[package]] +name = "ipnet" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" + [[package]] name = "itertools" version = "0.10.5" @@ -907,6 +1546,30 @@ dependencies = [ "libsecp256k1-core", ] +[[package]] +name = "light-poseidon" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c9a85a9752c549ceb7578064b4ed891179d20acd85f27318573b64d2d7ee7ee" +dependencies = [ + "ark-bn254", + "ark-ff", + "num-bigint 0.4.6", + "thiserror 1.0.69", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" + +[[package]] +name = "litemap" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" + [[package]] name = "lock_api" version = "0.4.12" @@ -959,6 +1622,106 @@ dependencies = [ "zeroize", ] +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "miniz_oxide" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" +dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" +dependencies = [ + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.52.0", +] + +[[package]] +name = "mollusk-svm" +version = "0.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95e7c0b51a00d234774b61bf829aa75316eb3a5ebf30bd622010bd046daa287a" +dependencies = [ + "bincode", + "mollusk-svm-error", + "mollusk-svm-keys", + "solana-bpf-loader-program", + "solana-compute-budget", + "solana-log-collector", + "solana-logger", + "solana-program-runtime", + "solana-sdk", + "solana-system-program", + "solana-timings", +] + +[[package]] +name = "mollusk-svm-error" +version = "0.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d7892725c98a376b55e03ccbea44a0d2111c8f7bab0432b42ea689f3f612e7" +dependencies = [ + "solana-sdk", + "thiserror 1.0.69", +] + +[[package]] +name = "mollusk-svm-keys" +version = "0.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd18816096707d148467889844ae57384ab4cbbe50ed24fd03139e6e34d61301" +dependencies = [ + "mollusk-svm-error", + "solana-sdk", +] + +[[package]] +name = "mollusk-svm-programs-token" +version = "0.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdaf9b1afcf8b45fbaa9d3e555ef7ef46b3594d3196ca484ca37fe85975ef45" +dependencies = [ + "mollusk-svm", + "solana-sdk", +] + +[[package]] +name = "num" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36" +dependencies = [ + "num-bigint 0.2.6", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-bigint" version = "0.4.6" @@ -969,6 +1732,16 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-complex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" +dependencies = [ + "autocfg", + "num-traits", +] + [[package]] name = "num-derive" version = "0.4.2" @@ -989,6 +1762,29 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" +dependencies = [ + "autocfg", + "num-bigint 0.2.6", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -1019,6 +1815,15 @@ dependencies = [ "syn 2.0.96", ] +[[package]] +name = "object" +version = "0.36.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" +dependencies = [ + "memchr", +] + [[package]] name = "once_cell" version = "1.20.2" @@ -1037,7 +1842,7 @@ version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ - "bitflags", + "bitflags 2.8.0", "cfg-if", "foreign-types", "libc", @@ -1089,7 +1894,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -1113,6 +1918,27 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +[[package]] +name = "percentage" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fd23b938276f14057220b707937bcb42fa76dda7560e57a2da30cb52d557937" +dependencies = [ + "num", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + [[package]] name = "pkg-config" version = "0.3.31" @@ -1167,6 +1993,26 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "proptest" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50" +dependencies = [ + "bit-set", + "bit-vec", + "bitflags 2.8.0", + "lazy_static", + "num-traits", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rand_xorshift", + "regex-syntax", + "rusty-fork", + "tempfile", + "unarray", +] + [[package]] name = "qstring" version = "0.7.2" @@ -1176,6 +2022,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + [[package]] name = "quote" version = "1.0.38" @@ -1256,42 +2108,231 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rand_xorshift" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" +dependencies = [ + "rand_core 0.6.4", +] + [[package]] name = "redox_syscall" version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ - "bitflags", + "bitflags 2.8.0", ] [[package]] -name = "rustc_version" -version = "0.4.1" +name = "regex" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ - "semver", + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", ] [[package]] -name = "rustversion" -version = "1.0.19" +name = "regex-automata" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" - -[[package]] +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "reqwest" +version = "0.11.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +dependencies = [ + "async-compression", + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-rustls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom 0.2.15", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustc_version" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" +dependencies = [ + "bitflags 2.8.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustls" +version = "0.21.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" + +[[package]] +name = "rusty-fork" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" +dependencies = [ + "fnv", + "quick-error", + "tempfile", + "wait-timeout", +] + +[[package]] name = "ryu" version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +[[package]] +name = "scc" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28e1c91382686d21b5ac7959341fcb9780fa7c03773646995a87c950fa7be640" +dependencies = [ + "sdd", +] + [[package]] name = "scopeguard" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "scroll" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "sdd" +version = "3.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478f121bb72bbf63c52c93011ea1791dca40140dfe13f8336c4c5ac952c33aa9" + [[package]] name = "semver" version = "1.0.25" @@ -1339,6 +2380,18 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + [[package]] name = "serde_with" version = "3.12.0" @@ -1362,6 +2415,31 @@ dependencies = [ "syn 2.0.96", ] +[[package]] +name = "serial_test" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9" +dependencies = [ + "futures", + "log", + "once_cell", + "parking_lot", + "scc", + "serial_test_derive", +] + +[[package]] +name = "serial_test_derive" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "sha2" version = "0.9.9" @@ -1414,17 +2492,36 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + [[package]] name = "smallvec" version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +[[package]] +name = "socket2" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "solana-account" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8557558040a6bf34101ea0ded1647bafc21c2a9ea0913034fa6794a304ba6791" +checksum = "d2af97266ee346ef1cd1649ba462d08bd3d254e50c06c45d3e70a21871a1da6a" dependencies = [ "bincode", "serde", @@ -1436,9 +2533,9 @@ dependencies = [ [[package]] name = "solana-account-info" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abeb32e8dbead1f920a919d8c781fe058cf657313aa237566fa812d2288f2aab" +checksum = "3ed2417317f26f0941dd8e552ac1f9768eb2aa3b7f16ec992a6833f058295bea" dependencies = [ "bincode", "serde", @@ -1449,18 +2546,18 @@ dependencies = [ [[package]] name = "solana-atomic-u64" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ceb7242711300b8d67933a3cd1c9b2cd7c4e98de529356ecddf340c98c457d" +checksum = "f0cd0453d46a62ed36ce234be9153a3c4d433711f1cec6943345d1637d6a0908" dependencies = [ "parking_lot", ] [[package]] name = "solana-bincode" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e154567b6846f4721c713afdd14c56892800fb940793ef529a68d6db6cf1beef" +checksum = "a97957d987dc85bbfa90cb7e919ee0b071206affc0209e7221d7ea4844e7be31" dependencies = [ "bincode", "serde", @@ -1469,9 +2566,9 @@ dependencies = [ [[package]] name = "solana-bn254" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c42ad3282999ef7df859e7ed03a6e6a4187ff4931f9814ddcd0477dba2be15" +checksum = "957ce0d8b021f78f7b3c99d82b21a8dae617cf016377647c4d43a6e3141e8f2f" dependencies = [ "ark-bn254", "ark-ec", @@ -1484,19 +2581,46 @@ dependencies = [ [[package]] name = "solana-borsh" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b2428671e99134c97990d2b466c33779f785376b7934e6bddb635929c54208f" +checksum = "99affe31b10c1cd4a6438d307b92c1b17c89c974aebf2c2aa15cd790d0ba672b" dependencies = [ "borsh 0.10.4", "borsh 1.5.5", ] +[[package]] +name = "solana-bpf-loader-program" +version = "2.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b29eca845657e02a138b4ed7ea8520c59a37f8b2d6eb92059f68b8c77440272d" +dependencies = [ + "bincode", + "byteorder", + "libsecp256k1", + "log", + "scopeguard", + "solana-bn254", + "solana-compute-budget", + "solana-curve25519", + "solana-feature-set", + "solana-log-collector", + "solana-measure", + "solana-poseidon", + "solana-program-memory", + "solana-program-runtime", + "solana-sdk", + "solana-timings", + "solana-type-overrides", + "solana_rbpf", + "thiserror 1.0.69", +] + [[package]] name = "solana-clock" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d639043cefcd061c31a342364adcb204406ebbd91ef86dfde88b74352b688cf" +checksum = "97864f28abd43d03e7ca7242059e340bb6e637e0ce99fd66f6420c43fa359898" dependencies = [ "serde", "serde_derive", @@ -1504,11 +2628,20 @@ dependencies = [ "solana-sysvar-id", ] +[[package]] +name = "solana-compute-budget" +version = "2.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f92a2ba8c5ed92fc805f8a92a3bfbbaca05da80d87f180aea4e9f28b9e0fa22" +dependencies = [ + "solana-sdk", +] + [[package]] name = "solana-cpi" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b87b387931f41422be3d82190e29c8414bbb4e8517dd94afb838012260d7a60" +checksum = "d54c3b096dc77222b9c19ffe9cf6c1c32bd1e9882ceb955d213be4315bbe3b95" dependencies = [ "solana-account-info", "solana-define-syscall", @@ -1520,9 +2653,9 @@ dependencies = [ [[package]] name = "solana-curve25519" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71b91a6c7db7874ab0721ba2ad49c34614c6af5bfa1a02f18ee471d28416b1fc" +checksum = "4b2ed697e82c44b0833550501e3fab428c07cc2865c788307fad4c98a64d27d0" dependencies = [ "bytemuck", "bytemuck_derive", @@ -1533,24 +2666,24 @@ dependencies = [ [[package]] name = "solana-decode-error" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b93163519c0b7419d3ac206207594d4b43e00267496996b898345ff3b31ed1" +checksum = "6c92852914fe0cfec234576a30b1de4b11516dd729226d5de04e4c67d80447a7" dependencies = [ "num-traits", ] [[package]] name = "solana-define-syscall" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d1b215d56d29f71782df6880d71b5a46cf9a4035046414488c7de6906899ba" +checksum = "44015e77f6f321bf526f7d026b08d8f34b57b1ea6e46038fd13e59f43a53a475" [[package]] name = "solana-derivation-path" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31edf5d285689b469471a1a0200f0c9196be7df155860bd83dfd735439172bd" +checksum = "e2cd4b95383d8926cc22d4a33417aa2e38897475f259cff4eb319c8cf0f7ac02" dependencies = [ "derivation-path", "qstring", @@ -1559,9 +2692,9 @@ dependencies = [ [[package]] name = "solana-epoch-schedule" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88aa6588f178c32258eb616ef1428f2c86beae370d6486843313f6320e055190" +checksum = "b3409f250234ec4bbd999de3eac727ca21dfbfd39a831906f6ec112a66d2e1a2" dependencies = [ "serde", "serde_derive", @@ -1571,9 +2704,9 @@ dependencies = [ [[package]] name = "solana-feature-set" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1736c5f6cb5d65e684a1daf425dd1479849e0793ffe877feedb602642ee5deb0" +checksum = "61ddda14ac5f2da82da4df043eabca2f2c00ac0d59f10295b8c8c3404fcc5f67" dependencies = [ "lazy_static", "solana-clock", @@ -1585,9 +2718,9 @@ dependencies = [ [[package]] name = "solana-fee-calculator" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ef28a47c3fcfd4ef8b19468531e32a431f6589f359cdbb927fc5e7fb859413" +checksum = "f8db8c4be5e012215ed1e3394cd3c188e217dd4f0c821045e5d2c1262aac8b4e" dependencies = [ "log", "serde", @@ -1596,9 +2729,9 @@ dependencies = [ [[package]] name = "solana-hash" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad865143587f6173d0bd15ec66b749fd2682c865467ffd2bb725705e33f0c8fa" +checksum = "7c25925816be2f57992c4c5af7dff31713bc95696c2fbc4bca911e290ba2f330" dependencies = [ "borsh 1.5.5", "bs58", @@ -1614,9 +2747,9 @@ dependencies = [ [[package]] name = "solana-inflation" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a205cb59db7fa1afc89ad5d960ac5afb997ba231cdc943451811746c84b7776d" +checksum = "e91a53086a0f0cc093ffce9e5be4399785f05a0d49f0ff2cd6d5f3f4d593e2e9" dependencies = [ "serde", "serde_derive", @@ -1624,9 +2757,9 @@ dependencies = [ [[package]] name = "solana-instruction" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af795f16bef3ae76e97978e35724ea88d2b9eba67a9e233adf48ccefeaa6e6b8" +checksum = "eab8c46b6f76857222ee1adeb7031b8eb0eb5134920614e9fd1bd710052b96a9" dependencies = [ "bincode", "borsh 1.5.5", @@ -1642,9 +2775,9 @@ dependencies = [ [[package]] name = "solana-last-restart-slot" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f88c8171167f1fd4ef1e5a083fd0e8f35ac60aacd1ffe163a1ef7053a28524be" +checksum = "633f272467f3e1a28dfcfb1a7df55129752524a18938a84fd67086e205f0bd88" dependencies = [ "serde", "serde_derive", @@ -1652,40 +2785,93 @@ dependencies = [ "solana-sysvar-id", ] +[[package]] +name = "solana-log-collector" +version = "2.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034627f9849eeafcbfa24f0e4ad0da50eb68422ceab5c605b7d87755af77b201" +dependencies = [ + "log", +] + +[[package]] +name = "solana-logger" +version = "2.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef1468f78c6f891ac2e3ce6e81bd0c47cff18598fb87618ab2e3d39da4bb69f" +dependencies = [ + "env_logger", + "lazy_static", + "log", +] + +[[package]] +name = "solana-measure" +version = "2.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24fa953c2b49a131492b5927e714ab60b7b927610c7ed3355b9ad28909622b5e" + +[[package]] +name = "solana-metrics" +version = "2.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cce8eeecdde1cfed801d0d8683856e0e0cc731119894a7ae77a966915cf84964" +dependencies = [ + "crossbeam-channel", + "gethostname", + "lazy_static", + "log", + "reqwest", + "solana-sdk", + "thiserror 1.0.69", +] + [[package]] name = "solana-msg" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aefec09cb47fb67b8f8c448e03491d4148c1749f27dcb74d1cfae6337695f94" +checksum = "80dde3316c6ee6e8d57bf105139ec93f8c32a42fe3ec42a3cda2ca9efb72c0e6" dependencies = [ "solana-define-syscall", ] [[package]] name = "solana-native-token" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81520eff9f776e62faa36a07250fcc467e54ca31ca9c87ab566a88b2f2691c05" +checksum = "9e0721f46122a2f1837f571d5a6c1478c962ebefd6d65d02694b3a267b58dbf2" [[package]] name = "solana-packet" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8c6e8a2cb0839ef49d8c6e34e89a5bc5ed97da855bf49528bae8c57eb39ed" +checksum = "39fcc5cf0ef0ac6a62dd09fae772672c2d6865ee1d1ba5fbfbcc94b2c37b2be8" dependencies = [ "bincode", - "bitflags", + "bitflags 2.8.0", "cfg_eval", "serde", "serde_derive", "serde_with", ] +[[package]] +name = "solana-poseidon" +version = "2.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "133321939f27f2e0eaeb556530757466b9e90b7acea06a216ace10f7e95ca0d9" +dependencies = [ + "ark-bn254", + "light-poseidon", + "solana-define-syscall", + "thiserror 1.0.69", +] + [[package]] name = "solana-precompile-error" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c01aefc15c451b4f573c1e4552f34ee8af53db285ee2f7ece17ef8b70d6c0a" +checksum = "54310052930124b78392b03d802aa465afe6fded96d97f2e6ca6b1dead85d8d9" dependencies = [ "num-traits", "solana-decode-error", @@ -1693,13 +2879,13 @@ dependencies = [ [[package]] name = "solana-program" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d3a72c5eafd348bc5e5b731b40ad8dfde3023632e34e5ca9e52a655266ffae7" +checksum = "12511916a9658664921ca12dd6214910de655ac9955159c1e9871bd516936cac" dependencies = [ "base64 0.22.1", "bincode", - "bitflags", + "bitflags 2.8.0", "blake3", "borsh 0.10.4", "borsh 1.5.5", @@ -1716,7 +2902,7 @@ dependencies = [ "lazy_static", "log", "memoffset", - "num-bigint", + "num-bigint 0.4.6", "num-derive", "num-traits", "parking_lot", @@ -1766,9 +2952,9 @@ dependencies = [ [[package]] name = "solana-program-entrypoint" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "269ccabf1f3aff504a97aca0f8b72e6d3e1b7fb621cc18a2d21a28b17d52e112" +checksum = "c3422fa98d2ac5b20df9c9feb9f638e1170341b3c4259c26cd91a6a7098f6830" dependencies = [ "solana-account-info", "solana-msg", @@ -1778,9 +2964,9 @@ dependencies = [ [[package]] name = "solana-program-error" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f7a81eeb5c3d44b2953c46215af390ca2951a0b8069836ffbf3d368b012b35" +checksum = "6a2ea6d8e88767586e6d547e5afb00cda08cee79c986443b2d47236aac50a755" dependencies = [ "borsh 1.5.5", "num-traits", @@ -1794,9 +2980,9 @@ dependencies = [ [[package]] name = "solana-program-memory" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1debcdd14cee4dbc2761c1e267e8888188fb469956df0e2144cd6e2962c2532a" +checksum = "716e1c9cbd3c5e9d9147ffb7e74815cfb34ff7a3196127da64aa8d1866beab52" dependencies = [ "num-traits", "solana-define-syscall", @@ -1804,24 +2990,54 @@ dependencies = [ [[package]] name = "solana-program-option" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b49ce216cce72eb0607610d2040b1979d999fe204f73ae2a669c2f4480d3c0" +checksum = "15c8ffad2c86e5de375ae5f0a46f64eb5897a63c514e958e908c1a98059c57d4" [[package]] name = "solana-program-pack" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ff47a5dd9881187e85a45641405d9d1c57e9ebdc813e2ff74a1aa1f1ec9042" +checksum = "4c185f9170ac85a93d5caaaaf5fe7bf0d49febdb329506bd7ea13716e4eb0189" dependencies = [ "solana-program-error", ] +[[package]] +name = "solana-program-runtime" +version = "2.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5cf60b4b2d8d70b082d03973b8e646ca1c65351eb12ab33427c2df40cd178cf" +dependencies = [ + "base64 0.22.1", + "bincode", + "enum-iterator", + "itertools 0.12.1", + "libc", + "log", + "num-derive", + "num-traits", + "percentage", + "rand 0.8.5", + "serde", + "solana-compute-budget", + "solana-feature-set", + "solana-log-collector", + "solana-measure", + "solana-metrics", + "solana-sdk", + "solana-timings", + "solana-type-overrides", + "solana-vote", + "solana_rbpf", + "thiserror 1.0.69", +] + [[package]] name = "solana-pubkey" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02016ff5f98314c886e219c023bffba188ad8d70dec007247bd7a9da50423ac0" +checksum = "fdb80787769457f022a39a55cf439d1996aeecc2364c99483c97318d80f15436" dependencies = [ "borsh 0.10.4", "borsh 1.5.5", @@ -1846,9 +3062,9 @@ dependencies = [ [[package]] name = "solana-rent" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "544fab48aacd3b9c740ef5206f30e8a44ef8bfe5676a9d7b1eed385265ec1265" +checksum = "88b4cd58602eb0c2250cd83a8cc8287ca6271b99af95d2a33250e6592c04e286" dependencies = [ "serde", "serde_derive", @@ -1858,18 +3074,18 @@ dependencies = [ [[package]] name = "solana-sanitize" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9677531dd4098d078515c66d69a04bfa0389d364a5c768561c719030b368a9db" +checksum = "74c557ff8937946d24c4f188f3029c1fdba4e23a15ed11cc8b31a72017e911d5" [[package]] name = "solana-sdk" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf93cfd5f5af23b59789eba96b6a6afd92a3a18a3fc6652259bfa1f32743caf4" +checksum = "0d755acdf62b367c1c4ca7ac1069c34a090d281b6425d11dd9410d4a147d99d3" dependencies = [ "bincode", - "bitflags", + "bitflags 2.8.0", "borsh 1.5.5", "bs58", "bytemuck", @@ -1928,9 +3144,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bded40f70accbe97030e5f7163017605e51a2631425229ec2b0a4339bd1163a" +checksum = "9055600bc70a91936458b3a43a4173f8b8cd4ee64a0dc83cbb00737cadc519a5" dependencies = [ "bs58", "proc-macro2", @@ -1940,9 +3156,9 @@ dependencies = [ [[package]] name = "solana-secp256k1-recover" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee25b962814dec3c141e8182474046bae231f0521ed62c9bfdfb6722999ddc18" +checksum = "b904576bfc5b72172aed9c133fe54840625ab9d510bd429d453c54bd6e4245c3" dependencies = [ "borsh 1.5.5", "libsecp256k1", @@ -1952,9 +3168,9 @@ dependencies = [ [[package]] name = "solana-secp256r1-program" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ec53eff8861ab398b9ca4da7ef8c8da5d4170f8ea26557fc1581638b56326c1" +checksum = "c3c1329b7faa66f80bb3dadcece042589d22881120b6c0d0f712f742ad002f26" dependencies = [ "bytemuck", "openssl", @@ -1972,18 +3188,18 @@ checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" [[package]] name = "solana-serde-varint" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ff77c37cb995cc53ce1a4b78e5e9961957098677de6fdc6a4783ed37a8b0fcd" +checksum = "e741efbc732c2e33fd600d39a5a5e63cbab18fc75fc84a98df68c2aa2b373b64" dependencies = [ "serde", ] [[package]] name = "solana-serialize-utils" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a10eb6e3177828145beaba85d352a4dbc47798fd95c5f86145e1a732684d6d" +checksum = "b2a6511f5147f992239415bd4bb297ad593da57b4ab634ed9bc10f81a560bc90" dependencies = [ "solana-instruction", "solana-pubkey", @@ -1992,9 +3208,9 @@ dependencies = [ [[package]] name = "solana-sha256-hasher" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c4229293979bf8bda7db2243ae75e13695341375577a4c44b07e4f0b7a5d9e" +checksum = "3456f5d3868b9ae8e7bc53529bbbd8bee48b0d9cf3783f918269e71e4ee5268d" dependencies = [ "sha2 0.10.8", "solana-define-syscall", @@ -2003,18 +3219,18 @@ dependencies = [ [[package]] name = "solana-short-vec" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6a2a88d56e6771329970059bcab0fde9a719c8edae173fb26b2c08e427495a" +checksum = "01771c84475e25352169e3fc901cae565f75ff8c9b40a4fa858f776211f20cbc" dependencies = [ "serde", ] [[package]] name = "solana-signature" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1e8a078879d8430cdfbee8e3c1cdf17da74c19d304662580fc463dc91e17699" +checksum = "1f89b547c800c3541d4d5d71de8c82f37a0050f361626213a425ad4f767da27b" dependencies = [ "bs58", "ed25519-dalek", @@ -2027,9 +3243,9 @@ dependencies = [ [[package]] name = "solana-slot-hashes" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88fa2a6e60f2d7016cf95429e0f60cf4a04d4eed167abd1a5f8b08cbda695893" +checksum = "3012c024a81d591d02a10648d5f4256d6fc3c9d93bc5421cadba224794940f6c" dependencies = [ "serde", "serde_derive", @@ -2039,9 +3255,9 @@ dependencies = [ [[package]] name = "solana-slot-history" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fa66272c308c39a3ce1ca2a9c422de4bdedc28cfe706d6f2c68727bb626eb7" +checksum = "817a68e2aae8fbcf00adef67eba05c513b0a461b5ed1fd0bd2cb1299a394a650" dependencies = [ "bv", "serde", @@ -2051,28 +3267,55 @@ dependencies = [ [[package]] name = "solana-stable-layout" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2243571ebf8c0c9915c7e71b17469e173c6755fa58af8eb529db3dda84e3e19a" +checksum = "ec316bf731aeb8e9e8a55634efb938eaf5c979d71a9e7d3de54f5848da4994a2" dependencies = [ "solana-instruction", "solana-pubkey", ] +[[package]] +name = "solana-system-program" +version = "2.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3deec0cbae00fb352cf28baa1dca56826221ed571e49530f497802f65386908c" +dependencies = [ + "bincode", + "log", + "serde", + "serde_derive", + "solana-log-collector", + "solana-program-runtime", + "solana-sdk", + "solana-type-overrides", +] + [[package]] name = "solana-sysvar-id" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5822b63dd59f124e4920df8d87640a288bb40f4016fd275d028fee0b94a5a51e" +checksum = "8a6ca7b6e6bf9f8c0de74e90546426190385a1c0b8e4d4f1975165f2335f9dc0" dependencies = [ "solana-pubkey", ] +[[package]] +name = "solana-timings" +version = "2.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39f948e963c99cee7d2a14da5faf864cb4ae298f8cb679fc088ec581d9d76aed" +dependencies = [ + "eager", + "enum-iterator", + "solana-sdk", +] + [[package]] name = "solana-transaction-error" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd92caae17b4b828864b85cecf6dba6a87ad0ac433606b8bbd58334c74d0251" +checksum = "ec8a6d17d8de8549df56d64b9af314eec3c4b705372790aa8dde7196e1c5f005" dependencies = [ "serde", "serde_derive", @@ -2080,11 +3323,35 @@ dependencies = [ "solana-sanitize", ] +[[package]] +name = "solana-type-overrides" +version = "2.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9673b27fb01b5479a25bfdd83d5ea1112433c8cf81a0aa8616c829587b285ecd" +dependencies = [ + "lazy_static", + "rand 0.8.5", +] + +[[package]] +name = "solana-vote" +version = "2.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b1a73fa59c07095599091dd9f026aceb478109d61d41720883a22ead9c18f8e" +dependencies = [ + "itertools 0.12.1", + "log", + "serde", + "serde_derive", + "solana-sdk", + "thiserror 1.0.69", +] + [[package]] name = "solana-zk-sdk" -version = "2.1.10" +version = "2.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c19f36d9e5227b4d94e651501a1ab15d58480d93e03d8340cc8593758e50530" +checksum = "0e5f33e61ecb86621dd7b47e164ec09021b0c910a79e3a6b17ae763554ad7138" dependencies = [ "aes-gcm-siv", "base64 0.22.1", @@ -2112,6 +3379,30 @@ dependencies = [ "zeroize", ] +[[package]] +name = "solana_rbpf" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c1941b5ef0c3ce8f2ac5dd984d0fb1a97423c4ff2a02eec81e3913f02e2ac2b" +dependencies = [ + "byteorder", + "combine", + "hash32", + "libc", + "log", + "rand 0.8.5", + "rustc-demangle", + "scroll", + "thiserror 1.0.69", + "winapi", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + [[package]] name = "spl-associated-token-account" version = "6.0.0" @@ -2431,9 +3722,19 @@ dependencies = [ name = "spl-token-wrap" version = "0.1.0" dependencies = [ + "arrayref", + "borsh 0.10.4", "bytemuck", + "lazy_static", + "mollusk-svm", + "mollusk-svm-programs-token", + "num-derive", + "num-traits", "num_enum", + "proptest", + "serial_test", "solana-program", + "solana-sdk", "spl-associated-token-account", "spl-token", "spl-token-2022 7.0.0", @@ -2483,6 +3784,12 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "strsim" version = "0.11.1" @@ -2517,6 +3824,67 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "tempfile" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" +dependencies = [ + "cfg-if", + "fastrand", + "getrandom 0.2.15", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + [[package]] name = "thiserror" version = "1.0.69" @@ -2557,6 +3925,16 @@ dependencies = [ "syn 2.0.96", ] +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinyvec" version = "1.8.1" @@ -2572,6 +3950,44 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +[[package]] +name = "tokio" +version = "1.43.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "pin-project-lite", + "socket2", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + [[package]] name = "toml" version = "0.5.11" @@ -2598,12 +4014,49 @@ dependencies = [ "winnow", ] +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" +dependencies = [ + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + [[package]] name = "typenum" version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +[[package]] +name = "unarray" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" + [[package]] name = "unicode-ident" version = "1.0.15" @@ -2620,6 +4073,21 @@ dependencies = [ "subtle", ] +[[package]] +name = "unreachable" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" +dependencies = [ + "void", +] + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "uriparse" version = "0.6.4" @@ -2630,6 +4098,29 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "url" +version = "2.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "vcpkg" version = "0.2.15" @@ -2642,6 +4133,30 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "void" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + +[[package]] +name = "wait-timeout" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +dependencies = [ + "libc", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + [[package]] name = "wasi" version = "0.9.0+wasi-snapshot-preview1" @@ -2680,6 +4195,19 @@ dependencies = [ "wasm-bindgen-shared", ] +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" +dependencies = [ + "cfg-if", + "js-sys", + "once_cell", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "wasm-bindgen-macro" version = "0.2.100" @@ -2722,34 +4250,131 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki-roots" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + [[package]] name = "windows-targets" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -2762,24 +4387,48 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + [[package]] name = "windows_x86_64_msvc" version = "0.52.6" @@ -2795,6 +4444,52 @@ dependencies = [ "memchr", ] +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + +[[package]] +name = "yoke" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", + "synstructure", +] + [[package]] name = "zerocopy" version = "0.7.35" @@ -2816,6 +4511,27 @@ dependencies = [ "syn 2.0.96", ] +[[package]] +name = "zerofrom" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", + "synstructure", +] + [[package]] name = "zeroize" version = "1.8.1" @@ -2835,3 +4551,25 @@ dependencies = [ "quote", "syn 2.0.96", ] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] diff --git a/program/Cargo.toml b/program/Cargo.toml index 3d559b1..f2a28d2 100644 --- a/program/Cargo.toml +++ b/program/Cargo.toml @@ -13,12 +13,24 @@ test-sbf = [] [dependencies] bytemuck = { version = "1.21.0", features = ["derive"] } -num_enum = "0.7" -solana-program = "2.1.0" +num_enum = "0.7.3" +solana-program = "2.1.11" spl-associated-token-account = { version = "6.0.0", features = ["no-entrypoint"] } spl-token = { version = "7.0", features = ["no-entrypoint"] } spl-token-2022 = { version = "7.0.0", features = ["no-entrypoint"] } -thiserror = "2.0" +thiserror = "2.0.11" +num-traits = "0.2.19" +borsh = "0.10.4" + +[dev-dependencies] +mollusk-svm = "0.0.15" +mollusk-svm-programs-token = "0.0.15" +serial_test = "3.2.0" +solana-sdk = "2.1.0" +arrayref = "0.3.9" +num-derive = "0.4" +lazy_static = "1.5.0" +proptest = "1.5" [lib] crate-type = ["cdylib", "lib"] diff --git a/program/src/instruction.rs b/program/src/instruction.rs index 32ad7f0..3be9575 100644 --- a/program/src/instruction.rs +++ b/program/src/instruction.rs @@ -1,30 +1,35 @@ //! Program instructions -use num_enum::{IntoPrimitive, TryFromPrimitive}; +use solana_program::instruction::{AccountMeta, Instruction}; +use solana_program::program_error::ProgramError; +use solana_program::pubkey::Pubkey; +use std::convert::TryInto; /// Instructions supported by the Token Wrap program -#[derive(Clone, Debug, PartialEq, TryFromPrimitive, IntoPrimitive)] +#[derive(Clone, Debug, PartialEq)] #[repr(u8)] pub enum TokenWrapInstruction { - /// Create a wrapped token mint + /// Create a wrapped token mint. Assumes caller has pre-allocated wrapped mint + /// and backpointer account. /// /// Accounts expected by this instruction: /// - /// 0. `[writeable,signer]` Funding account for mint and backpointer (must - /// be a system account) - /// 1. `[writeable]` Unallocated wrapped mint account to create, address - /// must be: `get_wrapped_mint_address(unwrapped_mint_address, + /// 0. `[writeable]` Unallocated wrapped mint account to create (PDA), + /// address must be: `get_wrapped_mint_address(unwrapped_mint_address, /// wrapped_token_program_id)` - /// 2. `[writeable]` Unallocated wrapped backpointer account to create + /// 1. `[writeable]` Unallocated wrapped backpointer account to create (PDA) /// `get_wrapped_mint_backpointer_address(wrapped_mint_address)` - /// 3. `[]` Existing unwrapped mint - /// 4. `[]` System program - /// 5. `[]` SPL Token program for wrapped mint + /// 2. `[]` Existing unwrapped mint + /// 3. `[]` System program + /// 4. `[]` SPL Token program for wrapped mint /// /// Data expected by this instruction: /// * `bool`: If true, idempotent creation. If false, fail if the mint /// already exists. - CreateMint, + CreateMint { + /// TODO: Add docs + idempotent: bool, + }, /// Wrap tokens /// @@ -51,7 +56,10 @@ pub enum TokenWrapInstruction { /// /// Data expected by this instruction: /// * little-endian `u64` representing the amount to wrap - Wrap, + Wrap { + /// TODO: Add docs + amount: u64, + }, /// Unwrap tokens /// @@ -78,5 +86,148 @@ pub enum TokenWrapInstruction { /// /// Data expected by this instruction: /// * little-endian `u64` representing the amount to unwrap - Unwrap, + UnWrap { + /// TODO: Add docs + amount: u64, + }, +} + +impl TokenWrapInstruction { + /// TODO: Add docs + pub fn pack(&self) -> Vec { + let mut buf = Vec::new(); + match self { + TokenWrapInstruction::CreateMint { idempotent } => { + buf.push(0); + buf.push(if *idempotent { 1 } else { 0 }); + } + + TokenWrapInstruction::Wrap { amount } => { + buf.push(1); + buf.extend_from_slice(&amount.to_le_bytes()); + } + TokenWrapInstruction::UnWrap { amount } => { + buf.push(2); + buf.extend_from_slice(&amount.to_le_bytes()); + } + } + buf + } + + /// TODO: Add docs + pub fn unpack(input: &[u8]) -> Result { + let (&tag, rest) = input + .split_first() + .ok_or(ProgramError::InvalidInstructionData)?; + match tag { + 0 => { + if rest.len() != 1 { + return Err(ProgramError::InvalidInstructionData); + } + let idempotent = rest[0] != 0; + Ok(TokenWrapInstruction::CreateMint { idempotent }) + } + 1 => { + if rest.len() != 8 { + return Err(ProgramError::InvalidInstructionData); + } + let amount = u64::from_le_bytes( + rest.try_into() + .map_err(|_| ProgramError::InvalidInstructionData)?, + ); + Ok(TokenWrapInstruction::Wrap { amount }) + } + 2 => { + if rest.len() != 8 { + return Err(ProgramError::InvalidInstructionData); + } + let amount = u64::from_le_bytes( + rest.try_into() + .map_err(|_| ProgramError::InvalidInstructionData)?, + ); + Ok(TokenWrapInstruction::UnWrap { amount }) + } + _ => Err(ProgramError::InvalidInstructionData), + } + } +} + +/// Creates `CreateMint` instruction. +pub fn create_mint( + program_id: &Pubkey, + wrapped_mint_address: &Pubkey, + wrapped_backpointer_address: &Pubkey, + unwrapped_mint_address: &Pubkey, + wrapped_token_program_id: &Pubkey, + idempotent: bool, +) -> Instruction { + let accounts = vec![ + AccountMeta::new(*wrapped_mint_address, false), + AccountMeta::new(*wrapped_backpointer_address, false), + AccountMeta::new_readonly(*unwrapped_mint_address, false), + AccountMeta::new_readonly(solana_program::system_program::id(), false), + AccountMeta::new_readonly(*wrapped_token_program_id, false), + ]; + let data = TokenWrapInstruction::CreateMint { idempotent }.pack(); + Instruction::new_with_bytes(*program_id, &data, accounts) +} + +/// Creates `Wrap` instruction. +#[allow(clippy::too_many_arguments)] +pub fn wrap( + program_id: &Pubkey, + unwrapped_token_account_address: &Pubkey, + wrapped_escrow_address: &Pubkey, + unwrapped_mint_address: &Pubkey, + wrapped_mint_address: &Pubkey, + recipient_wrapped_token_account_address: &Pubkey, + wrapped_mint_authority_address: &Pubkey, + unwrapped_token_program_id: &Pubkey, + wrapped_token_program_id: &Pubkey, + transfer_authority_address: &Pubkey, + amount: u64, +) -> Instruction { + let accounts = vec![ + AccountMeta::new(*unwrapped_token_account_address, false), + AccountMeta::new(*wrapped_escrow_address, false), + AccountMeta::new_readonly(*unwrapped_mint_address, false), + AccountMeta::new(*wrapped_mint_address, false), + AccountMeta::new(*recipient_wrapped_token_account_address, false), + AccountMeta::new_readonly(*wrapped_mint_authority_address, false), + AccountMeta::new_readonly(*unwrapped_token_program_id, false), + AccountMeta::new_readonly(*wrapped_token_program_id, false), + AccountMeta::new_readonly(*transfer_authority_address, true), + ]; + let data = TokenWrapInstruction::Wrap { amount }.pack(); + Instruction::new_with_bytes(*program_id, &data, accounts) +} + +/// Creates `UnWrap` instruction. +#[allow(clippy::too_many_arguments)] +pub fn unwrap( + program_id: &Pubkey, + wrapped_token_account_address: &Pubkey, + wrapped_mint_address: &Pubkey, + wrapped_escrow_address: &Pubkey, + recipient_unwrapped_token_account_address: &Pubkey, + unwrapped_mint_address: &Pubkey, + wrapped_mint_authority_address: &Pubkey, + wrapped_token_program_id: &Pubkey, + unwrapped_token_program_id: &Pubkey, + transfer_authority_address: &Pubkey, + amount: u64, +) -> Instruction { + let accounts = vec![ + AccountMeta::new(*wrapped_token_account_address, false), + AccountMeta::new(*wrapped_mint_address, false), + AccountMeta::new(*wrapped_escrow_address, false), + AccountMeta::new(*recipient_unwrapped_token_account_address, false), + AccountMeta::new_readonly(*unwrapped_mint_address, false), + AccountMeta::new_readonly(*wrapped_mint_authority_address, false), + AccountMeta::new_readonly(*wrapped_token_program_id, false), + AccountMeta::new_readonly(*unwrapped_token_program_id, false), + AccountMeta::new_readonly(*transfer_authority_address, true), + ]; + let data = TokenWrapInstruction::UnWrap { amount }.pack(); + Instruction::new_with_bytes(*program_id, &data, accounts) } diff --git a/program/src/processor.rs b/program/src/processor.rs index bb0cf1a..0bb507d 100644 --- a/program/src/processor.rs +++ b/program/src/processor.rs @@ -1,25 +1,62 @@ //! Program state processor +use solana_program::account_info::next_account_info; +use solana_program::program_error::ProgramError; +use solana_program::rent::Rent; +use solana_program::{msg, system_instruction}; +use solana_program::{program::invoke_signed, program_pack::Pack}; use { crate::instruction::TokenWrapInstruction, solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey}, - spl_token_2022::instruction::decode_instruction_type, }; +/// TODO: Add docs +pub fn process_create_mint( + program_id: &Pubkey, + accounts: &[AccountInfo], + idempotent: bool, +) -> ProgramResult { + let account_info_iter = &mut accounts.iter(); + + let wrapped_mint_account = next_account_info(account_info_iter)?; + let wrapped_backpointer_account = next_account_info(account_info_iter)?; + let unwrapped_mint_account = next_account_info(account_info_iter)?; + let system_program_account = next_account_info(account_info_iter)?; + let wrapped_token_program_account = next_account_info(account_info_iter)?; + + // TODO: Add account validation (has correct permissions, is passed in correct order, etc) + + // // --- Mint Existence Check and Idempotency --- + // if wrapped_mint_account.data_len() > 0 { + // msg!("Wrapped mint account already exists"); + // return if !idempotent { + // Err(ProgramError::AccountAlreadyInitialized) + // } else { + // msg!("Idempotent creation requested, skipping account creation and initialization."); + // Ok(()) // Succeed silently as idempotent creation requested + // }; + // } + + Ok(()) +} + /// Instruction processor pub fn process_instruction( - _program_id: &Pubkey, - _accounts: &[AccountInfo], + program_id: &Pubkey, + accounts: &[AccountInfo], input: &[u8], ) -> ProgramResult { - match decode_instruction_type(input)? { - TokenWrapInstruction::CreateMint => { - unimplemented!(); + match TokenWrapInstruction::unpack(input)? { + TokenWrapInstruction::CreateMint { idempotent } => { + msg!("Instruction: CreateMint"); + process_create_mint(program_id, accounts, idempotent) } - TokenWrapInstruction::Wrap => { + TokenWrapInstruction::Wrap { .. } => { + msg!("Instruction: Wrap"); unimplemented!(); } - TokenWrapInstruction::Unwrap => { + TokenWrapInstruction::UnWrap { .. } => { + msg!("Instruction: UnWrap"); unimplemented!(); } } diff --git a/program/tests/test_create_mint.rs b/program/tests/test_create_mint.rs new file mode 100644 index 0000000..74555b9 --- /dev/null +++ b/program/tests/test_create_mint.rs @@ -0,0 +1,38 @@ +use solana_program::system_program; +use solana_sdk::account::Account; +use { + mollusk_svm::{result::Check, Mollusk}, + solana_program::pubkey::Pubkey, + spl_token_wrap::instruction::create_mint, +}; + +#[test] +fn test_create_mint_idempotency() { + let program_id = Pubkey::new_unique(); + + let wrapped_mint_account = Pubkey::new_unique(); + let wrapped_backpointer_account = Pubkey::new_unique(); + let unwrapped_mint_account = Pubkey::new_unique(); + let wrapped_token_program_id = spl_token_2022::id(); + + let mut mollusk = Mollusk::new(&program_id, "spl_token_wrap"); + mollusk_svm_programs_token::token2022::add_program(&mut mollusk); + + let instruction = create_mint( + &program_id, + &wrapped_mint_account, + &wrapped_backpointer_account, + &unwrapped_mint_account, + &wrapped_token_program_id, + false, + ); + + let accounts = &[ + (wrapped_mint_account, Account::default()), + (wrapped_backpointer_account, Account::default()), + (unwrapped_mint_account, Account::default()), + (system_program::id(), Account::default()), + mollusk_svm_programs_token::token2022::keyed_account(), + ]; + mollusk.process_and_validate_instruction(&instruction, accounts, &[Check::success()]); +} diff --git a/program/tests/test_instruction.rs b/program/tests/test_instruction.rs new file mode 100644 index 0000000..e94eb69 --- /dev/null +++ b/program/tests/test_instruction.rs @@ -0,0 +1,49 @@ +use spl_token_wrap::instruction::TokenWrapInstruction; + +#[test] +fn test_pack_unpack_create_mint() { + let instruction = TokenWrapInstruction::CreateMint { idempotent: true }; + let packed = instruction.pack(); + assert_eq!(packed, vec![0, 1]); + + let unpacked = TokenWrapInstruction::unpack(&packed).unwrap(); + assert_eq!(unpacked, instruction); + + let instruction = TokenWrapInstruction::CreateMint { idempotent: false }; + let packed = instruction.pack(); + assert_eq!(packed, vec![0, 0]); + + let unpacked = TokenWrapInstruction::unpack(&packed).unwrap(); + assert_eq!(unpacked, instruction); +} + +#[test] +fn test_pack_unpack_wrap() { + let instruction = TokenWrapInstruction::Wrap { amount: 42 }; + let packed = instruction.pack(); + assert_eq!(packed, vec![1, 42, 0, 0, 0, 0, 0, 0, 0]); + + let unpacked = TokenWrapInstruction::unpack(&packed).unwrap(); + assert_eq!(unpacked, instruction); +} + +#[test] +fn test_pack_unpack_unwrap() { + let instruction = TokenWrapInstruction::UnWrap { amount: 100 }; + let packed = instruction.pack(); + assert_eq!(packed, vec![2, 100, 0, 0, 0, 0, 0, 0, 0]); + + let unpacked = TokenWrapInstruction::unpack(&packed).unwrap(); + assert_eq!(unpacked, instruction); +} + +#[test] +fn test_unpack_invalid_data() { + assert!(TokenWrapInstruction::unpack(&[]).is_err()); + assert!(TokenWrapInstruction::unpack(&[3]).is_err()); + assert!(TokenWrapInstruction::unpack(&[0]).is_err()); + assert!(TokenWrapInstruction::unpack(&[1, 0, 0, 0]).is_err()); + assert!(TokenWrapInstruction::unpack(&[2, 0, 0, 0]).is_err()); + assert!(TokenWrapInstruction::unpack(&[0]).is_err()); + assert!(TokenWrapInstruction::unpack(&[0, 1, 0]).is_err()); +} From b8f3c550bb137e94e0ea7eb4bec7e2aa1a10df93 Mon Sep 17 00:00:00 2001 From: Gabe Rodriguez Date: Thu, 30 Jan 2025 13:40:14 +0100 Subject: [PATCH 02/14] allocate+assign --- Cargo.lock | 274 +----------------------------- program/Cargo.toml | 10 -- program/src/instruction.rs | 20 +-- program/src/lib.rs | 1 + program/src/processor.rs | 113 ++++++++++-- program/tests/test_create_mint.rs | 114 ++++++++++++- 6 files changed, 219 insertions(+), 313 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2ef5359..223d526 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -297,21 +297,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bit-set" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" - [[package]] name = "bitflags" version = "1.3.2" @@ -900,22 +885,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" -[[package]] -name = "errno" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" -dependencies = [ - "libc", - "windows-sys 0.59.0", -] - -[[package]] -name = "fastrand" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" - [[package]] name = "feature-probe" version = "0.1.1" @@ -983,21 +952,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "futures" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - [[package]] name = "futures-channel" version = "0.3.31" @@ -1005,7 +959,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", - "futures-sink", ] [[package]] @@ -1014,17 +967,6 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" -[[package]] -name = "futures-executor" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - [[package]] name = "futures-io" version = "0.3.31" @@ -1049,10 +991,8 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ - "futures-channel", "futures-core", "futures-io", - "futures-sink", "futures-task", "memchr", "pin-project-lite", @@ -1558,12 +1498,6 @@ dependencies = [ "thiserror 1.0.69", ] -[[package]] -name = "linux-raw-sys" -version = "0.4.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" - [[package]] name = "litemap" version = "0.7.4" @@ -1993,26 +1927,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "proptest" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50" -dependencies = [ - "bit-set", - "bit-vec", - "bitflags 2.8.0", - "lazy_static", - "num-traits", - "rand 0.8.5", - "rand_chacha 0.3.1", - "rand_xorshift", - "regex-syntax", - "rusty-fork", - "tempfile", - "unarray", -] - [[package]] name = "qstring" version = "0.7.2" @@ -2022,12 +1936,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - [[package]] name = "quote" version = "1.0.38" @@ -2108,15 +2016,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_xorshift" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" -dependencies = [ - "rand_core 0.6.4", -] - [[package]] name = "redox_syscall" version = "0.5.8" @@ -2228,19 +2127,6 @@ dependencies = [ "semver", ] -[[package]] -name = "rustix" -version = "0.38.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" -dependencies = [ - "bitflags 2.8.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.59.0", -] - [[package]] name = "rustls" version = "0.21.12" @@ -2278,33 +2164,12 @@ version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" -[[package]] -name = "rusty-fork" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" -dependencies = [ - "fnv", - "quick-error", - "tempfile", - "wait-timeout", -] - [[package]] name = "ryu" version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" -[[package]] -name = "scc" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28e1c91382686d21b5ac7959341fcb9780fa7c03773646995a87c950fa7be640" -dependencies = [ - "sdd", -] - [[package]] name = "scopeguard" version = "1.2.0" @@ -2327,12 +2192,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "sdd" -version = "3.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478f121bb72bbf63c52c93011ea1791dca40140dfe13f8336c4c5ac952c33aa9" - [[package]] name = "semver" version = "1.0.25" @@ -2415,31 +2274,6 @@ dependencies = [ "syn 2.0.96", ] -[[package]] -name = "serial_test" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9" -dependencies = [ - "futures", - "log", - "once_cell", - "parking_lot", - "scc", - "serial_test_derive", -] - -[[package]] -name = "serial_test_derive" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.96", -] - [[package]] name = "sha2" version = "0.9.9" @@ -3403,32 +3237,6 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -[[package]] -name = "spl-associated-token-account" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76fee7d65013667032d499adc3c895e286197a35a0d3a4643c80e7fd3e9969e3" -dependencies = [ - "borsh 1.5.5", - "num-derive", - "num-traits", - "solana-program", - "spl-associated-token-account-client", - "spl-token", - "spl-token-2022 6.0.0", - "thiserror 1.0.69", -] - -[[package]] -name = "spl-associated-token-account-client" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6f8349dbcbe575f354f9a533a21f272f3eb3808a49e2fdc1c34393b88ba76cb" -dependencies = [ - "solana-instruction", - "solana-pubkey", -] - [[package]] name = "spl-discriminator" version = "0.4.1" @@ -3574,34 +3382,6 @@ dependencies = [ "thiserror 1.0.69", ] -[[package]] -name = "spl-token-2022" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b27f7405010ef816587c944536b0eafbcc35206ab6ba0f2ca79f1d28e488f4f" -dependencies = [ - "arrayref", - "bytemuck", - "num-derive", - "num-traits", - "num_enum", - "solana-program", - "solana-security-txt", - "solana-zk-sdk", - "spl-elgamal-registry", - "spl-memo", - "spl-pod", - "spl-token", - "spl-token-confidential-transfer-ciphertext-arithmetic", - "spl-token-confidential-transfer-proof-extraction", - "spl-token-confidential-transfer-proof-generation 0.2.0", - "spl-token-group-interface", - "spl-token-metadata-interface", - "spl-transfer-hook-interface", - "spl-type-length-value", - "thiserror 1.0.69", -] - [[package]] name = "spl-token-2022" version = "7.0.0" @@ -3622,7 +3402,7 @@ dependencies = [ "spl-token", "spl-token-confidential-transfer-ciphertext-arithmetic", "spl-token-confidential-transfer-proof-extraction", - "spl-token-confidential-transfer-proof-generation 0.3.0", + "spl-token-confidential-transfer-proof-generation", "spl-token-group-interface", "spl-token-metadata-interface", "spl-transfer-hook-interface", @@ -3656,17 +3436,6 @@ dependencies = [ "thiserror 2.0.11", ] -[[package]] -name = "spl-token-confidential-transfer-proof-generation" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8627184782eec1894de8ea26129c61303f1f0adeed65c20e0b10bc584f09356d" -dependencies = [ - "curve25519-dalek 4.1.3", - "solana-zk-sdk", - "thiserror 1.0.69", -] - [[package]] name = "spl-token-confidential-transfer-proof-generation" version = "0.3.0" @@ -3722,23 +3491,13 @@ dependencies = [ name = "spl-token-wrap" version = "0.1.0" dependencies = [ - "arrayref", - "borsh 0.10.4", "bytemuck", - "lazy_static", "mollusk-svm", "mollusk-svm-programs-token", - "num-derive", - "num-traits", - "num_enum", - "proptest", - "serial_test", "solana-program", "solana-sdk", - "spl-associated-token-account", "spl-token", - "spl-token-2022 7.0.0", - "thiserror 2.0.11", + "spl-token-2022", ] [[package]] @@ -3862,20 +3621,6 @@ dependencies = [ "libc", ] -[[package]] -name = "tempfile" -version = "3.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" -dependencies = [ - "cfg-if", - "fastrand", - "getrandom 0.2.15", - "once_cell", - "rustix", - "windows-sys 0.59.0", -] - [[package]] name = "termcolor" version = "1.4.1" @@ -4051,12 +3796,6 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" -[[package]] -name = "unarray" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" - [[package]] name = "unicode-ident" version = "1.0.15" @@ -4139,15 +3878,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - [[package]] name = "want" version = "0.3.1" diff --git a/program/Cargo.toml b/program/Cargo.toml index f2a28d2..cbe98c0 100644 --- a/program/Cargo.toml +++ b/program/Cargo.toml @@ -13,24 +13,14 @@ test-sbf = [] [dependencies] bytemuck = { version = "1.21.0", features = ["derive"] } -num_enum = "0.7.3" solana-program = "2.1.11" -spl-associated-token-account = { version = "6.0.0", features = ["no-entrypoint"] } spl-token = { version = "7.0", features = ["no-entrypoint"] } spl-token-2022 = { version = "7.0.0", features = ["no-entrypoint"] } -thiserror = "2.0.11" -num-traits = "0.2.19" -borsh = "0.10.4" [dev-dependencies] mollusk-svm = "0.0.15" mollusk-svm-programs-token = "0.0.15" -serial_test = "3.2.0" solana-sdk = "2.1.0" -arrayref = "0.3.9" -num-derive = "0.4" -lazy_static = "1.5.0" -proptest = "1.5" [lib] crate-type = ["cdylib", "lib"] diff --git a/program/src/instruction.rs b/program/src/instruction.rs index 3be9575..1cd0d46 100644 --- a/program/src/instruction.rs +++ b/program/src/instruction.rs @@ -22,12 +22,8 @@ pub enum TokenWrapInstruction { /// 2. `[]` Existing unwrapped mint /// 3. `[]` System program /// 4. `[]` SPL Token program for wrapped mint - /// - /// Data expected by this instruction: - /// * `bool`: If true, idempotent creation. If false, fail if the mint - /// already exists. CreateMint { - /// TODO: Add docs + /// If true, idempotent creation. If false, fail if the mint already exists. idempotent: bool, }, @@ -53,11 +49,8 @@ pub enum TokenWrapInstruction { /// 8. `[signer]` Transfer authority on unwrapped token account /// 9. `..8+M` `[signer]` (Optional) M multisig signers on unwrapped token /// account - /// - /// Data expected by this instruction: - /// * little-endian `u64` representing the amount to wrap Wrap { - /// TODO: Add docs + /// little-endian `u64` representing the amount to wrap amount: u64, }, @@ -83,17 +76,14 @@ pub enum TokenWrapInstruction { /// 8. `[signer]` Transfer authority on wrapped token account /// 9. `..8+M` `[signer]` (Optional) M multisig signers on wrapped token /// account - /// - /// Data expected by this instruction: - /// * little-endian `u64` representing the amount to unwrap UnWrap { - /// TODO: Add docs + /// little-endian `u64` representing the amount to unwrap amount: u64, }, } impl TokenWrapInstruction { - /// TODO: Add docs + /// Packs a [TokenWrapInstruction](enum.TokenWrapInstruction.html) into a byte array. pub fn pack(&self) -> Vec { let mut buf = Vec::new(); match self { @@ -114,7 +104,7 @@ impl TokenWrapInstruction { buf } - /// TODO: Add docs + /// Unpacks a byte array into a [TokenWrapInstruction](enum.TokenWrapInstruction.html). pub fn unpack(input: &[u8]) -> Result { let (&tag, rest) = input .split_first() diff --git a/program/src/lib.rs b/program/src/lib.rs index 79fda08..bf94079 100644 --- a/program/src/lib.rs +++ b/program/src/lib.rs @@ -26,6 +26,7 @@ pub(crate) fn get_wrapped_mint_address_with_seed( ) } +// TODO: Could someone else do a kind attack and pre-create these accounts with them as owner? pub(crate) fn get_wrapped_mint_seeds<'a>( unwrapped_mint: &'a Pubkey, wrapped_token_program_id: &'a Pubkey, diff --git a/program/src/processor.rs b/program/src/processor.rs index 0bb507d..4a9e636 100644 --- a/program/src/processor.rs +++ b/program/src/processor.rs @@ -1,16 +1,23 @@ //! Program state processor +use crate::state::Backpointer; +use crate::{ + get_wrapped_mint_address, get_wrapped_mint_backpointer_address, + get_wrapped_mint_backpointer_address_seeds, get_wrapped_mint_seeds, +}; use solana_program::account_info::next_account_info; +use solana_program::program::invoke_signed; use solana_program::program_error::ProgramError; +use solana_program::program_pack::Pack; use solana_program::rent::Rent; +use solana_program::sysvar::Sysvar; use solana_program::{msg, system_instruction}; -use solana_program::{program::invoke_signed, program_pack::Pack}; use { crate::instruction::TokenWrapInstruction, solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey}, }; -/// TODO: Add docs +/// Processes [CreateMint](enum.TokenWrapInstruction.html) instruction. pub fn process_create_mint( program_id: &Pubkey, accounts: &[AccountInfo], @@ -21,21 +28,97 @@ pub fn process_create_mint( let wrapped_mint_account = next_account_info(account_info_iter)?; let wrapped_backpointer_account = next_account_info(account_info_iter)?; let unwrapped_mint_account = next_account_info(account_info_iter)?; - let system_program_account = next_account_info(account_info_iter)?; + let system_program_account = next_account_info(account_info_iter)?; // TODO: What is this for? let wrapped_token_program_account = next_account_info(account_info_iter)?; - // TODO: Add account validation (has correct permissions, is passed in correct order, etc) - - // // --- Mint Existence Check and Idempotency --- - // if wrapped_mint_account.data_len() > 0 { - // msg!("Wrapped mint account already exists"); - // return if !idempotent { - // Err(ProgramError::AccountAlreadyInitialized) - // } else { - // msg!("Idempotent creation requested, skipping account creation and initialization."); - // Ok(()) // Succeed silently as idempotent creation requested - // }; - // } + assert!(wrapped_mint_account.is_writable); + assert!(wrapped_backpointer_account.is_writable); + assert!(!unwrapped_mint_account.is_writable); + assert!(!system_program_account.is_writable); + assert!(!wrapped_token_program_account.is_writable); + + // Idempotency checks + if wrapped_mint_account.data_len() > 0 || wrapped_backpointer_account.data_len() > 0 { + msg!("Wrapped mint or backpointer account already initialized"); + return if !idempotent { + Err(ProgramError::AccountAlreadyInitialized) + } else { + Ok(()) + }; + } + + // Initialize wrapped mint PDA + + let wrapped_mint_address = get_wrapped_mint_address( + unwrapped_mint_account.key, + wrapped_token_program_account.key, + ); + let signer_seeds = get_wrapped_mint_seeds( + unwrapped_mint_account.key, + wrapped_token_program_account.key, + ); + let space = spl_token_2022::state::Mint::get_packed_len(); + + let rent = Rent::get()?; + let mint_rent_required = rent.minimum_balance(space); + if wrapped_mint_account.lamports() < mint_rent_required { + msg!( + "Error: wrapped_mint_account requires pre-funding of {} lamports", + mint_rent_required + ); + return Err(ProgramError::InsufficientFunds); + } + + // TODO: Currently throwing --- An account required by the instruction is missing + invoke_signed( + &system_instruction::allocate(&wrapped_mint_address, space as u64), + &[wrapped_mint_account.clone()], + &[&signer_seeds], + )?; + invoke_signed( + &system_instruction::assign(&wrapped_mint_address, program_id), + &[wrapped_mint_account.clone()], + &[&signer_seeds], + )?; + + // Initialize backpointer PDA + + let wrapped_backpointer_address = + get_wrapped_mint_backpointer_address(wrapped_mint_account.key); + if *wrapped_backpointer_account.key != wrapped_backpointer_address { + msg!("Error: wrapped_backpointer_account address is not as expected"); + return Err(ProgramError::InvalidSeeds); + } + + let backpointer_signer_seeds = + get_wrapped_mint_backpointer_address_seeds(wrapped_mint_account.key); + let backpointer_space = std::mem::size_of::(); + + let backpointer_rent_required = rent.minimum_balance(space); + if wrapped_backpointer_account.lamports() < rent.minimum_balance(backpointer_space) { + msg!( + "Error: wrapped_backpointer_account requires pre-funding of {} lamports", + backpointer_rent_required + ); + return Err(ProgramError::InsufficientFunds); + } + + invoke_signed( + &system_instruction::allocate(&wrapped_backpointer_address, backpointer_space as u64), + &[wrapped_backpointer_account.clone()], + &[&backpointer_signer_seeds], + )?; + invoke_signed( + &system_instruction::assign(&wrapped_backpointer_address, program_id), + &[wrapped_backpointer_account.clone()], + &[&backpointer_signer_seeds], + )?; + + // Set data within backpointer PDA + + let mut backpointer_account_data = wrapped_backpointer_account.try_borrow_mut_data()?; + let backpointer = bytemuck::from_bytes_mut::(&mut backpointer_account_data[..]); + backpointer.unwrapped_mint = *unwrapped_mint_account.key; Ok(()) } diff --git a/program/tests/test_create_mint.rs b/program/tests/test_create_mint.rs index 74555b9..fd4fdd4 100644 --- a/program/tests/test_create_mint.rs +++ b/program/tests/test_create_mint.rs @@ -1,3 +1,4 @@ +use solana_program::program_error::ProgramError; use solana_program::system_program; use solana_sdk::account::Account; use { @@ -7,7 +8,7 @@ use { }; #[test] -fn test_create_mint_idempotency() { +fn test_idempotency_false_with_existing_account() { let program_id = Pubkey::new_unique(); let wrapped_mint_account = Pubkey::new_unique(); @@ -27,12 +28,123 @@ fn test_create_mint_idempotency() { false, ); + // Simulating existing data on mint or backpointer + let account_with_data = Account { + data: vec![1; 10], + ..Account::default() + }; + + // idempotent: true causes these to fail + let accounts = &[ + (wrapped_mint_account, account_with_data.clone()), // mint already exists + (wrapped_backpointer_account, Account::default()), + (unwrapped_mint_account, Account::default()), + (system_program::id(), Account::default()), + mollusk_svm_programs_token::token2022::keyed_account(), + ]; + mollusk.process_and_validate_instruction( + &instruction, + accounts, + &[Check::err(ProgramError::AccountAlreadyInitialized)], + ); + let accounts = &[ (wrapped_mint_account, Account::default()), + (wrapped_backpointer_account, account_with_data), // backpointer already exists + (unwrapped_mint_account, Account::default()), + (system_program::id(), Account::default()), + mollusk_svm_programs_token::token2022::keyed_account(), + ]; + mollusk.process_and_validate_instruction( + &instruction, + accounts, + &[Check::err(ProgramError::AccountAlreadyInitialized)], + ); +} + +#[test] +fn test_idempotency_true_with_existing_account() { + let program_id = Pubkey::new_unique(); + + let wrapped_mint_account = Pubkey::new_unique(); + let wrapped_backpointer_account = Pubkey::new_unique(); + let unwrapped_mint_account = Pubkey::new_unique(); + let wrapped_token_program_id = spl_token_2022::id(); + + let mut mollusk = Mollusk::new(&program_id, "spl_token_wrap"); + mollusk_svm_programs_token::token2022::add_program(&mut mollusk); + + let instruction = create_mint( + &program_id, + &wrapped_mint_account, + &wrapped_backpointer_account, + &unwrapped_mint_account, + &wrapped_token_program_id, + true, + ); + + // Simulating existing data on mint or backpointer + let account_with_data = Account { + data: vec![1; 10], + ..Account::default() + }; + + // idempotent: true causes these to return successfully + let accounts = &[ + (wrapped_mint_account, account_with_data.clone()), // mint already exists (wrapped_backpointer_account, Account::default()), (unwrapped_mint_account, Account::default()), (system_program::id(), Account::default()), mollusk_svm_programs_token::token2022::keyed_account(), ]; mollusk.process_and_validate_instruction(&instruction, accounts, &[Check::success()]); + + let accounts = &[ + (wrapped_mint_account, Account::default()), + (wrapped_backpointer_account, account_with_data), // backpointer already exists + (unwrapped_mint_account, Account::default()), + (system_program::id(), Account::default()), + mollusk_svm_programs_token::token2022::keyed_account(), + ]; + mollusk.process_and_validate_instruction(&instruction, accounts, &[Check::success()]); } + +#[test] +fn test_something() { + let program_id = Pubkey::new_unique(); + + let wrapped_mint_account = Pubkey::new_unique(); + let wrapped_backpointer_account = Pubkey::new_unique(); + let unwrapped_mint_account = Pubkey::new_unique(); + let wrapped_token_program_id = spl_token_2022::id(); + + let mut mollusk = Mollusk::new(&program_id, "spl_token_wrap"); + mollusk_svm_programs_token::token2022::add_program(&mut mollusk); + + let instruction = create_mint( + &program_id, + &wrapped_mint_account, + &wrapped_backpointer_account, + &unwrapped_mint_account, + &wrapped_token_program_id, + false, + ); + + let accounts = &[ + ( + wrapped_mint_account, + Account { + lamports: 100_000_000, // Pre-funded + ..Account::default() + }, + ), + (wrapped_backpointer_account, Account::default()), + (unwrapped_mint_account, Account::default()), + (system_program::id(), Account::default()), + mollusk_svm_programs_token::token2022::keyed_account(), + ]; + mollusk.process_and_validate_instruction(&instruction, accounts, &[Check::success()]); +} + +// TODO: +// - Test if not enough rent funded From f2031a27aa6d3f1b62b7c5c7ff8b5986da59da75 Mon Sep 17 00:00:00 2001 From: Gabe Rodriguez Date: Thu, 30 Jan 2025 17:14:44 +0100 Subject: [PATCH 03/14] assertion tests --- program/src/instruction.rs | 2 +- program/src/processor.rs | 13 +- program/tests/test_create_mint.rs | 213 +++++++++++++++++++++++++++++- 3 files changed, 218 insertions(+), 10 deletions(-) diff --git a/program/src/instruction.rs b/program/src/instruction.rs index 1cd0d46..d3cd884 100644 --- a/program/src/instruction.rs +++ b/program/src/instruction.rs @@ -9,7 +9,7 @@ use std::convert::TryInto; #[derive(Clone, Debug, PartialEq)] #[repr(u8)] pub enum TokenWrapInstruction { - /// Create a wrapped token mint. Assumes caller has pre-allocated wrapped mint + /// Create a wrapped token mint. Assumes caller has pre-funded wrapped mint /// and backpointer account. /// /// Accounts expected by this instruction: diff --git a/program/src/processor.rs b/program/src/processor.rs index 4a9e636..276b085 100644 --- a/program/src/processor.rs +++ b/program/src/processor.rs @@ -31,11 +31,14 @@ pub fn process_create_mint( let system_program_account = next_account_info(account_info_iter)?; // TODO: What is this for? let wrapped_token_program_account = next_account_info(account_info_iter)?; - assert!(wrapped_mint_account.is_writable); - assert!(wrapped_backpointer_account.is_writable); - assert!(!unwrapped_mint_account.is_writable); - assert!(!system_program_account.is_writable); - assert!(!wrapped_token_program_account.is_writable); + if !wrapped_mint_account.is_writable + || !wrapped_backpointer_account.is_writable + || unwrapped_mint_account.is_writable + || system_program_account.is_writable + || wrapped_token_program_account.is_writable + { + return Err(ProgramError::InvalidArgument); + } // Idempotency checks if wrapped_mint_account.data_len() > 0 || wrapped_backpointer_account.data_len() > 0 { diff --git a/program/tests/test_create_mint.rs b/program/tests/test_create_mint.rs index fd4fdd4..f46dcd1 100644 --- a/program/tests/test_create_mint.rs +++ b/program/tests/test_create_mint.rs @@ -1,12 +1,119 @@ +use solana_program::instruction::{AccountMeta, Instruction}; use solana_program::program_error::ProgramError; +use solana_program::program_pack::Pack; +use solana_program::rent::Rent; use solana_program::system_program; use solana_sdk::account::Account; +use spl_token_2022::state::Mint; +use spl_token_wrap::instruction::TokenWrapInstruction; +use spl_token_wrap::state::Backpointer; use { mollusk_svm::{result::Check, Mollusk}, solana_program::pubkey::Pubkey, spl_token_wrap::instruction::create_mint, }; +#[test] +fn test_account_flags() { + let program_id = Pubkey::new_unique(); + + let wrapped_mint_account = Pubkey::new_unique(); + let wrapped_backpointer_account = Pubkey::new_unique(); + let unwrapped_mint_account = Pubkey::new_unique(); + let wrapped_token_program_id = spl_token_2022::id(); + + // 1. Wrong flag on wrapped_mint_account + let account_metas = vec![ + AccountMeta::new_readonly(wrapped_mint_account, false), + AccountMeta::new(wrapped_backpointer_account, false), + AccountMeta::new_readonly(unwrapped_mint_account, false), + AccountMeta::new_readonly(system_program::id(), false), + AccountMeta::new_readonly(wrapped_token_program_id, false), + ]; + let data = TokenWrapInstruction::CreateMint { idempotent: false }.pack(); + let instruction = Instruction::new_with_bytes(program_id, &data, account_metas); + + let mut mollusk = Mollusk::new(&program_id, "spl_token_wrap"); + mollusk_svm_programs_token::token2022::add_program(&mut mollusk); + + let accounts = &[ + (wrapped_mint_account, Account::default()), + (wrapped_backpointer_account, Account::default()), + (unwrapped_mint_account, Account::default()), + (system_program::id(), Account::default()), + mollusk_svm_programs_token::token2022::keyed_account(), + ]; + mollusk.process_and_validate_instruction( + &instruction, + accounts, + &[Check::err(ProgramError::InvalidArgument)], + ); + + // 2. Wrong flag on wrapped_backpointer_account + let account_metas = vec![ + AccountMeta::new(wrapped_mint_account, false), + AccountMeta::new_readonly(wrapped_backpointer_account, false), + AccountMeta::new_readonly(unwrapped_mint_account, false), + AccountMeta::new_readonly(system_program::id(), false), + AccountMeta::new_readonly(wrapped_token_program_id, false), + ]; + let data = TokenWrapInstruction::CreateMint { idempotent: false }.pack(); + let instruction = Instruction::new_with_bytes(program_id, &data, account_metas); + mollusk.process_and_validate_instruction( + &instruction, + accounts, + &[Check::err(ProgramError::InvalidArgument)], + ); + + // 3. Wrong flag on unwrapped_mint_account + let account_metas = vec![ + AccountMeta::new(wrapped_mint_account, false), + AccountMeta::new(wrapped_backpointer_account, false), + AccountMeta::new(unwrapped_mint_account, false), + AccountMeta::new_readonly(system_program::id(), false), + AccountMeta::new_readonly(wrapped_token_program_id, false), + ]; + let data = TokenWrapInstruction::CreateMint { idempotent: false }.pack(); + let instruction = Instruction::new_with_bytes(program_id, &data, account_metas); + mollusk.process_and_validate_instruction( + &instruction, + accounts, + &[Check::err(ProgramError::InvalidArgument)], + ); + + // 4. Wrong flag on system_program + let account_metas = vec![ + AccountMeta::new(wrapped_mint_account, false), + AccountMeta::new(wrapped_backpointer_account, false), + AccountMeta::new_readonly(unwrapped_mint_account, false), + AccountMeta::new(system_program::id(), false), + AccountMeta::new_readonly(wrapped_token_program_id, false), + ]; + let data = TokenWrapInstruction::CreateMint { idempotent: false }.pack(); + let instruction = Instruction::new_with_bytes(program_id, &data, account_metas); + mollusk.process_and_validate_instruction( + &instruction, + accounts, + &[Check::err(ProgramError::InvalidArgument)], + ); + + // 5. Wrong flag on wrapped_token_program_id + let account_metas = vec![ + AccountMeta::new(wrapped_mint_account, false), + AccountMeta::new(wrapped_backpointer_account, false), + AccountMeta::new(unwrapped_mint_account, false), + AccountMeta::new_readonly(system_program::id(), false), + AccountMeta::new_readonly(wrapped_token_program_id, false), + ]; + let data = TokenWrapInstruction::CreateMint { idempotent: false }.pack(); + let instruction = Instruction::new_with_bytes(program_id, &data, account_metas); + mollusk.process_and_validate_instruction( + &instruction, + accounts, + &[Check::err(ProgramError::InvalidArgument)], + ); +} + #[test] fn test_idempotency_false_with_existing_account() { let program_id = Pubkey::new_unique(); @@ -110,7 +217,108 @@ fn test_idempotency_true_with_existing_account() { } #[test] -fn test_something() { +fn test_create_mint_insufficient_funds() { + let program_id = Pubkey::new_unique(); + + let wrapped_mint_account = Pubkey::new_unique(); + let wrapped_backpointer_account = Pubkey::new_unique(); + let unwrapped_mint_account = Pubkey::new_unique(); + let wrapped_token_program_id = spl_token_2022::id(); + + let mut mollusk = Mollusk::new(&program_id, "spl_token_wrap"); + mollusk_svm_programs_token::token2022::add_program(&mut mollusk); + + let instruction = create_mint( + &program_id, + &wrapped_mint_account, + &wrapped_backpointer_account, + &unwrapped_mint_account, + &wrapped_token_program_id, + false, + ); + + // Calculate minimum rent for Mint account + let rent = Rent::default(); // Using default rent for test + let space = Mint::get_packed_len(); + let mint_rent_required = rent.minimum_balance(space); + + // Create wrapped_mint_account with insufficient lamports + let insufficient_lamports = mint_rent_required - 1; // Less than required rent + let wrapped_mint_account_insufficent_funds = Account { + lamports: insufficient_lamports, + ..Account::default() + }; + + let accounts = &[ + (wrapped_mint_account, wrapped_mint_account_insufficent_funds), + (wrapped_backpointer_account, Account::default()), + (unwrapped_mint_account, Account::default()), + (system_program::id(), Account::default()), + mollusk_svm_programs_token::token2022::keyed_account(), + ]; + mollusk.process_and_validate_instruction( + &instruction, + accounts, + &[Check::err(ProgramError::InsufficientFunds)], + ); +} + +#[test] +fn test_create_mint_backpointer_insufficient_funds() { + let program_id = Pubkey::new_unique(); + + let wrapped_mint_account = Pubkey::new_unique(); + let wrapped_backpointer_account = Pubkey::new_unique(); + let unwrapped_mint_account = Pubkey::new_unique(); + let wrapped_token_program_id = spl_token_2022::id(); + + let mut mollusk = Mollusk::new(&program_id, "spl_token_wrap"); + mollusk_svm_programs_token::token2022::add_program(&mut mollusk); + + let instruction = create_mint( + &program_id, + &wrapped_mint_account, + &wrapped_backpointer_account, + &unwrapped_mint_account, + &wrapped_token_program_id, + false, + ); + + // Calculate minimum rent for Backpointer account + let rent = Rent::default(); // Using default rent for test + let backpointer_space = std::mem::size_of::(); + let backpointer_rent_required = rent.minimum_balance(backpointer_space); + + // Create wrapped_backpointer_account with insufficient lamports + let insufficient_lamports = backpointer_rent_required - 1; // Less than required rent + let wrapped_backpointer_account_insufficent_funds = Account { + lamports: insufficient_lamports, + ..Account::default() + }; + + let accounts = &[ + (wrapped_mint_account, Account::default()), + ( + wrapped_backpointer_account, + wrapped_backpointer_account_insufficent_funds, + ), + (unwrapped_mint_account, Account::default()), + (system_program::id(), Account::default()), + mollusk_svm_programs_token::token2022::keyed_account(), + ]; + mollusk.process_and_validate_instruction( + &instruction, + accounts, + &[Check::err(ProgramError::InsufficientFunds)], + ); +} + +// TODO: In progress. Should assert after success: +// - wrapped_mint_account is initialized, owner is ? +// - wrapped_backpointer_account, owner is token wrap program +// - unwrapped_mint_account is unchanged +#[test] +fn test_success() { let program_id = Pubkey::new_unique(); let wrapped_mint_account = Pubkey::new_unique(); @@ -145,6 +353,3 @@ fn test_something() { ]; mollusk.process_and_validate_instruction(&instruction, accounts, &[Check::success()]); } - -// TODO: -// - Test if not enough rent funded From cca879f58f37120b57589c5cc71557f765fa2cde Mon Sep 17 00:00:00 2001 From: Gabe Rodriguez Date: Thu, 30 Jan 2025 18:02:07 +0100 Subject: [PATCH 04/14] Review notes for next steps --- program/src/instruction.rs | 2 +- program/src/lib.rs | 1 - program/src/processor.rs | 23 ++++++++++++++++++----- program/tests/test_create_mint.rs | 4 ++-- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/program/src/instruction.rs b/program/src/instruction.rs index d3cd884..3d9f089 100644 --- a/program/src/instruction.rs +++ b/program/src/instruction.rs @@ -21,7 +21,7 @@ pub enum TokenWrapInstruction { /// `get_wrapped_mint_backpointer_address(wrapped_mint_address)` /// 2. `[]` Existing unwrapped mint /// 3. `[]` System program - /// 4. `[]` SPL Token program for wrapped mint + /// 4. `[]` SPL Token program for wrapped mint // TODO: BOTH DIRECTIONS CreateMint { /// If true, idempotent creation. If false, fail if the mint already exists. idempotent: bool, diff --git a/program/src/lib.rs b/program/src/lib.rs index bf94079..79fda08 100644 --- a/program/src/lib.rs +++ b/program/src/lib.rs @@ -26,7 +26,6 @@ pub(crate) fn get_wrapped_mint_address_with_seed( ) } -// TODO: Could someone else do a kind attack and pre-create these accounts with them as owner? pub(crate) fn get_wrapped_mint_seeds<'a>( unwrapped_mint: &'a Pubkey, wrapped_token_program_id: &'a Pubkey, diff --git a/program/src/processor.rs b/program/src/processor.rs index 276b085..a562b7b 100644 --- a/program/src/processor.rs +++ b/program/src/processor.rs @@ -2,8 +2,9 @@ use crate::state::Backpointer; use crate::{ - get_wrapped_mint_address, get_wrapped_mint_backpointer_address, - get_wrapped_mint_backpointer_address_seeds, get_wrapped_mint_seeds, + _get_wrapped_mint_signer_seeds, get_wrapped_mint_address, get_wrapped_mint_address_with_seed, + get_wrapped_mint_backpointer_address, get_wrapped_mint_backpointer_address_seeds, + get_wrapped_mint_seeds, }; use solana_program::account_info::next_account_info; use solana_program::program::invoke_signed; @@ -31,6 +32,7 @@ pub fn process_create_mint( let system_program_account = next_account_info(account_info_iter)?; // TODO: What is this for? let wrapped_token_program_account = next_account_info(account_info_iter)?; + // TODO: Can remove -- if !wrapped_mint_account.is_writable || !wrapped_backpointer_account.is_writable || unwrapped_mint_account.is_writable @@ -52,13 +54,17 @@ pub fn process_create_mint( // Initialize wrapped mint PDA - let wrapped_mint_address = get_wrapped_mint_address( + let (wrapped_mint_address, bump) = get_wrapped_mint_address_with_seed( unwrapped_mint_account.key, wrapped_token_program_account.key, ); - let signer_seeds = get_wrapped_mint_seeds( + + // TODO: this needs bump seed coming from above + let bump_seed = [bump]; + let signer_seeds = _get_wrapped_mint_signer_seeds( unwrapped_mint_account.key, wrapped_token_program_account.key, + &bump_seed, ); let space = spl_token_2022::state::Mint::get_packed_len(); @@ -78,12 +84,18 @@ pub fn process_create_mint( &[wrapped_mint_account.clone()], &[&signer_seeds], )?; + + // TODO: Assign it to the token program invoke_signed( - &system_instruction::assign(&wrapped_mint_address, program_id), + &system_instruction::assign(&wrapped_mint_address, program_id), // change this &[wrapped_mint_account.clone()], &[&signer_seeds], )?; + // TODO: initialize the mint + // - currently has zero bytes, need to set mint authority--> PDA of token wrapped program + // - get_wrapped_mint_authority() + // Initialize backpointer PDA let wrapped_backpointer_address = @@ -93,6 +105,7 @@ pub fn process_create_mint( return Err(ProgramError::InvalidSeeds); } + // TODO: Get bump seed like above let backpointer_signer_seeds = get_wrapped_mint_backpointer_address_seeds(wrapped_mint_account.key); let backpointer_space = std::mem::size_of::(); diff --git a/program/tests/test_create_mint.rs b/program/tests/test_create_mint.rs index f46dcd1..7459226 100644 --- a/program/tests/test_create_mint.rs +++ b/program/tests/test_create_mint.rs @@ -321,8 +321,8 @@ fn test_create_mint_backpointer_insufficient_funds() { fn test_success() { let program_id = Pubkey::new_unique(); - let wrapped_mint_account = Pubkey::new_unique(); - let wrapped_backpointer_account = Pubkey::new_unique(); + let wrapped_mint_account = Pubkey::new_unique(); // TODO: Don't use a random one, create a real mint + let wrapped_backpointer_account = Pubkey::new_unique(); // TODO: Don't use a random one, create a real mint let unwrapped_mint_account = Pubkey::new_unique(); let wrapped_token_program_id = spl_token_2022::id(); From 9c096a67fa364c3dc9e10f989d6756093218b677 Mon Sep 17 00:00:00 2001 From: Gabe Rodriguez Date: Fri, 31 Jan 2025 16:54:24 +0100 Subject: [PATCH 05/14] working create mint --- program/src/instruction.rs | 6 +- program/src/processor.rs | 65 ++++---- program/tests/test_create_mint.rs | 236 ++++++++++++------------------ 3 files changed, 131 insertions(+), 176 deletions(-) diff --git a/program/src/instruction.rs b/program/src/instruction.rs index 3d9f089..d4ab2fd 100644 --- a/program/src/instruction.rs +++ b/program/src/instruction.rs @@ -10,7 +10,9 @@ use std::convert::TryInto; #[repr(u8)] pub enum TokenWrapInstruction { /// Create a wrapped token mint. Assumes caller has pre-funded wrapped mint - /// and backpointer account. + /// and backpointer account. Supports both directions: + /// - spl-token -> token-2022 + /// - token-2022 -> spl-token /// /// Accounts expected by this instruction: /// @@ -21,7 +23,7 @@ pub enum TokenWrapInstruction { /// `get_wrapped_mint_backpointer_address(wrapped_mint_address)` /// 2. `[]` Existing unwrapped mint /// 3. `[]` System program - /// 4. `[]` SPL Token program for wrapped mint // TODO: BOTH DIRECTIONS + /// 4. `[]` SPL Token program for wrapped mint CreateMint { /// If true, idempotent creation. If false, fail if the mint already exists. idempotent: bool, diff --git a/program/src/processor.rs b/program/src/processor.rs index a562b7b..37f5070 100644 --- a/program/src/processor.rs +++ b/program/src/processor.rs @@ -2,9 +2,9 @@ use crate::state::Backpointer; use crate::{ - _get_wrapped_mint_signer_seeds, get_wrapped_mint_address, get_wrapped_mint_address_with_seed, - get_wrapped_mint_backpointer_address, get_wrapped_mint_backpointer_address_seeds, - get_wrapped_mint_seeds, + _get_wrapped_mint_authority_signer_seeds, _get_wrapped_mint_backpointer_address_signer_seeds, + _get_wrapped_mint_signer_seeds, get_wrapped_mint_address_with_seed, + get_wrapped_mint_authority_with_seed, get_wrapped_mint_backpointer_address_with_seed, }; use solana_program::account_info::next_account_info; use solana_program::program::invoke_signed; @@ -13,6 +13,7 @@ use solana_program::program_pack::Pack; use solana_program::rent::Rent; use solana_program::sysvar::Sysvar; use solana_program::{msg, system_instruction}; +use spl_token_2022::instruction::initialize_mint2; use { crate::instruction::TokenWrapInstruction, solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey}, @@ -29,20 +30,11 @@ pub fn process_create_mint( let wrapped_mint_account = next_account_info(account_info_iter)?; let wrapped_backpointer_account = next_account_info(account_info_iter)?; let unwrapped_mint_account = next_account_info(account_info_iter)?; - let system_program_account = next_account_info(account_info_iter)?; // TODO: What is this for? + let system_program_account = next_account_info(account_info_iter)?; // TODO: This is not used 🤔 let wrapped_token_program_account = next_account_info(account_info_iter)?; - // TODO: Can remove -- - if !wrapped_mint_account.is_writable - || !wrapped_backpointer_account.is_writable - || unwrapped_mint_account.is_writable - || system_program_account.is_writable - || wrapped_token_program_account.is_writable - { - return Err(ProgramError::InvalidArgument); - } - // Idempotency checks + if wrapped_mint_account.data_len() > 0 || wrapped_backpointer_account.data_len() > 0 { msg!("Wrapped mint or backpointer account already initialized"); return if !idempotent { @@ -58,8 +50,6 @@ pub fn process_create_mint( unwrapped_mint_account.key, wrapped_token_program_account.key, ); - - // TODO: this needs bump seed coming from above let bump_seed = [bump]; let signer_seeds = _get_wrapped_mint_signer_seeds( unwrapped_mint_account.key, @@ -78,38 +68,52 @@ pub fn process_create_mint( return Err(ProgramError::InsufficientFunds); } - // TODO: Currently throwing --- An account required by the instruction is missing + // Initialize the wrapped mint + invoke_signed( &system_instruction::allocate(&wrapped_mint_address, space as u64), &[wrapped_mint_account.clone()], &[&signer_seeds], )?; - - // TODO: Assign it to the token program invoke_signed( - &system_instruction::assign(&wrapped_mint_address, program_id), // change this + &system_instruction::assign(&wrapped_mint_address, wrapped_token_program_account.key), &[wrapped_mint_account.clone()], &[&signer_seeds], )?; - // TODO: initialize the mint - // - currently has zero bytes, need to set mint authority--> PDA of token wrapped program - // - get_wrapped_mint_authority() + // New wrapped mint matches decimals of unwrapped mint + let unwrapped_mint_data = unwrapped_mint_account.try_borrow_data()?; + let unpacked_unwrapped_mint = spl_token_2022::state::Mint::unpack(&unwrapped_mint_data)?; + let decimals = unpacked_unwrapped_mint.decimals; + + let (wrapped_mint_authority, authority_bump_seed) = + get_wrapped_mint_authority_with_seed(wrapped_mint_account.key); + let authority_bump_seeds = [authority_bump_seed]; + let authority_signer_seeds = + _get_wrapped_mint_authority_signer_seeds(wrapped_mint_account.key, &authority_bump_seeds); + + invoke_signed( + &initialize_mint2( + wrapped_token_program_account.key, + wrapped_mint_account.key, + &wrapped_mint_authority, + None, + decimals, + )?, + &[wrapped_mint_account.clone()], + &[&authority_signer_seeds], + )?; // Initialize backpointer PDA - let wrapped_backpointer_address = - get_wrapped_mint_backpointer_address(wrapped_mint_account.key); + let (wrapped_backpointer_address, bump) = + get_wrapped_mint_backpointer_address_with_seed(wrapped_mint_account.key); if *wrapped_backpointer_account.key != wrapped_backpointer_address { msg!("Error: wrapped_backpointer_account address is not as expected"); return Err(ProgramError::InvalidSeeds); } - // TODO: Get bump seed like above - let backpointer_signer_seeds = - get_wrapped_mint_backpointer_address_seeds(wrapped_mint_account.key); let backpointer_space = std::mem::size_of::(); - let backpointer_rent_required = rent.minimum_balance(space); if wrapped_backpointer_account.lamports() < rent.minimum_balance(backpointer_space) { msg!( @@ -119,6 +123,9 @@ pub fn process_create_mint( return Err(ProgramError::InsufficientFunds); } + let bump_seed = [bump]; + let backpointer_signer_seeds = + _get_wrapped_mint_backpointer_address_signer_seeds(wrapped_mint_account.key, &bump_seed); invoke_signed( &system_instruction::allocate(&wrapped_backpointer_address, backpointer_space as u64), &[wrapped_backpointer_account.clone()], diff --git a/program/tests/test_create_mint.rs b/program/tests/test_create_mint.rs index 7459226..2fbf8db 100644 --- a/program/tests/test_create_mint.rs +++ b/program/tests/test_create_mint.rs @@ -1,131 +1,48 @@ -use solana_program::instruction::{AccountMeta, Instruction}; use solana_program::program_error::ProgramError; use solana_program::program_pack::Pack; use solana_program::rent::Rent; use solana_program::system_program; use solana_sdk::account::Account; use spl_token_2022::state::Mint; -use spl_token_wrap::instruction::TokenWrapInstruction; use spl_token_wrap::state::Backpointer; +use spl_token_wrap::{get_wrapped_mint_address, get_wrapped_mint_backpointer_address}; use { mollusk_svm::{result::Check, Mollusk}, solana_program::pubkey::Pubkey, spl_token_wrap::instruction::create_mint, }; -#[test] -fn test_account_flags() { - let program_id = Pubkey::new_unique(); - - let wrapped_mint_account = Pubkey::new_unique(); - let wrapped_backpointer_account = Pubkey::new_unique(); - let unwrapped_mint_account = Pubkey::new_unique(); - let wrapped_token_program_id = spl_token_2022::id(); - - // 1. Wrong flag on wrapped_mint_account - let account_metas = vec![ - AccountMeta::new_readonly(wrapped_mint_account, false), - AccountMeta::new(wrapped_backpointer_account, false), - AccountMeta::new_readonly(unwrapped_mint_account, false), - AccountMeta::new_readonly(system_program::id(), false), - AccountMeta::new_readonly(wrapped_token_program_id, false), - ]; - let data = TokenWrapInstruction::CreateMint { idempotent: false }.pack(); - let instruction = Instruction::new_with_bytes(program_id, &data, account_metas); - - let mut mollusk = Mollusk::new(&program_id, "spl_token_wrap"); - mollusk_svm_programs_token::token2022::add_program(&mut mollusk); - - let accounts = &[ - (wrapped_mint_account, Account::default()), - (wrapped_backpointer_account, Account::default()), - (unwrapped_mint_account, Account::default()), - (system_program::id(), Account::default()), - mollusk_svm_programs_token::token2022::keyed_account(), - ]; - mollusk.process_and_validate_instruction( - &instruction, - accounts, - &[Check::err(ProgramError::InvalidArgument)], - ); - - // 2. Wrong flag on wrapped_backpointer_account - let account_metas = vec![ - AccountMeta::new(wrapped_mint_account, false), - AccountMeta::new_readonly(wrapped_backpointer_account, false), - AccountMeta::new_readonly(unwrapped_mint_account, false), - AccountMeta::new_readonly(system_program::id(), false), - AccountMeta::new_readonly(wrapped_token_program_id, false), - ]; - let data = TokenWrapInstruction::CreateMint { idempotent: false }.pack(); - let instruction = Instruction::new_with_bytes(program_id, &data, account_metas); - mollusk.process_and_validate_instruction( - &instruction, - accounts, - &[Check::err(ProgramError::InvalidArgument)], - ); - - // 3. Wrong flag on unwrapped_mint_account - let account_metas = vec![ - AccountMeta::new(wrapped_mint_account, false), - AccountMeta::new(wrapped_backpointer_account, false), - AccountMeta::new(unwrapped_mint_account, false), - AccountMeta::new_readonly(system_program::id(), false), - AccountMeta::new_readonly(wrapped_token_program_id, false), - ]; - let data = TokenWrapInstruction::CreateMint { idempotent: false }.pack(); - let instruction = Instruction::new_with_bytes(program_id, &data, account_metas); - mollusk.process_and_validate_instruction( - &instruction, - accounts, - &[Check::err(ProgramError::InvalidArgument)], - ); +fn setup_spl_mint(rent: &Rent) -> Account { + let state = spl_token::state::Mint { + decimals: 12, + is_initialized: true, + supply: 500_000_000, + ..Default::default() + }; + let mut data = vec![0u8; spl_token::state::Mint::LEN]; + state.pack_into_slice(&mut data); - // 4. Wrong flag on system_program - let account_metas = vec![ - AccountMeta::new(wrapped_mint_account, false), - AccountMeta::new(wrapped_backpointer_account, false), - AccountMeta::new_readonly(unwrapped_mint_account, false), - AccountMeta::new(system_program::id(), false), - AccountMeta::new_readonly(wrapped_token_program_id, false), - ]; - let data = TokenWrapInstruction::CreateMint { idempotent: false }.pack(); - let instruction = Instruction::new_with_bytes(program_id, &data, account_metas); - mollusk.process_and_validate_instruction( - &instruction, - accounts, - &[Check::err(ProgramError::InvalidArgument)], - ); + let lamports = rent.minimum_balance(data.len()); - // 5. Wrong flag on wrapped_token_program_id - let account_metas = vec![ - AccountMeta::new(wrapped_mint_account, false), - AccountMeta::new(wrapped_backpointer_account, false), - AccountMeta::new(unwrapped_mint_account, false), - AccountMeta::new_readonly(system_program::id(), false), - AccountMeta::new_readonly(wrapped_token_program_id, false), - ]; - let data = TokenWrapInstruction::CreateMint { idempotent: false }.pack(); - let instruction = Instruction::new_with_bytes(program_id, &data, account_metas); - mollusk.process_and_validate_instruction( - &instruction, - accounts, - &[Check::err(ProgramError::InvalidArgument)], - ); + Account { + lamports, + data, + owner: spl_token::id(), + ..Default::default() + } } #[test] fn test_idempotency_false_with_existing_account() { - let program_id = Pubkey::new_unique(); + let program_id = spl_token_wrap::id(); + let mut mollusk = Mollusk::new(&program_id, "spl_token_wrap"); + mollusk_svm_programs_token::token2022::add_program(&mut mollusk); let wrapped_mint_account = Pubkey::new_unique(); let wrapped_backpointer_account = Pubkey::new_unique(); let unwrapped_mint_account = Pubkey::new_unique(); let wrapped_token_program_id = spl_token_2022::id(); - let mut mollusk = Mollusk::new(&program_id, "spl_token_wrap"); - mollusk_svm_programs_token::token2022::add_program(&mut mollusk); - let instruction = create_mint( &program_id, &wrapped_mint_account, @@ -171,16 +88,15 @@ fn test_idempotency_false_with_existing_account() { #[test] fn test_idempotency_true_with_existing_account() { - let program_id = Pubkey::new_unique(); + let program_id = spl_token_wrap::id(); + let mut mollusk = Mollusk::new(&program_id, "spl_token_wrap"); + mollusk_svm_programs_token::token2022::add_program(&mut mollusk); let wrapped_mint_account = Pubkey::new_unique(); let wrapped_backpointer_account = Pubkey::new_unique(); let unwrapped_mint_account = Pubkey::new_unique(); let wrapped_token_program_id = spl_token_2022::id(); - let mut mollusk = Mollusk::new(&program_id, "spl_token_wrap"); - mollusk_svm_programs_token::token2022::add_program(&mut mollusk); - let instruction = create_mint( &program_id, &wrapped_mint_account, @@ -218,16 +134,15 @@ fn test_idempotency_true_with_existing_account() { #[test] fn test_create_mint_insufficient_funds() { - let program_id = Pubkey::new_unique(); + let program_id = spl_token_wrap::id(); + let mut mollusk = Mollusk::new(&program_id, "spl_token_wrap"); + mollusk_svm_programs_token::token2022::add_program(&mut mollusk); let wrapped_mint_account = Pubkey::new_unique(); let wrapped_backpointer_account = Pubkey::new_unique(); let unwrapped_mint_account = Pubkey::new_unique(); let wrapped_token_program_id = spl_token_2022::id(); - let mut mollusk = Mollusk::new(&program_id, "spl_token_wrap"); - mollusk_svm_programs_token::token2022::add_program(&mut mollusk); - let instruction = create_mint( &program_id, &wrapped_mint_account, @@ -265,21 +180,21 @@ fn test_create_mint_insufficient_funds() { #[test] fn test_create_mint_backpointer_insufficient_funds() { - let program_id = Pubkey::new_unique(); - - let wrapped_mint_account = Pubkey::new_unique(); - let wrapped_backpointer_account = Pubkey::new_unique(); - let unwrapped_mint_account = Pubkey::new_unique(); - let wrapped_token_program_id = spl_token_2022::id(); - + let program_id = spl_token_wrap::id(); let mut mollusk = Mollusk::new(&program_id, "spl_token_wrap"); mollusk_svm_programs_token::token2022::add_program(&mut mollusk); + let unwrapped_mint_address = Pubkey::new_unique(); + let wrapped_token_program_id = spl_token_2022::id(); + let wrapped_mint_address = + get_wrapped_mint_address(&unwrapped_mint_address, &wrapped_token_program_id); + let wrapped_backpointer_address = get_wrapped_mint_backpointer_address(&wrapped_mint_address); + let instruction = create_mint( &program_id, - &wrapped_mint_account, - &wrapped_backpointer_account, - &unwrapped_mint_account, + &wrapped_mint_address, + &wrapped_backpointer_address, + &unwrapped_mint_address, &wrapped_token_program_id, false, ); @@ -296,16 +211,30 @@ fn test_create_mint_backpointer_insufficient_funds() { ..Account::default() }; + let rent = &mollusk.sysvars.rent; let accounts = &[ - (wrapped_mint_account, Account::default()), ( - wrapped_backpointer_account, + wrapped_mint_address, + Account { + lamports: 100_000_000, + ..Default::default() + }, + ), + ( + wrapped_backpointer_address, wrapped_backpointer_account_insufficent_funds, ), - (unwrapped_mint_account, Account::default()), - (system_program::id(), Account::default()), + (unwrapped_mint_address, setup_spl_mint(rent)), + ( + system_program::id(), + Account { + executable: true, + ..Default::default() + }, + ), mollusk_svm_programs_token::token2022::keyed_account(), ]; + mollusk.process_and_validate_instruction( &instruction, accounts, @@ -313,43 +242,60 @@ fn test_create_mint_backpointer_insufficient_funds() { ); } -// TODO: In progress. Should assert after success: -// - wrapped_mint_account is initialized, owner is ? -// - wrapped_backpointer_account, owner is token wrap program -// - unwrapped_mint_account is unchanged #[test] fn test_success() { - let program_id = Pubkey::new_unique(); - - let wrapped_mint_account = Pubkey::new_unique(); // TODO: Don't use a random one, create a real mint - let wrapped_backpointer_account = Pubkey::new_unique(); // TODO: Don't use a random one, create a real mint - let unwrapped_mint_account = Pubkey::new_unique(); - let wrapped_token_program_id = spl_token_2022::id(); - + let program_id = spl_token_wrap::id(); let mut mollusk = Mollusk::new(&program_id, "spl_token_wrap"); mollusk_svm_programs_token::token2022::add_program(&mut mollusk); + let unwrapped_mint_address = Pubkey::new_unique(); + let wrapped_token_program_id = spl_token_2022::id(); + let wrapped_mint_address = + get_wrapped_mint_address(&unwrapped_mint_address, &wrapped_token_program_id); + let wrapped_backpointer_address = get_wrapped_mint_backpointer_address(&wrapped_mint_address); + let instruction = create_mint( &program_id, - &wrapped_mint_account, - &wrapped_backpointer_account, - &unwrapped_mint_account, + &wrapped_mint_address, + &wrapped_backpointer_address, + &unwrapped_mint_address, &wrapped_token_program_id, false, ); + let rent = &mollusk.sysvars.rent; let accounts = &[ ( - wrapped_mint_account, + wrapped_mint_address, Account { - lamports: 100_000_000, // Pre-funded - ..Account::default() + lamports: 100_000_000, + ..Default::default() + }, + ), + ( + wrapped_backpointer_address, + Account { + lamports: 100_000_000, + ..Default::default() + }, + ), + (unwrapped_mint_address, setup_spl_mint(rent)), + ( + system_program::id(), + Account { + executable: true, + ..Default::default() }, ), - (wrapped_backpointer_account, Account::default()), - (unwrapped_mint_account, Account::default()), - (system_program::id(), Account::default()), mollusk_svm_programs_token::token2022::keyed_account(), ]; mollusk.process_and_validate_instruction(&instruction, accounts, &[Check::success()]); + + // TODO: In progress. Should assert after success: + // - wrapped_mint_account is initialized, owner is ? + // - wrapped_backpointer_account, owner is token wrap program + // - unwrapped_mint_account is unchanged } + +// TODO: Test cases +// - spl-token -> token2022 and the reverse From 4615262994a8f6008841062c72a653eb82330f64 Mon Sep 17 00:00:00 2001 From: Gabe Rodriguez Date: Fri, 31 Jan 2025 18:08:11 +0100 Subject: [PATCH 06/14] Working tests --- program/src/instruction.rs | 44 ++++---- program/src/processor.rs | 2 +- program/tests/test_create_mint.rs | 163 +++++++++++++++++++++++++++--- 3 files changed, 174 insertions(+), 35 deletions(-) diff --git a/program/src/instruction.rs b/program/src/instruction.rs index d4ab2fd..8bc4610 100644 --- a/program/src/instruction.rs +++ b/program/src/instruction.rs @@ -164,62 +164,62 @@ pub fn create_mint( Instruction::new_with_bytes(*program_id, &data, accounts) } -/// Creates `Wrap` instruction. +/// Creates `UnWrap` instruction. #[allow(clippy::too_many_arguments)] -pub fn wrap( +pub fn unwrap( program_id: &Pubkey, - unwrapped_token_account_address: &Pubkey, + wrapped_token_account_address: &Pubkey, + wrapped_mint_address: &Pubkey, wrapped_escrow_address: &Pubkey, + recipient_unwrapped_token_account_address: &Pubkey, unwrapped_mint_address: &Pubkey, - wrapped_mint_address: &Pubkey, - recipient_wrapped_token_account_address: &Pubkey, wrapped_mint_authority_address: &Pubkey, - unwrapped_token_program_id: &Pubkey, wrapped_token_program_id: &Pubkey, + unwrapped_token_program_id: &Pubkey, transfer_authority_address: &Pubkey, amount: u64, ) -> Instruction { let accounts = vec![ - AccountMeta::new(*unwrapped_token_account_address, false), + AccountMeta::new(*wrapped_token_account_address, false), + AccountMeta::new(*wrapped_mint_address, false), AccountMeta::new(*wrapped_escrow_address, false), + AccountMeta::new(*recipient_unwrapped_token_account_address, false), AccountMeta::new_readonly(*unwrapped_mint_address, false), - AccountMeta::new(*wrapped_mint_address, false), - AccountMeta::new(*recipient_wrapped_token_account_address, false), AccountMeta::new_readonly(*wrapped_mint_authority_address, false), - AccountMeta::new_readonly(*unwrapped_token_program_id, false), AccountMeta::new_readonly(*wrapped_token_program_id, false), + AccountMeta::new_readonly(*unwrapped_token_program_id, false), AccountMeta::new_readonly(*transfer_authority_address, true), ]; - let data = TokenWrapInstruction::Wrap { amount }.pack(); + let data = TokenWrapInstruction::UnWrap { amount }.pack(); Instruction::new_with_bytes(*program_id, &data, accounts) } -/// Creates `UnWrap` instruction. +/// Creates `Wrap` instruction. #[allow(clippy::too_many_arguments)] -pub fn unwrap( +pub fn wrap( program_id: &Pubkey, - wrapped_token_account_address: &Pubkey, - wrapped_mint_address: &Pubkey, + unwrapped_token_account_address: &Pubkey, wrapped_escrow_address: &Pubkey, - recipient_unwrapped_token_account_address: &Pubkey, unwrapped_mint_address: &Pubkey, + wrapped_mint_address: &Pubkey, + recipient_wrapped_token_account_address: &Pubkey, wrapped_mint_authority_address: &Pubkey, - wrapped_token_program_id: &Pubkey, unwrapped_token_program_id: &Pubkey, + wrapped_token_program_id: &Pubkey, transfer_authority_address: &Pubkey, amount: u64, ) -> Instruction { let accounts = vec![ - AccountMeta::new(*wrapped_token_account_address, false), - AccountMeta::new(*wrapped_mint_address, false), + AccountMeta::new(*unwrapped_token_account_address, false), AccountMeta::new(*wrapped_escrow_address, false), - AccountMeta::new(*recipient_unwrapped_token_account_address, false), AccountMeta::new_readonly(*unwrapped_mint_address, false), + AccountMeta::new(*wrapped_mint_address, false), + AccountMeta::new(*recipient_wrapped_token_account_address, false), AccountMeta::new_readonly(*wrapped_mint_authority_address, false), - AccountMeta::new_readonly(*wrapped_token_program_id, false), AccountMeta::new_readonly(*unwrapped_token_program_id, false), + AccountMeta::new_readonly(*wrapped_token_program_id, false), AccountMeta::new_readonly(*transfer_authority_address, true), ]; - let data = TokenWrapInstruction::UnWrap { amount }.pack(); + let data = TokenWrapInstruction::Wrap { amount }.pack(); Instruction::new_with_bytes(*program_id, &data, accounts) } diff --git a/program/src/processor.rs b/program/src/processor.rs index 37f5070..5202c9c 100644 --- a/program/src/processor.rs +++ b/program/src/processor.rs @@ -30,7 +30,7 @@ pub fn process_create_mint( let wrapped_mint_account = next_account_info(account_info_iter)?; let wrapped_backpointer_account = next_account_info(account_info_iter)?; let unwrapped_mint_account = next_account_info(account_info_iter)?; - let system_program_account = next_account_info(account_info_iter)?; // TODO: This is not used 🤔 + let _system_program_account = next_account_info(account_info_iter)?; // TODO: This is not used 🤔 let wrapped_token_program_account = next_account_info(account_info_iter)?; // Idempotency checks diff --git a/program/tests/test_create_mint.rs b/program/tests/test_create_mint.rs index 2fbf8db..afdcc2f 100644 --- a/program/tests/test_create_mint.rs +++ b/program/tests/test_create_mint.rs @@ -5,18 +5,23 @@ use solana_program::system_program; use solana_sdk::account::Account; use spl_token_2022::state::Mint; use spl_token_wrap::state::Backpointer; -use spl_token_wrap::{get_wrapped_mint_address, get_wrapped_mint_backpointer_address}; +use spl_token_wrap::{ + get_wrapped_mint_address, get_wrapped_mint_authority, get_wrapped_mint_backpointer_address, +}; use { mollusk_svm::{result::Check, Mollusk}, solana_program::pubkey::Pubkey, spl_token_wrap::instruction::create_mint, }; +const MINT_DECIMALS: u8 = 12; +const MINT_SUPPLY: u64 = 500_000_000; + fn setup_spl_mint(rent: &Rent) -> Account { let state = spl_token::state::Mint { - decimals: 12, + decimals: MINT_DECIMALS, is_initialized: true, - supply: 500_000_000, + supply: MINT_SUPPLY, ..Default::default() }; let mut data = vec![0u8; spl_token::state::Mint::LEN]; @@ -32,6 +37,26 @@ fn setup_spl_mint(rent: &Rent) -> Account { } } +fn setup_token_2022_mint(rent: &Rent) -> Account { + let state = spl_token_2022::state::Mint { + decimals: MINT_DECIMALS, + is_initialized: true, + supply: MINT_SUPPLY, + ..Default::default() + }; + let mut data = vec![0u8; spl_token_2022::state::Mint::LEN]; + state.pack_into_slice(&mut data); + + let lamports = rent.minimum_balance(data.len()); + + Account { + lamports, + data, + owner: spl_token_2022::id(), + ..Default::default() + } +} + #[test] fn test_idempotency_false_with_existing_account() { let program_id = spl_token_wrap::id(); @@ -243,7 +268,7 @@ fn test_create_mint_backpointer_insufficient_funds() { } #[test] -fn test_success() { +fn test_successful_spl_token_to_token_2022() { let program_id = spl_token_wrap::id(); let mut mollusk = Mollusk::new(&program_id, "spl_token_wrap"); mollusk_svm_programs_token::token2022::add_program(&mut mollusk); @@ -264,6 +289,8 @@ fn test_success() { ); let rent = &mollusk.sysvars.rent; + let unwrapped_mint_account = setup_spl_mint(rent); + let accounts = &[ ( wrapped_mint_address, @@ -279,7 +306,7 @@ fn test_success() { ..Default::default() }, ), - (unwrapped_mint_address, setup_spl_mint(rent)), + (unwrapped_mint_address, unwrapped_mint_account.clone()), ( system_program::id(), Account { @@ -289,13 +316,125 @@ fn test_success() { ), mollusk_svm_programs_token::token2022::keyed_account(), ]; - mollusk.process_and_validate_instruction(&instruction, accounts, &[Check::success()]); + let result = mollusk.process_and_validate_instruction( + &instruction, + accounts, + &[ + Check::success(), + // Ensure unwrapped_mint_account remains unchanged + Check::account(&unwrapped_mint_address) + .data(&unwrapped_mint_account.data) + .build(), + ], + ); + + // Assert state of resulting wrapped mint account + + let resulting_wrapped_mint_account = &result.resulting_accounts[0].1; + assert_eq!(resulting_wrapped_mint_account.owner, spl_token_2022::id()); + + let wrapped_mint_data = Mint::unpack(&resulting_wrapped_mint_account.data).unwrap(); + assert_eq!(wrapped_mint_data.decimals, MINT_DECIMALS); + let expected_mint_authority = get_wrapped_mint_authority(&wrapped_mint_address); + assert_eq!( + wrapped_mint_data.mint_authority.unwrap(), + expected_mint_authority, + ); + assert_eq!(wrapped_mint_data.supply, 0); + assert!(wrapped_mint_data.is_initialized); + assert!(wrapped_mint_data.freeze_authority.is_none()); - // TODO: In progress. Should assert after success: - // - wrapped_mint_account is initialized, owner is ? - // - wrapped_backpointer_account, owner is token wrap program - // - unwrapped_mint_account is unchanged + // Assert state of resulting backpointer account + + let resulting_backpointer_account = &result.resulting_accounts[1].1; + assert_eq!(resulting_backpointer_account.owner, program_id); + + let backpointer = bytemuck::from_bytes::(&resulting_backpointer_account.data[..]); + assert_eq!(backpointer.unwrapped_mint, unwrapped_mint_address); } -// TODO: Test cases -// - spl-token -> token2022 and the reverse +#[test] +fn test_successful_token_2022_to_spl_token() { + let program_id = spl_token_wrap::id(); + let mut mollusk = Mollusk::new(&program_id, "spl_token_wrap"); + mollusk_svm_programs_token::token::add_program(&mut mollusk); + + let unwrapped_mint_address = Pubkey::new_unique(); + let wrapped_token_program_id = spl_token::id(); + let wrapped_mint_address = + get_wrapped_mint_address(&unwrapped_mint_address, &wrapped_token_program_id); + let wrapped_backpointer_address = get_wrapped_mint_backpointer_address(&wrapped_mint_address); + + let instruction = create_mint( + &program_id, + &wrapped_mint_address, + &wrapped_backpointer_address, + &unwrapped_mint_address, + &wrapped_token_program_id, + false, + ); + + let rent = &mollusk.sysvars.rent; + let unwrapped_mint_account = setup_token_2022_mint(rent); + + let accounts = &[ + ( + wrapped_mint_address, + Account { + lamports: 100_000_000, + ..Default::default() + }, + ), + ( + wrapped_backpointer_address, + Account { + lamports: 100_000_000, + ..Default::default() + }, + ), + (unwrapped_mint_address, unwrapped_mint_account.clone()), + ( + system_program::id(), + Account { + executable: true, + ..Default::default() + }, + ), + mollusk_svm_programs_token::token::keyed_account(), + ]; + let result = mollusk.process_and_validate_instruction( + &instruction, + accounts, + &[ + Check::success(), + // Ensure unwrapped_mint_account remains unchanged + Check::account(&unwrapped_mint_address) + .data(&unwrapped_mint_account.data) + .build(), + ], + ); + + // Assert state of resulting wrapped mint account + + let resulting_wrapped_mint_account = &result.resulting_accounts[0].1; + assert_eq!(resulting_wrapped_mint_account.owner, spl_token::id()); + + let wrapped_mint_data = Mint::unpack(&resulting_wrapped_mint_account.data).unwrap(); + assert_eq!(wrapped_mint_data.decimals, MINT_DECIMALS); + let expected_mint_authority = get_wrapped_mint_authority(&wrapped_mint_address); + assert_eq!( + wrapped_mint_data.mint_authority.unwrap(), + expected_mint_authority, + ); + assert_eq!(wrapped_mint_data.supply, 0); + assert!(wrapped_mint_data.is_initialized); + assert!(wrapped_mint_data.freeze_authority.is_none()); + + // Assert state of resulting backpointer account + + let resulting_backpointer_account = &result.resulting_accounts[1].1; + assert_eq!(resulting_backpointer_account.owner, program_id); + + let backpointer = bytemuck::from_bytes::(&resulting_backpointer_account.data[..]); + assert_eq!(backpointer.unwrapped_mint, unwrapped_mint_address); +} From ea17e90e8e2f27da2ba6c3cd96ba436c68e59081 Mon Sep 17 00:00:00 2001 From: Gabe Rodriguez Date: Fri, 31 Jan 2025 18:26:23 +0100 Subject: [PATCH 07/14] spell check fixes --- program/src/instruction.rs | 8 ++++---- program/src/processor.rs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/program/src/instruction.rs b/program/src/instruction.rs index 8bc4610..035ac7b 100644 --- a/program/src/instruction.rs +++ b/program/src/instruction.rs @@ -11,8 +11,8 @@ use std::convert::TryInto; pub enum TokenWrapInstruction { /// Create a wrapped token mint. Assumes caller has pre-funded wrapped mint /// and backpointer account. Supports both directions: - /// - spl-token -> token-2022 - /// - token-2022 -> spl-token + /// - spl-token to token-2022 + /// - token-2022 to spl-token /// /// Accounts expected by this instruction: /// @@ -85,7 +85,7 @@ pub enum TokenWrapInstruction { } impl TokenWrapInstruction { - /// Packs a [TokenWrapInstruction](enum.TokenWrapInstruction.html) into a byte array. + /// Packs a [`TokenWrapInstruction`](enum.TokenWrapInstruction.html) into a byte array. pub fn pack(&self) -> Vec { let mut buf = Vec::new(); match self { @@ -106,7 +106,7 @@ impl TokenWrapInstruction { buf } - /// Unpacks a byte array into a [TokenWrapInstruction](enum.TokenWrapInstruction.html). + /// Unpacks a byte array into a [`TokenWrapInstruction`](enum.TokenWrapInstruction.html). pub fn unpack(input: &[u8]) -> Result { let (&tag, rest) = input .split_first() diff --git a/program/src/processor.rs b/program/src/processor.rs index 5202c9c..988e759 100644 --- a/program/src/processor.rs +++ b/program/src/processor.rs @@ -19,7 +19,7 @@ use { solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey}, }; -/// Processes [CreateMint](enum.TokenWrapInstruction.html) instruction. +/// Processes [`CreateMint`](enum.TokenWrapInstruction.html) instruction. pub fn process_create_mint( program_id: &Pubkey, accounts: &[AccountInfo], @@ -30,7 +30,7 @@ pub fn process_create_mint( let wrapped_mint_account = next_account_info(account_info_iter)?; let wrapped_backpointer_account = next_account_info(account_info_iter)?; let unwrapped_mint_account = next_account_info(account_info_iter)?; - let _system_program_account = next_account_info(account_info_iter)?; // TODO: This is not used 🤔 + let _system_program_account = next_account_info(account_info_iter)?; let wrapped_token_program_account = next_account_info(account_info_iter)?; // Idempotency checks From d396a086fa9311e49969359f7dc7702816fd8d99 Mon Sep 17 00:00:00 2001 From: Gabe Rodriguez Date: Mon, 3 Feb 2025 11:48:35 +0100 Subject: [PATCH 08/14] Update freeze authority handling --- program/src/processor.rs | 5 +++-- program/tests/test_create_mint.rs | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/program/src/processor.rs b/program/src/processor.rs index 988e759..da6dced 100644 --- a/program/src/processor.rs +++ b/program/src/processor.rs @@ -81,10 +81,11 @@ pub fn process_create_mint( &[&signer_seeds], )?; - // New wrapped mint matches decimals of unwrapped mint + // New wrapped mint matches decimals & freeze authority of unwrapped mint let unwrapped_mint_data = unwrapped_mint_account.try_borrow_data()?; let unpacked_unwrapped_mint = spl_token_2022::state::Mint::unpack(&unwrapped_mint_data)?; let decimals = unpacked_unwrapped_mint.decimals; + let freeze_authority = unpacked_unwrapped_mint.freeze_authority.as_ref().into(); let (wrapped_mint_authority, authority_bump_seed) = get_wrapped_mint_authority_with_seed(wrapped_mint_account.key); @@ -97,7 +98,7 @@ pub fn process_create_mint( wrapped_token_program_account.key, wrapped_mint_account.key, &wrapped_mint_authority, - None, + freeze_authority, decimals, )?, &[wrapped_mint_account.clone()], diff --git a/program/tests/test_create_mint.rs b/program/tests/test_create_mint.rs index afdcc2f..cc70e8e 100644 --- a/program/tests/test_create_mint.rs +++ b/program/tests/test_create_mint.rs @@ -3,6 +3,7 @@ use solana_program::program_pack::Pack; use solana_program::rent::Rent; use solana_program::system_program; use solana_sdk::account::Account; +use solana_sdk::program_option::COption; use spl_token_2022::state::Mint; use spl_token_wrap::state::Backpointer; use spl_token_wrap::{ @@ -16,12 +17,14 @@ use { const MINT_DECIMALS: u8 = 12; const MINT_SUPPLY: u64 = 500_000_000; +const FREEZE_AUTHORITY: &str = "11111115q4EpJaTXAZWpCg3J2zppWGSZ46KXozzo9"; fn setup_spl_mint(rent: &Rent) -> Account { let state = spl_token::state::Mint { decimals: MINT_DECIMALS, is_initialized: true, supply: MINT_SUPPLY, + freeze_authority: COption::Some(Pubkey::from_str_const(FREEZE_AUTHORITY)), ..Default::default() }; let mut data = vec![0u8; spl_token::state::Mint::LEN]; @@ -42,6 +45,7 @@ fn setup_token_2022_mint(rent: &Rent) -> Account { decimals: MINT_DECIMALS, is_initialized: true, supply: MINT_SUPPLY, + freeze_authority: COption::Some(Pubkey::from_str_const(FREEZE_AUTHORITY)), ..Default::default() }; let mut data = vec![0u8; spl_token_2022::state::Mint::LEN]; @@ -342,7 +346,10 @@ fn test_successful_spl_token_to_token_2022() { ); assert_eq!(wrapped_mint_data.supply, 0); assert!(wrapped_mint_data.is_initialized); - assert!(wrapped_mint_data.freeze_authority.is_none()); + assert_eq!( + wrapped_mint_data.freeze_authority.unwrap(), + Pubkey::from_str_const(FREEZE_AUTHORITY) + ); // Assert state of resulting backpointer account @@ -428,7 +435,10 @@ fn test_successful_token_2022_to_spl_token() { ); assert_eq!(wrapped_mint_data.supply, 0); assert!(wrapped_mint_data.is_initialized); - assert!(wrapped_mint_data.freeze_authority.is_none()); + assert_eq!( + wrapped_mint_data.freeze_authority.unwrap(), + Pubkey::from_str_const(FREEZE_AUTHORITY) + ); // Assert state of resulting backpointer account From 5d83ce8bba3404bd725537c0fd72fdc2640753fc Mon Sep 17 00:00:00 2001 From: Gabe Rodriguez Date: Mon, 3 Feb 2025 11:57:55 +0100 Subject: [PATCH 09/14] update deps (after audit) --- Cargo.lock | 340 ++++++++++++++++++++++----------------------- program/Cargo.toml | 4 +- 2 files changed, 172 insertions(+), 172 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 223d526..5696def 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -387,7 +387,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -444,9 +444,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] name = "bv" @@ -475,7 +475,7 @@ checksum = "3fa76293b4f7bb636ab88fd78228235b5248b4d05cc589aed610f954af5d7c7a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -492,9 +492,9 @@ checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "cc" -version = "1.2.10" +version = "1.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229" +checksum = "e4730490333d58093109dc02c23174c3f4d490998c3fed3cc8e82d57afedb9cf" dependencies = [ "shlex", ] @@ -519,7 +519,7 @@ checksum = "45565fc9416b9896014f5732ac776f810ee53a66730c17e4020c3ec064a8f88f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -598,9 +598,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ "libc", ] @@ -704,7 +704,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -728,7 +728,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -739,7 +739,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -787,7 +787,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -863,7 +863,7 @@ checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -1159,9 +1159,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.5" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" +checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a" [[package]] name = "httpdate" @@ -1328,7 +1328,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -1684,7 +1684,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -1746,7 +1746,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -1772,9 +1772,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.68" +version = "0.10.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" +checksum = "61cfb4e166a8bb8c9b55c500bc2308550148ece889be90f609377e58140f42c6" dependencies = [ "bitflags 2.8.0", "cfg-if", @@ -1793,14 +1793,14 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] name = "openssl-sys" -version = "0.9.104" +version = "0.9.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" +checksum = "8b22d5b84be05a8d6947c7cb71f7c849aa0f112acd4bf51c2a7c1c988ac0a9dc" dependencies = [ "cc", "libc", @@ -2166,9 +2166,9 @@ checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" [[package]] name = "ryu" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd" [[package]] name = "scopeguard" @@ -2224,14 +2224,14 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] name = "serde_json" -version = "1.0.137" +version = "1.0.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "930cfb6e6abf99298aaad7d29abbef7a9999a9a8806a40088f55f0dcec03146b" +checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" dependencies = [ "itoa", "memchr", @@ -2271,7 +2271,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -2353,9 +2353,9 @@ dependencies = [ [[package]] name = "solana-account" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2af97266ee346ef1cd1649ba462d08bd3d254e50c06c45d3e70a21871a1da6a" +checksum = "af199e43e00e46fd74c825a5a815a62c105b69fe24aeea67cce34167cb3c8246" dependencies = [ "bincode", "serde", @@ -2367,9 +2367,9 @@ dependencies = [ [[package]] name = "solana-account-info" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed2417317f26f0941dd8e552ac1f9768eb2aa3b7f16ec992a6833f058295bea" +checksum = "0108d43d0dc6cb62f2fb5c5c6dddbbd2944cd41d674e78cfd7ab25505112fa83" dependencies = [ "bincode", "serde", @@ -2380,18 +2380,18 @@ dependencies = [ [[package]] name = "solana-atomic-u64" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0cd0453d46a62ed36ce234be9153a3c4d433711f1cec6943345d1637d6a0908" +checksum = "fb870569c01e96a8bada5423e1e2499f65c83fc23e18d15290c921eaa7464562" dependencies = [ "parking_lot", ] [[package]] name = "solana-bincode" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97957d987dc85bbfa90cb7e919ee0b071206affc0209e7221d7ea4844e7be31" +checksum = "eeb4dc964902dbe248bcfc57d6c5e7e814d300e0a8fee1fb5e9e517dacda0c12" dependencies = [ "bincode", "serde", @@ -2400,9 +2400,9 @@ dependencies = [ [[package]] name = "solana-bn254" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957ce0d8b021f78f7b3c99d82b21a8dae617cf016377647c4d43a6e3141e8f2f" +checksum = "a5f3acfa2be716cce5ae92a0e6919e48ea84505a81791f1f4966d2cabd06abdf" dependencies = [ "ark-bn254", "ark-ec", @@ -2415,9 +2415,9 @@ dependencies = [ [[package]] name = "solana-borsh" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99affe31b10c1cd4a6438d307b92c1b17c89c974aebf2c2aa15cd790d0ba672b" +checksum = "9616b7f3914d8b630d8bc61bed5340c05ec2d932e7c9694615c1c37f312529c6" dependencies = [ "borsh 0.10.4", "borsh 1.5.5", @@ -2425,9 +2425,9 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b29eca845657e02a138b4ed7ea8520c59a37f8b2d6eb92059f68b8c77440272d" +checksum = "a72f4ec4df7ac88310560ec9e03358017176d38d6947f0de118925b31bfcc57c" dependencies = [ "bincode", "byteorder", @@ -2452,9 +2452,9 @@ dependencies = [ [[package]] name = "solana-clock" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97864f28abd43d03e7ca7242059e340bb6e637e0ce99fd66f6420c43fa359898" +checksum = "27b7f7803b61bc339c57d7b3beed7c93d9757dcd2fdc90bf74660670378ed307" dependencies = [ "serde", "serde_derive", @@ -2464,18 +2464,18 @@ dependencies = [ [[package]] name = "solana-compute-budget" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f92a2ba8c5ed92fc805f8a92a3bfbbaca05da80d87f180aea4e9f28b9e0fa22" +checksum = "9ec695847457a262bd5fc5a834bb00215ad39ebc4111a9db4003bc0df86ca86b" dependencies = [ "solana-sdk", ] [[package]] name = "solana-cpi" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54c3b096dc77222b9c19ffe9cf6c1c32bd1e9882ceb955d213be4315bbe3b95" +checksum = "faece18bae6d818d5121b40f10acd5a0f1f0d1ee2283e79ad00825a43a4dfaaa" dependencies = [ "solana-account-info", "solana-define-syscall", @@ -2487,9 +2487,9 @@ dependencies = [ [[package]] name = "solana-curve25519" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2ed697e82c44b0833550501e3fab428c07cc2865c788307fad4c98a64d27d0" +checksum = "ddd364b9c90c05406baa604743a266a4526fd7ac1e7a048c40971ca28200851b" dependencies = [ "bytemuck", "bytemuck_derive", @@ -2500,24 +2500,24 @@ dependencies = [ [[package]] name = "solana-decode-error" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c92852914fe0cfec234576a30b1de4b11516dd729226d5de04e4c67d80447a7" +checksum = "e97eddcef283b84b0bc040550796de561dd52d5b2599d3791d2d8d20121dc6dc" dependencies = [ "num-traits", ] [[package]] name = "solana-define-syscall" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44015e77f6f321bf526f7d026b08d8f34b57b1ea6e46038fd13e59f43a53a475" +checksum = "366739af4e4606111a1c62ab1c91376d7d42864f79b9b863b5544fc56e140c27" [[package]] name = "solana-derivation-path" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2cd4b95383d8926cc22d4a33417aa2e38897475f259cff4eb319c8cf0f7ac02" +checksum = "549c98194387fac54f13558c701653bca55a14f2fbfa007ecc4fae601832cbc5" dependencies = [ "derivation-path", "qstring", @@ -2526,9 +2526,9 @@ dependencies = [ [[package]] name = "solana-epoch-schedule" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3409f250234ec4bbd999de3eac727ca21dfbfd39a831906f6ec112a66d2e1a2" +checksum = "fd5c9e8f4a155d29cb8e6aa2e4856e1200c6d1b41d63c189823a074a55e31aff" dependencies = [ "serde", "serde_derive", @@ -2538,9 +2538,9 @@ dependencies = [ [[package]] name = "solana-feature-set" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ddda14ac5f2da82da4df043eabca2f2c00ac0d59f10295b8c8c3404fcc5f67" +checksum = "6b782063b475df133508569bc7b4bb490b067a45da35c7aa2eea0f758c159c79" dependencies = [ "lazy_static", "solana-clock", @@ -2552,9 +2552,9 @@ dependencies = [ [[package]] name = "solana-fee-calculator" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8db8c4be5e012215ed1e3394cd3c188e217dd4f0c821045e5d2c1262aac8b4e" +checksum = "8959bafc64a69bc622b8ac8079f665aefcad14b234629ee742f34deef2d3167f" dependencies = [ "log", "serde", @@ -2563,9 +2563,9 @@ dependencies = [ [[package]] name = "solana-hash" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c25925816be2f57992c4c5af7dff31713bc95696c2fbc4bca911e290ba2f330" +checksum = "9d7983e14fd607a13fa6ef89ab2ddad91fd3e65fd24b2b37c142ddc94ac8cb27" dependencies = [ "borsh 1.5.5", "bs58", @@ -2581,9 +2581,9 @@ dependencies = [ [[package]] name = "solana-inflation" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91a53086a0f0cc093ffce9e5be4399785f05a0d49f0ff2cd6d5f3f4d593e2e9" +checksum = "c4250c724fafb1b30c39eb5af6f45ce918611d148712e3aa9b55470cc15069d7" dependencies = [ "serde", "serde_derive", @@ -2591,9 +2591,9 @@ dependencies = [ [[package]] name = "solana-instruction" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab8c46b6f76857222ee1adeb7031b8eb0eb5134920614e9fd1bd710052b96a9" +checksum = "34de1bf4e8abcc182bf90888b84b9656eee5fef7a252a44a20fed7c778abfbda" dependencies = [ "bincode", "borsh 1.5.5", @@ -2609,9 +2609,9 @@ dependencies = [ [[package]] name = "solana-last-restart-slot" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633f272467f3e1a28dfcfb1a7df55129752524a18938a84fd67086e205f0bd88" +checksum = "21db3a4a50b400bb03d32971bb9fefafb421e4210f86081d3c3217d8d98c1a77" dependencies = [ "serde", "serde_derive", @@ -2621,18 +2621,18 @@ dependencies = [ [[package]] name = "solana-log-collector" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034627f9849eeafcbfa24f0e4ad0da50eb68422ceab5c605b7d87755af77b201" +checksum = "b0af672ade9beba20d59eb0b6e3a9a1800b8c772138bcadb96bf6894bc552821" dependencies = [ "log", ] [[package]] name = "solana-logger" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef1468f78c6f891ac2e3ce6e81bd0c47cff18598fb87618ab2e3d39da4bb69f" +checksum = "d0e607485a4b8b66f7d3592e4a79355073cb7e6a101c244e5fa0aa52bfdce506" dependencies = [ "env_logger", "lazy_static", @@ -2641,15 +2641,15 @@ dependencies = [ [[package]] name = "solana-measure" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24fa953c2b49a131492b5927e714ab60b7b927610c7ed3355b9ad28909622b5e" +checksum = "6f3f0a8b37208c237452f2612049f338711c8d28242cb989c4d755452d84a6e0" [[package]] name = "solana-metrics" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce8eeecdde1cfed801d0d8683856e0e0cc731119894a7ae77a966915cf84964" +checksum = "d2f52947d3edea1d8924dd9f8b9898fb9c828887198871b5ba9af0e0597757bc" dependencies = [ "crossbeam-channel", "gethostname", @@ -2662,24 +2662,24 @@ dependencies = [ [[package]] name = "solana-msg" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80dde3316c6ee6e8d57bf105139ec93f8c32a42fe3ec42a3cda2ca9efb72c0e6" +checksum = "b772497c73933dc8f0123f1fc1c8ccae1e6edee194606e7fd5cb0a2f074f0cc6" dependencies = [ "solana-define-syscall", ] [[package]] name = "solana-native-token" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e0721f46122a2f1837f571d5a6c1478c962ebefd6d65d02694b3a267b58dbf2" +checksum = "880eea211f489f04d9aa8d436ea3dd172b1188dee97bdd7ec64acb05bef29a32" [[package]] name = "solana-packet" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39fcc5cf0ef0ac6a62dd09fae772672c2d6865ee1d1ba5fbfbcc94b2c37b2be8" +checksum = "bf06ea5042a29391f26bfbeeb30cd4709de4f47642f8a0ec2e15c5faa099cf44" dependencies = [ "bincode", "bitflags 2.8.0", @@ -2691,9 +2691,9 @@ dependencies = [ [[package]] name = "solana-poseidon" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "133321939f27f2e0eaeb556530757466b9e90b7acea06a216ace10f7e95ca0d9" +checksum = "9cb8f71202f04231fbc0869c94da00e7198abc9117100c62e4efb3cdf533f39d" dependencies = [ "ark-bn254", "light-poseidon", @@ -2703,9 +2703,9 @@ dependencies = [ [[package]] name = "solana-precompile-error" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54310052930124b78392b03d802aa465afe6fded96d97f2e6ca6b1dead85d8d9" +checksum = "307485e198c542e975a916c354764c2ced285b6df520793a2f10beb39d0d7f1c" dependencies = [ "num-traits", "solana-decode-error", @@ -2713,9 +2713,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12511916a9658664921ca12dd6214910de655ac9955159c1e9871bd516936cac" +checksum = "0a2334209564c9fa7673b01a5a5dac16c0a474bea95e218135ef1430c20ecba5" dependencies = [ "base64 0.22.1", "bincode", @@ -2786,9 +2786,9 @@ dependencies = [ [[package]] name = "solana-program-entrypoint" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3422fa98d2ac5b20df9c9feb9f638e1170341b3c4259c26cd91a6a7098f6830" +checksum = "39fdb97781dc0f4093f0a5ebe0b5c353da217d8c8a13fb7ded3c62a4774f7d13" dependencies = [ "solana-account-info", "solana-msg", @@ -2798,9 +2798,9 @@ dependencies = [ [[package]] name = "solana-program-error" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a2ea6d8e88767586e6d547e5afb00cda08cee79c986443b2d47236aac50a755" +checksum = "6a18ee0aac9905389f424598fd3656c981ed09268c04e160d08a468b25ecc7b1" dependencies = [ "borsh 1.5.5", "num-traits", @@ -2814,9 +2814,9 @@ dependencies = [ [[package]] name = "solana-program-memory" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "716e1c9cbd3c5e9d9147ffb7e74815cfb34ff7a3196127da64aa8d1866beab52" +checksum = "d4473c6315820301c873c3df0a110a4ded9874579be27362a1a7cc4b8c904d37" dependencies = [ "num-traits", "solana-define-syscall", @@ -2824,24 +2824,24 @@ dependencies = [ [[package]] name = "solana-program-option" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c8ffad2c86e5de375ae5f0a46f64eb5897a63c514e958e908c1a98059c57d4" +checksum = "c68158410c335eeb28e95520ab3628c6d887ea6acb07f20dfce55780e127cf87" [[package]] name = "solana-program-pack" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c185f9170ac85a93d5caaaaf5fe7bf0d49febdb329506bd7ea13716e4eb0189" +checksum = "31d03d7ad1c427cf50af1c51f82abe330c5dec09a0a4bace05fb303788fe58d8" dependencies = [ "solana-program-error", ] [[package]] name = "solana-program-runtime" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5cf60b4b2d8d70b082d03973b8e646ca1c65351eb12ab33427c2df40cd178cf" +checksum = "18c14d71bc78f0b09c3dd3f4cb06e1dab74354b2a96c79e86441e04cfeabebd7" dependencies = [ "base64 0.22.1", "bincode", @@ -2869,9 +2869,9 @@ dependencies = [ [[package]] name = "solana-pubkey" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb80787769457f022a39a55cf439d1996aeecc2364c99483c97318d80f15436" +checksum = "d87a0e1282ea13d3fab42d1c5df8f00283f8f739b2e5a9a5b530f76c4292e2b5" dependencies = [ "borsh 0.10.4", "borsh 1.5.5", @@ -2896,9 +2896,9 @@ dependencies = [ [[package]] name = "solana-rent" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b4cd58602eb0c2250cd83a8cc8287ca6271b99af95d2a33250e6592c04e286" +checksum = "d0ae7a8fb4d869c6134d9ebdde2bb68e4cfd6034fe947932ade7721e236b66bb" dependencies = [ "serde", "serde_derive", @@ -2908,15 +2908,15 @@ dependencies = [ [[package]] name = "solana-sanitize" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74c557ff8937946d24c4f188f3029c1fdba4e23a15ed11cc8b31a72017e911d5" +checksum = "f83981cbb16d532c96a7911e810bf3302fd14fd2651096130c3d3cc4e2b3410e" [[package]] name = "solana-sdk" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d755acdf62b367c1c4ca7ac1069c34a090d281b6425d11dd9410d4a147d99d3" +checksum = "54e2e78e01f045ae38199cacd980773e711ac8c8a3af6d9d21424184aa4dae1a" dependencies = [ "bincode", "bitflags 2.8.0", @@ -2978,21 +2978,21 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9055600bc70a91936458b3a43a4173f8b8cd4ee64a0dc83cbb00737cadc519a5" +checksum = "6822c0596b48342e7e6acebce6b0a4aa6bb57c9bef03ebf11405b5f5c7124627" dependencies = [ "bs58", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] name = "solana-secp256k1-recover" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b904576bfc5b72172aed9c133fe54840625ab9d510bd429d453c54bd6e4245c3" +checksum = "a4e19dfea19083c99baecbf09dc96f0c6abf56e39a610cb1c817935e54e03eaf" dependencies = [ "borsh 1.5.5", "libsecp256k1", @@ -3002,9 +3002,9 @@ dependencies = [ [[package]] name = "solana-secp256r1-program" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c1329b7faa66f80bb3dadcece042589d22881120b6c0d0f712f742ad002f26" +checksum = "12a60175bd0890161815bf5a1b8bec6f1db2fe5c4cd2b6d0a8eea3db6b362930" dependencies = [ "bytemuck", "openssl", @@ -3022,18 +3022,18 @@ checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" [[package]] name = "solana-serde-varint" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e741efbc732c2e33fd600d39a5a5e63cbab18fc75fc84a98df68c2aa2b373b64" +checksum = "75c3085b541f48338be527a5bb55bab216dd5b3715184473239efa09719e935d" dependencies = [ "serde", ] [[package]] name = "solana-serialize-utils" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a6511f5147f992239415bd4bb297ad593da57b4ab634ed9bc10f81a560bc90" +checksum = "410bd8c5aab8a447fcb925e59e03753333f1a43483cf2445d700ba72d5c133a6" dependencies = [ "solana-instruction", "solana-pubkey", @@ -3042,9 +3042,9 @@ dependencies = [ [[package]] name = "solana-sha256-hasher" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3456f5d3868b9ae8e7bc53529bbbd8bee48b0d9cf3783f918269e71e4ee5268d" +checksum = "8ef58345b6473a4045299ce77a90a1e6c46e360ed94899c9178fe2d03ea3e5e4" dependencies = [ "sha2 0.10.8", "solana-define-syscall", @@ -3053,18 +3053,18 @@ dependencies = [ [[package]] name = "solana-short-vec" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01771c84475e25352169e3fc901cae565f75ff8c9b40a4fa858f776211f20cbc" +checksum = "5a27e2842e02e138a8a4156f7d71c318539f8aae65b80bc7dc311e0ee350eefa" dependencies = [ "serde", ] [[package]] name = "solana-signature" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f89b547c800c3541d4d5d71de8c82f37a0050f361626213a425ad4f767da27b" +checksum = "7da51452851bdbee15558f23f23579b3dcdf93aefdbcb911bca41bbf1e875f0a" dependencies = [ "bs58", "ed25519-dalek", @@ -3077,9 +3077,9 @@ dependencies = [ [[package]] name = "solana-slot-hashes" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3012c024a81d591d02a10648d5f4256d6fc3c9d93bc5421cadba224794940f6c" +checksum = "2f7c1e1ea9b27d21b094162462b026f47de83102fafabf9ed2b6221d59e6f28a" dependencies = [ "serde", "serde_derive", @@ -3089,9 +3089,9 @@ dependencies = [ [[package]] name = "solana-slot-history" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "817a68e2aae8fbcf00adef67eba05c513b0a461b5ed1fd0bd2cb1299a394a650" +checksum = "0882d70244b024ae16463c7c8ad547f8ee4e42c4331a0641f7e817c9da3fac49" dependencies = [ "bv", "serde", @@ -3101,9 +3101,9 @@ dependencies = [ [[package]] name = "solana-stable-layout" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec316bf731aeb8e9e8a55634efb938eaf5c979d71a9e7d3de54f5848da4994a2" +checksum = "7db19a6a2bab0e421b73ebd2930e990c391ac34ccb14b464108b1d071fb44fa7" dependencies = [ "solana-instruction", "solana-pubkey", @@ -3111,9 +3111,9 @@ dependencies = [ [[package]] name = "solana-system-program" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3deec0cbae00fb352cf28baa1dca56826221ed571e49530f497802f65386908c" +checksum = "58e1e57bab6f597a95790ce6a1133a8984dd5e4939bffe87ac08b7b0fa1f545f" dependencies = [ "bincode", "log", @@ -3127,18 +3127,18 @@ dependencies = [ [[package]] name = "solana-sysvar-id" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6ca7b6e6bf9f8c0de74e90546426190385a1c0b8e4d4f1975165f2335f9dc0" +checksum = "803ec4576594f2c633f670be4cfe2e8febc6e8fb387a0f3f2555972b7309bdb6" dependencies = [ "solana-pubkey", ] [[package]] name = "solana-timings" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39f948e963c99cee7d2a14da5faf864cb4ae298f8cb679fc088ec581d9d76aed" +checksum = "2a9d1bb674024ec73911c7f86020b270d982ee39888598549938800d11bb510d" dependencies = [ "eager", "enum-iterator", @@ -3147,9 +3147,9 @@ dependencies = [ [[package]] name = "solana-transaction-error" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a6d17d8de8549df56d64b9af314eec3c4b705372790aa8dde7196e1c5f005" +checksum = "1a7f870884ac7127bfdc9b68c16f4d5236e7300ea06f22028638e01b3fd5a7b9" dependencies = [ "serde", "serde_derive", @@ -3159,9 +3159,9 @@ dependencies = [ [[package]] name = "solana-type-overrides" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9673b27fb01b5479a25bfdd83d5ea1112433c8cf81a0aa8616c829587b285ecd" +checksum = "9dde9f11d4ae3d701ef2cfc5eb40dbdb9d42977de3d74a11949406fb9e75d6a1" dependencies = [ "lazy_static", "rand 0.8.5", @@ -3169,9 +3169,9 @@ dependencies = [ [[package]] name = "solana-vote" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b1a73fa59c07095599091dd9f026aceb478109d61d41720883a22ead9c18f8e" +checksum = "e36de277406038484902b3ec5909d3a7e967f321800c9b7e2fe21e373074978e" dependencies = [ "itertools 0.12.1", "log", @@ -3183,9 +3183,9 @@ dependencies = [ [[package]] name = "solana-zk-sdk" -version = "2.1.11" +version = "2.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e5f33e61ecb86621dd7b47e164ec09021b0c910a79e3a6b17ae763554ad7138" +checksum = "b2aab701561fac2d5124e1e2eb5ab3962723e5b4a7a2e57bdf528374c8ee7831" dependencies = [ "aes-gcm-siv", "base64 0.22.1", @@ -3257,7 +3257,7 @@ checksum = "d9e8418ea6269dcfb01c712f0444d2c75542c04448b480e87de59d2865edc750" dependencies = [ "quote", "spl-discriminator-syn", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -3269,7 +3269,7 @@ dependencies = [ "proc-macro2", "quote", "sha2 0.10.8", - "syn 2.0.96", + "syn 2.0.98", "thiserror 1.0.69", ] @@ -3342,7 +3342,7 @@ dependencies = [ "proc-macro2", "quote", "sha2 0.10.8", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -3574,9 +3574,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.96" +version = "2.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" +checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1" dependencies = [ "proc-macro2", "quote", @@ -3597,7 +3597,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -3656,7 +3656,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -3667,7 +3667,7 @@ checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -3750,9 +3750,9 @@ checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" [[package]] name = "toml_edit" -version = "0.22.22" +version = "0.22.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee" dependencies = [ "indexmap", "toml_datetime", @@ -3798,9 +3798,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-ident" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11cd88e12b17c6494200a9c1b683a04fcac9573ed74cd1b62aeb2727c5592243" +checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" [[package]] name = "universal-hash" @@ -3921,7 +3921,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", "wasm-bindgen-shared", ] @@ -3956,7 +3956,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4167,9 +4167,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.24" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a" +checksum = "7e49d2d35d3fad69b39b94139037ecfb4f359f08958b9c11e7315ce770462419" dependencies = [ "memchr", ] @@ -4216,7 +4216,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", "synstructure", ] @@ -4238,7 +4238,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -4258,7 +4258,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", "synstructure", ] @@ -4279,7 +4279,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -4301,5 +4301,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] diff --git a/program/Cargo.toml b/program/Cargo.toml index cbe98c0..6373fd2 100644 --- a/program/Cargo.toml +++ b/program/Cargo.toml @@ -13,14 +13,14 @@ test-sbf = [] [dependencies] bytemuck = { version = "1.21.0", features = ["derive"] } -solana-program = "2.1.11" +solana-program = "2.1.12" spl-token = { version = "7.0", features = ["no-entrypoint"] } spl-token-2022 = { version = "7.0.0", features = ["no-entrypoint"] } [dev-dependencies] mollusk-svm = "0.0.15" mollusk-svm-programs-token = "0.0.15" -solana-sdk = "2.1.0" +solana-sdk = "2.1.12" [lib] crate-type = ["cdylib", "lib"] From 8679b9dffc512e5a40ad722c99d0f0498e003485 Mon Sep 17 00:00:00 2001 From: Gabe Rodriguez Date: Tue, 4 Feb 2025 11:45:40 +0100 Subject: [PATCH 10/14] Review updates --- Cargo.lock | 245 ++++++++------- program/Cargo.toml | 17 +- program/src/entrypoint.rs | 7 +- program/src/instruction.rs | 126 ++++---- program/src/lib.rs | 8 +- program/src/processor.rs | 101 +++--- program/src/state.rs | 2 +- program/tests/test_create_mint.rs | 493 ++++++++++++++++++++++++------ program/tests/test_instruction.rs | 2 +- rustfmt.toml | 7 +- 10 files changed, 689 insertions(+), 319 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5696def..6ac2600 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2353,9 +2353,9 @@ dependencies = [ [[package]] name = "solana-account" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af199e43e00e46fd74c825a5a815a62c105b69fe24aeea67cce34167cb3c8246" +checksum = "e2197f7b15bc6041fa833974025a6006a111977cd4fd35848b743757c1a409f5" dependencies = [ "bincode", "serde", @@ -2367,9 +2367,9 @@ dependencies = [ [[package]] name = "solana-account-info" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0108d43d0dc6cb62f2fb5c5c6dddbbd2944cd41d674e78cfd7ab25505112fa83" +checksum = "1a67b02d022266e0979a3033f58f83c6e4d45f7e7cc85e6beeaf90b32ef5ede8" dependencies = [ "bincode", "serde", @@ -2380,18 +2380,18 @@ dependencies = [ [[package]] name = "solana-atomic-u64" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb870569c01e96a8bada5423e1e2499f65c83fc23e18d15290c921eaa7464562" +checksum = "2453e9e0f5e948d83d1ea5ceef6a0488b39cb57f21e19d73d5dc57f27464ec8d" dependencies = [ "parking_lot", ] [[package]] name = "solana-bincode" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb4dc964902dbe248bcfc57d6c5e7e814d300e0a8fee1fb5e9e517dacda0c12" +checksum = "b235339197024a4f5c80b2ab5961f616c3ee2aa4542af082a0cc9c84c82b3c09" dependencies = [ "bincode", "serde", @@ -2400,9 +2400,9 @@ dependencies = [ [[package]] name = "solana-bn254" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5f3acfa2be716cce5ae92a0e6919e48ea84505a81791f1f4966d2cabd06abdf" +checksum = "6f1b3e79f6ad47ffeb75be02d69828c00926af536083dadc6db8282ef1f0774e" dependencies = [ "ark-bn254", "ark-ec", @@ -2415,9 +2415,9 @@ dependencies = [ [[package]] name = "solana-borsh" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9616b7f3914d8b630d8bc61bed5340c05ec2d932e7c9694615c1c37f312529c6" +checksum = "3950d83165c85ac9cb92be986a76c7a543c5c14c1e98982d6dfad3d98e6b2353" dependencies = [ "borsh 0.10.4", "borsh 1.5.5", @@ -2425,9 +2425,9 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a72f4ec4df7ac88310560ec9e03358017176d38d6947f0de118925b31bfcc57c" +checksum = "107b32cf9b65a8f44000fb86a2232aaa5bb6f12d16bc5e77272d0c5168bc3857" dependencies = [ "bincode", "byteorder", @@ -2452,9 +2452,9 @@ dependencies = [ [[package]] name = "solana-clock" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b7f7803b61bc339c57d7b3beed7c93d9757dcd2fdc90bf74660670378ed307" +checksum = "4bfdce9a9f46965ffb6e1e7cc0e52efeb834c89dc67d7399770a9d4447498fdb" dependencies = [ "serde", "serde_derive", @@ -2464,18 +2464,18 @@ dependencies = [ [[package]] name = "solana-compute-budget" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ec695847457a262bd5fc5a834bb00215ad39ebc4111a9db4003bc0df86ca86b" +checksum = "6989b3fa34b7190243346bee5c4c208b7d24da189c6c3cbd329227d5ab0d6b8b" dependencies = [ "solana-sdk", ] [[package]] name = "solana-cpi" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faece18bae6d818d5121b40f10acd5a0f1f0d1ee2283e79ad00825a43a4dfaaa" +checksum = "dd452db5b927c0abbbd47ccc9f233a480754ecc7d07a9c5826c4d1f09168b6e1" dependencies = [ "solana-account-info", "solana-define-syscall", @@ -2487,9 +2487,9 @@ dependencies = [ [[package]] name = "solana-curve25519" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd364b9c90c05406baa604743a266a4526fd7ac1e7a048c40971ca28200851b" +checksum = "af29b27893aa7bc5082f30ef653c9319b36ac2b2d0f5c44688a5e80c42fcd892" dependencies = [ "bytemuck", "bytemuck_derive", @@ -2500,24 +2500,24 @@ dependencies = [ [[package]] name = "solana-decode-error" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97eddcef283b84b0bc040550796de561dd52d5b2599d3791d2d8d20121dc6dc" +checksum = "4a1d529c1056b4d461609224fa1bf2a6584eafddf435c6394697b0f5de8c812c" dependencies = [ "num-traits", ] [[package]] name = "solana-define-syscall" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "366739af4e4606111a1c62ab1c91376d7d42864f79b9b863b5544fc56e140c27" +checksum = "3c012a5bdc1122a74880faf6684b32286a9fae0086ff0a3efb16d7f3681fca90" [[package]] name = "solana-derivation-path" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549c98194387fac54f13558c701653bca55a14f2fbfa007ecc4fae601832cbc5" +checksum = "0803b6ea9c3b9f3c3f540535d6a9d32e6fa6a2ae368a3a93eb4a61c3a216c65d" dependencies = [ "derivation-path", "qstring", @@ -2526,9 +2526,9 @@ dependencies = [ [[package]] name = "solana-epoch-schedule" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd5c9e8f4a155d29cb8e6aa2e4856e1200c6d1b41d63c189823a074a55e31aff" +checksum = "dc5bd1733a0099c803b5e63be64ef6be1041b52010481f12a7d81124615e030d" dependencies = [ "serde", "serde_derive", @@ -2538,9 +2538,9 @@ dependencies = [ [[package]] name = "solana-feature-set" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b782063b475df133508569bc7b4bb490b067a45da35c7aa2eea0f758c159c79" +checksum = "4d7034fc05eae9180a5ae63f87a2e9985f8e0ae3c1269973c523d1028a78ffe3" dependencies = [ "lazy_static", "solana-clock", @@ -2552,9 +2552,9 @@ dependencies = [ [[package]] name = "solana-fee-calculator" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8959bafc64a69bc622b8ac8079f665aefcad14b234629ee742f34deef2d3167f" +checksum = "6337eace41da19d476fe80c86a8a2f5cad76125c2aa672788ec7f2814a62478a" dependencies = [ "log", "serde", @@ -2563,9 +2563,9 @@ dependencies = [ [[package]] name = "solana-hash" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d7983e14fd607a13fa6ef89ab2ddad91fd3e65fd24b2b37c142ddc94ac8cb27" +checksum = "36647a50db4d401721e55d6bc1d259a8cea7bc333ab41c6358d2f5b344a1ab4e" dependencies = [ "borsh 1.5.5", "bs58", @@ -2581,9 +2581,9 @@ dependencies = [ [[package]] name = "solana-inflation" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4250c724fafb1b30c39eb5af6f45ce918611d148712e3aa9b55470cc15069d7" +checksum = "4c2ea0e34ad32c6a1a026f284716c9c21cd1c3dc496a595640f76ef4bf364f1d" dependencies = [ "serde", "serde_derive", @@ -2591,9 +2591,9 @@ dependencies = [ [[package]] name = "solana-instruction" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34de1bf4e8abcc182bf90888b84b9656eee5fef7a252a44a20fed7c778abfbda" +checksum = "d7a99a1276782510f3f9d8dac058b9fccadfc62ff4fd5b7c6d462dbf46632181" dependencies = [ "bincode", "borsh 1.5.5", @@ -2609,9 +2609,9 @@ dependencies = [ [[package]] name = "solana-last-restart-slot" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21db3a4a50b400bb03d32971bb9fefafb421e4210f86081d3c3217d8d98c1a77" +checksum = "55a1090667f03719f886b86f90a333b0741df8692fb7076529ae2ab066e2f4b4" dependencies = [ "serde", "serde_derive", @@ -2621,9 +2621,9 @@ dependencies = [ [[package]] name = "solana-log-collector" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0af672ade9beba20d59eb0b6e3a9a1800b8c772138bcadb96bf6894bc552821" +checksum = "606f71865c0889b7dbdccd2a75586ec028461d648901708f2bb5f5c6bee5693d" dependencies = [ "log", ] @@ -2641,15 +2641,15 @@ dependencies = [ [[package]] name = "solana-measure" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3f0a8b37208c237452f2612049f338711c8d28242cb989c4d755452d84a6e0" +checksum = "04cd58f210630986a5c3f0344da347bb75fc2a90f2fe287438a81cd2c6ffcc8b" [[package]] name = "solana-metrics" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2f52947d3edea1d8924dd9f8b9898fb9c828887198871b5ba9af0e0597757bc" +checksum = "58eec7006fe02032aa28f0ff49f3b378d64f16597d725af2887febc0f4ba3e9c" dependencies = [ "crossbeam-channel", "gethostname", @@ -2662,24 +2662,24 @@ dependencies = [ [[package]] name = "solana-msg" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b772497c73933dc8f0123f1fc1c8ccae1e6edee194606e7fd5cb0a2f074f0cc6" +checksum = "59b84934c69aa9799b661f87aa1c47f8d358c3912fe5843571a5d047a222a0e6" dependencies = [ "solana-define-syscall", ] [[package]] name = "solana-native-token" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "880eea211f489f04d9aa8d436ea3dd172b1188dee97bdd7ec64acb05bef29a32" +checksum = "1e628d59c4f2ca1e5765a99bf7a1f5fb87e6c834ad2992d84024141be32f21c8" [[package]] name = "solana-packet" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf06ea5042a29391f26bfbeeb30cd4709de4f47642f8a0ec2e15c5faa099cf44" +checksum = "cf27339d38ffc14b456e93f59a998cdd79079bec6776bef364a8aa1ee2ceed69" dependencies = [ "bincode", "bitflags 2.8.0", @@ -2691,9 +2691,9 @@ dependencies = [ [[package]] name = "solana-poseidon" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cb8f71202f04231fbc0869c94da00e7198abc9117100c62e4efb3cdf533f39d" +checksum = "c61632e0273d31dc0b3237eb32f86201d89bfaff673eceeea3081e21bd027ff9" dependencies = [ "ark-bn254", "light-poseidon", @@ -2703,9 +2703,9 @@ dependencies = [ [[package]] name = "solana-precompile-error" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307485e198c542e975a916c354764c2ced285b6df520793a2f10beb39d0d7f1c" +checksum = "c439844f1c18ec47ab13b5ed229cb0d9eacd75a7fafb8f150004b9a5ee11445e" dependencies = [ "num-traits", "solana-decode-error", @@ -2713,9 +2713,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2334209564c9fa7673b01a5a5dac16c0a474bea95e218135ef1430c20ecba5" +checksum = "5b23f3bdb67fec4edc60ce12b5583c5425aab96dbb029636d400cd3f36242412" dependencies = [ "base64 0.22.1", "bincode", @@ -2786,9 +2786,9 @@ dependencies = [ [[package]] name = "solana-program-entrypoint" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39fdb97781dc0f4093f0a5ebe0b5c353da217d8c8a13fb7ded3c62a4774f7d13" +checksum = "bc27bbb6ff7f346b93173cacd14a44873e24a1702a07ebbe4a9295bf53eed3cb" dependencies = [ "solana-account-info", "solana-msg", @@ -2798,9 +2798,9 @@ dependencies = [ [[package]] name = "solana-program-error" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a18ee0aac9905389f424598fd3656c981ed09268c04e160d08a468b25ecc7b1" +checksum = "f5f48931e21e648410a17a1a42b3ace669e1b6c55516357f40ac6b91d4f81ef1" dependencies = [ "borsh 1.5.5", "num-traits", @@ -2814,9 +2814,9 @@ dependencies = [ [[package]] name = "solana-program-memory" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4473c6315820301c873c3df0a110a4ded9874579be27362a1a7cc4b8c904d37" +checksum = "783ed2a707f3e875480ab0beda89951e8807cb0f76e30c19f82dd305b9169ab3" dependencies = [ "num-traits", "solana-define-syscall", @@ -2824,24 +2824,24 @@ dependencies = [ [[package]] name = "solana-program-option" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68158410c335eeb28e95520ab3628c6d887ea6acb07f20dfce55780e127cf87" +checksum = "af0be45a0148239936e931a0ae95052a66e0b8f257205c9304af39bf2211a8de" [[package]] name = "solana-program-pack" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31d03d7ad1c427cf50af1c51f82abe330c5dec09a0a4bace05fb303788fe58d8" +checksum = "02d992004feb5e4b8bec891470f38b029fa8a304ce762ca835ffcc67cc6bf385" dependencies = [ "solana-program-error", ] [[package]] name = "solana-program-runtime" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18c14d71bc78f0b09c3dd3f4cb06e1dab74354b2a96c79e86441e04cfeabebd7" +checksum = "09ed4dedcffb93dcf823dd0db043bb142ecc839d354c15347e75a370585b7c71" dependencies = [ "base64 0.22.1", "bincode", @@ -2869,9 +2869,9 @@ dependencies = [ [[package]] name = "solana-pubkey" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87a0e1282ea13d3fab42d1c5df8f00283f8f739b2e5a9a5b530f76c4292e2b5" +checksum = "2d4cb0f3b71f466fe8e11bef05dc562060b5c8f526e969ecd150ce5bedc6e3eb" dependencies = [ "borsh 0.10.4", "borsh 1.5.5", @@ -2896,9 +2896,9 @@ dependencies = [ [[package]] name = "solana-rent" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ae7a8fb4d869c6134d9ebdde2bb68e4cfd6034fe947932ade7721e236b66bb" +checksum = "4cb62c792559733d5f5d2ee42383e8d3b336e5168472ebdaaf157fd6f1949973" dependencies = [ "serde", "serde_derive", @@ -2908,15 +2908,15 @@ dependencies = [ [[package]] name = "solana-sanitize" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f83981cbb16d532c96a7911e810bf3302fd14fd2651096130c3d3cc4e2b3410e" +checksum = "e956e49e563eb8a9aa09425d676180a0a0509038be4457f230bb6e1dfa036053" [[package]] name = "solana-sdk" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e2e78e01f045ae38199cacd980773e711ac8c8a3af6d9d21424184aa4dae1a" +checksum = "a2625a64d46eccd46452df612f4266f24d266eb43ccac2a566ec41ee2ec76262" dependencies = [ "bincode", "bitflags 2.8.0", @@ -2978,9 +2978,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6822c0596b48342e7e6acebce6b0a4aa6bb57c9bef03ebf11405b5f5c7124627" +checksum = "6102303ef82f601e178970388256cd2841618d0789246c087c164760bd976b2f" dependencies = [ "bs58", "proc-macro2", @@ -2990,9 +2990,9 @@ dependencies = [ [[package]] name = "solana-secp256k1-recover" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e19dfea19083c99baecbf09dc96f0c6abf56e39a610cb1c817935e54e03eaf" +checksum = "a5658cf3a6792df8bc40da3c6cd8ff2d96ad494f3102a6c70ee41774647b0b0e" dependencies = [ "borsh 1.5.5", "libsecp256k1", @@ -3002,9 +3002,9 @@ dependencies = [ [[package]] name = "solana-secp256r1-program" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12a60175bd0890161815bf5a1b8bec6f1db2fe5c4cd2b6d0a8eea3db6b362930" +checksum = "3f1acf1413825581b79339a3b8427466f0a3b677c85cafe5d0827a3a6f7a6680" dependencies = [ "bytemuck", "openssl", @@ -3022,18 +3022,18 @@ checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" [[package]] name = "solana-serde-varint" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75c3085b541f48338be527a5bb55bab216dd5b3715184473239efa09719e935d" +checksum = "591ff7fba3f641998d613f6934bd89222cf45b0393225dc3c4af09b2b8f94d33" dependencies = [ "serde", ] [[package]] name = "solana-serialize-utils" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "410bd8c5aab8a447fcb925e59e03753333f1a43483cf2445d700ba72d5c133a6" +checksum = "304f0afa82feddfdab31a97148717bf33a0e1cd67261aa1fce55835eff0a5a90" dependencies = [ "solana-instruction", "solana-pubkey", @@ -3042,9 +3042,9 @@ dependencies = [ [[package]] name = "solana-sha256-hasher" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ef58345b6473a4045299ce77a90a1e6c46e360ed94899c9178fe2d03ea3e5e4" +checksum = "de0e647536438a92f1b02424d94c703534566aa9b1d8aae87f3b181d2dc5787c" dependencies = [ "sha2 0.10.8", "solana-define-syscall", @@ -3053,18 +3053,18 @@ dependencies = [ [[package]] name = "solana-short-vec" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a27e2842e02e138a8a4156f7d71c318539f8aae65b80bc7dc311e0ee350eefa" +checksum = "8cfbe01016ac7c0ac992fae610f46607b7d8cadba5c526f2b8701123bc28e5ce" dependencies = [ "serde", ] [[package]] name = "solana-signature" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da51452851bdbee15558f23f23579b3dcdf93aefdbcb911bca41bbf1e875f0a" +checksum = "7a515db8b6bbce5a603e09cda69e459ec8d5964a8711e40689ae596da0d9907a" dependencies = [ "bs58", "ed25519-dalek", @@ -3077,9 +3077,9 @@ dependencies = [ [[package]] name = "solana-slot-hashes" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f7c1e1ea9b27d21b094162462b026f47de83102fafabf9ed2b6221d59e6f28a" +checksum = "327614604f49be7b292e4fefeca60da6b16720ef2edf35458b1923f0a34b0e2e" dependencies = [ "serde", "serde_derive", @@ -3089,9 +3089,9 @@ dependencies = [ [[package]] name = "solana-slot-history" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0882d70244b024ae16463c7c8ad547f8ee4e42c4331a0641f7e817c9da3fac49" +checksum = "bfd9d02ec3cdf702027aaee2faac215aa0d8825f6b399b205236f349bd6c8e79" dependencies = [ "bv", "serde", @@ -3101,9 +3101,9 @@ dependencies = [ [[package]] name = "solana-stable-layout" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7db19a6a2bab0e421b73ebd2930e990c391ac34ccb14b464108b1d071fb44fa7" +checksum = "6ee6374e06b1373c4d526e87f02a5ee165093d341c0c5ab548fc79f6ff18e331" dependencies = [ "solana-instruction", "solana-pubkey", @@ -3111,9 +3111,9 @@ dependencies = [ [[package]] name = "solana-system-program" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58e1e57bab6f597a95790ce6a1133a8984dd5e4939bffe87ac08b7b0fa1f545f" +checksum = "61aa6965c2a143def2878fc576713fc39e4bce67461d3616eb46b5d1e56079de" dependencies = [ "bincode", "log", @@ -3127,18 +3127,18 @@ dependencies = [ [[package]] name = "solana-sysvar-id" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "803ec4576594f2c633f670be4cfe2e8febc6e8fb387a0f3f2555972b7309bdb6" +checksum = "d11cdbc013ed4f65a636762b9a62cb878dd530062804e6a6be0faa76f5902914" dependencies = [ "solana-pubkey", ] [[package]] name = "solana-timings" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a9d1bb674024ec73911c7f86020b270d982ee39888598549938800d11bb510d" +checksum = "629d606363f36eed6c79a1a96083050380733e5785ba05e52321ff593e806efe" dependencies = [ "eager", "enum-iterator", @@ -3147,9 +3147,9 @@ dependencies = [ [[package]] name = "solana-transaction-error" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a7f870884ac7127bfdc9b68c16f4d5236e7300ea06f22028638e01b3fd5a7b9" +checksum = "589ed4a290547a8ad581f4ede34cb9c164953203aa23b415c761cfb8b06cac89" dependencies = [ "serde", "serde_derive", @@ -3159,9 +3159,9 @@ dependencies = [ [[package]] name = "solana-type-overrides" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dde9f11d4ae3d701ef2cfc5eb40dbdb9d42977de3d74a11949406fb9e75d6a1" +checksum = "21ac99386eaec9b90c55a22dee445d88b04398e31023bd1749dd58dff150385e" dependencies = [ "lazy_static", "rand 0.8.5", @@ -3169,9 +3169,9 @@ dependencies = [ [[package]] name = "solana-vote" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36de277406038484902b3ec5909d3a7e967f321800c9b7e2fe21e373074978e" +checksum = "3d7917e3041555c37ba15028415ec424ff7833acc4f62941ce077ad5c6661198" dependencies = [ "itertools 0.12.1", "log", @@ -3183,9 +3183,9 @@ dependencies = [ [[package]] name = "solana-zk-sdk" -version = "2.1.12" +version = "2.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2aab701561fac2d5124e1e2eb5ab3962723e5b4a7a2e57bdf528374c8ee7831" +checksum = "d07c66d2589fb44e2050be900519070a15dbe8e7793977f586952fe9d1248ae6" dependencies = [ "aes-gcm-siv", "base64 0.22.1", @@ -3494,8 +3494,19 @@ dependencies = [ "bytemuck", "mollusk-svm", "mollusk-svm-programs-token", + "solana-account", + "solana-account-info", + "solana-cpi", + "solana-instruction", + "solana-msg", "solana-program", - "solana-sdk", + "solana-program-entrypoint", + "solana-program-error", + "solana-program-option", + "solana-program-pack", + "solana-pubkey", + "solana-rent", + "spl-pod", "spl-token", "spl-token-2022", ] diff --git a/program/Cargo.toml b/program/Cargo.toml index 6373fd2..befb5a5 100644 --- a/program/Cargo.toml +++ b/program/Cargo.toml @@ -13,14 +13,25 @@ test-sbf = [] [dependencies] bytemuck = { version = "1.21.0", features = ["derive"] } -solana-program = "2.1.12" -spl-token = { version = "7.0", features = ["no-entrypoint"] } +solana-account-info = "2.1.13" +solana-cpi = "2.1.13" +solana-instruction = "2.1.13" +solana-msg = "2.1.13" +solana-program = "2.1.13" +solana-program-entrypoint = "2.1.13" +solana-program-error = "2.1.13" +solana-program-option = "2.1.13" +solana-program-pack = "2.1.13" +solana-pubkey = "2.1.13" +solana-rent = "2.1.13" +spl-pod = "0.5.0" +spl-token = { version = "7.0.0", features = ["no-entrypoint"] } spl-token-2022 = { version = "7.0.0", features = ["no-entrypoint"] } [dev-dependencies] mollusk-svm = "0.0.15" mollusk-svm-programs-token = "0.0.15" -solana-sdk = "2.1.12" +solana-account = "2.1.13" [lib] crate-type = ["cdylib", "lib"] diff --git a/program/src/entrypoint.rs b/program/src/entrypoint.rs index 62a02f2..cc9e27e 100644 --- a/program/src/entrypoint.rs +++ b/program/src/entrypoint.rs @@ -2,9 +2,12 @@ #![cfg(all(target_os = "solana", not(feature = "no-entrypoint")))] -use solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey}; +use { + solana_account_info::AccountInfo, solana_program_error::ProgramResult, solana_pubkey::Pubkey, +}; + +solana_program_entrypoint::entrypoint!(process_instruction); -solana_program::entrypoint!(process_instruction); fn process_instruction( program_id: &Pubkey, accounts: &[AccountInfo], diff --git a/program/src/instruction.rs b/program/src/instruction.rs index 035ac7b..f2b8dc2 100644 --- a/program/src/instruction.rs +++ b/program/src/instruction.rs @@ -1,34 +1,17 @@ //! Program instructions -use solana_program::instruction::{AccountMeta, Instruction}; -use solana_program::program_error::ProgramError; -use solana_program::pubkey::Pubkey; -use std::convert::TryInto; +use { + solana_instruction::{AccountMeta, Instruction}, + solana_program::system_program, + solana_program_error::ProgramError, + solana_pubkey::Pubkey, + std::convert::TryInto, +}; /// Instructions supported by the Token Wrap program #[derive(Clone, Debug, PartialEq)] #[repr(u8)] pub enum TokenWrapInstruction { - /// Create a wrapped token mint. Assumes caller has pre-funded wrapped mint - /// and backpointer account. Supports both directions: - /// - spl-token to token-2022 - /// - token-2022 to spl-token - /// - /// Accounts expected by this instruction: - /// - /// 0. `[writeable]` Unallocated wrapped mint account to create (PDA), - /// address must be: `get_wrapped_mint_address(unwrapped_mint_address, - /// wrapped_token_program_id)` - /// 1. `[writeable]` Unallocated wrapped backpointer account to create (PDA) - /// `get_wrapped_mint_backpointer_address(wrapped_mint_address)` - /// 2. `[]` Existing unwrapped mint - /// 3. `[]` System program - /// 4. `[]` SPL Token program for wrapped mint - CreateMint { - /// If true, idempotent creation. If false, fail if the mint already exists. - idempotent: bool, - }, - /// Wrap tokens /// /// Move a user's unwrapped tokens into an escrow account and mint the same @@ -56,6 +39,27 @@ pub enum TokenWrapInstruction { amount: u64, }, + /// Create a wrapped token mint. Assumes caller has pre-funded wrapped mint + /// and backpointer account. Supports both directions: + /// - spl-token to token-2022 + /// - token-2022 to spl-token + /// + /// Accounts expected by this instruction: + /// + /// 0. `[writeable]` Unallocated wrapped mint account to create (PDA), + /// address must be: `get_wrapped_mint_address(unwrapped_mint_address, + /// wrapped_token_program_id)` + /// 1. `[writeable]` Unallocated wrapped backpointer account to create (PDA) + /// `get_wrapped_mint_backpointer_address(wrapped_mint_address)` + /// 2. `[]` Existing unwrapped mint + /// 3. `[]` System program + /// 4. `[]` SPL Token program for wrapped mint + CreateMint { + /// If true, idempotent creation. If false, fail if the mint already + /// exists. + idempotent: bool, + }, + /// Unwrap tokens /// /// Burn user wrapped tokens and transfer the same amount of unwrapped @@ -78,14 +82,15 @@ pub enum TokenWrapInstruction { /// 8. `[signer]` Transfer authority on wrapped token account /// 9. `..8+M` `[signer]` (Optional) M multisig signers on wrapped token /// account - UnWrap { + Unwrap { /// little-endian `u64` representing the amount to unwrap amount: u64, }, } impl TokenWrapInstruction { - /// Packs a [`TokenWrapInstruction`](enum.TokenWrapInstruction.html) into a byte array. + /// Packs a [`TokenWrapInstruction`](enum.TokenWrapInstruction.html) into a + /// byte array. pub fn pack(&self) -> Vec { let mut buf = Vec::new(); match self { @@ -98,7 +103,7 @@ impl TokenWrapInstruction { buf.push(1); buf.extend_from_slice(&amount.to_le_bytes()); } - TokenWrapInstruction::UnWrap { amount } => { + TokenWrapInstruction::Unwrap { amount } => { buf.push(2); buf.extend_from_slice(&amount.to_le_bytes()); } @@ -106,38 +111,25 @@ impl TokenWrapInstruction { buf } - /// Unpacks a byte array into a [`TokenWrapInstruction`](enum.TokenWrapInstruction.html). + /// Unpacks a byte array into a + /// [`TokenWrapInstruction`](enum.TokenWrapInstruction.html). pub fn unpack(input: &[u8]) -> Result { - let (&tag, rest) = input - .split_first() - .ok_or(ProgramError::InvalidInstructionData)?; - match tag { - 0 => { - if rest.len() != 1 { - return Err(ProgramError::InvalidInstructionData); - } - let idempotent = rest[0] != 0; + match input.split_first() { + Some((&0, rest)) if rest.len() == 1 => { + let idempotent = match rest[0] { + 0 => false, + 1 => true, + _ => return Err(ProgramError::InvalidInstructionData), + }; Ok(TokenWrapInstruction::CreateMint { idempotent }) } - 1 => { - if rest.len() != 8 { - return Err(ProgramError::InvalidInstructionData); - } - let amount = u64::from_le_bytes( - rest.try_into() - .map_err(|_| ProgramError::InvalidInstructionData)?, - ); + Some((&1, rest)) if rest.len() == 8 => { + let amount = u64::from_le_bytes(rest.try_into().unwrap()); Ok(TokenWrapInstruction::Wrap { amount }) } - 2 => { - if rest.len() != 8 { - return Err(ProgramError::InvalidInstructionData); - } - let amount = u64::from_le_bytes( - rest.try_into() - .map_err(|_| ProgramError::InvalidInstructionData)?, - ); - Ok(TokenWrapInstruction::UnWrap { amount }) + Some((&2, rest)) if rest.len() == 8 => { + let amount = u64::from_le_bytes(rest.try_into().unwrap()); + Ok(TokenWrapInstruction::Unwrap { amount }) } _ => Err(ProgramError::InvalidInstructionData), } @@ -157,7 +149,7 @@ pub fn create_mint( AccountMeta::new(*wrapped_mint_address, false), AccountMeta::new(*wrapped_backpointer_address, false), AccountMeta::new_readonly(*unwrapped_mint_address, false), - AccountMeta::new_readonly(solana_program::system_program::id(), false), + AccountMeta::new_readonly(system_program::id(), false), AccountMeta::new_readonly(*wrapped_token_program_id, false), ]; let data = TokenWrapInstruction::CreateMint { idempotent }.pack(); @@ -170,19 +162,20 @@ pub fn unwrap( program_id: &Pubkey, wrapped_token_account_address: &Pubkey, wrapped_mint_address: &Pubkey, - wrapped_escrow_address: &Pubkey, + unwrapped_escrow_address: &Pubkey, recipient_unwrapped_token_account_address: &Pubkey, unwrapped_mint_address: &Pubkey, wrapped_mint_authority_address: &Pubkey, wrapped_token_program_id: &Pubkey, unwrapped_token_program_id: &Pubkey, transfer_authority_address: &Pubkey, + signer_pubkeys: &[&Pubkey], amount: u64, ) -> Instruction { - let accounts = vec![ + let mut accounts = vec![ AccountMeta::new(*wrapped_token_account_address, false), AccountMeta::new(*wrapped_mint_address, false), - AccountMeta::new(*wrapped_escrow_address, false), + AccountMeta::new(*unwrapped_escrow_address, false), AccountMeta::new(*recipient_unwrapped_token_account_address, false), AccountMeta::new_readonly(*unwrapped_mint_address, false), AccountMeta::new_readonly(*wrapped_mint_authority_address, false), @@ -190,7 +183,11 @@ pub fn unwrap( AccountMeta::new_readonly(*unwrapped_token_program_id, false), AccountMeta::new_readonly(*transfer_authority_address, true), ]; - let data = TokenWrapInstruction::UnWrap { amount }.pack(); + for signer_pubkey in signer_pubkeys.iter() { + accounts.push(AccountMeta::new_readonly(**signer_pubkey, true)); + } + + let data = TokenWrapInstruction::Unwrap { amount }.pack(); Instruction::new_with_bytes(*program_id, &data, accounts) } @@ -199,7 +196,7 @@ pub fn unwrap( pub fn wrap( program_id: &Pubkey, unwrapped_token_account_address: &Pubkey, - wrapped_escrow_address: &Pubkey, + unwrapped_escrow_address: &Pubkey, unwrapped_mint_address: &Pubkey, wrapped_mint_address: &Pubkey, recipient_wrapped_token_account_address: &Pubkey, @@ -207,11 +204,12 @@ pub fn wrap( unwrapped_token_program_id: &Pubkey, wrapped_token_program_id: &Pubkey, transfer_authority_address: &Pubkey, + signer_pubkeys: &[&Pubkey], amount: u64, ) -> Instruction { - let accounts = vec![ + let mut accounts = vec![ AccountMeta::new(*unwrapped_token_account_address, false), - AccountMeta::new(*wrapped_escrow_address, false), + AccountMeta::new(*unwrapped_escrow_address, false), AccountMeta::new_readonly(*unwrapped_mint_address, false), AccountMeta::new(*wrapped_mint_address, false), AccountMeta::new(*recipient_wrapped_token_account_address, false), @@ -220,6 +218,10 @@ pub fn wrap( AccountMeta::new_readonly(*wrapped_token_program_id, false), AccountMeta::new_readonly(*transfer_authority_address, true), ]; + for signer_pubkey in signer_pubkeys.iter() { + accounts.push(AccountMeta::new_readonly(**signer_pubkey, true)); + } + let data = TokenWrapInstruction::Wrap { amount }.pack(); Instruction::new_with_bytes(*program_id, &data, accounts) } diff --git a/program/src/lib.rs b/program/src/lib.rs index 79fda08..571021d 100644 --- a/program/src/lib.rs +++ b/program/src/lib.rs @@ -10,9 +10,9 @@ pub mod state; // Export current SDK types for downstream users building with a different SDK // version pub use solana_program; -use solana_program::pubkey::Pubkey; +use solana_pubkey::Pubkey; -solana_program::declare_id!("TwRapQCDhWkZRrDaHfZGuHxkZ91gHDRkyuzNqeU5MgR"); +solana_pubkey::declare_id!("TwRapQCDhWkZRrDaHfZGuHxkZ91gHDRkyuzNqeU5MgR"); const WRAPPED_MINT_SEED: &[u8] = br"mint"; @@ -37,7 +37,7 @@ pub(crate) fn get_wrapped_mint_seeds<'a>( ] } -pub(crate) fn _get_wrapped_mint_signer_seeds<'a>( +pub(crate) fn get_wrapped_mint_signer_seeds<'a>( unwrapped_mint: &'a Pubkey, wrapped_token_program_id: &'a Pubkey, bump_seed: &'a [u8], @@ -90,7 +90,7 @@ pub(crate) fn get_wrapped_mint_backpointer_address_seeds(wrapped_mint: &Pubkey) [WRAPPED_MINT_BACKPOINTER_SEED, wrapped_mint.as_ref()] } -pub(crate) fn _get_wrapped_mint_backpointer_address_signer_seeds<'a>( +pub(crate) fn get_wrapped_mint_backpointer_address_signer_seeds<'a>( wrapped_mint: &'a Pubkey, bump_seed: &'a [u8], ) -> [&'a [u8]; 3] { diff --git a/program/src/processor.rs b/program/src/processor.rs index da6dced..2525aa9 100644 --- a/program/src/processor.rs +++ b/program/src/processor.rs @@ -1,22 +1,23 @@ //! Program state processor -use crate::state::Backpointer; -use crate::{ - _get_wrapped_mint_authority_signer_seeds, _get_wrapped_mint_backpointer_address_signer_seeds, - _get_wrapped_mint_signer_seeds, get_wrapped_mint_address_with_seed, - get_wrapped_mint_authority_with_seed, get_wrapped_mint_backpointer_address_with_seed, -}; -use solana_program::account_info::next_account_info; -use solana_program::program::invoke_signed; -use solana_program::program_error::ProgramError; -use solana_program::program_pack::Pack; -use solana_program::rent::Rent; -use solana_program::sysvar::Sysvar; -use solana_program::{msg, system_instruction}; -use spl_token_2022::instruction::initialize_mint2; use { - crate::instruction::TokenWrapInstruction, - solana_program::{account_info::AccountInfo, entrypoint::ProgramResult, pubkey::Pubkey}, + crate::{ + get_wrapped_mint_address_with_seed, get_wrapped_mint_authority, + get_wrapped_mint_backpointer_address_signer_seeds, + get_wrapped_mint_backpointer_address_with_seed, get_wrapped_mint_signer_seeds, + instruction::TokenWrapInstruction, state::Backpointer, + }, + solana_account_info::{next_account_info, AccountInfo}, + solana_cpi::{invoke, invoke_signed}, + solana_msg::msg, + solana_program::{system_instruction, sysvar::Sysvar}, + solana_program_error::{ProgramError, ProgramResult}, + solana_program_pack::Pack, + solana_pubkey::Pubkey, + solana_rent::Rent, + spl_token_2022::{ + extension::PodStateWithExtensions, instruction::initialize_mint2, pod::PodMint, + }, }; /// Processes [`CreateMint`](enum.TokenWrapInstruction.html) instruction. @@ -33,25 +34,44 @@ pub fn process_create_mint( let _system_program_account = next_account_info(account_info_iter)?; let wrapped_token_program_account = next_account_info(account_info_iter)?; + let (wrapped_mint_address, mint_bump) = get_wrapped_mint_address_with_seed( + unwrapped_mint_account.key, + wrapped_token_program_account.key, + ); + + let (wrapped_backpointer_address, backpointer_bump) = + get_wrapped_mint_backpointer_address_with_seed(wrapped_mint_account.key); + // Idempotency checks if wrapped_mint_account.data_len() > 0 || wrapped_backpointer_account.data_len() > 0 { msg!("Wrapped mint or backpointer account already initialized"); - return if !idempotent { - Err(ProgramError::AccountAlreadyInitialized) - } else { - Ok(()) - }; + if !idempotent { + return Err(ProgramError::AccountAlreadyInitialized); + } + if *wrapped_mint_account.key != wrapped_mint_address { + msg!("Wrapped mint account address does not match expected PDA"); + return Err(ProgramError::InvalidAccountData); + } + if wrapped_mint_account.owner != program_id { + msg!("Wrapped mint account owner is not the expected token program"); + return Err(ProgramError::InvalidAccountData); + } + if *wrapped_backpointer_account.key != wrapped_backpointer_address { + msg!("Wrapped backpointer account address does not match expected PDA"); + return Err(ProgramError::InvalidAccountData); + } + if wrapped_backpointer_account.owner != program_id { + msg!("Wrapped backpointer account owner is not the expected token wrap program"); + return Err(ProgramError::InvalidAccountData); + } + return Ok(()); } // Initialize wrapped mint PDA - let (wrapped_mint_address, bump) = get_wrapped_mint_address_with_seed( - unwrapped_mint_account.key, - wrapped_token_program_account.key, - ); - let bump_seed = [bump]; - let signer_seeds = _get_wrapped_mint_signer_seeds( + let bump_seed = [mint_bump]; + let signer_seeds = get_wrapped_mint_signer_seeds( unwrapped_mint_account.key, wrapped_token_program_account.key, &bump_seed, @@ -83,32 +103,29 @@ pub fn process_create_mint( // New wrapped mint matches decimals & freeze authority of unwrapped mint let unwrapped_mint_data = unwrapped_mint_account.try_borrow_data()?; - let unpacked_unwrapped_mint = spl_token_2022::state::Mint::unpack(&unwrapped_mint_data)?; + let unpacked_unwrapped_mint = + PodStateWithExtensions::::unpack(&unwrapped_mint_data)?.base; let decimals = unpacked_unwrapped_mint.decimals; - let freeze_authority = unpacked_unwrapped_mint.freeze_authority.as_ref().into(); + let freeze_authority = unpacked_unwrapped_mint + .freeze_authority + .ok_or(ProgramError::InvalidArgument) + .ok(); - let (wrapped_mint_authority, authority_bump_seed) = - get_wrapped_mint_authority_with_seed(wrapped_mint_account.key); - let authority_bump_seeds = [authority_bump_seed]; - let authority_signer_seeds = - _get_wrapped_mint_authority_signer_seeds(wrapped_mint_account.key, &authority_bump_seeds); + let wrapped_mint_authority = get_wrapped_mint_authority(wrapped_mint_account.key); - invoke_signed( + invoke( &initialize_mint2( wrapped_token_program_account.key, wrapped_mint_account.key, &wrapped_mint_authority, - freeze_authority, + freeze_authority.as_ref(), decimals, )?, &[wrapped_mint_account.clone()], - &[&authority_signer_seeds], )?; // Initialize backpointer PDA - let (wrapped_backpointer_address, bump) = - get_wrapped_mint_backpointer_address_with_seed(wrapped_mint_account.key); if *wrapped_backpointer_account.key != wrapped_backpointer_address { msg!("Error: wrapped_backpointer_account address is not as expected"); return Err(ProgramError::InvalidSeeds); @@ -124,9 +141,9 @@ pub fn process_create_mint( return Err(ProgramError::InsufficientFunds); } - let bump_seed = [bump]; + let bump_seed = [backpointer_bump]; let backpointer_signer_seeds = - _get_wrapped_mint_backpointer_address_signer_seeds(wrapped_mint_account.key, &bump_seed); + get_wrapped_mint_backpointer_address_signer_seeds(wrapped_mint_account.key, &bump_seed); invoke_signed( &system_instruction::allocate(&wrapped_backpointer_address, backpointer_space as u64), &[wrapped_backpointer_account.clone()], @@ -162,7 +179,7 @@ pub fn process_instruction( msg!("Instruction: Wrap"); unimplemented!(); } - TokenWrapInstruction::UnWrap { .. } => { + TokenWrapInstruction::Unwrap { .. } => { msg!("Instruction: UnWrap"); unimplemented!(); } diff --git a/program/src/state.rs b/program/src/state.rs index 977c34d..1533502 100644 --- a/program/src/state.rs +++ b/program/src/state.rs @@ -2,7 +2,7 @@ use { bytemuck::{Pod, Zeroable}, - solana_program::pubkey::Pubkey, + solana_pubkey::Pubkey, }; /// Backpointer diff --git a/program/tests/test_create_mint.rs b/program/tests/test_create_mint.rs index cc70e8e..ab0c772 100644 --- a/program/tests/test_create_mint.rs +++ b/program/tests/test_create_mint.rs @@ -1,30 +1,43 @@ -use solana_program::program_error::ProgramError; -use solana_program::program_pack::Pack; -use solana_program::rent::Rent; -use solana_program::system_program; -use solana_sdk::account::Account; -use solana_sdk::program_option::COption; -use spl_token_2022::state::Mint; -use spl_token_wrap::state::Backpointer; -use spl_token_wrap::{ - get_wrapped_mint_address, get_wrapped_mint_authority, get_wrapped_mint_backpointer_address, -}; use { mollusk_svm::{result::Check, Mollusk}, - solana_program::pubkey::Pubkey, - spl_token_wrap::instruction::create_mint, + solana_account::Account, + solana_instruction::error::InstructionError, + solana_program::system_program, + solana_program_error::ProgramError, + solana_program_option::COption, + solana_program_pack::Pack, + solana_pubkey::Pubkey, + solana_rent::Rent, + spl_pod::{ + optional_keys::OptionalNonZeroPubkey, + primitives::{PodBool, PodU64}, + }, + spl_token_2022::{ + extension::{ + mint_close_authority::MintCloseAuthority, BaseStateWithExtensionsMut, ExtensionType, + PodStateWithExtensions, PodStateWithExtensionsMut, + }, + pod::{PodCOption, PodMint}, + state::Mint, + }, + spl_token_wrap::{ + get_wrapped_mint_address, get_wrapped_mint_authority, get_wrapped_mint_backpointer_address, + instruction::create_mint, state::Backpointer, + }, + std::convert::TryFrom, }; const MINT_DECIMALS: u8 = 12; const MINT_SUPPLY: u64 = 500_000_000; -const FREEZE_AUTHORITY: &str = "11111115q4EpJaTXAZWpCg3J2zppWGSZ46KXozzo9"; +const FREEZE_AUTHORITY: Pubkey = + Pubkey::from_str_const("11111115q4EpJaTXAZWpCg3J2zppWGSZ46KXozzo9"); -fn setup_spl_mint(rent: &Rent) -> Account { +fn setup_mint(owner: Pubkey, rent: &Rent) -> Account { let state = spl_token::state::Mint { decimals: MINT_DECIMALS, is_initialized: true, supply: MINT_SUPPLY, - freeze_authority: COption::Some(Pubkey::from_str_const(FREEZE_AUTHORITY)), + freeze_authority: COption::Some(FREEZE_AUTHORITY), ..Default::default() }; let mut data = vec![0u8; spl_token::state::Mint::LEN]; @@ -35,28 +48,7 @@ fn setup_spl_mint(rent: &Rent) -> Account { Account { lamports, data, - owner: spl_token::id(), - ..Default::default() - } -} - -fn setup_token_2022_mint(rent: &Rent) -> Account { - let state = spl_token_2022::state::Mint { - decimals: MINT_DECIMALS, - is_initialized: true, - supply: MINT_SUPPLY, - freeze_authority: COption::Some(Pubkey::from_str_const(FREEZE_AUTHORITY)), - ..Default::default() - }; - let mut data = vec![0u8; spl_token_2022::state::Mint::LEN]; - state.pack_into_slice(&mut data); - - let lamports = rent.minimum_balance(data.len()); - - Account { - lamports, - data, - owner: spl_token_2022::id(), + owner, ..Default::default() } } @@ -67,16 +59,17 @@ fn test_idempotency_false_with_existing_account() { let mut mollusk = Mollusk::new(&program_id, "spl_token_wrap"); mollusk_svm_programs_token::token2022::add_program(&mut mollusk); - let wrapped_mint_account = Pubkey::new_unique(); - let wrapped_backpointer_account = Pubkey::new_unique(); - let unwrapped_mint_account = Pubkey::new_unique(); + let unwrapped_mint_address = Pubkey::new_unique(); let wrapped_token_program_id = spl_token_2022::id(); + let wrapped_mint_address = + get_wrapped_mint_address(&unwrapped_mint_address, &wrapped_token_program_id); + let wrapped_backpointer_address = get_wrapped_mint_backpointer_address(&wrapped_mint_address); let instruction = create_mint( &program_id, - &wrapped_mint_account, - &wrapped_backpointer_account, - &unwrapped_mint_account, + &wrapped_mint_address, + &wrapped_backpointer_address, + &unwrapped_mint_address, &wrapped_token_program_id, false, ); @@ -87,11 +80,11 @@ fn test_idempotency_false_with_existing_account() { ..Account::default() }; - // idempotent: true causes these to fail + // idempotent: false causes these to fail let accounts = &[ - (wrapped_mint_account, account_with_data.clone()), // mint already exists - (wrapped_backpointer_account, Account::default()), - (unwrapped_mint_account, Account::default()), + (wrapped_mint_address, account_with_data.clone()), // mint already exists + (wrapped_backpointer_address, Account::default()), + (unwrapped_mint_address, Account::default()), (system_program::id(), Account::default()), mollusk_svm_programs_token::token2022::keyed_account(), ]; @@ -102,9 +95,9 @@ fn test_idempotency_false_with_existing_account() { ); let accounts = &[ - (wrapped_mint_account, Account::default()), - (wrapped_backpointer_account, account_with_data), // backpointer already exists - (unwrapped_mint_account, Account::default()), + (wrapped_mint_address, Account::default()), + (wrapped_backpointer_address, account_with_data), // backpointer already exists + (unwrapped_mint_address, Account::default()), (system_program::id(), Account::default()), mollusk_svm_programs_token::token2022::keyed_account(), ]; @@ -116,49 +109,202 @@ fn test_idempotency_false_with_existing_account() { } #[test] -fn test_idempotency_true_with_existing_account() { +fn test_idempotency_true_with_existing_valid_account() { let program_id = spl_token_wrap::id(); let mut mollusk = Mollusk::new(&program_id, "spl_token_wrap"); mollusk_svm_programs_token::token2022::add_program(&mut mollusk); - let wrapped_mint_account = Pubkey::new_unique(); - let wrapped_backpointer_account = Pubkey::new_unique(); - let unwrapped_mint_account = Pubkey::new_unique(); + let unwrapped_mint_address = Pubkey::new_unique(); let wrapped_token_program_id = spl_token_2022::id(); + let wrapped_mint_address = + get_wrapped_mint_address(&unwrapped_mint_address, &wrapped_token_program_id); + let wrapped_backpointer_address = get_wrapped_mint_backpointer_address(&wrapped_mint_address); let instruction = create_mint( &program_id, - &wrapped_mint_account, - &wrapped_backpointer_account, - &unwrapped_mint_account, + &wrapped_mint_address, + &wrapped_backpointer_address, + &unwrapped_mint_address, &wrapped_token_program_id, true, ); // Simulating existing data on mint or backpointer - let account_with_data = Account { + let mint_account_with_data = Account { data: vec![1; 10], + owner: program_id, + ..Account::default() + }; + let backpointer_account_with_data = Account { + owner: program_id, ..Account::default() }; // idempotent: true causes these to return successfully let accounts = &[ - (wrapped_mint_account, account_with_data.clone()), // mint already exists - (wrapped_backpointer_account, Account::default()), - (unwrapped_mint_account, Account::default()), + (wrapped_mint_address, mint_account_with_data.clone()), // mint already exists + (wrapped_backpointer_address, backpointer_account_with_data), // backpointer already exists + (unwrapped_mint_address, Account::default()), (system_program::id(), Account::default()), mollusk_svm_programs_token::token2022::keyed_account(), ]; mollusk.process_and_validate_instruction(&instruction, accounts, &[Check::success()]); +} + +#[test] +fn test_idempotency_true_with_existing_invalid_accounts() { + let program_id = spl_token_wrap::id(); + let mut mollusk = Mollusk::new(&program_id, "spl_token_wrap"); + mollusk_svm_programs_token::token2022::add_program(&mut mollusk); + + let unwrapped_mint_address = Pubkey::new_unique(); + let wrapped_token_program_id = spl_token_2022::id(); + let wrapped_mint_address = + get_wrapped_mint_address(&unwrapped_mint_address, &wrapped_token_program_id); + let wrapped_backpointer_address = get_wrapped_mint_backpointer_address(&wrapped_mint_address); + + // Incorrectly derived wrapped mint address + + let incorrect_wrapped_mint_addr = Pubkey::new_unique(); + + let instruction = create_mint( + &program_id, + &incorrect_wrapped_mint_addr, + &wrapped_backpointer_address, + &unwrapped_mint_address, + &wrapped_token_program_id, + true, + ); + + let mint_account_with_data = Account { + data: vec![1; 10], + owner: program_id, + ..Account::default() + }; + let backpointer_account_with_data = Account { + owner: program_id, + ..Account::default() + }; let accounts = &[ - (wrapped_mint_account, Account::default()), - (wrapped_backpointer_account, account_with_data), // backpointer already exists - (unwrapped_mint_account, Account::default()), + (incorrect_wrapped_mint_addr, mint_account_with_data.clone()), + (wrapped_backpointer_address, backpointer_account_with_data), + (unwrapped_mint_address, Account::default()), (system_program::id(), Account::default()), mollusk_svm_programs_token::token2022::keyed_account(), ]; - mollusk.process_and_validate_instruction(&instruction, accounts, &[Check::success()]); + mollusk.process_and_validate_instruction( + &instruction, + accounts, + &[Check::err(ProgramError::InvalidAccountData)], + ); + + // Incorrectly wrapped mint account owner + + let instruction = create_mint( + &program_id, + &wrapped_mint_address, + &wrapped_backpointer_address, + &unwrapped_mint_address, + &wrapped_token_program_id, + true, + ); + + let mint_account_with_data = Account { + data: vec![1; 10], + owner: Pubkey::new_unique(), // Wrong owner + ..Account::default() + }; + let backpointer_account_with_data = Account { + owner: program_id, + ..Account::default() + }; + + let accounts = &[ + (wrapped_mint_address, mint_account_with_data.clone()), + (wrapped_backpointer_address, backpointer_account_with_data), + (unwrapped_mint_address, Account::default()), + (system_program::id(), Account::default()), + mollusk_svm_programs_token::token2022::keyed_account(), + ]; + mollusk.process_and_validate_instruction( + &instruction, + accounts, + &[Check::err(ProgramError::InvalidAccountData)], + ); + + // Incorrectly derived wrapped backpointer account address + + let incorrect_wrapped_backpointer_addr = Pubkey::new_unique(); + + let instruction = create_mint( + &program_id, + &wrapped_mint_address, + &incorrect_wrapped_backpointer_addr, + &unwrapped_mint_address, + &wrapped_token_program_id, + true, + ); + + let mint_account_with_data = Account { + data: vec![1; 10], + owner: program_id, + ..Account::default() + }; + let backpointer_account_with_data = Account { + owner: program_id, + ..Account::default() + }; + + let accounts = &[ + (wrapped_mint_address, mint_account_with_data.clone()), + ( + incorrect_wrapped_backpointer_addr, + backpointer_account_with_data, + ), + (unwrapped_mint_address, Account::default()), + (system_program::id(), Account::default()), + mollusk_svm_programs_token::token2022::keyed_account(), + ]; + mollusk.process_and_validate_instruction( + &instruction, + accounts, + &[Check::err(ProgramError::InvalidAccountData)], + ); + + // Incorrect owner on wrapped backpointer account + + let instruction = create_mint( + &program_id, + &wrapped_mint_address, + &wrapped_backpointer_address, + &unwrapped_mint_address, + &wrapped_token_program_id, + true, + ); + + let mint_account_with_data = Account { + data: vec![1; 10], + owner: program_id, + ..Account::default() + }; + let backpointer_account_with_data = Account { + owner: Pubkey::new_unique(), // Wrong owner + ..Account::default() + }; + + let accounts = &[ + (wrapped_mint_address, mint_account_with_data.clone()), + (wrapped_backpointer_address, backpointer_account_with_data), + (unwrapped_mint_address, Account::default()), + (system_program::id(), Account::default()), + mollusk_svm_programs_token::token2022::keyed_account(), + ]; + mollusk.process_and_validate_instruction( + &instruction, + accounts, + &[Check::err(ProgramError::InvalidAccountData)], + ); } #[test] @@ -167,16 +313,17 @@ fn test_create_mint_insufficient_funds() { let mut mollusk = Mollusk::new(&program_id, "spl_token_wrap"); mollusk_svm_programs_token::token2022::add_program(&mut mollusk); - let wrapped_mint_account = Pubkey::new_unique(); - let wrapped_backpointer_account = Pubkey::new_unique(); - let unwrapped_mint_account = Pubkey::new_unique(); + let unwrapped_mint_address = Pubkey::new_unique(); let wrapped_token_program_id = spl_token_2022::id(); + let wrapped_mint_address = + get_wrapped_mint_address(&unwrapped_mint_address, &wrapped_token_program_id); + let wrapped_backpointer_address = get_wrapped_mint_backpointer_address(&wrapped_mint_address); let instruction = create_mint( &program_id, - &wrapped_mint_account, - &wrapped_backpointer_account, - &unwrapped_mint_account, + &wrapped_mint_address, + &wrapped_backpointer_address, + &unwrapped_mint_address, &wrapped_token_program_id, false, ); @@ -194,9 +341,9 @@ fn test_create_mint_insufficient_funds() { }; let accounts = &[ - (wrapped_mint_account, wrapped_mint_account_insufficent_funds), - (wrapped_backpointer_account, Account::default()), - (unwrapped_mint_account, Account::default()), + (wrapped_mint_address, wrapped_mint_account_insufficent_funds), + (wrapped_backpointer_address, Account::default()), + (unwrapped_mint_address, Account::default()), (system_program::id(), Account::default()), mollusk_svm_programs_token::token2022::keyed_account(), ]; @@ -253,7 +400,7 @@ fn test_create_mint_backpointer_insufficient_funds() { wrapped_backpointer_address, wrapped_backpointer_account_insufficent_funds, ), - (unwrapped_mint_address, setup_spl_mint(rent)), + (unwrapped_mint_address, setup_mint(spl_token::id(), rent)), ( system_program::id(), Account { @@ -271,6 +418,151 @@ fn test_create_mint_backpointer_insufficient_funds() { ); } +#[test] +fn test_improperly_derived_addresses_fail() { + let program_id = spl_token_wrap::id(); + let mut mollusk = Mollusk::new(&program_id, "spl_token_wrap"); + mollusk_svm_programs_token::token2022::add_program(&mut mollusk); + + let unwrapped_mint_address = Pubkey::new_unique(); + let wrapped_token_program_id = spl_token_2022::id(); + let wrapped_mint_address = + get_wrapped_mint_address(&unwrapped_mint_address, &wrapped_token_program_id); + let wrapped_backpointer_address = get_wrapped_mint_backpointer_address(&wrapped_mint_address); + + let rent = &mollusk.sysvars.rent; + let unwrapped_mint_account = setup_mint(spl_token::id(), rent); + + // Incorrectly derived wrapped mint address + + let incorrect_wrapped_mint_addr = Pubkey::new_unique(); + let instruction = create_mint( + &program_id, + &incorrect_wrapped_mint_addr, + &wrapped_backpointer_address, + &unwrapped_mint_address, + &wrapped_token_program_id, + false, + ); + + let accounts = &[ + ( + incorrect_wrapped_mint_addr, + Account { + lamports: 100_000_000, + ..Default::default() + }, + ), + ( + wrapped_backpointer_address, + Account { + lamports: 100_000_000, + ..Default::default() + }, + ), + (unwrapped_mint_address, unwrapped_mint_account.clone()), + ( + system_program::id(), + Account { + executable: true, + ..Default::default() + }, + ), + mollusk_svm_programs_token::token2022::keyed_account(), + ]; + mollusk.process_and_validate_instruction( + &instruction, + accounts, + &[Check::instruction_err(InstructionError::MissingAccount)], + ); + + // Incorrectly derived backpointer address + + let incorrect_backpointer = Pubkey::new_unique(); + let instruction = create_mint( + &program_id, + &wrapped_mint_address, + &incorrect_backpointer, + &unwrapped_mint_address, + &wrapped_token_program_id, + false, + ); + + let accounts = &[ + ( + wrapped_mint_address, + Account { + lamports: 100_000_000, + ..Default::default() + }, + ), + ( + incorrect_backpointer, + Account { + lamports: 100_000_000, + ..Default::default() + }, + ), + (unwrapped_mint_address, unwrapped_mint_account.clone()), + ( + system_program::id(), + Account { + executable: true, + ..Default::default() + }, + ), + mollusk_svm_programs_token::token2022::keyed_account(), + ]; + mollusk.process_and_validate_instruction( + &instruction, + accounts, + &[Check::err(ProgramError::InvalidSeeds)], + ); + + // Incorrect token program address passed + + let incorrect_token_program = Pubkey::new_unique(); + let instruction = create_mint( + &program_id, + &wrapped_mint_address, + &wrapped_backpointer_address, + &unwrapped_mint_address, + &incorrect_token_program, + false, + ); + + let accounts = &[ + ( + wrapped_mint_address, + Account { + lamports: 100_000_000, + ..Default::default() + }, + ), + ( + wrapped_backpointer_address, + Account { + lamports: 100_000_000, + ..Default::default() + }, + ), + (unwrapped_mint_address, unwrapped_mint_account.clone()), + ( + system_program::id(), + Account { + executable: true, + ..Default::default() + }, + ), + (incorrect_token_program, Account::default()), + ]; + mollusk.process_and_validate_instruction( + &instruction, + accounts, + &[Check::instruction_err(InstructionError::MissingAccount)], + ); +} + #[test] fn test_successful_spl_token_to_token_2022() { let program_id = spl_token_wrap::id(); @@ -293,7 +585,7 @@ fn test_successful_spl_token_to_token_2022() { ); let rent = &mollusk.sysvars.rent; - let unwrapped_mint_account = setup_spl_mint(rent); + let unwrapped_mint_account = setup_mint(spl_token::id(), rent); let accounts = &[ ( @@ -348,7 +640,7 @@ fn test_successful_spl_token_to_token_2022() { assert!(wrapped_mint_data.is_initialized); assert_eq!( wrapped_mint_data.freeze_authority.unwrap(), - Pubkey::from_str_const(FREEZE_AUTHORITY) + FREEZE_AUTHORITY ); // Assert state of resulting backpointer account @@ -382,7 +674,28 @@ fn test_successful_token_2022_to_spl_token() { ); let rent = &mollusk.sysvars.rent; - let unwrapped_mint_account = setup_token_2022_mint(rent); + + // Add extension to spl_token_2022 + + let mint_size = + ExtensionType::try_calculate_account_len::(&[ExtensionType::MintCloseAuthority]) + .unwrap(); + let mut buffer = vec![0; mint_size]; + let mut state = + PodStateWithExtensionsMut::::unpack_uninitialized(&mut buffer).unwrap(); + state.base.decimals = MINT_DECIMALS; + state.base.is_initialized = PodBool::from_bool(true); + state.base.supply = PodU64::from(MINT_SUPPLY); + state.base.freeze_authority = PodCOption::from(COption::Some(FREEZE_AUTHORITY)); + state.init_account_type().unwrap(); + + let extension = state.init_extension::(true).unwrap(); + let close_authority = + OptionalNonZeroPubkey::try_from(Some(Pubkey::new_from_array([1; 32]))).unwrap(); + extension.close_authority = close_authority; + + let mut unwrapped_mint_account = setup_mint(spl_token_2022::id(), rent); + unwrapped_mint_account.data = buffer; let accounts = &[ ( @@ -426,18 +739,28 @@ fn test_successful_token_2022_to_spl_token() { let resulting_wrapped_mint_account = &result.resulting_accounts[0].1; assert_eq!(resulting_wrapped_mint_account.owner, spl_token::id()); - let wrapped_mint_data = Mint::unpack(&resulting_wrapped_mint_account.data).unwrap(); + let wrapped_mint_data = + PodStateWithExtensions::::unpack(&resulting_wrapped_mint_account.data) + .unwrap() + .base; + assert_eq!(wrapped_mint_data.decimals, MINT_DECIMALS); let expected_mint_authority = get_wrapped_mint_authority(&wrapped_mint_address); assert_eq!( - wrapped_mint_data.mint_authority.unwrap(), + wrapped_mint_data + .mint_authority + .ok_or(ProgramError::InvalidAccountData) + .unwrap(), expected_mint_authority, ); - assert_eq!(wrapped_mint_data.supply, 0); - assert!(wrapped_mint_data.is_initialized); + assert_eq!(wrapped_mint_data.supply, PodU64::from(0)); + assert_eq!(wrapped_mint_data.is_initialized, PodBool::from_bool(true)); assert_eq!( - wrapped_mint_data.freeze_authority.unwrap(), - Pubkey::from_str_const(FREEZE_AUTHORITY) + wrapped_mint_data + .freeze_authority + .ok_or(ProgramError::InvalidAccountData) + .unwrap(), + FREEZE_AUTHORITY ); // Assert state of resulting backpointer account diff --git a/program/tests/test_instruction.rs b/program/tests/test_instruction.rs index e94eb69..59b8144 100644 --- a/program/tests/test_instruction.rs +++ b/program/tests/test_instruction.rs @@ -29,7 +29,7 @@ fn test_pack_unpack_wrap() { #[test] fn test_pack_unpack_unwrap() { - let instruction = TokenWrapInstruction::UnWrap { amount: 100 }; + let instruction = TokenWrapInstruction::Unwrap { amount: 100 }; let packed = instruction.pack(); assert_eq!(packed, vec![2, 100, 0, 0, 0, 0, 0, 0, 0]); diff --git a/rustfmt.toml b/rustfmt.toml index 36789f4..60cb846 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -3,8 +3,11 @@ reorder_imports = true reorder_modules = true # == Nightly only. == +# comment_width = 80 +# format_strings = true +# group_imports = "One" # imports_indent = "Block" # imports_layout = "Mixed" -# imports_granularity = "Crate" -# group_imports = "Preserve" +# imports_granularity = "One" # reorder_impl_items = false +# wrap_comments = true From 96931a3edc0679380d902f00aaa94135405a9496 Mon Sep 17 00:00:00 2001 From: Gabe Rodriguez Date: Tue, 4 Feb 2025 17:48:30 +0100 Subject: [PATCH 11/14] fix ordering --- program/src/instruction.rs | 42 +++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/program/src/instruction.rs b/program/src/instruction.rs index f2b8dc2..d77c44f 100644 --- a/program/src/instruction.rs +++ b/program/src/instruction.rs @@ -12,6 +12,27 @@ use { #[derive(Clone, Debug, PartialEq)] #[repr(u8)] pub enum TokenWrapInstruction { + /// Create a wrapped token mint. Assumes caller has pre-funded wrapped mint + /// and backpointer account. Supports both directions: + /// - spl-token to token-2022 + /// - token-2022 to spl-token + /// + /// Accounts expected by this instruction: + /// + /// 0. `[writeable]` Unallocated wrapped mint account to create (PDA), + /// address must be: `get_wrapped_mint_address(unwrapped_mint_address, + /// wrapped_token_program_id)` + /// 1. `[writeable]` Unallocated wrapped backpointer account to create (PDA) + /// `get_wrapped_mint_backpointer_address(wrapped_mint_address)` + /// 2. `[]` Existing unwrapped mint + /// 3. `[]` System program + /// 4. `[]` SPL Token program for wrapped mint + CreateMint { + /// If true, idempotent creation. If false, fail if the mint already + /// exists. + idempotent: bool, + }, + /// Wrap tokens /// /// Move a user's unwrapped tokens into an escrow account and mint the same @@ -39,27 +60,6 @@ pub enum TokenWrapInstruction { amount: u64, }, - /// Create a wrapped token mint. Assumes caller has pre-funded wrapped mint - /// and backpointer account. Supports both directions: - /// - spl-token to token-2022 - /// - token-2022 to spl-token - /// - /// Accounts expected by this instruction: - /// - /// 0. `[writeable]` Unallocated wrapped mint account to create (PDA), - /// address must be: `get_wrapped_mint_address(unwrapped_mint_address, - /// wrapped_token_program_id)` - /// 1. `[writeable]` Unallocated wrapped backpointer account to create (PDA) - /// `get_wrapped_mint_backpointer_address(wrapped_mint_address)` - /// 2. `[]` Existing unwrapped mint - /// 3. `[]` System program - /// 4. `[]` SPL Token program for wrapped mint - CreateMint { - /// If true, idempotent creation. If false, fail if the mint already - /// exists. - idempotent: bool, - }, - /// Unwrap tokens /// /// Burn user wrapped tokens and transfer the same amount of unwrapped From 1c6abacabaa5ae816a5a6543ddd1b4934ed76678 Mon Sep 17 00:00:00 2001 From: Gabe Rodriguez Date: Thu, 6 Feb 2025 12:28:12 +0100 Subject: [PATCH 12/14] Review updates --- Cargo.lock | 18 ++++- program/Cargo.toml | 2 +- program/src/instruction.rs | 22 +++--- program/src/lib.rs | 3 - program/src/processor.rs | 38 +++++------ program/tests/test_create_mint.rs | 109 +++++------------------------- 6 files changed, 67 insertions(+), 125 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6ac2600..5e8e27d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3109,6 +3109,22 @@ dependencies = [ "solana-pubkey", ] +[[package]] +name = "solana-system-interface" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94d7c18cb1a91c6be5f5a8ac9276a1d7c737e39a21beba9ea710ab4b9c63bc90" +dependencies = [ + "js-sys", + "num-traits", + "serde", + "serde_derive", + "solana-decode-error", + "solana-instruction", + "solana-pubkey", + "wasm-bindgen", +] + [[package]] name = "solana-system-program" version = "2.1.13" @@ -3499,13 +3515,13 @@ dependencies = [ "solana-cpi", "solana-instruction", "solana-msg", - "solana-program", "solana-program-entrypoint", "solana-program-error", "solana-program-option", "solana-program-pack", "solana-pubkey", "solana-rent", + "solana-system-interface", "spl-pod", "spl-token", "spl-token-2022", diff --git a/program/Cargo.toml b/program/Cargo.toml index befb5a5..86d72c5 100644 --- a/program/Cargo.toml +++ b/program/Cargo.toml @@ -17,13 +17,13 @@ solana-account-info = "2.1.13" solana-cpi = "2.1.13" solana-instruction = "2.1.13" solana-msg = "2.1.13" -solana-program = "2.1.13" solana-program-entrypoint = "2.1.13" solana-program-error = "2.1.13" solana-program-option = "2.1.13" solana-program-pack = "2.1.13" solana-pubkey = "2.1.13" solana-rent = "2.1.13" +solana-system-interface = { version = "1.0.0", features = ["bincode"] } spl-pod = "0.5.0" spl-token = { version = "7.0.0", features = ["no-entrypoint"] } spl-token-2022 = { version = "7.0.0", features = ["no-entrypoint"] } diff --git a/program/src/instruction.rs b/program/src/instruction.rs index d77c44f..8b5da67 100644 --- a/program/src/instruction.rs +++ b/program/src/instruction.rs @@ -2,7 +2,6 @@ use { solana_instruction::{AccountMeta, Instruction}, - solana_program::system_program, solana_program_error::ProgramError, solana_pubkey::Pubkey, std::convert::TryInto, @@ -16,6 +15,7 @@ pub enum TokenWrapInstruction { /// and backpointer account. Supports both directions: /// - spl-token to token-2022 /// - token-2022 to spl-token + /// - token-2022 to token-2022 w/ new extensions /// /// Accounts expected by this instruction: /// @@ -149,7 +149,7 @@ pub fn create_mint( AccountMeta::new(*wrapped_mint_address, false), AccountMeta::new(*wrapped_backpointer_address, false), AccountMeta::new_readonly(*unwrapped_mint_address, false), - AccountMeta::new_readonly(system_program::id(), false), + AccountMeta::new_readonly(solana_system_interface::program::id(), false), AccountMeta::new_readonly(*wrapped_token_program_id, false), ]; let data = TokenWrapInstruction::CreateMint { idempotent }.pack(); @@ -169,7 +169,7 @@ pub fn unwrap( wrapped_token_program_id: &Pubkey, unwrapped_token_program_id: &Pubkey, transfer_authority_address: &Pubkey, - signer_pubkeys: &[&Pubkey], + multisig_signer_pubkeys: &[&Pubkey], amount: u64, ) -> Instruction { let mut accounts = vec![ @@ -181,9 +181,12 @@ pub fn unwrap( AccountMeta::new_readonly(*wrapped_mint_authority_address, false), AccountMeta::new_readonly(*wrapped_token_program_id, false), AccountMeta::new_readonly(*unwrapped_token_program_id, false), - AccountMeta::new_readonly(*transfer_authority_address, true), + AccountMeta::new_readonly( + *transfer_authority_address, + multisig_signer_pubkeys.is_empty(), + ), ]; - for signer_pubkey in signer_pubkeys.iter() { + for signer_pubkey in multisig_signer_pubkeys.iter() { accounts.push(AccountMeta::new_readonly(**signer_pubkey, true)); } @@ -204,7 +207,7 @@ pub fn wrap( unwrapped_token_program_id: &Pubkey, wrapped_token_program_id: &Pubkey, transfer_authority_address: &Pubkey, - signer_pubkeys: &[&Pubkey], + multisig_signer_pubkeys: &[&Pubkey], amount: u64, ) -> Instruction { let mut accounts = vec![ @@ -216,9 +219,12 @@ pub fn wrap( AccountMeta::new_readonly(*wrapped_mint_authority_address, false), AccountMeta::new_readonly(*unwrapped_token_program_id, false), AccountMeta::new_readonly(*wrapped_token_program_id, false), - AccountMeta::new_readonly(*transfer_authority_address, true), + AccountMeta::new_readonly( + *transfer_authority_address, + multisig_signer_pubkeys.is_empty(), + ), ]; - for signer_pubkey in signer_pubkeys.iter() { + for signer_pubkey in multisig_signer_pubkeys.iter() { accounts.push(AccountMeta::new_readonly(**signer_pubkey, true)); } diff --git a/program/src/lib.rs b/program/src/lib.rs index 571021d..5e2cd16 100644 --- a/program/src/lib.rs +++ b/program/src/lib.rs @@ -7,9 +7,6 @@ pub mod instruction; pub mod processor; pub mod state; -// Export current SDK types for downstream users building with a different SDK -// version -pub use solana_program; use solana_pubkey::Pubkey; solana_pubkey::declare_id!("TwRapQCDhWkZRrDaHfZGuHxkZ91gHDRkyuzNqeU5MgR"); diff --git a/program/src/processor.rs b/program/src/processor.rs index 2525aa9..7d98f7b 100644 --- a/program/src/processor.rs +++ b/program/src/processor.rs @@ -10,13 +10,14 @@ use { solana_account_info::{next_account_info, AccountInfo}, solana_cpi::{invoke, invoke_signed}, solana_msg::msg, - solana_program::{system_instruction, sysvar::Sysvar}, solana_program_error::{ProgramError, ProgramResult}, solana_program_pack::Pack, solana_pubkey::Pubkey, solana_rent::Rent, + solana_system_interface::instruction::{allocate, assign}, spl_token_2022::{ extension::PodStateWithExtensions, instruction::initialize_mint2, pod::PodMint, + solana_program::sysvar::Sysvar, }, }; @@ -42,6 +43,18 @@ pub fn process_create_mint( let (wrapped_backpointer_address, backpointer_bump) = get_wrapped_mint_backpointer_address_with_seed(wrapped_mint_account.key); + // PDA derivation validation + + if *wrapped_mint_account.key != wrapped_mint_address { + msg!("Wrapped mint account address does not match expected PDA"); + return Err(ProgramError::InvalidAccountData); + } + + if *wrapped_backpointer_account.key != wrapped_backpointer_address { + msg!("Error: wrapped_backpointer_account address is not as expected"); + return Err(ProgramError::InvalidSeeds); + } + // Idempotency checks if wrapped_mint_account.data_len() > 0 || wrapped_backpointer_account.data_len() > 0 { @@ -49,18 +62,10 @@ pub fn process_create_mint( if !idempotent { return Err(ProgramError::AccountAlreadyInitialized); } - if *wrapped_mint_account.key != wrapped_mint_address { - msg!("Wrapped mint account address does not match expected PDA"); - return Err(ProgramError::InvalidAccountData); - } - if wrapped_mint_account.owner != program_id { + if wrapped_mint_account.owner != wrapped_token_program_account.key { msg!("Wrapped mint account owner is not the expected token program"); return Err(ProgramError::InvalidAccountData); } - if *wrapped_backpointer_account.key != wrapped_backpointer_address { - msg!("Wrapped backpointer account address does not match expected PDA"); - return Err(ProgramError::InvalidAccountData); - } if wrapped_backpointer_account.owner != program_id { msg!("Wrapped backpointer account owner is not the expected token wrap program"); return Err(ProgramError::InvalidAccountData); @@ -91,12 +96,12 @@ pub fn process_create_mint( // Initialize the wrapped mint invoke_signed( - &system_instruction::allocate(&wrapped_mint_address, space as u64), + &allocate(&wrapped_mint_address, space as u64), &[wrapped_mint_account.clone()], &[&signer_seeds], )?; invoke_signed( - &system_instruction::assign(&wrapped_mint_address, wrapped_token_program_account.key), + &assign(&wrapped_mint_address, wrapped_token_program_account.key), &[wrapped_mint_account.clone()], &[&signer_seeds], )?; @@ -126,11 +131,6 @@ pub fn process_create_mint( // Initialize backpointer PDA - if *wrapped_backpointer_account.key != wrapped_backpointer_address { - msg!("Error: wrapped_backpointer_account address is not as expected"); - return Err(ProgramError::InvalidSeeds); - } - let backpointer_space = std::mem::size_of::(); let backpointer_rent_required = rent.minimum_balance(space); if wrapped_backpointer_account.lamports() < rent.minimum_balance(backpointer_space) { @@ -145,12 +145,12 @@ pub fn process_create_mint( let backpointer_signer_seeds = get_wrapped_mint_backpointer_address_signer_seeds(wrapped_mint_account.key, &bump_seed); invoke_signed( - &system_instruction::allocate(&wrapped_backpointer_address, backpointer_space as u64), + &allocate(&wrapped_backpointer_address, backpointer_space as u64), &[wrapped_backpointer_account.clone()], &[&backpointer_signer_seeds], )?; invoke_signed( - &system_instruction::assign(&wrapped_backpointer_address, program_id), + &assign(&wrapped_backpointer_address, program_id), &[wrapped_backpointer_account.clone()], &[&backpointer_signer_seeds], )?; diff --git a/program/tests/test_create_mint.rs b/program/tests/test_create_mint.rs index ab0c772..24255c0 100644 --- a/program/tests/test_create_mint.rs +++ b/program/tests/test_create_mint.rs @@ -1,8 +1,6 @@ use { mollusk_svm::{result::Check, Mollusk}, solana_account::Account, - solana_instruction::error::InstructionError, - solana_program::system_program, solana_program_error::ProgramError, solana_program_option::COption, solana_program_pack::Pack, @@ -85,7 +83,7 @@ fn test_idempotency_false_with_existing_account() { (wrapped_mint_address, account_with_data.clone()), // mint already exists (wrapped_backpointer_address, Account::default()), (unwrapped_mint_address, Account::default()), - (system_program::id(), Account::default()), + (solana_system_interface::program::id(), Account::default()), mollusk_svm_programs_token::token2022::keyed_account(), ]; mollusk.process_and_validate_instruction( @@ -98,7 +96,7 @@ fn test_idempotency_false_with_existing_account() { (wrapped_mint_address, Account::default()), (wrapped_backpointer_address, account_with_data), // backpointer already exists (unwrapped_mint_address, Account::default()), - (system_program::id(), Account::default()), + (solana_system_interface::program::id(), Account::default()), mollusk_svm_programs_token::token2022::keyed_account(), ]; mollusk.process_and_validate_instruction( @@ -132,7 +130,7 @@ fn test_idempotency_true_with_existing_valid_account() { // Simulating existing data on mint or backpointer let mint_account_with_data = Account { data: vec![1; 10], - owner: program_id, + owner: wrapped_token_program_id, ..Account::default() }; let backpointer_account_with_data = Account { @@ -145,7 +143,7 @@ fn test_idempotency_true_with_existing_valid_account() { (wrapped_mint_address, mint_account_with_data.clone()), // mint already exists (wrapped_backpointer_address, backpointer_account_with_data), // backpointer already exists (unwrapped_mint_address, Account::default()), - (system_program::id(), Account::default()), + (solana_system_interface::program::id(), Account::default()), mollusk_svm_programs_token::token2022::keyed_account(), ]; mollusk.process_and_validate_instruction(&instruction, accounts, &[Check::success()]); @@ -163,42 +161,6 @@ fn test_idempotency_true_with_existing_invalid_accounts() { get_wrapped_mint_address(&unwrapped_mint_address, &wrapped_token_program_id); let wrapped_backpointer_address = get_wrapped_mint_backpointer_address(&wrapped_mint_address); - // Incorrectly derived wrapped mint address - - let incorrect_wrapped_mint_addr = Pubkey::new_unique(); - - let instruction = create_mint( - &program_id, - &incorrect_wrapped_mint_addr, - &wrapped_backpointer_address, - &unwrapped_mint_address, - &wrapped_token_program_id, - true, - ); - - let mint_account_with_data = Account { - data: vec![1; 10], - owner: program_id, - ..Account::default() - }; - let backpointer_account_with_data = Account { - owner: program_id, - ..Account::default() - }; - - let accounts = &[ - (incorrect_wrapped_mint_addr, mint_account_with_data.clone()), - (wrapped_backpointer_address, backpointer_account_with_data), - (unwrapped_mint_address, Account::default()), - (system_program::id(), Account::default()), - mollusk_svm_programs_token::token2022::keyed_account(), - ]; - mollusk.process_and_validate_instruction( - &instruction, - accounts, - &[Check::err(ProgramError::InvalidAccountData)], - ); - // Incorrectly wrapped mint account owner let instruction = create_mint( @@ -224,46 +186,7 @@ fn test_idempotency_true_with_existing_invalid_accounts() { (wrapped_mint_address, mint_account_with_data.clone()), (wrapped_backpointer_address, backpointer_account_with_data), (unwrapped_mint_address, Account::default()), - (system_program::id(), Account::default()), - mollusk_svm_programs_token::token2022::keyed_account(), - ]; - mollusk.process_and_validate_instruction( - &instruction, - accounts, - &[Check::err(ProgramError::InvalidAccountData)], - ); - - // Incorrectly derived wrapped backpointer account address - - let incorrect_wrapped_backpointer_addr = Pubkey::new_unique(); - - let instruction = create_mint( - &program_id, - &wrapped_mint_address, - &incorrect_wrapped_backpointer_addr, - &unwrapped_mint_address, - &wrapped_token_program_id, - true, - ); - - let mint_account_with_data = Account { - data: vec![1; 10], - owner: program_id, - ..Account::default() - }; - let backpointer_account_with_data = Account { - owner: program_id, - ..Account::default() - }; - - let accounts = &[ - (wrapped_mint_address, mint_account_with_data.clone()), - ( - incorrect_wrapped_backpointer_addr, - backpointer_account_with_data, - ), - (unwrapped_mint_address, Account::default()), - (system_program::id(), Account::default()), + (solana_system_interface::program::id(), Account::default()), mollusk_svm_programs_token::token2022::keyed_account(), ]; mollusk.process_and_validate_instruction( @@ -285,7 +208,7 @@ fn test_idempotency_true_with_existing_invalid_accounts() { let mint_account_with_data = Account { data: vec![1; 10], - owner: program_id, + owner: wrapped_token_program_id, ..Account::default() }; let backpointer_account_with_data = Account { @@ -297,7 +220,7 @@ fn test_idempotency_true_with_existing_invalid_accounts() { (wrapped_mint_address, mint_account_with_data.clone()), (wrapped_backpointer_address, backpointer_account_with_data), (unwrapped_mint_address, Account::default()), - (system_program::id(), Account::default()), + (solana_system_interface::program::id(), Account::default()), mollusk_svm_programs_token::token2022::keyed_account(), ]; mollusk.process_and_validate_instruction( @@ -344,7 +267,7 @@ fn test_create_mint_insufficient_funds() { (wrapped_mint_address, wrapped_mint_account_insufficent_funds), (wrapped_backpointer_address, Account::default()), (unwrapped_mint_address, Account::default()), - (system_program::id(), Account::default()), + (solana_system_interface::program::id(), Account::default()), mollusk_svm_programs_token::token2022::keyed_account(), ]; mollusk.process_and_validate_instruction( @@ -402,7 +325,7 @@ fn test_create_mint_backpointer_insufficient_funds() { ), (unwrapped_mint_address, setup_mint(spl_token::id(), rent)), ( - system_program::id(), + solana_system_interface::program::id(), Account { executable: true, ..Default::default() @@ -462,7 +385,7 @@ fn test_improperly_derived_addresses_fail() { ), (unwrapped_mint_address, unwrapped_mint_account.clone()), ( - system_program::id(), + solana_system_interface::program::id(), Account { executable: true, ..Default::default() @@ -473,7 +396,7 @@ fn test_improperly_derived_addresses_fail() { mollusk.process_and_validate_instruction( &instruction, accounts, - &[Check::instruction_err(InstructionError::MissingAccount)], + &[Check::err(ProgramError::InvalidAccountData)], ); // Incorrectly derived backpointer address @@ -505,7 +428,7 @@ fn test_improperly_derived_addresses_fail() { ), (unwrapped_mint_address, unwrapped_mint_account.clone()), ( - system_program::id(), + solana_system_interface::program::id(), Account { executable: true, ..Default::default() @@ -548,7 +471,7 @@ fn test_improperly_derived_addresses_fail() { ), (unwrapped_mint_address, unwrapped_mint_account.clone()), ( - system_program::id(), + solana_system_interface::program::id(), Account { executable: true, ..Default::default() @@ -559,7 +482,7 @@ fn test_improperly_derived_addresses_fail() { mollusk.process_and_validate_instruction( &instruction, accounts, - &[Check::instruction_err(InstructionError::MissingAccount)], + &[Check::err(ProgramError::InvalidAccountData)], ); } @@ -604,7 +527,7 @@ fn test_successful_spl_token_to_token_2022() { ), (unwrapped_mint_address, unwrapped_mint_account.clone()), ( - system_program::id(), + solana_system_interface::program::id(), Account { executable: true, ..Default::default() @@ -714,7 +637,7 @@ fn test_successful_token_2022_to_spl_token() { ), (unwrapped_mint_address, unwrapped_mint_account.clone()), ( - system_program::id(), + solana_system_interface::program::id(), Account { executable: true, ..Default::default() From 2c0a9b92516741cac3ec65640b20958f3f65018f Mon Sep 17 00:00:00 2001 From: Gabe Rodriguez Date: Thu, 6 Feb 2025 16:14:36 +0100 Subject: [PATCH 13/14] Review updates pt. 4 --- Cargo.lock | 1 + program/Cargo.toml | 3 +++ program/src/processor.rs | 2 +- rustfmt.toml | 16 ++++++++-------- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5e8e27d..98b5449 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3515,6 +3515,7 @@ dependencies = [ "solana-cpi", "solana-instruction", "solana-msg", + "solana-program", "solana-program-entrypoint", "solana-program-error", "solana-program-option", diff --git a/program/Cargo.toml b/program/Cargo.toml index 86d72c5..52b5cd1 100644 --- a/program/Cargo.toml +++ b/program/Cargo.toml @@ -28,6 +28,9 @@ spl-pod = "0.5.0" spl-token = { version = "7.0.0", features = ["no-entrypoint"] } spl-token-2022 = { version = "7.0.0", features = ["no-entrypoint"] } +# Only needed until solana-sysvar is bumped to 2.1 +solana-program = "2.1.13" + [dev-dependencies] mollusk-svm = "0.0.15" mollusk-svm-programs-token = "0.0.15" diff --git a/program/src/processor.rs b/program/src/processor.rs index 7d98f7b..09a6882 100644 --- a/program/src/processor.rs +++ b/program/src/processor.rs @@ -10,6 +10,7 @@ use { solana_account_info::{next_account_info, AccountInfo}, solana_cpi::{invoke, invoke_signed}, solana_msg::msg, + solana_program::sysvar::Sysvar, solana_program_error::{ProgramError, ProgramResult}, solana_program_pack::Pack, solana_pubkey::Pubkey, @@ -17,7 +18,6 @@ use { solana_system_interface::instruction::{allocate, assign}, spl_token_2022::{ extension::PodStateWithExtensions, instruction::initialize_mint2, pod::PodMint, - solana_program::sysvar::Sysvar, }, }; diff --git a/rustfmt.toml b/rustfmt.toml index 60cb846..b81d5e8 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -3,11 +3,11 @@ reorder_imports = true reorder_modules = true # == Nightly only. == -# comment_width = 80 -# format_strings = true -# group_imports = "One" -# imports_indent = "Block" -# imports_layout = "Mixed" -# imports_granularity = "One" -# reorder_impl_items = false -# wrap_comments = true +comment_width = 80 +format_strings = true +group_imports = "One" +imports_indent = "Block" +imports_layout = "Mixed" +imports_granularity = "One" +reorder_impl_items = false +wrap_comments = true From 1ea0dd161da9acea952a0753eb81171a1ad9fb61 Mon Sep 17 00:00:00 2001 From: Gabe Rodriguez Date: Fri, 7 Feb 2025 10:55:29 +0100 Subject: [PATCH 14/14] Review updates --- program/src/instruction.rs | 68 ++++++++++++++----------------- program/src/processor.rs | 8 ++-- program/tests/test_create_mint.rs | 6 +-- 3 files changed, 37 insertions(+), 45 deletions(-) diff --git a/program/src/instruction.rs b/program/src/instruction.rs index 8b5da67..be18e97 100644 --- a/program/src/instruction.rs +++ b/program/src/instruction.rs @@ -48,12 +48,10 @@ pub enum TokenWrapInstruction { /// `get_wrapped_mint_address(unwrapped_mint_address, /// wrapped_token_program_id)` /// 4. `[writeable]` Recipient wrapped token account - /// 5. `[]` Escrow mint authority, address must be: - /// `get_wrapped_mint_authority(wrapped_mint)` - /// 6. `[]` SPL Token program for unwrapped mint - /// 7. `[]` SPL Token program for wrapped mint - /// 8. `[signer]` Transfer authority on unwrapped token account - /// 9. `..8+M` `[signer]` (Optional) M multisig signers on unwrapped token + /// 5. `[]` SPL Token program for unwrapped mint + /// 6. `[]` SPL Token program for wrapped mint + /// 7. `[signer]` Transfer authority on unwrapped token account + /// 8. `..8+M` `[signer]` (Optional) M multisig signers on unwrapped token /// account Wrap { /// little-endian `u64` representing the amount to wrap @@ -75,12 +73,10 @@ pub enum TokenWrapInstruction { /// `get_wrapped_mint_authority(wrapped_mint_address)` /// 3. `[writeable]` Recipient unwrapped tokens /// 4. `[]` Unwrapped token mint - /// 5. `[]` Escrow unwrapped token authority - /// `get_wrapped_mint_authority(wrapped_mint)` - /// 6. `[]` SPL Token program for wrapped mint - /// 7. `[]` SPL Token program for unwrapped mint - /// 8. `[signer]` Transfer authority on wrapped token account - /// 9. `..8+M` `[signer]` (Optional) M multisig signers on wrapped token + /// 5. `[]` SPL Token program for wrapped mint + /// 6. `[]` SPL Token program for unwrapped mint + /// 7. `[signer]` Transfer authority on wrapped token account + /// 8. `..8+M` `[signer]` (Optional) M multisig signers on wrapped token /// account Unwrap { /// little-endian `u64` representing the amount to unwrap @@ -156,31 +152,29 @@ pub fn create_mint( Instruction::new_with_bytes(*program_id, &data, accounts) } -/// Creates `UnWrap` instruction. +/// Creates `Wrap` instruction. #[allow(clippy::too_many_arguments)] -pub fn unwrap( +pub fn wrap( program_id: &Pubkey, - wrapped_token_account_address: &Pubkey, - wrapped_mint_address: &Pubkey, + unwrapped_token_account_address: &Pubkey, unwrapped_escrow_address: &Pubkey, - recipient_unwrapped_token_account_address: &Pubkey, unwrapped_mint_address: &Pubkey, - wrapped_mint_authority_address: &Pubkey, - wrapped_token_program_id: &Pubkey, + wrapped_mint_address: &Pubkey, + recipient_wrapped_token_account_address: &Pubkey, unwrapped_token_program_id: &Pubkey, + wrapped_token_program_id: &Pubkey, transfer_authority_address: &Pubkey, multisig_signer_pubkeys: &[&Pubkey], amount: u64, ) -> Instruction { let mut accounts = vec![ - AccountMeta::new(*wrapped_token_account_address, false), - AccountMeta::new(*wrapped_mint_address, false), + AccountMeta::new(*unwrapped_token_account_address, false), AccountMeta::new(*unwrapped_escrow_address, false), - AccountMeta::new(*recipient_unwrapped_token_account_address, false), AccountMeta::new_readonly(*unwrapped_mint_address, false), - AccountMeta::new_readonly(*wrapped_mint_authority_address, false), - AccountMeta::new_readonly(*wrapped_token_program_id, false), + AccountMeta::new(*wrapped_mint_address, false), + AccountMeta::new(*recipient_wrapped_token_account_address, false), AccountMeta::new_readonly(*unwrapped_token_program_id, false), + AccountMeta::new_readonly(*wrapped_token_program_id, false), AccountMeta::new_readonly( *transfer_authority_address, multisig_signer_pubkeys.is_empty(), @@ -190,35 +184,33 @@ pub fn unwrap( accounts.push(AccountMeta::new_readonly(**signer_pubkey, true)); } - let data = TokenWrapInstruction::Unwrap { amount }.pack(); + let data = TokenWrapInstruction::Wrap { amount }.pack(); Instruction::new_with_bytes(*program_id, &data, accounts) } -/// Creates `Wrap` instruction. +/// Creates `Unwrap` instruction. #[allow(clippy::too_many_arguments)] -pub fn wrap( +pub fn unwrap( program_id: &Pubkey, - unwrapped_token_account_address: &Pubkey, + wrapped_token_account_address: &Pubkey, + wrapped_mint_address: &Pubkey, unwrapped_escrow_address: &Pubkey, + recipient_unwrapped_token_account_address: &Pubkey, unwrapped_mint_address: &Pubkey, - wrapped_mint_address: &Pubkey, - recipient_wrapped_token_account_address: &Pubkey, - wrapped_mint_authority_address: &Pubkey, - unwrapped_token_program_id: &Pubkey, wrapped_token_program_id: &Pubkey, + unwrapped_token_program_id: &Pubkey, transfer_authority_address: &Pubkey, multisig_signer_pubkeys: &[&Pubkey], amount: u64, ) -> Instruction { let mut accounts = vec![ - AccountMeta::new(*unwrapped_token_account_address, false), + AccountMeta::new(*wrapped_token_account_address, false), + AccountMeta::new(*wrapped_mint_address, false), AccountMeta::new(*unwrapped_escrow_address, false), + AccountMeta::new(*recipient_unwrapped_token_account_address, false), AccountMeta::new_readonly(*unwrapped_mint_address, false), - AccountMeta::new(*wrapped_mint_address, false), - AccountMeta::new(*recipient_wrapped_token_account_address, false), - AccountMeta::new_readonly(*wrapped_mint_authority_address, false), - AccountMeta::new_readonly(*unwrapped_token_program_id, false), AccountMeta::new_readonly(*wrapped_token_program_id, false), + AccountMeta::new_readonly(*unwrapped_token_program_id, false), AccountMeta::new_readonly( *transfer_authority_address, multisig_signer_pubkeys.is_empty(), @@ -228,6 +220,6 @@ pub fn wrap( accounts.push(AccountMeta::new_readonly(**signer_pubkey, true)); } - let data = TokenWrapInstruction::Wrap { amount }.pack(); + let data = TokenWrapInstruction::Unwrap { amount }.pack(); Instruction::new_with_bytes(*program_id, &data, accounts) } diff --git a/program/src/processor.rs b/program/src/processor.rs index 09a6882..9ad58f9 100644 --- a/program/src/processor.rs +++ b/program/src/processor.rs @@ -64,11 +64,11 @@ pub fn process_create_mint( } if wrapped_mint_account.owner != wrapped_token_program_account.key { msg!("Wrapped mint account owner is not the expected token program"); - return Err(ProgramError::InvalidAccountData); + return Err(ProgramError::InvalidAccountOwner); } if wrapped_backpointer_account.owner != program_id { msg!("Wrapped backpointer account owner is not the expected token wrap program"); - return Err(ProgramError::InvalidAccountData); + return Err(ProgramError::InvalidAccountOwner); } return Ok(()); } @@ -90,7 +90,7 @@ pub fn process_create_mint( "Error: wrapped_mint_account requires pre-funding of {} lamports", mint_rent_required ); - return Err(ProgramError::InsufficientFunds); + return Err(ProgramError::AccountNotRentExempt); } // Initialize the wrapped mint @@ -180,7 +180,7 @@ pub fn process_instruction( unimplemented!(); } TokenWrapInstruction::Unwrap { .. } => { - msg!("Instruction: UnWrap"); + msg!("Instruction: Unwrap"); unimplemented!(); } } diff --git a/program/tests/test_create_mint.rs b/program/tests/test_create_mint.rs index 24255c0..cc5afb6 100644 --- a/program/tests/test_create_mint.rs +++ b/program/tests/test_create_mint.rs @@ -192,7 +192,7 @@ fn test_idempotency_true_with_existing_invalid_accounts() { mollusk.process_and_validate_instruction( &instruction, accounts, - &[Check::err(ProgramError::InvalidAccountData)], + &[Check::err(ProgramError::InvalidAccountOwner)], ); // Incorrect owner on wrapped backpointer account @@ -226,7 +226,7 @@ fn test_idempotency_true_with_existing_invalid_accounts() { mollusk.process_and_validate_instruction( &instruction, accounts, - &[Check::err(ProgramError::InvalidAccountData)], + &[Check::err(ProgramError::InvalidAccountOwner)], ); } @@ -273,7 +273,7 @@ fn test_create_mint_insufficient_funds() { mollusk.process_and_validate_instruction( &instruction, accounts, - &[Check::err(ProgramError::InsufficientFunds)], + &[Check::err(ProgramError::AccountNotRentExempt)], ); }