Skip to content

refactor: use int64 for ExUnits #1156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 22, 2025
Merged

refactor: use int64 for ExUnits #1156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ledger/alonzo/pparams.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,12 @@ func (p *AlonzoProtocolParameters) UpdateFromGenesis(
p.CollateralPercentage = genesis.CollateralPercentage
p.MaxCollateralInputs = genesis.MaxCollateralInputs
p.MaxTxExUnits = common.ExUnits{
Memory: uint64(genesis.MaxTxExUnits.Mem),
Steps: uint64(genesis.MaxTxExUnits.Steps),
Memory: int64(genesis.MaxTxExUnits.Mem), // nolint:gosec
Steps: int64(genesis.MaxTxExUnits.Steps), // nolint:gosec
}
p.MaxBlockExUnits = common.ExUnits{
Memory: uint64(genesis.MaxBlockExUnits.Mem),
Steps: uint64(genesis.MaxBlockExUnits.Steps),
Memory: int64(genesis.MaxBlockExUnits.Mem), // nolint:gosec
Steps: int64(genesis.MaxBlockExUnits.Steps), // nolint:gosec
}

if genesis.ExecutionPrices.Mem != nil &&
Expand Down Expand Up @@ -347,12 +347,12 @@ func (p *AlonzoProtocolParameters) Utxorpc() (*cardano.PParams, error) {
},
},
MaxExecutionUnitsPerTransaction: &cardano.ExUnits{
Memory: p.MaxTxExUnits.Memory,
Steps: p.MaxTxExUnits.Steps,
Memory: uint64(p.MaxTxExUnits.Memory),
Steps: uint64(p.MaxTxExUnits.Steps),
},
MaxExecutionUnitsPerBlock: &cardano.ExUnits{
Memory: p.MaxBlockExUnits.Memory,
Steps: p.MaxBlockExUnits.Steps,
Memory: uint64(p.MaxBlockExUnits.Memory),
Steps: uint64(p.MaxBlockExUnits.Steps),
},
}, nil
}
Expand Down
2 changes: 1 addition & 1 deletion ledger/alonzo/rules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func UtxoValidateExUnitsTooBigUtxo(
if !ok {
return errors.New("transaction is not expected type")
}
var totalSteps, totalMemory uint64
var totalSteps, totalMemory int64
for _, redeemer := range tmpTx.WitnessSet.WsRedeemers {
totalSteps += redeemer.ExUnits.Steps
totalMemory += redeemer.ExUnits.Memory
Expand Down
8 changes: 4 additions & 4 deletions ledger/babbage/pparams.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,12 +236,12 @@ func (p *BabbageProtocolParameters) Utxorpc() (*cardano.PParams, error) {
},
},
MaxExecutionUnitsPerTransaction: &cardano.ExUnits{
Memory: p.MaxTxExUnits.Memory,
Steps: p.MaxTxExUnits.Steps,
Memory: uint64(p.MaxTxExUnits.Memory),
Steps: uint64(p.MaxTxExUnits.Steps),
},
MaxExecutionUnitsPerBlock: &cardano.ExUnits{
Memory: p.MaxBlockExUnits.Memory,
Steps: p.MaxBlockExUnits.Steps,
Memory: uint64(p.MaxBlockExUnits.Memory),
Steps: uint64(p.MaxBlockExUnits.Steps),
},
}, nil
}
Expand Down
2 changes: 1 addition & 1 deletion ledger/babbage/rules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ func UtxoValidateExUnitsTooBigUtxo(
if !ok {
return errors.New("transaction is not expected type")
}
var totalSteps, totalMemory uint64
var totalSteps, totalMemory int64
for _, redeemer := range tmpTx.WitnessSet.WsRedeemers {
totalSteps += redeemer.ExUnits.Steps
totalMemory += redeemer.ExUnits.Memory
Expand Down
4 changes: 2 additions & 2 deletions ledger/common/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,8 +436,8 @@ func (i IssuerVkey) PoolId() string {
// ExUnits represents the steps and memory usage for script execution
type ExUnits struct {
cbor.StructAsArray
Memory uint64
Steps uint64
Memory int64
Steps int64
}

// GenesisRat is a convenience type for cbor.Rat
Expand Down
8 changes: 4 additions & 4 deletions ledger/common/script.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ func (s PlutusV3Script) Evaluate(scriptContext data.PlutusData, budget ExUnits)
machineBudget := cek.DefaultExBudget
if budget.Steps > 0 || budget.Memory > 0 {
machineBudget = cek.ExBudget{
Cpu: int64(budget.Steps), // nolint: gosec
Mem: int64(budget.Memory), // nolint: gosec
Cpu: budget.Steps,
Mem: budget.Memory,
}
}
// Decode raw script as bytestring to get actual script bytes
Expand Down Expand Up @@ -178,8 +178,8 @@ func (s PlutusV3Script) Evaluate(scriptContext data.PlutusData, budget ExUnits)
return usedExUnits, fmt.Errorf("execute script: %w", err)
}
consumedBudget := machineBudget.Sub(&machine.ExBudget)
usedExUnits.Memory = uint64(consumedBudget.Mem) // nolint:gosec
usedExUnits.Steps = uint64(consumedBudget.Cpu) // nolint:gosec
usedExUnits.Memory = consumedBudget.Mem
usedExUnits.Steps = consumedBudget.Cpu
return usedExUnits, nil
}

Expand Down
8 changes: 4 additions & 4 deletions ledger/conway/pparams.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,12 @@ func (p *ConwayProtocolParameters) Utxorpc() (*cardano.PParams, error) {
},
},
MaxExecutionUnitsPerTransaction: &cardano.ExUnits{
Memory: p.MaxTxExUnits.Memory,
Steps: p.MaxTxExUnits.Steps,
Memory: uint64(p.MaxTxExUnits.Memory),
Steps: uint64(p.MaxTxExUnits.Steps),
},
MaxExecutionUnitsPerBlock: &cardano.ExUnits{
Memory: p.MaxBlockExUnits.Memory,
Steps: p.MaxBlockExUnits.Steps,
Memory: uint64(p.MaxBlockExUnits.Memory),
Steps: uint64(p.MaxBlockExUnits.Steps),
},
}, nil
}
Expand Down
2 changes: 1 addition & 1 deletion ledger/conway/rules.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ func UtxoValidateExUnitsTooBigUtxo(
if !ok {
return errors.New("transaction is not expected type")
}
var totalSteps, totalMemory uint64
var totalSteps, totalMemory int64
for _, redeemer := range tmpTx.WitnessSet.WsRedeemers.Redeemers {
totalSteps += redeemer.ExUnits.Steps
totalMemory += redeemer.ExUnits.Memory
Expand Down