Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Evm Integration and integration script #107

Merged
merged 38 commits into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from 37 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
84c4346
Array -> [u8;20]
ryardley Sep 23, 2024
d9f6774
Merge branch 'ry/evm_event_massage-remove_address' into connect_evm
ryardley Sep 23, 2024
7e95860
[u8;20] -> String
ryardley Sep 23, 2024
8a8ecad
Setup evm events
ryardley Sep 23, 2024
e9d0d7a
Remove Committee Requested event
ryardley Sep 23, 2024
54d60ff
Setup evm events E3Requested and CiphernodeAdded
ryardley Sep 23, 2024
2475c63
Supply events to listen with
ryardley Sep 23, 2024
6e0874f
Use shortcut
ryardley Sep 23, 2024
abe4c7d
Update for e2e test
ryardley Sep 24, 2024
1af271a
e2e test sharing keys and saving
ryardley Sep 24, 2024
54de815
Update formatting
ryardley Sep 24, 2024
4699adc
Public Key Writer Working
ryardley Sep 24, 2024
9509146
Write pubkey to screen and file
ryardley Sep 24, 2024
082c3a4
attempt to load pubkey
ryardley Sep 24, 2024
64d44c6
Merge branch 'main' into connect_evm
ryardley Sep 24, 2024
dbfa41b
Update script
ryardley Sep 24, 2024
1551323
tworks
ryardley Sep 24, 2024
b4524de
Remove console
ryardley Sep 24, 2024
21efe3f
script tweaks, deploy tweak for testing
samepant Sep 24, 2024
d76a882
Tidy up test script
ryardley Sep 25, 2024
f9662b1
Add to CI
ryardley Sep 25, 2024
b07b1b9
Use rust 1.81
ryardley Sep 25, 2024
ae0da9c
Ensure bash
ryardley Sep 25, 2024
30d1b37
Remove frozen
ryardley Sep 25, 2024
896f187
Use --data-file over --data
ryardley Sep 26, 2024
e1237ff
Merge branch 'main' into connect_evm
ryardley Sep 26, 2024
8845ded
formatting
ryardley Sep 26, 2024
077049a
Rename file
ryardley Sep 26, 2024
f94252b
Apply code rabbit suggestions
ryardley Sep 26, 2024
a08755d
exit if not run from root
ryardley Sep 26, 2024
d80957d
Add waiton and decrease the use of sleep
ryardley Sep 26, 2024
d1b13a4
Tidy up cleanup trap in bash file
ryardley Sep 26, 2024
b205e6d
Remove cd inline in script
ryardley Sep 26, 2024
8bceba9
Add timeout to wait on
ryardley Sep 26, 2024
7a67578
Make timeout 10 min
ryardley Sep 26, 2024
f5ccc4f
Use version 2 rust toolchain
ryardley Sep 26, 2024
d0b7580
Revert bad suggestion from coderabbit
ryardley Sep 26, 2024
a8217cd
Architecture fixes (#114)
ryardley Sep 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 69 additions & 0 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
name: "INTEGRATION"

env:
HARDHAT_VAR_MNEMONIC: "test test test test test test test test test test test junk"
HARDHAT_VAR_INFURA_API_KEY: "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
# Uncomment the following lines to set your configuration variables using
# GitHub secrets (https://docs.github.com/en/actions/security-guides/using-secrets-in-github-actions)
#
# HARDHAT_VAR_MNEMONIC: ${{ secrets.Mnemonic }}
# HARDHAT_VAR_INFURA_API_KEY: ${{ secrets.InfuraApiKey }}
# HARDHAT_VAR_ARBISCAN_API_KEY: ${{ secrets.ArbiscanApiKey }}
# HARDHAT_VAR_BSCSCAN_API_KEY: ${{ secrets.BscscanApiKey }}
# HARDHAT_VAR_ETHERSCAN_API_KEY: ${{ secrets.EtherscanApiKey }}
# HARDHAT_VAR_OPTIMISM_API_KEY: ${{ secrets.OptimismApiKey }}
# HARDHAT_VAR_POLYGONSCAN_API_KEY: ${{ secrets.PolygonscanApiKey }}
# HARDHAT_VAR_SNOWTRACE_API_KEY: ${{ secrets.SnowtraceApiKey }}
ryardley marked this conversation as resolved.
Show resolved Hide resolved

on:
workflow_dispatch:
pull_request:
push:
branches:
- main

jobs:
ci:
runs-on: "ubuntu-latest"
steps:
- name: "Check out the repo"
uses: "actions/checkout@v4"

- name: "Setup node"
uses: actions/setup-node@v2
with:
node-version: 20

- name: Install Rust 1.81.0
uses: actions-rs/toolchain@v1
with:
toolchain: 1.81.0
override: true

- name: Cache node modules
uses: actions/cache@v2
with:
path: "**/node_modules"
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
ryardley marked this conversation as resolved.
Show resolved Hide resolved

- name: "Install the dependencies"
run: "yarn install"

- name: "Lint the code"
run: "yarn lint"

- name: "Add lint summary"
run: |
echo "## Lint results" >> $GITHUB_STEP_SUMMARY
echo "✅ Passed" >> $GITHUB_STEP_SUMMARY
- name: "Compile the contracts and generate the TypeChain bindings"
run: "yarn typechain"

- name: "Test the contracts and generate the coverage report"
run: "yarn test:integration"

- name: "Add test summary"
run: |
echo "## Test results" >> $GITHUB_STEP_SUMMARY
echo "✅ Passed" >> $GITHUB_STEP_SUMMARY
ryardley marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions .github/workflows/rust-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Install latest stable Rust
- name: Install Rust 1.81.0
uses: actions-rs/toolchain@v1
ryardley marked this conversation as resolved.
Show resolved Hide resolved
with:
toolchain: stable
toolchain: 1.81.0
override: true

- name: Run tests
Expand Down
11 changes: 11 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,21 @@
"lint": "yarn evm:lint",
"typechain": "yarn evm:typechain",
"test": "yarn evm:test && yarn ciphernode:test",
"test:integration": "./tests/basic_integration/test.sh",
"coverage": "yarn evm:coverage",
"ciphernode:launch": "cd packages/ciphernode && ./scripts/launch.sh",
ryardley marked this conversation as resolved.
Show resolved Hide resolved
"ciphernode:add": "cd packages/evm && yarn ciphernode:add",
"ciphernode:remove": "cd packages/evm && yarn ciphernode:remove",
ryardley marked this conversation as resolved.
Show resolved Hide resolved
"ciphernode:aggregator": "cd packages/ciphernode && ./scripts/aggregator.sh",
"ciphernode:test": "cd packages/ciphernode && cargo test",
"ciphernode:build": "cd packages/ciphernode && cargo build --release",
"committee:new": "cd packages/evm && yarn committee:new",
"committee:publish": "cd packages/evm && yarn hardhat committee:publish",
"e3:activate": "cd packages/evm && yarn hardhat e3:activate",
"e3:publishInput": "cd packages/evm && yarn hardhat e3:publishInput",
"e3:publishCiphertext": "cd packages/evm && yarn hardhat e3:publishCiphertext",
"evm:install": "cd packages/evm && yarn install",
"evm:node": "cd packages/evm && yarn hardhat node",
"evm:compile": "cd packages/evm && yarn compile",
"evm:lint": "cd packages/evm && yarn lint",
"evm:typechain": "cd packages/evm && yarn typechain",
Expand Down
Loading
Loading