Merge branch 'main' into feat/snafu

Author: joe-p

api/oas_generator/rust_oas_generator/templates/models/model.rs.j2

@@ -94,11 +94,13 @@ pub struct {{ schema.rust_struct_name }} {
     {% if property.description %}
     {{ property.description | rust_doc_comment(4) }}
     {% endif %}
+    {% set is_account_related = schema.name in ['Account', 'AccountParticipation', 'AssetHolding', 'ApplicationLocalState', 'Application', 'Asset', 'AssetParams', 'ApplicationParams'] %}
+    {% if schema.implements_algokit_msgpack and not is_account_related %}
     {% if property.is_base64_encoded %}
     {% if property.required %}
-    #[serde_as(as = "serde_with::base64::Base64")]
+    #[serde_as(as = "Bytes")]
     {% else %}
-    #[serde_as(as = "Option<serde_with::base64::Base64>")]
+    #[serde_as(as = "Option<Bytes>")]
     {% endif %}
     {% elif property.items and property.items.is_base64_encoded %}
     {% if property.required %}
@@ -107,6 +109,21 @@ pub struct {{ schema.rust_struct_name }} {
     #[serde_as(as = "Option<Vec<Bytes>>")]
     {% endif %}
     {% endif %}
+    {% else %}
+    {% if property.is_base64_encoded %}
+    {% if property.required %}
+    #[serde_as(as = "serde_with::base64::Base64")]
+    {% else %}
+    #[serde_as(as = "Option<serde_with::base64::Base64>")]
+    {% endif %}
+    {% elif property.items and property.items.is_base64_encoded %}
+    {% if property.required %}
+    #[serde_as(as = "Vec<serde_with::base64::Base64>")]
+    {% else %}
+    #[serde_as(as = "Option<Vec<serde_with::base64::Base64>>")]
+    {% endif %}
+    {% endif %}
+    {% endif %}
     #[serde(rename = "{{ property.name }}"{% if not property.required %}, skip_serializing_if = "Option::is_none"{% endif %})]
     {% if property.is_signed_transaction %}
     pub {{ property.rust_field_name }}: {% if property.required %}{% if property.rust_type.startswith('Vec<') %}Vec<AlgokitSignedTransaction>{% else %}AlgokitSignedTransaction{% endif %}{% else %}Option<{% if property.rust_type.startswith('Vec<') %}Vec<AlgokitSignedTransaction>{% else %}AlgokitSignedTransaction{% endif %}>{% endif %},
@@ -225,4 +242,3 @@ impl {{ schema.rust_struct_name }} {
     {% endif %}
 }
 {% endif %}
-

crates/algod_client/src/models/app_call_logs.rs

@@ -17,7 +17,7 @@ use serde_with::{Bytes, serde_as};
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
 pub struct AppCallLogs {
     /// An array of logs
-    #[serde_as(as = "Vec<Bytes>")]
+    #[serde_as(as = "Vec<serde_with::base64::Base64>")]
     #[serde(rename = "logs")]
     pub logs: Vec<Vec<u8>>,
     /// The application from which the logs were generated

crates/algod_client/src/models/application_state_operation.rs

@@ -26,7 +26,7 @@ pub struct ApplicationStateOperation {
     #[serde(rename = "app-state-type")]
     pub app_state_type: String,
     /// The key (name) of the global/local/box state.
-    #[serde_as(as = "serde_with::base64::Base64")]
+    #[serde_as(as = "Bytes")]
     #[serde(rename = "key")]
     pub key: Vec<u8>,
     #[serde(rename = "new-value", skip_serializing_if = "Option::is_none")]

crates/algod_client/src/models/avm_key_value.rs

@@ -19,7 +19,7 @@ use crate::models::AvmValue;
 #[serde_as]
 #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
 pub struct AvmKeyValue {
-    #[serde_as(as = "serde_with::base64::Base64")]
+    #[serde_as(as = "Bytes")]
     #[serde(rename = "key")]
     pub key: Vec<u8>,
     #[serde(rename = "value")]

crates/algod_client/src/models/box_reference.rs

@@ -21,7 +21,7 @@ pub struct BoxReference {
     #[serde(rename = "app")]
     pub app: u64,
     /// Base64 encoded box name
-    #[serde_as(as = "serde_with::base64::Base64")]
+    #[serde_as(as = "Bytes")]
     #[serde(rename = "name")]
     pub name: Vec<u8>,
 }

crates/algod_client/src/models/dryrun_txn_result.rs

@@ -41,7 +41,7 @@ pub struct DryrunTxnResult {
     pub global_delta: Option<StateDelta>,
     #[serde(rename = "local-deltas", skip_serializing_if = "Option::is_none")]
     pub local_deltas: Option<Vec<AccountStateDelta>>,
-    #[serde_as(as = "Option<Vec<Bytes>>")]
+    #[serde_as(as = "Option<Vec<serde_with::base64::Base64>>")]
     #[serde(rename = "logs", skip_serializing_if = "Option::is_none")]
     pub logs: Option<Vec<Vec<u8>>>,
     /// Budget added during execution of app call transaction.

crates/algod_client/src/models/simulation_transaction_exec_trace.rs

@@ -26,7 +26,7 @@ pub struct SimulationTransactionExecTrace {
     )]
     pub approval_program_trace: Option<Vec<SimulationOpcodeTraceUnit>>,
     /// SHA512_256 hash digest of the approval program executed in transaction.
-    #[serde_as(as = "Option<serde_with::base64::Base64>")]
+    #[serde_as(as = "Option<Bytes>")]
     #[serde(
         rename = "approval-program-hash",
         skip_serializing_if = "Option::is_none"
@@ -39,7 +39,7 @@ pub struct SimulationTransactionExecTrace {
     )]
     pub clear_state_program_trace: Option<Vec<SimulationOpcodeTraceUnit>>,
     /// SHA512_256 hash digest of the clear state program executed in transaction.
-    #[serde_as(as = "Option<serde_with::base64::Base64>")]
+    #[serde_as(as = "Option<Bytes>")]
     #[serde(
         rename = "clear-state-program-hash",
         skip_serializing_if = "Option::is_none"
@@ -61,7 +61,7 @@ pub struct SimulationTransactionExecTrace {
     #[serde(rename = "logic-sig-trace", skip_serializing_if = "Option::is_none")]
     pub logic_sig_trace: Option<Vec<SimulationOpcodeTraceUnit>>,
     /// SHA512_256 hash digest of the logic sig executed in transaction.
-    #[serde_as(as = "Option<serde_with::base64::Base64>")]
+    #[serde_as(as = "Option<Bytes>")]
     #[serde(rename = "logic-sig-hash", skip_serializing_if = "Option::is_none")]
     pub logic_sig_hash: Option<Vec<u8>>,
     /// An array of SimulationTransactionExecTrace representing the execution trace of any inner transactions executed.

crates/algod_client/src/models/teal_value.rs

@@ -21,7 +21,7 @@ pub struct TealValue {
     #[serde(rename = "type")]
     pub r#type: u64,
     /// \[tb\] bytes value.
-    #[serde_as(as = "serde_with::base64::Base64")]
+    #[serde_as(as = "Bytes")]
     #[serde(rename = "bytes")]
     pub bytes: Vec<u8>,
     /// \[ui\] uint value.

crates/algokit_transact/src/address.rs

@@ -21,7 +21,7 @@ use std::str::FromStr;
 /// and provides methods for encoding to and decoding from the standard Algorand base32 string format.
 /// The checksum is automatically calculated and validated as part of parsing and formatting.
 #[serde_as]
-#[derive(Serialize, Deserialize, Debug, Clone, Default, PartialEq)]
+#[derive(Serialize, Deserialize, Debug, Clone, Default, PartialEq, Eq)]
 #[serde(transparent)]
 pub struct Address(#[serde_as(as = "Bytes")] pub Byte32);
 

crates/algokit_transact/src/constants.rs

@@ -11,3 +11,20 @@ pub const MAX_TX_GROUP_SIZE: usize = 16;
 pub const MULTISIG_DOMAIN_SEPARATOR: &str = "MultisigAddr";
 pub const EMPTY_SIGNATURE: [u8; ALGORAND_SIGNATURE_BYTE_LENGTH] =
     [0; ALGORAND_SIGNATURE_BYTE_LENGTH];
+
+// Application program size constraints
+pub const MAX_EXTRA_PROGRAM_PAGES: u64 = 3;
+pub const PROGRAM_PAGE_SIZE: usize = 2048; // In bytes
+
+// Application reference limits
+pub const MAX_APP_ARGS: usize = 16;
+pub const MAX_ARGS_SIZE: usize = 2048; // Maximum size in bytes of all args combined
+pub const MAX_OVERALL_REFERENCES: usize = 8;
+pub const MAX_ACCOUNT_REFERENCES: usize = 4;
+pub const MAX_APP_REFERENCES: usize = 8;
+pub const MAX_ASSET_REFERENCES: usize = 8;
+pub const MAX_BOX_REFERENCES: usize = 8;
+
+// Application state schema limits
+pub const MAX_GLOBAL_STATE_KEYS: u64 = 64;
+pub const MAX_LOCAL_STATE_KEYS: u64 = 16;