X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=Novacoin%2FCScript.cs;h=95ca17a88e5dc7898e8d896170bf94cb10b74908;hb=0fe762d6eee8a8a23033f813217c1675a34f2d6a;hp=e2e17e0ecd621db34e031c0713a7df8a97a73dad;hpb=892af99303ad6d6ece3e57bebd36b521102df838;p=NovacoinLibrary.git
diff --git a/Novacoin/CScript.cs b/Novacoin/CScript.cs
index e2e17e0..95ca17a 100644
--- a/Novacoin/CScript.cs
+++ b/Novacoin/CScript.cs
@@ -52,9 +52,9 @@ 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);
}
///
@@ -73,10 +73,10 @@ 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.Add((byte)hash.Size);
codeBytes.AddRange((byte[])hash);
}
@@ -85,10 +85,10 @@ 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.Add((byte)hash.Size);
codeBytes.AddRange((byte[])hash);
}
@@ -157,7 +157,7 @@ namespace Novacoin
}
var count = 0;
- var bq1 = new ByteQueue(codeBytes);
+ var bq1 = new InstructionQueue(ref codeBytes);
byte[] pushData;
instruction opcode;
@@ -203,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))
{
@@ -239,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
@@ -265,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
@@ -352,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 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
@@ -373,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
{
@@ -391,7 +391,7 @@ namespace Novacoin
///
/// pay-to-script-hash scriptPubKey
/// SigOps count
- public int GetSigOpCount(CScript scriptSig)
+ public uint GetSigOpCount(CScript scriptSig)
{
if (!IsPayToScriptHash)
{
@@ -401,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;
@@ -513,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