diff --git a/Cargo.lock b/Cargo.lock index 9cc99ac..3c8bc58 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -43,7 +43,7 @@ name = "amm_core" version = "0.1.0" dependencies = [ "borsh", - "nssa_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0-rc3)", + "nssa_core", "risc0-zkvm", "serde", "spel-framework-macros", @@ -55,7 +55,7 @@ name = "amm_program" version = "0.1.0" dependencies = [ "amm_core", - "nssa_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0-rc3)", + "nssa_core", "token_core", ] @@ -314,7 +314,7 @@ name = "ata_core" version = "0.1.0" dependencies = [ "borsh", - "nssa_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0-rc3)", + "nssa_core", "risc0-zkvm", "serde", ] @@ -324,7 +324,7 @@ name = "ata_program" version = "0.1.0" dependencies = [ "ata_core", - "nssa_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0-rc3)", + "nssa_core", "token_core", ] @@ -614,7 +614,7 @@ version = "0.1.0" source = "git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0-rc3#cf3639d8252040d13b3d4e933feb19b42c76e14a" dependencies = [ "borsh", - "nssa_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0-rc3)", + "nssa_core", ] [[package]] @@ -1605,7 +1605,7 @@ dependencies = [ "ata-methods", "ata_core", "nssa", - "nssa_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0-rc3)", + "nssa_core", "token-methods", "token_core", ] @@ -1840,7 +1840,7 @@ dependencies = [ "hex", "k256", "log", - "nssa_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0-rc3)", + "nssa_core", "rand 0.8.6", "risc0-binfmt", "risc0-build", @@ -1851,23 +1851,6 @@ dependencies = [ "thiserror 2.0.18", ] -[[package]] -name = "nssa_core" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0-rc1#35d8df0d031315219f94d1546ceb862b0e5b208f" -dependencies = [ - "base58", - "borsh", - "bytemuck", - "bytesize", - "chacha20", - "k256", - "risc0-zkvm", - "serde", - "serde_with", - "thiserror 2.0.18", -] - [[package]] name = "nssa_core" version = "0.1.0" @@ -2987,10 +2970,10 @@ dependencies = [ [[package]] name = "spel-framework-core" version = "0.2.0" -source = "git+https://github.com/logos-co/spel.git?rev=338129a5209e46d433bb068c96ab2eb7cc2601d9#338129a5209e46d433bb068c96ab2eb7cc2601d9" +source = "git+https://github.com/logos-co/spel.git?rev=ba6e87d086ed85c5ac095325d8a28f02e3d33ca2#ba6e87d086ed85c5ac095325d8a28f02e3d33ca2" dependencies = [ "borsh", - "nssa_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0-rc3)", + "nssa_core", "proc-macro2", "serde", "serde_json", @@ -3002,7 +2985,7 @@ dependencies = [ [[package]] name = "spel-framework-macros" version = "0.2.0" -source = "git+https://github.com/logos-co/spel.git?rev=338129a5209e46d433bb068c96ab2eb7cc2601d9#338129a5209e46d433bb068c96ab2eb7cc2601d9" +source = "git+https://github.com/logos-co/spel.git?rev=ba6e87d086ed85c5ac095325d8a28f02e3d33ca2#ba6e87d086ed85c5ac095325d8a28f02e3d33ca2" dependencies = [ "proc-macro2", "quote", @@ -3058,7 +3041,7 @@ name = "stablecoin_core" version = "0.1.0" dependencies = [ "borsh", - "nssa_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0-rc1)", + "nssa_core", "serde", ] @@ -3066,7 +3049,7 @@ dependencies = [ name = "stablecoin_program" version = "0.1.0" dependencies = [ - "nssa_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0-rc1)", + "nssa_core", "stablecoin_core", ] @@ -3268,7 +3251,7 @@ name = "token_core" version = "0.1.0" dependencies = [ "borsh", - "nssa_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0-rc3)", + "nssa_core", "serde", "spel-framework-macros", ] @@ -3277,7 +3260,7 @@ dependencies = [ name = "token_program" version = "0.1.0" dependencies = [ - "nssa_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0-rc3)", + "nssa_core", "token_core", ] diff --git a/amm/core/Cargo.toml b/amm/core/Cargo.toml index da4323d..1d095a7 100644 --- a/amm/core/Cargo.toml +++ b/amm/core/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] nssa_core = { git = "https://github.com/logos-blockchain/logos-execution-zone.git", tag = "v0.2.0-rc3", features = ["host"] } -spel-framework-macros = { git = "https://github.com/logos-co/spel.git", rev = "338129a5209e46d433bb068c96ab2eb7cc2601d9", package = "spel-framework-macros" } +spel-framework-macros = { git = "https://github.com/logos-co/spel.git", rev = "ba6e87d086ed85c5ac095325d8a28f02e3d33ca2", package = "spel-framework-macros" } token_core = { path = "../../token/core" } borsh = { version = "1.5", features = ["derive"] } serde = { version = "1.0", features = ["derive"] } diff --git a/amm/methods/guest/Cargo.lock b/amm/methods/guest/Cargo.lock index ac02a3a..ab6b1b1 100644 --- a/amm/methods/guest/Cargo.lock +++ b/amm/methods/guest/Cargo.lock @@ -2892,7 +2892,7 @@ dependencies = [ [[package]] name = "spel-framework" version = "0.2.0" -source = "git+https://github.com/logos-co/spel.git?rev=338129a5209e46d433bb068c96ab2eb7cc2601d9#338129a5209e46d433bb068c96ab2eb7cc2601d9" +source = "git+https://github.com/logos-co/spel.git?rev=ba6e87d086ed85c5ac095325d8a28f02e3d33ca2#ba6e87d086ed85c5ac095325d8a28f02e3d33ca2" dependencies = [ "borsh", "nssa_core", @@ -2904,7 +2904,7 @@ dependencies = [ [[package]] name = "spel-framework-core" version = "0.2.0" -source = "git+https://github.com/logos-co/spel.git?rev=338129a5209e46d433bb068c96ab2eb7cc2601d9#338129a5209e46d433bb068c96ab2eb7cc2601d9" +source = "git+https://github.com/logos-co/spel.git?rev=ba6e87d086ed85c5ac095325d8a28f02e3d33ca2#ba6e87d086ed85c5ac095325d8a28f02e3d33ca2" dependencies = [ "borsh", "nssa_core", @@ -2919,7 +2919,7 @@ dependencies = [ [[package]] name = "spel-framework-macros" version = "0.2.0" -source = "git+https://github.com/logos-co/spel.git?rev=338129a5209e46d433bb068c96ab2eb7cc2601d9#338129a5209e46d433bb068c96ab2eb7cc2601d9" +source = "git+https://github.com/logos-co/spel.git?rev=ba6e87d086ed85c5ac095325d8a28f02e3d33ca2#ba6e87d086ed85c5ac095325d8a28f02e3d33ca2" dependencies = [ "proc-macro2", "quote", diff --git a/amm/methods/guest/Cargo.toml b/amm/methods/guest/Cargo.toml index 7a48337..29d14d4 100644 --- a/amm/methods/guest/Cargo.toml +++ b/amm/methods/guest/Cargo.toml @@ -10,7 +10,7 @@ name = "amm" path = "src/bin/amm.rs" [dependencies] -spel-framework = { git = "https://github.com/logos-co/spel.git", rev = "338129a5209e46d433bb068c96ab2eb7cc2601d9", package = "spel-framework" } +spel-framework = { git = "https://github.com/logos-co/spel.git", rev = "ba6e87d086ed85c5ac095325d8a28f02e3d33ca2", package = "spel-framework" } nssa_core = { git = "https://github.com/logos-blockchain/logos-execution-zone.git", tag = "v0.2.0-rc3" } risc0-zkvm = { version = "=3.0.5", default-features = false } amm_core = { path = "../../core" } diff --git a/amm/methods/guest/src/bin/amm.rs b/amm/methods/guest/src/bin/amm.rs index 8c4bf81..6fa3aef 100644 --- a/amm/methods/guest/src/bin/amm.rs +++ b/amm/methods/guest/src/bin/amm.rs @@ -47,8 +47,7 @@ mod amm { fees, amm_program_id, ); - #[allow(deprecated)] - Ok(SpelOutput::with_chained_calls(post_states, chained_calls) + Ok(spel_framework::SpelOutput::execute(post_states, chained_calls) .with_timestamp_validity_window(..deadline)) } @@ -79,8 +78,7 @@ mod amm { max_amount_to_add_token_a, max_amount_to_add_token_b, ); - #[allow(deprecated)] - Ok(SpelOutput::with_chained_calls(post_states, chained_calls) + Ok(spel_framework::SpelOutput::execute(post_states, chained_calls) .with_timestamp_validity_window(..deadline)) } @@ -112,8 +110,7 @@ mod amm { min_amount_to_remove_token_a, min_amount_to_remove_token_b, ); - #[allow(deprecated)] - Ok(SpelOutput::with_chained_calls(post_states, chained_calls) + Ok(spel_framework::SpelOutput::execute(post_states, chained_calls) .with_timestamp_validity_window(..deadline)) } @@ -140,8 +137,7 @@ mod amm { min_amount_out, token_definition_id_in, ); - #[allow(deprecated)] - Ok(SpelOutput::with_chained_calls(post_states, chained_calls) + Ok(spel_framework::SpelOutput::execute(post_states, chained_calls) .with_timestamp_validity_window(..deadline)) } @@ -168,8 +164,7 @@ mod amm { max_amount_in, token_definition_id_in, ); - #[allow(deprecated)] - Ok(SpelOutput::with_chained_calls(post_states, chained_calls) + Ok(spel_framework::SpelOutput::execute(post_states, chained_calls) .with_timestamp_validity_window(..deadline)) } @@ -182,7 +177,6 @@ mod amm { ) -> SpelResult { let (post_states, chained_calls) = amm_program::sync::sync_reserves(pool, vault_a, vault_b); - #[allow(deprecated)] - Ok(SpelOutput::with_chained_calls(post_states, chained_calls)) + Ok(spel_framework::SpelOutput::execute(post_states, chained_calls)) } } diff --git a/ata/methods/guest/Cargo.lock b/ata/methods/guest/Cargo.lock index a596871..8b0be85 100644 --- a/ata/methods/guest/Cargo.lock +++ b/ata/methods/guest/Cargo.lock @@ -2890,7 +2890,7 @@ dependencies = [ [[package]] name = "spel-framework" version = "0.2.0" -source = "git+https://github.com/logos-co/spel.git?rev=338129a5209e46d433bb068c96ab2eb7cc2601d9#338129a5209e46d433bb068c96ab2eb7cc2601d9" +source = "git+https://github.com/logos-co/spel.git?rev=ba6e87d086ed85c5ac095325d8a28f02e3d33ca2#ba6e87d086ed85c5ac095325d8a28f02e3d33ca2" dependencies = [ "borsh", "nssa_core", @@ -2902,7 +2902,7 @@ dependencies = [ [[package]] name = "spel-framework-core" version = "0.2.0" -source = "git+https://github.com/logos-co/spel.git?rev=338129a5209e46d433bb068c96ab2eb7cc2601d9#338129a5209e46d433bb068c96ab2eb7cc2601d9" +source = "git+https://github.com/logos-co/spel.git?rev=ba6e87d086ed85c5ac095325d8a28f02e3d33ca2#ba6e87d086ed85c5ac095325d8a28f02e3d33ca2" dependencies = [ "borsh", "nssa_core", @@ -2917,7 +2917,7 @@ dependencies = [ [[package]] name = "spel-framework-macros" version = "0.2.0" -source = "git+https://github.com/logos-co/spel.git?rev=338129a5209e46d433bb068c96ab2eb7cc2601d9#338129a5209e46d433bb068c96ab2eb7cc2601d9" +source = "git+https://github.com/logos-co/spel.git?rev=ba6e87d086ed85c5ac095325d8a28f02e3d33ca2#ba6e87d086ed85c5ac095325d8a28f02e3d33ca2" dependencies = [ "proc-macro2", "quote", diff --git a/ata/methods/guest/Cargo.toml b/ata/methods/guest/Cargo.toml index 18101bc..c676c44 100644 --- a/ata/methods/guest/Cargo.toml +++ b/ata/methods/guest/Cargo.toml @@ -10,7 +10,7 @@ name = "ata" path = "src/bin/ata.rs" [dependencies] -spel-framework = { git = "https://github.com/logos-co/spel.git", rev = "338129a5209e46d433bb068c96ab2eb7cc2601d9", package = "spel-framework" } +spel-framework = { git = "https://github.com/logos-co/spel.git", rev = "ba6e87d086ed85c5ac095325d8a28f02e3d33ca2", package = "spel-framework" } nssa_core = { git = "https://github.com/logos-blockchain/logos-execution-zone.git", tag = "v0.2.0-rc3" } risc0-zkvm = { version = "=3.0.5", default-features = false } ata_core = { path = "../../core" } diff --git a/ata/methods/guest/src/bin/ata.rs b/ata/methods/guest/src/bin/ata.rs index ddcd5b8..b3020a0 100644 --- a/ata/methods/guest/src/bin/ata.rs +++ b/ata/methods/guest/src/bin/ata.rs @@ -25,8 +25,7 @@ mod ata { ata_account, ata_program_id, ); - #[allow(deprecated)] - Ok(SpelOutput::with_chained_calls(post_states, chained_calls)) + Ok(spel_framework::SpelOutput::execute(post_states, chained_calls)) } /// Transfer tokens FROM owner's ATA to a recipient token holding account. @@ -47,8 +46,7 @@ mod ata { ata_program_id, amount, ); - #[allow(deprecated)] - Ok(SpelOutput::with_chained_calls(post_states, chained_calls)) + Ok(spel_framework::SpelOutput::execute(post_states, chained_calls)) } /// Burn tokens FROM owner's ATA. @@ -68,7 +66,6 @@ mod ata { ata_program_id, amount, ); - #[allow(deprecated)] - Ok(SpelOutput::with_chained_calls(post_states, chained_calls)) + Ok(spel_framework::SpelOutput::execute(post_states, chained_calls)) } } diff --git a/stablecoin/Cargo.toml b/stablecoin/Cargo.toml index 30f7325..ca3c6a8 100644 --- a/stablecoin/Cargo.toml +++ b/stablecoin/Cargo.toml @@ -4,5 +4,5 @@ version = "0.1.0" edition = "2021" [dependencies] -nssa_core = { git = "https://github.com/logos-blockchain/logos-execution-zone.git", tag = "v0.2.0-rc1", features = ["host"] } +nssa_core = { git = "https://github.com/logos-blockchain/logos-execution-zone.git", tag = "v0.2.0-rc3", features = ["host"] } stablecoin_core = { path = "core" } diff --git a/stablecoin/core/Cargo.toml b/stablecoin/core/Cargo.toml index 49fc14a..e32a63b 100644 --- a/stablecoin/core/Cargo.toml +++ b/stablecoin/core/Cargo.toml @@ -4,6 +4,6 @@ version = "0.1.0" edition = "2021" [dependencies] -nssa_core = { git = "https://github.com/logos-blockchain/logos-execution-zone.git", tag = "v0.2.0-rc1", features = ["host"] } +nssa_core = { git = "https://github.com/logos-blockchain/logos-execution-zone.git", tag = "v0.2.0-rc3", features = ["host"] } borsh = { version = "1.5", features = ["derive"] } serde = { version = "1.0", features = ["derive"] } diff --git a/stablecoin/methods/guest/Cargo.lock b/stablecoin/methods/guest/Cargo.lock index 3f8b396..7697add 100644 --- a/stablecoin/methods/guest/Cargo.lock +++ b/stablecoin/methods/guest/Cargo.lock @@ -1742,7 +1742,7 @@ checksum = "a5b0c77c1b780822bc749a33e39aeb2c07584ab93332303babeabb645298a76e" [[package]] name = "nssa_core" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0-rc1#35d8df0d031315219f94d1546ceb862b0e5b208f" +source = "git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0-rc3#cf3639d8252040d13b3d4e933feb19b42c76e14a" dependencies = [ "base58", "borsh", @@ -2857,7 +2857,7 @@ dependencies = [ [[package]] name = "spel-framework" version = "0.2.0" -source = "git+https://github.com/logos-co/spel.git?rev=9e7f2754e1d4cdb3ea36e63b1ff86c3af55488d3#9e7f2754e1d4cdb3ea36e63b1ff86c3af55488d3" +source = "git+https://github.com/logos-co/spel.git?rev=ba6e87d086ed85c5ac095325d8a28f02e3d33ca2#ba6e87d086ed85c5ac095325d8a28f02e3d33ca2" dependencies = [ "borsh", "nssa_core", @@ -2869,10 +2869,11 @@ dependencies = [ [[package]] name = "spel-framework-core" version = "0.2.0" -source = "git+https://github.com/logos-co/spel.git?rev=9e7f2754e1d4cdb3ea36e63b1ff86c3af55488d3#9e7f2754e1d4cdb3ea36e63b1ff86c3af55488d3" +source = "git+https://github.com/logos-co/spel.git?rev=ba6e87d086ed85c5ac095325d8a28f02e3d33ca2#ba6e87d086ed85c5ac095325d8a28f02e3d33ca2" dependencies = [ "borsh", "nssa_core", + "proc-macro2", "serde", "serde_json", "sha2", @@ -2883,7 +2884,7 @@ dependencies = [ [[package]] name = "spel-framework-macros" version = "0.2.0" -source = "git+https://github.com/logos-co/spel.git?rev=9e7f2754e1d4cdb3ea36e63b1ff86c3af55488d3#9e7f2754e1d4cdb3ea36e63b1ff86c3af55488d3" +source = "git+https://github.com/logos-co/spel.git?rev=ba6e87d086ed85c5ac095325d8a28f02e3d33ca2#ba6e87d086ed85c5ac095325d8a28f02e3d33ca2" dependencies = [ "proc-macro2", "quote", diff --git a/stablecoin/methods/guest/Cargo.toml b/stablecoin/methods/guest/Cargo.toml index 4336b98..2b7fee3 100644 --- a/stablecoin/methods/guest/Cargo.toml +++ b/stablecoin/methods/guest/Cargo.toml @@ -10,8 +10,8 @@ name = "stablecoin" path = "src/bin/stablecoin.rs" [dependencies] -spel-framework = { git = "https://github.com/logos-co/spel.git", rev = "9e7f2754e1d4cdb3ea36e63b1ff86c3af55488d3", package = "spel-framework" } -nssa_core = { git = "https://github.com/logos-blockchain/logos-execution-zone.git", tag = "v0.2.0-rc1" } +spel-framework = { git = "https://github.com/logos-co/spel.git", rev = "ba6e87d086ed85c5ac095325d8a28f02e3d33ca2", package = "spel-framework" } +nssa_core = { git = "https://github.com/logos-blockchain/logos-execution-zone.git", tag = "v0.2.0-rc3" } risc0-zkvm = { version = "=3.0.5", default-features = false } stablecoin_core = { path = "../../core" } stablecoin_program = { path = "../..", package = "stablecoin_program" } diff --git a/stablecoin/methods/guest/src/bin/stablecoin.rs b/stablecoin/methods/guest/src/bin/stablecoin.rs index 703c630..6a40c2c 100644 --- a/stablecoin/methods/guest/src/bin/stablecoin.rs +++ b/stablecoin/methods/guest/src/bin/stablecoin.rs @@ -12,9 +12,8 @@ mod stablecoin { #[instruction] pub fn noop(account: AccountWithMetadata) -> SpelResult { - #[allow(deprecated)] - Ok(SpelOutput::states_only(stablecoin_program::noop::noop( + Ok(spel_framework::SpelOutput::execute(stablecoin_program::noop::noop( account, - ))) + ), vec![])) } } diff --git a/token/core/Cargo.toml b/token/core/Cargo.toml index 4eb22eb..6cebf20 100644 --- a/token/core/Cargo.toml +++ b/token/core/Cargo.toml @@ -5,6 +5,6 @@ edition = "2021" [dependencies] nssa_core = { git = "https://github.com/logos-blockchain/logos-execution-zone.git", tag = "v0.2.0-rc3", features = ["host"] } -spel-framework-macros = { git = "https://github.com/logos-co/spel.git", rev = "338129a5209e46d433bb068c96ab2eb7cc2601d9", package = "spel-framework-macros" } +spel-framework-macros = { git = "https://github.com/logos-co/spel.git", rev = "ba6e87d086ed85c5ac095325d8a28f02e3d33ca2", package = "spel-framework-macros" } borsh = { version = "1.5", features = ["derive"] } serde = { version = "1.0", features = ["derive"] } diff --git a/token/methods/guest/Cargo.lock b/token/methods/guest/Cargo.lock index 097cec4..de7d2ad 100644 --- a/token/methods/guest/Cargo.lock +++ b/token/methods/guest/Cargo.lock @@ -2857,7 +2857,7 @@ dependencies = [ [[package]] name = "spel-framework" version = "0.2.0" -source = "git+https://github.com/logos-co/spel.git?rev=338129a5209e46d433bb068c96ab2eb7cc2601d9#338129a5209e46d433bb068c96ab2eb7cc2601d9" +source = "git+https://github.com/logos-co/spel.git?rev=ba6e87d086ed85c5ac095325d8a28f02e3d33ca2#ba6e87d086ed85c5ac095325d8a28f02e3d33ca2" dependencies = [ "borsh", "nssa_core", @@ -2869,7 +2869,7 @@ dependencies = [ [[package]] name = "spel-framework-core" version = "0.2.0" -source = "git+https://github.com/logos-co/spel.git?rev=338129a5209e46d433bb068c96ab2eb7cc2601d9#338129a5209e46d433bb068c96ab2eb7cc2601d9" +source = "git+https://github.com/logos-co/spel.git?rev=ba6e87d086ed85c5ac095325d8a28f02e3d33ca2#ba6e87d086ed85c5ac095325d8a28f02e3d33ca2" dependencies = [ "borsh", "nssa_core", @@ -2884,7 +2884,7 @@ dependencies = [ [[package]] name = "spel-framework-macros" version = "0.2.0" -source = "git+https://github.com/logos-co/spel.git?rev=338129a5209e46d433bb068c96ab2eb7cc2601d9#338129a5209e46d433bb068c96ab2eb7cc2601d9" +source = "git+https://github.com/logos-co/spel.git?rev=ba6e87d086ed85c5ac095325d8a28f02e3d33ca2#ba6e87d086ed85c5ac095325d8a28f02e3d33ca2" dependencies = [ "proc-macro2", "quote", diff --git a/token/methods/guest/Cargo.toml b/token/methods/guest/Cargo.toml index efe2cfb..702af5d 100644 --- a/token/methods/guest/Cargo.toml +++ b/token/methods/guest/Cargo.toml @@ -10,7 +10,7 @@ name = "token" path = "src/bin/token.rs" [dependencies] -spel-framework = { git = "https://github.com/logos-co/spel.git", rev = "338129a5209e46d433bb068c96ab2eb7cc2601d9", package = "spel-framework" } +spel-framework = { git = "https://github.com/logos-co/spel.git", rev = "ba6e87d086ed85c5ac095325d8a28f02e3d33ca2", package = "spel-framework" } nssa_core = { git = "https://github.com/logos-blockchain/logos-execution-zone.git", tag = "v0.2.0-rc3" } risc0-zkvm = { version = "=3.0.5", default-features = false } token_core = { path = "../../core" } diff --git a/token/methods/guest/src/bin/token.rs b/token/methods/guest/src/bin/token.rs index b1bd06f..e2b7749 100644 --- a/token/methods/guest/src/bin/token.rs +++ b/token/methods/guest/src/bin/token.rs @@ -18,12 +18,11 @@ mod token { recipient: AccountWithMetadata, amount_to_transfer: u128, ) -> SpelResult { - #[allow(deprecated)] - Ok(SpelOutput::states_only(token_program::transfer::transfer( + Ok(spel_framework::SpelOutput::execute(token_program::transfer::transfer( sender, recipient, amount_to_transfer, - ))) + ), vec![])) } /// Create a new fungible token definition without metadata. @@ -35,14 +34,14 @@ mod token { name: String, total_supply: u128, ) -> SpelResult { - #[allow(deprecated)] - Ok(SpelOutput::states_only( + Ok(spel_framework::SpelOutput::execute( token_program::new_definition::new_fungible_definition( definition_target_account, holding_target_account, name, total_supply, ), + vec![], )) } @@ -56,8 +55,7 @@ mod token { new_definition: token_core::NewTokenDefinition, metadata: Box, ) -> SpelResult { - #[allow(deprecated)] - Ok(SpelOutput::states_only( + Ok(spel_framework::SpelOutput::execute( token_program::new_definition::new_definition_with_metadata( definition_target_account, holding_target_account, @@ -65,6 +63,7 @@ mod token { new_definition, *metadata, ), + vec![], )) } @@ -75,12 +74,12 @@ mod token { definition_account: AccountWithMetadata, account_to_initialize: AccountWithMetadata, ) -> SpelResult { - #[allow(deprecated)] - Ok(SpelOutput::states_only( + Ok(spel_framework::SpelOutput::execute( token_program::initialize::initialize_account( definition_account, account_to_initialize, ), + vec![], )) } @@ -91,12 +90,11 @@ mod token { user_holding_account: AccountWithMetadata, amount_to_burn: u128, ) -> SpelResult { - #[allow(deprecated)] - Ok(SpelOutput::states_only(token_program::burn::burn( + Ok(spel_framework::SpelOutput::execute(token_program::burn::burn( definition_account, user_holding_account, amount_to_burn, - ))) + ), vec![])) } /// Mint new tokens to the holder's account. @@ -107,12 +105,11 @@ mod token { user_holding_account: AccountWithMetadata, amount_to_mint: u128, ) -> SpelResult { - #[allow(deprecated)] - Ok(SpelOutput::states_only(token_program::mint::mint( + Ok(spel_framework::SpelOutput::execute(token_program::mint::mint( definition_account, user_holding_account, amount_to_mint, - ))) + ), vec![])) } /// Print a new NFT from the master copy. @@ -122,10 +119,9 @@ mod token { master_account: AccountWithMetadata, printed_account: AccountWithMetadata, ) -> SpelResult { - #[allow(deprecated)] - Ok(SpelOutput::states_only(token_program::print_nft::print_nft( + Ok(spel_framework::SpelOutput::execute(token_program::print_nft::print_nft( master_account, printed_account, - ))) + ), vec![])) } } diff --git a/tools/idl-gen/Cargo.toml b/tools/idl-gen/Cargo.toml index 843fecd..67996c6 100644 --- a/tools/idl-gen/Cargo.toml +++ b/tools/idl-gen/Cargo.toml @@ -8,7 +8,7 @@ name = "idl-gen" path = "src/main.rs" [dependencies] -spel-framework-core = { git = "https://github.com/logos-co/spel.git", rev = "338129a5209e46d433bb068c96ab2eb7cc2601d9", features = [ +spel-framework-core = { git = "https://github.com/logos-co/spel.git", rev = "ba6e87d086ed85c5ac095325d8a28f02e3d33ca2", features = [ "idl-gen", ] } serde_json = "1.0"