Keep deprecated precompiles in cancun (as deprecated) (#663)

* keep deprecatedContract behavior for previously deployed contracts * avoid modifying globals * set timestamps in chain config
ava-labs · Sep 30, 2024 · 39516a3 · 39516a3
1 parent 7a5204d
commit 39516a3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/core/state_transition_test.go b/core/state_transition_test.go
@@ -142,7 +142,7 @@ func TestNativeAssetContractCall(t *testing.T) {
  makeTx(1, contractAddr, common.Big0, 100_000, big.NewInt(params.LaunchMinGasPrice), nil), // No input data is necessary, since this will hit the contract's fallback function.
  }
 
- phase6Tests := map[string]stateTransitionTest{
+ tests := map[string]stateTransitionTest{
  "phase5": {
  config: params.TestApricotPhase5Config,
  txs: txs,
@@ -167,9 +167,21 @@ func TestNativeAssetContractCall(t *testing.T) {
  gasUsed: []uint64{132091, 21618},
  want: "",
  },
+ "durango": {
+ config: params.TestDurangoChainConfig,
+ txs: txs,
+ gasUsed: []uint64{132117, 21618},
+ want: "",
+ },
+ "etna": {
+ config: params.TestEtnaChainConfig,
+ txs: txs,
+ gasUsed: []uint64{132117, 21618},
+ want: "",
+ },
  }
 
- for name, stTest := range phase6Tests {
+ for name, stTest := range tests {
  t.Run(name, func(t *testing.T) {
  executeStateTransitionTest(t, stTest)
  })

diff --git a/core/vm/contracts.go b/core/vm/contracts.go
@@ -172,6 +172,9 @@ var PrecompiledContractsCancun = map[common.Address]contract.StatefulPrecompiled
  common.BytesToAddress([]byte{8}): newWrappedPrecompiledContract(&bn256PairingIstanbul{}),
  common.BytesToAddress([]byte{9}): newWrappedPrecompiledContract(&blake2F{}),
  common.BytesToAddress([]byte{0x0a}): newWrappedPrecompiledContract(&kzgPointEvaluation{}),
+ genesisContractAddr: &deprecatedContract{},
+ NativeAssetBalanceAddr: &deprecatedContract{},
+ NativeAssetCallAddr: &deprecatedContract{},
 }
 
 // PrecompiledContractsBLS contains the set of pre-compiled Ethereum

diff --git a/params/config.go b/params/config.go
@@ -446,6 +446,7 @@ var (
  MuirGlacierBlock: big.NewInt(0),
  BerlinBlock: big.NewInt(0),
  LondonBlock: big.NewInt(0),
+ ShanghaiTime: utils.NewUint64(0),
  NetworkUpgrades: NetworkUpgrades{
  ApricotPhase1BlockTimestamp: utils.NewUint64(0),
  ApricotPhase2BlockTimestamp: utils.NewUint64(0),
@@ -478,6 +479,8 @@ var (
  MuirGlacierBlock: big.NewInt(0),
  BerlinBlock: big.NewInt(0),
  LondonBlock: big.NewInt(0),
+ ShanghaiTime: utils.NewUint64(0),
+ CancunTime: utils.NewUint64(0),
  NetworkUpgrades: NetworkUpgrades{
  ApricotPhase1BlockTimestamp: utils.NewUint64(0),
  ApricotPhase2BlockTimestamp: utils.NewUint64(0),