/// 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>
/// 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.Add((byte)hash.Size);
codeBytes.AddRange((byte[])hash);
}
/// 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.Add((byte)hash.Size);
codeBytes.AddRange((byte[])hash);
}
}
var count = 0;
- var bq1 = new ByteQueue(codeBytes);
+ var bq1 = new InstructionQueue(ref codeBytes);
byte[] pushData;
instruction opcode;
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))
{
{
get
{
- var wCodeBytes = new ByteQueue(codeBytes);
+ var wCodeBytes = new InstructionQueue(ref codeBytes);
instruction opcode; // Current instruction
byte[] pushArgs; // OP_PUSHDATAn argument
{
get
{
- var wCodeBytes = new ByteQueue(codeBytes);
+ var wCodeBytes = new InstructionQueue(ref codeBytes);
byte[] pushArgs; // OP_PUSHDATAn argument
instruction opcode; // Current instruction
/// </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
{
if (fAccurate && lastOpcode >= instruction.OP_1 && lastOpcode <= instruction.OP_16)
{
- nCount += ScriptCode.DecodeOP_N(lastOpcode);
+ nCount += (uint)ScriptCode.DecodeOP_N(lastOpcode);
}
else
{
/// </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)
{
// 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;
return script.codeBytes.ToArray();
}
+ /// <summary>
+ /// Implicit cast of byte array to CScript.
+ /// </summary>
+ /// <param name="scriptBytes"></param>
+ public static implicit operator CScript(byte[] scriptBytes)
+ {
+ return new CScript(scriptBytes);
+ }
+
+ /// <summary>
+ /// Script size
+ /// </summary>
+ public uint Size
+ {
+ get { return (uint) codeBytes.Count; }
+ }
+
public CScriptID ScriptID
{
- get { return new CScriptID(Hash160.Compute160(codeBytes.ToArray())); }
+ get { return new CScriptID(CryptoUtils.ComputeHash160(codeBytes.ToArray())); }
}
/// <summary>
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