Change petersburg to constantinople

2019-03-17 20:32:17 -07:00 · 2019-03-17 20:32:17 -07:00 · b008fabdac
commit b008fabdac
parent caf286b8cb
12 changed files with 11 additions and 19 deletions
--- 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,
--- 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
            }
        ]
--- 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,
--- 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": {
            "*": {
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,
--- 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,