From f130cd6fca209370e9b1bc118eecbd9eb6fadebd Mon Sep 17 00:00:00 2001 From: Jakub Sztandera Date: Wed, 11 Nov 2020 18:59:48 +0100 Subject: [PATCH] Adjust virtual gas Signed-off-by: Jakub Sztandera --- chain/vm/gas_v0.go | 6 +++--- chain/vm/runtime.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/chain/vm/gas_v0.go b/chain/vm/gas_v0.go index df3709058..555ffeb11 100644 --- a/chain/vm/gas_v0.go +++ b/chain/vm/gas_v0.go @@ -133,13 +133,13 @@ func (pl *pricelistV0) OnMethodInvocation(value abi.TokenAmount, methodNum abi.M // OnIpldGet returns the gas used for storing an object func (pl *pricelistV0) OnIpldGet() GasCharge { - return newGasCharge("OnIpldGet", pl.ipldGetBase, 0) + return newGasCharge("OnIpldGet", pl.ipldGetBase, 0).WithVirtual(114617, 0) } // OnIpldPut returns the gas used for storing an object func (pl *pricelistV0) OnIpldPut(dataSize int) GasCharge { return newGasCharge("OnIpldPut", pl.ipldPutBase, int64(dataSize)*pl.ipldPutPerByte*pl.storageGasMulti). - WithExtra(dataSize) + WithExtra(dataSize).WithVirtual(400000, int64(dataSize)*1300) } // OnCreateActor returns the gas used for creating an actor @@ -208,7 +208,7 @@ func (pl *pricelistV0) OnVerifyPost(info proof2.WindowPoStVerifyInfo) GasCharge gasUsed /= 2 // XXX: this is an artificial discount } - return newGasCharge("OnVerifyPost", gasUsed, 0). + return newGasCharge("OnVerifyPost", gasUsed, 0).WithVirtual(117680921+43780len(info.ChallengedSectors), 0) WithExtra(map[string]interface{}{ "type": sectorSize, "size": len(info.ChallengedSectors), diff --git a/chain/vm/runtime.go b/chain/vm/runtime.go index 9107e6d7e..e8ad3265b 100644 --- a/chain/vm/runtime.go +++ b/chain/vm/runtime.go @@ -50,7 +50,7 @@ func (m *Message) ValueReceived() abi.TokenAmount { } // EnableGasTracing, if true, outputs gas tracing in execution traces. -var EnableGasTracing = false +var EnableGasTracing = true type Runtime struct { rt2.Message