Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
258 commits
Select commit Hold shift + click to select a range
2d23d6b
Merge branch 'zsa1' into switch-to-zsa-crates-nu6
dmidem Sep 2, 2024
7d79143
Merge branch 'switch-to-zsa-crates-nu6' into switch-to-zsa-crates-nu7
dmidem Sep 2, 2024
9d6c8e9
Merge branch 'switch-to-zsa-crates-nu6' into switch-to-zsa-crates-nu6…
dmidem Sep 2, 2024
53c65b6
Trigger CI
dmidem Sep 2, 2024
d659628
Merge branch 'switch-to-zsa-crates-nu6' into switch-to-zsa-crates-nu7
dmidem Sep 2, 2024
c67e2ae
Merge branch 'switch-to-zsa-crates-nu6' into switch-to-zsa-crates-nu6…
dmidem Sep 2, 2024
c238847
Add basic CI checks workflow
dmidem Sep 3, 2024
2c13ae9
Fix ci-basic.yml
dmidem Sep 3, 2024
5a839c6
Fix ci-basic.yml (2)
dmidem Sep 3, 2024
367a14b
Add installing of build-essential to ci-basic.yml
dmidem Sep 3, 2024
f425747
Try to use librocksdb-dev in ci-basic.yml
dmidem Sep 3, 2024
831c847
Run ci-basic.yml on ubuntu-24.04
dmidem Sep 3, 2024
ecaf98d
Enable nu6 cfg flag in ci-basic.yml
dmidem Sep 3, 2024
7d11159
Adjust the code with librustzcash/zcash_protocol nu6 related changes
dmidem Sep 4, 2024
6a0196e
Add RUSTDOCFLAGS to ci-basic.yml
dmidem Sep 4, 2024
faec84b
Merge branch 'switch-to-zsa-crates-nu6' into switch-to-zsa-crates-nu7
dmidem Sep 9, 2024
8e53d24
Merge branch 'switch-to-zsa-crates-nu6' into switch-to-zsa-crates-nu6…
dmidem Sep 9, 2024
23e318c
Add support for Orchard ZSA and updated generic structures for Tx V6 …
dmidem Sep 16, 2024
e98bb67
Fix compilation errors for unit tests
dmidem Sep 18, 2024
dd741e9
Add missed files
dmidem Sep 18, 2024
c218fc5
Fix ciphertexts.rs tests compilation error
dmidem Sep 18, 2024
4807dd6
Simplify the previous fix for ciphertexts.rs test
dmidem Sep 18, 2024
cccadcd
Merge branch 'switch-to-zsa-crates-nu6-txv6-gen' of https://github.co…
dmidem Sep 18, 2024
0f9c164
Fix tests compilation errors for nullifiers
dmidem Sep 18, 2024
1526276
Merge remote-tracking branch 'origin/main' into switch-to-zsa-crates-nu6
dmidem Sep 22, 2024
509d525
Merge branch 'switch-to-zsa-crates-nu6' into switch-to-zsa-crates-nu7
dmidem Sep 22, 2024
654b8d4
Merge branch 'switch-to-zsa-crates-nu6' into switch-to-zsa-crates-nu6…
dmidem Sep 22, 2024
20810ee
Merge branch 'switch-to-zsa-crates-nu6-txv6' into switch-to-zsa-crate…
dmidem Sep 22, 2024
9e94dc5
Merge remote-tracking branch 'zcash/main' into switch-to-zsa-crates-nu6
dmidem Sep 22, 2024
0bcf59a
Merge branch 'switch-to-zsa-crates-nu6' into switch-to-zsa-crates-nu7
dmidem Sep 22, 2024
a6405d7
Merge branch 'switch-to-zsa-crates-nu6' into switch-to-zsa-crates-nu6…
dmidem Sep 22, 2024
986339e
Merge branch 'switch-to-zsa-crates-nu6-txv6' into switch-to-zsa-crate…
dmidem Sep 22, 2024
4d8cdef
Add several FIXME comments
dmidem Sep 24, 2024
1adadb1
Remove (comment out) zcash_unstable=nu6 Rust flag and sync Cargo.lock…
dmidem Sep 24, 2024
e9b0d46
Merge remote-tracking branch 'origin/main' into switch-to-zsa-crates-…
dmidem Sep 24, 2024
e2e160c
Attempt to make the code compilable when tx-v6 feature is disabled
dmidem Sep 30, 2024
5eade11
Merge branch 'main' of https://github.com/QED-it/zebra into switch-to…
dmidem Oct 2, 2024
763cded
Use tx-v6 feature across all crates
dmidem Oct 2, 2024
083171f
Merge branch 'switch-to-zsa-crates-nu6-txv6-gen-txv6-disabled' into s…
dmidem Oct 2, 2024
12ade98
Merge branch 'main' into switch-to-zsa-crates-nu6
dmidem Oct 2, 2024
a09774e
Merge branch 'main' into switch-to-zsa-crates-nu6-txv6
dmidem Oct 2, 2024
ab1838d
Merge branch 'main' into switch-to-zsa-crates-nu7
dmidem Oct 2, 2024
a026dd2
Merge branch 'switch-to-zsa-crates-nu6' into switch-to-zsa-crates-nu6…
dmidem Oct 2, 2024
0a8cfe0
Merge branch 'switch-to-zsa-crates-nu6' into switch-to-zsa-crates-nu7
dmidem Oct 2, 2024
d2917fb
Merge branch 'switch-to-zsa-crates-nu6-txv6' into switch-to-zsa-crate…
dmidem Oct 2, 2024
c979861
Patch path for zcash_keys in Cargo.toml to avoid crate duplication in…
dmidem Oct 2, 2024
3422026
Add Burn and Issuance ZSA structs to Orchard proptests
dmidem Oct 8, 2024
4eb472b
Add missed new file orchard_zsa/arbitrary.rs
dmidem Oct 8, 2024
6372de8
Refactor burn types and proptest implementations for Orchard types
dmidem Oct 9, 2024
bb1395c
Merge branch 'main' into switch-to-zsa-crates-nu6
dmidem Oct 17, 2024
1b8e9e9
Merge branch 'zsa-integration-zsadeps' into zsa-integration-nu7
dmidem Oct 17, 2024
8d18425
Merge branch 'zsa-integration-zsadeps' into zsa-integration-txv6
dmidem Oct 17, 2024
018203e
Merge branch 'zsa-integration-txv6' into zsa-integration-generics
dmidem Oct 17, 2024
b0cb801
Merge branch 'zsa-integration-generics' into zsa-integration-proptest
dmidem Oct 17, 2024
d8964e7
Fix of new_regtest call (as it additionally needs Nu7 arg now)
dmidem Oct 17, 2024
e8abddd
Fix of new_regtest call (as it additionally needs Nu7 arg now) (2)
dmidem Oct 17, 2024
23d9e77
Set Nu7 as a network update for testnet in zebra-chain network tests
dmidem Oct 17, 2024
d2313fb
Fix Orchard ZSA issuance serialization (use to_vec for notes and asse…
dmidem Oct 17, 2024
e0adb4c
Fix serde names for NU7
dmidem Oct 17, 2024
0daf0ce
Update test snapshot in zebra-rpc to use NU7
dmidem Oct 17, 2024
398beb0
Merge branch 'zsa-integration-generics' into zsa-integration-proptest
dmidem Oct 17, 2024
6a9334a
Enable test-dependencies feaure flag for orchard if proptest-impl is …
dmidem Oct 18, 2024
51009ae
Merge branch 'main' into zsa-integration-zsadeps-old
dmidem Oct 29, 2024
2fabac7
Prepare to use Orchard ZSA
dmidem Jul 29, 2024
836516d
Add basic CI checks workflow
dmidem Sep 3, 2024
e29a64c
Fix ci-basic.yml
dmidem Sep 3, 2024
790072d
Fix ci-basic.yml (2)
dmidem Sep 3, 2024
7695882
Add installing of build-essential to ci-basic.yml
dmidem Sep 3, 2024
9a8d37e
Try to use librocksdb-dev in ci-basic.yml
dmidem Sep 3, 2024
925e81a
Run ci-basic.yml on ubuntu-24.04
dmidem Sep 3, 2024
61f9f95
Enable nu6 cfg flag in ci-basic.yml
dmidem Sep 3, 2024
2e9c089
Adjust the code with librustzcash/zcash_protocol nu6 related changes
dmidem Sep 4, 2024
0dce1a4
Add RUSTDOCFLAGS to ci-basic.yml
dmidem Sep 4, 2024
77e9d4d
Merge branch 'zsa1' into zsa-integration-zsadeps-old
dmidem Oct 29, 2024
e294837
Set Rust cfg zcash_unstable to nu6 in .cargo/config.toml
dmidem Oct 29, 2024
9f55f35
Disable GCP/Firebase/Docker/deploy related workflows (add .disabled s…
dmidem Oct 29, 2024
6b43dd1
Trigger CI
dmidem Oct 29, 2024
c6f8913
Restore the names of ci-*.yml files )i.e. non GCP/Firebase/Docker/dep…
dmidem Oct 29, 2024
24f5e85
Merge branch 'zsa-integration-zsadeps' into zsa-integration-nu7
dmidem Oct 29, 2024
f90a10f
Merge branch 'zsa-integration-zsadeps' into zsa-integration-txv6
dmidem Oct 29, 2024
6b22fba
Merge branch 'zsa-integration-txv6' into zsa-integration-generics
dmidem Oct 29, 2024
0e14637
Merge branch 'zsa-integration-generics' into zsa-integration-proptest
dmidem Oct 29, 2024
1c061e9
Update Cargo.lock
dmidem Oct 29, 2024
8c76592
Use zsa1 branch for librustzcash crates
dmidem Oct 29, 2024
ab9a2b5
Add support for processing ZSA orchard_shielded_data in zebra_state
dmidem Oct 30, 2024
9e5a01c
Merge branch 'zsa-integration-zsadeps' into zsa-integration-txv6
dmidem Oct 30, 2024
d0ecf96
Merge branch 'zsa-integration-zsadeps' into zsa-integration-nu7
dmidem Oct 30, 2024
c7cd215
Merge branch 'zsa-integration-txv6' into zsa-integration-generics
dmidem Oct 30, 2024
5076910
Merge branch 'zsa-integration-generics' into zsa-integration-proptest
dmidem Oct 30, 2024
2587b04
Introduce match_orchard_shielded_data macro in transaction.rs and ref…
dmidem Nov 3, 2024
7447d45
Expose Burn, NoBurn, and IssueData from orchard_zsa module directly
dmidem Nov 3, 2024
714e631
Add IssueData::note_commitments and use it in Transaction::orchard_no…
dmidem Nov 3, 2024
c9c79e6
Revert "Introduce match_orchard_shielded_data macro in transaction.rs…
dmidem Nov 4, 2024
9ad18a4
Modify Transaction::orchard_note_commitments method to not use match_…
dmidem Nov 4, 2024
50680a6
Merge branch 'zsa-integration-nu7' into zsa-integration-block-test
dmidem Nov 11, 2024
3cce489
Refactor orchard_zsa modules to use IssueBundle serialization functio…
dmidem Nov 11, 2024
ce6c5c3
Fix the orchard::ShieldedData serialization/deserialization functions…
dmidem Nov 11, 2024
22349e5
Add ENABLE_ZSA flag to Flags for the orchard ShieldedData
dmidem Nov 11, 2024
46f81bc
Fix TX_V6_VERSION_GROUP_ID constant value to adjust it with the value…
dmidem Nov 11, 2024
408c155
Add a value for Nu7 to CONSENSUS_BRANCH_IDS (a placeholder values for…
dmidem Nov 11, 2024
c6a3dd4
Add a test vector with an issuance block to orchard_zsa module, also …
dmidem Nov 11, 2024
c3a8583
Add a method to return the inner value (IssueBundle) of IssueData wra…
dmidem Nov 11, 2024
4855c25
Add more checks after deserializing issuance block in issuance_block …
dmidem Nov 11, 2024
87e4a63
Rename orchard_zsa::tests::issuance_block to deserialize_blocks and a…
dmidem Nov 17, 2024
ffe49b7
Make zebra_chain::orchard_zsa::tests::vectors::BLOCKS visible for zeb…
dmidem Nov 17, 2024
697d38a
Add initial version of ZSA woirkflow tests to zebra-chain
dmidem Nov 17, 2024
fa948b8
Improve zebra-state/tests/zsa.rs code
dmidem Nov 18, 2024
1df822e
Modify zebra-consensus to use ItemVerifyingKey for Orchard ZSA (there…
dmidem Nov 19, 2024
e5d5dac
Temporary update get_blockchain_info@testnet_10 snapshot zebra-rpc to…
dmidem Nov 19, 2024
a18a456
Fix cargo fmt issue
dmidem Nov 19, 2024
215ec92
Add cargo clippy to ci-basic
dmidem Nov 19, 2024
d9c8720
Add temporary docs for pub test constants amd modules
dmidem Nov 19, 2024
90dac03
Fix zsa consensus tests
dmidem Nov 20, 2024
2bb599f
Add missed ZSA test modules in zebra-consensus
dmidem Nov 20, 2024
1faf196
Remove zebra-state zsa workflow tests (in favour of workflow tests in…
dmidem Nov 20, 2024
689e791
Fix cargo clippy issues
dmidem Nov 20, 2024
ab7c077
Modify Orchard ShieldedData binding_verification_key function to subt…
dmidem Nov 21, 2024
ada6a37
Update consensus ZSA workflow tests and test vectors
dmidem Nov 25, 2024
e0ee6c6
Add ZSA workflow test vectors
dmidem Nov 25, 2024
bf18f0c
Introduce Nu7
dmidem Aug 18, 2024
99ec8e6
Introduce Nu7 fo other crates of Zebra
dmidem Aug 19, 2024
7e2ca82
Fix of new_regtest call (as it additionally needs Nu7 arg now)
dmidem Oct 17, 2024
78e035a
Fix of new_regtest call (as it additionally needs Nu7 arg now) (2)
dmidem Oct 17, 2024
ac491b8
Set Nu7 as a network update for testnet in zebra-chain network tests
dmidem Oct 17, 2024
6883488
Fix serde names for NU7
dmidem Oct 17, 2024
aa373f1
Update test snapshot in zebra-rpc to use NU7
dmidem Oct 17, 2024
0fba7f3
Copy Nu7-related changes from zsa-integration-state
dmidem Feb 10, 2025
b42d84a
Uncomment zcash_unstable = nu7
dmidem Feb 10, 2025
d8b48c9
Fix Nu7 constants and add cfg(zcash_unstable ...) attribute according…
dmidem Feb 10, 2025
75f56e7
Update network constant values according to PR #15 review comments
dmidem Feb 10, 2025
bba5fd5
Update zebra-consensus/src/primitives/halo2/tests.rs
dmidem Feb 10, 2025
f2b10a5
Add zcash_unstable=nu6 Rust flag to .cargo/config.toml to use nu6 by …
dmidem Feb 10, 2025
6118303
Update zebra-chain/src/orchard/note/ciphertexts.rs
dmidem Feb 10, 2025
e97f991
Use zcash_unstable = nu6 TODO nu7 as nu6 cfg attribute
dmidem Feb 10, 2025
a5980e7
Add TODO comment for bridgetree dependency downgrading
dmidem Feb 10, 2025
a0241d8
Add ENABLE_ZSA orchard flag
dmidem Feb 10, 2025
f74671e
Update zebra-consensus/src/primitives/halo2.rs
dmidem Feb 10, 2025
56a445f
Remove resolved FIXMEs
dmidem Feb 10, 2025
eb7f1d1
Merge branch 'zsa-integration-zsadeps' of https://github.com/QED-it/z…
dmidem Feb 10, 2025
25c5486
Remove resolved FIXMEs (2)
dmidem Feb 10, 2025
b6969bd
Merge branch 'zsa-integration-nu7-only' into zsa-integration-nu7-try-…
dmidem Feb 10, 2025
350b6c7
Merge branch 'zsa-integration-zsadeps' into zsa-integration-nu7
dmidem Feb 10, 2025
58da335
Add zcash_unstable = nu6 cfg in zebra-network/.../types.rs
dmidem Feb 10, 2025
fbf1f9f
Merge branch 'zsa-integration-nu7-only' into zsa-integration-nu7
dmidem Feb 10, 2025
9e51b24
Merge branch 'zsa-integration-zsadeps' into zsa-integration-txv6
dmidem Feb 10, 2025
22b7db5
Merge branch 'zsa-integration-txv6' into zsa-integration-generics
dmidem Feb 10, 2025
10d19d4
Merge branch 'zsa-integration-generics' into zsa-integration-proptest
dmidem Feb 10, 2025
e87f997
Merge branch 'zsa-integration-proptest' into zsa-integration-issuance…
dmidem Feb 10, 2025
91869e1
Merge branch 'zsa-integration-issuance-commitments' into zsa-integrat…
dmidem Feb 10, 2025
b582e2b
Merge branch 'zsa-integration-nu7' into zsa-integration-consensus
dmidem Feb 10, 2025
9a5a5a1
Fix nu7 activation heights in network_upgrade.rs (nu6 value + 1 does …
dmidem Feb 11, 2025
0992399
Merge branch 'zsa-integration-nu7-only' into zsa-integration-nu7
dmidem Feb 11, 2025
64d9994
Uncomment RUSTFLAGS/RUSTDOCFLAGS variable settings in ci-basic.yml as…
dmidem Feb 11, 2025
938c329
Merge branch 'zsa-integration-generics' into zsa-integration-proptest
dmidem Feb 11, 2025
37ed0e4
Merge branch 'zsa-integration-proptest' into zsa-integration-issuance…
dmidem Feb 11, 2025
2b14304
Merge branch 'zsa-integration-issuance-commitments' into zsa-integrat…
dmidem Feb 11, 2025
85cdccd
Merge branch 'zsa-integration-nu7' into zsa-integration-consensus
dmidem Feb 11, 2025
cfaac4b
Update librustzcash and orchard version hashes in Cargo.lock, make a …
dmidem Feb 11, 2025
dd9b476
Merge branch 'zsa-integration-zsadeps' into zsa-integration-nu7
dmidem Feb 11, 2025
6b7e665
Fix consenus test to use the new orchard builder return type
dmidem Feb 11, 2025
8f7a913
Merge branch 'zsa-integration-zsadeps' into zsa-integration-nu7
dmidem Feb 11, 2025
8ae0b92
Add cfg for CURRENT_NETWORK_PROTOCOL_VERSION constant definition, add…
dmidem Feb 12, 2025
88b705d
Update get_blockchain_info@testnet_10.snap
dmidem Feb 12, 2025
ef3f6da
Update get_blockchain_info@mainnet_10.snap
dmidem Feb 12, 2025
c277d51
Add cfg for CURRENT_NETWORK_PROTOCOL_VERSION constant definition, add…
dmidem Feb 12, 2025
c48c753
Update get_blockchain_info@testnet_10.snap
dmidem Feb 12, 2025
152d893
Update get_blockchain_info@mainnet_10.snap
dmidem Feb 12, 2025
9206459
Merge branch 'zsa-integration-nu7-only' into zsa-integration-nu7
dmidem Feb 13, 2025
a158e9f
Merge branch 'zsa-integration-zsadeps' into zsa-integration-txv6
dmidem Feb 13, 2025
14f95a0
Merge branch 'zsa-integration-txv6' into zsa-integration-generics
dmidem Feb 13, 2025
225dac1
Minor fix to align with orchard changes
dmidem Feb 13, 2025
eb7c4bb
Merge branch 'zsa-integration-generics' into zsa-integration-proptest
dmidem Feb 13, 2025
39195c0
Merge branch 'zsa-integration-proptest' into zsa-integration-issuance…
dmidem Feb 13, 2025
e17da59
Merge branch 'zsa-integration-issuance-commitments' into zsa-integrat…
dmidem Feb 13, 2025
3e925b4
Merge branch 'zsa-integration-nu7' into zsa-integration-consensus
dmidem Feb 13, 2025
a1fc48e
Update OrchardZSA test vectors to use the correct consensus branch id…
dmidem Feb 13, 2025
015f8b3
Revert "Update OrchardZSA test vectors to use the correct consensus b…
dmidem Feb 13, 2025
10f3740
Update librustzcash commit in Cargo.lock
dmidem Feb 13, 2025
628a518
Merge branch 'zsa-integration-zsadeps' into zsa-integration-nu7
dmidem Feb 13, 2025
bed9fb5
Merge branch 'zsa-integration-zsadeps' into zsa-integration-txv6
dmidem Feb 13, 2025
164e5de
Change TX_V6_VERSION_GROUP_ID value back to a temporary 0x7777_7777, …
dmidem Feb 13, 2025
998a2c7
Update zebra-chain to sync with the updated librustzcash (zcash_primi…
dmidem Feb 13, 2025
90c8847
Removed previousely added unused variables
dmidem Feb 13, 2025
642776f
Add lints.rust/unexpected_cfgs into zebra-chain Cargo.toml to avoid c…
dmidem Feb 13, 2025
9f80f6d
Pin Rust version to 1.82.0 by adding rust-toolchain.toml file, to avo…
dmidem Feb 13, 2025
526e92d
Pin Rust version to 1.82.0 by adding rust-toolchain.toml file, to avo…
dmidem Feb 13, 2025
388d539
Merge branch 'zsa-integration-zsadeps' into zsa-integration-nu7
dmidem Feb 13, 2025
8195426
Merge branch 'zsa-integration-zsadeps' into zsa-integration-txv6
dmidem Feb 13, 2025
3677c4b
Merge branch 'zsa-integration-txv6' into zsa-integration-generics
dmidem Feb 14, 2025
2012ac5
Merge branch 'zsa-integration-generics' into zsa-integration-proptest
dmidem Feb 14, 2025
122de8f
Merge branch 'zsa-integration-proptest' into zsa-integration-issuance…
dmidem Feb 14, 2025
1650bcc
Merge branch 'zsa-integration-issuance-commitments' into zsa-integrat…
dmidem Feb 14, 2025
d8dfb7d
Add lints.rust/unexpected_cfgs into zebra-network Cargo.toml to avoid…
dmidem Feb 14, 2025
7b59054
Change a way of const CURRENT_NETWORK_PROTOCOL_VERSION with cfg defin…
dmidem Feb 14, 2025
dd81623
Merge branch 'zsa-integration-nu7' into zsa-integration-consensus
dmidem Feb 14, 2025
0dd30f3
Update OrchardZSA test vectors to use new TX_V6_VERSION_GROUP_ID and …
dmidem Feb 14, 2025
4ad68ae
Revert "Update zebra-chain to sync with the updated librustzcash (zca…
dmidem Feb 14, 2025
a999d70
Revert "Update zebra-chain to sync with the updated librustzcash (zca…
dmidem Feb 14, 2025
daeb0f0
Revert "Update librustzcash and orchard version hashes in Cargo.lock,…
dmidem Feb 14, 2025
e0653cc
Change ConsensusBranchId value back to a temporary 0x77777777, to ali…
dmidem Feb 14, 2025
0c12d25
Merge branch 'zsa-integration-zsadeps' into zsa-integration-nu7
dmidem Feb 14, 2025
b219b66
Merge branch 'zsa-integration-zsadeps' into zsa-integration-txv6
dmidem Feb 14, 2025
08de3de
Change TX_V6_VERSION_GROUP_ID value back to 0x124A_69F8, to aling wit…
dmidem Feb 14, 2025
49f0a9c
Revert "Fix consenus test to use the new orchard builder return type"
dmidem Feb 14, 2025
f16bd20
Merge branch 'zsa-integration-zsadeps' into zsa-integration-txv6
dmidem Feb 14, 2025
2ee1f9a
Merge branch 'zsa-integration-zsadeps' into zsa-integration-nu7
dmidem Feb 14, 2025
12ad26a
Revert zebra-rpc test snapshots to use a temporary consensus branch i…
dmidem Feb 14, 2025
271983a
Merge branch 'zsa-integration-txv6' into zsa-integration-proptest
dmidem Feb 14, 2025
1026d58
Merge branch 'zsa-integration-txv6' into zsa-integration-generics
dmidem Feb 14, 2025
95687c0
Merge branch 'zsa-integration-generics' into zsa-integration-proptest
dmidem Feb 14, 2025
f24f2b2
Merge branch 'zsa-integration-proptest' into zsa-integration-issuance…
dmidem Feb 14, 2025
2ac98ea
Merge branch 'zsa-integration-issuance-commitments' into zsa-integrat…
dmidem Feb 14, 2025
6635d91
Merge branch 'zsa-integration-nu7' into zsa-integration-consensus
dmidem Feb 14, 2025
53b657d
Revert "Update OrchardZSA test vectors to use new TX_V6_VERSION_GROUP…
dmidem Feb 14, 2025
d102b13
Revert "Minor fix to align with orchard changes"
dmidem Feb 14, 2025
0b24a2b
Revert "Minor fix to align with orchard changes"
dmidem Feb 14, 2025
27a8969
Merge branch 'zsa-integration-generics' into zsa-integration-proptest
dmidem Feb 14, 2025
a7b6449
Merge branch 'zsa-integration-proptest' into zsa-integration-issuance…
dmidem Feb 14, 2025
48eddcb
Merge branch 'zsa-integration-issuance-commitments' into zsa-integrat…
dmidem Feb 14, 2025
7691e79
Remove RUSTFLAGS and RUSTDOCFLAGS from CI config as they override .ca…
dmidem Feb 17, 2025
7d8956d
Secure .cargo config in ci-basic.yml CI to apply custom rustflags
dmidem Feb 17, 2025
7dfd07e
Revert "Secure .cargo config in ci-basic.yml CI to apply custom rustf…
dmidem Feb 17, 2025
72092f5
Add --cfg zcash_unstable flag to rustdocflags of .cargo/config.toml
dmidem Feb 17, 2025
de8dab5
Add --cfg zcash_unstable flag to rustdocflags of .cargo/config.toml
dmidem Feb 17, 2025
944df50
Remove RUSTFLAGS and RUSTDOCFLAGS from CI config as they override .ca…
dmidem Feb 17, 2025
51eaeda
Merge branch 'zsa-integration-zsadeps' into zsa-integration-txv6
dmidem Feb 17, 2025
c1aa709
Merge branch 'zsa-integration-txv6' into zsa-integration-generics
dmidem Feb 17, 2025
d9cb686
Merge branch 'zsa-integration-generics' into zsa-integration-proptest
dmidem Feb 17, 2025
45fd6d3
Merge branch 'zsa-integration-proptest' into zsa-integration-issuance…
dmidem Feb 17, 2025
c6bf766
Merge branch 'zsa-integration-issuance-commitments' into zsa-integrat…
dmidem Feb 17, 2025
ddadae9
Change unfixed FIXMEs to TODOs
dmidem Feb 18, 2025
e93d07e
Merge branch 'zsa-integration-zsadeps' into zsa-integration-txv6
dmidem Feb 18, 2025
47ac4e0
Fix typos in comments
dmidem Feb 24, 2025
708844c
Rename txid_v5_v6 to txid_v5_to_v6, minor fixes in comments
dmidem Feb 24, 2025
4fd7f88
Rename transaction_to_fake_v5 function to transaction_to_fake_min_v5 …
dmidem Feb 24, 2025
a597c4e
Minor fix in comments
dmidem Feb 24, 2025
0498e06
Temporary comment of #[cfg(feature = tx-v6)] in zebra-chain/src/trans…
dmidem Feb 24, 2025
975d5be
Merge branch 'zsa-integration-txv6' into zsa-integration-generics
dmidem Feb 24, 2025
7735050
Make changes according to #17 PR review (partially)
dmidem Feb 25, 2025
25a44a2
Derive Copy, Clone, Debug, Eq, PartialEq for EncryptedNote instead of…
dmidem Feb 25, 2025
600571d
Make changes according to #17 PR review
dmidem Feb 25, 2025
f0faf64
Merge branch 'zsa-integration-generics' into zsa-integration-proptest
dmidem Feb 26, 2025
3ac784a
Fix wrong resolving of merge conflict in the previous commit
dmidem Feb 26, 2025
d7cba24
Merge branch 'zsa-integration-proptest' into zsa-integration-issuance…
dmidem Feb 26, 2025
757a789
Minor fix in FIXME comment
dmidem Feb 26, 2025
a911873
Merge branch 'zsa-integration-generics' into zsa-integration-proptest
dmidem Feb 26, 2025
8f87c2f
Merge branch 'zsa-integration-proptest' into zsa-integration-issuance…
dmidem Feb 26, 2025
9bf6a26
Merge branch 'zsa-integration-issuance-commitments' into zsa-integrat…
dmidem Feb 26, 2025
bfe8f6f
Minor spelling fixes in comments
dmidem Feb 26, 2025
850ebf2
Fix compilation error in tests
dmidem Feb 26, 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
6 changes: 6 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
# Flags that apply to all Zebra crates and configurations
[target.'cfg(all())']
rustflags = [
# TODO: Consider removing this line later (it's needed for the ZSA version of librustzcash crates)
"--cfg", "zcash_unstable=\"nu6\"",

# Zebra standard lints for Rust 1.65+

# High-risk code
Expand Down Expand Up @@ -82,6 +85,9 @@ rustflags = [

[build]
rustdocflags = [
# TODO: Consider removing this line later (it's needed for the ZSA version of librustzcash crates)
"--cfg", "zcash_unstable=\"nu6\"",

# The -A and -W settings must be the same as the `RUSTDOCFLAGS` in:
# https://github.com/ZcashFoundation/zebra/blob/main/.github/workflows/docs-deploy-firebase.yml#L68

Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/ci-basic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Basic checks

#on: [push, pull_request]
on: [push]

jobs:
test:
name: Test on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-24.04]

env:
# Use system-installed RocksDB library instead of building from scratch
ROCKSDB_LIB_DIR: /usr/lib
# Use system-installed Snappy library for compression in RocksDB
SNAPPY_LIB_DIR: /usr/lib/x86_64-linux-gnu

steps:
- uses: actions/checkout@v4
- name: Install dependencies on Ubuntu
#run: sudo apt-get update && sudo apt-get install -y protobuf-compiler build-essential librocksdb-dev
run: sudo apt-get update && sudo apt-get install -y protobuf-compiler librocksdb-dev
- name: Run tests
run: cargo test --verbose
- name: Verify working directory is clean
run: git diff --exit-code
- name: Run doc check
run: cargo doc --all-features --document-private-items
- name: Run format check
run: cargo fmt -- --check
- name: Run clippy
run: cargo clippy --workspace --all-features --all-targets -- -D warnings
Loading