X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=Novacoin%2FCScript.cs;h=229b60b8284554c5b370eefb2f3bc15fbf650eb1;hb=be9d844557911f95165d2c9875c4f5b2822cfc92;hp=13386a131401b3d98b6cdf13d2b5c62934800392;hpb=e9c24822f85ac68df600ec96e94f5e64f7409d3a;p=NovacoinLibrary.git
diff --git a/Novacoin/CScript.cs b/Novacoin/CScript.cs
index 13386a1..229b60b 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)
- {
- }
- }
-
///
/// Representation of script code
///
@@ -68,9 +52,9 @@ namespace Novacoin
/// Return a new instance of ByteQueue object for current code bytes
///
///
- public ByteQueue GetByteQUeue()
+ public ByteQueue GetByteQueue()
{
- return new ByteQueue(codeBytes);
+ return new ByteQueue(ref codeBytes);
}
///
@@ -79,10 +63,7 @@ namespace Novacoin
///
public void AddInstruction(instruction opcode)
{
- if (opcode < instruction.OP_0 || opcode > instruction.OP_INVALIDOPCODE)
- {
- throw new CScriptException("CScript::AddInstruction() : invalid instruction");
- }
+ Contract.Requires(opcode >= instruction.OP_0 && opcode <= instruction.OP_INVALIDOPCODE, "Invalid instruction.");
codeBytes.Add((byte)opcode);
}
@@ -96,7 +77,7 @@ namespace Novacoin
public void AddHash(Hash160 hash)
{
codeBytes.Add((byte)hash.hashSize);
- codeBytes.AddRange(hash.hashBytes);
+ codeBytes.AddRange((byte[])hash);
}
///
@@ -108,7 +89,7 @@ namespace Novacoin
public void AddHash(Hash256 hash)
{
codeBytes.Add((byte)hash.hashSize);
- codeBytes.AddRange(hash.hashBytes);
+ codeBytes.AddRange((byte[])hash);
}
///
@@ -176,7 +157,7 @@ namespace Novacoin
}
var count = 0;
- var bq1 = new ByteQueue(codeBytes);
+ var bq1 = new ByteQueue(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 ByteQueue(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 ByteQueue(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 ByteQueue(ref codeBytes);
byte[] pushArgs; // OP_PUSHDATAn argument
instruction opcode; // Current instruction
@@ -371,14 +352,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 ByteQueue(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
///
/// pay-to-script-hash scriptPubKey
/// SigOps count
- 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();
+ ByteQueue wScriptSig = scriptSig.GetByteQueue();
+ 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,9 +495,17 @@ namespace Novacoin
///
/// Access to script code.
///
- public byte[] Bytes
+ public static implicit operator byte[] (CScript script)
+ {
+ return script.codeBytes.ToArray();
+ }
+
+ ///
+ /// Script size
+ ///
+ public int Size
{
- get { return codeBytes.ToArray(); }
+ get { return codeBytes.Count; }
}
public CScriptID ScriptID
@@ -524,7 +520,7 @@ namespace Novacoin
public override string ToString()
{
var sb = new StringBuilder();
- var wCodeBytes = new ByteQueue(codeBytes);
+ var wCodeBytes = new ByteQueue(ref codeBytes);
instruction opcode; // Current instruction
byte[] pushArgs; // OP_PUSHDATAn argument