Merge pull request #542 from technoch1ef/main

feat: improve the identification of writeable accounts

Author: KellianDev

Cargo.toml

@@ -191,13 +191,13 @@ spl-token-interface = "2.0.0"
 spl-token-metadata-interface = "0.8.0"
 spl-type-length-value = "0.9.0"
 sqlx = { version = "0.8.6", features = [
-  "macros",
-  "runtime-tokio-rustls",
-  "postgres",
-  "uuid",
-  "chrono",
-  "rust_decimal",
-  "bigdecimal",
+    "macros",
+    "runtime-tokio-rustls",
+    "postgres",
+    "uuid",
+    "chrono",
+    "rust_decimal",
+    "bigdecimal",
 ] }
 sqlx_migrator = { version = "0.17.0", features = ["postgres"] }
 syn = { version = "1.0", features = ["full"] }

crates/core/src/transformers.rs

@@ -107,7 +107,22 @@ pub fn extract_instructions_with_metadata(
                 &meta.inner_instructions,
                 transaction_metadata,
                 &mut instructions_with_metadata,
-                |key, _| meta.loaded_addresses.writable.contains(key),
+                |key, idx| {
+                    let num_static = v0.account_keys.len();
+                    if idx < num_static {
+                        let num_signers = v0.header.num_required_signatures as usize;
+                        let num_readonly_signed = v0.header.num_readonly_signed_accounts as usize;
+                        let num_readonly_unsigned =
+                            v0.header.num_readonly_unsigned_accounts as usize;
+                        if idx < num_signers {
+                            idx < num_signers - num_readonly_signed
+                        } else {
+                            idx < num_static - num_readonly_unsigned
+                        }
+                    } else {
+                        meta.loaded_addresses.writable.contains(key)
+                    }
+                },
                 |_, idx| idx < v0.header.num_required_signatures as usize,
             );
         }