diff options
| author | zelig <viktor.tron@gmail.com> | 2015-03-16 23:50:29 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2015-03-16 23:50:29 +0800 |
| commit | b3e133dd159749a625c4b0245af293607ba12c8c (patch) | |
| tree | 9ba8e8c4afe9168f5bc83219d402efb00387d616 /core/asm.go | |
| parent | 8139d444f8d8163251d1c96ef8034d186825ce32 (diff) | |
| parent | 73af0302bed5076260ac935e452064aee423934d (diff) | |
| download | dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar.gz dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar.bz2 dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar.lz dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar.xz dexon-b3e133dd159749a625c4b0245af293607ba12c8c.tar.zst dexon-b3e133dd159749a625c4b0245af293607ba12c8c.zip | |
Merge branch 'frontier/js' into frontier/nodeadmin.js
Diffstat (limited to 'core/asm.go')
| -rw-r--r-- | core/asm.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/asm.go b/core/asm.go index a8b3023f4..fc3493fe1 100644 --- a/core/asm.go +++ b/core/asm.go @@ -4,7 +4,7 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/ethutil" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/vm" ) @@ -28,7 +28,7 @@ func Disassemble(script []byte) (asm []string) { vm.PUSH16, vm.PUSH17, vm.PUSH18, vm.PUSH19, vm.PUSH20, vm.PUSH21, vm.PUSH22, vm.PUSH23, vm.PUSH24, vm.PUSH25, vm.PUSH26, vm.PUSH27, vm.PUSH28, vm.PUSH29, vm.PUSH30, vm.PUSH31, vm.PUSH32: - pc.Add(pc, ethutil.Big1) + pc.Add(pc, common.Big1) a := int64(op) - int64(vm.PUSH1) + 1 if int(pc.Int64()+a) > len(script) { return @@ -43,7 +43,7 @@ func Disassemble(script []byte) (asm []string) { pc.Add(pc, big.NewInt(a-1)) } - pc.Add(pc, ethutil.Big1) + pc.Add(pc, common.Big1) } return asm |