-
Notifications
You must be signed in to change notification settings - Fork 114
feat(core): implement ArgumentDecoder using function parameter specs … #389
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
codeZe-us
merged 1 commit into
Toolbox-Lab:main
from
uche102:fix/argument-decoder-parameter-specs
Jul 30, 2026
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,307 @@ | ||
| use crate::decode::function_call_decoder::DecodedArgument; | ||
| use crate::decode::return_decoder::ReturnValueDecoder; | ||
| use crate::spec::decoder::{ContractFunction, ContractSpec}; | ||
| use serde_json::Value; | ||
| use stellar_xdr::curr::{ScSpecTypeDef, ScVal}; | ||
|
|
||
| /// Decoder for contract function arguments, converting raw `ScVal` structures | ||
| /// into typed, human-readable `DecodedArgument` representations based on contract function parameter specifications. | ||
| #[derive(Debug, Clone, Default)] | ||
| pub struct ArgumentDecoder { | ||
| return_decoder: ReturnValueDecoder, | ||
| } | ||
|
|
||
| impl ArgumentDecoder { | ||
| /// Creates a new `ArgumentDecoder`. | ||
| pub fn new() -> Self { | ||
| Self { | ||
| return_decoder: ReturnValueDecoder::new(), | ||
| } | ||
| } | ||
|
|
||
| /// Decodes a list of raw `ScVal` arguments using a slice of parameter definitions `(name, type_def)`. | ||
| /// | ||
| /// Edge cases handled: | ||
| /// - Extra arguments beyond parameter specs are decoded dynamically with fallback names `argN`. | ||
| /// - Fewer arguments than parameter specs decode only the supplied arguments. | ||
| /// - Type conflicts between the raw `ScVal` and the `ScSpecTypeDef` fall back to dynamic decoding. | ||
| pub fn decode( | ||
| &self, | ||
| args: &[ScVal], | ||
| param_defs: &[(String, ScSpecTypeDef)], | ||
| contract_spec: Option<&ContractSpec>, | ||
| ) -> Vec<DecodedArgument> { | ||
| args.iter() | ||
| .enumerate() | ||
| .map(|(i, val)| { | ||
| if let Some((param_name, type_def)) = param_defs.get(i) { | ||
| self.decode_single_argument(param_name, val, Some(type_def), contract_spec) | ||
| } else { | ||
| let fallback_name = format!("arg{i}"); | ||
| self.decode_single_argument(&fallback_name, val, None, contract_spec) | ||
| } | ||
| }) | ||
| .collect() | ||
| } | ||
|
|
||
| /// Decodes a list of raw `ScVal` arguments given a target `ContractFunction` spec. | ||
| pub fn decode_function_args( | ||
| &self, | ||
| args: &[ScVal], | ||
| func: &ContractFunction, | ||
| contract_spec: Option<&ContractSpec>, | ||
| ) -> Vec<DecodedArgument> { | ||
| if !func.param_defs.is_empty() { | ||
| self.decode(args, &func.param_defs, contract_spec) | ||
| } else { | ||
| args.iter() | ||
| .enumerate() | ||
| .map(|(i, val)| { | ||
| let name = func | ||
| .params | ||
| .get(i) | ||
| .map(|(pname, _)| pname.clone()) | ||
| .unwrap_or_else(|| format!("arg{i}")); | ||
| self.decode_single_argument(&name, val, None, contract_spec) | ||
| }) | ||
| .collect() | ||
| } | ||
| } | ||
|
|
||
| /// Decodes raw `ScVal` arguments dynamically without parameter specifications. | ||
| pub fn decode_dynamic(&self, args: &[ScVal]) -> Vec<DecodedArgument> { | ||
| args.iter() | ||
| .enumerate() | ||
| .map(|(i, val)| { | ||
| let name = format!("arg{i}"); | ||
| self.decode_single_argument(&name, val, None, None) | ||
| }) | ||
| .collect() | ||
| } | ||
|
|
||
| /// Decodes a single `ScVal` argument into a `DecodedArgument`. | ||
| pub fn decode_single_argument( | ||
| &self, | ||
| name: &str, | ||
| val: &ScVal, | ||
| type_def: Option<&ScSpecTypeDef>, | ||
| contract_spec: Option<&ContractSpec>, | ||
| ) -> DecodedArgument { | ||
| let value = self.return_decoder.decode(val, type_def, contract_spec); | ||
| let formatted = Self::format_value(&value); | ||
| DecodedArgument { | ||
| name: name.to_string(), | ||
| value, | ||
| formatted, | ||
| } | ||
| } | ||
|
|
||
| /// Formats a decoded JSON value into a clean human-readable string representation. | ||
| pub fn format_value(value: &Value) -> String { | ||
| match value { | ||
| Value::String(s) => s.clone(), | ||
| Value::Null => "null".to_string(), | ||
| Value::Bool(b) => b.to_string(), | ||
| Value::Number(n) => n.to_string(), | ||
| other => serde_json::to_string(other).unwrap_or_else(|_| other.to_string()), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use super::*; | ||
| use crate::spec::decoder::{ContractStructDef, ContractStructField}; | ||
| use serde_json::json; | ||
| use stellar_xdr::curr::{ | ||
| Hash, ScAddress, ScMapEntry, ScString, ScSymbol, ScVal, | ||
| }; | ||
|
|
||
| fn sym(s: &str) -> ScVal { | ||
| ScVal::Symbol(ScSymbol(s.try_into().unwrap())) | ||
| } | ||
|
|
||
| fn str_val(s: &str) -> ScVal { | ||
| ScVal::String(ScString(s.try_into().unwrap())) | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_primitive_argument_decoding() { | ||
| let decoder = ArgumentDecoder::new(); | ||
| let args = vec![ScVal::U32(42), ScVal::Bool(true), sym("admin")]; | ||
| let param_defs = vec![ | ||
| ("amount".to_string(), ScSpecTypeDef::U32), | ||
| ("active".to_string(), ScSpecTypeDef::Bool), | ||
| ("role".to_string(), ScSpecTypeDef::Symbol), | ||
| ]; | ||
|
|
||
| let decoded = decoder.decode(&args, ¶m_defs, None); | ||
| assert_eq!(decoded.len(), 3); | ||
|
|
||
| assert_eq!(decoded[0].name, "amount"); | ||
| assert_eq!(decoded[0].value, json!(42)); | ||
| assert_eq!(decoded[0].formatted, "42"); | ||
|
|
||
| assert_eq!(decoded[1].name, "active"); | ||
| assert_eq!(decoded[1].value, json!(true)); | ||
| assert_eq!(decoded[1].formatted, "true"); | ||
|
|
||
| assert_eq!(decoded[2].name, "role"); | ||
| assert_eq!(decoded[2].value, json!("admin")); | ||
| assert_eq!(decoded[2].formatted, "admin"); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_argument_count_mismatch_extra_arguments() { | ||
| let decoder = ArgumentDecoder::new(); | ||
| let args = vec![ScVal::U32(100), ScVal::I32(-5), sym("extra")]; | ||
| let param_defs = vec![("count".to_string(), ScSpecTypeDef::U32)]; | ||
|
|
||
| let decoded = decoder.decode(&args, ¶m_defs, None); | ||
| assert_eq!(decoded.len(), 3); | ||
|
|
||
| assert_eq!(decoded[0].name, "count"); | ||
| assert_eq!(decoded[0].value, json!(100)); | ||
|
|
||
| assert_eq!(decoded[1].name, "arg1"); | ||
| assert_eq!(decoded[1].value, json!(-5)); | ||
| assert_eq!(decoded[1].formatted, "-5"); | ||
|
|
||
| assert_eq!(decoded[2].name, "arg2"); | ||
| assert_eq!(decoded[2].value, json!("extra")); | ||
| assert_eq!(decoded[2].formatted, "extra"); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_argument_count_mismatch_fewer_arguments() { | ||
| let decoder = ArgumentDecoder::new(); | ||
| let args = vec![ScVal::U32(10)]; | ||
| let param_defs = vec![ | ||
| ("first".to_string(), ScSpecTypeDef::U32), | ||
| ("second".to_string(), ScSpecTypeDef::String), | ||
| ]; | ||
|
|
||
| let decoded = decoder.decode(&args, ¶m_defs, None); | ||
| assert_eq!(decoded.len(), 1); | ||
| assert_eq!(decoded[0].name, "first"); | ||
| assert_eq!(decoded[0].value, json!(10)); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_type_conflict_fallback() { | ||
| let decoder = ArgumentDecoder::new(); | ||
| // Expecting U32, but provided a Symbol | ||
| let args = vec![sym("not_a_number")]; | ||
| let param_defs = vec![("expected_num".to_string(), ScSpecTypeDef::U32)]; | ||
|
|
||
| let decoded = decoder.decode(&args, ¶m_defs, None); | ||
| assert_eq!(decoded.len(), 1); | ||
| assert_eq!(decoded[0].name, "expected_num"); | ||
| assert_eq!(decoded[0].value, json!("not_a_number")); | ||
| assert_eq!(decoded[0].formatted, "not_a_number"); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_udt_struct_argument_decoding() { | ||
| let decoder = ArgumentDecoder::new(); | ||
| let struct_def = ContractStructDef { | ||
| name: "Recipient".to_string(), | ||
| fields: vec![ | ||
| ContractStructField { | ||
| name: "address".to_string(), | ||
| type_name: "Address".to_string(), | ||
| doc: None, | ||
| type_def: Some(ScSpecTypeDef::Address), | ||
| }, | ||
| ContractStructField { | ||
| name: "weight".to_string(), | ||
| type_name: "U32".to_string(), | ||
| doc: None, | ||
| type_def: Some(ScSpecTypeDef::U32), | ||
| }, | ||
| ], | ||
| doc: None, | ||
| }; | ||
|
|
||
| let contract_spec = ContractSpec { | ||
| errors: vec![], | ||
| functions: vec![], | ||
| structs: vec![struct_def], | ||
| name: None, | ||
| version: None, | ||
| enums: vec![], | ||
| unions: vec![], | ||
| }; | ||
|
|
||
| let addr = ScAddress::Contract(Hash([1u8; 32])); | ||
| let map_val = ScVal::Map(Some( | ||
| vec![ | ||
| ScMapEntry { | ||
| key: sym("address"), | ||
| val: ScVal::Address(addr.clone()), | ||
| }, | ||
| ScMapEntry { | ||
| key: sym("weight"), | ||
| val: ScVal::U32(50), | ||
| }, | ||
| ] | ||
| .try_into() | ||
| .unwrap(), | ||
| )); | ||
|
|
||
| let param_defs = vec![( | ||
| "target".to_string(), | ||
| ScSpecTypeDef::Udt(stellar_xdr::curr::ScSpecTypeUdt { | ||
| name: "Recipient".try_into().unwrap(), | ||
| }), | ||
| )]; | ||
|
|
||
| let decoded = decoder.decode(&vec![map_val], ¶m_defs, Some(&contract_spec)); | ||
| assert_eq!(decoded.len(), 1); | ||
| assert_eq!(decoded[0].name, "target"); | ||
| assert_eq!( | ||
| decoded[0].value, | ||
| json!({ "address": addr.to_string(), "weight": 50 }) | ||
| ); | ||
| assert!(decoded[0].formatted.contains("weight")); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_decode_function_args_convenience() { | ||
| let decoder = ArgumentDecoder::new(); | ||
| let func = ContractFunction { | ||
| name: "transfer".to_string(), | ||
| params: vec![("to".to_string(), "Address".to_string()), ("amount".to_string(), "U128".to_string())], | ||
| return_type: "Void".to_string(), | ||
| doc: None, | ||
| return_type_def: Some(ScSpecTypeDef::Void), | ||
| param_defs: vec![ | ||
| ("to".to_string(), ScSpecTypeDef::Address), | ||
| ("amount".to_string(), ScSpecTypeDef::U64), | ||
| ], | ||
| }; | ||
|
|
||
| let addr = ScAddress::Contract(Hash([2u8; 32])); | ||
| let args = vec![ScVal::Address(addr.clone()), ScVal::U64(1000)]; | ||
|
|
||
| let decoded = decoder.decode_function_args(&args, &func, None); | ||
| assert_eq!(decoded.len(), 2); | ||
| assert_eq!(decoded[0].name, "to"); | ||
| assert_eq!(decoded[0].value, json!(addr.to_string())); | ||
| assert_eq!(decoded[1].name, "amount"); | ||
| assert_eq!(decoded[1].value, json!(1000)); | ||
| } | ||
|
|
||
| #[test] | ||
| fn test_decode_dynamic() { | ||
| let decoder = ArgumentDecoder::new(); | ||
| let args = vec![ScVal::U32(1), str_val("test")]; | ||
| let decoded = decoder.decode_dynamic(&args); | ||
|
|
||
| assert_eq!(decoded.len(), 2); | ||
| assert_eq!(decoded[0].name, "arg0"); | ||
| assert_eq!(decoded[0].value, json!(1)); | ||
| assert_eq!(decoded[1].name, "arg1"); | ||
| assert_eq!(decoded[1].value, json!("test")); | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win
Fix
cargo fmtfailures reported by CI.Pipeline logs flag this file's import block and
params: vec![...]literal as failingcargo fmt --all -- --check.🎨 Proposed rustfmt-compliant formatting
Also applies to: 270-282
🤖 Prompt for AI Agents
Source: Pipeline failures