diff --git a/Cargo.lock b/Cargo.lock index c5c46c4..a6327b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -754,18 +754,6 @@ version = "2.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06" -[[package]] -name = "bitvec" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddcec3d12c579d40898fe0a9a358a803c23e9c52ca3c425707f81c9436211837" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - [[package]] name = "blake2" version = "0.10.6" @@ -796,7 +784,7 @@ dependencies = [ [[package]] name = "blockchain-test-logos" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "anyhow", "async-trait", @@ -845,7 +833,7 @@ dependencies = [ [[package]] name = "blockchain-test-support" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "hex", "logos-blockchain-binary-codec", @@ -1935,12 +1923,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - [[package]] name = "futures" version = "0.3.34" @@ -3643,7 +3625,7 @@ checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" [[package]] name = "logos-blockchain-api-service" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "async-trait", "futures", @@ -3663,7 +3645,6 @@ dependencies = [ "logos-blockchain-storage-service", "logos-blockchain-time-service", "logos-blockchain-tx-service", - "logos-blockchain-wallet-service", "overwatch", "serde", "thiserror 2.0.21", @@ -3676,7 +3657,7 @@ dependencies = [ [[package]] name = "logos-blockchain-binary-codec" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "bincode", "bytes", @@ -3692,7 +3673,7 @@ dependencies = [ [[package]] name = "logos-blockchain-binary-codec-macros" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "hex", "proc-macro2", @@ -3703,7 +3684,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "logos-blockchain-blend-crypto", "logos-blockchain-blend-membership", @@ -3718,7 +3699,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-crypto" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "blake2", "logos-blockchain-groth16", @@ -3733,7 +3714,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-membership" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "logos-blockchain-key-management-system-keys", "multiaddr", @@ -3744,7 +3725,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-message" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "blake2", "educe 0.7.6", @@ -3771,7 +3752,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-network" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "either", "futures", @@ -3792,7 +3773,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-primitives" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "futures", "tokio", @@ -3801,7 +3782,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-proofs" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "ed25519-dalek", "generic-array 1.4.5", @@ -3823,7 +3804,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-provers" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "async-trait", "educe 0.7.6", @@ -3847,7 +3828,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-scheduling" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "fork_stream", "futures", @@ -3868,7 +3849,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-service" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "async-trait", "futures", @@ -3909,7 +3890,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-broadcast-service" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "async-trait", "educe 0.7.6", @@ -3924,7 +3905,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-leader-service" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "async-trait", "futures", @@ -3946,7 +3927,6 @@ dependencies = [ "logos-blockchain-utils", "logos-blockchain-wallet-service", "overwatch", - "rand 0.8.8", "serde", "thiserror 2.0.21", "tokio", @@ -3958,7 +3938,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-network-service" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "async-trait", "backon", @@ -3992,7 +3972,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-service" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "async-trait", "bytes", @@ -4026,8 +4006,8 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-build" -version = "0.7.3" -source = "git+https://github.com/logos-blockchain/logos-blockchain-circuits.git?tag=v0.7.3#6ac94979fef0dfb74d909c8422d5a999e3190eef" +version = "0.8.0-rc.2" +source = "git+https://github.com/logos-blockchain/logos-blockchain-circuits.git?tag=v0.8.0-rc.2#754538c0f2ebe66587021bbf551e6a2f605a4aa1" dependencies = [ "dirs", "fd-lock", @@ -4038,16 +4018,16 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-common" -version = "0.7.3" -source = "git+https://github.com/logos-blockchain/logos-blockchain-circuits.git?tag=v0.7.3#6ac94979fef0dfb74d909c8422d5a999e3190eef" +version = "0.8.0-rc.2" +source = "git+https://github.com/logos-blockchain/logos-blockchain-circuits.git?tag=v0.8.0-rc.2#754538c0f2ebe66587021bbf551e6a2f605a4aa1" dependencies = [ "logos-blockchain-circuits-types", ] [[package]] name = "logos-blockchain-circuits-pol-sys" -version = "0.7.3" -source = "git+https://github.com/logos-blockchain/logos-blockchain-circuits.git?tag=v0.7.3#6ac94979fef0dfb74d909c8422d5a999e3190eef" +version = "0.8.0-rc.2" +source = "git+https://github.com/logos-blockchain/logos-blockchain-circuits.git?tag=v0.8.0-rc.2#754538c0f2ebe66587021bbf551e6a2f605a4aa1" dependencies = [ "logos-blockchain-circuits-build", "logos-blockchain-circuits-common", @@ -4056,8 +4036,8 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-poq-sys" -version = "0.7.3" -source = "git+https://github.com/logos-blockchain/logos-blockchain-circuits.git?tag=v0.7.3#6ac94979fef0dfb74d909c8422d5a999e3190eef" +version = "0.8.0-rc.2" +source = "git+https://github.com/logos-blockchain/logos-blockchain-circuits.git?tag=v0.8.0-rc.2#754538c0f2ebe66587021bbf551e6a2f605a4aa1" dependencies = [ "logos-blockchain-circuits-build", "logos-blockchain-circuits-common", @@ -4066,8 +4046,8 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-program-spend-sys" -version = "0.7.3" -source = "git+https://github.com/logos-blockchain/logos-blockchain-circuits.git?tag=v0.7.3#6ac94979fef0dfb74d909c8422d5a999e3190eef" +version = "0.8.0-rc.2" +source = "git+https://github.com/logos-blockchain/logos-blockchain-circuits.git?tag=v0.8.0-rc.2#754538c0f2ebe66587021bbf551e6a2f605a4aa1" dependencies = [ "logos-blockchain-circuits-build", "logos-blockchain-circuits-common", @@ -4077,15 +4057,15 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-prover" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "rust-rapidsnark", ] [[package]] name = "logos-blockchain-circuits-transfer-sys" -version = "0.7.3" -source = "git+https://github.com/logos-blockchain/logos-blockchain-circuits.git?tag=v0.7.3#6ac94979fef0dfb74d909c8422d5a999e3190eef" +version = "0.8.0-rc.2" +source = "git+https://github.com/logos-blockchain/logos-blockchain-circuits.git?tag=v0.8.0-rc.2#754538c0f2ebe66587021bbf551e6a2f605a4aa1" dependencies = [ "logos-blockchain-circuits-build", "logos-blockchain-circuits-common", @@ -4094,8 +4074,8 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-types" -version = "0.7.3" -source = "git+https://github.com/logos-blockchain/logos-blockchain-circuits.git?tag=v0.7.3#6ac94979fef0dfb74d909c8422d5a999e3190eef" +version = "0.8.0-rc.2" +source = "git+https://github.com/logos-blockchain/logos-blockchain-circuits.git?tag=v0.8.0-rc.2#754538c0f2ebe66587021bbf551e6a2f605a4aa1" dependencies = [ "bytes", "libc", @@ -4104,7 +4084,7 @@ dependencies = [ [[package]] name = "logos-blockchain-common-http-client" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "futures", "hex", @@ -4130,12 +4110,11 @@ dependencies = [ [[package]] name = "logos-blockchain-config" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "hex", "logos-blockchain-binary-codec", "logos-blockchain-core", - "logos-blockchain-cryptarchia-engine", "logos-blockchain-groth16", "logos-blockchain-key-management-system-service", "logos-blockchain-ledger", @@ -4153,11 +4132,10 @@ dependencies = [ [[package]] name = "logos-blockchain-core" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "ark-ff", "bincode", - "bitvec", "blake2", "bytes", "hex", @@ -4192,7 +4170,7 @@ dependencies = [ [[package]] name = "logos-blockchain-cryptarchia-engine" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "logos-blockchain-log-targets", "logos-blockchain-pol", @@ -4208,7 +4186,7 @@ dependencies = [ [[package]] name = "logos-blockchain-cryptarchia-sync" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "bytes", "educe 0.7.6", @@ -4231,33 +4209,15 @@ dependencies = [ [[package]] name = "logos-blockchain-dynamic-merkle" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "serde", ] -[[package]] -name = "logos-blockchain-faucet" -version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" -dependencies = [ - "axum 0.8.9", - "clap", - "hex", - "logos-blockchain-common-http-client", - "logos-blockchain-groth16", - "logos-blockchain-http-api-common", - "logos-blockchain-key-management-system-keys", - "logos-blockchain-wallet", - "reqwest 0.12.28", - "serde_json", - "tokio", -] - [[package]] name = "logos-blockchain-groth16" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "ark-bn254", "ark-ec", @@ -4270,6 +4230,7 @@ dependencies = [ "logos-blockchain-utils", "num-bigint", "rand 0.8.8", + "rand_chacha 0.3.1", "serde", "serde_json", "thiserror 2.0.21", @@ -4278,10 +4239,11 @@ dependencies = [ [[package]] name = "logos-blockchain-http-api-common" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "axum 0.8.9", "logos-blockchain-core", + "logos-blockchain-groth16", "logos-blockchain-key-management-system-keys", "logos-blockchain-log-targets", "logos-blockchain-tracing", @@ -4299,7 +4261,7 @@ dependencies = [ [[package]] name = "logos-blockchain-imt" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "ark-ff", "logos-blockchain-dynamic-merkle", @@ -4315,7 +4277,7 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-keys" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "arbitrary-int", "async-trait", @@ -4323,12 +4285,10 @@ dependencies = [ "blake2", "bytes", "ed25519-dalek", - "generic-array 1.4.5", "hex", "logos-blockchain-binary-codec", "logos-blockchain-groth16", "logos-blockchain-key-management-system-macros", - "logos-blockchain-log-targets", "logos-blockchain-poseidon2", "logos-blockchain-utils", "logos-blockchain-zktransfer", @@ -4337,7 +4297,6 @@ dependencies = [ "serde", "subtle", "thiserror 2.0.21", - "tracing", "utoipa", "x25519-dalek", "zeroize", @@ -4346,7 +4305,7 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-macros" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "proc-macro2", "quote", @@ -4356,7 +4315,7 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-operators" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "async-trait", "logos-blockchain-blend-proofs", @@ -4374,7 +4333,7 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-service" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "async-trait", "logos-blockchain-key-management-system-keys", @@ -4392,7 +4351,7 @@ dependencies = [ [[package]] name = "logos-blockchain-kv-store" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "bytes", "rocksdb", @@ -4402,7 +4361,7 @@ dependencies = [ [[package]] name = "logos-blockchain-ledger" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "educe 0.7.6", "logos-blockchain-binary-codec", @@ -4424,7 +4383,6 @@ dependencies = [ "rand 0.8.8", "rpds", "serde", - "serde_arrays", "thiserror 2.0.21", "tracing", ] @@ -4432,7 +4390,7 @@ dependencies = [ [[package]] name = "logos-blockchain-libp2p" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "async-trait", "backon", @@ -4463,7 +4421,7 @@ dependencies = [ [[package]] name = "logos-blockchain-log-targets" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "logos-blockchain-log-targets-macros", ] @@ -4471,7 +4429,7 @@ dependencies = [ [[package]] name = "logos-blockchain-log-targets-macros" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "proc-macro2", "quote", @@ -4481,7 +4439,7 @@ dependencies = [ [[package]] name = "logos-blockchain-mmr" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "ark-ff", "logos-blockchain-groth16", @@ -4495,7 +4453,7 @@ dependencies = [ [[package]] name = "logos-blockchain-network-service" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "async-trait", "educe 0.7.6", @@ -4522,7 +4480,7 @@ dependencies = [ [[package]] name = "logos-blockchain-node" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "async-trait", "axum 0.8.9", @@ -4591,7 +4549,7 @@ dependencies = [ [[package]] name = "logos-blockchain-pol" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "astro-float", "logos-blockchain-circuits-pol-sys", @@ -4605,13 +4563,14 @@ dependencies = [ "num-traits", "serde", "serde_json", + "serde_with", "tracing", ] [[package]] name = "logos-blockchain-poq" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "logos-blockchain-circuits-poq-sys", "logos-blockchain-circuits-prover", @@ -4623,13 +4582,14 @@ dependencies = [ "num-bigint", "serde", "serde_json", + "serde_with", "tracing", ] [[package]] name = "logos-blockchain-poseidon2" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "ark-bn254", "ark-ff", @@ -4640,7 +4600,7 @@ dependencies = [ [[package]] name = "logos-blockchain-pow-service" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "async-trait", "futures", @@ -4672,7 +4632,7 @@ dependencies = [ [[package]] name = "logos-blockchain-program-spend" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "logos-blockchain-circuits-program-spend-sys", "logos-blockchain-circuits-prover", @@ -4682,8 +4642,8 @@ dependencies = [ "logos-blockchain-proofs-error", "logos-blockchain-zktransfer", "serde", - "serde-big-array", "serde_json", + "serde_with", "thiserror 2.0.21", "tracing", ] @@ -4691,7 +4651,7 @@ dependencies = [ [[package]] name = "logos-blockchain-proofs-error" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "logos-blockchain-circuits-types", "logos-blockchain-groth16", @@ -4702,9 +4662,10 @@ dependencies = [ [[package]] name = "logos-blockchain-sdp-service" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "async-trait", + "futures", "logos-blockchain-chain-service", "logos-blockchain-core", "logos-blockchain-key-management-system-keys", @@ -4725,7 +4686,7 @@ dependencies = [ [[package]] name = "logos-blockchain-services-utils" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "async-trait", "bytes", @@ -4742,7 +4703,7 @@ dependencies = [ [[package]] name = "logos-blockchain-storage-service" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "async-trait", "bytes", @@ -4750,10 +4711,12 @@ dependencies = [ "logos-blockchain-binary-codec", "logos-blockchain-core", "logos-blockchain-cryptarchia-engine", + "logos-blockchain-groth16", "logos-blockchain-log-targets", "logos-blockchain-services-utils", "logos-blockchain-tracing", "logos-blockchain-utils", + "logos-blockchain-wallet", "overwatch", "rocksdb", "serde", @@ -4765,7 +4728,7 @@ dependencies = [ [[package]] name = "logos-blockchain-system-sig-service" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "async-ctrlc", "async-trait", @@ -4777,7 +4740,7 @@ dependencies = [ [[package]] name = "logos-blockchain-tests" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "async-trait", "axum 0.8.9", @@ -4797,7 +4760,6 @@ dependencies = [ "logos-blockchain-common-http-client", "logos-blockchain-config", "logos-blockchain-core", - "logos-blockchain-faucet", "logos-blockchain-groth16", "logos-blockchain-http-api-common", "logos-blockchain-key-management-system-service", @@ -4818,7 +4780,6 @@ dependencies = [ "serde", "serde_json", "serde_yaml", - "serial_test", "strum", "strum_macros", "tempfile", @@ -4835,7 +4796,7 @@ dependencies = [ [[package]] name = "logos-blockchain-time" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "logos-blockchain-binary-codec", "logos-blockchain-utils", @@ -4848,7 +4809,7 @@ dependencies = [ [[package]] name = "logos-blockchain-time-service" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "async-trait", "futures", @@ -4871,7 +4832,7 @@ dependencies = [ [[package]] name = "logos-blockchain-tracing" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "flate2", "logos-blockchain-log-targets", @@ -4898,7 +4859,7 @@ dependencies = [ [[package]] name = "logos-blockchain-tracing-service" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "async-trait", "logos-blockchain-log-targets", @@ -4916,7 +4877,7 @@ dependencies = [ [[package]] name = "logos-blockchain-tx-service" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "async-trait", "futures", @@ -4946,7 +4907,7 @@ dependencies = [ [[package]] name = "logos-blockchain-utils" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "async-trait", "const-hex", @@ -4970,7 +4931,7 @@ dependencies = [ [[package]] name = "logos-blockchain-utxotree" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "ark-ff", "logos-blockchain-dynamic-merkle", @@ -4980,7 +4941,7 @@ dependencies = [ [[package]] name = "logos-blockchain-version" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "serde", "utoipa", @@ -4989,18 +4950,16 @@ dependencies = [ [[package]] name = "logos-blockchain-wallet" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "logos-blockchain-core", "logos-blockchain-cryptarchia-engine", "logos-blockchain-groth16", "logos-blockchain-key-management-system-keys", - "logos-blockchain-ledger", "logos-blockchain-log-targets", "logos-blockchain-mmr", "logos-blockchain-utils", "logos-blockchain-zktransfer", - "num-bigint", "rpds", "serde", "thiserror 2.0.21", @@ -5010,7 +4969,7 @@ dependencies = [ [[package]] name = "logos-blockchain-wallet-service" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "async-trait", "bytes", @@ -5034,6 +4993,7 @@ dependencies = [ "overwatch", "rand 0.8.8", "serde", + "strum_macros", "thiserror 2.0.21", "tokio", "tokio-stream", @@ -5043,7 +5003,7 @@ dependencies = [ [[package]] name = "logos-blockchain-zktransfer" version = "0.0.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=a54cbc526112d391f11901e7b284e1bbe5d801b8#a54cbc526112d391f11901e7b284e1bbe5d801b8" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=f08cbf14e14d3da86c717a61658836bd5d49e3ce#f08cbf14e14d3da86c717a61658836bd5d49e3ce" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-transfer-sys", @@ -5053,6 +5013,7 @@ dependencies = [ "logos-blockchain-proofs-error", "serde", "serde_json", + "serde_with", "thiserror 2.0.21", "tracing", ] @@ -5061,6 +5022,7 @@ dependencies = [ name = "logos-blockchain-zone-sdk" version = "0.0.0" dependencies = [ + "ark-ff", "async-trait", "blockchain-test-logos", "futures", @@ -5073,7 +5035,9 @@ dependencies = [ "logos-blockchain-key-management-system-service", "logos-blockchain-log-targets", "logos-blockchain-mmr", + "logos-blockchain-program-spend", "logos-blockchain-time", + "logos-blockchain-wallet", "reqwest 0.12.28", "rpds", "serde", @@ -6440,12 +6404,6 @@ version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - [[package]] name = "rand" version = "0.8.8" @@ -7004,15 +6962,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-big-array" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11fc7cc2c76d73e0f27ee52abbd64eec84d46f370c88371120433196934e4b7f" -dependencies = [ - "serde", -] - [[package]] name = "serde-value" version = "0.7.0" @@ -7023,15 +6972,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_arrays" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94a16b99c5ea4fe3daccd14853ad260ec00ea043b2708d1fd1da3106dcd8d9df" -dependencies = [ - "serde", -] - [[package]] name = "serde_core" version = "1.0.229" @@ -7140,28 +7080,6 @@ dependencies = [ "unsafe-libyaml", ] -[[package]] -name = "serial_test" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "699f4197115b8a7e7ff19c9a315a4bd6fffec26cc4626ef45ecaea389e081c6d" -dependencies = [ - "once_cell", - "parking_lot", - "serial_test_derive", -] - -[[package]] -name = "serial_test_derive" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94e153fc76e1c6a068703d6d29c508a0b15c061c4b7e43da59cc097bc342673c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.119", -] - [[package]] name = "sha2" version = "0.10.9" @@ -7551,12 +7469,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - [[package]] name = "tar" version = "0.4.46" @@ -8987,15 +8899,6 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc" -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - [[package]] name = "x25519-dalek" version = "2.0.1" diff --git a/Cargo.toml b/Cargo.toml index 33187ff..8fdcf8b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,6 +16,7 @@ repository = "https://github.com/logos-blockchain/logos-zone-sdk" version = "0.0.0" [workspace.dependencies] +ark-ff = { default-features = false, version = "0.5" } async-trait = { default-features = false, version = "0.1" } bincode = { default-features = false, version = "1.3" } blake2 = { default-features = false, version = "0.10" } @@ -24,19 +25,21 @@ cucumber = { default-features = false, version = "=0.23. flate2 = { default-features = false, version = "1.1.9" } futures = { default-features = false, version = "0.3.32" } hex = { default-features = false, version = "0.4" } -lb-binary-codec = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", package = "logos-blockchain-binary-codec", rev = "a54cbc526112d391f11901e7b284e1bbe5d801b8" } -lb-common-http-client = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", package = "logos-blockchain-common-http-client", rev = "a54cbc526112d391f11901e7b284e1bbe5d801b8" } -lb-core = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", package = "logos-blockchain-core", rev = "a54cbc526112d391f11901e7b284e1bbe5d801b8" } -lb-groth16 = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", package = "logos-blockchain-groth16", rev = "a54cbc526112d391f11901e7b284e1bbe5d801b8" } -lb-http-api-common = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", package = "logos-blockchain-http-api-common", rev = "a54cbc526112d391f11901e7b284e1bbe5d801b8" } -lb-key-management-system-service = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", package = "logos-blockchain-key-management-system-service", rev = "a54cbc526112d391f11901e7b284e1bbe5d801b8" } -lb-log-targets = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", package = "logos-blockchain-log-targets", rev = "a54cbc526112d391f11901e7b284e1bbe5d801b8" } -lb-mmr = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", package = "logos-blockchain-mmr", rev = "a54cbc526112d391f11901e7b284e1bbe5d801b8" } -lb-testing-framework = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", package = "blockchain-test-logos", rev = "a54cbc526112d391f11901e7b284e1bbe5d801b8" } -lb-time = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", package = "logos-blockchain-time", rev = "a54cbc526112d391f11901e7b284e1bbe5d801b8" } -lb-utils = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", package = "logos-blockchain-utils", rev = "a54cbc526112d391f11901e7b284e1bbe5d801b8" } +lb-binary-codec = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", package = "logos-blockchain-binary-codec", rev = "f08cbf14e14d3da86c717a61658836bd5d49e3ce" } +lb-common-http-client = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", package = "logos-blockchain-common-http-client", rev = "f08cbf14e14d3da86c717a61658836bd5d49e3ce" } +lb-core = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", package = "logos-blockchain-core", rev = "f08cbf14e14d3da86c717a61658836bd5d49e3ce" } +lb-groth16 = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", package = "logos-blockchain-groth16", rev = "f08cbf14e14d3da86c717a61658836bd5d49e3ce" } +lb-http-api-common = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", package = "logos-blockchain-http-api-common", rev = "f08cbf14e14d3da86c717a61658836bd5d49e3ce" } +lb-key-management-system-service = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", package = "logos-blockchain-key-management-system-service", rev = "f08cbf14e14d3da86c717a61658836bd5d49e3ce" } +lb-log-targets = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", package = "logos-blockchain-log-targets", rev = "f08cbf14e14d3da86c717a61658836bd5d49e3ce" } +lb-mmr = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", package = "logos-blockchain-mmr", rev = "f08cbf14e14d3da86c717a61658836bd5d49e3ce" } +lb-program-spend = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", package = "logos-blockchain-program-spend", rev = "f08cbf14e14d3da86c717a61658836bd5d49e3ce" } +lb-testing-framework = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", package = "blockchain-test-logos", rev = "f08cbf14e14d3da86c717a61658836bd5d49e3ce" } +lb-time = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", package = "logos-blockchain-time", rev = "f08cbf14e14d3da86c717a61658836bd5d49e3ce" } +lb-utils = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", package = "logos-blockchain-utils", rev = "f08cbf14e14d3da86c717a61658836bd5d49e3ce" } +lb-wallet = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", package = "logos-blockchain-wallet", rev = "f08cbf14e14d3da86c717a61658836bd5d49e3ce" } lb-zone-sdk = { default-features = false, package = "logos-blockchain-zone-sdk", path = "zone-sdk" } -logos-blockchain-tests = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "a54cbc526112d391f11901e7b284e1bbe5d801b8" } +logos-blockchain-tests = { default-features = false, git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "f08cbf14e14d3da86c717a61658836bd5d49e3ce" } logos-blockchain-zone-tests = { default-features = false, path = "tests/zone-sdk" } rand = { default-features = false, version = "0.8" } reqwest = { default-features = false, version = "0.12" } diff --git a/tests/zone-sdk/Cargo.toml b/tests/zone-sdk/Cargo.toml index 7213ca4..97e7a9b 100644 --- a/tests/zone-sdk/Cargo.toml +++ b/tests/zone-sdk/Cargo.toml @@ -17,7 +17,7 @@ cucumber = { features = ["macros", "output-junit"], work futures = { workspace = true } lb-common-http-client = { workspace = true } lb-core = { features = ["test-utils"], workspace = true } -lb-groth16 = { workspace = true } +lb-groth16 = { features = ["test-utils"], workspace = true } lb-http-api-common = { workspace = true } lb-key-management-system-service = { workspace = true } lb-testing-framework = { workspace = true } diff --git a/tests/zone-sdk/features/zone.feature b/tests/zone-sdk/features/zone.feature index ea01f05..705d428 100644 --- a/tests/zone-sdk/features/zone.feature +++ b/tests/zone-sdk/features/zone.feature @@ -718,3 +718,42 @@ Feature: Zone SDK | alias | | MSG_1 | Then the channel view contract holds for all zone sequencers + + @zone_ci + Scenario: A holder's deposit moves through the program and back to the holder + Given the genesis block has the following wallet resources: + | account_index | token_count | token_amount | + | 1 | 3 | 100000 | + And I have a cluster with capacity of 1 nodes + And I start nodes with wallet and sequencer resources: + | node_name | account_index | wallet_name | connected_to | sequencers | + | NODE_1 | 1 | WALLET_1A | | SEQ_A | + When node "NODE_1" is at height 1 in 120 seconds + And wallet "WALLET_1A" sends 4 notes of 10000 LGO to node "NODE_1" funding wallet as "FUNDING_TOPUP" + And transaction "FUNDING_TOPUP" is included on node "NODE_1" in 180 seconds + And I start zone sequencer "SEQ_A" with indexer + And sequencer "SEQ_A" publishes the following zone messages: + | alias | data | + | MSG_1 | initial inscription | + Then all zone messages are safe in 120 seconds + When sequencer "SEQ_A" registers zone program "PROGRAM_1" + Then zone transaction "PROGRAM_1" is included in 120 seconds + And sequencer "SEQ_A" observes program registration "PROGRAM_1" in 120 seconds + When wallet "WALLET_1A" deposits 1000 LGO into the channel of sequencer "SEQ_A" as "DEPOSIT" + Then zone transaction "DEPOSIT" is included in 120 seconds + When wallet "WALLET_1A" pays 600 LGO of its channel notes to program "PROGRAM_1" of sequencer "SEQ_A" as step "PAY_IN" + And sequencer "SEQ_A" publishes zone block "BLOCK_1" with step "PAY_IN" and a step of program "PROGRAM_1" collecting it + Then zone transaction "BLOCK_1" is included in 120 seconds + And sequencer "SEQ_A" tracks the program notes zone block "BLOCK_1" created in 120 seconds + When sequencer "SEQ_A" publishes zone block "BLOCK_2" with a step of program "PROGRAM_1" paying its notes to wallet "WALLET_1A" as "PAYOUT" + Then zone transaction "BLOCK_2" is included in 120 seconds + And sequencer "SEQ_A" tracks the program notes zone block "BLOCK_2" created in 120 seconds + When wallet "WALLET_1A" withdraws channel note "PAYOUT" from the channel of sequencer "SEQ_A" as "WITHDRAW" + Then zone transaction "WITHDRAW" is included in 120 seconds + And wallet "WALLET_1A" holds a ledger note of 600 LGO in 180 seconds + And the zone indexer returns messages in this order: + | alias | + | MSG_1 | + | BLOCK_1 | + | BLOCK_2 | + Then the channel view contract holds for all zone sequencers diff --git a/tests/zone-sdk/src/cucumber/steps/zone/actions/cluster.rs b/tests/zone-sdk/src/cucumber/steps/zone/actions/cluster.rs index 9ce0a76..e89b579 100644 --- a/tests/zone-sdk/src/cucumber/steps/zone/actions/cluster.rs +++ b/tests/zone-sdk/src/cucumber/steps/zone/actions/cluster.rs @@ -74,6 +74,13 @@ fn apply_zone_timing_defaults(world: &mut ZoneWorld, step: &str) -> StepResult { step, "eras.0.cryptarchia.slot_activation_coeff.denominator", "2", + )?; + // Short enough for a scenario to see a channel withdrawal released. + set_deployment_config_override( + &mut world.node, + step, + "eras.0.cryptarchia.channel_withdraw_delay", + "30", ) } diff --git a/tests/zone-sdk/src/cucumber/steps/zone/actions/mod.rs b/tests/zone-sdk/src/cucumber/steps/zone/actions/mod.rs index 86d5b09..5c5fb6f 100644 --- a/tests/zone-sdk/src/cucumber/steps/zone/actions/mod.rs +++ b/tests/zone-sdk/src/cucumber/steps/zone/actions/mod.rs @@ -123,7 +123,11 @@ pub(super) use channel::{ pub(super) use cluster::{ register_zone_sequencers_with_shared_key, start_nodes_with_zone_resources, }; -pub(super) use program::register_zone_program; +pub(super) use program::{ + ProgramBlockContent, deposit_into_channel, pay_into_program, publish_program_block, + register_zone_program, wait_for_tracked_program_notes, wait_for_wallet_note, + withdraw_channel_note, +}; pub(super) use publishing::{ initialize_zone_indexer, publish_zone_messages, publish_zone_messages_concurrently, }; diff --git a/tests/zone-sdk/src/cucumber/steps/zone/actions/program.rs b/tests/zone-sdk/src/cucumber/steps/zone/actions/program.rs index a9e685e..c9da1c3 100644 --- a/tests/zone-sdk/src/cucumber/steps/zone/actions/program.rs +++ b/tests/zone-sdk/src/cucumber/steps/zone/actions/program.rs @@ -1,23 +1,71 @@ -use lb_core::mantle::ops::program::ProgramRegisterOp; +use std::collections::HashSet; + +use lb_common_http_client::CommonHttpClient; +use lb_core::{ + crypto::ZkHasher, + mantle::{ + Note, Value, + gas::GasCost, + note_set::NoteSetIndex, + notes::{NoteCommitment, ProgramId}, + ops::{ + StepProof, + channel::{ChannelId, deposit::Metadata, inscribe::Step}, + }, + programs::ProgramVerificationKey, + }, +}; +use lb_groth16::{ + CompressedGroth16Proof, Fr, + test_utils::{three_input_prove, three_input_setup}, +}; +use lb_http_api_common::bodies::{ + channel::{ + ChannelDepositRequestBody, ChannelStepRequestBody, ChannelWithdrawRequestBody, + ProgramDepositBody, + }, + wallet::import::WalletImportNoteRequestBody, +}; +use lb_key_management_system_service::keys::ZkPublicKey; +use lb_testing_framework::NodeHttpClient; +use lb_zone_sdk::{ + node_types::ProgramProof, + sequencer::{ + Error as SequencerError, PreparedProgramInscription, ProgramOutput, ProgramStepRequest, + StepRequest, UserOutput, prove_program_step, + }, +}; +use tokio::time::{sleep, timeout}; +use tracing::warn; use super::{ - Duration, PublishDeadline, Step, StepError, StepResult, ZoneWorld, log_step_error, - register_program_with_retry, + Duration, Inscription, PublishDeadline, PublishResult, SequencerClient, Step as GherkinStep, + StepError, StepResult, ZoneWorld, ensure_zone_transactions_included, log_step_error, + register_program_with_retry, remember_published_zone_message, zone_step_error, }; +use crate::cucumber::{steps::TARGET, zone::ZoneProgram}; -/// Registers the node's sample program key through the sequencer and -/// remembers the registration under `program_alias`, its tx under the same -/// alias. +/// Registers a toy program through the sequencer, its circuit seeded from +/// `program_alias`, and remembers the registration under the alias, its tx +/// under the same alias. pub async fn register_zone_program( world: &mut ZoneWorld, - step: &Step, + step: &GherkinStep, sequencer_alias: &str, program_alias: String, ) -> StepResult { + let circuit_seed = circuit_seed(&program_alias); + let (verification_key, _) = three_input_setup(circuit_seed); + let verification_key = + ProgramVerificationKey::try_from(&verification_key).map_err(|error| { + StepError::LogicalError { + message: format!("The toy circuit's key is not a program key: {error}"), + } + })?; let client = log_step_error(step, world.zone.sequencer_client(sequencer_alias))?; let (info, checkpoint) = register_program_with_retry( client, - &ProgramRegisterOp::sample().verification_key, + &verification_key, PublishDeadline::from_now(Duration::from_secs(120)), ) .await @@ -34,6 +82,581 @@ pub async fn register_zone_program( world .node .remember_submitted_transaction(program_alias.clone(), info.tx_hash); - world.zone.remember_program(program_alias, info); + world + .zone + .remember_program(program_alias, ZoneProgram { info, circuit_seed }); + Ok(()) +} + +/// Deposits `amount` from `wallet_name`'s ledger notes into the channel of +/// `sequencer_alias` through the wallet's node, which funds and proves the +/// deposit. The tx is remembered under `alias`, the channel note it creates +/// too. +pub async fn deposit_into_channel( + world: &mut ZoneWorld, + step: &GherkinStep, + wallet_name: &str, + sequencer_alias: &str, + amount: Value, + alias: String, +) -> StepResult { + let holder = holder_key(world, wallet_name)?; + let node = holder_node(world, wallet_name)?; + let channel_id = world.zone.sequencer_channel_id(sequencer_alias)?; + let body = || ChannelDepositRequestBody { + tip: None, + channel_id, + amount, + holder_public_key: holder, + metadata: Metadata::new_unchecked(alias.clone().into_bytes()), + change_public_key: holder, + funding_public_keys: vec![holder], + max_tx_fee: GasCost::new(u64::MAX), + }; + let client = CommonHttpClient::new(None); + // The node signs the deposit and hands it back; the holder submits it. + let response = retry_until_spendable("channel deposit", || { + client.prepare_channel_deposit(node.base_url().clone(), body()) + }) + .await?; + node.submit_transaction(&response.transaction) + .await + .map_err(|error| StepError::LogicalError { + message: format!("Submitting the channel deposit failed: {error}"), + })?; + ensure_zone_transactions_included(&node, &[response.hash], Duration::from_mins(3)) + .await + .map_err(|error| zone_step_error(step, &error))?; + world + .node + .remember_submitted_transaction(alias.clone(), response.hash); + world + .zone + .remember_channel_note(alias, response.holder_note); + Ok(()) +} + +/// Builds a program deposit of `amount` from `wallet_name`'s channel notes +/// through the wallet's node, paying the program of `program_alias`, and +/// remembers the step with its proof under `step_alias` for a zone block to +/// carry. +pub async fn pay_into_program( + world: &mut ZoneWorld, + wallet_name: &str, + sequencer_alias: &str, + amount: Value, + program_alias: &str, + step_alias: String, +) -> StepResult { + let holder = holder_key(world, wallet_name)?; + let node = holder_node(world, wallet_name)?; + let channel_id = world.zone.sequencer_channel_id(sequencer_alias)?; + let program_id = world.zone.program(program_alias)?.info.program_id; + let body = || ChannelStepRequestBody { + tip: None, + channel_id, + appended: Vec::new(), + payments: Vec::new(), + program_deposit: Some(ProgramDepositBody { + program_id, + value: amount, + intent: Fr::from(1u64), + }), + inscription: Inscription::new_unchecked(step_alias.clone().into_bytes()), + change_public_key: holder, + holder_public_keys: vec![holder], + }; + let response = retry_until_spendable("program deposit", || node.channel_step(body())).await?; + world.zone.remember_user_step( + step_alias, + response.step, + StepProof::ZkTransfer(response.proof), + ); + Ok(()) +} + +/// What the program step of a zone block does. +pub enum ProgramBlockContent { + /// Collects the program deposit of the user step published before it + /// into one note of the program. + Collect { user_step: String }, + /// Consumes every note of the program the sequencer tracks and pays + /// their value to `wallet`, whose node imports the note before the block + /// is submitted; the note is remembered under `payout`. + PayOut { wallet: String, payout: String }, +} + +/// Publishes a zone block carrying one step of `program_alias`'s program with +/// `content`. The sequencer builds and proves the spend, the toy circuit +/// proves the program. The block is remembered under `block_alias` with the +/// program notes its step created. +pub async fn publish_program_block( + world: &mut ZoneWorld, + step: &GherkinStep, + sequencer_alias: &str, + block_alias: String, + program_alias: &str, + content: ProgramBlockContent, +) -> StepResult { + let program = world.zone.program(program_alias)?.clone(); + let client = log_step_error(step, world.zone.sequencer_client(sequencer_alias))?.clone(); + let node = log_step_error( + step, + world.zone_node_http_client_for_sequencer(sequencer_alias), + )?; + let channel_id = world.zone.sequencer_channel_id(sequencer_alias)?; + let payload = Inscription::new_unchecked(block_alias.clone().into_bytes()); + let plan = match &content { + ProgramBlockContent::Collect { user_step } => { + let (step, proof) = world.zone.user_step(user_step)?; + BlockPlan::Collect { step, proof } + } + ProgramBlockContent::PayOut { wallet, .. } => BlockPlan::PayOut { + payee: holder_key(world, wallet)?, + payee_node: holder_node(world, wallet)?, + channel_id, + }, + }; + let (result, created, payouts) = publish_program_block_with_retry( + &client, + &payload, + &program, + &plan, + PublishDeadline::from_now(Duration::from_mins(3)), + ) + .await?; + ensure_zone_transactions_included(&node, &[result.inscription_id()], Duration::from_mins(3)) + .await + .map_err(|error| zone_step_error(step, &error))?; + + world + .node + .remember_submitted_transaction(block_alias.clone(), result.inscription_id()); + remember_published_zone_message( + world, + sequencer_alias, + block_alias.clone(), + payload, + &result, + ); + world.zone.remember_program_outputs(block_alias, created); + if let ProgramBlockContent::PayOut { payout, .. } = content { + let note = payouts + .first() + .copied() + .ok_or_else(|| StepError::LogicalError { + message: "The payout step paid no note".to_owned(), + })?; + world.zone.remember_channel_note(payout, note); + } + Ok(()) +} + +/// Withdraws the channel note `note_alias` of `wallet_name` through the +/// wallet's node and remembers the tx under `tx_alias`. +pub async fn withdraw_channel_note( + world: &mut ZoneWorld, + wallet_name: &str, + sequencer_alias: &str, + note_alias: &str, + tx_alias: String, +) -> StepResult { + let holder = holder_key(world, wallet_name)?; + let node = holder_node(world, wallet_name)?; + let channel_id = world.zone.sequencer_channel_id(sequencer_alias)?; + let note = world.zone.channel_note(note_alias)?; + let body = || ChannelWithdrawRequestBody { + tip: None, + channel_id, + notes: vec![note.commitment()], + change_public_key: holder, + funding_public_keys: vec![holder], + max_tx_fee: GasCost::new(u64::MAX), + }; + let response = + retry_until_spendable("channel withdrawal", || node.channel_withdraw(body())).await?; + world + .node + .remember_submitted_transaction(tx_alias, response.hash); Ok(()) } + +/// Waits until the ledger notes of `wallet_name` include one worth `value`. +pub async fn wait_for_wallet_note( + world: &ZoneWorld, + wallet_name: &str, + value: Value, + duration: Duration, +) -> StepResult { + let holder = holder_key(world, wallet_name)?; + let node = holder_node(world, wallet_name)?; + timeout(duration, async { + loop { + match node.wallet_balance(holder, None).await { + Ok(balance) if balance.notes.values().any(|note| *note == value) => return, + Ok(_) => {} + Err(error) => { + warn!(target: TARGET, "Wallet balance request failed, retrying: {error}"); + } + } + sleep(Duration::from_millis(500)).await; + } + }) + .await + .map_err(|_| StepError::LogicalError { + message: format!("Timed out waiting for wallet '{wallet_name}' to hold a note of {value}"), + }) +} + +/// Waits until the program notes the sequencer tracks are exactly +/// `expected`, each with a path against the view's root. +pub async fn wait_for_tracked_program_notes( + client: &SequencerClient, + expected: &[NoteCommitment], + duration: Duration, +) -> StepResult { + let expected: HashSet = expected.iter().copied().collect(); + timeout(duration, async { + loop { + let view = client + .program_notes() + .await + .map_err(|error| StepError::LogicalError { + message: format!("Zone program_notes failed: {error}"), + })?; + let notes: Vec<_> = view.finalized.iter().chain(&view.unfinalized).collect(); + let tracked: HashSet = + notes.iter().map(|note| note.commitment).collect(); + if tracked == expected { + for note in notes { + if !note.path.verify::(note.commitment.0, view.root) { + return Err(StepError::LogicalError { + message: format!( + "Tracked program note {:?} has no valid path against the root", + note.commitment + ), + }); + } + } + return Ok(()); + } + sleep(Duration::from_millis(500)).await; + } + }) + .await + .map_err(|_| StepError::LogicalError { + message: format!("Timed out waiting for the sequencer to track {expected:?}"), + })? +} + +// The program step of a block, resolved from the world. +#[expect( + clippy::large_enum_variant, + reason = "a user's step is carried with its proof as given" +)] +enum BlockPlan { + Collect { + step: Step, + proof: StepProof, + }, + PayOut { + payee: ZkPublicKey, + payee_node: NodeHttpClient, + channel_id: ChannelId, + }, +} + +// Builds, proves and submits the block until it lands in the pending set: a +// note the sequencer tracks becomes spendable a few blocks after its +// creation, and the publish tip may move under a built inscription. Returns +// the publish result, the program notes created and the user notes paid. +async fn publish_program_block_with_retry( + client: &SequencerClient, + payload: &Inscription, + program: &ZoneProgram, + plan: &BlockPlan, + deadline: PublishDeadline, +) -> Result<(PublishResult, Vec, Vec), StepError> { + loop { + if deadline.is_expired() { + return Err(StepError::LogicalError { + message: "Timed out publishing a program step".to_owned(), + }); + } + if let Some(published) = try_publish_program_block(client, payload, program, plan).await? { + return Ok(published); + } + sleep(Duration::from_millis(500)).await; + } +} + +// One attempt at the block; `None` when it is to be tried again. +async fn try_publish_program_block( + client: &SequencerClient, + payload: &Inscription, + program: &ZoneProgram, + plan: &BlockPlan, +) -> Result, Vec)>, StepError> { + let program_id = program.info.program_id; + let mini_block = match plan { + BlockPlan::Collect { step, proof } => { + let Step::ProgramDeposit(deposit) = step else { + return Err(StepError::LogicalError { + message: "The user step to collect is not a program deposit".to_owned(), + }); + }; + vec![ + StepRequest::User { + step: step.clone(), + proof: proof.clone(), + }, + StepRequest::Program(program_step( + program, + payload, + Vec::new(), + vec![program_note(program, deposit.value)], + Vec::new(), + )), + ] + } + BlockPlan::PayOut { payee, .. } => { + let inputs = tracked_inputs(client, program_id).await?; + if inputs.is_empty() { + return Ok(None); + } + let value = inputs.iter().map(|(_, value)| value).sum(); + vec![StepRequest::Program(program_step( + program, + payload, + inputs + .into_iter() + .map(|(commitment, _)| commitment) + .collect(), + Vec::new(), + vec![UserOutput { + public_key: *payee, + stake_public_key: *payee, + value, + nonce: None, + }], + ))] + } + }; + let Some(built) = prepare_built(client, payload, mini_block).await else { + return Ok(None); + }; + let (proofs, created, paid) = prove_block(&built, program).await?; + // A payee's wallet adopts a note it knows the opening of when the note + // is appended, so it learns the payout before the block lands. + if let BlockPlan::PayOut { + payee_node, + channel_id, + .. + } = plan + { + for note in &paid { + import_channel_note(payee_node, *channel_id, *note).await?; + } + } + Ok(submit_built(client, &built, proofs) + .await + .map(|result| (result, created, paid))) +} + +// The program notes of the program the sequencer tracks, with their values. +async fn tracked_inputs( + client: &SequencerClient, + program_id: ProgramId, +) -> Result, StepError> { + let view = client + .program_notes() + .await + .map_err(|error| StepError::LogicalError { + message: format!("Zone program_notes failed: {error}"), + })?; + Ok(view + .finalized + .iter() + .chain(&view.unfinalized) + .filter(|note| note.program == program_id) + .map(|note| (note.commitment, note.opening.value)) + .collect()) +} + +// A note of the program worth `value`, with a nonce of the program's choosing: +// the collecting step consumes nothing, so the spend fixes none. +fn program_note(program: &ZoneProgram, value: Value) -> ProgramOutput { + ProgramOutput { + value, + stake_public_key: ZkPublicKey::new(Fr::from(program.circuit_seed)), + data: Fr::from(value), + nonce: Some(Fr::from(program.circuit_seed ^ value)), + } +} + +fn program_step( + program: &ZoneProgram, + payload: &Inscription, + inputs: Vec, + program_outputs: Vec, + outputs: Vec, +) -> ProgramStepRequest { + ProgramStepRequest { + program_id: program.info.program_id, + inputs, + program_outputs, + outputs, + inscription: payload.clone(), + } +} + +// The inscription built on the sequencer's current state; `None` when it +// refuses the step for now, such as a note not yet deep enough to spend. +async fn prepare_built( + client: &SequencerClient, + payload: &Inscription, + mini_block: Vec, +) -> Option { + client + .prepare_program_inscription(payload.clone(), vec![mini_block]) + .await + .inspect_err(|error| { + warn!(target: TARGET, "Zone prepare_program_inscription failed, retrying: {error}"); + }) + .ok() +} + +// The step proofs of the built inscription, the spend proven by the +// sequencer's prover and the program by the toy circuit, with the program +// notes and the user notes its program step creates. +async fn prove_block( + built: &PreparedProgramInscription, + program: &ZoneProgram, +) -> Result<(Vec, Vec, Vec), StepError> { + let prepared = + built + .program_steps() + .next() + .cloned() + .ok_or_else(|| StepError::LogicalError { + message: "The built inscription carries no program step".to_owned(), + })?; + let proving = prepared.clone(); + let spend_proof = tokio::task::spawn_blocking(move || prove_program_step(&proving)) + .await + .map_err(|error| StepError::LogicalError { + message: format!("The spend prover task failed: {error}"), + })? + .map_err(|error| StepError::LogicalError { + message: format!("The spend proof failed: {error}"), + })?; + let (_, proving_key) = three_input_setup(program.circuit_seed); + let program_proof = + three_input_prove(&proving_key, prepared.program_inputs, program.circuit_seed); + let program_proof = ProgramProof::new( + CompressedGroth16Proof::try_from(&program_proof).map_err(|error| { + StepError::LogicalError { + message: format!("The program proof does not compress: {error:?}"), + } + })?, + ); + let proofs = built + .step_proofs(vec![(spend_proof, program_proof)]) + .map_err(|error| StepError::LogicalError { + message: format!("The step proofs do not fit: {error}"), + })?; + let program_notes = prepared.program_notes.len(); + let created = prepared.outputs[..program_notes] + .iter() + .map(Note::commitment) + .collect(); + let paid = prepared.outputs[program_notes..].to_vec(); + Ok((proofs, created, paid)) +} + +// The built inscription submitted with its proofs; `None` when the publish +// tip moved under it or the submission failed, to rebuild. +async fn submit_built( + client: &SequencerClient, + built: &PreparedProgramInscription, + proofs: Vec, +) -> Option { + match client + .submit_prepared_inscription(built.op.clone(), proofs) + .await + { + Ok((result, _checkpoint)) => Some(result), + Err(SequencerError::ChannelStateChanged(reason)) => { + warn!(target: TARGET, "The publish tip moved under the program step, rebuilding: {reason}"); + None + } + Err(error) => { + warn!(target: TARGET, "Zone submit_prepared_inscription failed, retrying: {error}"); + None + } + } +} + +// Registers the opening of a channel note with the wallet of `node`. +async fn import_channel_note( + node: &NodeHttpClient, + channel_id: ChannelId, + note: Note, +) -> Result<(), StepError> { + CommonHttpClient::new(None) + .import_note( + node.base_url().clone(), + WalletImportNoteRequestBody { + note, + note_set: NoteSetIndex::Channel(channel_id), + }, + ) + .await + .map_err(|error| StepError::LogicalError { + message: format!("Importing the payout note failed: {error}"), + }) +} + +// Retries a node request until the wallet can spend the notes it needs, +// which takes a few blocks after they land. +async fn retry_until_spendable( + label: &str, + request: impl Fn() -> Request + Send + Sync, +) -> Result +where + Response: Send, + Request: Future> + Send, +{ + let mut last_error = None; + timeout(Duration::from_mins(3), async { + loop { + match request().await { + Ok(response) => return response, + Err(error) => last_error = Some(error), + } + sleep(Duration::from_millis(500)).await; + } + }) + .await + .map_err(|_| StepError::LogicalError { + message: format!( + "Timed out waiting for the {label} to succeed, last error: {last_error:?}" + ), + }) +} + +fn holder_key(world: &ZoneWorld, wallet_name: &str) -> Result { + world.node.resolve_wallet(wallet_name)?.public_key() +} + +fn holder_node(world: &ZoneWorld, wallet_name: &str) -> Result { + let node_name = world.node.resolve_wallet_node_name(wallet_name)?; + world.node.resolve_node_http_client(&node_name) +} + +// A seed of the toy circuit, stable per program alias. +fn circuit_seed(program_alias: &str) -> u64 { + program_alias.bytes().fold(0x5eedu64, |seed, byte| { + seed.wrapping_mul(31).wrapping_add(u64::from(byte)) + }) +} diff --git a/tests/zone-sdk/src/cucumber/steps/zone/operations/mod.rs b/tests/zone-sdk/src/cucumber/steps/zone/operations/mod.rs index b9698b3..4bb95ea 100644 --- a/tests/zone-sdk/src/cucumber/steps/zone/operations/mod.rs +++ b/tests/zone-sdk/src/cucumber/steps/zone/operations/mod.rs @@ -147,7 +147,7 @@ impl PublishDeadline { } } - fn is_expired(self) -> bool { + pub(super) fn is_expired(self) -> bool { self.started_at.elapsed() > self.timeout } } diff --git a/tests/zone-sdk/src/cucumber/steps/zone/steps/mod.rs b/tests/zone-sdk/src/cucumber/steps/zone/steps/mod.rs index fc92eae..29436ef 100644 --- a/tests/zone-sdk/src/cucumber/steps/zone/steps/mod.rs +++ b/tests/zone-sdk/src/cucumber/steps/zone/steps/mod.rs @@ -17,12 +17,14 @@ use logos_blockchain_tests::{ use super::{ CustomRepublishDeps, PublishDeadline, actions::{ - DriveMode, initialize_zone_indexer, prepare_zone_channel_config, publish_zone_messages, - publish_zone_messages_concurrently, register_zone_program, + DriveMode, ProgramBlockContent, deposit_into_channel, initialize_zone_indexer, + pay_into_program, prepare_zone_channel_config, publish_program_block, + publish_zone_messages, publish_zone_messages_concurrently, register_zone_program, register_zone_sequencers_with_shared_key, remember_published_zone_message, save_zone_checkpoint, sign_prepared_zone_channel_config, start_named_sequencer, start_named_sequencer_with_pending_submit_depth, start_nodes_with_zone_resources, stop_zone_sequencer, submit_prepared_zone_channel_config, submit_zone_channel_config, + wait_for_tracked_program_notes, wait_for_wallet_note, withdraw_channel_note, }, assertions::{ assert_sorted_outcome, scan_indexer_for_payloads, wait_for_indexer_unordered, diff --git a/tests/zone-sdk/src/cucumber/steps/zone/steps/program.rs b/tests/zone-sdk/src/cucumber/steps/zone/steps/program.rs index 3461fb4..c42dd1a 100644 --- a/tests/zone-sdk/src/cucumber/steps/zone/steps/program.rs +++ b/tests/zone-sdk/src/cucumber/steps/zone/steps/program.rs @@ -1,7 +1,9 @@ use super::{ - Duration, Step, StepResult, ZoneWorld, log_step_error, register_zone_program, + Duration, ProgramBlockContent, Step, StepResult, ZoneWorld, deposit_into_channel, + log_step_error, pay_into_program, publish_program_block, register_zone_program, wait_for_finalized_program, wait_for_finalized_program_via_sequencer, - wait_for_observed_program, when, zone_step_error, + wait_for_observed_program, wait_for_tracked_program_notes, wait_for_wallet_note, when, + withdraw_channel_note, zone_step_error, }; #[when(expr = "sequencer {string} registers zone program {string}")] @@ -24,7 +26,7 @@ async fn step_sequencer_observes_program( program_alias: String, timeout_seconds: u64, ) -> StepResult { - let program_id = world.zone.program(&program_alias)?.program_id; + let program_id = world.zone.program(&program_alias)?.info.program_id; let events = log_step_error(step, world.zone.sequencer_events_mut(&sequencer_alias))?; wait_for_observed_program(events, program_id, Duration::from_secs(timeout_seconds)) .await @@ -41,7 +43,7 @@ async fn step_sequencer_finalizes_program( program_alias: String, timeout_seconds: u64, ) -> StepResult { - let program_id = world.zone.program(&program_alias)?.program_id; + let program_id = world.zone.program(&program_alias)?.info.program_id; let events = log_step_error(step, world.zone.sequencer_events_mut(&sequencer_alias))?; wait_for_finalized_program_via_sequencer( events, @@ -65,9 +67,144 @@ async fn step_zone_indexer_returns_finalized_program( program_alias: String, timeout_seconds: u64, ) -> StepResult { - let program_id = world.zone.program(&program_alias)?.program_id; + let program_id = world.zone.program(&program_alias)?.info.program_id; let indexer = log_step_error(step, world.zone.indexer())?; wait_for_finalized_program(indexer, program_id, Duration::from_secs(timeout_seconds)) .await .map_err(|error| zone_step_error(step, &error)) } + +#[when( + expr = "wallet {string} deposits {int} LGO into the channel of sequencer {string} as {string}" +)] +async fn step_deposit_into_channel( + world: &mut ZoneWorld, + step: &Step, + wallet_name: String, + amount: u64, + sequencer_alias: String, + alias: String, +) -> StepResult { + deposit_into_channel(world, step, &wallet_name, &sequencer_alias, amount, alias).await +} + +#[when( + expr = "wallet {string} pays {int} LGO of its channel notes to program {string} of sequencer {string} as step {string}" +)] +async fn step_pay_into_program( + world: &mut ZoneWorld, + wallet_name: String, + amount: u64, + program_alias: String, + sequencer_alias: String, + step_alias: String, +) -> StepResult { + pay_into_program( + world, + &wallet_name, + &sequencer_alias, + amount, + &program_alias, + step_alias, + ) + .await +} + +#[when( + expr = "sequencer {string} publishes zone block {string} with step {string} and a step of program {string} collecting it" +)] +async fn step_publish_collecting_block( + world: &mut ZoneWorld, + step: &Step, + sequencer_alias: String, + block_alias: String, + user_step: String, + program_alias: String, +) -> StepResult { + publish_program_block( + world, + step, + &sequencer_alias, + block_alias, + &program_alias, + ProgramBlockContent::Collect { user_step }, + ) + .await +} + +#[when( + expr = "sequencer {string} publishes zone block {string} with a step of program {string} paying its notes to wallet {string} as {string}" +)] +async fn step_publish_payout_block( + world: &mut ZoneWorld, + step: &Step, + sequencer_alias: String, + block_alias: String, + program_alias: String, + wallet: String, + payout: String, +) -> StepResult { + publish_program_block( + world, + step, + &sequencer_alias, + block_alias, + &program_alias, + ProgramBlockContent::PayOut { wallet, payout }, + ) + .await +} + +#[when( + expr = "wallet {string} withdraws channel note {string} from the channel of sequencer {string} as {string}" +)] +async fn step_withdraw_channel_note( + world: &mut ZoneWorld, + wallet_name: String, + note_alias: String, + sequencer_alias: String, + tx_alias: String, +) -> StepResult { + withdraw_channel_note(world, &wallet_name, &sequencer_alias, ¬e_alias, tx_alias).await +} + +#[cucumber::then(expr = "wallet {string} holds a ledger note of {int} LGO in {int} seconds")] +#[expect( + clippy::needless_pass_by_ref_mut, + reason = "Cucumber step functions require `&mut World` as the first parameter" +)] +async fn step_wallet_holds_note( + world: &mut ZoneWorld, + wallet_name: String, + value: u64, + timeout_seconds: u64, +) -> StepResult { + wait_for_wallet_note( + world, + &wallet_name, + value, + Duration::from_secs(timeout_seconds), + ) + .await +} + +/// The program's notes the sequencer tracks are exactly the ones the block's +/// step created, each with a path against the channel's root. +#[cucumber::then( + expr = "sequencer {string} tracks the program notes zone block {string} created in {int} seconds" +)] +#[expect( + clippy::needless_pass_by_ref_mut, + reason = "Cucumber step functions require `&mut World` as the first parameter" +)] +async fn step_sequencer_tracks_program_notes( + world: &mut ZoneWorld, + step: &Step, + sequencer_alias: String, + block_alias: String, + timeout_seconds: u64, +) -> StepResult { + let expected = world.zone.program_outputs(&block_alias)?.to_vec(); + let client = log_step_error(step, world.zone.sequencer_client(&sequencer_alias))?.clone(); + wait_for_tracked_program_notes(&client, &expected, Duration::from_secs(timeout_seconds)).await +} diff --git a/tests/zone-sdk/src/cucumber/zone.rs b/tests/zone-sdk/src/cucumber/zone.rs index 3f40257..28a635d 100644 --- a/tests/zone-sdk/src/cucumber/zone.rs +++ b/tests/zone-sdk/src/cucumber/zone.rs @@ -4,7 +4,17 @@ use std::{ }; use lb_core::{ - mantle::ops::channel::{ChannelId, MsgId, inscribe::Inscription}, + mantle::{ + Note, + notes::NoteCommitment, + ops::{ + StepProof, + channel::{ + ChannelId, MsgId, + inscribe::{Inscription, Step}, + }, + }, + }, proofs::channel_multi_sig_proof::IndexedSignatures, }; use lb_key_management_system_service::keys::{Ed25519Key, Ed25519PublicKey}; @@ -17,6 +27,14 @@ use super::steps::zone::runner::{ SequencerCheckpoint, SequencerClient, }; +/// A program a sequencer registered: the registration and the seed of the +/// toy circuit whose key it registered, which proves its steps. +#[derive(Debug, Clone)] +pub struct ZoneProgram { + pub info: ProgramRegisterInfo, + pub circuit_seed: u64, +} + pub struct ZonePublishedMessage { pub payload: Inscription, pub inscription_id: Option, @@ -87,7 +105,13 @@ pub struct ZoneState { latest_checkpoints: HashMap, prepared_configs: HashMap, prepared_config_signatures: HashMap, - programs: HashMap, + programs: HashMap, + /// The notes the program step of a published zone block created. + program_outputs: HashMap>, + /// Channel notes a holder knows the opening of: deposits and payouts. + channel_notes: HashMap, + /// Steps a user's node built and proved, for a zone block to carry. + user_steps: HashMap, sequencer_startups: HashMap, sorted_total_payloads: Option, sorted_expected_by_sequencer: Option>>, @@ -346,16 +370,55 @@ impl ZoneState { self.prepared_configs.insert(alias, prepared); } - pub fn remember_program(&mut self, alias: String, program: ProgramRegisterInfo) { + pub fn remember_program(&mut self, alias: String, program: ZoneProgram) { self.programs.insert(alias, program); } - pub fn program(&self, alias: &str) -> Result<&ProgramRegisterInfo, StepError> { + pub fn program(&self, alias: &str) -> Result<&ZoneProgram, StepError> { self.programs.get(alias).ok_or(StepError::LogicalError { message: format!("Zone program '{alias}' not found"), }) } + pub fn remember_program_outputs(&mut self, block_alias: String, outputs: Vec) { + self.program_outputs.insert(block_alias, outputs); + } + + pub fn program_outputs(&self, block_alias: &str) -> Result<&[NoteCommitment], StepError> { + self.program_outputs + .get(block_alias) + .map(Vec::as_slice) + .ok_or(StepError::LogicalError { + message: format!("Zone block '{block_alias}' published no program step"), + }) + } + + pub fn remember_channel_note(&mut self, alias: String, note: Note) { + self.channel_notes.insert(alias, note); + } + + pub fn channel_note(&self, alias: &str) -> Result { + self.channel_notes + .get(alias) + .copied() + .ok_or(StepError::LogicalError { + message: format!("Channel note '{alias}' not found"), + }) + } + + pub fn remember_user_step(&mut self, alias: String, step: Step, proof: StepProof) { + self.user_steps.insert(alias, (step, proof)); + } + + pub fn user_step(&self, alias: &str) -> Result<(Step, StepProof), StepError> { + self.user_steps + .get(alias) + .cloned() + .ok_or(StepError::LogicalError { + message: format!("User step '{alias}' not found"), + }) + } + pub fn prepared_config(&self, alias: &str) -> Result<&PreparedChannelConfig, StepError> { self.prepared_configs .get(alias) @@ -656,6 +719,9 @@ impl ZoneState { self.latest_checkpoints.clear(); self.prepared_configs.clear(); self.programs.clear(); + self.program_outputs.clear(); + self.channel_notes.clear(); + self.user_steps.clear(); self.prepared_config_signatures.clear(); self.expected_custom_payloads.clear(); self.view_violations.clear(); diff --git a/zone-sdk/Cargo.toml b/zone-sdk/Cargo.toml index 4246099..d791f00 100644 --- a/zone-sdk/Cargo.toml +++ b/zone-sdk/Cargo.toml @@ -17,6 +17,7 @@ workspace = true testing = ["dep:lb-testing-framework", "dep:testing-framework-app", "dep:testing-framework-core"] [dependencies] +ark-ff = { workspace = true } async-trait = { workspace = true } futures = { workspace = true } hex = { workspace = true } @@ -28,8 +29,10 @@ lb-http-api-common = { workspace = true } lb-key-management-system-service = { workspace = true } lb-log-targets = { workspace = true } lb-mmr = { workspace = true } +lb-program-spend = { workspace = true } lb-testing-framework = { optional = true, workspace = true } lb-time = { workspace = true } +lb-wallet = { workspace = true } reqwest = { workspace = true } rpds = { workspace = true } serde = { features = ["derive"], workspace = true } diff --git a/zone-sdk/src/lib.rs b/zone-sdk/src/lib.rs index eb924ef..7227e0a 100644 --- a/zone-sdk/src/lib.rs +++ b/zone-sdk/src/lib.rs @@ -22,6 +22,16 @@ //! [`adapter::Node`] trait; an HTTP implementation is provided as //! [`adapter::NodeHttpClient`]. //! +//! An inscription carrying program steps is built with +//! [`sequencer::SequencerHandle::prepare_program_inscription`]: the sequencer +//! tracks the channel's program notes +//! ([`sequencer::SequencerHandle::program_notes`]) and builds each program +//! step on them, with the witness of its spend. The spend is proven with +//! [`sequencer::prove_program_step`], off the drive loop; the zone adds its +//! program proof and publishes the inscription with +//! [`sequencer::SequencerHandle::submit_prepared_inscription`] and +//! [`sequencer::PreparedProgramInscription::step_proofs`]. +//! //! # Quick start (sequencer) //! //! The sequencer is owned by a single drive task. Two command surfaces: @@ -109,7 +119,7 @@ pub mod node_types { crypto::Hash, header::HeaderId, mantle::{ - SignedOps, TxHash, Value, + Note, SignedOps, TxHash, Value, channel::ChannelState, note_set::CommitmentMmr, notes::{ @@ -117,22 +127,30 @@ pub mod node_types { derive_program_output_nonce, }, ops::{ - OpId, ProgramNoteOpening, + OpId, ProgramNoteOpening, StepProof, channel::{ ChannelId, MsgId, deposit::Metadata, - inscribe::{Inscription, user_step_id}, - program_step::{program_deposit_id, program_deposits_hash}, + inscribe::{ + Inscription, InscriptionOp, MiniBlock, MiniBlocks, Step, UserStep, + user_step_id, + }, + program_step::{ + ProgramDeposit, ProgramStep, program_deposit_id, program_deposits_hash, + }, }, + proof_program_step::{ProgramProof, ProgramStepProof, ZkProgramSpendProof}, }, programs::{ProgramVerificationKey, derive_program_id, program_step_id}, transactions::states::Unverified, }, }; + pub use lb_groth16::Fr; pub use lb_http_api_common::bodies::{ mantle::LimitsResponseBody, wallet::fund::{WalletFundRequestBody, WalletFundResponseBody}, }; + pub use lb_key_management_system_service::keys::ZkPublicKey; pub use lb_mmr::MerklePath; } diff --git a/zone-sdk/src/sequencer/actor/tests.rs b/zone-sdk/src/sequencer/actor/tests.rs index 386b705..eb3ecb2 100644 --- a/zone-sdk/src/sequencer/actor/tests.rs +++ b/zone-sdk/src/sequencer/actor/tests.rs @@ -2595,6 +2595,178 @@ async fn a_checkpoint_without_program_notes_rebuilds_the_set_from_the_finalized_ assert!(note.path.verify::(commitment.0, view.root)); } +/// A program inscription prepared at the tip spends the program notes the +/// sequencer tracks `SPEND_ROOT_DEPTH` blocks below it, its first +/// mini-block proven against the root on chain, and once submitted its +/// inputs leave the notes a next step may consume. +#[tokio::test] +#[expect(clippy::too_many_lines, reason = "Test function.")] +async fn prepare_program_inscription_spends_the_tracked_notes_and_submits() { + use std::collections::HashMap; + + use lb_core::{ + events::{BlockEvent, Event as ChainEvent, Events}, + mantle::{ + note_set::{NoteSetIndex, NoteSetUpdate}, + ops::{ + channel::{ + inscribe::{MiniBlock, MiniBlocks, Step}, + program_step::ProgramStep, + }, + proof_program_step::StepProofShape, + }, + }, + }; + use lb_key_management_system_service::keys::ZkPublicKey; + use lb_wallet::SPEND_ROOT_DEPTH; + + use crate::{ + sequencer::{ + ProgramStepRequest, StepRequest, UserOutput, + program_notes::fixtures::{foreign, program, sample_opening}, + }, + test_support::{inscribe_op, unverified_tx_with_ops}, + }; + + let channel_id = ChannelId::from([0; 32]); + let sequencer_key = Ed25519Key::from_bytes(&[0; 32]); + let opening = sample_opening(); + let commitment = opening.note(program()).commitment(); + let step = ProgramStep { + program_id: program(), + program_outputs: [commitment].into(), + ..ProgramStep::sample() + }; + let mut mined = inscribe_op(channel_id, MsgId::root(), b"step"); + mined.mini_blocks = MiniBlocks::from([MiniBlock::try_from(vec![Step::Program(step)]).unwrap()]); + let b1 = api_block( + 1, + 0, + 1, + vec![unverified_tx_with_ops(vec![Op::ChannelInscribe( + mined.clone(), + )])], + ); + let update = Events::from(ChainEvent::Block(BlockEvent::NoteSetUpdated( + NoteSetUpdate { + note_set: NoteSetIndex::Channel(channel_id), + nullifiers: vec![], + commitments: vec![foreign(1), commitment], + }, + ))); + // B1 creates the note; the empty blocks after it bring it to spend depth. + let blocks: Vec<_> = (2..=1 + SPEND_ROOT_DEPTH as u8) + .map(|n| api_block(n, n - 1, u64::from(n), vec![])) + .collect(); + let (mut node, _posted) = MockNode::with_posted_channel(); + node.channel_state = Some(single_key_channel_state()); + node.scripts = scripts(vec![StreamScript { + events: std::iter::once(&b1) + .chain(&blocks) + .map(live_event) + .collect(), + then: StreamEnd::Hang, + }]); + node.events = HashMap::from([(header_id(1), update)]); + let mut sequencer = + ZoneSequencer::init(channel_id, sequencer_key, node, funding_config(), None); + let deadline = tokio::time::Instant::now() + std::time::Duration::from_secs(5); + loop { + let event = tokio::time::timeout_at(deadline, sequencer.next_event()) + .await + .expect("the sequencer gets ready"); + if matches!(event, Event::Ready) { + break; + } + } + let mut processed = 0; + while processed <= blocks.len() { + let event = tokio::time::timeout_at(deadline, sequencer.next_event()) + .await + .expect("every block is processed"); + if matches!(event, Event::BlocksProcessed { .. }) { + processed += 1; + } + } + let view = sequencer.handle().program_notes(); + assert_eq!(view.unfinalized.len(), 1, "the note is tracked at the tip"); + + let payee = ZkPublicKey::new(Fr::from(5u64)); + let built = sequencer + .handle() + .prepare_program_inscription( + Inscription::new_unchecked(b"zone block".to_vec()), + vec![vec![StepRequest::Program(ProgramStepRequest { + program_id: program(), + inputs: vec![commitment], + program_outputs: vec![], + outputs: vec![UserOutput { + public_key: payee, + stake_public_key: payee, + value: opening.value, + nonce: None, + }], + inscription: Inscription::new_unchecked(b"spend".to_vec()), + })]], + ) + .expect("a ready sequencer builds the program step on its tracked note"); + assert_eq!( + built.op.parent, + mined.id(), + "chains on the mined inscription" + ); + let prepared = built + .program_steps() + .next() + .expect("the inscription has a program step"); + assert_eq!( + prepared.witness.chain.tx_commitment_root, view.root, + "a first mini-block is proven against the root on chain" + ); + assert_eq!(prepared.outputs[0].public_key, payee); + + let StepProof::ProgramStep(sample) = + StepProof::sample_for(StepProofShape::ProgramStep { program_notes: 0 }) + else { + panic!("a program step shape samples a program step proof"); + }; + let proofs = built + .step_proofs(vec![(sample.spend_proof, sample.program_proof)]) + .unwrap(); + let (result, _checkpoint) = sequencer + .handle() + .submit_prepared_inscription(built.op.clone(), proofs) + .await + .expect("the built inscription submits with its proofs"); + assert_eq!(result.tx.inscription().this_msg, built.op.id()); + assert_eq!( + sequencer.handle().program_notes().unfinalized, + [], + "the pending step spends the note" + ); + assert!( + matches!( + sequencer.handle().prepare_program_inscription( + Inscription::new_unchecked(b"again".to_vec()), + vec![vec![StepRequest::Program(ProgramStepRequest { + program_id: program(), + inputs: vec![commitment], + program_outputs: vec![], + outputs: vec![UserOutput { + public_key: payee, + stake_public_key: payee, + value: opening.value, + nonce: None, + }], + inscription: Inscription::new_unchecked(b"spend".to_vec()), + })]], + ), + Err(Error::InvalidProgramStep(_)) + ), + "a note a pending step spends is not spendable again" + ); +} + /// The config op's signature must claim our key's index in the *current* /// accredited list — not index 0 — or the ledger rejects the update as /// `InvalidSignature` whenever the sequencer is not the leading key. diff --git a/zone-sdk/src/sequencer/block_states.rs b/zone-sdk/src/sequencer/block_states.rs index bbb2020..52e75e4 100644 --- a/zone-sdk/src/sequencer/block_states.rs +++ b/zone-sdk/src/sequencer/block_states.rs @@ -18,6 +18,7 @@ use lb_core::{ }, }; use lb_mmr::PushWithPathsError; +use lb_wallet::SPEND_ROOT_DEPTH; use rpds::{HashTrieSetSync, ListSync}; use super::{ @@ -422,6 +423,32 @@ impl BlockStates { .view(&self.finalized.notes) } + /// The program notes a step prepared at `tip` spends, at the root it + /// names: the set [`SPEND_ROOT_DEPTH`] blocks below the tip, the depth + /// every wallet spend names its root at, or the deepest one held on its + /// branch, keeping the notes still in the tip's set. The finalized set + /// when no tip is known. + pub fn program_spend_set(&self, tip: Option) -> ProgramNoteSet { + let Some((tip, tip_state)) = tip.and_then(|tip| Some((tip, self.block_states.get(&tip)?))) + else { + return self.finalized.notes.clone(); + }; + let mut block = tip; + let mut base = tip_state; + for _ in 0..SPEND_ROOT_DEPTH { + let Some((parent, state)) = self + .parent_map + .get(&block) + .and_then(|parent| Some((*parent, self.block_states.get(parent)?))) + else { + break; + }; + block = parent; + base = state; + } + base.notes.still_in(&tip_state.notes) + } + /// The finalized note set, for checkpointing. pub fn finalized_program_notes(&self) -> ProgramNotesCheckpoint { self.finalized.notes.to_checkpoint() diff --git a/zone-sdk/src/sequencer/client.rs b/zone-sdk/src/sequencer/client.rs index 70c4966..1e4b276 100644 --- a/zone-sdk/src/sequencer/client.rs +++ b/zone-sdk/src/sequencer/client.rs @@ -19,6 +19,7 @@ use lb_key_management_system_service::keys::Ed25519Signature; use tokio::sync::{broadcast, mpsc, oneshot, watch}; use super::{ + program_steps::{MiniBlockRequest, PreparedProgramInscription}, types::{ Error, Event, PreparedChannelConfig, ProgramNotesView, ProgramRegisterInfo, SequencerChannelView, SequencerCheckpoint, TurnNotification, @@ -94,6 +95,22 @@ impl SequencerClient { Self::recv(response_rx).await? } + /// Async counterpart of + /// [`super::SequencerHandle::prepare_program_inscription`]. + pub async fn prepare_program_inscription( + &self, + data: Inscription, + mini_blocks: Vec, + ) -> Result { + let (response_tx, response_rx) = oneshot::channel(); + self.send(ActorRequest::PrepareProgramInscription { + data, + mini_blocks, + response_tx, + })?; + Self::recv(response_rx).await? + } + /// Async counterpart of /// [`super::SequencerHandle::submit_prepared_inscription`]. pub async fn submit_prepared_inscription( diff --git a/zone-sdk/src/sequencer/handle.rs b/zone-sdk/src/sequencer/handle.rs index 9238c7b..68fffca 100644 --- a/zone-sdk/src/sequencer/handle.rs +++ b/zone-sdk/src/sequencer/handle.rs @@ -18,6 +18,7 @@ use lb_core::{ use lb_key_management_system_service::keys::Ed25519Signature; use super::{ + program_steps::{MiniBlockRequest, PreparedProgramInscription}, types::{ Error, PreparedChannelConfig, ProgramNotesView, ProgramRegisterInfo, SequencerCheckpoint, }, @@ -103,6 +104,23 @@ where self.sequencer.do_prepare_inscription(data, mini_blocks) } + /// Build the inscription of `data` with `mini_blocks` on the current + /// publish tip, its program steps spending the channel's program notes + /// and carrying the witness of their spend, without publishing it. The + /// spends are proven with [`super::prove_program_step`], off the drive + /// loop, and the inscription is published with + /// [`Self::submit_prepared_inscription`] and + /// [`PreparedProgramInscription::step_proofs`]. Async counterpart: + /// [`super::SequencerClient::prepare_program_inscription`]. + pub fn prepare_program_inscription( + &mut self, + data: Inscription, + mini_blocks: Vec, + ) -> Result { + self.sequencer + .do_prepare_program_inscription(data, mini_blocks) + } + /// Enqueue a prepared inscription with one proof per step. /// /// The op is published as prepared: a stale re-fund replaces only the @@ -112,7 +130,7 @@ where /// and an inscription that lands then drops off the canonical branch /// comes back orphaned in a [`super::ChannelUpdate`] with its steps. Both /// mean: prepare again, re-prove the program steps against the new - /// `op_id`, keep the holders' proofs, submit again. + /// `op_id`, keep the users' proofs, submit again. pub async fn submit_prepared_inscription( &mut self, op: InscriptionOp, diff --git a/zone-sdk/src/sequencer/mod.rs b/zone-sdk/src/sequencer/mod.rs index 8ca4f17..f83e1be 100644 --- a/zone-sdk/src/sequencer/mod.rs +++ b/zone-sdk/src/sequencer/mod.rs @@ -69,6 +69,7 @@ mod block_states; mod client; mod handle; pub(crate) mod program_notes; +mod program_steps; mod slot_clock; mod state; mod tx_builder; @@ -94,6 +95,10 @@ pub use lb_core::{ proofs::channel_multi_sig_proof::{IndexedSignature, IndexedSignatures}, }; pub use lb_key_management_system_service::keys::{Ed25519Key, UnverifiedEd25519PublicKey}; +pub use program_steps::{ + MiniBlockRequest, PreparedProgramInscription, PreparedProgramStep, PreparedStep, ProgramOutput, + ProgramStepRequest, StepRequest, UserOutput, prove_program_step, +}; // Pure key-only signing primitive for prepared multi-sig artifacts — usable by // an offline key holder with no sequencer or chain state. pub use tx_builder::sign_prepared; diff --git a/zone-sdk/src/sequencer/program_notes.rs b/zone-sdk/src/sequencer/program_notes.rs index 4e27683..589c637 100644 --- a/zone-sdk/src/sequencer/program_notes.rs +++ b/zone-sdk/src/sequencer/program_notes.rs @@ -197,6 +197,58 @@ impl ProgramNoteSet { self.notes.values() } + pub fn note(&self, commitment: &NoteCommitment) -> Option<&ProgramNote> { + self.notes.get(commitment) + } + + /// The set at `self`'s root keeping only the notes also in `tip`: what a + /// step naming `self`'s root may consume once `tip` is the chain. + #[must_use] + pub fn still_in(&self, tip: &Self) -> Self { + Self { + commitments: self.commitments.clone(), + notes: self + .notes + .iter() + .filter(|(commitment, _)| tip.contains(commitment)) + .map(|(commitment, note)| (*commitment, note.clone())) + .collect(), + } + } + + /// The set without the notes of `spent`. + #[must_use] + pub fn without(&self, spent: &HashSet) -> Self { + if spent.is_empty() { + return self.clone(); + } + Self { + commitments: self.commitments.clone(), + notes: self + .notes + .iter() + .filter(|(_, note)| !spent.contains(¬e.nullifier)) + .map(|(commitment, note)| (*commitment, note.clone())) + .collect(), + } + } + + /// The root of the set extended with `appended`, and the paths of + /// `inputs` against it: what a step at that position of a transaction + /// is proven against. + pub fn extended( + &self, + appended: &[NoteCommitment], + inputs: &[&ProgramNote], + ) -> Result<(Fr, Vec), PushWithPathsError> { + let mut paths: Vec = inputs.iter().map(|note| note.path.clone()).collect(); + let mut commitments = self.commitments.clone(); + for commitment in appended { + commitments = commitments.push_with_paths(*commitment, &mut paths)?.0; + } + Ok((commitments.frontier_root(), paths)) + } + /// The set at `self`'s root, split into the notes also in `finalized` /// and the rest. #[must_use] @@ -463,4 +515,64 @@ mod tests { BlockNoteSet::from_events(&events, ChannelId::from([3; 32]), HashMap::new()).is_none() ); } + + #[test] + fn still_in_keeps_the_root_and_drops_what_the_tip_consumed() { + let base = ProgramNoteSet::default() + .apply(&block(&[1], &[1, 2], &[])) + .unwrap(); + let tip = base.apply(&block(&[2], &[3], &[1])).unwrap(); + let spend = base.still_in(&tip); + assert_eq!(spend.root(), base.root()); + assert_eq!( + spend + .notes() + .map(|note| note.commitment) + .collect::>(), + [commitment(2)], + "note 1 is consumed at the tip and note 3 is not in the base yet" + ); + assert!( + spend + .note(&commitment(2)) + .unwrap() + .path + .verify::(commitment(2).0, spend.root()) + ); + } + + #[test] + fn without_drops_the_spent_notes() { + let set = ProgramNoteSet::default() + .apply(&block(&[], &[1, 2], &[])) + .unwrap(); + let rest = set.without(&HashSet::from([nullifier(1)])); + assert_eq!( + rest.notes().map(|note| note.commitment).collect::>(), + [commitment(2)] + ); + assert_eq!(rest.root(), set.root()); + } + + #[test] + fn extended_proves_the_inputs_against_the_root_the_buffer_makes() { + let set = ProgramNoteSet::default() + .apply(&block(&[1], &[1, 2], &[])) + .unwrap(); + let appended = [fixtures::foreign(2), commitment(3)]; + let inputs = [set.note(&commitment(2)).unwrap()]; + let (root, paths) = set.extended(&appended, &inputs).unwrap(); + let expected = appended + .iter() + .fold(set.commitments.clone(), |mmr, commitment| { + mmr.push_with_paths(*commitment, &mut []).unwrap().0 + }) + .frontier_root(); + assert_eq!(root, expected); + assert_ne!(root, set.root()); + assert!(paths[0].verify::(commitment(2).0, root)); + let (unextended, paths) = set.extended(&[], &inputs).unwrap(); + assert_eq!(unextended, set.root()); + assert_eq!(paths, [inputs[0].path.clone()]); + } } diff --git a/zone-sdk/src/sequencer/program_steps.rs b/zone-sdk/src/sequencer/program_steps.rs new file mode 100644 index 0000000..78dab12 --- /dev/null +++ b/zone-sdk/src/sequencer/program_steps.rs @@ -0,0 +1,1055 @@ +//! The program steps of an inscription: built on the sequencer's tracked +//! program notes at the position the ledger verifies them, each with the +//! witness of its `ZkProgramSpend`, which is proven off the drive loop. + +use std::collections::HashSet; + +use ark_ff::PrimeField as _; +use lb_core::mantle::{ + Note, Value, + notes::{ + InputNullifiers, NoteCommitment, NoteNullifier, OutputCommitments, ProgramId, + derive_program_output_nonce, + }, + ops::{ + OpId as _, StepProof, + channel::{ + ChannelId, MsgId, + inscribe::{Inscription, InscriptionOp, MiniBlock, MiniBlocks, Step}, + program_step::{ProgramDeposit, ProgramStep, program_deposits_hash}, + }, + proof_program_step::{ + ProgramNoteOpening, ProgramProof, ProgramStepProof, ZkProgramSpendProof, + }, + }, + programs::{SpendInputFields, SpendOutputFields, program_step_id}, +}; +use lb_groth16::{AdditiveGroup as _, Fr}; +use lb_key_management_system_service::keys::{Ed25519Key, ZkKey, ZkPublicKey}; +use lb_mmr::MerklePath; +use lb_program_spend::{ + MAX_INPUTS, MAX_OUTPUTS, ZkProgramSpendChainInputsData, ZkProgramSpendInputNoteData, + ZkProgramSpendOutputNoteData, ZkProgramSpendWalletInputsData, ZkProgramSpendWitnessInputsData, + check_bounds, +}; + +use super::{ + program_notes::ProgramNoteSet, + tx_builder::inscription_op, + types::{Error, ProgramNote}, +}; + +/// A note of the program a step creates. +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub struct ProgramOutput { + pub value: Value, + pub stake_public_key: ZkPublicKey, + pub data: Fr, + /// The program's choice of nonce, which a step consuming nothing must + /// make. A step consuming a note has every output nonce derived from + /// its first input, so the nonce is left out or equals the derivation. + pub nonce: Option, +} + +/// A user note a step pays. +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub struct UserOutput { + pub public_key: ZkPublicKey, + pub stake_public_key: ZkPublicKey, + pub value: Value, + /// As [`ProgramOutput::nonce`]. + pub nonce: Option, +} + +/// A program step for the sequencer to build: what it consumes and creates. +/// Its value balances: the inputs plus the program deposits before it in +/// its mini-block pay the outputs. +#[derive(Debug, Clone, PartialEq, Eq)] +pub struct ProgramStepRequest { + pub program_id: ProgramId, + /// The program notes it consumes, among the ones + /// [`ZoneSequencer::program_notes`](super::ZoneSequencer::program_notes) + /// lists. + pub inputs: Vec, + /// The notes of the program it creates, appended before `outputs`. + pub program_outputs: Vec, + /// The user notes it pays. + pub outputs: Vec, + /// The zone message of the step. + pub inscription: Inscription, +} + +/// A step of a mini-block: one a user's node built and proved, a user step +/// or a program deposit, or one of the program for the sequencer to build. +#[derive(Debug, Clone, PartialEq, Eq)] +#[expect( + clippy::large_enum_variant, + reason = "a user's step is carried with its proof as given" +)] +pub enum StepRequest { + User { step: Step, proof: StepProof }, + Program(ProgramStepRequest), +} + +/// The steps of a mini-block, in the order they apply. +pub type MiniBlockRequest = Vec; + +/// An inscription with its program steps built: the op to submit, and per +/// step what its proof is made of. +#[derive(Debug, Clone)] +pub struct PreparedProgramInscription { + pub op: InscriptionOp, + /// One per step of `op`, in order. + pub steps: Vec, +} + +/// What a step of a [`PreparedProgramInscription`] has towards its proof. +#[derive(Debug, Clone)] +pub enum PreparedStep { + /// A user's step, proven as given. + User(StepProof), + /// A program step built by the sequencer, whose spend + /// [`prove_program_step`] proves and whose program proof the zone adds. + Program(PreparedProgramStep), +} + +/// A program step the sequencer built, with the witness of its spend. +#[derive(Debug, Clone)] +pub struct PreparedProgramStep { + /// The index of the step over the mini-blocks of the inscription. + pub index: usize, + /// The `ZkProgramSpend` witness, bound to the inscription's op id. + pub witness: Box, + /// The openings of the notes of the program the step creates, which + /// its proof publishes. + pub program_notes: Vec, + /// The openings of every note the step creates, the program's first. + pub outputs: Vec, + /// The public inputs of the program proof: the step id, the hash of the + /// deposits the step consumes and the op id. + pub program_inputs: [Fr; 3], +} + +impl PreparedProgramInscription { + /// The program steps of the inscription, in order. + pub fn program_steps(&self) -> impl Iterator { + self.steps.iter().filter_map(|step| match step { + PreparedStep::Program(prepared) => Some(prepared), + PreparedStep::User(_) => None, + }) + } + + /// The proofs of the steps for + /// [`SequencerHandle::submit_prepared_inscription`](super::SequencerHandle::submit_prepared_inscription), + /// from the spend and program proofs of the program steps, in their + /// order. + pub fn step_proofs( + &self, + program_proofs: Vec<(ZkProgramSpendProof, ProgramProof)>, + ) -> Result, Error> { + let program_steps = self.program_steps().count(); + if program_proofs.len() != program_steps { + return Err(Error::InvalidStepProofs(format!( + "{} proofs for {program_steps} program steps", + program_proofs.len() + ))); + } + let mut program_proofs = program_proofs.into_iter(); + Ok(self + .steps + .iter() + .map(|step| match step { + PreparedStep::User(proof) => proof.clone(), + PreparedStep::Program(prepared) => { + let (spend_proof, program_proof) = program_proofs + .next() + .expect("one proof pair per program step, counted above"); + StepProof::ProgramStep(ProgramStepProof { + spend_proof, + program_proof, + program_notes: prepared.program_notes.clone(), + }) + } + }) + .collect()) + } +} + +/// Proves the spend of a program step. Takes seconds of CPU: run it off +/// the drive loop. +pub fn prove_program_step(prepared: &PreparedProgramStep) -> Result { + let (proof, _) = lb_program_spend::prove((*prepared.witness).clone().into()) + .map_err(|error| Error::Prover(error.to_string()))?; + Ok(ZkProgramSpendProof::new(proof)) +} + +/// Builds the inscription of `data` with `mini_blocks` on `parent`, its +/// program steps spending `spend`'s notes at the root `spend` is at. +pub(super) fn build_program_inscription( + channel_id: ChannelId, + signing_key: &Ed25519Key, + data: Inscription, + parent: MsgId, + spend: &ProgramNoteSet, + mini_blocks: Vec, +) -> Result { + let mut builder = Builder { + spend, + buffer: Vec::new(), + consumed: HashSet::new(), + index: 0, + steps: Vec::new(), + }; + let mini_blocks = mini_blocks + .into_iter() + .map(|mini_block| builder.mini_block(mini_block)) + .collect::, _>>()?; + let mini_blocks = MiniBlocks::try_from_iter(mini_blocks) + .map_err(|error| Error::InvalidProgramStep(format!("too many mini-blocks: {error}")))?; + let op = inscription_op(channel_id, signing_key, data, parent, mini_blocks); + // The message of the program spends and the third input of the program + // proofs. + let op_id = Fr::from_le_bytes_mod_order(&op.op_id()); + let mut steps = builder.steps; + for step in &mut steps { + if let PreparedStep::Program(prepared) = step { + prepared.witness.chain.msg = op_id; + prepared.program_inputs[2] = op_id; + } + } + Ok(PreparedProgramInscription { op, steps }) +} + +// Walks the steps of an inscription as the ledger does: every step's +// outputs join the buffer the next program steps are proven behind, and a +// program step consumes the deposits of its mini-block since the last one. +struct Builder<'a> { + spend: &'a ProgramNoteSet, + buffer: Vec, + consumed: HashSet, + index: usize, + steps: Vec, +} + +impl<'a> Builder<'a> { + fn mini_block(&mut self, steps: MiniBlockRequest) -> Result { + let mut built = Vec::with_capacity(steps.len()); + let mut deposits: Vec = Vec::new(); + for request in steps { + let step = match request { + StepRequest::User { step, proof } => { + self.check_user_step(&step, &proof)?; + match &step { + Step::ProgramDeposit(deposit) => deposits.push(deposit.clone()), + Step::Program(_) => deposits.clear(), + Step::User(_) => {} + } + self.steps.push(PreparedStep::User(proof)); + step + } + StepRequest::Program(request) => { + let (step, prepared) = self.program_step(request, &deposits)?; + deposits.clear(); + self.steps.push(PreparedStep::Program(prepared)); + Step::Program(step) + } + }; + self.buffer.extend(step.outputs().iter().copied()); + self.index += 1; + built.push(step); + } + if let Some(deposit) = deposits.first() { + return Err(self.invalid(&format!( + "a deposit to program {:?} is left unconsumed at the end of its mini-block", + deposit.program_id + ))); + } + MiniBlock::try_from(built) + .map_err(|error| Error::InvalidProgramStep(format!("mini-block: {error}"))) + } + + fn invalid(&self, reason: &str) -> Error { + Error::InvalidProgramStep(format!("step {}: {reason}", self.index)) + } + + // A user's step carries the proof of its kind and consumes no note of + // the inscription's program steps. + fn check_user_step(&mut self, step: &Step, proof: &StepProof) -> Result<(), Error> { + let fits = match step { + Step::User(_) | Step::ProgramDeposit(_) => matches!(proof, StepProof::ZkTransfer(_)), + Step::Program(_) => matches!(proof, StepProof::ProgramStep(_)), + }; + if !fits { + return Err(self.invalid("the proof is not of the step's kind")); + } + for nullifier in step.inputs().iter() { + if !self.consumed.insert(*nullifier) { + return Err(self.invalid(&format!("consumes {nullifier:?} twice"))); + } + } + Ok(()) + } + + fn program_step( + &mut self, + request: ProgramStepRequest, + deposits: &[ProgramDeposit], + ) -> Result<(ProgramStep, PreparedProgramStep), Error> { + if let Some(deposit) = deposits + .iter() + .find(|deposit| deposit.program_id != request.program_id) + { + return Err(self.invalid(&format!( + "consumes a deposit to another program {:?}", + deposit.program_id + ))); + } + let paid_value = deposits + .iter() + .try_fold(0, |paid: Value, deposit| paid.checked_add(deposit.value)) + .ok_or_else(|| self.invalid("the paid value overflows"))?; + check_bounds( + request.inputs.len(), + request.program_outputs.len() + request.outputs.len(), + ) + .map_err(|error| self.invalid(&error.to_string()))?; + let inputs = self.inputs(&request)?; + self.check_balance(&request, &inputs, paid_value)?; + + let first_input = inputs.first().map(|note| ¬e.nullifier); + let (program_notes, outputs) = + created_notes(&request, first_input).map_err(|reason| self.invalid(&reason))?; + let input_notes: Vec = inputs + .iter() + .map(|note| note.opening.note(note.program)) + .collect(); + let (tx_commitment_root, paths) = self + .spend + .extended(&self.buffer, &inputs) + .map_err(|error| self.invalid(&format!("the channel's note set is full: {error}")))?; + let step = ProgramStep { + program_id: request.program_id, + inputs: InputNullifiers::try_from_iter(inputs.iter().map(|note| note.nullifier)) + .map_err(|error| self.invalid(&error.to_string()))?, + program_outputs: OutputCommitments::try_from_iter( + outputs[..program_notes.len()].iter().map(Note::commitment), + ) + .map_err(|error| self.invalid(&error.to_string()))?, + outputs: OutputCommitments::try_from_iter( + outputs[program_notes.len()..].iter().map(Note::commitment), + ) + .map_err(|error| self.invalid(&error.to_string()))?, + commitment_merkle_root: self.spend.root(), + program_step_id: step_id(&input_notes, &outputs), + inscription: request.inscription, + }; + let witness = ZkProgramSpendWitnessInputsData { + wallet: wallet_inputs(&input_notes, &paths, &outputs), + chain: ZkProgramSpendChainInputsData { + inputs_active: core::array::from_fn(|i| i < inputs.len()), + outputs_active: core::array::from_fn(|j| j < outputs.len()), + outputs_of_program: core::array::from_fn(|j| j < program_notes.len()), + tx_commitment_root, + program_id: request.program_id, + paid_value, + msg: Fr::ZERO, + }, + }; + let prepared = PreparedProgramStep { + index: self.index, + witness: Box::new(witness), + program_notes, + outputs, + program_inputs: [ + step.program_step_id, + program_deposits_hash(&deposits.iter().collect::>()), + Fr::ZERO, + ], + }; + Ok((step, prepared)) + } + + // The spendable notes of the step's program the step consumes, each + // once in the inscription. + fn inputs(&mut self, request: &ProgramStepRequest) -> Result, Error> { + let spend = self.spend; + let mut inputs = Vec::with_capacity(request.inputs.len()); + for commitment in &request.inputs { + let note = spend.note(commitment).ok_or_else(|| { + self.invalid(&format!( + "consumes {commitment:?}, not a spendable program note of the channel" + )) + })?; + if note.program != request.program_id { + return Err(self.invalid(&format!( + "consumes {commitment:?}, a note of program {:?}", + note.program + ))); + } + if !self.consumed.insert(note.nullifier) { + return Err(self.invalid(&format!("consumes {commitment:?} twice"))); + } + inputs.push(note); + } + Ok(inputs) + } + + fn check_balance( + &self, + request: &ProgramStepRequest, + inputs: &[&ProgramNote], + paid_value: Value, + ) -> Result<(), Error> { + let overflow = || self.invalid("the value overflows"); + let consumed = inputs + .iter() + .try_fold(paid_value, |total: Value, note| { + total.checked_add(note.opening.value) + }) + .ok_or_else(overflow)?; + let created = request + .program_outputs + .iter() + .map(|output| output.value) + .chain(request.outputs.iter().map(|output| output.value)) + .try_fold(0, |total: Value, value| total.checked_add(value)) + .ok_or_else(overflow)?; + if consumed != created { + return Err(self.invalid(&format!("consumes {consumed} and creates {created}"))); + } + Ok(()) + } +} + +// The notes the step creates, the program's first, with the nonce the spend +// fixes or the program chose. +fn created_notes( + request: &ProgramStepRequest, + first_input: Option<&NoteNullifier>, +) -> Result<(Vec, Vec), String> { + let holder = ZkKey::zero().to_public_key(); + let program_notes = request + .program_outputs + .iter() + .enumerate() + .map(|(index, output)| { + Ok(ProgramNoteOpening { + value: output.value, + nonce: output_nonce(first_input, index, output.value, &holder, output.nonce)?, + stake_public_key: output.stake_public_key, + data: output.data, + }) + }) + .collect::, String>>()?; + let user_notes = request + .outputs + .iter() + .enumerate() + .map(|(index, output)| { + let index = index + program_notes.len(); + Ok(Note { + value: output.value, + nonce: output_nonce( + first_input, + index, + output.value, + &output.public_key, + output.nonce, + )?, + public_key: output.public_key, + stake_public_key: output.stake_public_key, + program: Fr::ZERO, + data: Fr::ZERO, + }) + }) + .collect::, String>>()?; + let outputs = program_notes + .iter() + .map(|opening| opening.note(request.program_id)) + .chain(user_notes) + .collect(); + Ok((program_notes, outputs)) +} + +// The nonce of the output at `index`: the derivation from the first input +// when the step consumes a note, which a chosen nonce must equal, else the +// program's choice, which it must make. +fn output_nonce( + first_input: Option<&NoteNullifier>, + index: usize, + value: Value, + public_key: &ZkPublicKey, + chosen: Option, +) -> Result { + match (first_input, chosen) { + (Some(first_input), chosen) => { + let derived = derive_program_output_nonce(first_input, index, value, public_key); + if chosen.is_some_and(|nonce| nonce != derived) { + return Err(format!( + "the nonce of output {index} is derived from the first input" + )); + } + Ok(derived) + } + (None, Some(nonce)) => Ok(nonce), + (None, None) => Err(format!( + "a step consuming nothing names the nonce of output {index}" + )), + } +} + +// The id of the step consuming `inputs` and creating `outputs`. +fn step_id(inputs: &[Note], outputs: &[Note]) -> Fr { + let input_fields: [SpendInputFields; MAX_INPUTS] = core::array::from_fn(|i| { + inputs + .get(i) + .map_or_else(SpendInputFields::inactive, |note| SpendInputFields { + active: true, + value: note.value, + nonce: note.nonce, + public_key: note.public_key, + stake_public_key: note.stake_public_key, + data: note.data, + }) + }); + let output_fields: [SpendOutputFields; MAX_OUTPUTS] = core::array::from_fn(|j| { + outputs + .get(j) + .map_or_else(SpendOutputFields::inactive, SpendOutputFields::of) + }); + program_step_id(&input_fields, &output_fields) +} + +// The wallet's part of the witness: the inputs with their paths, and the +// outputs. +fn wallet_inputs( + inputs: &[Note], + paths: &[MerklePath], + outputs: &[Note], +) -> ZkProgramSpendWalletInputsData { + ZkProgramSpendWalletInputsData { + inputs: core::array::from_fn(|i| { + inputs.get(i).zip(paths.get(i)).map_or_else( + ZkProgramSpendInputNoteData::inactive, + |(note, path)| ZkProgramSpendInputNoteData { + stake_public_key: *note.stake_public_key.as_fr(), + nonce: note.nonce, + value: note.value, + data: note.data, + path_and_selectors: core::array::from_fn(|level| { + path.path_and_selectors(level).into() + }), + }, + ) + }), + outputs: core::array::from_fn(|j| { + outputs + .get(j) + .map_or_else(ZkProgramSpendOutputNoteData::inactive, |note| { + ZkProgramSpendOutputNoteData { + public_key: *note.public_key.as_fr(), + stake_public_key: *note.stake_public_key.as_fr(), + nonce: note.nonce, + value: note.value, + program: note.program, + data: note.data, + } + }) + }), + } +} + +#[cfg(test)] +mod tests { + use std::collections::HashMap; + + use lb_core::mantle::{ + note_set::CommitmentMmr, + ops::{channel::inscribe::UserStep, proof_program_step::StepProofShape}, + }; + use lb_program_spend::{ZkProgramSpendPublic, ZkProgramSpendVerifierInput}; + + use super::{ + super::{ + program_notes::{ + BlockNoteSet, + fixtures::{block, commitment, foreign, nullifier, opening, program}, + }, + tx_builder::check_step_proofs, + }, + *, + }; + + fn channel() -> ChannelId { + ChannelId::from([3; 32]) + } + + fn key() -> Ed25519Key { + Ed25519Key::from_bytes(&[5; 32]) + } + + fn parent() -> MsgId { + MsgId::from([9u8; 32]) + } + + fn pk(seed: u64) -> ZkPublicKey { + ZkPublicKey::new(Fr::from(seed)) + } + + fn holder() -> ZkPublicKey { + ZkKey::zero().to_public_key() + } + + fn chosen_nonce(value: Value) -> Fr { + Fr::from(1_000 + value) + } + + /// The channel's set: the program's notes 2 and 3 behind a foreign + /// commitment. + fn spend_set() -> ProgramNoteSet { + ProgramNoteSet::default() + .apply(&block(&[1], &[2, 3], &[])) + .unwrap() + } + + /// The root of [`spend_set`]'s MMR extended with `buffer`, built from + /// the leaves. + fn extended_root(buffer: &[NoteCommitment]) -> Fr { + [foreign(1), commitment(2), commitment(3)] + .iter() + .chain(buffer) + .fold(CommitmentMmr::new(), |mmr, commitment| { + mmr.push(*commitment).unwrap() + }) + .frontier_root() + } + + fn transfer_proof() -> StepProof { + StepProof::sample_for(StepProofShape::ZkTransfer) + } + + fn user_outputs() -> [NoteCommitment; 2] { + [ + NoteCommitment(Fr::from(0x24u64)), + NoteCommitment(Fr::from(0x25u64)), + ] + } + + fn user_step() -> StepRequest { + StepRequest::User { + step: Step::User(UserStep { + inputs: [NoteNullifier(Fr::from(0x23u64))].into(), + outputs: user_outputs().into(), + commitment_merkle_root: Fr::from(0x26u64), + inscription: Inscription::new_unchecked(b"user".to_vec()), + }), + proof: transfer_proof(), + } + } + + /// A deposit of `value`, spending a note of its own. + fn deposit(program_id: ProgramId, value: Value) -> StepRequest { + StepRequest::User { + step: Step::ProgramDeposit(ProgramDeposit { + program_id, + value, + inputs: [NoteNullifier(Fr::from(0x100 + value))].into(), + outputs: [NoteCommitment(Fr::from(0x200 + value))].into(), + ..ProgramDeposit::sample() + }), + proof: transfer_proof(), + } + } + + fn program_step( + inputs: &[u64], + program_outputs: &[Value], + outputs: &[(u64, Value)], + ) -> StepRequest { + StepRequest::Program(ProgramStepRequest { + program_id: program(), + inputs: inputs.iter().map(|seed| commitment(*seed)).collect(), + // A step consuming nothing names its nonces: `chosen_nonce`. + program_outputs: program_outputs + .iter() + .map(|value| ProgramOutput { + value: *value, + stake_public_key: pk(77), + data: Fr::from(11u64), + nonce: inputs.is_empty().then(|| chosen_nonce(*value)), + }) + .collect(), + outputs: outputs + .iter() + .map(|(seed, value)| UserOutput { + public_key: pk(*seed), + stake_public_key: pk(*seed + 100), + value: *value, + nonce: inputs.is_empty().then(|| chosen_nonce(*value)), + }) + .collect(), + inscription: Inscription::new_unchecked(b"program".to_vec()), + }) + } + + fn build( + spend: &ProgramNoteSet, + mini_blocks: Vec, + ) -> Result { + build_program_inscription( + channel(), + &key(), + Inscription::new_unchecked(b"zone block".to_vec()), + parent(), + spend, + mini_blocks, + ) + } + + fn program_draft( + built: &PreparedProgramInscription, + index: usize, + ) -> (&ProgramStep, &PreparedProgramStep) { + let Some(Step::Program(step)) = built.op.steps().nth(index) else { + panic!("step {index} is a program step"); + }; + let Some(PreparedStep::Program(prepared)) = built.steps.get(index) else { + panic!("step {index} has a program prepared"); + }; + (step, prepared) + } + + fn rejection(result: Result) -> String { + match result { + Err(Error::InvalidProgramStep(reason)) => reason, + Err(error) => panic!("another error: {error}"), + Ok(_) => panic!("the inscription builds"), + } + } + + /// A program step is built on the spend set's notes and proven behind + /// the outputs of the steps before it, naming the set's root. Its + /// outputs are the program's notes first, with the nonces derived from + /// its first input. + #[test] + fn builds_a_program_step_at_its_position_in_the_inscription() { + let spend = spend_set(); + let built = build( + &spend, + vec![vec![user_step(), program_step(&[2, 3], &[4], &[(5, 1)])]], + ) + .unwrap(); + assert_eq!(built.op.channel_id, channel()); + assert_eq!(built.op.parent, parent()); + assert_eq!(built.op.steps_len(), 2); + let Some(PreparedStep::User(proof)) = built.steps.first() else { + panic!("the user's step keeps its proof"); + }; + assert_eq!(*proof, transfer_proof()); + + let (step, prepared) = program_draft(&built, 1); + assert_eq!(prepared.index, 1); + assert_eq!(step.program_id, program()); + assert_eq!(step.inputs.as_slice(), [nullifier(2), nullifier(3)]); + assert_eq!( + step.commitment_merkle_root, + spend.root(), + "the step names the root of the spend set" + ); + assert_eq!( + prepared.witness.chain.tx_commitment_root, + extended_root(&user_outputs()), + "the spend is proven behind the outputs of the user's step" + ); + assert_ne!(prepared.witness.chain.tx_commitment_root, spend.root()); + + assert_eq!(prepared.program_notes.len(), 1); + assert_eq!(prepared.outputs.len(), 2); + assert_eq!( + prepared.outputs[0], + prepared.program_notes[0].note(program()) + ); + assert_eq!( + prepared.outputs[0].nonce, + derive_program_output_nonce(&nullifier(2), 0, 4, &holder()) + ); + assert_eq!( + prepared.outputs[1], + Note { + value: 1, + nonce: derive_program_output_nonce(&nullifier(2), 1, 1, &pk(5)), + public_key: pk(5), + stake_public_key: pk(105), + program: Fr::ZERO, + data: Fr::ZERO, + }, + "a user note keeps the staking key it was given" + ); + assert_eq!( + step.program_outputs.as_slice(), + [prepared.outputs[0].commitment()] + ); + assert_eq!(step.outputs.as_slice(), [prepared.outputs[1].commitment()]); + + let op_id = Fr::from_le_bytes_mod_order(&built.op.op_id()); + assert_eq!( + prepared.program_inputs, + [step.program_step_id, program_deposits_hash(&[]), op_id] + ); + assert_eq!(prepared.witness.chain.msg, op_id); + assert_eq!(prepared.witness.chain.paid_value, 0); + assert_eq!(prepared.witness.chain.program_id, program()); + assert_eq!( + prepared.witness.chain.inputs_active, + [true, true, false, false] + ); + assert_eq!( + prepared.witness.chain.outputs_active[..3], + [true, true, false] + ); + assert_eq!( + prepared.witness.chain.outputs_of_program[..2], + [true, false] + ); + } + + /// A step after program deposits consumes their value, with their hash + /// as the second input of its program proof. Consuming no note, its + /// outputs carry the nonces the program chose. + #[test] + fn a_step_after_deposits_is_paid_their_value() { + let built = build( + &spend_set(), + vec![vec![ + user_step(), + deposit(program(), 50), + deposit(program(), 6), + program_step(&[], &[56], &[]), + ]], + ) + .unwrap(); + let (step, prepared) = program_draft(&built, 3); + assert_eq!(step.inputs.as_slice(), []); + assert_eq!(prepared.witness.chain.paid_value, 56); + assert_eq!(prepared.witness.chain.inputs_active, [false; MAX_INPUTS]); + let deposits: Vec<&ProgramDeposit> = built + .op + .steps() + .filter_map(|step| match step { + Step::ProgramDeposit(deposit) => Some(deposit), + _ => None, + }) + .collect(); + assert_eq!(deposits.len(), 2); + assert_eq!(prepared.program_inputs[1], program_deposits_hash(&deposits)); + assert_eq!( + prepared.outputs[0].nonce, + chosen_nonce(56), + "a step consuming nothing uses the nonce the program chose" + ); + let buffer: Vec = user_outputs() + .into_iter() + .chain( + deposits + .iter() + .flat_map(|deposit| deposit.outputs.iter().copied()), + ) + .collect(); + assert_eq!( + prepared.witness.chain.tx_commitment_root, + extended_root(&buffer), + "the spend is proven behind the deposits' change too" + ); + } + + /// The steps of a later mini-block are proven behind the outputs of + /// the earlier ones, and a note is consumed once in the inscription. + #[test] + fn later_mini_blocks_build_on_the_earlier_outputs() { + let built = build( + &spend_set(), + vec![ + vec![program_step(&[2], &[2], &[])], + vec![program_step(&[3], &[], &[(5, 3)])], + ], + ) + .unwrap(); + assert_eq!(built.op.mini_blocks.len(), 2); + let (first, first_draft) = program_draft(&built, 0); + let (_, second_draft) = program_draft(&built, 1); + assert_eq!( + first_draft.witness.chain.tx_commitment_root, + extended_root(&[]) + ); + assert_eq!( + second_draft.witness.chain.tx_commitment_root, + extended_root(first.program_outputs.as_slice()) + ); + assert_eq!( + rejection(build( + &spend_set(), + vec![ + vec![program_step(&[2], &[2], &[])], + vec![program_step(&[2], &[2], &[])], + ], + )), + format!("step 1: consumes {:?} twice", commitment(2)) + ); + } + + #[test] + fn rejects_a_step_the_ledger_would() { + let spend = spend_set(); + assert_eq!( + rejection(build(&spend, vec![vec![program_step(&[9], &[9], &[])]])), + format!( + "step 0: consumes {:?}, not a spendable program note of the channel", + commitment(9) + ) + ); + let other = Fr::from(8u64); + let foreign_note = opening(4).note(other).commitment(); + let with_other = spend + .apply(&BlockNoteSet { + commitments: vec![foreign_note], + nullifiers: vec![], + created: HashMap::from([(foreign_note, (other, opening(4)))]), + }) + .unwrap(); + let mut request = program_step(&[], &[4], &[]); + let StepRequest::Program(step) = &mut request else { + unreachable!() + }; + step.inputs = vec![foreign_note]; + assert_eq!( + rejection(build(&with_other, vec![vec![request]])), + format!("step 0: consumes {foreign_note:?}, a note of program {other:?}") + ); + assert_eq!( + rejection(build(&spend, vec![vec![program_step(&[2], &[1], &[])]])), + "step 0: consumes 2 and creates 1" + ); + assert_eq!( + rejection(build( + &spend, + vec![vec![deposit(other, 5), program_step(&[], &[5], &[])]] + )), + format!("step 1: consumes a deposit to another program {other:?}") + ); + assert_eq!( + rejection(build(&spend, vec![vec![deposit(program(), 5)]])), + format!( + "step 1: a deposit to program {:?} is left unconsumed at the end of its mini-block", + program() + ) + ); + assert!(rejection(build(&spend, vec![vec![]])).starts_with("mini-block:")); + let five = ProgramNoteSet::default() + .apply(&block(&[], &[1, 2, 3, 4, 5], &[])) + .unwrap(); + assert_eq!( + rejection(build( + &five, + vec![vec![program_step(&[1, 2, 3, 4, 5], &[15], &[])]] + )), + "step 0: a ZkProgramSpend spends at most 4 notes: got 5" + ); + let mut unnamed = program_step(&[], &[5], &[]); + let StepRequest::Program(step) = &mut unnamed else { + unreachable!() + }; + step.program_outputs[0].nonce = None; + assert_eq!( + rejection(build(&spend, vec![vec![deposit(program(), 5), unnamed]])), + "step 1: a step consuming nothing names the nonce of output 0" + ); + let mut fixed = program_step(&[2], &[2], &[]); + let StepRequest::Program(step) = &mut fixed else { + unreachable!() + }; + step.program_outputs[0].nonce = Some(Fr::from(9u64)); + assert_eq!( + rejection(build(&spend, vec![vec![fixed]])), + "step 0: the nonce of output 0 is derived from the first input" + ); + let misfit = StepRequest::User { + step: Step::ProgramDeposit(ProgramDeposit::sample()), + proof: StepProof::sample_for(StepProofShape::ProgramStep { program_notes: 0 }), + }; + assert_eq!( + rejection(build(&spend, vec![vec![misfit]])), + "step 0: the proof is not of the step's kind" + ); + } + + /// The step proofs interleave the users' proofs with the program + /// steps' assembled ones, in step order, as `submit_prepared_inscription` + /// checks them. + #[test] + fn step_proofs_fit_the_steps() { + let built = build( + &spend_set(), + vec![vec![user_step(), program_step(&[2], &[2], &[])]], + ) + .unwrap(); + let StepProof::ProgramStep(sample) = + StepProof::sample_for(StepProofShape::ProgramStep { program_notes: 1 }) + else { + panic!("a program step shape samples a program step proof"); + }; + let proofs = built + .step_proofs(vec![(sample.spend_proof, sample.program_proof)]) + .unwrap(); + assert_eq!(proofs[0], transfer_proof()); + let (_, prepared) = program_draft(&built, 1); + assert_eq!( + proofs[1], + StepProof::ProgramStep(ProgramStepProof { + spend_proof: sample.spend_proof, + program_proof: sample.program_proof, + program_notes: prepared.program_notes.clone(), + }) + ); + check_step_proofs(&built.op, &proofs).unwrap(); + assert!(matches!( + built.step_proofs(vec![]), + Err(Error::InvalidStepProofs(_)) + )); + } + + /// The spend proof verifies against the public inputs the ledger + /// derives from the op: the step's nullifiers, commitments and id, the + /// root extended with the buffer before the step, and the op id. + #[test] + fn the_spend_proof_verifies_against_what_the_ledger_reads_from_the_op() { + let built = build( + &spend_set(), + vec![vec![user_step(), program_step(&[2, 3], &[4], &[(5, 1)])]], + ) + .unwrap(); + let (step, prepared) = program_draft(&built, 1); + let proof = prove_program_step(prepared).unwrap(); + let outputs = step.outputs(); + let public = ZkProgramSpendVerifierInput::new(&ZkProgramSpendPublic { + inputs: &step + .inputs + .iter() + .map(|nullifier| nullifier.0) + .collect::>(), + outputs: &outputs + .iter() + .map(|commitment| commitment.0) + .collect::>(), + outputs_of_program: &(0..outputs.len()) + .map(|output| output < outputs.program_outputs().len()) + .collect::>(), + tx_commitment_root: extended_root(&user_outputs()), + program_id: step.program_id, + paid_value: 0, + program_step_id: step.program_step_id, + msg: Fr::from_le_bytes_mod_order(&built.op.op_id()), + }) + .unwrap(); + assert!(lb_program_spend::verify(proof.as_proof(), &public).unwrap()); + } +} diff --git a/zone-sdk/src/sequencer/state.rs b/zone-sdk/src/sequencer/state.rs index 3d99e1d..d795000 100644 --- a/zone-sdk/src/sequencer/state.rs +++ b/zone-sdk/src/sequencer/state.rs @@ -42,7 +42,7 @@ fn inscription_steps(tx: &SignedOps) -> InscriptionSte use super::{ block_fetch::{channel_configs, channel_inscriptions, is_pure_config}, block_states::{BlockChannelTx, BlockStates, ChannelTxKind, SharedTx}, - program_notes::{BlockNoteSet, program_step_inputs}, + program_notes::{BlockNoteSet, ProgramNoteSet, program_step_inputs}, types::{ ChannelUpdateTx, Error, InscriptionInfo, ObservedOp, PendingFunding, PendingTx, ProgramNotesCheckpoint, ProgramNotesView, @@ -1513,10 +1513,30 @@ impl TxState { #[must_use] pub fn program_notes(&self, tip: Option) -> ProgramNotesView { let mut view = self.blocks.program_notes_at(tip); + let spent = self.pending_program_inputs(tip); + view.finalized + .retain(|note| !spent.contains(¬e.nullifier)); + view.unfinalized + .retain(|note| !spent.contains(¬e.nullifier)); + view + } + + /// The program notes a step prepared at `tip` may consume, at the root + /// it names (see [`BlockStates::program_spend_set`]), minus what the + /// pending txs unmined there already spend. + #[must_use] + pub fn program_spend_set(&self, tip: Option) -> ProgramNoteSet { + self.blocks + .program_spend_set(tip) + .without(&self.pending_program_inputs(tip)) + } + + /// The program notes the pending txs unmined at `tip`, own inscriptions + /// and custom txs alike, spend. + fn pending_program_inputs(&self, tip: Option) -> HashSet { let safe = tip.map(|tip| self.blocks.safe_at(tip)).unwrap_or_default(); let unmined = |hash: &TxHash| !safe.contains(hash); - let spent: HashSet = self - .pending + self.pending .iter() .filter(|(hash, _)| unmined(hash)) .map(|(_, pending)| &pending.signed_tx) @@ -1527,12 +1547,7 @@ impl TxState { .map(|(_, other)| &other.signed_tx), ) .flat_map(|tx| program_step_inputs(tx).collect::>()) - .collect(); - view.finalized - .retain(|note| !spent.contains(¬e.nullifier)); - view.unfinalized - .retain(|note| !spent.contains(¬e.nullifier)); - view + .collect() } /// See [`BlockStates::finalized_program_notes`]. diff --git a/zone-sdk/src/sequencer/types.rs b/zone-sdk/src/sequencer/types.rs index 3ac4ca2..b0dee06 100644 --- a/zone-sdk/src/sequencer/types.rs +++ b/zone-sdk/src/sequencer/types.rs @@ -388,6 +388,15 @@ pub enum Error { /// would reject the registration. Not recoverable by retrying. #[error("program key rejected: {0}")] InvalidProgramKey(String), + /// A program step cannot be built as specified: it consumes a note the + /// sequencer does not hold spendable, its values do not balance, or + /// its mini-block breaks the ledger's rules. Not recoverable by + /// retrying. + #[error("program step rejected: {0}")] + InvalidProgramStep(String), + /// The `ZkProgramSpend` prover failed. + #[error("prover error: {0}")] + Prover(String), } /// Events emitted by the sequencer. diff --git a/zone-sdk/src/sequencer/zone_sequencer.rs b/zone-sdk/src/sequencer/zone_sequencer.rs index a10869c..10a2ace 100644 --- a/zone-sdk/src/sequencer/zone_sequencer.rs +++ b/zone-sdk/src/sequencer/zone_sequencer.rs @@ -38,6 +38,7 @@ use super::{ block_states::{ChannelTxKind, SharedTx}, client::SequencerClient, handle::SequencerHandle, + program_steps::{MiniBlockRequest, PreparedProgramInscription, build_program_inscription}, slot_clock::SlotClock, state::{ParentTaken, TxState}, tx_builder::{ @@ -184,6 +185,11 @@ pub(super) enum ActorRequest { mini_blocks: MiniBlocks, response_tx: oneshot::Sender>, }, + PrepareProgramInscription { + data: Inscription, + mini_blocks: Vec, + response_tx: oneshot::Sender>, + }, SubmitPreparedInscription { op: Box, step_proofs: Vec, @@ -646,6 +652,13 @@ where } => { drop(response_tx.send(self.do_prepare_inscription(data, mini_blocks))); } + ActorRequest::PrepareProgramInscription { + data, + mini_blocks, + response_tx, + } => { + drop(response_tx.send(self.do_prepare_program_inscription(data, mini_blocks))); + } ActorRequest::SubmitPreparedInscription { op, step_proofs, @@ -814,6 +827,33 @@ where )) } + /// Builds the inscription of `data` with `mini_blocks` on the current + /// publish tip, its program steps spending the channel's program notes + /// at the root they name: the set [`lb_wallet::SPEND_ROOT_DEPTH`] blocks + /// below the tip, as every wallet spend, minus what the pending + /// inscriptions already spend. + pub(super) fn do_prepare_program_inscription( + &self, + data: Inscription, + mini_blocks: Vec, + ) -> Result { + self.ensure_ready()?; + // Safe to unwrap — `ensure_ready` checks state. + let spend = self + .state + .as_ref() + .unwrap() + .program_spend_set(self.current_tip); + build_program_inscription( + self.channel_id, + &self.signing_key, + data, + self.compute_publish_parent(), + &spend, + mini_blocks, + ) + } + pub(super) async fn do_submit_prepared_inscription( &mut self, op: InscriptionOp,