Skip to content
This repository has been archived by the owner on Jul 9, 2021. It is now read-only.

Commit

Permalink
Merge pull request #1678 from 0xProject/fix/contracts/solidityUpgradeFix
Browse files Browse the repository at this point in the history 
Fix contracts after Solidity 0.5.5 update
  • Loading branch information
@hysz
hysz authored Mar 7, 2019
2 parents 2c32902 + ac8f4ae commit 7bb93a7
Show file tree
Hide file tree
Showing 21 changed files with 110 additions and 0 deletions.
9 changes: 9 additions & 0 deletions contracts/asset-proxy/CHANGELOG.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
[
{
"version": "1.0.10",
"changes": [
{
"note": "Set evmVersion to byzantium",
"pr": 1678
}
]
},
{
"timestamp": 1551479279,
"version": "1.0.9",
Expand Down
1 change: 1 addition & 0 deletions contracts/asset-proxy/compiler.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"useDockerisedSolc": true,
"isOfflineMode": false,
"compilerSettings": {
"evmVersion": "byzantium",
"optimizer": { "enabled": true, "runs": 1000000 },
"outputSelection": {
"*": {
Expand Down
9 changes: 9 additions & 0 deletions contracts/erc20/CHANGELOG.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
[
{
"version": "1.0.10",
"changes": [
{
"note": "Set evmVersion to byzantium",
"pr": 1678
}
]
},
{
"timestamp": 1551479279,
"version": "1.0.9",
Expand Down
1 change: 1 addition & 0 deletions contracts/erc20/compiler.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"useDockerisedSolc": true,
"isOfflineMode": false,
"compilerSettings": {
"evmVersion": "byzantium",
"optimizer": { "enabled": true, "runs": 1000000 },
"outputSelection": {
"*": {
Expand Down
9 changes: 9 additions & 0 deletions contracts/erc721/CHANGELOG.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
[
{
"version": "1.0.10",
"changes": [
{
"note": "Set evmVersion to byzantium",
"pr": 1678
}
]
},
{
"timestamp": 1551479279,
"version": "1.0.9",
Expand Down
1 change: 1 addition & 0 deletions contracts/erc721/compiler.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"useDockerisedSolc": true,
"isOfflineMode": false,
"compilerSettings": {
"evmVersion": "byzantium",
"optimizer": { "enabled": true, "runs": 1000000 },
"outputSelection": {
"*": {
Expand Down
9 changes: 9 additions & 0 deletions contracts/exchange-forwarder/CHANGELOG.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
[
{
"version": "1.0.10",
"changes": [
{
"note": "Set evmVersion to byzantium",
"pr": 1678
}
]
},
{
"timestamp": 1551479279,
"version": "1.0.9",
Expand Down
1 change: 1 addition & 0 deletions contracts/exchange-forwarder/compiler.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"useDockerisedSolc": true,
"isOfflineMode": false,
"compilerSettings": {
"evmVersion": "byzantium",
"optimizer": { "enabled": true, "runs": 1000000 },
"outputSelection": {
"*": {
Expand Down
9 changes: 9 additions & 0 deletions contracts/exchange-libs/CHANGELOG.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
[
{
"version": "1.1.4",
"changes": [
{
"note": "Set evmVersion to byzantium",
"pr": 1678
}
]
},
{
"timestamp": 1551479279,
"version": "1.1.3",
Expand Down
1 change: 1 addition & 0 deletions contracts/exchange-libs/compiler.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"useDockerisedSolc": true,
"isOfflineMode": false,
"compilerSettings": {
"evmVersion": "byzantium",
"optimizer": { "enabled": true, "runs": 1000000 },
"outputSelection": {
"*": {
Expand Down
9 changes: 9 additions & 0 deletions contracts/exchange/CHANGELOG.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
[
{
"version": "1.0.10",
"changes": [
{
"note": "Set evmVersion to byzantium",
"pr": 1678
}
]
},
{
"timestamp": 1551479279,
"version": "1.0.9",
Expand Down
1 change: 1 addition & 0 deletions contracts/exchange/compiler.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"useDockerisedSolc": true,
"isOfflineMode": false,
"compilerSettings": {
"evmVersion": "byzantium",
"optimizer": { "enabled": true, "runs": 1000000 },
"outputSelection": {
"*": {
Expand Down
10 changes: 10 additions & 0 deletions contracts/extensions/CHANGELOG.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
[
{

"version": "2.0.9",
"changes": [
{
"note": "Set evmVersion to byzantium",
"pr": 1678
}
]
},
{
"timestamp": 1551479279,
"version": "2.0.8",
Expand Down
1 change: 1 addition & 0 deletions contracts/extensions/compiler.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"useDockerisedSolc": true,
"isOfflineMode": false,
"compilerSettings": {
"evmVersion": "byzantium",
"optimizer": { "enabled": true, "runs": 1000000 },
"outputSelection": {
"*": {
Expand Down
9 changes: 9 additions & 0 deletions contracts/multisig/CHANGELOG.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
[
{
"version": "2.0.9",
"changes": [
{
"note": "Set evmVersion to byzantium",
"pr": 1678
}
]
},
{
"timestamp": 1551479279,
"version": "2.0.8",
Expand Down
1 change: 1 addition & 0 deletions contracts/multisig/compiler.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"useDockerisedSolc": true,
"isOfflineMode": false,
"compilerSettings": {
"evmVersion": "byzantium",
"optimizer": { "enabled": true, "runs": 1000000 },
"outputSelection": {
"*": {
Expand Down
9 changes: 9 additions & 0 deletions contracts/tec/CHANGELOG.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
[
{
"version": "0.0.5",
"changes": [
{
"note": "Set evmVersion to byzantium",
"pr": 1678
}
]
},
{
"timestamp": 1551479279,
"version": "0.0.4",
Expand Down
1 change: 1 addition & 0 deletions contracts/tec/compiler.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"contractsDir": "./contracts",
"useDockerisedSolc": true,
"compilerSettings": {
"evmVersion": "byzantium",
"optimizer": { "enabled": true, "runs": 1000000 },
"outputSelection": {
"*": {
Expand Down
9 changes: 9 additions & 0 deletions contracts/test-utils/CHANGELOG.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
[
{
"version": "3.0.9",
"changes": [
{
"note": "Set evmVersion to byzantium",
"pr": 1678
}
]
},
{
"timestamp": 1551479279,
"version": "3.0.8",
Expand Down
9 changes: 9 additions & 0 deletions contracts/utils/CHANGELOG.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
[
{
"version": "2.0.9",
"changes": [
{
"note": "Set evmVersion to byzantium",
"pr": 1678
}
]
},
{
"timestamp": 1551479279,
"version": "2.0.8",
Expand Down
1 change: 1 addition & 0 deletions contracts/utils/compiler.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"useDockerisedSolc": true,
"isOfflineMode": false,
"compilerSettings": {
"evmVersion": "byzantium",
"optimizer": { "enabled": true, "runs": 1000000 },
"outputSelection": {
"*": {
Expand Down

0 comments on commit 7bb93a7

Please sign in to comment.