forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-24 13:46:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

cleanup

Browse source 
Co-authored-by: Felix Lange <fjl@twurst.com>
This commit is contained in:
Kevaundray Wedderburn 2025-07-10 23:08:27 +01:00
parent 6de5aa5091
commit adf6119e88
1 changed files with 13 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
core/vm/contracts.go
View file

@ -466,35 +466,24 @@ func osakaMultComplexity(x uint64) *uint256.Int {
func calculateIterationCount(expLen uint64, expHead *uint256.Int, multiplier uint64) uint64 { func calculateIterationCount(expLen uint64, expHead *uint256.Int, multiplier uint64) uint64 {
var iterationCount uint64 var iterationCount uint64
if expLen <= 32 && expHead.IsZero() { // For large exponents (expLen > 32), add (expLen - 32) * multiplier
iterationCount = 0 if expLen > 32 {
} else if expLen <= 32 {
// For small exponents, use MSB position - 1
if bitLen := expHead.BitLen(); bitLen > 0 {
iterationCount = uint64(bitLen - 1)
}
} else {
// For large exponents: (expLen - 32) * multiplier + MSB position - 1
iterationCount = (expLen - 32) * multiplier iterationCount = (expLen - 32) * multiplier
if bitLen := expHead.BitLen(); bitLen > 0 { }
iterationCount += uint64(bitLen - 1)
} // Add the MSB position - 1 if expHead is non-zero
if bitLen := expHead.BitLen(); bitLen > 0 {
iterationCount += uint64(bitLen - 1)
} }
// Return at least 1 // Return at least 1
if iterationCount == 0 { return max(iterationCount, 1)
return 1
}
return iterationCount
} }
// byzantiumGasCalc calculates the gas cost for the modexp precompile using Byzantium rules. // byzantiumGasCalc calculates the gas cost for the modexp precompile using Byzantium rules.
func byzantiumGasCalc(baseLen, expLen, modLen uint64, expHead *uint256.Int) uint64 { func byzantiumGasCalc(baseLen, expLen, modLen uint64, expHead *uint256.Int) uint64 {
// Calculate max(baseLen, modLen) // Calculate max(baseLen, modLen)
maxLen := baseLen maxLen := max(baseLen, modLen)
if modLen > maxLen {
maxLen = modLen
}
// Calculate multiplication complexity // Calculate multiplication complexity
multComplexity := byzantiumMultComplexity(maxLen) multComplexity := byzantiumMultComplexity(maxLen)
@ -516,10 +505,7 @@ func byzantiumGasCalc(baseLen, expLen, modLen uint64, expHead *uint256.Int) uint
// berlinGasCalc calculates the gas cost for the modexp precompile using Berlin rules. // berlinGasCalc calculates the gas cost for the modexp precompile using Berlin rules.
func berlinGasCalc(baseLen, expLen, modLen uint64, expHead *uint256.Int) uint64 { func berlinGasCalc(baseLen, expLen, modLen uint64, expHead *uint256.Int) uint64 {
// Calculate max(baseLen, modLen) // Calculate max(baseLen, modLen)
maxLen := baseLen maxLen := max(baseLen, modLen)
if modLen > maxLen {
maxLen = modLen
}
// Calculate multiplication complexity // Calculate multiplication complexity
multComplexity := berlinMultComplexity(maxLen) multComplexity := berlinMultComplexity(maxLen)
@ -537,20 +523,13 @@ func berlinGasCalc(baseLen, expLen, modLen uint64, expHead *uint256.Int) uint64
} }
// Return at least berlinMinGas // Return at least berlinMinGas
gasUint64 := gas.Uint64() return max(gas.Uint64(), berlinMinGas)
if gasUint64 < berlinMinGas {
return berlinMinGas
}
return gasUint64
} }
// osakaGasCalc calculates the gas cost for the modexp precompile using Osaka rules. // osakaGasCalc calculates the gas cost for the modexp precompile using Osaka rules.
func osakaGasCalc(baseLen, expLen, modLen uint64, expHead *uint256.Int) uint64 { func osakaGasCalc(baseLen, expLen, modLen uint64, expHead *uint256.Int) uint64 {
// Calculate max(baseLen, modLen) // Calculate max(baseLen, modLen)
maxLen := baseLen maxLen := max(baseLen, modLen)
if modLen > maxLen {
maxLen = modLen
}
// Calculate multiplication complexity // Calculate multiplication complexity
multComplexity := osakaMultComplexity(maxLen) multComplexity := osakaMultComplexity(maxLen)
@ -568,11 +547,7 @@ func osakaGasCalc(baseLen, expLen, modLen uint64, expHead *uint256.Int) uint64 {
} }
// Return at least osakaMinGas // Return at least osakaMinGas
gasUint64 := gas.Uint64() return max(gas.Uint64(), osakaMinGas)
if gasUint64 < osakaMinGas {
return osakaMinGas
}
return gasUint64
} }
// RequiredGas returns the gas required to execute the pre-compiled contract. // RequiredGas returns the gas required to execute the pre-compiled contract.