X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=Novacoin%2FCScript.cs;h=817d2fabdb83481864cfaab35f0eca00b4f7873f;hb=1dcac5faa2b1477034f82466ffb16170fa2e9bb6;hp=5692fa9a4a206522aeaf9cba6e5f812d832e4308;hpb=397772c7e6df61eaf558b3502ae403b7abfd86a2;p=NovacoinLibrary.git

diff --git a/Novacoin/CScript.cs b/Novacoin/CScript.cs
index 5692fa9..817d2fa 100644
--- a/Novacoin/CScript.cs
+++ b/Novacoin/CScript.cs
@@ -20,26 +20,10 @@ using System;
 using System.Linq;
 using System.Text;
 using System.Collections.Generic;
+using System.Diagnostics.Contracts;
 
 namespace Novacoin
 {
-    public class CScriptException : Exception
-    {
-        public CScriptException()
-        {
-        }
-
-        public CScriptException(string message)
-            : base(message)
-        {
-        }
-
-        public CScriptException(string message, Exception inner)
-            : base(message, inner)
-        {
-        }
-    }
-
     /// <summary>
     /// Representation of script code
     /// </summary>
@@ -68,9 +52,9 @@ namespace Novacoin
         /// Return a new instance of ByteQueue object for current code bytes
         /// </summary>
         /// <returns></returns>
-        public ByteQueue GetByteQUeue()
+        public InstructionQueue GetInstructionQueue()
         {
-             return new ByteQueue(codeBytes);
+             return new InstructionQueue(ref codeBytes);
         }
 
         /// <summary>
@@ -79,10 +63,7 @@ namespace Novacoin
         /// <param name="opcode"></param>
         public void AddInstruction(instruction opcode)
         {
-            if (opcode < instruction.OP_0 || opcode > instruction.OP_INVALIDOPCODE)
-            {
-                throw new CScriptException("CScript::AddInstruction() : invalid instruction");
-            }
+            Contract.Requires<ArgumentException>(opcode >= instruction.OP_0 && opcode <= instruction.OP_INVALIDOPCODE, "Invalid instruction.");
 
             codeBytes.Add((byte)opcode);
         }
@@ -92,11 +73,11 @@ namespace Novacoin
         ///    New items are added in this format:
         ///    hash_length_byte hash_bytes
         /// </summary>
-        /// <param name="hash">Hash160 instance</param>
-        public void AddHash(Hash160 hash)
+        /// <param name="hash">uint160 instance</param>
+        public void AddHash(uint160 hash)
         {
-            codeBytes.Add((byte)hash.hashSize);
-            codeBytes.AddRange(hash.hashBytes);
+            codeBytes.Add((byte)hash.Size);
+            codeBytes.AddRange((byte[])hash);
         }
 
         /// <summary>
@@ -104,11 +85,11 @@ namespace Novacoin
         ///    New items are added in this format:
         ///    hash_length_byte hash_bytes
         /// </summary>
-        /// <param name="hash">Hash256 instance</param>
-        public void AddHash(Hash256 hash)
+        /// <param name="hash">uint256 instance</param>
+        public void AddHash(uint256 hash)
         {
-            codeBytes.Add((byte)hash.hashSize);
-            codeBytes.AddRange(hash.hashBytes);
+            codeBytes.Add((byte)hash.Size);
+            codeBytes.AddRange((byte[])hash);
         }
 
         /// <summary>
@@ -132,7 +113,7 @@ namespace Novacoin
             }
             else if (nCount < 0xffff)
             {
-                // OP_PUSHDATA1 0x00 0x01 [0x5a]
+                // OP_PUSHDATA1 0x01 0x00 [0x5a]
                 codeBytes.Add((byte)instruction.OP_PUSHDATA2);
 
                 var szBytes = BitConverter.GetBytes((ushort)nCount);
@@ -140,7 +121,7 @@ namespace Novacoin
             }
             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 = BitConverter.GetBytes((uint)nCount);
@@ -176,7 +157,7 @@ namespace Novacoin
             }
 
             var count = 0;
-            var bq1 = new ByteQueue(codeBytes);
+            var bq1 = new InstructionQueue(ref codeBytes);
 
             byte[] pushData;
             instruction opcode;
@@ -222,7 +203,7 @@ namespace Novacoin
 
             var count = 0;
             var newScript = new CScript();
-            var bq1 = new ByteQueue(codeBytes);
+            var bq1 = new InstructionQueue(ref codeBytes);
 
             while (ScriptCode.GetOp(ref bq1, out opcode, out pushData))
             {
@@ -258,7 +239,7 @@ namespace Novacoin
         {
             get
             {
-                var wCodeBytes = new ByteQueue(codeBytes);
+                var wCodeBytes = new InstructionQueue(ref codeBytes);
 
                 instruction opcode; // Current instruction
                 byte[] pushArgs; // OP_PUSHDATAn argument
@@ -284,7 +265,7 @@ namespace Novacoin
         {
             get
             {
-                var wCodeBytes = new ByteQueue(codeBytes);
+                var wCodeBytes = new InstructionQueue(ref codeBytes);
 
                 byte[] pushArgs; // OP_PUSHDATAn argument
                 instruction opcode; // Current instruction
@@ -371,14 +352,14 @@ namespace Novacoin
         /// </summary>
         /// <param name="fAccurate">Legacy mode flag</param>
         /// <returns>Amount of sigops</returns>
-        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
@@ -392,7 +373,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
                     {
@@ -410,7 +391,7 @@ namespace Novacoin
         /// </summary>
         /// <param name="scriptSig">pay-to-script-hash scriptPubKey</param>
         /// <returns>SigOps count</returns>
-        public int GetSigOpCount(CScript scriptSig)
+        public uint GetSigOpCount(CScript scriptSig)
         {
             if (!IsPayToScriptHash)
             {
@@ -420,13 +401,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();
+            int 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;
@@ -447,7 +435,7 @@ namespace Novacoin
         public void SetDestination(CPubKey pubKey)
         {
             codeBytes.Clear();
-            PushData(pubKey.PublicBytes);
+            PushData(pubKey);
             AddInstruction(instruction.OP_CHECKSIG);
         }
 
@@ -497,7 +485,7 @@ namespace Novacoin
 
             foreach (var key in keys)
             {
-                PushData(key.PublicBytes);
+                PushData(key);
             }
 
             AddInstruction(ScriptCode.EncodeOP_N(keys.Length));
@@ -507,14 +495,22 @@ namespace Novacoin
         /// <summary>
         /// Access to script code.
         /// </summary>
-        public byte[] Bytes
+        public static implicit operator byte[] (CScript script)
+        {
+            return script.codeBytes.ToArray();
+        }
+
+        /// <summary>
+        /// Script size
+        /// </summary>
+        public int Size
         {
-            get { return codeBytes.ToArray(); }
+            get { return codeBytes.Count; }
         }
 
         public CScriptID ScriptID
         {
-            get { return new CScriptID(Hash160.Compute160(codeBytes.ToArray())); }
+            get { return new CScriptID(CryptoUtils.ComputeHash160(codeBytes.ToArray())); }
         }
 
         /// <summary>
@@ -524,7 +520,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