flip/dcrd
1
0
Fork 0
mirror of https://github.com/FlipsideCrypto/dcrd.git synced 2026-02-06 10:56:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

txscript: Rename p2sh indicator to isP2SH.

Browse Source 
This renames the flag that indicates whether or not the script engine is
executing a pay-to-script-hash script pair to a name that more
accurately describes its behavior.
This commit is contained in:
Dave Collins 2019-02-12 23:32:02 -06:00
parent 1f5abadc08
commit c0124570cd
No known key found for this signature in database
GPG Key ID: B8904D9D9C93D1F2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
txscript/engine.go
View File

@ -85,7 +85,7 @@ type Engine struct {
numOps int
flags ScriptFlags
version uint16
bip16 bool // treat execution as pay-to-script-hash
isP2SH bool // treat execution as pay-to-script-hash
}
// hasFlag returns whether the script engine instance has the passed flag set.
@ -303,10 +303,10 @@ func (vm *Engine) Step() (done bool, err error) {
vm.numOps = 0 // number of ops is per script.
vm.scriptOff = 0
switch {
case vm.scriptIdx == 0 && vm.bip16:
case vm.scriptIdx == 0 && vm.isP2SH:
vm.scriptIdx++
vm.savedFirstStack = vm.GetStack()
case vm.scriptIdx == 1 && vm.bip16:
case vm.scriptIdx == 1 && vm.isP2SH:
// Put us past the end for CheckErrorCondition()
vm.scriptIdx++
// Check script ran successfully and pull the script
@ -715,7 +715,7 @@ func NewEngine(scriptPubKey []byte, tx *wire.MsgTx, txIdx int, flags ScriptFlags
return nil, scriptError(ErrNotPushOnly,
"pay to script hash is not push only")
}
vm.bip16 = true
vm.isP2SH = true
}
vm.tx = *tx