From 1ff49188b157511926c14b24c77171c651c58470 Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Tue, 5 Mar 2019 16:34:10 -0800 Subject: [PATCH 1/2] Set evm version to byzantium to avoid using unsupported opcodes in solidity 0.5.5 --- contracts/asset-proxy/compiler.json | 1 + contracts/erc20/compiler.json | 1 + contracts/erc721/compiler.json | 1 + contracts/exchange-forwarder/compiler.json | 1 + contracts/exchange-libs/compiler.json | 1 + contracts/exchange/compiler.json | 1 + contracts/extensions/compiler.json | 1 + contracts/multisig/compiler.json | 1 + contracts/tec/compiler.json | 1 + contracts/utils/compiler.json | 1 + 10 files changed, 10 insertions(+) diff --git a/contracts/asset-proxy/compiler.json b/contracts/asset-proxy/compiler.json index dce6ece23f..e1e8f48f74 100644 --- a/contracts/asset-proxy/compiler.json +++ b/contracts/asset-proxy/compiler.json @@ -4,6 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { + "evmVersion": "byzantium", "optimizer": { "enabled": true, "runs": 1000000 }, "outputSelection": { "*": { diff --git a/contracts/erc20/compiler.json b/contracts/erc20/compiler.json index 35becac1ea..0ae2534dac 100644 --- a/contracts/erc20/compiler.json +++ b/contracts/erc20/compiler.json @@ -4,6 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { + "evmVersion": "byzantium", "optimizer": { "enabled": true, "runs": 1000000 }, "outputSelection": { "*": { diff --git a/contracts/erc721/compiler.json b/contracts/erc721/compiler.json index 15ecb35ed4..6cf38d7d15 100644 --- a/contracts/erc721/compiler.json +++ b/contracts/erc721/compiler.json @@ -4,6 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { + "evmVersion": "byzantium", "optimizer": { "enabled": true, "runs": 1000000 }, "outputSelection": { "*": { diff --git a/contracts/exchange-forwarder/compiler.json b/contracts/exchange-forwarder/compiler.json index 4417c149a5..4c33fda9c6 100644 --- a/contracts/exchange-forwarder/compiler.json +++ b/contracts/exchange-forwarder/compiler.json @@ -4,6 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { + "evmVersion": "byzantium", "optimizer": { "enabled": true, "runs": 1000000 }, "outputSelection": { "*": { diff --git a/contracts/exchange-libs/compiler.json b/contracts/exchange-libs/compiler.json index 0bdd1ab3de..229bf94f6e 100644 --- a/contracts/exchange-libs/compiler.json +++ b/contracts/exchange-libs/compiler.json @@ -4,6 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { + "evmVersion": "byzantium", "optimizer": { "enabled": true, "runs": 1000000 }, "outputSelection": { "*": { diff --git a/contracts/exchange/compiler.json b/contracts/exchange/compiler.json index 9f3016da51..240a9ecd15 100644 --- a/contracts/exchange/compiler.json +++ b/contracts/exchange/compiler.json @@ -4,6 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { + "evmVersion": "byzantium", "optimizer": { "enabled": true, "runs": 1000000 }, "outputSelection": { "*": { diff --git a/contracts/extensions/compiler.json b/contracts/extensions/compiler.json index 800b7fda33..02c7518274 100644 --- a/contracts/extensions/compiler.json +++ b/contracts/extensions/compiler.json @@ -4,6 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { + "evmVersion": "byzantium", "optimizer": { "enabled": true, "runs": 1000000 }, "outputSelection": { "*": { diff --git a/contracts/multisig/compiler.json b/contracts/multisig/compiler.json index 9fa8cf71be..449abf82ad 100644 --- a/contracts/multisig/compiler.json +++ b/contracts/multisig/compiler.json @@ -4,6 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { + "evmVersion": "byzantium", "optimizer": { "enabled": true, "runs": 1000000 }, "outputSelection": { "*": { diff --git a/contracts/tec/compiler.json b/contracts/tec/compiler.json index 68d864c189..747052bb3e 100644 --- a/contracts/tec/compiler.json +++ b/contracts/tec/compiler.json @@ -3,6 +3,7 @@ "contractsDir": "./contracts", "useDockerisedSolc": true, "compilerSettings": { + "evmVersion": "byzantium", "optimizer": { "enabled": true, "runs": 1000000 }, "outputSelection": { "*": { diff --git a/contracts/utils/compiler.json b/contracts/utils/compiler.json index 4edc9fd88d..22582d6194 100644 --- a/contracts/utils/compiler.json +++ b/contracts/utils/compiler.json @@ -4,6 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { + "evmVersion": "byzantium", "optimizer": { "enabled": true, "runs": 1000000 }, "outputSelection": { "*": { From ac8f4ae2f94e3f3b3f41d2db2e420b03e7da9b0b Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Wed, 6 Mar 2019 15:45:18 -0800 Subject: [PATCH 2/2] updated changelogs of contracts packages --- contracts/asset-proxy/CHANGELOG.json | 9 +++++++++ contracts/erc20/CHANGELOG.json | 9 +++++++++ contracts/erc721/CHANGELOG.json | 9 +++++++++ contracts/exchange-forwarder/CHANGELOG.json | 9 +++++++++ contracts/exchange-libs/CHANGELOG.json | 9 +++++++++ contracts/exchange/CHANGELOG.json | 9 +++++++++ contracts/extensions/CHANGELOG.json | 10 ++++++++++ contracts/multisig/CHANGELOG.json | 9 +++++++++ contracts/tec/CHANGELOG.json | 9 +++++++++ contracts/test-utils/CHANGELOG.json | 9 +++++++++ contracts/utils/CHANGELOG.json | 9 +++++++++ 11 files changed, 100 insertions(+) diff --git a/contracts/asset-proxy/CHANGELOG.json b/contracts/asset-proxy/CHANGELOG.json index 0fabaf3e9d..3e2d10a3c8 100644 --- a/contracts/asset-proxy/CHANGELOG.json +++ b/contracts/asset-proxy/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "1.0.10", + "changes": [ + { + "note": "Set evmVersion to byzantium", + "pr": 1678 + } + ] + }, { "timestamp": 1551479279, "version": "1.0.9", diff --git a/contracts/erc20/CHANGELOG.json b/contracts/erc20/CHANGELOG.json index 65eef9cf88..cb7ca2d951 100644 --- a/contracts/erc20/CHANGELOG.json +++ b/contracts/erc20/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "1.0.10", + "changes": [ + { + "note": "Set evmVersion to byzantium", + "pr": 1678 + } + ] + }, { "timestamp": 1551479279, "version": "1.0.9", diff --git a/contracts/erc721/CHANGELOG.json b/contracts/erc721/CHANGELOG.json index 42f02c833b..84aa0a01f8 100644 --- a/contracts/erc721/CHANGELOG.json +++ b/contracts/erc721/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "1.0.10", + "changes": [ + { + "note": "Set evmVersion to byzantium", + "pr": 1678 + } + ] + }, { "timestamp": 1551479279, "version": "1.0.9", diff --git a/contracts/exchange-forwarder/CHANGELOG.json b/contracts/exchange-forwarder/CHANGELOG.json index 403478d330..483f32a0f6 100644 --- a/contracts/exchange-forwarder/CHANGELOG.json +++ b/contracts/exchange-forwarder/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "1.0.10", + "changes": [ + { + "note": "Set evmVersion to byzantium", + "pr": 1678 + } + ] + }, { "timestamp": 1551479279, "version": "1.0.9", diff --git a/contracts/exchange-libs/CHANGELOG.json b/contracts/exchange-libs/CHANGELOG.json index eb2b53b03c..96246134f6 100644 --- a/contracts/exchange-libs/CHANGELOG.json +++ b/contracts/exchange-libs/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "1.1.4", + "changes": [ + { + "note": "Set evmVersion to byzantium", + "pr": 1678 + } + ] + }, { "timestamp": 1551479279, "version": "1.1.3", diff --git a/contracts/exchange/CHANGELOG.json b/contracts/exchange/CHANGELOG.json index 4a5163a6be..9d28b24f44 100644 --- a/contracts/exchange/CHANGELOG.json +++ b/contracts/exchange/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "1.0.10", + "changes": [ + { + "note": "Set evmVersion to byzantium", + "pr": 1678 + } + ] + }, { "timestamp": 1551479279, "version": "1.0.9", diff --git a/contracts/extensions/CHANGELOG.json b/contracts/extensions/CHANGELOG.json index 8a83322589..7597990692 100644 --- a/contracts/extensions/CHANGELOG.json +++ b/contracts/extensions/CHANGELOG.json @@ -1,4 +1,14 @@ [ + { + + "version": "2.0.9", + "changes": [ + { + "note": "Set evmVersion to byzantium", + "pr": 1678 + } + ] + }, { "timestamp": 1551479279, "version": "2.0.8", diff --git a/contracts/multisig/CHANGELOG.json b/contracts/multisig/CHANGELOG.json index a52b4b8751..f2cecdeab5 100644 --- a/contracts/multisig/CHANGELOG.json +++ b/contracts/multisig/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "2.0.9", + "changes": [ + { + "note": "Set evmVersion to byzantium", + "pr": 1678 + } + ] + }, { "timestamp": 1551479279, "version": "2.0.8", diff --git a/contracts/tec/CHANGELOG.json b/contracts/tec/CHANGELOG.json index 01de7a425e..e93c00032c 100644 --- a/contracts/tec/CHANGELOG.json +++ b/contracts/tec/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "0.0.5", + "changes": [ + { + "note": "Set evmVersion to byzantium", + "pr": 1678 + } + ] + }, { "timestamp": 1551479279, "version": "0.0.4", diff --git a/contracts/test-utils/CHANGELOG.json b/contracts/test-utils/CHANGELOG.json index 279b6ce2f0..5a01a0d2b5 100644 --- a/contracts/test-utils/CHANGELOG.json +++ b/contracts/test-utils/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "3.0.9", + "changes": [ + { + "note": "Set evmVersion to byzantium", + "pr": 1678 + } + ] + }, { "timestamp": 1551479279, "version": "3.0.8", diff --git a/contracts/utils/CHANGELOG.json b/contracts/utils/CHANGELOG.json index eabf38bf79..25825828cb 100644 --- a/contracts/utils/CHANGELOG.json +++ b/contracts/utils/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "2.0.9", + "changes": [ + { + "note": "Set evmVersion to byzantium", + "pr": 1678 + } + ] + }, { "timestamp": 1551479279, "version": "2.0.8",