logos-blockchain/lez-programs
1
0
Fork 0
mirror of https://github.com/logos-blockchain/lez-programs.git synced 2026-05-19 07:29:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: update spel

Browse Source 
This updates the spel dependency, which introduces a breaking change.
To make reviewing changes easier from other changes, this update comes
in a separate commit.
This commit is contained in:
r4bbit 2026-05-12 11:33:19 +02:00
parent f4a0aaf8d0
commit ceb8a4b597
18 changed files with 63 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Cargo.lock generated
View File

@ -43,7 +43,7 @@ name = "amm_core"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"borsh", "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", "risc0-zkvm",
"serde", "serde",
"spel-framework-macros", "spel-framework-macros",
@ -55,7 +55,7 @@ name = "amm_program"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"amm_core", "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", "token_core",
] ]
@ -314,7 +314,7 @@ name = "ata_core"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"borsh", "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", "risc0-zkvm",
"serde", "serde",
] ]
@ -324,7 +324,7 @@ name = "ata_program"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"ata_core", "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", "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" source = "git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0-rc3#cf3639d8252040d13b3d4e933feb19b42c76e14a"
dependencies = [ dependencies = [
"borsh", "borsh",
"nssa_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0-rc3)", "nssa_core",
] ]
[[package]] [[package]]
@ -1605,7 +1605,7 @@ dependencies = [
"ata-methods", "ata-methods",
"ata_core", "ata_core",
"nssa", "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-methods",
"token_core", "token_core",
] ]
@ -1840,7 +1840,7 @@ dependencies = [
"hex", "hex",
"k256", "k256",
"log", "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", "rand 0.8.6",
"risc0-binfmt", "risc0-binfmt",
"risc0-build", "risc0-build",
@ -1851,23 +1851,6 @@ dependencies = [
"thiserror 2.0.18", "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]] [[package]]
name = "nssa_core" name = "nssa_core"
version = "0.1.0" version = "0.1.0"
@ -2987,10 +2970,10 @@ dependencies = [
[[package]] [[package]]
name = "spel-framework-core" name = "spel-framework-core"
version = "0.2.0" 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 = [ dependencies = [
"borsh", "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", "proc-macro2",
"serde", "serde",
"serde_json", "serde_json",
@ -3002,7 +2985,7 @@ dependencies = [
[[package]] [[package]]
name = "spel-framework-macros" name = "spel-framework-macros"
version = "0.2.0" 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 = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -3058,7 +3041,7 @@ name = "stablecoin_core"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"borsh", "borsh",
"nssa_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0-rc1)", "nssa_core",
"serde", "serde",
] ]
@ -3066,7 +3049,7 @@ dependencies = [
name = "stablecoin_program" name = "stablecoin_program"
version = "0.1.0" version = "0.1.0"
dependencies = [ 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", "stablecoin_core",
] ]
@ -3268,7 +3251,7 @@ name = "token_core"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"borsh", "borsh",
"nssa_core 0.1.0 (git+https://github.com/logos-blockchain/logos-execution-zone.git?tag=v0.2.0-rc3)", "nssa_core",
"serde", "serde",
"spel-framework-macros", "spel-framework-macros",
] ]
@ -3277,7 +3260,7 @@ dependencies = [
name = "token_program" name = "token_program"
version = "0.1.0" version = "0.1.0"
dependencies = [ 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", "token_core",
] ]

2
amm/core/Cargo.toml
View File

@ -5,7 +5,7 @@ edition = "2021"
[dependencies] [dependencies]
nssa_core = { git = "https://github.com/logos-blockchain/logos-execution-zone.git", tag = "v0.2.0-rc3", features = ["host"] } 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" } token_core = { path = "../../token/core" }
borsh = { version = "1.5", features = ["derive"] } borsh = { version = "1.5", features = ["derive"] }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }

6
amm/methods/guest/Cargo.lock generated
View File

@ -2892,7 +2892,7 @@ dependencies = [
[[package]] [[package]]
name = "spel-framework" name = "spel-framework"
version = "0.2.0" 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 = [ dependencies = [
"borsh", "borsh",
"nssa_core", "nssa_core",
@ -2904,7 +2904,7 @@ dependencies = [
[[package]] [[package]]
name = "spel-framework-core" name = "spel-framework-core"
version = "0.2.0" 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 = [ dependencies = [
"borsh", "borsh",
"nssa_core", "nssa_core",
@ -2919,7 +2919,7 @@ dependencies = [
[[package]] [[package]]
name = "spel-framework-macros" name = "spel-framework-macros"
version = "0.2.0" 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 = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",

2
amm/methods/guest/Cargo.toml
View File

@ -10,7 +10,7 @@ name = "amm"
path = "src/bin/amm.rs" path = "src/bin/amm.rs"
[dependencies] [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" } 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 } risc0-zkvm = { version = "=3.0.5", default-features = false }
amm_core = { path = "../../core" } amm_core = { path = "../../core" }

18
amm/methods/guest/src/bin/amm.rs
View File

@ -47,8 +47,7 @@ mod amm {
fees, fees,
amm_program_id, amm_program_id,
); );
#[allow(deprecated)] Ok(spel_framework::SpelOutput::execute(post_states, chained_calls)
Ok(SpelOutput::with_chained_calls(post_states, chained_calls)
.with_timestamp_validity_window(..deadline)) .with_timestamp_validity_window(..deadline))
} }
@ -79,8 +78,7 @@ mod amm {
max_amount_to_add_token_a, max_amount_to_add_token_a,
max_amount_to_add_token_b, max_amount_to_add_token_b,
); );
#[allow(deprecated)] Ok(spel_framework::SpelOutput::execute(post_states, chained_calls)
Ok(SpelOutput::with_chained_calls(post_states, chained_calls)
.with_timestamp_validity_window(..deadline)) .with_timestamp_validity_window(..deadline))
} }
@ -112,8 +110,7 @@ mod amm {
min_amount_to_remove_token_a, min_amount_to_remove_token_a,
min_amount_to_remove_token_b, min_amount_to_remove_token_b,
); );
#[allow(deprecated)] Ok(spel_framework::SpelOutput::execute(post_states, chained_calls)
Ok(SpelOutput::with_chained_calls(post_states, chained_calls)
.with_timestamp_validity_window(..deadline)) .with_timestamp_validity_window(..deadline))
} }
@ -140,8 +137,7 @@ mod amm {
min_amount_out, min_amount_out,
token_definition_id_in, token_definition_id_in,
); );
#[allow(deprecated)] Ok(spel_framework::SpelOutput::execute(post_states, chained_calls)
Ok(SpelOutput::with_chained_calls(post_states, chained_calls)
.with_timestamp_validity_window(..deadline)) .with_timestamp_validity_window(..deadline))
} }
@ -168,8 +164,7 @@ mod amm {
max_amount_in, max_amount_in,
token_definition_id_in, token_definition_id_in,
); );
#[allow(deprecated)] Ok(spel_framework::SpelOutput::execute(post_states, chained_calls)
Ok(SpelOutput::with_chained_calls(post_states, chained_calls)
.with_timestamp_validity_window(..deadline)) .with_timestamp_validity_window(..deadline))
} }
@ -182,7 +177,6 @@ mod amm {
) -> SpelResult { ) -> SpelResult {
let (post_states, chained_calls) = let (post_states, chained_calls) =
amm_program::sync::sync_reserves(pool, vault_a, vault_b); amm_program::sync::sync_reserves(pool, vault_a, vault_b);
#[allow(deprecated)] Ok(spel_framework::SpelOutput::execute(post_states, chained_calls))
Ok(SpelOutput::with_chained_calls(post_states, chained_calls))
} }
} }

6
ata/methods/guest/Cargo.lock generated
View File

@ -2890,7 +2890,7 @@ dependencies = [
[[package]] [[package]]
name = "spel-framework" name = "spel-framework"
version = "0.2.0" 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 = [ dependencies = [
"borsh", "borsh",
"nssa_core", "nssa_core",
@ -2902,7 +2902,7 @@ dependencies = [
[[package]] [[package]]
name = "spel-framework-core" name = "spel-framework-core"
version = "0.2.0" 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 = [ dependencies = [
"borsh", "borsh",
"nssa_core", "nssa_core",
@ -2917,7 +2917,7 @@ dependencies = [
[[package]] [[package]]
name = "spel-framework-macros" name = "spel-framework-macros"
version = "0.2.0" 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 = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",

2
ata/methods/guest/Cargo.toml
View File

@ -10,7 +10,7 @@ name = "ata"
path = "src/bin/ata.rs" path = "src/bin/ata.rs"
[dependencies] [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" } 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 } risc0-zkvm = { version = "=3.0.5", default-features = false }
ata_core = { path = "../../core" } ata_core = { path = "../../core" }

9
ata/methods/guest/src/bin/ata.rs
View File

@ -25,8 +25,7 @@ mod ata {
ata_account, ata_account,
ata_program_id, ata_program_id,
); );
#[allow(deprecated)] Ok(spel_framework::SpelOutput::execute(post_states, chained_calls))
Ok(SpelOutput::with_chained_calls(post_states, chained_calls))
} }
/// Transfer tokens FROM owner's ATA to a recipient token holding account. /// Transfer tokens FROM owner's ATA to a recipient token holding account.
@ -47,8 +46,7 @@ mod ata {
ata_program_id, ata_program_id,
amount, amount,
); );
#[allow(deprecated)] Ok(spel_framework::SpelOutput::execute(post_states, chained_calls))
Ok(SpelOutput::with_chained_calls(post_states, chained_calls))
} }
/// Burn tokens FROM owner's ATA. /// Burn tokens FROM owner's ATA.
@ -68,7 +66,6 @@ mod ata {
ata_program_id, ata_program_id,
amount, amount,
); );
#[allow(deprecated)] Ok(spel_framework::SpelOutput::execute(post_states, chained_calls))
Ok(SpelOutput::with_chained_calls(post_states, chained_calls))
} }
} }

2
stablecoin/Cargo.toml
View File

@ -4,5 +4,5 @@ version = "0.1.0"
edition = "2021" edition = "2021"
[dependencies] [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" } stablecoin_core = { path = "core" }

2
stablecoin/core/Cargo.toml
View File

@ -4,6 +4,6 @@ version = "0.1.0"
edition = "2021" edition = "2021"
[dependencies] [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"] } borsh = { version = "1.5", features = ["derive"] }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }

9
stablecoin/methods/guest/Cargo.lock generated
View File

@ -1742,7 +1742,7 @@ checksum = "a5b0c77c1b780822bc749a33e39aeb2c07584ab93332303babeabb645298a76e"
[[package]] [[package]]
name = "nssa_core" name = "nssa_core"
version = "0.1.0" 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 = [ dependencies = [
"base58", "base58",
"borsh", "borsh",
@ -2857,7 +2857,7 @@ dependencies = [
[[package]] [[package]]
name = "spel-framework" name = "spel-framework"
version = "0.2.0" 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 = [ dependencies = [
"borsh", "borsh",
"nssa_core", "nssa_core",
@ -2869,10 +2869,11 @@ dependencies = [
[[package]] [[package]]
name = "spel-framework-core" name = "spel-framework-core"
version = "0.2.0" 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 = [ dependencies = [
"borsh", "borsh",
"nssa_core", "nssa_core",
"proc-macro2",
"serde", "serde",
"serde_json", "serde_json",
"sha2", "sha2",
@ -2883,7 +2884,7 @@ dependencies = [
[[package]] [[package]]
name = "spel-framework-macros" name = "spel-framework-macros"
version = "0.2.0" 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 = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",

4
stablecoin/methods/guest/Cargo.toml
View File

@ -10,8 +10,8 @@ name = "stablecoin"
path = "src/bin/stablecoin.rs" path = "src/bin/stablecoin.rs"
[dependencies] [dependencies]
spel-framework = { git = "https://github.com/logos-co/spel.git", rev = "9e7f2754e1d4cdb3ea36e63b1ff86c3af55488d3", 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-rc1" } 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 } risc0-zkvm = { version = "=3.0.5", default-features = false }
stablecoin_core = { path = "../../core" } stablecoin_core = { path = "../../core" }
stablecoin_program = { path = "../..", package = "stablecoin_program" } stablecoin_program = { path = "../..", package = "stablecoin_program" }

5
stablecoin/methods/guest/src/bin/stablecoin.rs
View File

@ -12,9 +12,8 @@ mod stablecoin {
#[instruction] #[instruction]
pub fn noop(account: AccountWithMetadata) -> SpelResult { pub fn noop(account: AccountWithMetadata) -> SpelResult {
#[allow(deprecated)] Ok(spel_framework::SpelOutput::execute(stablecoin_program::noop::noop(
Ok(SpelOutput::states_only(stablecoin_program::noop::noop(
account, account,
))) ), vec![]))
} }
} }

2
token/core/Cargo.toml
View File

@ -5,6 +5,6 @@ edition = "2021"
[dependencies] [dependencies]
nssa_core = { git = "https://github.com/logos-blockchain/logos-execution-zone.git", tag = "v0.2.0-rc3", features = ["host"] } 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"] } borsh = { version = "1.5", features = ["derive"] }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }

6
token/methods/guest/Cargo.lock generated
View File

@ -2857,7 +2857,7 @@ dependencies = [
[[package]] [[package]]
name = "spel-framework" name = "spel-framework"
version = "0.2.0" 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 = [ dependencies = [
"borsh", "borsh",
"nssa_core", "nssa_core",
@ -2869,7 +2869,7 @@ dependencies = [
[[package]] [[package]]
name = "spel-framework-core" name = "spel-framework-core"
version = "0.2.0" 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 = [ dependencies = [
"borsh", "borsh",
"nssa_core", "nssa_core",
@ -2884,7 +2884,7 @@ dependencies = [
[[package]] [[package]]
name = "spel-framework-macros" name = "spel-framework-macros"
version = "0.2.0" 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 = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",

2
token/methods/guest/Cargo.toml
View File

@ -10,7 +10,7 @@ name = "token"
path = "src/bin/token.rs" path = "src/bin/token.rs"
[dependencies] [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" } 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 } risc0-zkvm = { version = "=3.0.5", default-features = false }
token_core = { path = "../../core" } token_core = { path = "../../core" }

32
token/methods/guest/src/bin/token.rs
View File

@ -18,12 +18,11 @@ mod token {
recipient: AccountWithMetadata, recipient: AccountWithMetadata,
amount_to_transfer: u128, amount_to_transfer: u128,
) -> SpelResult { ) -> SpelResult {
#[allow(deprecated)] Ok(spel_framework::SpelOutput::execute(token_program::transfer::transfer(
Ok(SpelOutput::states_only(token_program::transfer::transfer(
sender, sender,
recipient, recipient,
amount_to_transfer, amount_to_transfer,
))) ), vec![]))
} }
/// Create a new fungible token definition without metadata. /// Create a new fungible token definition without metadata.
@ -35,14 +34,14 @@ mod token {
name: String, name: String,
total_supply: u128, total_supply: u128,
) -> SpelResult { ) -> SpelResult {
#[allow(deprecated)] Ok(spel_framework::SpelOutput::execute(
Ok(SpelOutput::states_only(
token_program::new_definition::new_fungible_definition( token_program::new_definition::new_fungible_definition(
definition_target_account, definition_target_account,
holding_target_account, holding_target_account,
name, name,
total_supply, total_supply,
), ),
vec![],
)) ))
} }
@ -56,8 +55,7 @@ mod token {
new_definition: token_core::NewTokenDefinition, new_definition: token_core::NewTokenDefinition,
metadata: Box<token_core::NewTokenMetadata>, metadata: Box<token_core::NewTokenMetadata>,
) -> SpelResult { ) -> SpelResult {
#[allow(deprecated)] Ok(spel_framework::SpelOutput::execute(
Ok(SpelOutput::states_only(
token_program::new_definition::new_definition_with_metadata( token_program::new_definition::new_definition_with_metadata(
definition_target_account, definition_target_account,
holding_target_account, holding_target_account,
@ -65,6 +63,7 @@ mod token {
new_definition, new_definition,
*metadata, *metadata,
), ),
vec![],
)) ))
} }
@ -75,12 +74,12 @@ mod token {
definition_account: AccountWithMetadata, definition_account: AccountWithMetadata,
account_to_initialize: AccountWithMetadata, account_to_initialize: AccountWithMetadata,
) -> SpelResult { ) -> SpelResult {
#[allow(deprecated)] Ok(spel_framework::SpelOutput::execute(
Ok(SpelOutput::states_only(
token_program::initialize::initialize_account( token_program::initialize::initialize_account(
definition_account, definition_account,
account_to_initialize, account_to_initialize,
), ),
vec![],
)) ))
} }
@ -91,12 +90,11 @@ mod token {
user_holding_account: AccountWithMetadata, user_holding_account: AccountWithMetadata,
amount_to_burn: u128, amount_to_burn: u128,
) -> SpelResult { ) -> SpelResult {
#[allow(deprecated)] Ok(spel_framework::SpelOutput::execute(token_program::burn::burn(
Ok(SpelOutput::states_only(token_program::burn::burn(
definition_account, definition_account,
user_holding_account, user_holding_account,
amount_to_burn, amount_to_burn,
))) ), vec![]))
} }
/// Mint new tokens to the holder's account. /// Mint new tokens to the holder's account.
@ -107,12 +105,11 @@ mod token {
user_holding_account: AccountWithMetadata, user_holding_account: AccountWithMetadata,
amount_to_mint: u128, amount_to_mint: u128,
) -> SpelResult { ) -> SpelResult {
#[allow(deprecated)] Ok(spel_framework::SpelOutput::execute(token_program::mint::mint(
Ok(SpelOutput::states_only(token_program::mint::mint(
definition_account, definition_account,
user_holding_account, user_holding_account,
amount_to_mint, amount_to_mint,
))) ), vec![]))
} }
/// Print a new NFT from the master copy. /// Print a new NFT from the master copy.
@ -122,10 +119,9 @@ mod token {
master_account: AccountWithMetadata, master_account: AccountWithMetadata,
printed_account: AccountWithMetadata, printed_account: AccountWithMetadata,
) -> SpelResult { ) -> SpelResult {
#[allow(deprecated)] Ok(spel_framework::SpelOutput::execute(token_program::print_nft::print_nft(
Ok(SpelOutput::states_only(token_program::print_nft::print_nft(
master_account, master_account,
printed_account, printed_account,
))) ), vec![]))
} }
} }

2
tools/idl-gen/Cargo.toml
View File

@ -8,7 +8,7 @@ name = "idl-gen"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [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", "idl-gen",
] } ] }
serde_json = "1.0" serde_json = "1.0"