Skip to content

Commit

Permalink
chore: prepare release (#52)
Browse files Browse the repository at this point in the history
* chore: prepare release

Signed-off-by: Thomas Chataigner <[email protected]>

* chore: Re-generate fixtures and update VKs

---------

Signed-off-by: Thomas Chataigner <[email protected]>
Co-authored-by: wwared <[email protected]>
  • Loading branch information
tchataigner and wwared authored Jun 25, 2024
1 parent 8df5b18 commit 4282d3a
Show file tree
Hide file tree
Showing 16 changed files with 60 additions and 56 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bump-version-PR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:

# The `release/1.0` branch is always truncated, so that patch version merges still are valid Semver
# However, when we make the initial `release/1.0` version bump, we include the full `1.0.0` in `Cargo.toml`
# and the release for clarity
# and the release for clarity
- name: Set branches
run: |
BASE_VERSION_SHORT=$(echo "${{ inputs.version }}" | cut -d'.' -f1-2)
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/tag-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,12 @@ jobs:
VERSION=$(echo "${{ github.event.pull_request.head.ref }}" | cut -d'/' -f 2)
RELEASE_BRANCH="${{ startsWith(github.event.pull_request.head.ref, 'release/') && github.event.pull_request.head.ref || github.event.pull_request.base.ref }}"
git tag -a $VERSION -m "$VERSION" $RELEASE_BRANCH
git push origin $VERSION -f
if [[ "${{ startsWith(github.event.pull_request.head.ref, 'release/') }}" == "true" ]]; then
VERSION="${VERSION}.0"
fi
git tag -a $VERSION -m "$VERSION" origin/$RELEASE_BRANCH
git push origin $VERSION --follow-tags
echo "version=$VERSION" | tee -a "$GITHUB_OUTPUT"
echo "RELEASE_BRANCH=$RELEASE_BRANCH" | tee -a "$GITHUB_ENV"
Expand Down
46 changes: 23 additions & 23 deletions aptos/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions aptos/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ sha2 = "0.9"
thiserror = "1.0.58"
tiny-keccak = "2.0.2"
url = "2.5.0"
sphinx-derive = { git = "ssh://[email protected]/lurk-lab/sphinx", branch = "dev" }
sphinx-sdk = { git = "ssh://[email protected]/lurk-lab/sphinx", branch = "dev", features = ["plonk"] }
sphinx-zkvm = { git = "ssh://[email protected]/lurk-lab/sphinx", branch = "dev" }
sphinx-helper = { git = "ssh://[email protected]/lurk-lab/sphinx", branch = "dev" }
sphinx-prover = { git = "ssh://[email protected]/lurk-lab/sphinx", branch = "dev" }
sphinx-derive = { git = "ssh://[email protected]/lurk-lab/sphinx", tag = "v1.0.0" }
sphinx-sdk = { git = "ssh://[email protected]/lurk-lab/sphinx", tag = "v1.0.0", features = ["plonk"] }
sphinx-zkvm = { git = "ssh://[email protected]/lurk-lab/sphinx", tag = "v1.0.0" }
sphinx-helper = { git = "ssh://[email protected]/lurk-lab/sphinx", tag = "v1.0.0" }
sphinx-prover = { git = "ssh://[email protected]/lurk-lab/sphinx", tag = "v1.0.0" }
tokio = "1.37"
tokio-stream = "0.1"

Expand Down
Binary file not shown.
Binary file modified aptos/aptos-programs/artifacts/epoch-change-program
Binary file not shown.
Binary file modified aptos/aptos-programs/artifacts/inclusion-program
Binary file not shown.
4 changes: 2 additions & 2 deletions aptos/docs/src/design/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ to some account needs to be validated.
The current Verifying Key Hashes which uniquely identify the specific RISC-V binaries for the proof programs, located in the
[`aptos/aptos-programs/artifacts/`](https://github.com/lurk-lab/zk-light-clients/tree/dev/aptos/aptos-programs/artifacts)
directory are:
* `epoch_change`: `0x002db5b71161ed07ff1acb4e581a528b17c04eb925bcca913729def81d66f460`
* `inclusion`: `0x001847dcc9b3d153f9d56a099f10436270fa265b84a7dc833485c382053b557f`
* `epoch_change`: `0x00eea0650222f7e5bb6a2fe57c0e0e504d1df8b3d848d5116174a8703d228c94`
* `inclusion`: `0x00577bdce64983ba592ae451a43bf8bd57cc5f814df02e0ff0e2bb1c3c7c5af2`

These values are also present in and used by the [solidity fixtures](../benchmark/on_chain.md).
12 changes: 6 additions & 6 deletions aptos/programs/benchmarks/signature-verification/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions aptos/programs/benchmarks/signature-verification/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ edition = "2021"

[dependencies]
aptos-lc-core = { path = "../../../core", package = "aptos-lc-core", default-features = false }
sphinx-derive = { git = "ssh://[email protected]/lurk-lab/sphinx", branch = "dev" }
sphinx-zkvm = { git = "ssh://[email protected]/lurk-lab/sphinx", branch = "dev" }
sphinx-derive = { git = "ssh://[email protected]/lurk-lab/sphinx", tag = "v1.0.0" }
sphinx-zkvm = { git = "ssh://[email protected]/lurk-lab/sphinx", tag = "v1.0.0" }

[patch.crates-io]
# Sphinx patch
Expand Down
8 changes: 4 additions & 4 deletions aptos/programs/epoch-change/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion aptos/programs/epoch-change/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"

[dependencies]
aptos-lc-core = { path = "../../core", package = "aptos-lc-core", default-features = false }
sphinx-zkvm = { git = "ssh://[email protected]/lurk-lab/sphinx", branch = "dev" }
sphinx-zkvm = { git = "ssh://[email protected]/lurk-lab/sphinx", tag = "v1.0.0" }

[patch.crates-io]
# Sphinx patch
Expand Down
8 changes: 4 additions & 4 deletions aptos/programs/inclusion/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion aptos/programs/inclusion/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"

[dependencies]
aptos-lc-core = { path = "../../core", package = "aptos-lc-core", default-features = false }
sphinx-zkvm = { git = "ssh://[email protected]/lurk-lab/sphinx", branch = "dev" }
sphinx-zkvm = { git = "ssh://[email protected]/lurk-lab/sphinx", tag = "v1.0.0" }

[patch.crates-io]
# Sphinx patch
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"vkey": "0x002db5b71161ed07ff1acb4e581a528b17c04eb925bcca913729def81d66f460",
"vkey": "0x00eea0650222f7e5bb6a2fe57c0e0e504d1df8b3d848d5116174a8703d228c94",
"publicValues": "0x205829098a4c0273312e8bc4fdbde28fc12abdc540c88bdd9abeef0a85d706ecc071f215064bfe6f1c24295135199ce6f6dec2974115fad50989e666915453ad",
"proof": "0x2639e9597ac0378e4654b2688b9aa7b8ae0948090b1c1e9a1382da359b297d5e25f32ac0c4a131f9cb1073ceb9415ac3cf26cf521111aba08960defefbc5f1e802ba6e933995f3e03b61f8d73d5759234f2d1eac2fb6f4626b7fc8501af13ae10400eba1741a93df3deee459e79ce32f7feae9a0aeed6e91f165a6be176c7f7112f44863d7153af8682188e11c98efed4664c8acd8866a231d4b62d1c6533d0300885456cbe77421872213184c46eb35caab028d25ec6287f0c2e2399fac529407fda58941bf97a6b66a54b4ead0e772bddfafc707d0d3ada6f60e58b13597770446484ce719f269a20e52019bc1e6856af9a84f295aef576515f089c6f308452ff9c7b6cce578ddcf76003aba12f38f048200c6b0438bd619e5af6b0aeb9fae191ff3e04813ad553795e4f1568fbb5203c39516c1629d9f3826ce4d134c7bc41940ddb366cbb40aa9a9d52160536b69a45f42749ebb133a80cf982a1162efc124c707783676b81331d16762001c48932a292066a90804e4ab7aef1c5578660903d70e36ff4c56ee7e83d8fa73011ea854c1dc1a078bafe30ce6eab765c862d70e49232480c73fbac1e1a993532c631549c7bf5fa9096e5feabeeae586ca3eb216245fde9c5869f91926686f7f5a1c33ed9dec7fc48cd69db28be917938e73500a234685cad8fa1cdce7e0e285c273e587ddac2f741e46b57bd9d283d88cb9d814eadcea70db58915459be8ac0d1e3d54f74d7ce453d9a2c7b978c28ba55ff371a47a22f7929bc920ba7ed4f54a1d7cf9206f435ec5170398eed5d4c7125e47323ec8897726dea044c23b2aaeb2c1e5af859ec994e24989a8b75eaa51099824f2344de6a4b9de108181d81c062c6ff18b15cd21612fff932ace1fee2fa55efdf0bf2d254c1e691db76fe0a2637955467eb21a53173e5ba38b30c2f34de84d968190b15476587e3f88b5733b4b79a7f8033d17b21cdabd25cbceec4f86657bf952373b7f7833bffd0093394bc0ab5597e2bb5bfc7ad3c90045d5bd605653744ab0f3b9d8aba596d0e98ea6e568ea5d4a6116ca9fade7d62e9f30ebd944fb06629115d482c5c7c4f13d5d72c00ad180265a5d9fc38cdcd99c8a1da492b5c54d220184e23f682e14b6d1a898f31d33ac5bc5b2a4d62e7495c5bc739333ee0881cce1781421cdda7972e5c30a98ef23345e9bfe97cf08ecdf8a468674d05f05ffd35"
"proof": "0x16536f25d0b8df778db5fc2a8aecff55863b9fb148bb99a00b8ecda8439098641d3354e32267a8501c25a399e72e9fd55dfc3cb19b12436751126986027af985105be2085b1e9512b5051b94c272143efc056bf8f2af175a196d70e1cf805baa1c475b29413224ac4aba2e8d8816f13dab4de1d34f69d671e75f7ab5aaa331ed04b203da2f9da209a1a5f2711682dc5f38f69775641a18ef74edf0ec333fb5030c322b15a953f0df182c98fe6fbab369800112b9923f69f27fa7833c59dfa2381e0ff8d0230d8f2003c49377f51367ecf158a8b85387ccb3803ac23e9fa14a84232c6da02d579b00b5fd74f38e6ef6b265cd62ee176557bc8d678596a5b7bb080eb301934e92ff7a45ea7630aac61e0d4ed582491cd3d12d2a2457543f4eee03038e88c5d0af0cef9a3fd4754fd97dba290c08173ae5513724d6aa70cec0a77714debe504d1c068644194b88248ca1cc80156ef403916ff576ee649870e5dce726796a12d4760588a398e019f1c7ad405580e82cd6bf7630d98c1d07b4c41c0c21ed66a0c0f26bd3c6a7746ed7445e644baac76ed6dfbf40c6d56460f56b97cf1ab3741a663b8517c204302c9bd2ce6c34695474484068350c763e372ccf9bc62917d036675b6684919b0bc458dae9f2c03fb8bf1059e85e99188268f1f1fd7e2a889bc9945036e63a3b83f77bb22da5c2057bba9549d7d0cffb1419cb7636c429c89319dcde6c8dc69fb5b9577d4ffca4e0b557d7a885f7af32075c67cc4413263033469f472231c2e6b2e8520e66c8f38744ee4cccb2948661dae364e1d749044202e7166a3d080faac8a404560fcc93553e180d5655b08d20341b89c2187c2e178fd065064fc7a6ef133c88648562ffc4cd18b97e689e06e59ad41672bb922c1778db85f5a498ab09ceb79664f3861f7174012cf9aa79d6d5bbe097c2bb5012092921367f888f00089cd8ad94daa1897d12e15dae4b17adf724762ad425f21645a27f36cf74031942cae24f7e138322e3a4e10bfccc5efd327315ef42a1f2194d3c8943b2fe3453a44003088d76202f5e4e8f434a8a72929d4ab66accef621b16bcd52a4b159660dc015a80887efe73d6a2dce89fd7bb2edae794a2d9c45a1fd380c345114059044001cd15001fd7e81040b4d25f8af0edbd73c62987a9a30e43624946ef6a83898c5530787b6bc30285c019133f3599baba3f55252d7ba9"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"vkey": "0x001847dcc9b3d153f9d56a099f10436270fa265b84a7dc833485c382053b557f",
"publicValues": "0x205829098a4c0273312e8bc4fdbde28fc12abdc540c88bdd9abeef0a85d706ecc83b460f2b5e5e9356d2e426e26c79980f49ccf65e91a7f5db6fb906601758c6",
"proof": "0x1232fed0cee49c628d83551ac3f6f7bf7f23b153d3e994320f85860b7ceb13d104a009abae398b73dafdcd6dc0e478faf61a70a5088776d24f7dc16e0092c4be00c49e346c82bb59bbd1e9a859ecb40feffeee099820d1b697f9a05bbe2510031f785a226d12d7238273705b2fe1f33f902dfa31bddd9733b320deb57b86c1bb047bd65e4a9d192fb80e479e01c53299449ac331ad17393603ec56e2347e9083260d4ff50b887024b46e38def63dc7f67dad5eb2f024ae33da16801eb328a50310d6c9a02a19460b33b6b2621ab7edcac664ee6c97b944b125cb972a94c4f8ba2d1f6e891068ca46b6ccc8d352a8a069aee494302f85511f2934b8994634bcc22dc0b7ed50eeefd5a747608a68c318de8b69810728d161b316d6369bc576af2f2bdfaf70a5fe496dcc141da578c46720de35c324d91173885bb00e645133a35716f65f18f8ba07901f33e2e3c1fd86214334d413f8ce8cf3983e301f4647b609082494fb68929c5263014645f8869891e40116ecd421703db69be44431df2fb806ec262e80dc2988e4a233a90b39b65b641ce81aadfa935ba71329942d1f38410e7405749106f317e9b4acbfdb35236acde217cb3d6c154088178a2826edc4c1271f4e5c6e068700bced3e26e4af2f1348ce64eb588461af951c68e8a096487d0b9cffd730c38d6bc2c5980f2e1563ae0728d47757d6ad86f76fbd85fd33c6bf05869d7ce10416933c8824de3c207d7b894c3439692ca5e8bd8553c0dbb7242f04cbcc9df825173dfe2730431fb893a9c2c9f7164988e8404f02a8e94274c3591abb0ede0ac853f18013395d397cb7fcb5b47dc2d79792c0bc59446510c8a54610585d06ff281668f0a5c52c2fa8e95fce6fea2ddb747f768e2542783efd361a1ee79d28e5efbb73d1ceda1e53d74d4d4189a0403b29d79563ab79640eeb5e530f5df4c4fea7150861910283bbea588532383505fb8489131ae320599bd3bbf60064a7e080207d89c5b6fa4838e721046ab4cb077036a105c5aea01d3991b62d1efb092a1b7dfc371ed25d0f0e0828284a643e36d3427ca34f2504327f5fe6f80e966ceacbc71f9d86c06f0ba79d71bdadf71d15e090e5546b4e8c195f9c5f281603412cfec0014662d3a1a5583efb59ae7660ce22be232619437672a002ba0405d0740c579d0fbab32734be6c43e6c8beb5c037f0ed351292b89172fd3e7ce3"
"vkey": "0x00577bdce64983ba592ae451a43bf8bd57cc5f814df02e0ff0e2bb1c3c7c5af2",
"publicValues": "0x205829098a4c0273312e8bc4fdbde28fc12abdc540c88bdd9abeef0a85d706ecc18c75854fc4b66a58dda3fd0ce5f839169d6af3375a33db32f96228ced033f3",
"proof": "0x064dff4b8e0f3606fd62691004e6da826916e1d306de9a3a6ec42e590f633dab2d8f4f35acdbf1c96df65817378d22559c807ee5865dcc7cb3f94992ad1e0af02f295558989b14cb713b33dcc8f5e9ce5afcf057f1cd6cb58ef1ed9c60b2b4730c64d4db30cd58b43176e75cb03bafd0c5e39cbea24e0aca3fc155bf6a7f8743122a885af3f58dddd63711db8f596dac53453704ceaf50a66fa505d8db98422422b4c6a11d32f7df896b0710f2a9c5b22dca8775fdc4aa952c7c77945c658b0b25f20098e2a8830f9d37c39a9932d639da7af7b8509829764a7959fc6ffc0c1707c6dea4f3207a71b39fea221f44e96f657a253acb67161ca317b64f5bc6ce1423de2d99b6e5741a95fcc6fa5042f9bc8bd4d5eb255f64fc1ca3fa7ff63cf278108167c677871fcb0cf27b57759dd685842dd78605b27c079579d518fdb85f532f29d116324372b3deecab80cdd739d021099fae9da7781a4b196dbe2386aaad1b1cb1286459be415298c7f2bf589e688b0b560d71eb7778165e48c5b89cad601ac255a5df7013689a15a96f1a30fd2cdb0175af281633fd263c452e5cd8b4be159d295d7845ffd62ecc204586b0d401fa4535d3abf5d665427e1cd38ecf6037016d3ba0780df154e287e61bb44e0cf49c36f41379ff7dd0d477f3ed2d9c8095029536f4d5f6485e31ebaae3e53682097c1b7d05dac5c17fb24082d900b95ef4140b7bdc730639c805e957c14c3218153dfe9644f4e81eb664cadded900c574d1898b07936470c4b45434fc62a893c111e8e50f85af6a8816b07dd64fd9875d122db4fc44ce9fb6b1bbfa3aca904180af186b207602ef590b964b9cd6131c434248e0eb84b2a1a62dd45e0c401fae8a6d73a6f320b7fb0019dbab63f791416310f0fbcfec55f8ddf5957171d7d3b81f81bf06c15b50cbc4c01d37471ba8f99c71abd61811de7f3c3d70acc092b32bc531a8125b2e6aa9fdbdd8fdbc5d5c8e14708ddcfd0cacfd9d6e49f5d9b620833c9f6fce4d607d710751d164ba41e62601614eba8b75dc887c488dd9fd03c88d04801c3ee9a4dec538194edfc34d94596010abaddacb42e65b4a02011311585fa81e3014a5982ead2da7d873d427eae18bc2cad270545015a5d8c93b205195615d9e8889847139d5bc4f992792a4ee05142175f22aac173d381adf575965f1780e11527cbee013166d8e2cfcc2ce231d97b"
}

0 comments on commit 4282d3a

Please sign in to comment.