diff --git a/.dvc/.gitignore b/.dvc/.gitignore new file mode 100644 index 0000000..528f30c --- /dev/null +++ b/.dvc/.gitignore @@ -0,0 +1,3 @@ +/config.local +/tmp +/cache diff --git a/.dvc/config b/.dvc/config new file mode 100644 index 0000000..e69de29 diff --git a/.dvcignore b/.dvcignore new file mode 100644 index 0000000..5197305 --- /dev/null +++ b/.dvcignore @@ -0,0 +1,3 @@ +# Add patterns of files dvc should ignore, which could improve +# the performance. Learn more at +# https://dvc.org/doc/user-guide/dvcignore diff --git a/.gitignore b/.gitignore index ddfe284..c88d4b0 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ test-scripts/src/config/wasms/*.wasm .DS_Store test-scripts/yarn.lock +/substrate-fixtures diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 3437f23..0000000 --- a/.gitmodules +++ /dev/null @@ -1,4 +0,0 @@ -[submodule "protocol-substrate-fixtures"] - path = protocol-substrate-fixtures - url = https://github.com/webb-tools/protocol-substrate-fixtures.git - branch = main diff --git a/contracts/anchor/src/test_util.rs b/contracts/anchor/src/test_util.rs index 5381141..8b43806 100644 --- a/contracts/anchor/src/test_util.rs +++ b/contracts/anchor/src/test_util.rs @@ -44,10 +44,10 @@ pub fn setup_environment(curve: Curve) -> (Vec, Vec) { match curve { Curve::Bn254 => { let pk_bytes = include_bytes!( - "../../../protocol-substrate-fixtures/fixed-anchor/bn254/x5/2/proving_key_uncompressed.bin" + "../../../substrate-fixtures/fixed-anchor/bn254/x5/2/proving_key_uncompressed.bin" ); let vk_bytes = include_bytes!( - "../../../protocol-substrate-fixtures/fixed-anchor/bn254/x5/2/verifying_key.bin" + "../../../substrate-fixtures/fixed-anchor/bn254/x5/2/verifying_key.bin" ); (pk_bytes.to_vec(), vk_bytes.to_vec()) diff --git a/contracts/mixer/src/test_util.rs b/contracts/mixer/src/test_util.rs index f24ef8a..52f8801 100644 --- a/contracts/mixer/src/test_util.rs +++ b/contracts/mixer/src/test_util.rs @@ -31,10 +31,10 @@ pub fn setup_environment(curve: Curve) -> (Vec, Vec) { match curve { Curve::Bn254 => { let pk_bytes = include_bytes!( - "../../../protocol-substrate-fixtures/mixer/bn254/x5/proving_key_uncompressed.bin" + "../../../substrate-fixtures/mixer/bn254/x5/proving_key_uncompressed.bin" ); let vk_bytes = include_bytes!( - "../../../protocol-substrate-fixtures/mixer/bn254/x5/verifying_key.bin" + "../../../substrate-fixtures/mixer/bn254/x5/verifying_key.bin" ); (pk_bytes.to_vec(), vk_bytes.to_vec()) diff --git a/contracts/vanchor/src/test_util.rs b/contracts/vanchor/src/test_util.rs index ca5d2d4..7152bb5 100644 --- a/contracts/vanchor/src/test_util.rs +++ b/contracts/vanchor/src/test_util.rs @@ -45,11 +45,11 @@ pub fn setup_environment_2_2_2(curve: Curve) -> (Vec, Vec) { match curve { Curve::Bn254 => { let pk_bytes = include_bytes!( - "../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-2-2/proving_key_uncompressed.bin" + "../../../substrate-fixtures/vanchor/bn254/x5/2-2-2/proving_key_uncompressed.bin" ) .to_vec(); let vk_bytes = include_bytes!( - "../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-2-2/verifying_key.bin" + "../../../substrate-fixtures/vanchor/bn254/x5/2-2-2/verifying_key.bin" ) .to_vec(); @@ -66,11 +66,11 @@ pub fn setup_environment_2_16_2(curve: Curve) -> (Vec, Vec) { match curve { Curve::Bn254 => { let pk_bytes = include_bytes!( - "../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-16-2/proving_key_uncompressed.bin" + "../../../substrate-fixtures/vanchor/bn254/x5/2-16-2/proving_key_uncompressed.bin" ) .to_vec(); let vk_bytes = include_bytes!( - "../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-16-2/verifying_key.bin" + "../../../substrate-fixtures/vanchor/bn254/x5/2-16-2/verifying_key.bin" ) .to_vec(); diff --git a/packages/protocol_cosmwasm/src/anchor_verifier.rs b/packages/protocol_cosmwasm/src/anchor_verifier.rs index 84c66a9..bc9f359 100644 --- a/packages/protocol_cosmwasm/src/anchor_verifier.rs +++ b/packages/protocol_cosmwasm/src/anchor_verifier.rs @@ -23,9 +23,9 @@ pub mod anchor_verifier { impl AnchorVerifier { pub fn new(max_edges: u32) -> StdResult { let vk_bytes: &[u8] = match max_edges { - 2 => include_bytes!("../../../protocol-substrate-fixtures/fixed-anchor/bn254/x5/2/verifying_key.bin"), - 16 => include_bytes!("../../../protocol-substrate-fixtures/fixed-anchor/bn254/x5/16/verifying_key.bin"), - 32 => include_bytes!("../../../protocol-substrate-fixtures/fixed-anchor/bn254/x5/32/verifying_key.bin"), + 2 => include_bytes!("../../../substrate-fixtures/fixed-anchor/bn254/x5/2/verifying_key.bin"), + 16 => include_bytes!("../../../substrate-fixtures/fixed-anchor/bn254/x5/16/verifying_key.bin"), + 32 => include_bytes!("../../../substrate-fixtures/fixed-anchor/bn254/x5/32/verifying_key.bin"), _ => return Err( StdError::GenericErr { msg: "Invalid max_edges".to_string() } ), }; Ok(Self { diff --git a/packages/protocol_cosmwasm/src/mixer_verifier.rs b/packages/protocol_cosmwasm/src/mixer_verifier.rs index 1bab1f4..4841624 100644 --- a/packages/protocol_cosmwasm/src/mixer_verifier.rs +++ b/packages/protocol_cosmwasm/src/mixer_verifier.rs @@ -23,7 +23,7 @@ pub mod mixer_verifier { /// Constructor that initializes the `bool` value to the given `init_value`. pub fn new() -> Self { let vk_bytes = include_bytes!( - "../../../protocol-substrate-fixtures/mixer/bn254/x5/verifying_key.bin" + "../../../substrate-fixtures/mixer/bn254/x5/verifying_key.bin" ); Self { vk_bytes: vk_bytes.to_vec(), diff --git a/packages/protocol_cosmwasm/src/vanchor_verifier.rs b/packages/protocol_cosmwasm/src/vanchor_verifier.rs index 42a6a44..66520b9 100644 --- a/packages/protocol_cosmwasm/src/vanchor_verifier.rs +++ b/packages/protocol_cosmwasm/src/vanchor_verifier.rs @@ -23,10 +23,10 @@ pub mod vanchor_verifier { impl VAnchorVerifier { pub fn new(max_edges: u32, ins: u32, outs: u32) -> StdResult { let vk_bytes: &[u8] = match (max_edges, ins, outs) { - (2, 2, 2) => include_bytes!("../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-2-2/verifying_key.bin"), - (2, 16, 2) => include_bytes!("../../../protocol-substrate-fixtures/vanchor/bn254/x5/2-16-2/verifying_key.bin"), - (32, 2, 2) => include_bytes!("../../../protocol-substrate-fixtures/vanchor/bn254/x5/32-2-2/verifying_key.bin"), - (32, 16, 2) => include_bytes!("../../../protocol-substrate-fixtures/vanchor/bn254/x5/32-16-2/verifying_key.bin"), + (2, 2, 2) => include_bytes!("../../../substrate-fixtures/vanchor/bn254/x5/2-2-2/verifying_key.bin"), + (2, 16, 2) => include_bytes!("../../../substrate-fixtures/vanchor/bn254/x5/2-16-2/verifying_key.bin"), + (32, 2, 2) => include_bytes!("../../../substrate-fixtures/vanchor/bn254/x5/32-2-2/verifying_key.bin"), + (32, 16, 2) => include_bytes!("../../../substrate-fixtures/vanchor/bn254/x5/32-16-2/verifying_key.bin"), _ => return Err(StdError::GenericErr { msg: format!("Invalid ({}, {}, {}) group", max_edges, ins, outs) }), }; Ok(Self { diff --git a/protocol-substrate-fixtures b/protocol-substrate-fixtures deleted file mode 160000 index e335530..0000000 --- a/protocol-substrate-fixtures +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e335530c28cb8575c28f4e796e69cd501590e8e4 diff --git a/substrate-fixtures.dvc b/substrate-fixtures.dvc new file mode 100644 index 0000000..72bb906 --- /dev/null +++ b/substrate-fixtures.dvc @@ -0,0 +1,12 @@ +md5: 556aaf5231aabec2aca01802ccba23d6 +frozen: true +deps: +- path: substrate-fixtures + repo: + url: https://github.com/webb-tools/substrate-fixtures + rev_lock: 2ee2d9448af09772aedefd22972d4230f7fdc14f +outs: +- md5: 9c00cd97c42bef50fcfdb4b8878be0fb.dir + size: 240092288 + nfiles: 35 + path: substrate-fixtures