diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 9fdf1f504..d06c47eb3 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -15,7 +15,7 @@ - + diff --git a/src/OracleService/OracleService.cs b/src/OracleService/OracleService.cs index 37b6b7078..5b94f034c 100644 --- a/src/OracleService/OracleService.cs +++ b/src/OracleService/OracleService.cs @@ -341,7 +341,7 @@ public static Transaction CreateResponseTx(StoreView snapshot, OracleRequest req var oracleContract = NativeContract.ContractManagement.GetContract(snapshot, NativeContract.Oracle.Hash); var engine = ApplicationEngine.Create(TriggerType.Verification, tx, snapshot.Clone()); - engine.LoadContract(oracleContract, "verify", CallFlags.None, true, 0); + engine.LoadContract(oracleContract, "verify", CallFlags.None, true); engine.Push("verify"); if (engine.Execute() != VMState.HALT) return null; tx.NetworkFee += engine.GasConsumed; diff --git a/src/RpcClient/Models/RpcContractState.cs b/src/RpcClient/Models/RpcContractState.cs index 797fa1a79..5475a89de 100644 --- a/src/RpcClient/Models/RpcContractState.cs +++ b/src/RpcClient/Models/RpcContractState.cs @@ -1,32 +1,31 @@ -using Neo; -using Neo.IO; using Neo.IO.Json; -using Neo.Network.RPC.Models; using Neo.SmartContract; using Neo.SmartContract.Manifest; -using System; -public class RpcContractState +namespace Neo.Network.RPC.Models { - public ContractState ContractState { get; set; } - - public JObject ToJson() + public class RpcContractState { - return ContractState.ToJson(); - } + public ContractState ContractState { get; set; } - public static RpcContractState FromJson(JObject json) - { - return new RpcContractState + public JObject ToJson() + { + return ContractState.ToJson(); + } + + public static RpcContractState FromJson(JObject json) { - ContractState = new ContractState + return new RpcContractState { - Id = (int)json["id"].AsNumber(), - UpdateCounter = (ushort)json["updatecounter"].AsNumber(), - Hash = UInt160.Parse(json["hash"].AsString()), - Nef = RpcNefFile.FromJson(json["nef"]), - Manifest = ContractManifest.FromJson(json["manifest"]) - } - }; + ContractState = new ContractState + { + Id = (int)json["id"].AsNumber(), + UpdateCounter = (ushort)json["updatecounter"].AsNumber(), + Hash = UInt160.Parse(json["hash"].AsString()), + Nef = RpcNefFile.FromJson(json["nef"]), + Manifest = ContractManifest.FromJson(json["manifest"]) + } + }; + } } } diff --git a/src/RpcClient/Models/RpcInvokeResult.cs b/src/RpcClient/Models/RpcInvokeResult.cs index 8ef6e50a6..ef48f8a35 100644 --- a/src/RpcClient/Models/RpcInvokeResult.cs +++ b/src/RpcClient/Models/RpcInvokeResult.cs @@ -1,10 +1,8 @@ using Neo.IO.Json; -using Neo.SmartContract.Native; using Neo.VM; using Neo.VM.Types; using System; using System.Linq; -using System.Numerics; namespace Neo.Network.RPC.Models { diff --git a/src/RpcClient/Models/RpcMethodToken.cs b/src/RpcClient/Models/RpcMethodToken.cs index 02bf31ead..3b7eea854 100644 --- a/src/RpcClient/Models/RpcMethodToken.cs +++ b/src/RpcClient/Models/RpcMethodToken.cs @@ -1,10 +1,6 @@ using Neo.IO.Json; using Neo.SmartContract; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Neo.Network.RPC.Models { diff --git a/src/RpcClient/Models/RpcNefFile.cs b/src/RpcClient/Models/RpcNefFile.cs index d366d5294..ca1c54a3f 100644 --- a/src/RpcClient/Models/RpcNefFile.cs +++ b/src/RpcClient/Models/RpcNefFile.cs @@ -1,10 +1,7 @@ using Neo.IO.Json; using Neo.SmartContract; using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Neo.Network.RPC.Models { @@ -15,7 +12,6 @@ public static NefFile FromJson(JObject json) return new NefFile { Compiler = json["compiler"].AsString(), - Version = json["version"].AsString(), Tokens = ((JArray)json["tokens"]).Select(p => RpcMethodToken.FromJson(p)).ToArray(), Script = Convert.FromBase64String(json["script"].AsString()), CheckSum = (uint)json["checksum"].AsNumber() diff --git a/src/RpcServer/RpcServer.Wallet.cs b/src/RpcServer/RpcServer.Wallet.cs index c9f571035..f9dcaab0e 100644 --- a/src/RpcServer/RpcServer.Wallet.cs +++ b/src/RpcServer/RpcServer.Wallet.cs @@ -355,7 +355,7 @@ private JObject GetVerificationResult(UInt160 scriptHash, ContractParameter[] ar tx.Witnesses = context.Completed ? context.GetWitnesses() : null; using ApplicationEngine engine = ApplicationEngine.Create(TriggerType.Verification, tx, snapshot.Clone()); - engine.LoadScript(new ScriptBuilder().EmitDynamicCall(scriptHash, methodName, args).ToArray(), (ushort)args.Length, 1); + engine.LoadScript(new ScriptBuilder().EmitDynamicCall(scriptHash, methodName, args).ToArray(), rvcount: 1); JObject json = new JObject(); json["script"] = Convert.ToBase64String(contract.Script); diff --git a/tests/Neo.Network.RPC.Tests/RpcTestCases.json b/tests/Neo.Network.RPC.Tests/RpcTestCases.json index 92b81a0b4..ef6efaa07 100644 --- a/tests/Neo.Network.RPC.Tests/RpcTestCases.json +++ b/tests/Neo.Network.RPC.Tests/RpcTestCases.json @@ -346,11 +346,10 @@ "hash": "0x9ac04cf223f646de5f7faccafe34e30e5d4382a2", "nef": { "magic": 860243278, - "compiler": "ScriptBuilder", - "version": "3.0", + "compiler": "neo-core-v3.0", "tokens": [], "script": "AP1BGvd7Zw==", - "checksum": 571607263 + "checksum": 3921333105 }, "manifest": { "name": "GasToken", @@ -360,13 +359,6 @@ ], "abi": { "methods": [ - { - "name": "totalSupply", - "parameters": [], - "offset": 0, - "returntype": "Integer", - "safe": true - }, { "name": "balanceOf", "parameters": [ @@ -379,6 +371,27 @@ "returntype": "Integer", "safe": true }, + { + "name": "decimals", + "parameters": [], + "offset": 0, + "returntype": "Integer", + "safe": true + }, + { + "name": "symbol", + "parameters": [], + "offset": 0, + "returntype": "String", + "safe": true + }, + { + "name": "totalSupply", + "parameters": [], + "offset": 0, + "returntype": "Integer", + "safe": true + }, { "name": "transfer", "parameters": [ @@ -402,20 +415,6 @@ "offset": 0, "returntype": "Boolean", "safe": false - }, - { - "name": "symbol", - "parameters": [], - "offset": 0, - "returntype": "String", - "safe": true - }, - { - "name": "decimals", - "parameters": [], - "offset": 0, - "returntype": "Integer", - "safe": true } ], "events": [ @@ -455,7 +454,7 @@ "Request": { "jsonrpc": "2.0", "method": "getcontractstate", - "params": [ "0x149a7f61eb3b4763b9655836ec7e75ddafdd1717" ], + "params": [ "0x9ac04cf223f646de5f7faccafe34e30e5d4382a2" ], "id": 1 }, "Response": { @@ -467,11 +466,10 @@ "hash": "0x9ac04cf223f646de5f7faccafe34e30e5d4382a2", "nef": { "magic": 860243278, - "compiler": "ScriptBuilder", - "version": "3.0", + "compiler": "neo-core-v3.0", "tokens": [], "script": "AP1BGvd7Zw==", - "checksum": 571607263 + "checksum": 3921333105 }, "manifest": { "name": "GasToken", @@ -481,13 +479,6 @@ ], "abi": { "methods": [ - { - "name": "totalSupply", - "parameters": [], - "offset": 0, - "returntype": "Integer", - "safe": true - }, { "name": "balanceOf", "parameters": [ @@ -500,6 +491,27 @@ "returntype": "Integer", "safe": true }, + { + "name": "decimals", + "parameters": [], + "offset": 0, + "returntype": "Integer", + "safe": true + }, + { + "name": "symbol", + "parameters": [], + "offset": 0, + "returntype": "String", + "safe": true + }, + { + "name": "totalSupply", + "parameters": [], + "offset": 0, + "returntype": "Integer", + "safe": true + }, { "name": "transfer", "parameters": [ @@ -523,20 +535,6 @@ "offset": 0, "returntype": "Boolean", "safe": false - }, - { - "name": "symbol", - "parameters": [], - "offset": 0, - "returntype": "String", - "safe": true - }, - { - "name": "decimals", - "parameters": [], - "offset": 0, - "returntype": "Integer", - "safe": true } ], "events": [ @@ -588,11 +586,10 @@ "hash": "0x4961bf0ab79370b23dc45cde29f568d0e0fa6e93", "nef": { "magic": 860243278, - "compiler": "ScriptBuilder", - "version": "3.0", + "compiler": "neo-core-v3.0", "tokens": [], "script": "AP5BGvd7Zw==", - "checksum": 4259551467 + "checksum": 3395482975 }, "manifest": { "name": "NeoToken", @@ -603,61 +600,54 @@ "abi": { "methods": [ { - "name": "totalSupply", + "name": "balanceOf", + "parameters": [ + { + "name": "account", + "type": "Hash160" + } + ], + "offset": 0, + "returntype": "Integer", + "safe": true + }, + { + "name": "decimals", "parameters": [], "offset": 0, "returntype": "Integer", "safe": true }, { - "name": "setGasPerBlock", - "parameters": [ - { - "name": "gasPerBlock", - "type": "Integer" - } - ], + "name": "getCandidates", + "parameters": [], "offset": 0, - "returntype": "Boolean", - "safe": false + "returntype": "Array", + "safe": true }, { - "name": "getGasPerBlock", + "name": "getCommittee", "parameters": [], "offset": 0, - "returntype": "Integer", + "returntype": "Array", "safe": true }, { - "name": "unclaimedGas", - "parameters": [ - { - "name": "account", - "type": "Hash160" - }, - { - "name": "end", - "type": "Integer" - } - ], + "name": "getGasPerBlock", + "parameters": [], "offset": 0, "returntype": "Integer", "safe": true }, { - "name": "registerCandidate", - "parameters": [ - { - "name": "pubkey", - "type": "ByteArray" - } - ], + "name": "getNextBlockValidators", + "parameters": [], "offset": 0, - "returntype": "Boolean", - "safe": false + "returntype": "Array", + "safe": true }, { - "name": "unregisterCandidate", + "name": "registerCandidate", "parameters": [ { "name": "pubkey", @@ -669,15 +659,11 @@ "safe": false }, { - "name": "vote", + "name": "setGasPerBlock", "parameters": [ { - "name": "account", - "type": "Hash160" - }, - { - "name": "voteTo", - "type": "ByteArray" + "name": "gasPerBlock", + "type": "Integer" } ], "offset": 0, @@ -685,35 +671,16 @@ "safe": false }, { - "name": "getCandidates", - "parameters": [], - "offset": 0, - "returntype": "Array", - "safe": true - }, - { - "name": "getCommittee", + "name": "symbol", "parameters": [], "offset": 0, - "returntype": "Array", + "returntype": "String", "safe": true }, { - "name": "getNextBlockValidators", + "name": "totalSupply", "parameters": [], "offset": 0, - "returntype": "Array", - "safe": true - }, - { - "name": "balanceOf", - "parameters": [ - { - "name": "account", - "type": "Hash160" - } - ], - "offset": 0, "returntype": "Integer", "safe": true }, @@ -742,18 +709,48 @@ "safe": false }, { - "name": "symbol", - "parameters": [], + "name": "unclaimedGas", + "parameters": [ + { + "name": "account", + "type": "Hash160" + }, + { + "name": "end", + "type": "Integer" + } + ], "offset": 0, - "returntype": "String", + "returntype": "Integer", "safe": true }, { - "name": "decimals", - "parameters": [], + "name": "unregisterCandidate", + "parameters": [ + { + "name": "pubkey", + "type": "ByteArray" + } + ], "offset": 0, - "returntype": "Integer", - "safe": true + "returntype": "Boolean", + "safe": false + }, + { + "name": "vote", + "parameters": [ + { + "name": "account", + "type": "Hash160" + }, + { + "name": "voteTo", + "type": "ByteArray" + } + ], + "offset": 0, + "returntype": "Boolean", + "safe": false } ], "events": [ @@ -805,11 +802,10 @@ "hash": "0x4961bf0ab79370b23dc45cde29f568d0e0fa6e93", "nef": { "magic": 860243278, - "compiler": "ScriptBuilder", - "version": "3.0", + "compiler": "neo-core-v3.0", "tokens": [], "script": "AP5BGvd7Zw==", - "checksum": 4259551467 + "checksum": 3395482975 }, "manifest": { "name": "NeoToken", @@ -820,61 +816,54 @@ "abi": { "methods": [ { - "name": "totalSupply", - "parameters": [], - "offset": 0, - "returntype": "Integer", - "safe": true - }, - { - "name": "setGasPerBlock", + "name": "balanceOf", "parameters": [ { - "name": "gasPerBlock", - "type": "Integer" + "name": "account", + "type": "Hash160" } ], "offset": 0, - "returntype": "Boolean", - "safe": false + "returntype": "Integer", + "safe": true }, { - "name": "getGasPerBlock", + "name": "decimals", "parameters": [], "offset": 0, "returntype": "Integer", "safe": true }, { - "name": "unclaimedGas", - "parameters": [ - { - "name": "account", - "type": "Hash160" - }, - { - "name": "end", - "type": "Integer" - } - ], + "name": "getCandidates", + "parameters": [], "offset": 0, - "returntype": "Integer", + "returntype": "Array", "safe": true }, { - "name": "registerCandidate", - "parameters": [ - { - "name": "pubkey", - "type": "ByteArray" - } - ], + "name": "getCommittee", + "parameters": [], "offset": 0, - "returntype": "Boolean", - "safe": false + "returntype": "Array", + "safe": true }, { - "name": "unregisterCandidate", + "name": "getGasPerBlock", + "parameters": [], + "offset": 0, + "returntype": "Integer", + "safe": true + }, + { + "name": "getNextBlockValidators", + "parameters": [], + "offset": 0, + "returntype": "Array", + "safe": true + }, + { + "name": "registerCandidate", "parameters": [ { "name": "pubkey", @@ -886,15 +875,11 @@ "safe": false }, { - "name": "vote", + "name": "setGasPerBlock", "parameters": [ { - "name": "account", - "type": "Hash160" - }, - { - "name": "voteTo", - "type": "ByteArray" + "name": "gasPerBlock", + "type": "Integer" } ], "offset": 0, @@ -902,35 +887,16 @@ "safe": false }, { - "name": "getCandidates", - "parameters": [], - "offset": 0, - "returntype": "Array", - "safe": true - }, - { - "name": "getCommittee", + "name": "symbol", "parameters": [], "offset": 0, - "returntype": "Array", + "returntype": "String", "safe": true }, { - "name": "getNextBlockValidators", + "name": "totalSupply", "parameters": [], "offset": 0, - "returntype": "Array", - "safe": true - }, - { - "name": "balanceOf", - "parameters": [ - { - "name": "account", - "type": "Hash160" - } - ], - "offset": 0, "returntype": "Integer", "safe": true }, @@ -959,18 +925,48 @@ "safe": false }, { - "name": "symbol", - "parameters": [], + "name": "unclaimedGas", + "parameters": [ + { + "name": "account", + "type": "Hash160" + }, + { + "name": "end", + "type": "Integer" + } + ], "offset": 0, - "returntype": "String", + "returntype": "Integer", "safe": true }, { - "name": "decimals", - "parameters": [], + "name": "unregisterCandidate", + "parameters": [ + { + "name": "pubkey", + "type": "ByteArray" + } + ], "offset": 0, - "returntype": "Integer", - "safe": true + "returntype": "Boolean", + "safe": false + }, + { + "name": "vote", + "parameters": [ + { + "name": "account", + "type": "Hash160" + }, + { + "name": "voteTo", + "type": "ByteArray" + } + ], + "offset": 0, + "returntype": "Boolean", + "safe": false } ], "events": [ @@ -1022,11 +1018,10 @@ "hash": "0xbee421fdbb3e791265d2104cb34934f53fcc0e45", "nef": { "magic": 860243278, - "compiler": "ScriptBuilder", - "version": "3.0", + "compiler": "neo-core-v3.0", "tokens": [], "script": "D0Ea93tn", - "checksum": 4234537066 + "checksum": 3516775561 }, "manifest": { "name": "ContractManagement", @@ -1035,21 +1030,29 @@ "abi": { "methods": [ { - "name": "getMinimumDeploymentFee", - "parameters": [], - "offset": 0, - "returntype": "Integer", - "safe": true - }, - { - "name": "setMinimumDeploymentFee", + "name": "deploy", "parameters": [ { - "name": "value", - "type": "Integer" + "name": "nefFile", + "type": "ByteArray" + }, + { + "name": "manifest", + "type": "ByteArray" + }, + { + "name": "data", + "type": "Any" } ], "offset": 0, + "returntype": "Array", + "safe": false + }, + { + "name": "destroy", + "parameters": [], + "offset": 0, "returntype": "Void", "safe": false }, @@ -1066,19 +1069,22 @@ "safe": true }, { - "name": "deploy", + "name": "getMinimumDeploymentFee", + "parameters": [], + "offset": 0, + "returntype": "Integer", + "safe": true + }, + { + "name": "setMinimumDeploymentFee", "parameters": [ { - "name": "nefFile", - "type": "ByteArray" - }, - { - "name": "manifest", - "type": "ByteArray" + "name": "value", + "type": "Integer" } ], "offset": 0, - "returntype": "Array", + "returntype": "Void", "safe": false }, { @@ -1091,18 +1097,15 @@ { "name": "manifest", "type": "ByteArray" + }, + { + "name": "data", + "type": "Any" } ], "offset": 0, "returntype": "Void", "safe": false - }, - { - "name": "destroy", - "parameters": [], - "offset": 0, - "returntype": "Void", - "safe": false } ], "events": [ @@ -1151,11 +1154,10 @@ "hash": "0x4961bf0ab79370b23dc45cde29f568d0e0fa6e93", "nef": { "magic": 860243278, - "compiler": "ScriptBuilder", - "version": "3.0", + "compiler": "neo-core-v3.0", "tokens": [], "script": "AP5BGvd7Zw==", - "checksum": 4259551467 + "checksum": 3395482975 }, "manifest": { "name": "NeoToken", @@ -1166,61 +1168,54 @@ "abi": { "methods": [ { - "name": "totalSupply", + "name": "balanceOf", + "parameters": [ + { + "name": "account", + "type": "Hash160" + } + ], + "offset": 0, + "returntype": "Integer", + "safe": true + }, + { + "name": "decimals", "parameters": [], "offset": 0, "returntype": "Integer", "safe": true }, { - "name": "setGasPerBlock", - "parameters": [ - { - "name": "gasPerBlock", - "type": "Integer" - } - ], + "name": "getCandidates", + "parameters": [], "offset": 0, - "returntype": "Boolean", - "safe": false + "returntype": "Array", + "safe": true }, { - "name": "getGasPerBlock", + "name": "getCommittee", "parameters": [], "offset": 0, - "returntype": "Integer", + "returntype": "Array", "safe": true }, { - "name": "unclaimedGas", - "parameters": [ - { - "name": "account", - "type": "Hash160" - }, - { - "name": "end", - "type": "Integer" - } - ], + "name": "getGasPerBlock", + "parameters": [], "offset": 0, "returntype": "Integer", "safe": true }, { - "name": "registerCandidate", - "parameters": [ - { - "name": "pubkey", - "type": "ByteArray" - } - ], + "name": "getNextBlockValidators", + "parameters": [], "offset": 0, - "returntype": "Boolean", - "safe": false + "returntype": "Array", + "safe": true }, { - "name": "unregisterCandidate", + "name": "registerCandidate", "parameters": [ { "name": "pubkey", @@ -1232,15 +1227,11 @@ "safe": false }, { - "name": "vote", + "name": "setGasPerBlock", "parameters": [ { - "name": "account", - "type": "Hash160" - }, - { - "name": "voteTo", - "type": "ByteArray" + "name": "gasPerBlock", + "type": "Integer" } ], "offset": 0, @@ -1248,35 +1239,16 @@ "safe": false }, { - "name": "getCandidates", - "parameters": [], - "offset": 0, - "returntype": "Array", - "safe": true - }, - { - "name": "getCommittee", + "name": "symbol", "parameters": [], "offset": 0, - "returntype": "Array", + "returntype": "String", "safe": true }, { - "name": "getNextBlockValidators", + "name": "totalSupply", "parameters": [], "offset": 0, - "returntype": "Array", - "safe": true - }, - { - "name": "balanceOf", - "parameters": [ - { - "name": "account", - "type": "Hash160" - } - ], - "offset": 0, "returntype": "Integer", "safe": true }, @@ -1305,18 +1277,48 @@ "safe": false }, { - "name": "symbol", - "parameters": [], + "name": "unclaimedGas", + "parameters": [ + { + "name": "account", + "type": "Hash160" + }, + { + "name": "end", + "type": "Integer" + } + ], "offset": 0, - "returntype": "String", + "returntype": "Integer", "safe": true }, { - "name": "decimals", - "parameters": [], + "name": "unregisterCandidate", + "parameters": [ + { + "name": "pubkey", + "type": "ByteArray" + } + ], "offset": 0, - "returntype": "Integer", - "safe": true + "returntype": "Boolean", + "safe": false + }, + { + "name": "vote", + "parameters": [ + { + "name": "account", + "type": "Hash160" + }, + { + "name": "voteTo", + "type": "ByteArray" + } + ], + "offset": 0, + "returntype": "Boolean", + "safe": false } ], "events": [ @@ -1355,11 +1357,10 @@ "hash": "0x9ac04cf223f646de5f7faccafe34e30e5d4382a2", "nef": { "magic": 860243278, - "compiler": "ScriptBuilder", - "version": "3.0", + "compiler": "neo-core-v3.0", "tokens": [], "script": "AP1BGvd7Zw==", - "checksum": 571607263 + "checksum": 3921333105 }, "manifest": { "name": "GasToken", @@ -1370,20 +1371,34 @@ "abi": { "methods": [ { - "name": "totalSupply", + "name": "balanceOf", + "parameters": [ + { + "name": "account", + "type": "Hash160" + } + ], + "offset": 0, + "returntype": "Integer", + "safe": true + }, + { + "name": "decimals", + "parameters": [], + "offset": 0, + "returntype": "Integer", + "safe": true + }, + { + "name": "symbol", "parameters": [], "offset": 0, - "returntype": "Integer", + "returntype": "String", "safe": true }, { - "name": "balanceOf", - "parameters": [ - { - "name": "account", - "type": "Hash160" - } - ], + "name": "totalSupply", + "parameters": [], "offset": 0, "returntype": "Integer", "safe": true @@ -1411,20 +1426,6 @@ "offset": 0, "returntype": "Boolean", "safe": false - }, - { - "name": "symbol", - "parameters": [], - "offset": 0, - "returntype": "String", - "safe": true - }, - { - "name": "decimals", - "parameters": [], - "offset": 0, - "returntype": "Integer", - "safe": true } ], "events": [ @@ -1463,11 +1464,10 @@ "hash": "0xc939a4af1c762e5edca36d4b61c06ba82c4c6ff5", "nef": { "magic": 860243278, - "compiler": "ScriptBuilder", - "version": "3.0", + "compiler": "neo-core-v3.0", "tokens": [], "script": "APxBGvd7Zw==", - "checksum": 1792437732 + "checksum": 3155977747 }, "manifest": { "name": "PolicyContract", @@ -1476,35 +1476,47 @@ "abi": { "methods": [ { - "name": "getMaxTransactionsPerBlock", + "name": "blockAccount", + "parameters": [ + { + "name": "account", + "type": "Hash160" + } + ], + "offset": 0, + "returntype": "Boolean", + "safe": false + }, + { + "name": "getExecFeeFactor", "parameters": [], "offset": 0, "returntype": "Integer", "safe": true }, { - "name": "getMaxBlockSize", + "name": "getFeePerByte", "parameters": [], "offset": 0, "returntype": "Integer", "safe": true }, { - "name": "getMaxBlockSystemFee", + "name": "getMaxBlockSize", "parameters": [], "offset": 0, "returntype": "Integer", "safe": true }, { - "name": "getFeePerByte", + "name": "getMaxBlockSystemFee", "parameters": [], "offset": 0, "returntype": "Integer", "safe": true }, { - "name": "getExecFeeFactor", + "name": "getMaxTransactionsPerBlock", "parameters": [], "offset": 0, "returntype": "Integer", @@ -1530,7 +1542,7 @@ "safe": true }, { - "name": "setMaxBlockSize", + "name": "setExecFeeFactor", "parameters": [ { "name": "value", @@ -1542,7 +1554,7 @@ "safe": false }, { - "name": "setMaxTransactionsPerBlock", + "name": "setFeePerByte", "parameters": [ { "name": "value", @@ -1554,7 +1566,7 @@ "safe": false }, { - "name": "setMaxBlockSystemFee", + "name": "setMaxBlockSize", "parameters": [ { "name": "value", @@ -1566,7 +1578,7 @@ "safe": false }, { - "name": "setFeePerByte", + "name": "setMaxBlockSystemFee", "parameters": [ { "name": "value", @@ -1578,7 +1590,7 @@ "safe": false }, { - "name": "setExecFeeFactor", + "name": "setMaxTransactionsPerBlock", "parameters": [ { "name": "value", @@ -1601,18 +1613,6 @@ "returntype": "Boolean", "safe": false }, - { - "name": "blockAccount", - "parameters": [ - { - "name": "account", - "type": "Hash160" - } - ], - "offset": 0, - "returntype": "Boolean", - "safe": false - }, { "name": "unblockAccount", "parameters": [ @@ -1644,11 +1644,10 @@ "hash": "0xf4bbd95569e8dda2cb84eb609a1488ddd0d9fa91", "nef": { "magic": 860243278, - "compiler": "ScriptBuilder", - "version": "3.0", + "compiler": "neo-core-v3.0", "tokens": [], "script": "APtBGvd7Zw==", - "checksum": 1875564659 + "checksum": 1136340263 }, "manifest": { "name": "RoleManagement", @@ -1657,36 +1656,36 @@ "abi": { "methods": [ { - "name": "getDesignatedByRole", + "name": "designateAsRole", "parameters": [ { "name": "role", "type": "Integer" }, { - "name": "index", - "type": "Integer" + "name": "nodes", + "type": "Array" } ], "offset": 0, - "returntype": "Array", - "safe": true + "returntype": "Void", + "safe": false }, { - "name": "designateAsRole", + "name": "getDesignatedByRole", "parameters": [ { "name": "role", "type": "Integer" }, { - "name": "nodes", - "type": "Array" + "name": "index", + "type": "Integer" } ], "offset": 0, - "returntype": "Void", - "safe": false + "returntype": "Array", + "safe": true } ], "events": [] @@ -1707,11 +1706,10 @@ "hash": "0x8cd3889136056b3304ec59f6d424b8767710ed79", "nef": { "magic": 860243278, - "compiler": "ScriptBuilder", - "version": "3.0", + "compiler": "neo-core-v3.0", "tokens": [], "script": "APpBGvd7Zw==", - "checksum": 3970697217 + "checksum": 3289425910 }, "manifest": { "name": "OracleContract", @@ -1815,11 +1813,10 @@ "hash": "0xa92fbe5bf164170a624474841485b20b45a26047", "nef": { "magic": 860243278, - "compiler": "ScriptBuilder", - "version": "3.0", + "compiler": "neo-core-v3.0", "tokens": [], "script": "APlBGvd7Zw==", - "checksum": 2817451339 + "checksum": 3902663397 }, "manifest": { "name": "NameService", @@ -1840,54 +1837,65 @@ "safe": false }, { - "name": "setPrice", + "name": "balanceOf", "parameters": [ { - "name": "price", - "type": "Integer" + "name": "owner", + "type": "Hash160" } ], "offset": 0, - "returntype": "Void", - "safe": false + "returntype": "Integer", + "safe": true }, { - "name": "getPrice", + "name": "decimals", "parameters": [], "offset": 0, "returntype": "Integer", "safe": true }, { - "name": "isAvailable", + "name": "deleteRecord", "parameters": [ { "name": "name", "type": "String" + }, + { + "name": "type", + "type": "Integer" } ], "offset": 0, - "returntype": "Boolean", + "returntype": "Void", + "safe": false + }, + { + "name": "getPrice", + "parameters": [], + "offset": 0, + "returntype": "Integer", "safe": true }, { - "name": "register", + "name": "getRecord", "parameters": [ { "name": "name", "type": "String" }, { - "name": "owner", - "type": "Hash160" + "name": "type", + "type": "Integer" } ], "offset": 0, - "returntype": "Boolean", - "safe": false + "returntype": "String", + "safe": true }, { - "name": "renew", + "name": "isAvailable", "parameters": [ { "name": "name", @@ -1895,75 +1903,59 @@ } ], "offset": 0, - "returntype": "Integer", - "safe": false + "returntype": "Boolean", + "safe": true }, { - "name": "setAdmin", + "name": "ownerOf", "parameters": [ { - "name": "name", - "type": "String" - }, - { - "name": "admin", - "type": "Hash160" + "name": "tokenId", + "type": "ByteArray" } ], "offset": 0, - "returntype": "Void", - "safe": false + "returntype": "Hash160", + "safe": true }, { - "name": "setRecord", + "name": "properties", "parameters": [ { - "name": "name", - "type": "String" - }, - { - "name": "type", - "type": "Integer" - }, - { - "name": "data", - "type": "String" + "name": "tokenId", + "type": "ByteArray" } ], "offset": 0, - "returntype": "Void", - "safe": false + "returntype": "Map", + "safe": true }, { - "name": "getRecord", + "name": "register", "parameters": [ { "name": "name", "type": "String" }, { - "name": "type", - "type": "Integer" + "name": "owner", + "type": "Hash160" } ], "offset": 0, - "returntype": "String", - "safe": true + "returntype": "Boolean", + "safe": false }, { - "name": "deleteRecord", + "name": "renew", "parameters": [ { "name": "name", "type": "String" - }, - { - "name": "type", - "type": "Integer" } ], "offset": 0, - "returntype": "Void", + "returntype": "Integer", "safe": false }, { @@ -1983,46 +1975,58 @@ "safe": true }, { - "name": "totalSupply", - "parameters": [], - "offset": 0, - "returntype": "Integer", - "safe": true - }, - { - "name": "ownerOf", + "name": "setAdmin", "parameters": [ { - "name": "tokenId", - "type": "ByteArray" + "name": "name", + "type": "String" + }, + { + "name": "admin", + "type": "Hash160" } ], "offset": 0, - "returntype": "Hash160", - "safe": true + "returntype": "Void", + "safe": false }, { - "name": "properties", + "name": "setPrice", "parameters": [ { - "name": "tokenId", - "type": "ByteArray" + "name": "price", + "type": "Integer" } ], "offset": 0, - "returntype": "Any", - "safe": true + "returntype": "Void", + "safe": false }, { - "name": "balanceOf", + "name": "setRecord", "parameters": [ { - "name": "owner", - "type": "Hash160" + "name": "name", + "type": "String" + }, + { + "name": "type", + "type": "Integer" + }, + { + "name": "data", + "type": "String" } ], "offset": 0, - "returntype": "Integer", + "returntype": "Void", + "safe": false + }, + { + "name": "symbol", + "parameters": [], + "offset": 0, + "returntype": "String", "safe": true }, { @@ -2037,6 +2041,13 @@ "returntype": "Any", "safe": true }, + { + "name": "totalSupply", + "parameters": [], + "offset": 0, + "returntype": "Integer", + "safe": true + }, { "name": "transfer", "parameters": [ @@ -2052,20 +2063,6 @@ "offset": 0, "returntype": "Boolean", "safe": false - }, - { - "name": "symbol", - "parameters": [], - "offset": 0, - "returntype": "String", - "safe": true - }, - { - "name": "decimals", - "parameters": [], - "offset": 0, - "returntype": "Integer", - "safe": true } ], "events": [