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.

Sign up for GitHub

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

Jump to bottom

chore(ci): rename repos and tags #163

Closed
wants to merge 1 commit into from
Closed

chore(ci): rename repos and tags #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# TFHE_RS_VERSION=0.2.1
# TFHE_RS_PATH=../tfhe-rs
# ZBC_DEVELOPMENT_PATH=../zbc-development
# ZBC_SOLIDITY_PATH=../zbc-solidity
# ZBC_FHE_TOOL_PATH=../zbc-fhe-tool
# ZBC_SOLIDITY_PATH=../fhevm-solidity
# ZBC_FHE_TOOL_PATH=../fhevm-tfhe-cli
#LOCAL_BUILD=false
LOCAL_BUILD=true
GOPRIVATE=github.com/zama-ai/*
18 changes: 9 additions & 9 deletions .github/workflows/ci_e2e_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ jobs:
path: ./evmos/work_dir/zbc-development
ref: ${{ env.ZBC_DEVELOPMENT_VERSION }}

- name: Checkout zbc-solidity
- name: Checkout fhevm-solidity
uses: actions/checkout@v3
with:
repository: zama-ai/zbc-solidity
repository: zama-ai/fhevm-solidity
token: ${{ secrets.CONCRETE_ACTIONS_TOKEN }}
path: ./evmos/work_dir/zbc-solidity
path: ./evmos/work_dir/fhevm-solidity
ref: ${{ env.ZBC_SOLIDITY_VERSION }}

- name: Checkout tfhe-rs
Expand All @@ -72,12 +72,12 @@ jobs:
path: ./evmos/work_dir/tfhe-rs
ref: ${{ env.TFHE_RS_VERSION }}

- name: Checkout zbc-fhe-tool
- name: Checkout fhevm-tfhe-cli
uses: actions/checkout@v3
with:
repository: zama-ai/zbc-fhe-tool
repository: zama-ai/fhevm-tfhe-cli
token: ${{ secrets.CONCRETE_ACTIONS_TOKEN }}
path: ./evmos/work_dir/zbc-fhe-tool
path: ./evmos/work_dir/fhevm-tfhe-cli
ref: ${{ env.ZBC_FHE_TOOL_VERSION }}

- name: Checkout go-ethereum
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
docker images

- name: Install @openzeppelin/contracts
working-directory: evmos/work_dir/zbc-solidity
working-directory: evmos/work_dir/fhevm-solidity
run: |
npm install @openzeppelin/contracts

Expand All @@ -141,6 +141,6 @@ jobs:
run: |
ls ${{ github.workspace }}
ls work_dir
ls work_dir/zbc-fhe-tool
ls work_dir/zbc-fhe-tool/.git
ls work_dir/fhevm-tfhe-cli
ls work_dir/fhevm-tfhe-cli/.git
make e2e-test
14 changes: 7 additions & 7 deletions .github/workflows/deploy_full_node_aws.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ on:
required: true
default: "v9.1.0-zama"
type: string
ref_to_zbc_solidity:
description: 'Branch, tag or commit SHA1 to checkout zbc-solidity'
ref_to_fhevm_solidity:
description: 'Branch, tag or commit SHA1 to checkout fhevm-solidity'
required: true
default: "feature/CI-testing"
type: string
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
run: |
echo "ref_for_zbc_development: ${{ inputs.ref_for_zbc_development }}"
echo "ref_to_evmos: ${{ inputs.ref_to_evmos }}"
echo "ref_to_zbc_solidity: ${{ inputs.ref_to_zbc_solidity }}"
echo "ref_to_fhevm_solidity: ${{ inputs.ref_to_fhevm_solidity }}"
echo "evmos_node_tag: ${{ inputs.evmos_node_tag }}"
echo "clean: ${{ inputs.clean }}"

Expand All @@ -84,13 +84,13 @@ jobs:
path: zbc-development
ref: ${{ inputs.ref_for_zbc_development }}

- name: Checkout zbc-solidity
- name: Checkout fhevm-solidity
uses: actions/checkout@v3
with:
repository: zama-ai/zbc-solidity
repository: zama-ai/fhevm-solidity
token: ${{ secrets.CONCRETE_ACTIONS_TOKEN }}
path: zbc-solidity
ref: ${{ inputs.ref_to_zbc_solidity }}
path: fhevm-solidity
ref: ${{ inputs.ref_to_fhevm_solidity }}

- name: List files in the repository
run: |
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/deploy_validator_aws.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@ jobs:
run: |
echo "ZBC_SOLIDITY_VERSION: $ZBC_SOLIDITY_VERSION"

- name: Checkout zbc-solidity
- name: Checkout fhevm-solidity
uses: actions/checkout@v3
with:
repository: zama-ai/zbc-solidity
repository: zama-ai/fhevm-solidity
token: ${{ secrets.CONCRETE_ACTIONS_TOKEN }}
path: ./evmos/work_dir/zbc-solidity
path: ./evmos/work_dir/fhevm-solidity
ref: ${{ env.ZBC_SOLIDITY_VERSION }}

- name: List files in the repository
Expand Down Expand Up @@ -152,8 +152,8 @@ jobs:
run: |
sleep 10s

- name: List files in zbc-solidity
working-directory: evmos/work_dir/zbc-solidity
- name: List files in fhevm-solidity
working-directory: evmos/work_dir/fhevm-solidity
run: |
ls

Expand All @@ -166,17 +166,17 @@ jobs:
./scripts/upload_genesis.sh

- name: Prepare/download fhe keys
working-directory: evmos/work_dir/zbc-solidity
working-directory: evmos/work_dir/fhevm-solidity
run: |
./ci/scripts/prepare_fhe_keys_ci.sh

- name: Install @openzeppelin/contracts
working-directory: evmos/work_dir/zbc-solidity
working-directory: evmos/work_dir/fhevm-solidity
run: |
npm install @openzeppelin/contracts

- name: Run e2e test from zbc-solidty
if: ${{ inputs.run_test }}
working-directory: evmos/work_dir/zbc-solidity
working-directory: evmos/work_dir/fhevm-solidity
run: |
./ci/scripts/run_ERC20_ci_test.sh mykey1 ../../
24 changes: 12 additions & 12 deletions .github/workflows/run_e2e_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ on:
description: 'Oracle Db service image tag (default: latest)'
type: string
required: false
ref_to_zbc_solidity:
description: 'Branch, tag or commit SHA1 to checkout zbc-solidity'
ref_to_fhevm_solidity:
description: 'Branch, tag or commit SHA1 to checkout fhevm-solidity'
required: true
default: "feature/test-m1"
type: string
Expand All @@ -29,7 +29,7 @@ jobs:
run: |
echo "evmos_node_tag: ${{ inputs.evmos_node_tag }}"
echo "oracle_db_service_tag: ${{ inputs.oracle_db_service_tag }}"
echo "ref_to_zbc_solidity: ${{ inputs.ref_to_zbc_solidity }}"
echo "ref_to_fhevm_solidity: ${{ inputs.ref_to_fhevm_solidity }}"

- name: Install npm
run: |
Expand All @@ -48,13 +48,13 @@ jobs:
grep LOCAL_BUILD .env


- name: Checkout zbc-solidity
- name: Checkout fhevm-solidity
uses: actions/checkout@v3
with:
repository: zama-ai/zbc-solidity
repository: zama-ai/fhevm-solidity
token: ${{ secrets.CONCRETE_ACTIONS_TOKEN }}
path: ./evmos/work_dir/zbc-solidity
ref: ${{ inputs.ref_to_zbc_solidity }}
path: ./evmos/work_dir/fhevm-solidity
ref: ${{ inputs.ref_to_fhevm_solidity }}

- name: List files in the repository
run: |
Expand Down Expand Up @@ -126,22 +126,22 @@ jobs:
run: |
sleep 5s

- name: List files in zbc-solidity
working-directory: evmos/work_dir/zbc-solidity
- name: List files in fhevm-solidity
working-directory: evmos/work_dir/fhevm-solidity
run: |
ls

- name: Prepare/download fhe keys
working-directory: evmos/work_dir/zbc-solidity
working-directory: evmos/work_dir/fhevm-solidity
run: |
./ci/scripts/prepare_fhe_keys_ci.sh

- name: Install @openzeppelin/contracts
working-directory: evmos/work_dir/zbc-solidity
working-directory: evmos/work_dir/fhevm-solidity
run: |
npm install @openzeppelin/contracts

- name: Run e2e test from zbc-solidty
working-directory: evmos/work_dir/zbc-solidity
working-directory: evmos/work_dir/fhevm-solidity
run: |
./ci/scripts/run_ERC20_ci_test.sh mykey1 ../../
20 changes: 10 additions & 10 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ For e2e test:

| Name | Type | version |
| :-----------: | :--------: | :-----: |
| zbc-solidity | repository | v0.1.2 |
| zbc-fhe-tool | repository | v0.1.1 |
| fhevm-solidity | repository | v0.1.2 |
| fhevm-tfhe-cli | repository | v0.1.1 |
| zbc-oracle-db | repository | main |

## [v0.1.4]
Expand All @@ -86,8 +86,8 @@ For e2e test:

| Name | Type | version |
| :-----------: | :--------: | :-----: |
| zbc-solidity | repository | v0.1.1 |
| zbc-fhe-tool | repository | v0.1.1 |
| fhevm-solidity | repository | v0.1.1 |
| fhevm-tfhe-cli | repository | v0.1.1 |
| zbc-oracle-db | repository | main |

## [v0.1.3]
Expand All @@ -109,8 +109,8 @@ For e2e test:

| Name | Type | version |
| :-----------: | :--------: | :-----: |
| zbc-solidity | repository | v0.1.1 |
| zbc-fhe-tool | repository | v0.1.1 |
| fhevm-solidity | repository | v0.1.1 |
| fhevm-tfhe-cli | repository | v0.1.1 |
| zbc-oracle-db | repository | main |

## [v0.1.2]
Expand All @@ -130,8 +130,8 @@ For e2e test:

| Name | Type | version |
| :-----------: | :--------: | :-----: |
| zbc-solidity | repository | v0.1.0 |
| zbc-fhe-tool | repository | v0.1.0 |
| fhevm-solidity | repository | v0.1.0 |
| fhevm-tfhe-cli | repository | v0.1.0 |
| zbc-oracle-db | repository | main |


Expand All @@ -152,7 +152,7 @@ For e2e test:

| Name | Type | version |
| :-----------: | :--------: | :-----: |
| zbc-solidity | repository | v0.1.0 |
| zbc-fhe-tool | repository | v0.1.0 |
| fhevm-solidity | repository | v0.1.0 |
| fhevm-tfhe-cli | repository | v0.1.0 |
| zbc-oracle-db | repository | main |

8 changes: 4 additions & 4 deletions Development.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@
<summary>Custom repository</summary>

To use an existing repository please update the environment file **.env** with the path to it or export it:
```bash

Check failure on line 17 in Development.md

View workflow job for this annotation

GitHub Actions / Run markdown-lint 

Fenced code blocks should be surrounded by blank lines [Context: "```bash"]
export TFHE_RS_PATH=../tfhe-rs
```

Check failure on line 19 in Development.md

View workflow job for this annotation

GitHub Actions / Run markdown-lint 

Fenced code blocks should be surrounded by blank lines [Context: "```"]
</details>
<details>
<summary>Add it for me!</summary>
<br />

If you want to install it automatically, you can override the default tfhe-rs version by setting TFHE_RS_VERSION env variable and running:
```

Check failure on line 26 in Development.md

View workflow job for this annotation

GitHub Actions / Run markdown-lint 

Fenced code blocks should be surrounded by blank lines [Context: "```"]
export TFHE_RS_VERSION=0.2.4
make install-tfhe-rs
```

Check failure on line 29 in Development.md

View workflow job for this annotation

GitHub Actions / Run markdown-lint 

Fenced code blocks should be surrounded by blank lines [Context: "```"]
</details>
<br />

Expand All @@ -43,9 +43,9 @@
## Using docker

Here are the steps executed automatically:
- Build a base image (or retrieve it from ghcr.io) called __zama-zbc-build__.

Check failure on line 46 in Development.md

View workflow job for this annotation

GitHub Actions / Run markdown-lint 

Lists should be surrounded by blank lines [Context: "- Build a base image (or retri..."]


Check failure on line 48 in Development.md

View workflow job for this annotation

GitHub Actions / Run markdown-lint 

Multiple consecutive blank lines [Expected: 1; Actual: 2]
- Check tfhe-rs is available in TFHE_RS_PATH (default is work_dir/tfhe-rs)
- In any case the custom version or the cloned (TFHE_RS_VERSION) one is copied into work_dir/tfhe-rs
- Clone go-ethereum and ethermint to work_dir (version are parsed from go.mod to avoid handling ssh keys inside docker because those repositories are private)
Expand Down Expand Up @@ -88,7 +88,7 @@
<details>
<summary>Troubleshoot ghcr.io</summary>

Here is a tutorial on [how to manage ghcr.io access](https://github.com/zama-ai/zbc-fhe-tool#using-the-published-image-easiest-way).
Here is a tutorial on [how to manage ghcr.io access](https://github.com/zama-ai/fhevm-tfhe-cli#using-the-published-image-easiest-way).

If you get trouble to pull image from ghcri.io, one can build it locally with
```bash
Expand Down Expand Up @@ -129,11 +129,11 @@

This test will:
- check you have all the needed repositories
- zbc-fhe-tool
- zbc-solidity
- fhevm-tfhe-cli
- fhevm-solidity
- zbc-development
- init evmos node by calling /config/setup.sh file
- generate fhe keys using zbc-fhe-tool based on $(ZBC_DEVELOPMENT_PATH)/prepare_volumes_from_fhe_tool.sh script
- generate fhe keys using fhevm-tfhe-cli based on $(ZBC_DEVELOPMENT_PATH)/prepare_volumes_from_fhe_tool.sh script
- copy them at the right folder using $(ZBC_DEVELOPMENT_PATH)/prepare_demo_local.sh script
- start validator and oracle db using docker-compose/docker-compose.local.yml file
- run the e2e test
Expand Down
Loading
Loading