refactor: modify CoreCallbackFunc to pass gasBurned as a parameter

iotaledger · Oct 25, 2023 · 0666326 · 0666326
1 parent acda2a7
commit 0666326
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/packages/isc/sandbox_interface.go b/packages/isc/sandbox_interface.go
@@ -148,7 +148,7 @@ type Privileged interface {
 	SendOnBehalfOf(caller ContractIdentity, metadata RequestParameters)
 }
 
-type CoreCallbackFunc func(contractPartition kv.KVStore)
+type CoreCallbackFunc func(contractPartition kv.KVStore, gasBurned uint64)
 
 // RequestParameters represents parameters of the on-ledger request. The output is build from these parameters
 type RequestParameters struct {

diff --git a/packages/vm/core/evm/evmimpl/impl.go b/packages/vm/core/evm/evmimpl/impl.go
@@ -154,7 +154,7 @@ func applyTransaction(ctx isc.Sandbox) dict.Dict {
 
 	// make sure we always store the EVM tx/receipt in the BlockchainDB, even
 	// if the ISC request is reverted
-	ctx.Privileged().OnWriteReceipt(func(evmPartition kv.KVStore) {
+	ctx.Privileged().OnWriteReceipt(func(evmPartition kv.KVStore, _ uint64) {
 		saveExecutedTx(evmPartition, chainInfo, tx, receipt)
 	})
 	// revert the changes in the state / txbuilder in case of error
@@ -465,9 +465,9 @@ func newL1Deposit(ctx isc.Sandbox) dict.Dict {
 	}
 	receipt.Bloom = types.CreateBloom(types.Receipts{receipt})
 
-	ctx.Privileged().OnWriteReceipt(func(evmPartition kv.KVStore) {
-		receipt.GasUsed = gas.ISCGasBurnedToEVM(ctx.Gas().Burned(), &chainInfo.GasFeePolicy.EVMGasRatio)
-		receipt.CumulativeGasUsed = createBlockchainDB(ctx.State(), chainInfo).GetPendingCumulativeGasUsed() + receipt.GasUsed
+	ctx.Privileged().OnWriteReceipt(func(evmPartition kv.KVStore, gasBurned uint64) {
+		receipt.GasUsed = gas.ISCGasBurnedToEVM(gasBurned, &chainInfo.GasFeePolicy.EVMGasRatio)
+		receipt.CumulativeGasUsed = createBlockchainDB(evmPartition, chainInfo).GetPendingCumulativeGasUsed() + receipt.GasUsed
 		createBlockchainDB(evmPartition, ctx.ChainInfo()).AddTransaction(tx, receipt)
 	})
 

diff --git a/packages/vm/vmimpl/internal.go b/packages/vm/vmimpl/internal.go
@@ -170,7 +170,7 @@ func (reqctx *requestContext) writeReceiptToBlockLog(vmError *isc.VMError) *bloc
 	}
 	for _, f := range reqctx.onWriteReceipt {
 		reqctx.callCore(corecontracts.All[f.contract], func(s kv.KVStore) {
-			f.callback(s)
+			f.callback(s, receipt.GasBurned)
 		})
 	}
 	return receipt