Add custom Serialize/Deserialize impl for EphemeralPublicKey, Pepper, Groth16ZkpAndStatement, G1Bytes, and G2Bytes, which output hex when used to serialize json #12295

rex1fernando · 2024-02-29T03:47:26Z

Description

This PR adds Serialize/Deserialize implementations for the following types:

EphemeralPublicKey
Pepper
Groth16ZkpAndStatement
G1Bytes
G2Bytes

instead of using the derive macros. The purpose of this is so that serde_json serializes these two types as hex strings, while bcs behavior is still preserved.

Test plan

This PR includes a new module aptos_types::unit_tests::keyless_serialization_test, which has test cases to test the new serialization/deserialization behavior for each of the types above.

…er so that serde_json serializes as hex, while bcs still serializes normally

trunk-io · 2024-02-29T03:47:29Z

⏱️ 16h 40m total CI duration on this PR

Job	Cumulative Duration	Recent Runs
windows-build	4h 5m	🟩 🟩 🟩 🟩 🟩 (+9 more)
rust-unit-tests	3h 18m	🟩 🟩 ⬜ 🟩 🟩 (+6 more)
execution-performance / single-node-performance	1h 42m	🟥 🟩 🟩
run-tests-main-branch	1h 31m	🟥 🟥 🟥 🟥 🟥 (+9 more)
rust-smoke-tests	1h 28m	🟥 🟥 🟩
rust-lints	47m	🟩 🟩 ⬜ 🟩 🟩 (+6 more)
forge-e2e-test / forge	41m	🟩 🟩 🟩
rust-images / rust-all	40m	🟩 🟩 🟩
forge-compat-test / forge	39m	🟩 🟩 🟩
check	28m	🟩 ⬜ 🟩 ⬜ 🟩 (+12 more)
check-dynamic-deps	27m	🟩 🟩 🟩 🟩 🟩 (+9 more)
general-lints	20m	🟩 🟩 ⬜ 🟩 🟩 (+6 more)
cli-e2e-tests / run-cli-tests	17m	🟩 🟩 🟩
semgrep/ci	6m	🟩 🟩 🟩 🟩 🟩 (+9 more)
node-api-compatibility-tests / node-api-compatibility-tests	3m	🟩 🟩 🟩
file_change_determinator	2m	🟩 🟩 🟩 🟩 🟩 (+7 more)
file_change_determinator	2m	🟩 🟩 🟩 ⬜ 🟩 (+8 more)
permission-check	56s	🟩 🟩 🟩 🟩 🟩 (+9 more)
permission-check	46s	🟩 🟩 🟩 🟩 🟩 (+9 more)
permission-check	44s	🟩 🟩 🟩 🟩 🟩 (+9 more)
permission-check	43s	🟩 🟩 🟩 🟩 🟩 (+9 more)
file_change_determinator	37s	🟩 🟩 🟩
execution-performance / file_change_determinator	25s	🟩 🟩 🟩
determine-docker-build-metadata	16s	🟩 🟩 🟩
permission-check	12s	🟩 🟩 🟩

_{settings ⋅ feedback ⋅ docs ⋅ learn more about trunk.io}

alinush

Be sure to run ./scripts/rust_lint.sh since, judging from the authenticator.rs changes, I think you might've linted with an older cargo or rustc...

types/src/transaction/authenticator.rs

…G1Bytes, and G2Bytes so that things serialize as hex when using a human-readable target format. Add tests for the above and for Pepper.

…om:aptos-labs/aptos-core into rex/add_epk_and_pepper_deserialization_hex

types/src/keyless/bn254_circom.rs

types/src/keyless/mod.rs

types/src/keyless/bn254_circom.rs

types/src/keyless/mod.rs

types/src/transaction/authenticator.rs

types/src/unit_tests/keyless_serialization_test.rs

…zation. Add tests for G1Bytes and G2Bytes, and do length sanity checks during tests.

…om:aptos-labs/aptos-core into rex/add_epk_and_pepper_deserialization_hex

github-actions · 2024-03-01T04:30:03Z

✅ Forge suite `compat` success on `aptos-node-v1.9.5` ==> `14a109eccfc254fb23e11cba997f564efd4bc834`

Compatibility test results for aptos-node-v1.9.5 ==> 14a109eccfc254fb23e11cba997f564efd4bc834 (PR)
1. Check liveness of validators at old version: aptos-node-v1.9.5
compatibility::simple-validator-upgrade::liveness-check : committed: 5430 txn/s, latency: 5957 ms, (p50: 4900 ms, p90: 9600 ms, p99: 14600 ms), latency samples: 206360
2. Upgrading first Validator to new version: 14a109eccfc254fb23e11cba997f564efd4bc834
compatibility::simple-validator-upgrade::single-validator-upgrade : committed: 1137 txn/s, latency: 25005 ms, (p50: 26800 ms, p90: 35300 ms, p99: 36800 ms), latency samples: 56880
3. Upgrading rest of first batch to new version: 14a109eccfc254fb23e11cba997f564efd4bc834
compatibility::simple-validator-upgrade::half-validator-upgrade : committed: 457 txn/s, submitted: 681 txn/s, expired: 223 txn/s, latency: 25278 ms, (p50: 18300 ms, p90: 48300 ms, p99: 57200 ms), latency samples: 43486
4. upgrading second batch to new version: 14a109eccfc254fb23e11cba997f564efd4bc834
compatibility::simple-validator-upgrade::rest-validator-upgrade : committed: 2142 txn/s, latency: 13203 ms, (p50: 13900 ms, p90: 16300 ms, p99: 18400 ms), latency samples: 102840
5. check swarm health
Compatibility test for aptos-node-v1.9.5 ==> 14a109eccfc254fb23e11cba997f564efd4bc834 passed
Test Ok

github-actions · 2024-03-01T04:31:16Z

✅ Forge suite `realistic_env_max_load` success on `14a109eccfc254fb23e11cba997f564efd4bc834`

two traffics test: inner traffic : committed: 7494 txn/s, latency: 5244 ms, (p50: 5000 ms, p90: 6300 ms, p99: 12500 ms), latency samples: 3229940
two traffics test : committed: 100 txn/s, latency: 1796 ms, (p50: 1700 ms, p90: 2000 ms, p99: 5200 ms), latency samples: 1680
Latency breakdown for phase 0: ["QsBatchToPos: max: 0.255, avg: 0.207", "QsPosToProposal: max: 0.349, avg: 0.271", "ConsensusProposalToOrdered: max: 0.469, avg: 0.433", "ConsensusOrderedToCommit: max: 0.319, avg: 0.297", "ConsensusProposalToCommit: max: 0.750, avg: 0.730"]
Max round gap was 1 [limit 4] at version 1517828. Max no progress secs was 3.9664931 [limit 15] at version 1517828.
Test Ok

… Groth16ZkpAndStatement, G1Bytes, and G2Bytes, which output hex when used to serialize json (#12295) * Expose G1Bytes and G2Bytes * Expose g{1,2}_projective_str_to_affine * Expose g{1,2}_projective_str_to_affine * Rename jwk method * typo * Add custom Serialize/Deserialize impl for EphemeralPublicKey and Pepper so that serde_json serializes as hex, while bcs still serializes normally * rust fmt * Lint fixes * Add custom serialization/deserialization for Groth16ZkpAndStatement, G1Bytes, and G2Bytes so that things serialize as hex when using a human-readable target format. Add tests for the above and for Pepper. * rust linter corrections * Add copyright * Remove to_hex and from_hex, and don't panic on unsuccessful deserialization. Add tests for G1Bytes and G2Bytes, and do length sanity checks during tests. * remove from_hex and to_hex from EphemeralPublicKey

* Add custom Serialize/Deserialize impl for EphemeralPublicKey, Pepper, Groth16ZkpAndStatement, G1Bytes, and G2Bytes, which output hex when used to serialize json (#12295) * e2e Move tests for keyless + feature gating (#12296) * add support for passkey-based EPKs & merge non-malleability signature into ephemeral signature (#12333) Co-authored-by: Rex Fernando <[email protected]>

rex1fernando added 9 commits February 22, 2024 01:30

Expose G1Bytes and G2Bytes

e09650c

Expose g{1,2}_projective_str_to_affine

f39979d

Expose g{1,2}_projective_str_to_affine

c991866

Rename jwk method

7ea5e55

Merge branch 'main' into rex/merge-prover-server

273f67b

Merge branch 'main' into rex/merge-prover-server

b02d992

typo

1f0eacb

Add custom Serialize/Deserialize impl for EphemeralPublicKey and Pepp…

563d51d

…er so that serde_json serializes as hex, while bcs still serializes normally

Merge branch 'main' into rex/add_epk_and_pepper_deserialization_hex

fe37589

rex1fernando requested a review from heliuchuan February 29, 2024 03:47

rex1fernando requested review from alinush and mstraka100 as code owners February 29, 2024 03:47

rex1fernando added 2 commits February 28, 2024 19:47

Merge branch 'main' into rex/add_epk_and_pepper_deserialization_hex

8f48e7f

rust fmt

0bef2df

alinush approved these changes Feb 29, 2024

View reviewed changes

Lint fixes

9fac461

rex1fernando requested a review from gregnazario February 29, 2024 06:08

heliuchuan reviewed Feb 29, 2024

View reviewed changes

types/src/transaction/authenticator.rs Show resolved Hide resolved

heliuchuan approved these changes Feb 29, 2024

View reviewed changes

Add custom serialization/deserialization for Groth16ZkpAndStatement, …

5fdff74

…G1Bytes, and G2Bytes so that things serialize as hex when using a human-readable target format. Add tests for the above and for Pepper.

rex1fernando added 4 commits February 29, 2024 16:02

rust linter corrections

4adf7bd

Merge branch 'main' into rex/add_epk_and_pepper_deserialization_hex

b8baf87

Add copyright

715f9ea

Merge branch 'rex/add_epk_and_pepper_deserialization_hex' of github.c…

e976d47

…om:aptos-labs/aptos-core into rex/add_epk_and_pepper_deserialization_hex

rex1fernando enabled auto-merge (squash) March 1, 2024 00:57

This comment has been minimized.

Sign in to view

rex1fernando disabled auto-merge March 1, 2024 01:25