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

Hardcode docker version #134

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .solhint.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"rules": {
"mark-callable-contracts": "off",
"no-empty-blocks": "off",
"compiler-version": ["error", "0.8.17"],
"compiler-version": ["error", "0.8.20"],
"private-vars-leading-underscore": "error",
"bracket-align": "off",
"reason-string": "off",
Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"editor.formatOnSave": false,
"solidity.linter": "solhint",
"solidity.compileUsingRemoteVersion": "v0.8.17+commit.e14f2714"
"solidity.compileUsingRemoteVersion": "v0.8.20+commit.e14f2714",
"solidity.remappings": ["@openzeppelin/=node_modules/@openzeppelin"],
}
22 changes: 8 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# zkevm-contracts
# suppernets2-contracts

Smart contract implementation which will be used by the polygon-hermez zkevm
Smart contract implementation which will be used by Supernets2

[![Main CI](https://github.com/0xPolygonHermez/zkevm-contracts/actions/workflows/main.yml/badge.svg)](https://github.com/0xPolygonHermez/zkevm-contracts/actions/workflows/main.yml)
[![Main CI](https://github.com/0xPolygon/supernets2-contracts/actions/workflows/main.yml/badge.svg)](https://github.com/0xPolygon/supernets2-contracts/actions/workflows/main.yml)

## Note

Expand All @@ -15,11 +15,11 @@ Private keys and mnemonics contained in this repository are used for internal te

## Repository structure

- `contracts`: zkevm contracts
- `contracts`: supenrets2 contracts
- `PolygonZkEVMBridge.sol`: transfer assets between chains
- `PolygonZkEVMGlobalExitRoot.sol`: manage global exit root in L1
- `PolygonZkEVMGlobalExitRootL2.sol`: manage global exit root in L2
- `PolygonZkEVM.sol`: consensus algorithm used by polygon hermez zkevm
- `Supernets2.sol`: consensus algorithm used by supernets2
- `docs`: specs and useful links
- `test`: contracts tests

Expand Down Expand Up @@ -55,22 +55,16 @@ Autofix errors:
npm run lint:fix
```

## Deploy on hardhat

```
npm run deploy:ZkEVM:hardhat
```

## Build dockers

```
npm run docker:contracts
```

A new docker `hermez-geth1.3:latest` will be created
A new docker `hermeznetwork/geth-supernets2-contracts` will be created
This docker will contain a geth node with the deployed contracts
The deployment output can be found in: `docker/deploymentOutput/deploy_output.json`
To run the docker you can use: `docker run -p 8545:8545 hermez-geth1.3:latest`
To run the docker you can use: `docker run -p 8545:8545 hermeznetwork/geth-supernets2-contracts`

## Note

Expand All @@ -85,4 +79,4 @@ In order to test, the following private keys are being used. These keys are not

To verify that the smartcontracts of this repository are the same deployed on mainnet, you could follow the instructions described [document](verifyMainnetDeployment/verifyDeployment.md)

The smartcontract used to verify a proof, it's a generated contract from zkEVM Rom and Pil (constraints). To verify the deployment of this smartcontract you could follow the instructions described in this [document](verifyMainnetDeployment/verifyMainnetProofVerifier.md)
The smartcontract used to verify a proof, it's a generated contract from zkEVM Rom and Pil (constraints).
Binary file removed audits/Hexens_Polygon_zkEVM_PUBLIC_27.02.23.pdf
Binary file not shown.
Binary file removed audits/zkEVM-bridge-Spearbit-27-March.pdf
Binary file not shown.
4 changes: 2 additions & 2 deletions compiled-contracts/ERC20PermitMock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions compiled-contracts/FflonkVerifier.json

Large diffs are not rendered by default.

Loading