Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 20 additions & 11 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 7 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,28 +31,26 @@ stellar-asset-spec = { version = "23.3.0", path = "stellar-asset-spec" }

[workspace.dependencies.soroban-env-common]
version = "=25.0.0"
git = "https://github.com/stellar/rs-soroban-env"
rev = "cf58d535ab05d02802a5e804a95524650f8c62c7"
# git = "https://github.com/stellar/rs-soroban-env"
# rev = "cf58d535ab05d02802a5e804a95524650f8c62c7"

[workspace.dependencies.soroban-env-guest]
version = "=25.0.0"
git = "https://github.com/stellar/rs-soroban-env"
rev = "cf58d535ab05d02802a5e804a95524650f8c62c7"
# git = "https://github.com/stellar/rs-soroban-env"
# rev = "cf58d535ab05d02802a5e804a95524650f8c62c7"

[workspace.dependencies.soroban-env-host]
version = "=25.0.0"
git = "https://github.com/stellar/rs-soroban-env"
rev = "cf58d535ab05d02802a5e804a95524650f8c62c7"
# git = "https://github.com/stellar/rs-soroban-env"
# rev = "cf58d535ab05d02802a5e804a95524650f8c62c7"

[workspace.dependencies.stellar-strkey]
version = "=0.0.13"

[workspace.dependencies.stellar-xdr]
version = "=24.0.1"
version = "=25.0.0"
default-features = false
features = ["curr"]
git = "https://github.com/stellar/rs-stellar-xdr"
rev = "89cc1cbadf1b9a16843826954dede7fec514d8e7"

#[patch.crates-io]
#soroban-env-common = { path = "../rs-soroban-env/soroban-env-common" }
Expand Down
14 changes: 2 additions & 12 deletions soroban-sdk-macros/src/derive_spec_fn.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use proc_macro2::TokenStream as TokenStream2;
use quote::{format_ident, quote};
use stellar_xdr::curr as stellar_xdr;
use stellar_xdr::{
ScSpecEntry, ScSpecFunctionInputV0, ScSpecFunctionV0, ScSpecTypeDef, ScSymbol, StringM, VecM,
ScSpecEntry, ScSpecFunctionInputV0, ScSpecFunctionV0, ScSpecTypeDef, ScSymbol, StringM,
WriteXdr, SCSYMBOL_LIMIT,
};
use syn::TypeReference;
Expand Down Expand Up @@ -143,17 +143,7 @@ pub fn derive_fn_spec(
));
ScSymbol::default()
}),
inputs: spec_args.try_into().unwrap_or_else(|_| {
const MAX: u32 = 10;
errors.push(Error::new(
inputs.iter().nth(MAX as usize).span(),
format!(
"contract function has too many parameters, max count {} parameters",
MAX,
),
));
VecM::<_, MAX>::default()
}),
inputs: spec_args.try_into().unwrap(),
outputs: spec_result.try_into().unwrap(),
});
let spec_xdr = spec_entry.to_xdr(DEFAULT_XDR_RW_LIMITS).unwrap();
Expand Down
8 changes: 4 additions & 4 deletions tests/alloc/test_snapshots/test/wasm/test.1.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"val": {
"contract_instance": {
"executable": {
"wasm": "96c0a94f8958212d9077730444e5351f82ba10d12b6fab95aee4c6048da0490c"
"wasm": "5502426c078164cc2bbf7a2d2fca006ccf7f9570c0bfd58c4fc7c2cea23d9907"
},
"storage": null
}
Expand All @@ -85,7 +85,7 @@
[
{
"contract_code": {
"hash": "96c0a94f8958212d9077730444e5351f82ba10d12b6fab95aee4c6048da0490c"
"hash": "5502426c078164cc2bbf7a2d2fca006ccf7f9570c0bfd58c4fc7c2cea23d9907"
}
},
[
Expand All @@ -111,8 +111,8 @@
}
}
},
"hash": "96c0a94f8958212d9077730444e5351f82ba10d12b6fab95aee4c6048da0490c",
"code": "0061736d01000000012e096000017e60027e7e017e60027f7f0060000060017f017f60037f7f7f0060017f0060017e017e60037f7f7f017f020d020176015f000001760136000103100f02030403050602070606030603030805030100110621047f01418080c0000b7f00418080c0000b7f00418c80c0000b7f00419080c0000b073405066d656d6f72790200086e756d5f6c6973740009015f03010a5f5f646174615f656e6403020b5f5f686561705f6261736503030ad80e0f850101027f0240024020010d00410421020c010b41002d008080c080001a1083808080000240410028028480c08000220241036a22032002490d0002402003417c71220220016a2203410028028880c080004d0d00200110848080800021020c020b4100200336028480c080000c010b108580808000000b20002001360204200020023602000b4301017f02400240410028028880c080000d003f00220041ffff034b0d0141002000411074220036028880c080004100200036028480c080000b0f0b108580808000000b910101047f200041ffff036a22014180807c7121022001411076210302400240034020034000417f460d014100410028028880c0800020026a36028880c08000108380808000410028028480c08000220141036a22042001490d022004417c71220120006a2204410028028880c080004b0d000b4100200436028480c0800020010f0b108f80808000000b108580808000000b0900108e80808000000b940201047f23808080800041106b22032480808080000240024002402002280204450d000240200228020822040d00200341086a2001108280808000200328020c2104200328020821020c020b20022802002105108380808000410028028480c08000220241036a22062002490d02024002402006417c71220220016a2206410028028880c080004d0d00200110848080800021020c010b4100200636028480c080000b0240024020020d00410021020c010b2002200520041090808080001a0b200121040c010b2003200110828080800020032802042104200328020021020b20002002410420021b360204200020024536020020002004200120021b360208200341106a2480808080000f0b108580808000000bec0101067f23808080800041206b220124808080800041002102024002400240024020002802002203417f460d002003410174200341016a200341004a1b220441ffffffff034d0d010b0c010b20044104200441044b1b2205410274220441fcffffff074b0d000240024020030d00410021030c010b2001200341027436021c20012000280204360214410421030b20012003360218200141086a2004200141146a10868080800020012802084101470d0120012802102106200128020c21020b20022006108880808000000b200128020c21032000200536020020002003360204200141206a2480808080000b1900024020000d00108c80808000000b2001108d80808000000bee0101067f23808080800041106b220124808080800002400240200042ff01834204520d002000422088a72102410021032001410036020c20014280808080c00037020441012104410421054100210602400340200620024f0d0102402004417f6a2001280204470d00200141046a108780808000200128020821050b200520036a2006360200200341046a21032001200436020c200441016a2104200620062002496a21060c000b0b108080808000210003402003450d022003417c6a2103200020053502004220864204841081808080002100200541046a21050c000b0b000b200141106a24808080800020000b0b002000108b80808000000b0900108e80808000000b0900108e80808000000b0b002000108a80808000000b0300000b0900108580808000000ba50501087f02400240200241104f0d00200021030c010b02402000410020006b41037122046a220520004d0d002004417f6a2106200021032001210702402004450d002004210820002103200121070340200320072d00003a0000200741016a2107200341016a21032008417f6a22080d000b0b20064107490d000340200320072d00003a0000200341016a200741016a2d00003a0000200341026a200741026a2d00003a0000200341036a200741036a2d00003a0000200341046a200741046a2d00003a0000200341056a200741056a2d00003a0000200341066a200741066a2d00003a0000200341076a200741076a2d00003a0000200741086a2107200341086a22032005470d000b0b2005200220046b2208417c7122066a210302400240200120046a22074103710d00200520034f0d0120072101034020052001280200360200200141046a2101200541046a22052003490d000c020b0b200520034f0d002007410374220241187121042007417c71220941046a2101410020026b411871210a2009280200210203402005200220047620012802002202200a7472360200200141046a2101200541046a22052003490d000b0b20084103712102200720066a21010b02402003200320026a22054f0d002002417f6a2108024020024107712207450d000340200320012d00003a0000200141016a2101200341016a21032007417f6a22070d000b0b20084107490d000340200320012d00003a0000200341016a200141016a2d00003a0000200341026a200141026a2d00003a0000200341036a200141036a2d00003a0000200341046a200141046a2d00003a0000200341056a200141056a2d00003a0000200341066a200141066a2d00003a0000200341076a200141076a2d00003a0000200141086a2101200341086a22032005470d000b0b20000b0b090100418080c0000b0000470e636f6e74726163747370656376300000000000000000000000086e756d5f6c697374000000010000000000000005636f756e740000000000000400000001000003ea00000004001e11636f6e7472616374656e766d6574617630000000000000001900000000002b0e636f6e74726163746d65746176300000000000000005727376657200000000000006312e38342e300000"
"hash": "5502426c078164cc2bbf7a2d2fca006ccf7f9570c0bfd58c4fc7c2cea23d9907",
"code": "0061736d01000000012e096000017e60027e7e017e60027f7f0060000060017f017f60037f7f7f0060017f0060017e017e60037f7f7f017f020d020176015f000001760136000103100f02030403050602070306030606030805030100110621047f01418080c0000b7f00418080c0000b7f00418c80c0000b7f00419080c0000b073405066d656d6f72790200086e756d5f6c6973740009015f03010a5f5f646174615f656e6403020b5f5f686561705f6261736503030ad80e0f850101027f0240024020010d00410421020c010b41002d008080c080001a1083808080000240410028028480c08000220241036a22032002490d0002402003417c71220220016a2203410028028880c080004d0d00200110848080800021020c020b4100200336028480c080000c010b108580808000000b20002001360204200020023602000b4301017f02400240410028028880c080000d003f00220041ffff034b0d0141002000411074220036028880c080004100200036028480c080000b0f0b108580808000000b910101047f200041ffff036a22014180807c7121022001411076210302400240034020034000417f460d014100410028028880c0800020026a36028880c08000108380808000410028028480c08000220141036a22042001490d022004417c71220120006a2204410028028880c080004b0d000b4100200436028480c0800020010f0b108f80808000000b108580808000000b0900108c80808000000b940201047f23808080800041106b22032480808080000240024002402002280204450d000240200228020822040d00200341086a2001108280808000200328020c2104200328020821020c020b20022802002105108380808000410028028480c08000220241036a22062002490d02024002402006417c71220220016a2206410028028880c080004d0d00200110848080800021020c010b4100200636028480c080000b0240024020020d00410021020c010b2002200520041090808080001a0b200121040c010b2003200110828080800020032802042104200328020021020b20002002410420021b360204200020024536020020002004200120021b360208200341106a2480808080000f0b108580808000000bec0101067f23808080800041206b220124808080800041002102024002400240024020002802002203417f460d002003410174200341016a200341004a1b220441ffffffff034d0d010b0c010b20044104200441044b1b2205410274220441fcffffff074b0d000240024020030d00410021030c010b2001200341027436021c20012000280204360214410421030b20012003360218200141086a2004200141146a10868080800020012802084101470d0120012802102106200128020c21020b20022006108880808000000b200128020c21032000200536020020002003360204200141206a2480808080000b1900024020000d00108a80808000000b2001108b80808000000bee0101067f23808080800041106b220124808080800002400240200042ff01834204520d002000422088a72102410021032001410036020c20014280808080c00037020441012104410421054100210602400340200620024f0d0102402004417f6a2001280204470d00200141046a108780808000200128020821050b200520036a2006360200200341046a21032001200436020c200441016a2104200620062002496a21060c000b0b108080808000210003402003450d022003417c6a2103200020053502004220864204841081808080002100200541046a21050c000b0b000b200141106a24808080800020000b0900108c80808000000b0b002000108d80808000000b0300000b0b002000108e80808000000b0900108c80808000000b0900108580808000000ba50501087f02400240200241104f0d00200021030c010b02402000410020006b41037122046a220520004d0d002004417f6a2106200021032001210702402004450d002004210820002103200121070340200320072d00003a0000200741016a2107200341016a21032008417f6a22080d000b0b20064107490d000340200320072d00003a0000200341016a200741016a2d00003a0000200341026a200741026a2d00003a0000200341036a200741036a2d00003a0000200341046a200741046a2d00003a0000200341056a200741056a2d00003a0000200341066a200741066a2d00003a0000200341076a200741076a2d00003a0000200741086a2107200341086a22032005470d000b0b2005200220046b2208417c7122066a210302400240200120046a22074103710d00200520034f0d0120072101034020052001280200360200200141046a2101200541046a22052003490d000c020b0b200520034f0d002007410374220241187121042007417c71220941046a2101410020026b411871210a2009280200210203402005200220047620012802002202200a7472360200200141046a2101200541046a22052003490d000b0b20084103712102200720066a21010b02402003200320026a22054f0d002002417f6a2108024020024107712207450d000340200320012d00003a0000200141016a2101200341016a21032007417f6a22070d000b0b20084107490d000340200320012d00003a0000200341016a200141016a2d00003a0000200341026a200141026a2d00003a0000200341036a200141036a2d00003a0000200341046a200141046a2d00003a0000200341056a200141056a2d00003a0000200341066a200141066a2d00003a0000200341076a200141076a2d00003a0000200141086a2101200341086a22032005470d000b0b20000b0b090100418080c0000b0000470e636f6e74726163747370656376300000000000000000000000086e756d5f6c697374000000010000000000000005636f756e740000000000000400000001000003ea00000004001e11636f6e7472616374656e766d6574617630000000000000001900000000002b0e636f6e74726163746d65746176300000000000000005727376657200000000000006312e38342e300000"
}
},
"ext": "v0"
Expand Down
31 changes: 20 additions & 11 deletions tests/fuzz/fuzz/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading