merge changes from development

neo/SmartContract/ContractParameterType.py

@@ -16,7 +16,7 @@ class ContractParameterType(object):
     ByteArray = 0x05        # 字节数组
     PublicKey = 0x06
     String = 0x07
-    Array = 0xf0
+    Array = 0x10
     Void = 0xff
 
 

prompt.py

@@ -41,7 +41,11 @@
 from prompt_toolkit.contrib.completers import WordCompleter
 from prompt_toolkit.history import InMemoryHistory
 
+<<<<<<< HEAD
 from boa.boa import Compiler
+=======
+#from boa.boa import Compiler
+>>>>>>> development
 
 logname = 'prompt.log'
 logging.basicConfig(

protocol.json

@@ -1,38 +1,42 @@
 {
   "ProtocolConfiguration": {
-    "Magic": 1953787457,
+    "Magic": 7630401,
     "AddressVersion": 23,
     "StandbyValidators": [
-      "0327da12b5c40200e9f65569476bbff2218da4f32548ff43b6387ec1416a231ee8",
-      "026ce35b29147ad09e4afe4ec4a7319095f08198fa8babbe3c56e970b143528d22",
-      "0209e7fd41dfb5c2f8dc72eb30358ac100ea8c72da18847befe06eade68cebfcb9",
-      "039dafd8571a641058ccc832c5e2111ea39b09c0bde36050914384f7a48bce9bf9",
-      "038dddc06ce687677a53d54f096d2591ba2302068cf123c1f2d75c2dddc5425579",
-      "02d02b1873a0863cd042cc717da31cea0d7cf9db32b74d4c72c01b0011503e2e22",
-      "034ff5ceeac41acf22cd5ed2da17a6df4dd8358fcb2bfb1a43208ad0feaab2746b"
+      "03b209fd4f53a7170ea4444e0cb0a6bb6a53c2bd016926989cf85f9b0fba17a70c",
+      "02df48f60e8f3e01c48ff40b9b7f1310d7a8b2a193188befe1c2e3df740e895093",
+      "03b8d9d5771d8f513aa0869b9cc8d50986403b78c6da36890638c3d46a5adce04a",
+      "02ca0e27697b9c248f6f16e085fd0061e26f44da85b58ee835c110caa5ec3ba554",
+      "024c7b7fb6c310fccf1ba33b082519d82964ea93868d676662d4a59ad548df0e7d",
+      "02aaec38470f6aad0042c6e877cfd8087d2676b0f516fddd362801b9bd3936399e",
+      "02486fd15702c4490a26703112a5cc1d0923fd697a33406bd5a1c00e0013b09a70"
     ],
     "SeedList": [
-      "seed1.neo.org:20333",
-      "seed2.neo.org:20333",
-      "seed3.neo.org:20333",
-      "seed4.neo.org:20333"
-
+      "seed1.neo.org:10333",
+      "seed2.neo.org:10333",
+      "seed3.neo.org:10333",
+      "seed4.neo.org:10333",
+      "seed5.neo.org:10333",
+      "13.59.52.94:10333",
+      "18.220.214.143:10333",
+      "13.58.198.112:10333",
+      "13.59.14.206:10333",
+      "18.216.9.7:10333"
     ],
     "SystemFee": {
-      "EnrollmentTransaction": 10,
-      "IssueTransaction": 5,
-      "PublishTransaction": 5,
-      "RegisterTransaction": 100
+      "EnrollmentTransaction": 1000,
+      "IssueTransaction": 500,
+      "PublishTransaction": 500,
+      "RegisterTransaction": 10000
     }
   },
-
   "ApplicationConfiguration": {
-    "DataDirectoryPath": "./Chains/TestChain",
-    "NodePort": 20333,
-    "WsPort": 20334,
-    "UriPrefix": [ "http://*:20332" ],
+    "DataDirectoryPath": "./Chains/Main",
+    "NodePort": 10333,
+    "WsPort": 10334,
+    "UriPrefix": [ "http://*:10332" ],
     "SslCert": "",
     "SslCertPassword": "",
     "VersionName":"/NEO:2.1.0/"
   }
-}
+}

protocol.mainnet.json

@@ -12,15 +12,16 @@
       "02486fd15702c4490a26703112a5cc1d0923fd697a33406bd5a1c00e0013b09a70"
     ],
     "SeedList": [
+      "seed1.neo.org:10333",
       "seed2.neo.org:10333",
       "seed3.neo.org:10333",
       "seed4.neo.org:10333",
       "seed5.neo.org:10333",
-      "18.220.41.87:10333",
-      "13.59.76.52:10333",
-      "13.59.113.222:10333",
-      "18.220.34.148:10333",
-      "52.15.69.104:10333"
+      "13.59.52.94:10333",
+      "18.220.214.143:10333",
+      "13.58.198.112:10333",
+      "13.59.14.206:10333",
+      "18.216.9.7:10333"
     ],
     "SystemFee": {
       "EnrollmentTransaction": 1000,