X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=Novacoin%2FCScript.cs;h=abdad9c238b64cfd219295ebe5e86e01e3f9ea15;hb=6dfa6de57c6493b76856acc9ab510ac31962c327;hp=f5ea0369a22ed2e24cca52eecc978396998151da;hpb=70c6f23891b719dacc4c6b55a0a6c749d069136a;p=NovacoinLibrary.git diff --git a/Novacoin/CScript.cs b/Novacoin/CScript.cs index f5ea036..abdad9c 100644 --- a/Novacoin/CScript.cs +++ b/Novacoin/CScript.cs @@ -20,26 +20,11 @@ using System; using System.Linq; using System.Text; using System.Collections.Generic; +using System.Diagnostics.Contracts; +using System.Numerics; namespace Novacoin { - public class CScriptException : Exception - { - public CScriptException() - { - } - - public CScriptException(string message) - : base(message) - { - } - - public CScriptException(string message, Exception inner) - : base(message, inner) - { - } - } - /// /// Representation of script code /// @@ -68,21 +53,35 @@ namespace Novacoin /// Return a new instance of ByteQueue object for current code bytes /// /// - public ByteQueue GetByteQUeue() + public InstructionQueue GetInstructionQueue() { - return new ByteQueue(codeBytes); + return new InstructionQueue(ref codeBytes); } /// - /// Adds specified operation to instruction list + /// Add serialized number to instructions list. /// - /// - public void AddInstruction(instruction opcode) + /// Number to add. + public void AddNumber(int n) { - if (opcode < instruction.OP_0 || opcode > instruction.OP_INVALIDOPCODE) + if (n == -1 || (n >= 1 && n <= 16)) + { + codeBytes.Add((byte)ScriptCode.EncodeOP_N(n, true)); + } + else { - throw new CScriptException("CScript::AddInstruction() : invalid instruction"); + BigInteger bn = n; + PushData(bn.ToByteArray()); } + } + + /// + /// Adds specified operation to instruction list + /// + /// Instruction to add. + public void AddInstruction(instruction opcode) + { + Contract.Requires(opcode >= instruction.OP_0 && opcode <= instruction.OP_INVALIDOPCODE, "Invalid instruction."); codeBytes.Add((byte)opcode); } @@ -92,11 +91,11 @@ namespace Novacoin /// New items are added in this format: /// hash_length_byte hash_bytes /// - /// Hash160 instance - public void AddHash(Hash160 hash) + /// uint160 instance + public void AddHash(uint160 hash) { - codeBytes.Add((byte)hash.hashSize); - codeBytes.AddRange(hash.hashBytes); + codeBytes.Add((byte)hash.Size); + codeBytes.AddRange((byte[])hash); } /// @@ -104,11 +103,11 @@ namespace Novacoin /// New items are added in this format: /// hash_length_byte hash_bytes /// - /// Hash256 instance - public void AddHash(Hash256 hash) + /// uint256 instance + public void AddHash(uint256 hash) { - codeBytes.Add((byte)hash.hashSize); - codeBytes.AddRange(hash.hashBytes); + codeBytes.Add((byte)hash.Size); + codeBytes.AddRange((byte[])hash); } /// @@ -132,18 +131,18 @@ namespace Novacoin } else if (nCount < 0xffff) { - // OP_PUSHDATA1 0x00 0x01 [0x5a] + // OP_PUSHDATA1 0x01 0x00 [0x5a] codeBytes.Add((byte)instruction.OP_PUSHDATA2); - var szBytes = Interop.BEBytes((ushort)nCount); + var szBytes = BitConverter.GetBytes((ushort)nCount); codeBytes.AddRange(szBytes); } else if (nCount < 0xffffffff) { - // OP_PUSHDATA1 0x00 0x00 0x00 0x01 [0x5a] + // OP_PUSHDATA1 0x01 0x00 0x00 0x00 [0x5a] codeBytes.Add((byte)instruction.OP_PUSHDATA4); - var szBytes = Interop.BEBytes((uint)nCount); + var szBytes = BitConverter.GetBytes((uint)nCount); codeBytes.AddRange(szBytes); } @@ -152,21 +151,31 @@ namespace Novacoin } /// + /// Just insert data array without including any prefixes. Please make sure that you know what you're doing, + /// it is recommended to use AddInstruction, AddHash or PushData instead. + /// + /// Data bytes + public void AddRawData(byte[] dataBytes) + { + // Add data bytes + codeBytes.AddRange(dataBytes); + } + + /// /// Scan pushed data bytes for pattern and, in case of exact match, remove it. /// /// Pattern sequence /// Matches count public int RemovePattern(byte[] pattern) { - // There is no sense to continue if pattern is longer than script itself + // There is no sense to continue if pattern is empty or longer than script itself if (pattern.Length == 0 || pattern.Length > codeBytes.Count) { return 0; } var count = 0; - var bq1 = new ByteQueue(codeBytes); - + var bq1 = new InstructionQueue(ref codeBytes); byte[] pushData; instruction opcode; @@ -191,7 +200,11 @@ namespace Novacoin } } - codeBytes = newScript.codeBytes; + if (count > 0) + { + // Replace current script if any matches were found + codeBytes = newScript.codeBytes; + } return count; } @@ -203,23 +216,23 @@ namespace Novacoin /// Matches count public int RemoveInstruction(instruction op) { - var count = 0; - var bq1 = new ByteQueue(codeBytes); - - byte[] pushData; instruction opcode; + var count = 0; var newScript = new CScript(); + var bq1 = new InstructionQueue(ref codeBytes); while (ScriptCode.GetOp(ref bq1, out opcode, out pushData)) { - if (pushData.Length != 0) + if (pushData.Length != 0 && op != opcode) { + // If instruction didn't match then push its data again newScript.PushData(pushData); } else if (Enum.IsDefined(typeof(instruction), op) && op != opcode) { + // Instruction didn't match newScript.AddInstruction(opcode); } else @@ -228,7 +241,11 @@ namespace Novacoin } } - codeBytes = newScript.codeBytes; + if (count > 0) + { + // Replace current script if any matches were found + codeBytes = newScript.codeBytes; + } return count; } @@ -240,7 +257,7 @@ namespace Novacoin { get { - var wCodeBytes = new ByteQueue(codeBytes); + var wCodeBytes = new InstructionQueue(ref codeBytes); instruction opcode; // Current instruction byte[] pushArgs; // OP_PUSHDATAn argument @@ -266,7 +283,7 @@ namespace Novacoin { get { - var wCodeBytes = new ByteQueue(codeBytes); + var wCodeBytes = new InstructionQueue(ref codeBytes); byte[] pushArgs; // OP_PUSHDATAn argument instruction opcode; // Current instruction @@ -353,14 +370,14 @@ namespace Novacoin /// /// Legacy mode flag /// Amount of sigops - public int GetSigOpCount(bool fAccurate) + public uint GetSigOpCount(bool fAccurate) { - var wCodeBytes = new ByteQueue(codeBytes); + var wCodeBytes = new InstructionQueue(ref codeBytes); instruction opcode; // Current instruction byte[] pushArgs; // OP_PUSHDATAn argument - int nCount = 0; + uint nCount = 0; var lastOpcode = instruction.OP_INVALIDOPCODE; // Scan instructions sequence @@ -374,7 +391,7 @@ namespace Novacoin { if (fAccurate && lastOpcode >= instruction.OP_1 && lastOpcode <= instruction.OP_16) { - nCount += ScriptCode.DecodeOP_N(lastOpcode); + nCount += (uint)ScriptCode.DecodeOP_N(lastOpcode); } else { @@ -392,7 +409,7 @@ namespace Novacoin /// /// pay-to-script-hash scriptPubKey /// SigOps count - public int GetSigOpCount(CScript scriptSig) + public uint GetSigOpCount(CScript scriptSig) { if (!IsPayToScriptHash) { @@ -402,13 +419,20 @@ namespace Novacoin // This is a pay-to-script-hash scriptPubKey; // get the last item that the scriptSig // pushes onto the stack: - ByteQueue wScriptSig = scriptSig.GetByteQUeue(); + InstructionQueue wScriptSig = scriptSig.GetInstructionQueue(); + uint nScriptSigSize = scriptSig.Size; instruction opcode; // Current instruction - byte[] pushArgs; // OP_PUSHDATAn argument + byte[] pushArgs = new byte[0]; // OP_PUSHDATAn argument + - while (ScriptCode.GetOp(ref wScriptSig, out opcode, out pushArgs)) + while (wScriptSig.Index < nScriptSigSize) { + if (!ScriptCode.GetOp(ref wScriptSig, out opcode, out pushArgs)) + { + return 0; + } + if (opcode > instruction.OP_16) { return 0; @@ -429,7 +453,7 @@ namespace Novacoin public void SetDestination(CPubKey pubKey) { codeBytes.Clear(); - PushData(pubKey.PublicBytes); + PushData(pubKey); AddInstruction(instruction.OP_CHECKSIG); } @@ -479,7 +503,7 @@ namespace Novacoin foreach (var key in keys) { - PushData(key.PublicBytes); + PushData(key); } AddInstruction(ScriptCode.EncodeOP_N(keys.Length)); @@ -489,14 +513,31 @@ namespace Novacoin /// /// Access to script code. /// - public byte[] Bytes + public static implicit operator byte[] (CScript script) + { + return script.codeBytes.ToArray(); + } + + /// + /// Implicit cast of byte array to CScript. + /// + /// + public static implicit operator CScript(byte[] scriptBytes) + { + return new CScript(scriptBytes); + } + + /// + /// Script size + /// + public uint Size { - get { return codeBytes.ToArray(); } + get { return (uint) codeBytes.Count; } } public CScriptID ScriptID { - get { return new CScriptID(Hash160.Compute160(codeBytes.ToArray())); } + get { return new CScriptID(CryptoUtils.ComputeHash160(codeBytes.ToArray())); } } /// @@ -506,7 +547,7 @@ namespace Novacoin public override string ToString() { var sb = new StringBuilder(); - var wCodeBytes = new ByteQueue(codeBytes); + var wCodeBytes = new InstructionQueue(ref codeBytes); instruction opcode; // Current instruction byte[] pushArgs; // OP_PUSHDATAn argument