From b008fabdacb4171f25fa36871903f6de071cd72d Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Sun, 17 Mar 2019 20:32:17 -0700 Subject: [PATCH] Change petersburg to constantinople --- contracts/asset-proxy/compiler.json | 2 +- contracts/coordinator/CHANGELOG.json | 8 -------- contracts/coordinator/compiler.json | 2 +- contracts/erc1155/compiler.json | 2 +- contracts/erc20/compiler.json | 2 +- contracts/erc721/compiler.json | 2 +- contracts/exchange-forwarder/compiler.json | 2 +- contracts/exchange-libs/compiler.json | 2 +- contracts/exchange/compiler.json | 2 +- contracts/extensions/compiler.json | 2 +- contracts/multisig/compiler.json | 2 +- contracts/utils/compiler.json | 2 +- 12 files changed, 11 insertions(+), 19 deletions(-) diff --git a/contracts/asset-proxy/compiler.json b/contracts/asset-proxy/compiler.json index e3b9ed00ec..6bf9c16c56 100644 --- a/contracts/asset-proxy/compiler.json +++ b/contracts/asset-proxy/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "petersburg", + "evmVersion": "constantinople", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/coordinator/CHANGELOG.json b/contracts/coordinator/CHANGELOG.json index eb06267e8d..fc1a3f7f0d 100644 --- a/contracts/coordinator/CHANGELOG.json +++ b/contracts/coordinator/CHANGELOG.json @@ -14,15 +14,7 @@ "pr": 1705 }, { -<<<<<<< HEAD - "note": "Add `SignatureType.Invalid`", - "pr": 1705 - }, - { - "note": "Set `evmVersion` to `petersburg`", -======= "note": "Set `evmVersion` to `constantinople`", ->>>>>>> 4a3e9e8f4... fgrtre "pr": 1707 } ] diff --git a/contracts/coordinator/compiler.json b/contracts/coordinator/compiler.json index 28e07105b9..8df8f3cd33 100644 --- a/contracts/coordinator/compiler.json +++ b/contracts/coordinator/compiler.json @@ -3,7 +3,7 @@ "contractsDir": "./contracts", "useDockerisedSolc": true, "compilerSettings": { - "evmVersion": "petersburg", + "evmVersion": "constantinople", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/erc1155/compiler.json b/contracts/erc1155/compiler.json index 46d62f1178..2c3318284a 100644 --- a/contracts/erc1155/compiler.json +++ b/contracts/erc1155/compiler.json @@ -3,7 +3,7 @@ "contractsDir": "contracts", "useDockerisedSolc": true, "compilerSettings": { - "evmVersion": "petersburg", + "evmVersion": "constantinople", "optimizer": { "enabled": true, "runs": 1000000 }, "outputSelection": { "*": { diff --git a/contracts/erc20/compiler.json b/contracts/erc20/compiler.json index 910c18689d..c84caf47f1 100644 --- a/contracts/erc20/compiler.json +++ b/contracts/erc20/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "petersburg", + "evmVersion": "constantinople", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/erc721/compiler.json b/contracts/erc721/compiler.json index bfbcbb878e..a3b8f417d5 100644 --- a/contracts/erc721/compiler.json +++ b/contracts/erc721/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "petersburg", + "evmVersion": "constantinople", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/exchange-forwarder/compiler.json b/contracts/exchange-forwarder/compiler.json index 4be147db96..d49cd34b7d 100644 --- a/contracts/exchange-forwarder/compiler.json +++ b/contracts/exchange-forwarder/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "petersburg", + "evmVersion": "constantinople", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/exchange-libs/compiler.json b/contracts/exchange-libs/compiler.json index 4abdfde931..fed143589c 100644 --- a/contracts/exchange-libs/compiler.json +++ b/contracts/exchange-libs/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "petersburg", + "evmVersion": "constantinople", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/exchange/compiler.json b/contracts/exchange/compiler.json index 95bbd3bee4..c1f8663d37 100644 --- a/contracts/exchange/compiler.json +++ b/contracts/exchange/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "petersburg", + "evmVersion": "constantinople", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/extensions/compiler.json b/contracts/extensions/compiler.json index 534f4a93fd..bf3756c15b 100644 --- a/contracts/extensions/compiler.json +++ b/contracts/extensions/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "petersburg", + "evmVersion": "constantinople", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/multisig/compiler.json b/contracts/multisig/compiler.json index 8b024af976..942df6bb25 100644 --- a/contracts/multisig/compiler.json +++ b/contracts/multisig/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "petersburg", + "evmVersion": "constantinople", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/utils/compiler.json b/contracts/utils/compiler.json index ce996091e8..4632bf57b7 100644 --- a/contracts/utils/compiler.json +++ b/contracts/utils/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "petersburg", + "evmVersion": "constantinople", "optimizer": { "enabled": true, "runs": 1000000,