TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #648 from nspcc-dev/fix/gas

Browse source 
core: fix GAS price definitions
This commit is contained in:
Roman Khimov 2020-02-06 18:23:50 +03:00 committed by GitHub
commit 138119674f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkg/core/gas_price.go
View file

@ -21,20 +21,20 @@ func getPrice(v *vm.VM, op opcode.Opcode, parameter []byte) util.Fixed8 {
switch op { switch op {
case opcode.APPCALL, opcode.TAILCALL: case opcode.APPCALL, opcode.TAILCALL:
return util.Fixed8FromInt64(10) return toFixed8(10)
case opcode.SYSCALL: case opcode.SYSCALL:
interopID := vm.GetInteropID(parameter) interopID := vm.GetInteropID(parameter)
return getSyscallPrice(v, interopID) return getSyscallPrice(v, interopID)
case opcode.SHA1, opcode.SHA256: case opcode.SHA1, opcode.SHA256:
return util.Fixed8FromInt64(10) return toFixed8(10)
case opcode.HASH160, opcode.HASH256: case opcode.HASH160, opcode.HASH256:
return util.Fixed8FromInt64(20) return toFixed8(20)
case opcode.CHECKSIG, opcode.VERIFY: case opcode.CHECKSIG, opcode.VERIFY:
return util.Fixed8FromInt64(100) return toFixed8(100)
case opcode.CHECKMULTISIG: case opcode.CHECKMULTISIG:
estack := v.Estack() estack := v.Estack()
if estack.Len() == 0 { if estack.Len() == 0 {
return util.Fixed8FromInt64(1) return toFixed8(1)
} }
var cost int var cost int
@ -48,21 +48,25 @@ func getPrice(v *vm.VM, op opcode.Opcode, parameter []byte) util.Fixed8 {
} }
if cost < 1 { if cost < 1 {
return util.Fixed8FromInt64(1) return toFixed8(1)
} }
return util.Fixed8FromInt64(int64(100 * cost)) return toFixed8(int64(100 * cost))
default: default:
return util.Fixed8FromInt64(1) return toFixed8(1)
} }
} }
func toFixed8(n int64) util.Fixed8 {
return util.Fixed8(n * interopGasRatio)
}
// getSyscallPrice returns cost of executing syscall with provided id. // getSyscallPrice returns cost of executing syscall with provided id.
// Is SYSCALL is not found, cost is 1. // Is SYSCALL is not found, cost is 1.
func getSyscallPrice(v *vm.VM, id uint32) util.Fixed8 { func getSyscallPrice(v *vm.VM, id uint32) util.Fixed8 {
ifunc := v.GetInteropByID(id) ifunc := v.GetInteropByID(id)
if ifunc != nil && ifunc.Price > 0 { if ifunc != nil && ifunc.Price > 0 {
return util.Fixed8(ifunc.Price) * interopGasRatio return toFixed8(int64(ifunc.Price))
} }
const ( const (