Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
1af120e
Defines and implements the issued asset state types
arya2 Nov 12, 2024
cc8bc0d
Adds issued assets to the finalized state
arya2 Nov 12, 2024
c7116f3
Validates issuance actions and burns before committing blocks to a no…
arya2 Nov 12, 2024
bb62c67
Adds `issued_assets` fields on `ChainInner` and `ContextuallyValidate…
arya2 Nov 12, 2024
3d00b81
Adds issued assets map to non-finalized chains
arya2 Nov 12, 2024
2daf84f
adds new column family to list of state column families
arya2 Nov 12, 2024
c6c099b
Updates AssetState, AssetStateChange, IssuedAssetsOrChange, & Semanti…
arya2 Nov 14, 2024
9e0e043
Fixes tests by computing an `IssuedAssetsChange` for conversions to C…
arya2 Nov 14, 2024
8f26a89
fixes finalization checks
arya2 Nov 14, 2024
e063729
Adds documentation to types and methods in `asset_state` module, fixe…
arya2 Nov 15, 2024
6aad8da
Merge branch 'zsa-issued-assets' into zsa-integration-state
dmidem Nov 27, 2024
f0b64ad
Fix compilation errors that appeared after the previous merge
dmidem Nov 27, 2024
bc0c8e6
Avoid using NonEmpty in orchard_zsa/issuance
dmidem Nov 27, 2024
17f3ee6
Fix BurnItem serialization/deserializartioon errors (use LE instead o…
dmidem Nov 27, 2024
3f96af0
Make a minor fix and add FIXME comment in orchard_flavor_ext.rs
dmidem Nov 27, 2024
5524480
Fix the sign of burn value in SupplyChange::add in orchard_zsa/asset_…
dmidem Nov 27, 2024
8096da4
Fix the 'transactions must have only one burn item per asset base' er…
dmidem Nov 27, 2024
20fd58d
Use NoteValue from the orchard crate for BurnItem amount instead of u…
dmidem Nov 27, 2024
4932495
Use BurnItem::from instead of try_from
dmidem Nov 27, 2024
89be470
Fix a compilation error for the previous commit ('Use BurnItem::from …
dmidem Nov 27, 2024
c3daec9
Fix a compilation error for the previous commit ('Use BurnItem::from …
dmidem Nov 27, 2024
a8668d6
Modify ValueCommitment::with_asset to accept value as a NoteValue ins…
dmidem Dec 3, 2024
e31f24c
Adds TODOs
arya2 Nov 28, 2024
2a5aebd
Adds state request/response variants for querying asset states
arya2 Nov 28, 2024
f7b43a9
Adds a `getassetstate` RPC method
arya2 Nov 28, 2024
e35ae57
Adds snapshot test
arya2 Nov 28, 2024
c278758
Addesses some FIXMEs and replaces a couple others with TODOs.
arya2 Nov 29, 2024
d144774
Removes `issued_assets_change` field from `SemanticallyVerifiedBlock`
arya2 Nov 29, 2024
727e3e3
Temporarily disable specific Clippy checks for Rust 1.83.0 compatibility
dmidem Dec 5, 2024
9a8c032
Disable clippy warning about doc comment for empty line
dmidem Dec 5, 2024
fb512d9
Update Orchard ZSA consensus tests to calculate and check asset supply
dmidem Dec 6, 2024
977af42
Rename ZSA workflow tests (including file, constant and variable name…
dmidem Dec 6, 2024
29af613
Add amount method to BurnItem and make BurnItem pub (visible for othe…
dmidem Dec 6, 2024
2b7926a
Fix Orchard ZSA workflow tests to make it compilable with getblocktem…
dmidem Dec 6, 2024
73c804f
Fix clippy error
dmidem Dec 6, 2024
6bd4284
Add rust-toolchain.toml with Rust version 1.82.0 to avoid clippy erro…
dmidem Dec 9, 2024
8dd53f1
Fix revert_chain_with function in zebra-state to support V6/OrchardZSA
dmidem Jan 20, 2025
59fec59
Minor fix in comments
dmidem Feb 24, 2025
2ce58ef
Rename transaction_to_fake_v5 function to transaction_to_fake_min_v5 …
dmidem Feb 24, 2025
fac3abd
Minor fixes in comments
dmidem Feb 24, 2025
c42c5dd
Revert "Minor fix in comments"
dmidem Feb 24, 2025
36f10b8
Revert "Rename transaction_to_fake_v5 function to transaction_to_fake…
dmidem Feb 24, 2025
0e7d340
Revert " Minor fixes in comments"
dmidem Feb 24, 2025
32c1428
Merge branch 'zsa-integration-consensus' into zsa-integration-state-ag
dmidem Apr 2, 2025
b5162c9
Fix remaining merge conflicts
dmidem Apr 2, 2025
2c042a0
Fix compilation erros
dmidem Apr 3, 2025
a6913a2
Fix clippy warning
dmidem Apr 3, 2025
dd5d8bd
Fix compilation errors appeared after the previous merge
dmidem Apr 6, 2025
88a47a5
Fix compilation error
dmidem Apr 7, 2025
4ee9031
Merge branch 'zsa-integration-state-fix-revert' into zsa-integration-…
dmidem Apr 11, 2025
e79160b
\Merge branch 'zsa-integration-consensus' into zsa-integration-state-…
dmidem Jun 1, 2025
65dbc74
Fix compilation errors in zebra-state happened without tx-v6 feature …
dmidem Jun 2, 2025
11d37fe
Allow finalizing issued assets via the issue action when no notes are…
dmidem Jun 6, 2025
70ab5ed
Refactor orchard_workflow_blocks_zsa.rs (zebra-test crate) to read te…
dmidem Jun 6, 2025
d301946
Fix clippy errors
dmidem Jun 8, 2025
43ea314
Copy tests from zsa-issued-assets-tests here and fix compilation errors
dmidem Jun 9, 2025
3ab6b56
Temporarily comment out verify_issuance_blocks_test test (it fails now)
dmidem Jun 15, 2025
67961c3
Merge branch 'zsa1' into zsa-integration-state
dmidem Jun 23, 2025
c006f8a
Merge branch 'zsa1' into zsa-integration-state
dmidem Sep 7, 2025
75ecd54
Merge branch 'zsa1' into zsa-integration-state
dmidem Oct 28, 2025
7cf475f
Rename remaining tx-v6 flags to tx_v6
dmidem Oct 28, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "143f5327f23168716be068f8e1014ba2ea16a6c91e8777bc8927da7b51e1df1f"
dependencies = [
"bs58",
"hmac",
"hmac 0.13.0-pre.4",
"rand_core 0.6.4",
"ripemd 0.2.0-pre.4",
"secp256k1 0.29.1",
Expand Down Expand Up @@ -1238,6 +1238,7 @@ dependencies = [
"block-buffer 0.10.4",
"const-oid",
"crypto-common 0.1.6",
"subtle",
]

[[package]]
Expand Down Expand Up @@ -1296,7 +1297,9 @@ dependencies = [
"der",
"digest 0.10.7",
"elliptic-curve",
"rfc6979",
"signature",
"spki",
]

[[package]]
Expand Down Expand Up @@ -1364,6 +1367,7 @@ dependencies = [
"ff",
"generic-array",
"group",
"pkcs8",
"rand_core 0.6.4",
"sec1",
"subtle",
Expand Down Expand Up @@ -1926,6 +1930,15 @@ version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"

[[package]]
name = "hmac"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
dependencies = [
"digest 0.10.7",
]

[[package]]
name = "hmac"
version = "0.13.0-pre.4"
Expand Down Expand Up @@ -2485,6 +2498,7 @@ dependencies = [
"cfg-if 1.0.0",
"ecdsa",
"elliptic-curve",
"once_cell",
"sha2 0.10.8",
"signature",
]
Expand Down Expand Up @@ -3794,6 +3808,16 @@ dependencies = [
"winreg",
]

[[package]]
name = "rfc6979"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
dependencies = [
"hmac 0.12.1",
"subtle",
]

[[package]]
name = "rgb"
version = "0.8.47"
Expand Down Expand Up @@ -4049,6 +4073,7 @@ dependencies = [
"base16ct",
"der",
"generic-array",
"pkcs8",
"subtle",
"zeroize",
]
Expand Down Expand Up @@ -6147,6 +6172,7 @@ dependencies = [
"incrementalmerkletree",
"itertools 0.13.0",
"jubjub",
"k256",
"lazy_static",
"nonempty 0.7.0",
"num-integer",
Expand Down
2 changes: 2 additions & 0 deletions zebra-chain/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,8 @@ rand_chacha = { version = "0.3.1", optional = true }

zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.41", optional = true }

k256 = "0.13.3"

[dev-dependencies]
# Benchmarks
criterion = { version = "0.5.1", features = ["html_reports"] }
Expand Down
8 changes: 7 additions & 1 deletion zebra-chain/src/orchard_zsa.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,14 @@
#[cfg(any(test, feature = "proptest-impl"))]
mod arbitrary;

pub mod asset_state;
mod burn;
mod issuance;

pub(crate) use burn::{compute_burn_value_commitment, Burn, BurnItem, NoBurn};
pub(crate) use burn::{compute_burn_value_commitment, Burn, NoBurn};
pub(crate) use issuance::IssueData;

pub use burn::BurnItem;

// FIXME: should asset_state mod be pub and these structs be pub as well?
pub use asset_state::{AssetBase, AssetState, AssetStateChange, IssuedAssets, IssuedAssetsChange};
Loading