diff --git a/circuit-lib/verifier/src/lib.rs b/circuit-lib/verifier/src/lib.rs index 6ba6564b88..132735f4cd 100644 --- a/circuit-lib/verifier/src/lib.rs +++ b/circuit-lib/verifier/src/lib.rs @@ -312,11 +312,6 @@ pub fn verify_batch_append_with_proofs( compressed_proof: &CompressedProof, ) -> Result<(), VerifierError> { match batch_size { - 1 => verify::<1>( - &[public_input_hash], - compressed_proof, - &append_with_proofs_32_1::VERIFYINGKEY, - ), 10 => verify::<1>( &[public_input_hash], compressed_proof, diff --git a/circuit-lib/verifier/src/verifying_keys/append_with_proofs_32_1.rs b/circuit-lib/verifier/src/verifying_keys/append_with_proofs_32_1.rs deleted file mode 100644 index 355d274762..0000000000 --- a/circuit-lib/verifier/src/verifying_keys/append_with_proofs_32_1.rs +++ /dev/null @@ -1,65 +0,0 @@ -// This file is generated by xtask. Do not edit it manually. - -use groth16_solana::groth16::Groth16Verifyingkey; -pub const VERIFYINGKEY: Groth16Verifyingkey = Groth16Verifyingkey { - nr_pubinputs: 1usize, - vk_alpha_g1: [ - 14u8, 229u8, 193u8, 170u8, 25u8, 73u8, 173u8, 77u8, 206u8, 253u8, 46u8, 237u8, 110u8, 99u8, - 21u8, 176u8, 206u8, 125u8, 104u8, 220u8, 116u8, 13u8, 44u8, 97u8, 190u8, 148u8, 108u8, - 104u8, 91u8, 210u8, 203u8, 22u8, 47u8, 29u8, 213u8, 110u8, 222u8, 186u8, 129u8, 6u8, 191u8, - 231u8, 164u8, 183u8, 198u8, 253u8, 7u8, 106u8, 220u8, 213u8, 90u8, 143u8, 207u8, 74u8, - 64u8, 121u8, 67u8, 230u8, 53u8, 172u8, 218u8, 216u8, 69u8, 245u8, - ], - vk_beta_g2: [ - 47u8, 1u8, 92u8, 148u8, 186u8, 116u8, 133u8, 116u8, 216u8, 241u8, 105u8, 103u8, 79u8, - 249u8, 5u8, 61u8, 177u8, 54u8, 172u8, 36u8, 122u8, 137u8, 0u8, 135u8, 207u8, 194u8, 106u8, - 82u8, 250u8, 202u8, 204u8, 85u8, 15u8, 113u8, 202u8, 93u8, 71u8, 247u8, 104u8, 0u8, 46u8, - 124u8, 87u8, 120u8, 145u8, 176u8, 38u8, 208u8, 43u8, 43u8, 75u8, 242u8, 165u8, 200u8, - 211u8, 2u8, 185u8, 234u8, 0u8, 137u8, 41u8, 158u8, 232u8, 148u8, 32u8, 21u8, 91u8, 169u8, - 193u8, 68u8, 188u8, 136u8, 36u8, 44u8, 46u8, 143u8, 172u8, 229u8, 14u8, 43u8, 93u8, 134u8, - 40u8, 15u8, 146u8, 113u8, 192u8, 173u8, 15u8, 140u8, 159u8, 229u8, 109u8, 191u8, 178u8, - 77u8, 20u8, 195u8, 247u8, 15u8, 159u8, 225u8, 237u8, 102u8, 11u8, 227u8, 221u8, 95u8, - 199u8, 115u8, 208u8, 3u8, 160u8, 220u8, 232u8, 197u8, 120u8, 207u8, 233u8, 182u8, 193u8, - 200u8, 39u8, 117u8, 217u8, 180u8, 219u8, 187u8, - ], - vk_gamme_g2: [ - 26u8, 182u8, 108u8, 107u8, 41u8, 106u8, 203u8, 100u8, 64u8, 243u8, 28u8, 131u8, 36u8, - 123u8, 127u8, 60u8, 53u8, 116u8, 39u8, 131u8, 116u8, 240u8, 215u8, 100u8, 13u8, 82u8, 82u8, - 251u8, 92u8, 215u8, 62u8, 18u8, 19u8, 135u8, 101u8, 45u8, 169u8, 124u8, 235u8, 0u8, 169u8, - 174u8, 120u8, 100u8, 79u8, 20u8, 17u8, 133u8, 148u8, 214u8, 151u8, 102u8, 208u8, 149u8, - 130u8, 101u8, 84u8, 74u8, 129u8, 206u8, 136u8, 105u8, 109u8, 146u8, 39u8, 206u8, 86u8, - 210u8, 194u8, 207u8, 70u8, 135u8, 80u8, 7u8, 227u8, 118u8, 64u8, 167u8, 124u8, 219u8, 30u8, - 106u8, 39u8, 34u8, 199u8, 236u8, 239u8, 146u8, 122u8, 236u8, 27u8, 204u8, 192u8, 86u8, - 91u8, 90u8, 18u8, 117u8, 110u8, 250u8, 43u8, 11u8, 222u8, 224u8, 33u8, 116u8, 13u8, 93u8, - 75u8, 100u8, 193u8, 104u8, 6u8, 148u8, 234u8, 62u8, 83u8, 225u8, 74u8, 147u8, 47u8, 81u8, - 198u8, 155u8, 222u8, 161u8, 1u8, 83u8, - ], - vk_delta_g2: [ - 29u8, 121u8, 206u8, 185u8, 184u8, 6u8, 233u8, 48u8, 235u8, 74u8, 210u8, 77u8, 218u8, 13u8, - 85u8, 218u8, 68u8, 158u8, 134u8, 254u8, 171u8, 43u8, 77u8, 154u8, 147u8, 28u8, 199u8, - 114u8, 57u8, 244u8, 36u8, 87u8, 0u8, 68u8, 19u8, 69u8, 214u8, 221u8, 31u8, 145u8, 82u8, - 42u8, 215u8, 157u8, 128u8, 200u8, 245u8, 44u8, 36u8, 157u8, 251u8, 8u8, 166u8, 200u8, - 137u8, 104u8, 189u8, 29u8, 96u8, 174u8, 106u8, 130u8, 90u8, 136u8, 24u8, 33u8, 207u8, 45u8, - 210u8, 235u8, 216u8, 3u8, 237u8, 112u8, 167u8, 22u8, 138u8, 157u8, 215u8, 210u8, 134u8, - 244u8, 70u8, 25u8, 63u8, 41u8, 128u8, 33u8, 169u8, 250u8, 197u8, 50u8, 131u8, 79u8, 83u8, - 232u8, 43u8, 223u8, 118u8, 48u8, 113u8, 22u8, 84u8, 132u8, 117u8, 49u8, 241u8, 230u8, 11u8, - 86u8, 132u8, 242u8, 240u8, 169u8, 43u8, 236u8, 185u8, 250u8, 80u8, 23u8, 38u8, 243u8, - 232u8, 69u8, 231u8, 170u8, 69u8, 160u8, - ], - vk_ic: &[ - [ - 44u8, 25u8, 181u8, 177u8, 42u8, 207u8, 98u8, 204u8, 97u8, 21u8, 181u8, 207u8, 32u8, - 128u8, 9u8, 66u8, 27u8, 233u8, 190u8, 225u8, 153u8, 185u8, 184u8, 90u8, 254u8, 2u8, - 42u8, 147u8, 107u8, 143u8, 81u8, 119u8, 13u8, 75u8, 140u8, 239u8, 218u8, 47u8, 3u8, - 108u8, 46u8, 127u8, 183u8, 99u8, 226u8, 108u8, 187u8, 199u8, 133u8, 201u8, 124u8, - 217u8, 39u8, 73u8, 7u8, 94u8, 48u8, 217u8, 168u8, 169u8, 236u8, 85u8, 38u8, 192u8, - ], - [ - 36u8, 225u8, 87u8, 195u8, 236u8, 65u8, 227u8, 225u8, 104u8, 236u8, 145u8, 204u8, 29u8, - 9u8, 71u8, 13u8, 226u8, 72u8, 225u8, 109u8, 61u8, 33u8, 39u8, 136u8, 207u8, 177u8, - 213u8, 63u8, 33u8, 239u8, 215u8, 115u8, 34u8, 145u8, 87u8, 249u8, 6u8, 221u8, 173u8, - 216u8, 88u8, 248u8, 239u8, 251u8, 159u8, 67u8, 185u8, 167u8, 9u8, 165u8, 192u8, 251u8, - 249u8, 246u8, 224u8, 175u8, 203u8, 178u8, 200u8, 148u8, 149u8, 252u8, 58u8, 106u8, - ], - ], -}; diff --git a/circuit-lib/verifier/src/verifying_keys/append_with_subtrees_26_1.rs b/circuit-lib/verifier/src/verifying_keys/append_with_subtrees_26_1.rs deleted file mode 100644 index 930c997d09..0000000000 --- a/circuit-lib/verifier/src/verifying_keys/append_with_subtrees_26_1.rs +++ /dev/null @@ -1,65 +0,0 @@ -// This file is generated by xtask. Do not edit it manually. - -use groth16_solana::groth16::Groth16Verifyingkey; -pub const VERIFYINGKEY: Groth16Verifyingkey = Groth16Verifyingkey { - nr_pubinputs: 1usize, - vk_alpha_g1: [ - 4u8, 35u8, 179u8, 5u8, 245u8, 113u8, 253u8, 229u8, 166u8, 65u8, 122u8, 30u8, 105u8, 207u8, - 162u8, 85u8, 132u8, 190u8, 181u8, 54u8, 70u8, 148u8, 223u8, 135u8, 211u8, 141u8, 73u8, 2u8, - 198u8, 61u8, 53u8, 23u8, 42u8, 21u8, 179u8, 89u8, 172u8, 137u8, 243u8, 161u8, 244u8, 171u8, - 43u8, 206u8, 113u8, 232u8, 223u8, 190u8, 63u8, 197u8, 118u8, 141u8, 152u8, 44u8, 228u8, - 14u8, 88u8, 143u8, 130u8, 119u8, 24u8, 3u8, 166u8, 85u8, - ], - vk_beta_g2: [ - 16u8, 133u8, 239u8, 200u8, 109u8, 176u8, 231u8, 83u8, 140u8, 209u8, 143u8, 227u8, 244u8, - 27u8, 49u8, 165u8, 39u8, 61u8, 168u8, 46u8, 241u8, 88u8, 107u8, 139u8, 155u8, 84u8, 66u8, - 43u8, 107u8, 81u8, 132u8, 76u8, 31u8, 122u8, 122u8, 165u8, 147u8, 66u8, 162u8, 0u8, 170u8, - 208u8, 23u8, 142u8, 61u8, 218u8, 247u8, 40u8, 249u8, 159u8, 212u8, 254u8, 236u8, 22u8, - 17u8, 152u8, 218u8, 12u8, 51u8, 238u8, 116u8, 18u8, 240u8, 4u8, 7u8, 254u8, 241u8, 122u8, - 143u8, 151u8, 138u8, 11u8, 65u8, 69u8, 191u8, 97u8, 249u8, 8u8, 137u8, 192u8, 46u8, 91u8, - 90u8, 32u8, 174u8, 137u8, 58u8, 131u8, 232u8, 116u8, 76u8, 136u8, 164u8, 159u8, 200u8, - 183u8, 23u8, 16u8, 246u8, 152u8, 252u8, 21u8, 103u8, 24u8, 103u8, 211u8, 226u8, 82u8, - 240u8, 245u8, 7u8, 237u8, 185u8, 43u8, 64u8, 53u8, 253u8, 71u8, 82u8, 3u8, 232u8, 98u8, - 84u8, 228u8, 187u8, 215u8, 77u8, 239u8, - ], - vk_gamme_g2: [ - 29u8, 88u8, 141u8, 54u8, 237u8, 188u8, 125u8, 166u8, 31u8, 12u8, 249u8, 247u8, 60u8, 30u8, - 116u8, 222u8, 64u8, 152u8, 212u8, 25u8, 155u8, 218u8, 70u8, 11u8, 206u8, 156u8, 142u8, - 31u8, 140u8, 184u8, 99u8, 27u8, 30u8, 198u8, 176u8, 20u8, 166u8, 210u8, 177u8, 120u8, 62u8, - 178u8, 152u8, 182u8, 22u8, 56u8, 188u8, 19u8, 99u8, 182u8, 114u8, 208u8, 248u8, 98u8, 23u8, - 178u8, 147u8, 83u8, 80u8, 173u8, 147u8, 160u8, 132u8, 54u8, 8u8, 234u8, 224u8, 216u8, 6u8, - 223u8, 94u8, 199u8, 232u8, 161u8, 9u8, 169u8, 195u8, 195u8, 70u8, 200u8, 76u8, 129u8, - 143u8, 60u8, 114u8, 217u8, 176u8, 247u8, 167u8, 248u8, 88u8, 137u8, 251u8, 29u8, 198u8, - 189u8, 5u8, 187u8, 80u8, 145u8, 227u8, 82u8, 152u8, 247u8, 190u8, 72u8, 8u8, 251u8, 58u8, - 152u8, 89u8, 23u8, 219u8, 148u8, 90u8, 253u8, 11u8, 112u8, 4u8, 70u8, 8u8, 191u8, 117u8, - 40u8, 99u8, 33u8, 140u8, 214u8, - ], - vk_delta_g2: [ - 16u8, 253u8, 105u8, 173u8, 85u8, 83u8, 227u8, 147u8, 27u8, 189u8, 163u8, 199u8, 80u8, 46u8, - 236u8, 166u8, 59u8, 239u8, 191u8, 65u8, 217u8, 9u8, 145u8, 46u8, 127u8, 89u8, 35u8, 221u8, - 239u8, 70u8, 69u8, 72u8, 38u8, 110u8, 181u8, 72u8, 35u8, 45u8, 111u8, 213u8, 33u8, 156u8, - 11u8, 229u8, 30u8, 247u8, 182u8, 245u8, 174u8, 91u8, 32u8, 54u8, 81u8, 31u8, 222u8, 236u8, - 226u8, 29u8, 47u8, 243u8, 172u8, 110u8, 198u8, 135u8, 24u8, 45u8, 152u8, 8u8, 75u8, 224u8, - 214u8, 164u8, 211u8, 27u8, 126u8, 39u8, 223u8, 74u8, 202u8, 198u8, 244u8, 69u8, 158u8, - 52u8, 188u8, 158u8, 190u8, 152u8, 148u8, 220u8, 118u8, 200u8, 224u8, 220u8, 171u8, 70u8, - 15u8, 244u8, 203u8, 166u8, 21u8, 86u8, 98u8, 94u8, 49u8, 78u8, 171u8, 146u8, 38u8, 132u8, - 249u8, 78u8, 74u8, 187u8, 166u8, 226u8, 70u8, 132u8, 60u8, 201u8, 135u8, 183u8, 13u8, - 115u8, 208u8, 233u8, 118u8, 240u8, - ], - vk_ic: &[ - [ - 21u8, 36u8, 170u8, 76u8, 56u8, 208u8, 11u8, 161u8, 225u8, 82u8, 148u8, 114u8, 4u8, - 172u8, 166u8, 146u8, 207u8, 99u8, 227u8, 107u8, 38u8, 9u8, 233u8, 9u8, 186u8, 189u8, - 178u8, 212u8, 180u8, 37u8, 36u8, 89u8, 11u8, 36u8, 34u8, 22u8, 129u8, 164u8, 153u8, - 228u8, 6u8, 119u8, 112u8, 172u8, 159u8, 217u8, 42u8, 24u8, 34u8, 63u8, 45u8, 185u8, - 170u8, 140u8, 93u8, 6u8, 232u8, 36u8, 22u8, 207u8, 60u8, 138u8, 93u8, 49u8, - ], - [ - 19u8, 92u8, 40u8, 66u8, 178u8, 26u8, 118u8, 143u8, 145u8, 100u8, 200u8, 98u8, 145u8, - 68u8, 73u8, 198u8, 215u8, 189u8, 19u8, 69u8, 125u8, 213u8, 231u8, 114u8, 195u8, 27u8, - 244u8, 170u8, 102u8, 75u8, 62u8, 61u8, 41u8, 203u8, 194u8, 14u8, 125u8, 67u8, 63u8, - 156u8, 193u8, 96u8, 242u8, 26u8, 51u8, 236u8, 228u8, 243u8, 94u8, 137u8, 229u8, 170u8, - 231u8, 56u8, 221u8, 77u8, 105u8, 98u8, 40u8, 2u8, 254u8, 225u8, 19u8, 25u8, - ], - ], -}; diff --git a/circuit-lib/verifier/src/verifying_keys/append_with_subtrees_26_10.rs b/circuit-lib/verifier/src/verifying_keys/append_with_subtrees_26_10.rs deleted file mode 100644 index d48ec2f00e..0000000000 --- a/circuit-lib/verifier/src/verifying_keys/append_with_subtrees_26_10.rs +++ /dev/null @@ -1,65 +0,0 @@ -// This file is generated by xtask. Do not edit it manually. - -use groth16_solana::groth16::Groth16Verifyingkey; -pub const VERIFYINGKEY: Groth16Verifyingkey = Groth16Verifyingkey { - nr_pubinputs: 1usize, - vk_alpha_g1: [ - 33u8, 177u8, 176u8, 53u8, 169u8, 1u8, 35u8, 130u8, 158u8, 228u8, 165u8, 158u8, 113u8, 29u8, - 234u8, 194u8, 205u8, 161u8, 123u8, 99u8, 237u8, 114u8, 132u8, 142u8, 87u8, 135u8, 120u8, - 12u8, 240u8, 11u8, 225u8, 239u8, 22u8, 80u8, 62u8, 3u8, 196u8, 31u8, 55u8, 24u8, 234u8, - 236u8, 53u8, 14u8, 186u8, 67u8, 224u8, 218u8, 179u8, 160u8, 233u8, 249u8, 200u8, 96u8, - 31u8, 112u8, 12u8, 191u8, 110u8, 28u8, 211u8, 210u8, 232u8, 217u8, - ], - vk_beta_g2: [ - 24u8, 81u8, 180u8, 25u8, 186u8, 33u8, 186u8, 141u8, 21u8, 24u8, 222u8, 37u8, 36u8, 206u8, - 144u8, 249u8, 8u8, 226u8, 56u8, 61u8, 82u8, 154u8, 37u8, 120u8, 37u8, 241u8, 161u8, 199u8, - 99u8, 254u8, 32u8, 177u8, 31u8, 255u8, 213u8, 138u8, 246u8, 12u8, 172u8, 15u8, 97u8, 82u8, - 159u8, 74u8, 50u8, 23u8, 107u8, 31u8, 249u8, 0u8, 226u8, 244u8, 71u8, 140u8, 143u8, 31u8, - 94u8, 125u8, 211u8, 97u8, 126u8, 20u8, 170u8, 149u8, 4u8, 187u8, 31u8, 133u8, 102u8, 68u8, - 137u8, 153u8, 117u8, 54u8, 166u8, 198u8, 223u8, 120u8, 186u8, 90u8, 120u8, 38u8, 54u8, - 163u8, 228u8, 217u8, 214u8, 48u8, 76u8, 176u8, 209u8, 24u8, 46u8, 199u8, 50u8, 135u8, 2u8, - 236u8, 3u8, 43u8, 45u8, 205u8, 32u8, 43u8, 167u8, 214u8, 84u8, 174u8, 122u8, 14u8, 226u8, - 242u8, 9u8, 113u8, 219u8, 234u8, 67u8, 200u8, 128u8, 237u8, 243u8, 218u8, 57u8, 112u8, - 30u8, 35u8, 68u8, 109u8, - ], - vk_gamme_g2: [ - 15u8, 175u8, 204u8, 231u8, 129u8, 232u8, 190u8, 79u8, 167u8, 143u8, 164u8, 61u8, 100u8, - 123u8, 17u8, 197u8, 120u8, 247u8, 213u8, 4u8, 233u8, 39u8, 189u8, 116u8, 86u8, 175u8, 93u8, - 17u8, 95u8, 44u8, 11u8, 193u8, 33u8, 123u8, 123u8, 2u8, 23u8, 13u8, 11u8, 85u8, 146u8, - 17u8, 37u8, 67u8, 18u8, 38u8, 204u8, 19u8, 9u8, 205u8, 29u8, 78u8, 192u8, 140u8, 201u8, - 129u8, 89u8, 126u8, 201u8, 142u8, 202u8, 137u8, 83u8, 52u8, 33u8, 2u8, 147u8, 130u8, 60u8, - 132u8, 206u8, 6u8, 200u8, 168u8, 79u8, 103u8, 7u8, 128u8, 227u8, 106u8, 82u8, 25u8, 108u8, - 159u8, 52u8, 130u8, 189u8, 202u8, 187u8, 1u8, 130u8, 116u8, 248u8, 88u8, 117u8, 121u8, - 43u8, 62u8, 101u8, 182u8, 33u8, 210u8, 121u8, 26u8, 211u8, 48u8, 113u8, 47u8, 202u8, 253u8, - 53u8, 114u8, 229u8, 62u8, 236u8, 27u8, 180u8, 127u8, 164u8, 2u8, 73u8, 0u8, 0u8, 114u8, - 133u8, 24u8, 63u8, 95u8, - ], - vk_delta_g2: [ - 25u8, 97u8, 254u8, 228u8, 126u8, 117u8, 115u8, 165u8, 3u8, 201u8, 247u8, 131u8, 146u8, - 33u8, 191u8, 105u8, 138u8, 28u8, 213u8, 27u8, 16u8, 8u8, 137u8, 113u8, 179u8, 144u8, 230u8, - 239u8, 119u8, 123u8, 18u8, 24u8, 10u8, 163u8, 225u8, 91u8, 223u8, 220u8, 76u8, 246u8, 71u8, - 40u8, 4u8, 24u8, 241u8, 118u8, 88u8, 52u8, 17u8, 5u8, 107u8, 122u8, 219u8, 179u8, 6u8, - 86u8, 14u8, 252u8, 134u8, 155u8, 214u8, 110u8, 105u8, 115u8, 45u8, 195u8, 18u8, 123u8, - 218u8, 156u8, 91u8, 247u8, 184u8, 100u8, 119u8, 107u8, 163u8, 108u8, 112u8, 126u8, 57u8, - 80u8, 5u8, 234u8, 4u8, 100u8, 8u8, 99u8, 104u8, 115u8, 86u8, 76u8, 203u8, 81u8, 214u8, - 40u8, 30u8, 235u8, 10u8, 98u8, 179u8, 238u8, 64u8, 61u8, 37u8, 193u8, 103u8, 200u8, 204u8, - 95u8, 183u8, 98u8, 189u8, 221u8, 191u8, 192u8, 58u8, 142u8, 81u8, 93u8, 134u8, 172u8, 54u8, - 89u8, 136u8, 150u8, 151u8, 186u8, - ], - vk_ic: &[ - [ - 38u8, 25u8, 142u8, 83u8, 214u8, 92u8, 57u8, 48u8, 128u8, 113u8, 100u8, 27u8, 66u8, - 210u8, 196u8, 63u8, 71u8, 73u8, 115u8, 88u8, 68u8, 5u8, 140u8, 76u8, 225u8, 140u8, - 102u8, 112u8, 96u8, 245u8, 177u8, 78u8, 15u8, 215u8, 67u8, 70u8, 48u8, 201u8, 115u8, - 84u8, 251u8, 100u8, 13u8, 241u8, 42u8, 100u8, 24u8, 253u8, 160u8, 199u8, 246u8, 199u8, - 235u8, 233u8, 148u8, 196u8, 101u8, 247u8, 94u8, 67u8, 223u8, 244u8, 64u8, 238u8, - ], - [ - 29u8, 49u8, 209u8, 41u8, 52u8, 106u8, 148u8, 134u8, 93u8, 77u8, 98u8, 126u8, 204u8, - 182u8, 61u8, 148u8, 172u8, 248u8, 192u8, 157u8, 133u8, 192u8, 148u8, 253u8, 53u8, - 219u8, 173u8, 137u8, 95u8, 35u8, 160u8, 102u8, 17u8, 95u8, 175u8, 79u8, 218u8, 9u8, - 101u8, 32u8, 211u8, 45u8, 112u8, 219u8, 85u8, 99u8, 93u8, 7u8, 28u8, 17u8, 171u8, - 159u8, 231u8, 89u8, 74u8, 29u8, 168u8, 40u8, 85u8, 159u8, 100u8, 93u8, 49u8, 149u8, - ], - ], -}; diff --git a/circuit-lib/verifier/src/verifying_keys/append_with_subtrees_26_100.rs b/circuit-lib/verifier/src/verifying_keys/append_with_subtrees_26_100.rs deleted file mode 100644 index 80834ea873..0000000000 --- a/circuit-lib/verifier/src/verifying_keys/append_with_subtrees_26_100.rs +++ /dev/null @@ -1,65 +0,0 @@ -// This file is generated by xtask. Do not edit it manually. - -use groth16_solana::groth16::Groth16Verifyingkey; -pub const VERIFYINGKEY: Groth16Verifyingkey = Groth16Verifyingkey { - nr_pubinputs: 1usize, - vk_alpha_g1: [ - 13u8, 125u8, 112u8, 105u8, 97u8, 112u8, 181u8, 170u8, 70u8, 59u8, 221u8, 160u8, 141u8, - 124u8, 68u8, 23u8, 228u8, 115u8, 84u8, 221u8, 102u8, 61u8, 216u8, 185u8, 166u8, 192u8, - 186u8, 199u8, 102u8, 108u8, 153u8, 63u8, 23u8, 120u8, 6u8, 46u8, 130u8, 104u8, 24u8, 28u8, - 87u8, 53u8, 116u8, 112u8, 39u8, 154u8, 222u8, 221u8, 43u8, 62u8, 171u8, 35u8, 55u8, 137u8, - 30u8, 17u8, 165u8, 190u8, 130u8, 222u8, 21u8, 243u8, 98u8, 147u8, - ], - vk_beta_g2: [ - 34u8, 9u8, 159u8, 38u8, 22u8, 9u8, 183u8, 56u8, 159u8, 17u8, 6u8, 50u8, 72u8, 53u8, 103u8, - 21u8, 6u8, 31u8, 104u8, 5u8, 203u8, 134u8, 71u8, 231u8, 215u8, 222u8, 46u8, 73u8, 76u8, - 250u8, 108u8, 84u8, 26u8, 80u8, 5u8, 186u8, 182u8, 170u8, 92u8, 132u8, 13u8, 175u8, 32u8, - 105u8, 93u8, 212u8, 236u8, 0u8, 186u8, 8u8, 8u8, 82u8, 161u8, 19u8, 249u8, 243u8, 199u8, - 61u8, 129u8, 16u8, 211u8, 247u8, 173u8, 78u8, 12u8, 74u8, 24u8, 178u8, 233u8, 217u8, 92u8, - 79u8, 223u8, 61u8, 61u8, 25u8, 107u8, 21u8, 120u8, 18u8, 134u8, 198u8, 122u8, 151u8, 32u8, - 152u8, 107u8, 169u8, 39u8, 222u8, 252u8, 1u8, 99u8, 63u8, 171u8, 17u8, 2u8, 143u8, 195u8, - 170u8, 158u8, 89u8, 67u8, 112u8, 223u8, 23u8, 131u8, 219u8, 38u8, 31u8, 173u8, 63u8, 226u8, - 203u8, 185u8, 136u8, 44u8, 58u8, 7u8, 1u8, 152u8, 208u8, 198u8, 198u8, 34u8, 177u8, 88u8, - 57u8, - ], - vk_gamme_g2: [ - 38u8, 150u8, 47u8, 56u8, 44u8, 141u8, 12u8, 144u8, 221u8, 115u8, 88u8, 57u8, 231u8, 230u8, - 112u8, 165u8, 216u8, 12u8, 136u8, 153u8, 123u8, 35u8, 54u8, 95u8, 82u8, 27u8, 185u8, 115u8, - 236u8, 156u8, 139u8, 150u8, 20u8, 187u8, 161u8, 156u8, 49u8, 146u8, 14u8, 48u8, 143u8, - 131u8, 109u8, 98u8, 53u8, 204u8, 94u8, 54u8, 215u8, 178u8, 42u8, 146u8, 125u8, 62u8, 65u8, - 11u8, 159u8, 30u8, 54u8, 95u8, 42u8, 56u8, 175u8, 154u8, 48u8, 75u8, 8u8, 88u8, 113u8, - 203u8, 185u8, 122u8, 98u8, 197u8, 153u8, 245u8, 12u8, 154u8, 167u8, 68u8, 155u8, 191u8, - 42u8, 81u8, 87u8, 44u8, 173u8, 81u8, 160u8, 81u8, 219u8, 95u8, 85u8, 85u8, 234u8, 66u8, - 29u8, 74u8, 203u8, 14u8, 250u8, 222u8, 61u8, 209u8, 243u8, 238u8, 54u8, 235u8, 107u8, - 139u8, 158u8, 204u8, 75u8, 199u8, 45u8, 76u8, 212u8, 253u8, 179u8, 19u8, 146u8, 202u8, - 93u8, 39u8, 55u8, 222u8, 137u8, 229u8, - ], - vk_delta_g2: [ - 6u8, 206u8, 171u8, 251u8, 197u8, 122u8, 91u8, 24u8, 124u8, 47u8, 90u8, 68u8, 246u8, 108u8, - 120u8, 41u8, 143u8, 7u8, 144u8, 146u8, 158u8, 119u8, 116u8, 44u8, 213u8, 149u8, 178u8, - 51u8, 10u8, 152u8, 56u8, 180u8, 19u8, 251u8, 130u8, 110u8, 137u8, 94u8, 15u8, 65u8, 181u8, - 192u8, 124u8, 250u8, 94u8, 132u8, 162u8, 212u8, 93u8, 188u8, 215u8, 62u8, 254u8, 177u8, - 252u8, 174u8, 196u8, 145u8, 183u8, 222u8, 209u8, 34u8, 138u8, 249u8, 2u8, 244u8, 134u8, - 224u8, 52u8, 234u8, 71u8, 5u8, 27u8, 145u8, 101u8, 189u8, 56u8, 162u8, 211u8, 135u8, 158u8, - 53u8, 81u8, 122u8, 109u8, 182u8, 105u8, 101u8, 77u8, 58u8, 191u8, 68u8, 112u8, 172u8, - 135u8, 93u8, 12u8, 61u8, 90u8, 137u8, 31u8, 149u8, 63u8, 125u8, 60u8, 179u8, 216u8, 237u8, - 103u8, 252u8, 156u8, 234u8, 196u8, 209u8, 88u8, 232u8, 231u8, 133u8, 61u8, 95u8, 105u8, - 243u8, 103u8, 238u8, 74u8, 91u8, 23u8, 182u8, - ], - vk_ic: &[ - [ - 30u8, 212u8, 253u8, 203u8, 57u8, 27u8, 39u8, 210u8, 97u8, 148u8, 225u8, 47u8, 125u8, - 55u8, 214u8, 90u8, 246u8, 43u8, 246u8, 13u8, 5u8, 50u8, 221u8, 149u8, 150u8, 247u8, - 26u8, 64u8, 3u8, 46u8, 69u8, 40u8, 1u8, 41u8, 90u8, 18u8, 106u8, 17u8, 228u8, 106u8, - 219u8, 255u8, 1u8, 76u8, 114u8, 146u8, 217u8, 13u8, 226u8, 195u8, 137u8, 33u8, 249u8, - 125u8, 187u8, 218u8, 246u8, 182u8, 71u8, 70u8, 250u8, 126u8, 64u8, 191u8, - ], - [ - 15u8, 7u8, 46u8, 229u8, 197u8, 252u8, 32u8, 212u8, 99u8, 80u8, 228u8, 58u8, 36u8, 12u8, - 183u8, 124u8, 114u8, 173u8, 230u8, 75u8, 220u8, 237u8, 216u8, 235u8, 190u8, 47u8, 7u8, - 42u8, 235u8, 155u8, 22u8, 78u8, 10u8, 89u8, 209u8, 250u8, 222u8, 191u8, 236u8, 144u8, - 169u8, 210u8, 199u8, 159u8, 252u8, 39u8, 59u8, 165u8, 191u8, 233u8, 29u8, 158u8, 70u8, - 170u8, 235u8, 177u8, 147u8, 113u8, 167u8, 240u8, 248u8, 81u8, 11u8, 206u8, - ], - ], -}; diff --git a/circuit-lib/verifier/src/verifying_keys/append_with_subtrees_26_1000.rs b/circuit-lib/verifier/src/verifying_keys/append_with_subtrees_26_1000.rs deleted file mode 100644 index c0c29c6c01..0000000000 --- a/circuit-lib/verifier/src/verifying_keys/append_with_subtrees_26_1000.rs +++ /dev/null @@ -1,65 +0,0 @@ -// This file is generated by xtask. Do not edit it manually. - -use groth16_solana::groth16::Groth16Verifyingkey; -pub const VERIFYINGKEY: Groth16Verifyingkey = Groth16Verifyingkey { - nr_pubinputs: 1usize, - vk_alpha_g1: [ - 16u8, 205u8, 128u8, 105u8, 82u8, 67u8, 90u8, 237u8, 230u8, 30u8, 214u8, 218u8, 95u8, 216u8, - 112u8, 63u8, 246u8, 216u8, 89u8, 173u8, 220u8, 188u8, 241u8, 137u8, 210u8, 59u8, 173u8, - 198u8, 133u8, 46u8, 104u8, 94u8, 27u8, 121u8, 67u8, 199u8, 155u8, 119u8, 169u8, 85u8, 68u8, - 125u8, 107u8, 107u8, 123u8, 179u8, 155u8, 141u8, 23u8, 210u8, 52u8, 206u8, 118u8, 49u8, - 109u8, 96u8, 35u8, 161u8, 139u8, 32u8, 186u8, 99u8, 79u8, 71u8, - ], - vk_beta_g2: [ - 31u8, 142u8, 44u8, 26u8, 19u8, 160u8, 193u8, 189u8, 218u8, 97u8, 176u8, 150u8, 66u8, 34u8, - 152u8, 90u8, 110u8, 6u8, 15u8, 167u8, 210u8, 114u8, 1u8, 196u8, 199u8, 101u8, 34u8, 1u8, - 161u8, 158u8, 189u8, 78u8, 23u8, 27u8, 78u8, 106u8, 113u8, 90u8, 34u8, 157u8, 41u8, 10u8, - 41u8, 82u8, 35u8, 201u8, 134u8, 90u8, 170u8, 192u8, 21u8, 220u8, 198u8, 9u8, 234u8, 127u8, - 128u8, 139u8, 25u8, 42u8, 12u8, 57u8, 150u8, 177u8, 34u8, 234u8, 173u8, 79u8, 141u8, 204u8, - 26u8, 132u8, 237u8, 236u8, 113u8, 103u8, 225u8, 129u8, 81u8, 116u8, 192u8, 28u8, 42u8, - 188u8, 201u8, 162u8, 117u8, 197u8, 241u8, 210u8, 14u8, 252u8, 56u8, 99u8, 122u8, 158u8, - 1u8, 148u8, 242u8, 208u8, 68u8, 217u8, 49u8, 106u8, 38u8, 215u8, 82u8, 61u8, 11u8, 50u8, - 2u8, 181u8, 192u8, 244u8, 219u8, 202u8, 57u8, 62u8, 220u8, 26u8, 46u8, 239u8, 12u8, 244u8, - 134u8, 195u8, 169u8, 20u8, - ], - vk_gamme_g2: [ - 42u8, 124u8, 17u8, 141u8, 139u8, 144u8, 53u8, 207u8, 79u8, 39u8, 59u8, 72u8, 97u8, 103u8, - 37u8, 100u8, 79u8, 210u8, 84u8, 108u8, 238u8, 194u8, 135u8, 181u8, 121u8, 250u8, 163u8, - 71u8, 200u8, 145u8, 182u8, 54u8, 25u8, 117u8, 179u8, 124u8, 138u8, 228u8, 29u8, 252u8, - 166u8, 8u8, 90u8, 0u8, 128u8, 128u8, 143u8, 180u8, 255u8, 1u8, 12u8, 25u8, 108u8, 207u8, - 209u8, 144u8, 195u8, 240u8, 41u8, 68u8, 24u8, 86u8, 91u8, 152u8, 1u8, 118u8, 171u8, 161u8, - 253u8, 177u8, 7u8, 237u8, 195u8, 161u8, 249u8, 47u8, 61u8, 25u8, 86u8, 15u8, 154u8, 134u8, - 135u8, 1u8, 199u8, 192u8, 185u8, 18u8, 127u8, 255u8, 35u8, 193u8, 56u8, 239u8, 95u8, 77u8, - 38u8, 142u8, 58u8, 80u8, 31u8, 207u8, 9u8, 104u8, 38u8, 22u8, 24u8, 153u8, 32u8, 230u8, - 9u8, 244u8, 75u8, 76u8, 0u8, 216u8, 114u8, 244u8, 184u8, 165u8, 138u8, 252u8, 117u8, 4u8, - 177u8, 93u8, 201u8, 179u8, - ], - vk_delta_g2: [ - 22u8, 22u8, 30u8, 218u8, 176u8, 55u8, 57u8, 104u8, 54u8, 40u8, 227u8, 144u8, 68u8, 195u8, - 90u8, 169u8, 80u8, 255u8, 123u8, 202u8, 244u8, 31u8, 24u8, 9u8, 54u8, 69u8, 206u8, 26u8, - 147u8, 211u8, 187u8, 20u8, 24u8, 69u8, 158u8, 199u8, 109u8, 6u8, 39u8, 143u8, 74u8, 128u8, - 9u8, 175u8, 238u8, 145u8, 28u8, 105u8, 160u8, 56u8, 188u8, 63u8, 75u8, 164u8, 212u8, 118u8, - 104u8, 132u8, 227u8, 212u8, 99u8, 21u8, 164u8, 93u8, 12u8, 8u8, 69u8, 51u8, 109u8, 96u8, - 213u8, 196u8, 113u8, 193u8, 159u8, 126u8, 9u8, 248u8, 123u8, 134u8, 25u8, 75u8, 12u8, - 153u8, 74u8, 167u8, 184u8, 120u8, 159u8, 40u8, 143u8, 136u8, 45u8, 212u8, 224u8, 147u8, - 19u8, 47u8, 215u8, 246u8, 62u8, 155u8, 230u8, 42u8, 42u8, 35u8, 9u8, 162u8, 149u8, 48u8, - 187u8, 169u8, 226u8, 66u8, 234u8, 54u8, 231u8, 64u8, 254u8, 59u8, 117u8, 127u8, 8u8, 239u8, - 75u8, 116u8, 80u8, 168u8, - ], - vk_ic: &[ - [ - 4u8, 254u8, 110u8, 225u8, 141u8, 166u8, 48u8, 35u8, 153u8, 138u8, 55u8, 124u8, 123u8, - 72u8, 97u8, 114u8, 230u8, 95u8, 122u8, 213u8, 235u8, 169u8, 142u8, 161u8, 68u8, 122u8, - 141u8, 87u8, 227u8, 23u8, 235u8, 1u8, 1u8, 188u8, 83u8, 112u8, 147u8, 241u8, 221u8, - 241u8, 73u8, 203u8, 79u8, 59u8, 216u8, 16u8, 241u8, 23u8, 121u8, 29u8, 242u8, 191u8, - 15u8, 101u8, 102u8, 56u8, 18u8, 199u8, 36u8, 114u8, 94u8, 24u8, 97u8, 129u8, - ], - [ - 4u8, 208u8, 70u8, 33u8, 134u8, 115u8, 177u8, 7u8, 209u8, 246u8, 147u8, 11u8, 144u8, - 105u8, 247u8, 103u8, 123u8, 104u8, 139u8, 76u8, 169u8, 15u8, 24u8, 239u8, 213u8, 133u8, - 123u8, 159u8, 233u8, 2u8, 100u8, 164u8, 41u8, 132u8, 59u8, 175u8, 250u8, 36u8, 25u8, - 153u8, 70u8, 61u8, 30u8, 49u8, 118u8, 104u8, 209u8, 202u8, 160u8, 153u8, 73u8, 148u8, - 132u8, 74u8, 106u8, 249u8, 18u8, 214u8, 219u8, 165u8, 129u8, 177u8, 39u8, 120u8, - ], - ], -}; diff --git a/circuit-lib/verifier/src/verifying_keys/append_with_subtrees_26_500.rs b/circuit-lib/verifier/src/verifying_keys/append_with_subtrees_26_500.rs deleted file mode 100644 index a1499b56ef..0000000000 --- a/circuit-lib/verifier/src/verifying_keys/append_with_subtrees_26_500.rs +++ /dev/null @@ -1,65 +0,0 @@ -// This file is generated by xtask. Do not edit it manually. - -use groth16_solana::groth16::Groth16Verifyingkey; -pub const VERIFYINGKEY: Groth16Verifyingkey = Groth16Verifyingkey { - nr_pubinputs: 1usize, - vk_alpha_g1: [ - 24u8, 119u8, 80u8, 206u8, 169u8, 86u8, 100u8, 55u8, 148u8, 186u8, 197u8, 158u8, 24u8, 15u8, - 149u8, 202u8, 185u8, 161u8, 38u8, 182u8, 163u8, 214u8, 117u8, 82u8, 12u8, 52u8, 221u8, - 108u8, 87u8, 244u8, 36u8, 142u8, 0u8, 208u8, 101u8, 21u8, 55u8, 178u8, 65u8, 176u8, 151u8, - 34u8, 187u8, 103u8, 238u8, 91u8, 209u8, 2u8, 224u8, 40u8, 194u8, 93u8, 51u8, 80u8, 142u8, - 156u8, 165u8, 157u8, 163u8, 27u8, 81u8, 150u8, 164u8, 141u8, - ], - vk_beta_g2: [ - 42u8, 6u8, 114u8, 159u8, 97u8, 192u8, 104u8, 164u8, 215u8, 127u8, 34u8, 147u8, 6u8, 19u8, - 2u8, 99u8, 175u8, 98u8, 36u8, 191u8, 64u8, 35u8, 185u8, 162u8, 119u8, 102u8, 168u8, 49u8, - 136u8, 179u8, 149u8, 4u8, 22u8, 202u8, 181u8, 177u8, 79u8, 145u8, 18u8, 244u8, 67u8, 240u8, - 18u8, 49u8, 51u8, 194u8, 160u8, 101u8, 240u8, 149u8, 170u8, 188u8, 92u8, 204u8, 112u8, - 75u8, 176u8, 75u8, 214u8, 30u8, 239u8, 104u8, 6u8, 65u8, 36u8, 83u8, 231u8, 239u8, 45u8, - 33u8, 67u8, 155u8, 66u8, 88u8, 198u8, 84u8, 5u8, 86u8, 94u8, 68u8, 156u8, 156u8, 178u8, - 117u8, 116u8, 188u8, 20u8, 195u8, 38u8, 212u8, 170u8, 135u8, 115u8, 77u8, 200u8, 90u8, - 41u8, 233u8, 9u8, 154u8, 179u8, 79u8, 215u8, 130u8, 181u8, 90u8, 48u8, 253u8, 118u8, 188u8, - 229u8, 51u8, 250u8, 133u8, 204u8, 238u8, 179u8, 56u8, 224u8, 147u8, 208u8, 115u8, 0u8, - 90u8, 85u8, 60u8, 122u8, 218u8, - ], - vk_gamme_g2: [ - 12u8, 43u8, 16u8, 154u8, 137u8, 15u8, 71u8, 97u8, 3u8, 78u8, 58u8, 129u8, 221u8, 117u8, - 211u8, 241u8, 133u8, 4u8, 154u8, 121u8, 180u8, 40u8, 65u8, 74u8, 246u8, 2u8, 28u8, 67u8, - 128u8, 92u8, 254u8, 118u8, 16u8, 51u8, 204u8, 58u8, 90u8, 77u8, 51u8, 112u8, 24u8, 69u8, - 7u8, 129u8, 138u8, 238u8, 69u8, 254u8, 160u8, 209u8, 1u8, 186u8, 83u8, 118u8, 115u8, 223u8, - 155u8, 176u8, 83u8, 115u8, 224u8, 146u8, 213u8, 108u8, 17u8, 195u8, 34u8, 36u8, 122u8, - 15u8, 87u8, 70u8, 76u8, 95u8, 125u8, 44u8, 50u8, 23u8, 212u8, 200u8, 51u8, 26u8, 69u8, - 65u8, 223u8, 57u8, 132u8, 156u8, 0u8, 250u8, 142u8, 12u8, 199u8, 241u8, 227u8, 117u8, 36u8, - 250u8, 82u8, 139u8, 27u8, 132u8, 16u8, 175u8, 66u8, 94u8, 86u8, 54u8, 240u8, 69u8, 3u8, - 159u8, 8u8, 177u8, 59u8, 135u8, 188u8, 116u8, 2u8, 235u8, 175u8, 28u8, 116u8, 102u8, 73u8, - 209u8, 95u8, 137u8, - ], - vk_delta_g2: [ - 4u8, 230u8, 138u8, 96u8, 103u8, 50u8, 4u8, 145u8, 111u8, 43u8, 44u8, 49u8, 97u8, 199u8, - 56u8, 21u8, 104u8, 102u8, 80u8, 148u8, 45u8, 65u8, 75u8, 68u8, 17u8, 198u8, 92u8, 222u8, - 0u8, 133u8, 44u8, 169u8, 17u8, 7u8, 74u8, 212u8, 204u8, 238u8, 52u8, 159u8, 131u8, 45u8, - 218u8, 77u8, 21u8, 25u8, 157u8, 195u8, 148u8, 151u8, 186u8, 209u8, 48u8, 226u8, 33u8, - 172u8, 24u8, 155u8, 56u8, 205u8, 172u8, 207u8, 116u8, 110u8, 44u8, 186u8, 86u8, 166u8, - 131u8, 109u8, 133u8, 225u8, 121u8, 181u8, 19u8, 31u8, 105u8, 185u8, 32u8, 29u8, 251u8, - 123u8, 34u8, 104u8, 210u8, 94u8, 171u8, 77u8, 217u8, 203u8, 88u8, 58u8, 63u8, 59u8, 223u8, - 92u8, 47u8, 22u8, 80u8, 228u8, 8u8, 71u8, 81u8, 114u8, 20u8, 197u8, 229u8, 27u8, 107u8, - 153u8, 206u8, 121u8, 67u8, 185u8, 169u8, 122u8, 71u8, 55u8, 231u8, 83u8, 43u8, 236u8, - 126u8, 131u8, 18u8, 168u8, 108u8, 216u8, - ], - vk_ic: &[ - [ - 17u8, 189u8, 85u8, 227u8, 93u8, 255u8, 110u8, 149u8, 123u8, 108u8, 166u8, 90u8, 241u8, - 255u8, 180u8, 162u8, 193u8, 47u8, 7u8, 66u8, 26u8, 215u8, 212u8, 169u8, 57u8, 180u8, - 14u8, 37u8, 90u8, 209u8, 37u8, 84u8, 43u8, 4u8, 114u8, 60u8, 88u8, 17u8, 43u8, 226u8, - 130u8, 27u8, 92u8, 43u8, 152u8, 121u8, 245u8, 26u8, 167u8, 38u8, 134u8, 154u8, 100u8, - 36u8, 234u8, 196u8, 132u8, 110u8, 73u8, 132u8, 166u8, 217u8, 226u8, 152u8, - ], - [ - 15u8, 136u8, 95u8, 116u8, 255u8, 125u8, 173u8, 166u8, 13u8, 68u8, 249u8, 92u8, 152u8, - 103u8, 242u8, 229u8, 81u8, 23u8, 130u8, 44u8, 19u8, 133u8, 166u8, 71u8, 140u8, 208u8, - 101u8, 82u8, 204u8, 229u8, 152u8, 5u8, 33u8, 238u8, 205u8, 150u8, 159u8, 178u8, 207u8, - 183u8, 86u8, 124u8, 101u8, 229u8, 172u8, 89u8, 89u8, 231u8, 172u8, 132u8, 67u8, 234u8, - 83u8, 115u8, 237u8, 234u8, 113u8, 226u8, 141u8, 8u8, 121u8, 154u8, 135u8, 195u8, - ], - ], -}; diff --git a/circuit-lib/verifier/src/verifying_keys/mod.rs b/circuit-lib/verifier/src/verifying_keys/mod.rs index fd3082f6fc..9a866b42f4 100644 --- a/circuit-lib/verifier/src/verifying_keys/mod.rs +++ b/circuit-lib/verifier/src/verifying_keys/mod.rs @@ -1,4 +1,3 @@ -pub mod append_with_proofs_32_1; pub mod append_with_proofs_32_10; pub mod append_with_proofs_32_100; pub mod append_with_proofs_32_1000; diff --git a/light-prover/prover/proving_keys_utils.go b/light-prover/prover/proving_keys_utils.go index c1726bed43..27bb11e1e5 100644 --- a/light-prover/prover/proving_keys_utils.go +++ b/light-prover/prover/proving_keys_utils.go @@ -141,7 +141,6 @@ func GetKeys(keysDir string, runMode RunMode, circuits []string) []string { } var updateKeys []string = []string{ - keysDir + "update_32_1.key", keysDir + "update_32_10.key", keysDir + "update_32_100.key", keysDir + "update_32_500.key", @@ -157,7 +156,6 @@ func GetKeys(keysDir string, runMode RunMode, circuits []string) []string { } var addressAppendKeys []string = []string{ - keysDir + "address-append_40_1.key", keysDir + "address-append_40_10.key", keysDir + "address-append_40_100.key", keysDir + "address-append_40_250.key", diff --git a/light-prover/scripts/download_keys.sh b/light-prover/scripts/download_keys.sh index 147624d3f9..bcb00ab2bf 100755 --- a/light-prover/scripts/download_keys.sh +++ b/light-prover/scripts/download_keys.sh @@ -2,62 +2,81 @@ set -e +# Configuration ROOT_DIR="$(git rev-parse --show-toplevel)" KEYS_DIR="${ROOT_DIR}/light-prover/proving-keys" +BASE_URL="https://light.fra1.cdn.digitaloceanspaces.com/proving-keys" +CHECKSUM_URL="${BASE_URL}/CHECKSUM" +MAX_RETRIES=3 +RETRY_DELAY=5 +# Create keys directory mkdir -p "$KEYS_DIR" -# Circuits with multiple inputs (we are going to cease supporting address trees of -# height 26 hence no point in doing a new trusted setup for these circuits) -MAINNET_INCLUSION_26_BUCKET="bafybeiacecbc3hnlmgifpe6v3h3r3ord7ifedjj6zvdv7nxgkab4npts54" -NON_INCLUSION_26_BUCKET="bafybeiacecbc3hnlmgifpe6v3h3r3ord7ifedjj6zvdv7nxgkab4npts54" -COMBINED_26_26_BUCKET="bafybeiacecbc3hnlmgifpe6v3h3r3ord7ifedjj6zvdv7nxgkab4npts54" +# Download function with retry mechanism +download_file() { + local url="$1" + local output="$2" + local attempt=1 -# Circuits with unified inputs4" -INCLUSION_32_BUCKET="bafybeihhka7qkdiq3hhur6hycmaqzgov4vpzw5jmjsvomjbcybvqc4exgy" -NON_INCLUSION_40_BUCKET="bafybeigp64bqx2k2ogwur4efzcxczm22jkxye57p5mnmvgzvlpb75b66m4" + while [ $attempt -le $MAX_RETRIES ]; do + echo "Downloading $url (attempt $attempt/$MAX_RETRIES)" + if curl -L \ + --fail \ + -H "Accept: */*" \ + -H "Accept-Encoding: identity" \ + -A "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36" \ + --connect-timeout 30 \ + --max-time 300 \ + --output "$output" \ + "$url"; then + return 0 + fi + + echo "Download failed. Retrying in $RETRY_DELAY seconds..." + rm -f "$output" # Remove failed download + attempt=$((attempt + 1)) + [ $attempt -le $MAX_RETRIES ] && sleep $RETRY_DELAY + done + return 1 +} -COMBINED_32_40_BUCKET="bafybeihhka7qkdiq3hhur6hycmaqzgov4vpzw5jmjsvomjbcybvqc4exgy" -APPEND_WITH_PROOFS_32_BUCKET="bafybeihhka7qkdiq3hhur6hycmaqzgov4vpzw5jmjsvomjbcybvqc4exgy" -UPDATE_32_BUCKET="bafybeihhka7qkdiq3hhur6hycmaqzgov4vpzw5jmjsvomjbcybvqc4exgy" +verify_checksum() { + local file="$1" + local checksum_file="$2" + local expected + local actual + + expected=$(grep "${file##*/}" "$checksum_file" | cut -d' ' -f1) + actual=$(sha256sum "$file" | cut -d' ' -f1) + + echo "Expected checksum: $expected" + echo "Actual checksum: $actual" + + [ "$expected" = "$actual" ] +} -APPEND_ADDRESS_40_BUCKET="bafybeib2rajatndlpslpqhf4vrbekpyyehjt5byivfzxl36c5p67ypddvu" +# Download checksum file +CHECKSUM_FILE="${KEYS_DIR}/CHECKSUM" +if ! download_file "$CHECKSUM_URL" "$CHECKSUM_FILE"; then + echo "Failed to download checksum file" + exit 1 +fi -get_bucket_url() { - local FILE="$1" - - if [[ $FILE == inclusion_32_* ]]; then - echo "https://${INCLUSION_32_BUCKET}.ipfs.w3s.link/${FILE}" - elif [[ $FILE == mainnet_inclusion_26_* ]]; then - echo "https://${MAINNET_INCLUSION_26_BUCKET}.ipfs.w3s.link/${FILE#mainnet_}" - elif [[ $FILE == non-inclusion_26_* ]]; then - echo "https://${NON_INCLUSION_26_BUCKET}.ipfs.w3s.link/${FILE}" - elif [[ $FILE == non-inclusion_40_* ]]; then - echo "https://${NON_INCLUSION_40_BUCKET}.ipfs.w3s.link/${FILE}" - elif [[ $FILE == combined_32_40_* ]]; then - echo "https://${COMBINED_32_40_BUCKET}.ipfs.w3s.link/${FILE}" - elif [[ $FILE == combined_26_* ]]; then - echo "https://${COMBINED_26_26_BUCKET}.ipfs.w3s.link/${FILE}" - elif [[ $FILE == append-with-proofs_32_* ]]; then - echo "https://${APPEND_WITH_PROOFS_32_BUCKET}.ipfs.w3s.link/${FILE}" - elif [[ $FILE == address-append_40_* ]]; then - echo "https://${APPEND_ADDRESS_40_BUCKET}.ipfs.w3s.link/${FILE}" - elif [[ $FILE == update_32_* ]]; then - echo "https://${UPDATE_32_BUCKET}.ipfs.w3s.link/${FILE}" - fi -} +echo "Content of CHECKSUM file:" +cat "$CHECKSUM_FILE" case "$1" in "light") SUFFIXES=( "inclusion_32:1 2 3 4 8" "mainnet_inclusion_26:1 2 3 4 8" - "non-inclusion_26:1 2 3 4 8" + "non-inclusion_26:1 2" "non-inclusion_40:1 2 3 4 8" "combined_26:1_1 1_2 2_1 2_2 3_1 3_2 4_1 4_2" "combined_32_40:1_1 1_2 1_3 1_4 2_1 2_2 2_3 2_4 3_1 3_2 3_3 3_4 4_1 4_2 4_3 4_4" - "append-with-proofs_32:1 10" - "update_32:1 10" + "append-with-proofs_32:10" + "update_32:10" "address-append_40:10" ) ;; @@ -65,12 +84,12 @@ case "$1" in SUFFIXES=( "inclusion_32:1 2 3 4 8" "mainnet_inclusion_26:1 2 3 4 8" - "non-inclusion_26:1 2 3 4 8" + "non-inclusion_26:1 2" "non-inclusion_40:1 2 3 4 8" - "combined_26_26:1_1 1_2 2_1 2_2 3_1 3_2 4_1 4_2" + "combined_26:1_1 1_2 2_1 2_2 3_1 3_2 4_1 4_2" "combined_32_40:1_1 1_2 1_3 1_4 2_1 2_2 2_3 2_4 3_1 3_2 3_3 3_4 4_1 4_2 4_3 4_4" - "append-with-proofs_32:1 10 100 500 1000" - "update_32:1 10 100 500 1000" + "append-with-proofs_32:10 100 500 1000" + "update_32:10 100 500 1000" "address-append_40:10 100 250 500 1000" ) ;; @@ -80,15 +99,35 @@ case "$1" in ;; esac +# Process each file for group in "${SUFFIXES[@]}"; do base=${group%:*} suffixes=${group#*:} + for suffix in $suffixes; do for ext in key vkey; do file="${base}_${suffix}.${ext}" - url="$(get_bucket_url "$file")" - echo "Downloading $file" - curl -S --retry 3 -o "${KEYS_DIR}/${file}" "$url" + output="${KEYS_DIR}/${file}" + + if [ -f "$output" ] && verify_checksum "$output" "$CHECKSUM_FILE"; then + echo "Skipping $file (already downloaded and verified)" + continue + fi + + if download_file "${BASE_URL}/${file}" "$output"; then + echo "Verifying checksum for $file..." + if ! verify_checksum "$output" "$CHECKSUM_FILE"; then + echo "Checksum verification failed for $file" + rm -f "$output" + exit 1 + fi + echo "Successfully downloaded and verified $file" + else + echo "Failed to download $file" + exit 1 + fi done done done + +echo "All files downloaded and verified successfully" \ No newline at end of file diff --git a/light-prover/scripts/generate_checksums.py b/light-prover/scripts/generate_checksums.py new file mode 100644 index 0000000000..008ded1601 --- /dev/null +++ b/light-prover/scripts/generate_checksums.py @@ -0,0 +1,27 @@ +import os +import hashlib +import boto3 +from tqdm import tqdm + +def calculate_sha256(filepath): + sha256_hash = hashlib.sha256() + with open(filepath, "rb") as f: + for chunk in iter(lambda: f.read(4096), b""): + sha256_hash.update(chunk) + return sha256_hash.hexdigest() + +def generate_checksums(directory): + checksums = {} + files = [f for f in os.listdir(directory) if os.path.isfile(os.path.join(directory, f))] + + print("Calculating checksums...") + for filename in tqdm(files): + filepath = os.path.join(directory, filename) + checksums[filename] = calculate_sha256(filepath) + + with open("CHECKSUM", "w") as f: + for filename, checksum in checksums.items(): + f.write(f"{checksum} {filename}\n") + +if __name__ == "__main__": + generate_checksums("./proving-keys") diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0a42d50d1c..29342a0b4e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -398,10 +398,6 @@ importers: specifier: ^1.6.0 version: 1.6.0(@types/node@22.5.5)(@vitest/browser@1.6.0)(terser@5.31.0) - hasher.rs/src/main/wasm: {} - - hasher.rs/src/main/wasm-simd: {} - js/compressed-token: dependencies: '@coral-xyz/anchor':