Skip to content
This repository has been archived by the owner on Dec 13, 2019. It is now read-only.

Update solidity to 0.5.12 #2496

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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 packages/apps/contracts/HighRollerApp.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

/* solium-disable-next-line */
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/contracts/Migrations.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;


contract Migrations {
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/contracts/NimApp.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

/* solium-disable-next-line */
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/contracts/SimpleTransferApp.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

/* solium-disable-next-line */
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/contracts/SimpleTwoPartySwapApp.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

/* solium-disable-next-line */
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/contracts/TicTacToeApp.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

/* solium-disable-next-line */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

import "openzeppelin-solidity/contracts/math/SafeMath.sol";
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/contracts/UnidirectionalTransferApp.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

import "openzeppelin-solidity/contracts/math/SafeMath.sol";
Expand Down
6 changes: 3 additions & 3 deletions packages/apps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,22 @@
"lint:ts": "tslint -c tslint.json -p ."
},
"devDependencies": {
"@counterfactual/cf-adjudicator-contracts": "0.0.8",
"@counterfactual/cf-adjudicator-contracts": "0.0.9",
"@types/chai": "4.2.3",
"@types/mocha": "5.2.7",
"chai": "4.2.0",
"ethereum-waffle": "2.1.0",
"ethers": "4.0.37",
"ethlint": "1.2.5",
"mocha": "6.2.1",
"solc": "0.5.11",
"solc": "0.5.12",
"truffle": "5.0.38",
"truffle-deploy-registry": "0.5.1",
"truffle-hdwallet-provider": "1.0.17",
"ts-mocha": "6.0.0",
"tslint": "5.20.0"
},
"resolutions": {
"ethereum-waffle/solc": "0.5.11"
"ethereum-waffle/solc": "0.5.12"
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

import "./mixins/MixinChallengeRegistryCore.sol";
Expand Down
2 changes: 1 addition & 1 deletion packages/cf-adjudicator-contracts/contracts/Migrations.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;


contract Migrations {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";


Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

import "../interfaces/CounterfactualApp.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental ABIEncoderV2;

import "openzeppelin-solidity/contracts/cryptography/ECDSA.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

import "../libs/LibStateChannelApp.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

import "../libs/LibStateChannelApp.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

import "../libs/LibStateChannelApp.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

import "../libs/LibStateChannelApp.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

import "../libs/LibStateChannelApp.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

import "../libs/LibStateChannelApp.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

import "../libs/LibStateChannelApp.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

import "../interfaces/CounterfactualApp.sol";
Expand Down
6 changes: 3 additions & 3 deletions packages/cf-adjudicator-contracts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@counterfactual/cf-adjudicator-contracts",
"version": "0.0.8",
"version": "0.0.9",
"description": "Smart contracts for an State Channel AppInstance Adjudicator",
"license": "MIT",
"engines": {
Expand Down Expand Up @@ -45,7 +45,7 @@
"ganache-cli": "6.7.0",
"openzeppelin-solidity": "2.3.0",
"shx": "0.3.2",
"solc": "0.5.11",
"solc": "0.5.12",
"truffle": "5.0.38",
"truffle-deploy-registry": "0.5.1",
"truffle-hdwallet-provider": "1.0.17",
Expand All @@ -55,6 +55,6 @@
"zos-lib": "2.4.2"
},
"resolutions": {
"ethereum-waffle/solc": "0.5.11"
"ethereum-waffle/solc": "0.5.12"
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

/* solium-disable-next-line */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";


Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;


contract Migrations {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

import "openzeppelin-solidity/contracts/math/SafeMath.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

import "./IdentityApp.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

/* solium-disable-next-line */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

/* solium-disable-next-line */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

import "openzeppelin-solidity/contracts/token/ERC20/ERC20.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

import "openzeppelin-solidity/contracts/token/ERC20/ERC20.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

import "openzeppelin-solidity/contracts/math/SafeMath.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

import "openzeppelin-solidity/contracts/token/ERC20/ERC20.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

import "openzeppelin-solidity/contracts/math/SafeMath.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

import "openzeppelin-solidity/contracts/token/ERC20/ERC20.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";


Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;


/// @title Proxy - Generic proxy contract allows to execute all transactions applying the code of a master contract.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;

import "./Proxy.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental ABIEncoderV2;

import "openzeppelin-solidity/contracts/cryptography/ECDSA.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;


contract DelegateProxy {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;

import "openzeppelin-solidity/contracts/token/ERC20/ERC20.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;


contract Echo {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pragma solidity 0.5.11;
pragma solidity 0.5.12;
pragma experimental "ABIEncoderV2";

import "../libs/LibOutcome.sol";
Expand Down
8 changes: 4 additions & 4 deletions packages/cf-funding-protocol-contracts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@counterfactual/cf-funding-protocol-contracts",
"version": "0.0.11",
"version": "0.0.12",
"description": "Smart contracts for the Counterfactual multisig funding protocol",
"license": "MIT",
"engines": {
Expand Down Expand Up @@ -32,7 +32,7 @@
"solidity"
],
"devDependencies": {
"@counterfactual/cf-adjudicator-contracts": "0.0.8",
"@counterfactual/cf-adjudicator-contracts": "0.0.9",
"@counterfactual/types": "0.0.43",
"@counterfactual/typescript-typings": "0.1.2",
"@types/node": "12.7.8",
Expand All @@ -46,7 +46,7 @@
"ganache-cli": "6.7.0",
"openzeppelin-solidity": "2.3.0",
"shx": "0.3.2",
"solc": "0.5.11",
"solc": "0.5.12",
"truffle": "5.0.38",
"truffle-deploy-registry": "0.5.1",
"truffle-hdwallet-provider": "1.0.17",
Expand All @@ -56,6 +56,6 @@
"zos-lib": "2.4.2"
},
"resolutions": {
"ethereum-waffle/solc": "0.5.11"
"ethereum-waffle/solc": "0.5.12"
}
}
4 changes: 2 additions & 2 deletions packages/local-ganache-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
},
"dependencies": {
"@counterfactual/apps": "0.1.12",
"@counterfactual/cf-adjudicator-contracts": "0.0.8",
"@counterfactual/cf-funding-protocol-contracts": "0.0.11",
"@counterfactual/cf-adjudicator-contracts": "0.0.9",
"@counterfactual/cf-funding-protocol-contracts": "0.0.12",
"@counterfactual/types": "0.0.43",
"ethers": "4.0.37",
"ganache-core": "2.8.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
"typescript": "3.5.3"
},
"dependencies": {
"@counterfactual/cf-adjudicator-contracts": "0.0.8",
"@counterfactual/cf-funding-protocol-contracts": "0.0.11",
"@counterfactual/cf-adjudicator-contracts": "0.0.9",
"@counterfactual/cf-funding-protocol-contracts": "0.0.12",
"@counterfactual/cf.js": "0.2.6",
"@counterfactual/firebase-client": "0.0.6",
"@counterfactual/types": "0.0.43",
Expand Down
2 changes: 1 addition & 1 deletion packages/node/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export function timeout(ms: number) {
* ProxyFactory contract with the bytecode of a Proxy contract pointing to
* a `masterCopy` of a MinimumViableMultisig contract.
*
* See https://solidity.readthedocs.io/en/v0.5.11/assembly.html?highlight=create2
* See https://solidity.readthedocs.io/en/v0.5.12/assembly.html?highlight=create2
* for information on how CREAT2 addresses are calculated.
*
* @export
Expand Down
17 changes: 15 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -17814,7 +17814,21 @@ [email protected]:
semver "^5.3.0"
yargs "^4.7.1"

[email protected], solc@^0.5.10:
[email protected]:
version "0.5.12"
resolved "https://registry.yarnpkg.com/solc/-/solc-0.5.12.tgz#e63047dce04c82ec6f469f6e28febfbde713b808"
integrity sha512-OX/AGZT04tuUsagoVXSZBiBZYJReA02hdwZOfRkB03/eeYP9Dl3pr+M+au+1MhssgiuWBlFPN7sRXFiqwkAW2g==
dependencies:
command-exists "^1.2.8"
fs-extra "^0.30.0"
js-sha3 "0.8.0"
memorystream "^0.3.1"
require-from-string "^2.0.0"
semver "^5.5.0"
tmp "0.0.33"
yargs "^13.2.0"

solc@^0.5.10:
version "0.5.11"
resolved "https://registry.npmjs.org/solc/-/solc-0.5.11.tgz#5905261191d01befd78ef52610a006820022ee8f"
integrity sha512-F8avCCVDYnJzvIm/ITsU11GFNdFI4HaNsME+zw9lK5a3ojD3LZN2Op2cIfWg7w1HeRYRiMOU1dM77saX6jUIKw==
Expand Down Expand Up @@ -20973,7 +20987,6 @@ [email protected], websocket@^1.0.28:
dependencies:
debug "^2.2.0"
es5-ext "^0.10.50"
gulp "^4.0.2"
nan "^2.14.0"
typedarray-to-buffer "^3.1.5"
yaeti "^0.0.6"
Expand Down