Skip to content

Commit

Permalink
chore: update solc in tests (#2897)
Browse files Browse the repository at this point in the history
## What ❔

Updates solc in tests

## Checklist

<!-- Check your PR fulfills the following items. -->
<!-- For draft PRs check the boxes as you complete them. -->

- [ ] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [ ] Tests for the changes have been added / updated.
- [ ] Documentation comments have been added / updated.
- [ ] Code has been formatted via `zk fmt` and `zk lint`.
  • Loading branch information
perekopskiy authored Sep 17, 2024
1 parent 80b37b2 commit c6e5e1c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-core-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ jobs:
- name: Initialize Contract verifier
run: |
ci_run zk_inception contract-verifier init --zksolc-version=v1.5.3 --zkvyper-version=v1.5.4 --solc-version=0.8.26 --vyper-version=v0.3.10 --era-vm-solc-version=0.8.18-1.0.1 --only --chain era
ci_run zk_inception contract-verifier init --zksolc-version=v1.5.3 --zkvyper-version=v1.5.4 --solc-version=0.8.26 --vyper-version=v0.3.10 --era-vm-solc-version=0.8.26-1.0.1 --only --chain era
ci_run zk_inception contract-verifier run --chain era &> ${{ env.SERVER_LOGS_DIR }}/contract-verifier-rollup.log &
- name: Run servers
Expand Down
7 changes: 5 additions & 2 deletions core/tests/ts-integration/hardhat.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,11 @@ export default {
}
},
solidity: {
version: '0.8.18',
eraVersion: '1.0.1'
version: '0.8.26',
eraVersion: '1.0.1',
settings: {
evmVersion: 'cancun'
}
},
vyper: {
version: '0.3.10'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const DATE_REGEX = /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{6})?/;

const ZKSOLC_VERSION = 'v1.5.3';
const SOLC_VERSION = '0.8.26';
const ZK_VM_SOLC_VERSION = 'zkVM-0.8.18-1.0.1';
const ZK_VM_SOLC_VERSION = 'zkVM-0.8.26-1.0.1';

const ZKVYPER_VERSION = 'v1.5.4';
const VYPER_VERSION = '0.3.10';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ pub async fn run(shell: &Shell, args: IntegrationArgs) -> anyhow::Result<()> {
let test_pattern = args.test_pattern;
let mut command = cmd!(
shell,
"yarn jest api/contract-verification.test.ts --forceExit --testTimeout 120000 -t {test_pattern...}"
"yarn jest --forceExit --testTimeout 120000 -t {test_pattern...}"
)
.env("CHAIN_NAME", ecosystem_config.current_chain())
.env("MASTER_WALLET_PK", wallets.get_test_pk(&chain_config)?);
Expand Down

0 comments on commit c6e5e1c

Please sign in to comment.