Skip to content

Commit 2ac688c

Browse files
authored
Merge branch 'dev' into vlad-bochok-zks-471-fix-uniswap-api-usage
2 parents d808c74 + 5173b6b commit 2ac688c

File tree

19 files changed

+2240
-2167
lines changed

19 files changed

+2240
-2167
lines changed

.github/workflows/ci.yml

+20
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,35 @@ jobs:
118118
- name: integration-server
119119
run: ci_run zk test i server
120120

121+
- name: Show logs
122+
run: |
123+
ci_run cat server.log
124+
ci_run cat dummy_prover.log
125+
121126
- name: integration-api
122127
run: ci_run zk test i api
123128

129+
- name: Show logs
130+
run: |
131+
ci_run cat server.log
132+
ci_run cat dummy_prover.log
133+
124134
- name: integration-zcli
125135
run: ci_run zk test i zcli
126136

137+
- name: Show logs
138+
run: |
139+
ci_run cat server.log
140+
ci_run cat dummy_prover.log
141+
127142
- name: integration-rust-sdk
128143
run: ci_run zk test i rust-sdk
129144

145+
- name: Show logs
146+
run: |
147+
ci_run cat server.log
148+
ci_run cat dummy_prover.log
149+
130150
131151
testkit:
132152
runs-on: [self-hosted, CI-worker]

changelog/infrastructure.md

+10
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,24 @@ components, the logs will have the following format:
1111

1212
### Removed
1313

14+
- (`ci/Dockerfile`): `dockerci/Dockerfile` file with folder was removed , because it is outdated.
15+
1416
### Changed
1517

18+
- (`fee-seller`): migrating to zksync V0.9.0.
19+
1620
### Added
1721

22+
- (`read-variable`): tool for read private and public variables from contracts.
1823
- (`reading-tool`): tool for reading test config.
1924

2025
### Fixed
2126

27+
- (`fee-seller`): Sends all Ethereum transactions with sequential nonce starting with the next available not finalized
28+
nonce. Thereby resend stuck transactions after the next time you run the script.
29+
30+
- (`explorer`): Bug with 'Click to copy' button for account address.
31+
2232
## Release 2021-02-02
2333

2434
### Removed

changelog/js-sdk.md

+7
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,17 @@ All notable changes to `zksync.js` will be documented in this file.
66

77
### Added
88

9+
- Method for calculation of transaction hash.
10+
911
### Changed
1012

1113
### Deprecated
1214

15+
- `Signer.transferSignBytes` method
16+
- `Signer.withdrawSignBytes` method
17+
- `Signer.forcedExitSignBytes` method
18+
- `Signer.changePubKeySignBytes` method
19+
1320
### Fixed
1421

1522
## Version 0.9.0 (15.02.2021)

contracts/package.json

+5-3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"axios": "^0.21.1",
1717
"chai": "^4.2.0",
1818
"chalk": "^4.1.0",
19+
"commander": "^6.0.0",
1920
"ethereum-waffle": "^3.0.0",
2021
"ethereumjs-abi": "^0.6.8",
2122
"ethers": "^5.0.0",
@@ -25,18 +26,18 @@
2526
"hardhat-contract-sizer": "^2.0.2",
2627
"hardhat-typechain": "^0.3.3",
2728
"handlebars": "^4.7.6",
29+
"jsonwebtoken": "^8.5.1",
2830
"mocha": "^8.2.0",
2931
"openzeppelin-solidity": "^2.3.0",
3032
"path": "^0.12.7",
3133
"prettier": "^1.18.2",
3234
"prettier-plugin-solidity": "^1.0.0-alpha.27",
3335
"querystring": "^0.2.0",
36+
"solc": "0.7.4",
3437
"ts-generator": "^0.1.1",
3538
"ts-node": "^9.0.0",
3639
"typechain": "^4.0.0",
3740
"typescript": "^4.0.5",
38-
"commander": "^6.0.0",
39-
"jsonwebtoken": "^8.5.1",
4041
"zksync": "link:../sdk/zksync.js"
4142
},
4243
"scripts": {
@@ -52,6 +53,7 @@
5253
"token-info": "ts-node scripts/token-info.ts",
5354
"deploy-testkit": "ts-node scripts/deploy-testkit.ts",
5455
"publish-sources": "hardhat run --network env scripts/publish.ts",
55-
"deploy-testnet-erc20": "ts-node scripts/deploy-testnet-token.ts"
56+
"deploy-testnet-erc20": "ts-node scripts/deploy-testnet-token.ts",
57+
"read-variable": "ts-node scripts/read-variable.ts"
5658
}
5759
}

0 commit comments

Comments
 (0)