From b263489af668efdf8b9360a561d0955c3e09e478 Mon Sep 17 00:00:00 2001 From: Deirdre Connolly Date: Sat, 6 Jun 2020 18:10:32 -0400 Subject: [PATCH] Export ed25519 zebra (#445) And use that one, and our similar redjubjub export, everywhere. Fixes #405 * Move PRs to 'In Progress' column on project board when created --- .github/workflows/assign-to-project.yml | 7 +++++++ zebra-chain/src/keys/sapling.rs | 2 +- zebra-chain/src/lib.rs | 1 + zebra-chain/src/transaction/joinsplit.rs | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/assign-to-project.yml b/.github/workflows/assign-to-project.yml index b2bc8ece2..fe6bb59ea 100644 --- a/.github/workflows/assign-to-project.yml +++ b/.github/workflows/assign-to-project.yml @@ -11,7 +11,14 @@ jobs: runs-on: ubuntu-latest steps: - uses: alex-page/github-project-automation-plus@v0.2.4 + if: github.event_name == 'issues' && github.event.action == 'opened' with: project: Zebra column: To Do repo-token: ${{ secrets.PROJECT_AUTOMATION }} + - uses: alex-page/github-project-automation-plus@v0.2.4 + if: github.event_name == 'pull_request' && github.event.action == 'opened' + with: + project: Zebra + column: In progress + repo-token: ${{ secrets.PROJECT_AUTOMATION }} diff --git a/zebra-chain/src/keys/sapling.rs b/zebra-chain/src/keys/sapling.rs index c1c8359f9..10371a74a 100644 --- a/zebra-chain/src/keys/sapling.rs +++ b/zebra-chain/src/keys/sapling.rs @@ -23,12 +23,12 @@ use std::{ use bech32::{self, FromBase32, ToBase32}; use rand_core::{CryptoRng, RngCore}; -use redjubjub::{self, SpendAuth}; #[cfg(test)] use proptest_derive::Arbitrary; use crate::{ + redjubjub::{self, SpendAuth}, serialization::{ReadZcashExt, SerializationError}, Network, }; diff --git a/zebra-chain/src/lib.rs b/zebra-chain/src/lib.rs index afc8d081d..5a733ef5c 100644 --- a/zebra-chain/src/lib.rs +++ b/zebra-chain/src/lib.rs @@ -21,6 +21,7 @@ pub mod serialization; pub mod transaction; pub mod types; +pub use ed25519_zebra; pub use redjubjub; #[cfg(test)] diff --git a/zebra-chain/src/transaction/joinsplit.rs b/zebra-chain/src/transaction/joinsplit.rs index f3bfaf7a0..b95a92f32 100644 --- a/zebra-chain/src/transaction/joinsplit.rs +++ b/zebra-chain/src/transaction/joinsplit.rs @@ -1,7 +1,7 @@ #[cfg(test)] use proptest::{array, collection::vec, prelude::*}; -use crate::{notes::sprout, proofs::ZkSnarkProof}; +use crate::{ed25519_zebra, notes::sprout, proofs::ZkSnarkProof}; /// A _JoinSplit Description_, as described in [protocol specification ยง7.2][ps]. ///