Skip to content
This repository has been archived by the owner on Oct 7, 2022. It is now read-only.

Commit

Permalink
Downgrade solc and do not use native solc in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
kerzhner committed Feb 12, 2020
1 parent 8b8e689 commit cca9efc
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 11 deletions.
2 changes: 0 additions & 2 deletions .circleci/config.yml
Expand Up @@ -9,8 +9,6 @@ defaults: &defaults
resource_class: medium
docker:
- image: counterfactual/statechannels:0.5.13 # Fast contract compilation with solc installed
environment:
USE_NATIVE_SOLC: true
- image: circleci/postgres:12.0-alpine
environment:
POSTGRES_USER: root
Expand Down
2 changes: 1 addition & 1 deletion packages/devtools/package.json
Expand Up @@ -15,7 +15,7 @@
"fs-extra": "8.1.0",
"jest": "25.1.0",
"loglevel": "1.6.6",
"solc": "0.6.2",
"solc": "0.5.13",
"yargs": "15.1.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-gas-reporter/package.json
Expand Up @@ -8,7 +8,7 @@
"easy-table": "1.1.1",
"ethers": "4.0.44",
"path": "0.12.7",
"solc": "0.6.2",
"solc": "0.5.13",
"typescript": "3.7.5"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/nitro-protocol/package.json
Expand Up @@ -42,7 +42,7 @@
"prettier": "1.19.1",
"prettier-plugin-solidity": "1.0.0-alpha.34",
"server-destroy": "1.0.1",
"solc": "0.6.2",
"solc": "0.5.13",
"solidoc": "https://github.com/statechannels/solidoc.git",
"ts-jest": "25.0.0",
"ts-node": "8.6.2",
Expand Down
4 changes: 2 additions & 2 deletions patches/@counterfactual+cf-adjudicator-contracts+0.0.11.patch
@@ -1,10 +1,10 @@
diff --git a/node_modules/@counterfactual/cf-adjudicator-contracts/contracts/interfaces/CounterfactualApp.sol b/node_modules/@counterfactual/cf-adjudicator-contracts/contracts/interfaces/CounterfactualApp.sol
index 5ba3e0e..5f684e1 100644
index d823033..31595b9 100644
--- a/node_modules/@counterfactual/cf-adjudicator-contracts/contracts/interfaces/CounterfactualApp.sol
+++ b/node_modules/@counterfactual/cf-adjudicator-contracts/contracts/interfaces/CounterfactualApp.sol
@@ -1,4 +1,4 @@
-pragma solidity 0.5.12;
+pragma solidity 0.5.13;
+pragma solidity ^0.5.13;
pragma experimental "ABIEncoderV2";


8 changes: 4 additions & 4 deletions yarn.lock
Expand Up @@ -26134,10 +26134,10 @@ socks@~2.3.2:
ip "1.1.5"
smart-buffer "^4.1.0"

solc@0.6.2:
version "0.6.2"
resolved "https://registry.npmjs.org/solc/-/solc-0.6.2.tgz#0340520782caef3e8230af6785aba17625415c73"
integrity sha512-PIFb/i7HSQXXfsXHlGDR+B2BCaQ+Bx7gpZ7bz+zLz2rPePyxkIJgLmb4rgRKYxEnIp5dKilcjKRPbrz8GNlIHQ==
solc@0.5.13:
version "0.5.13"
resolved "https://registry.npmjs.org/solc/-/solc-0.5.13.tgz#2a5ba2b7681898c6293759441e0a768fb6955def"
integrity sha512-osybDVPGjAqcmSKLU3vh5iHuxbhGlJjQI5ZvI7nRDR0fgblQqYte4MGvNjbew8DPvCrmoH0ZBiz/KBBLlPxfMg==
dependencies:
command-exists "^1.2.8"
commander "3.0.2"
Expand Down

0 comments on commit cca9efc

Please sign in to comment.