Merge pull request #3115 from nspcc-dev/3030-opcode-dumps
Add address and swap endianness to vm opcode dump for hashes
This commit is contained in:
commit
a59fd50844
1 changed files with 10 additions and 1 deletions
|
@ -3,6 +3,7 @@ package vm
|
||||||
import (
|
import (
|
||||||
"crypto/elliptic"
|
"crypto/elliptic"
|
||||||
"encoding/binary"
|
"encoding/binary"
|
||||||
|
"encoding/hex"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
@ -15,6 +16,7 @@ import (
|
||||||
|
|
||||||
"github.com/nspcc-dev/neo-go/pkg/core/interop/interopnames"
|
"github.com/nspcc-dev/neo-go/pkg/core/interop/interopnames"
|
||||||
"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
|
"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
|
||||||
|
"github.com/nspcc-dev/neo-go/pkg/encoding/address"
|
||||||
"github.com/nspcc-dev/neo-go/pkg/encoding/bigint"
|
"github.com/nspcc-dev/neo-go/pkg/encoding/bigint"
|
||||||
"github.com/nspcc-dev/neo-go/pkg/smartcontract/callflag"
|
"github.com/nspcc-dev/neo-go/pkg/smartcontract/callflag"
|
||||||
"github.com/nspcc-dev/neo-go/pkg/smartcontract/nef"
|
"github.com/nspcc-dev/neo-go/pkg/smartcontract/nef"
|
||||||
|
@ -216,11 +218,18 @@ func (v *VM) PrintOps(out io.Writer) {
|
||||||
default:
|
default:
|
||||||
if utf8.Valid(parameter) {
|
if utf8.Valid(parameter) {
|
||||||
desc = fmt.Sprintf("%x (%q)", parameter, parameter)
|
desc = fmt.Sprintf("%x (%q)", parameter, parameter)
|
||||||
|
} else {
|
||||||
|
// Try converting the parameter to an address and swap the endianness
|
||||||
|
// if the parameter is a 20-byte value.
|
||||||
|
u, err := util.Uint160DecodeBytesBE(parameter)
|
||||||
|
if err == nil {
|
||||||
|
desc = fmt.Sprintf("%x (%q, %q)", parameter, address.Uint160ToString(u), "0x"+hex.EncodeToString(slice.CopyReverse(parameter)))
|
||||||
} else {
|
} else {
|
||||||
desc = fmt.Sprintf("%x", parameter)
|
desc = fmt.Sprintf("%x", parameter)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fmt.Fprintf(w, "%d\t%s\t%s%s\n", ctx.ip, instr, desc, cursor)
|
fmt.Fprintf(w, "%d\t%s\t%s%s\n", ctx.ip, instr, desc, cursor)
|
||||||
if ctx.nextip >= len(ctx.sc.prog) {
|
if ctx.nextip >= len(ctx.sc.prog) {
|
||||||
|
|
Loading…
Reference in a new issue