Replace old packers

accounts/abi/bind/precompilebind/precompile_module_template.go

@@ -22,7 +22,7 @@ import (
 
 var _ contract.Configurator = &configurator{}
 
-// ConfigKey is the key used in json config files to specify this precompile precompileconfig.
+// ConfigKey is the key used in json config files to specify this precompile config.
 // must be unique across all precompiles.
 const ConfigKey = "{{decapitalise .Contract.Type}}Config"
 

precompile/allowlist/allowlist.go

@@ -170,14 +170,10 @@ func CreateAllowListPrecompile(precompileAddr common.Address) contract.StatefulP
 
 func CreateAllowListFunctions(precompileAddr common.Address) []*contract.StatefulPrecompileFunction {
 	setAdmin := contract.NewStatefulPrecompileFunction(setAdminSignature, createAllowListRoleSetter(precompileAddr, AdminRole))
-	setManager := contract.NewStatefulPrecompileFunctionWithActivator(setManagerSignature, createAllowListRoleSetter(precompileAddr, ManagerRole), isManagerRoleActivated)
+	setManager := contract.NewStatefulPrecompileFunctionWithActivator(setManagerSignature, createAllowListRoleSetter(precompileAddr, ManagerRole), contract.IsDUpgradeActivated)
 	setEnabled := contract.NewStatefulPrecompileFunction(setEnabledSignature, createAllowListRoleSetter(precompileAddr, EnabledRole))
 	setNone := contract.NewStatefulPrecompileFunction(setNoneSignature, createAllowListRoleSetter(precompileAddr, NoRole))
 	read := contract.NewStatefulPrecompileFunction(readAllowListSignature, createReadAllowList(precompileAddr))
 
 	return []*contract.StatefulPrecompileFunction{setAdmin, setManager, setEnabled, setNone, read}
 }
-
-func isManagerRoleActivated(evm contract.AccessibleState) bool {
-	return evm.GetChainConfig().IsDUpgrade(evm.GetBlockContext().Timestamp())
-}

precompile/contract/contract.go

@@ -22,7 +22,6 @@ type ActivationFunc func(AccessibleState) bool
 // StatefulPrecompileFunction defines a function implemented by a stateful precompile
 type StatefulPrecompileFunction struct {
 	// selector is the 4 byte function selector for this function
-	// This should be calculated from the function signature using CalculateFunctionSelector
 	selector []byte
 	// execute is performed when this function is selected
 	execute RunStatefulPrecompileFunc

precompile/contract/test_utils.go

@@ -0,0 +1,49 @@
+// (c) 2019-2020, Ava Labs, Inc. All rights reserved.
+// See the file LICENSE for licensing terms.
+
+package contract
+
+import (
+	"fmt"
+
+	"github.com/ethereum/go-ethereum/common"
+)
+
+// PackOrderedHashesWithSelector packs the function selector and ordered list of hashes into [dst]
+// byte slice.
+// assumes that [dst] has sufficient room for [functionSelector] and [hashes].
+// Kept for testing backwards compatibility.
+func PackOrderedHashesWithSelector(dst []byte, functionSelector []byte, hashes []common.Hash) error {
+	copy(dst[:len(functionSelector)], functionSelector)
+	return PackOrderedHashes(dst[len(functionSelector):], hashes)
+}
+
+// PackOrderedHashes packs the ordered list of [hashes] into the [dst] byte buffer.
+// assumes that [dst] has sufficient space to pack [hashes] or else this function will panic.
+// Kept for testing backwards compatibility.
+func PackOrderedHashes(dst []byte, hashes []common.Hash) error {
+	if len(dst) != len(hashes)*common.HashLength {
+		return fmt.Errorf("destination byte buffer has insufficient length (%d) for %d hashes", len(dst), len(hashes))
+	}
+
+	var (
+		start = 0
+		end   = common.HashLength
+	)
+	for _, hash := range hashes {
+		copy(dst[start:end], hash.Bytes())
+		start += common.HashLength
+		end += common.HashLength
+	}
+	return nil
+}
+
+// PackedHash returns packed the byte slice with common.HashLength from [packed]
+// at the given [index].
+// Assumes that [packed] is composed entirely of packed 32 byte segments.
+// Kept for testing backwards compatibility.
+func PackedHash(packed []byte, index int) []byte {
+	start := common.HashLength * index
+	end := start + common.HashLength
+	return packed[start:end]
+}

precompile/contract/utils.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/ava-labs/subnet-evm/accounts/abi"
 	"github.com/ava-labs/subnet-evm/vmerrs"
-	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 )
 
@@ -42,42 +41,6 @@ func DeductGas(suppliedGas uint64, requiredGas uint64) (uint64, error) {
 	return suppliedGas - requiredGas, nil
 }
 
-// PackOrderedHashesWithSelector packs the function selector and ordered list of hashes into [dst]
-// byte slice.
-// assumes that [dst] has sufficient room for [functionSelector] and [hashes].
-func PackOrderedHashesWithSelector(dst []byte, functionSelector []byte, hashes []common.Hash) error {
-	copy(dst[:len(functionSelector)], functionSelector)
-	return PackOrderedHashes(dst[len(functionSelector):], hashes)
-}
-
-// PackOrderedHashes packs the ordered list of [hashes] into the [dst] byte buffer.
-// assumes that [dst] has sufficient space to pack [hashes] or else this function will panic.
-func PackOrderedHashes(dst []byte, hashes []common.Hash) error {
-	if len(dst) != len(hashes)*common.HashLength {
-		return fmt.Errorf("destination byte buffer has insufficient length (%d) for %d hashes", len(dst), len(hashes))
-	}
-
-	var (
-		start = 0
-		end   = common.HashLength
-	)
-	for _, hash := range hashes {
-		copy(dst[start:end], hash.Bytes())
-		start += common.HashLength
-		end += common.HashLength
-	}
-	return nil
-}
-
-// PackedHash returns packed the byte slice with common.HashLength from [packed]
-// at the given [index].
-// Assumes that [packed] is composed entirely of packed 32 byte segments.
-func PackedHash(packed []byte, index int) []byte {
-	start := common.HashLength * index
-	end := start + common.HashLength
-	return packed[start:end]
-}
-
 // ParseABI parses the given ABI string and returns the parsed ABI.
 // If the ABI is invalid, it panics.
 func ParseABI(rawABI string) abi.ABI {
@@ -88,3 +51,7 @@ func ParseABI(rawABI string) abi.ABI {
 
 	return parsed
 }
+
+func IsDUpgradeActivated(evm AccessibleState) bool {
+	return evm.GetChainConfig().IsDUpgrade(evm.GetBlockContext().Timestamp())
+}

precompile/contracts/deployerallowlist/module.go

@@ -35,11 +35,14 @@ func init() {
 	}
 }
 
+// MakeConfig returns a new precompile config instance.
+// This is required for Marshal/Unmarshal the precompile config.
 func (*configurator) MakeConfig() precompileconfig.Config {
 	return new(Config)
 }
 
-// Configure configures [state] with the given [cfg] config.
+// Configure configures [state] with the given [cfg] precompileconfig.
+// This function is called by the EVM once per precompile contract activation.
 func (c *configurator) Configure(chainConfig precompileconfig.ChainConfig, cfg precompileconfig.Config, state contract.StateDB, blockContext contract.ConfigurationBlockContext) error {
 	config, ok := cfg.(*Config)
 	if !ok {

precompile/contracts/feemanager/config.go

@@ -46,6 +46,8 @@ func NewDisableConfig(blockTimestamp *uint64) *Config {
 	}
 }
 
+// Key returns the key for the FeeManager precompileconfig.
+// This should be the same key as used in the precompile module.
 func (*Config) Key() string { return ConfigKey }
 
 // Equal returns true if [cfg] is a [*FeeManagerConfig] and it has been configured identical to [c].
@@ -67,6 +69,7 @@ func (c *Config) Equal(cfg precompileconfig.Config) bool {
 	return c.InitialFeeConfig.Equal(other.InitialFeeConfig)
 }
 
+// Verify tries to verify Config and returns an error accordingly.
 func (c *Config) Verify(chainConfig precompileconfig.ChainConfig) error {
 	if err := c.AllowListConfig.Verify(chainConfig, c.Upgrade); err != nil {
 		return err

precompile/contracts/feemanager/contract.abi

@@ -0,0 +1,169 @@
+[
+    {
+      "inputs": [],
+      "name": "getFeeConfig",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "gasLimit",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "targetBlockRate",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "minBaseFee",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "targetGas",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "baseFeeChangeDenominator",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "minBlockGasCost",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "maxBlockGasCost",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "blockGasCostStep",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "getFeeConfigLastChangedAt",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "blockNumber",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "addr",
+          "type": "address"
+        }
+      ],
+      "name": "readAllowList",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "role",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "addr",
+          "type": "address"
+        }
+      ],
+      "name": "setAdmin",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "addr",
+          "type": "address"
+        }
+      ],
+      "name": "setEnabled",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "uint256",
+          "name": "gasLimit",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "targetBlockRate",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "minBaseFee",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "targetGas",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "baseFeeChangeDenominator",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "minBlockGasCost",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "maxBlockGasCost",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "blockGasCostStep",
+          "type": "uint256"
+        }
+      ],
+      "name": "setFeeConfig",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "addr",
+          "type": "address"
+        }
+      ],
+      "name": "setNone",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    }
+  ]