mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-24 05:36:46 +00:00
core/vm: rename some functions
This commit is contained in:
parent
10fd96bcb5
commit
f8b8610d6d
1 changed files with 11 additions and 11 deletions
|
|
@ -462,9 +462,9 @@ func osakaMultComplexity(x uint64) uint64 {
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
// calculateIterationCount calculates the number of iterations for the modexp precompile.
|
// modexpIterationCount calculates the number of iterations for the modexp precompile.
|
||||||
// This is the adjusted exponent length used in gas calculation.
|
// This is the adjusted exponent length used in gas calculation.
|
||||||
func calculateIterationCount(expLen uint64, expHead uint256.Int, multiplier uint64) uint64 {
|
func modexpIterationCount(expLen uint64, expHead uint256.Int, multiplier uint64) uint64 {
|
||||||
var iterationCount uint64
|
var iterationCount uint64
|
||||||
|
|
||||||
// For large exponents (expLen > 32), add (expLen - 32) * multiplier
|
// For large exponents (expLen > 32), add (expLen - 32) * multiplier
|
||||||
|
|
@ -492,7 +492,7 @@ func byzantiumGasCalc(baseLen, expLen, modLen uint64, expHead uint256.Int) uint6
|
||||||
if multComplexity == math.MaxUint64 {
|
if multComplexity == math.MaxUint64 {
|
||||||
return math.MaxUint64
|
return math.MaxUint64
|
||||||
}
|
}
|
||||||
iterationCount := calculateIterationCount(expLen, expHead, multiplier)
|
iterationCount := modexpIterationCount(expLen, expHead, multiplier)
|
||||||
|
|
||||||
// Calculate gas: (multComplexity * iterationCount) / divisor
|
// Calculate gas: (multComplexity * iterationCount) / divisor
|
||||||
carry, gas := bits.Mul64(iterationCount, multComplexity)
|
carry, gas := bits.Mul64(iterationCount, multComplexity)
|
||||||
|
|
@ -503,8 +503,8 @@ func byzantiumGasCalc(baseLen, expLen, modLen uint64, expHead uint256.Int) uint6
|
||||||
return gas
|
return gas
|
||||||
}
|
}
|
||||||
|
|
||||||
// berlinGasCalc calculates the gas cost for the modexp precompile using Berlin rules.
|
// berlinModexpGas calculates the gas cost for the modexp precompile using Berlin rules.
|
||||||
func berlinGasCalc(baseLen, expLen, modLen uint64, expHead uint256.Int) uint64 {
|
func berlinModexpGas(baseLen, expLen, modLen uint64, expHead uint256.Int) uint64 {
|
||||||
const (
|
const (
|
||||||
multiplier = 8
|
multiplier = 8
|
||||||
divisor = 3
|
divisor = 3
|
||||||
|
|
@ -516,7 +516,7 @@ func berlinGasCalc(baseLen, expLen, modLen uint64, expHead uint256.Int) uint64 {
|
||||||
if multComplexity == math.MaxUint64 {
|
if multComplexity == math.MaxUint64 {
|
||||||
return math.MaxUint64
|
return math.MaxUint64
|
||||||
}
|
}
|
||||||
iterationCount := calculateIterationCount(expLen, expHead, multiplier)
|
iterationCount := modexpIterationCount(expLen, expHead, multiplier)
|
||||||
|
|
||||||
// Calculate gas: (multComplexity * iterationCount) / divisor
|
// Calculate gas: (multComplexity * iterationCount) / divisor
|
||||||
carry, gas := bits.Mul64(iterationCount, multComplexity)
|
carry, gas := bits.Mul64(iterationCount, multComplexity)
|
||||||
|
|
@ -527,8 +527,8 @@ func berlinGasCalc(baseLen, expLen, modLen uint64, expHead uint256.Int) uint64 {
|
||||||
return max(gas, minGas)
|
return max(gas, minGas)
|
||||||
}
|
}
|
||||||
|
|
||||||
// osakaGasCalc calculates the gas cost for the modexp precompile using Osaka rules.
|
// osakaModexpGas calculates the gas cost for the modexp precompile using Osaka rules.
|
||||||
func osakaGasCalc(baseLen, expLen, modLen uint64, expHead uint256.Int) uint64 {
|
func osakaModexpGas(baseLen, expLen, modLen uint64, expHead uint256.Int) uint64 {
|
||||||
const (
|
const (
|
||||||
multiplier = 16
|
multiplier = 16
|
||||||
divisor = 3
|
divisor = 3
|
||||||
|
|
@ -540,7 +540,7 @@ func osakaGasCalc(baseLen, expLen, modLen uint64, expHead uint256.Int) uint64 {
|
||||||
if multComplexity == math.MaxUint64 {
|
if multComplexity == math.MaxUint64 {
|
||||||
return math.MaxUint64
|
return math.MaxUint64
|
||||||
}
|
}
|
||||||
iterationCount := calculateIterationCount(expLen, expHead, multiplier)
|
iterationCount := modexpIterationCount(expLen, expHead, multiplier)
|
||||||
|
|
||||||
// Calculate gas: (multComplexity * iterationCount) / osakaDivisor
|
// Calculate gas: (multComplexity * iterationCount) / osakaDivisor
|
||||||
carry, gas := bits.Mul64(iterationCount, multComplexity)
|
carry, gas := bits.Mul64(iterationCount, multComplexity)
|
||||||
|
|
@ -591,9 +591,9 @@ func (c *bigModExp) RequiredGas(input []byte) uint64 {
|
||||||
|
|
||||||
// Choose the appropriate gas calculation based on the EIP flags
|
// Choose the appropriate gas calculation based on the EIP flags
|
||||||
if c.eip7883 {
|
if c.eip7883 {
|
||||||
return osakaGasCalc(baseLen, expLen, modLen, expHead)
|
return osakaModexpGas(baseLen, expLen, modLen, expHead)
|
||||||
} else if c.eip2565 {
|
} else if c.eip2565 {
|
||||||
return berlinGasCalc(baseLen, expLen, modLen, expHead)
|
return berlinModexpGas(baseLen, expLen, modLen, expHead)
|
||||||
} else {
|
} else {
|
||||||
return byzantiumGasCalc(baseLen, expLen, modLen, expHead)
|
return byzantiumGasCalc(baseLen, expLen, modLen, expHead)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue