Fixed precompiles - each precompile has 13 respective in-scope addres…

…ses, but support for addresses 1-9 is maintained
myexchworld · Feb 21, 2023 · caf0c54 · caf0c54
1 parent 6eb684f
commit caf0c54
Show file tree

Hide file tree

Showing 4 changed files with 241 additions and 95 deletions.
diff --git a/cmd/go-quai/config.go b/cmd/go-quai/config.go
@@ -28,6 +28,7 @@ import (
 	"gopkg.in/urfave/cli.v1"
 
 	"github.com/dominant-strategies/go-quai/cmd/utils"
+	"github.com/dominant-strategies/go-quai/core/vm"
 	"github.com/dominant-strategies/go-quai/eth/ethconfig"
 	"github.com/dominant-strategies/go-quai/internal/quaiapi"
 	"github.com/dominant-strategies/go-quai/log"
@@ -139,7 +140,7 @@ func makeConfigNode(ctx *cli.Context) (*node.Node, quaiConfig) {
 		cfg.Ethstats.URL = ctx.GlobalString(utils.QuaiStatsURLFlag.Name)
 	}
 	applyMetricConfig(ctx, &cfg)
-
+	vm.InitializePrecompiles()
 	return stack, cfg
 }
 

diff --git a/core/state_processor_test.go b/core/state_processor_test.go
@@ -44,6 +44,63 @@ func (c MockChainContext) GetHeader(common.Hash, uint64) *types.Header {
 	return c.blocks[1].Header()
 }
 
+func TestPrecompile(t *testing.T) {
+	// Create a simple chain to verify
+	var statedb *state.StateDB
+	gen := func(i int, b *BlockGen) {
+		statedb = b.statedb
+	}
+	var (
+		testdb = rawdb.NewMemoryDatabase()
+		gspec  = &Genesis{
+			Config: params.TestChainConfig,
+			Alloc: GenesisAlloc{
+				common.HexToAddress("0x71562b71999873DB5b286dF957af199Ec94617F7"): GenesisAccount{
+					Balance: big.NewInt(1000000000000000000), // 1 ether
+					Nonce:   0,
+				},
+			},
+			GasLimit:   []uint64{params.GenesisGasLimit, params.GenesisGasLimit, params.GenesisGasLimit},
+			Difficulty: []*big.Int{common.Big0, common.Big0, common.Big0},
+			ParentHash: []common.Hash{common.HexToHash("0"), common.HexToHash("0"), common.HexToHash("0")},
+			BaseFee:    []*big.Int{common.Big0, common.Big0, common.Big0},
+		}
+		genesis    = gspec.MustCommit(testdb)
+		signer     = types.LatestSigner(params.TestChainConfig)
+		testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")
+		addr       = crypto.PubkeyToAddress(testKey.PublicKey)
+		zero       = uint64(0)
+		gasLimit   = GasPool(params.GenesisGasLimit)
+	)
+	t.Log(addr)
+	common.NodeLocation = *addr.Location()
+	t.Log(common.NodeLocation.Name())
+	vm.InitializePrecompiles()
+
+	toAddr := common.BytesToAddress([]byte{1})
+	location := toAddr.Location()
+	t.Log(location.Name())
+	params.TestChainConfig.GenesisHash = genesis.Hash()
+	blocks, _ := GenerateChain(params.TestChainConfig, genesis, blake3pow.NewFaker(), testdb, 2, gen)
+	statedb.AddBalance(addr, big.NewInt(params.Ether*2)) // give me 2 eth
+	mockContext := MockChainContext{blocks}
+
+	inner_tx := types.InternalTx{ChainID: big.NewInt(1), Nonce: 0, GasTipCap: common.Big1, GasFeeCap: common.Big1, Gas: 100000, To: &toAddr, Value: big.NewInt(params.Ether)}
+	tx, err := types.SignTx(types.NewTx(&inner_tx), signer, testKey)
+	if err != nil {
+		t.Error(err.Error())
+		t.Fail()
+	}
+	receipt, err := ApplyTransaction(params.TestChainConfig, mockContext, &common.ZeroAddr, &gasLimit, statedb, blocks[1].Header(), tx, &zero, vm.Config{NoBaseFee: true})
+	if err != nil {
+		t.Error(err.Error())
+		t.Fail()
+	}
+	t.Log(*receipt)
+	t.Log(receipt.Status)
+
+}
+
 func TestCreateETX(t *testing.T) {
 	// Create a simple chain to verify
 	var statedb *state.StateDB

diff --git a/core/vm/contracts.go b/core/vm/contracts.go
@@ -41,90 +41,185 @@ type PrecompiledContract interface {
 	Run(input []byte) ([]byte, error) // Run runs the precompiled contract
 }
 
-// PrecompiledContractsHomestead contains the default set of pre-compiled Ethereum
-// contracts used in the Frontier and Homestead releases.
-var PrecompiledContractsHomestead = map[common.Address]PrecompiledContract{
-	common.BytesToAddress([]byte{1}): &ecrecover{},
-	common.BytesToAddress([]byte{2}): &sha256hash{},
-	common.BytesToAddress([]byte{3}): &ripemd160hash{},
-	common.BytesToAddress([]byte{4}): &dataCopy{},
-}
-
-// PrecompiledContractsByzantium contains the default set of pre-compiled Ethereum
-// contracts used in the Byzantium release.
-var PrecompiledContractsByzantium = map[common.Address]PrecompiledContract{
-	common.BytesToAddress([]byte{1}): &ecrecover{},
-	common.BytesToAddress([]byte{2}): &sha256hash{},
-	common.BytesToAddress([]byte{3}): &ripemd160hash{},
-	common.BytesToAddress([]byte{4}): &dataCopy{},
-	common.BytesToAddress([]byte{5}): &bigModExp{eip2565: false},
-	common.BytesToAddress([]byte{6}): &bn256AddByzantium{},
-	common.BytesToAddress([]byte{7}): &bn256ScalarMulByzantium{},
-	common.BytesToAddress([]byte{8}): &bn256PairingByzantium{},
-}
-
-// PrecompiledContractsIstanbul contains the default set of pre-compiled Ethereum
-// contracts used in the Istanbul release.
-var PrecompiledContractsIstanbul = map[common.Address]PrecompiledContract{
-	common.BytesToAddress([]byte{1}): &ecrecover{},
-	common.BytesToAddress([]byte{2}): &sha256hash{},
-	common.BytesToAddress([]byte{3}): &ripemd160hash{},
-	common.BytesToAddress([]byte{4}): &dataCopy{},
-	common.BytesToAddress([]byte{5}): &bigModExp{eip2565: false},
-	common.BytesToAddress([]byte{6}): &bn256AddIstanbul{},
-	common.BytesToAddress([]byte{7}): &bn256ScalarMulIstanbul{},
-	common.BytesToAddress([]byte{8}): &bn256PairingIstanbul{},
-	common.BytesToAddress([]byte{9}): &blake2F{},
-}
-
-// PrecompiledContractsBerlin contains the default set of pre-compiled Ethereum
-// contracts used in the Berlin release.
-var PrecompiledContractsBerlin = map[common.Address]PrecompiledContract{
-	common.BytesToAddress([]byte{1}): &ecrecover{},
-	common.BytesToAddress([]byte{2}): &sha256hash{},
-	common.BytesToAddress([]byte{3}): &ripemd160hash{},
-	common.BytesToAddress([]byte{4}): &dataCopy{},
-	common.BytesToAddress([]byte{5}): &bigModExp{eip2565: true},
-	common.BytesToAddress([]byte{6}): &bn256AddIstanbul{},
-	common.BytesToAddress([]byte{7}): &bn256ScalarMulIstanbul{},
-	common.BytesToAddress([]byte{8}): &bn256PairingIstanbul{},
-	common.BytesToAddress([]byte{9}): &blake2F{},
+var TranslatedAddresses = map[common.Address]int{
+	common.BytesToAddress([]byte{1}): 0,
+	common.BytesToAddress([]byte{2}): 1,
+	common.BytesToAddress([]byte{3}): 2,
+	common.BytesToAddress([]byte{4}): 3,
+	common.BytesToAddress([]byte{5}): 4,
+	common.BytesToAddress([]byte{6}): 5,
+	common.BytesToAddress([]byte{7}): 6,
+	common.BytesToAddress([]byte{8}): 7,
+	common.BytesToAddress([]byte{9}): 8,
 }
 
 var (
-	PrecompiledAddressesBerlin    []common.Address
-	PrecompiledAddressesIstanbul  []common.Address
-	PrecompiledAddressesByzantium []common.Address
-	PrecompiledAddressesHomestead []common.Address
+	PrecompiledContracts map[common.Address]PrecompiledContract = make(map[common.Address]PrecompiledContract)
+	PrecompiledAddresses map[string][]common.Address            = make(map[string][]common.Address)
 )
 
+func InitializePrecompiles() {
+	PrecompiledContracts[PrecompiledAddresses[common.NodeLocation.Name()][0]] = &ecrecover{}
+	PrecompiledContracts[PrecompiledAddresses[common.NodeLocation.Name()][1]] = &sha256hash{}
+	PrecompiledContracts[PrecompiledAddresses[common.NodeLocation.Name()][2]] = &ripemd160hash{}
+	PrecompiledContracts[PrecompiledAddresses[common.NodeLocation.Name()][3]] = &dataCopy{}
+	PrecompiledContracts[PrecompiledAddresses[common.NodeLocation.Name()][4]] = &bigModExp{eip2565: true}
+	PrecompiledContracts[PrecompiledAddresses[common.NodeLocation.Name()][5]] = &bn256AddIstanbul{}
+	PrecompiledContracts[PrecompiledAddresses[common.NodeLocation.Name()][6]] = &bn256ScalarMulIstanbul{}
+	PrecompiledContracts[PrecompiledAddresses[common.NodeLocation.Name()][7]] = &bn256PairingIstanbul{}
+	PrecompiledContracts[PrecompiledAddresses[common.NodeLocation.Name()][8]] = &blake2F{}
+}
+
 func init() {
-	for k := range PrecompiledContractsHomestead {
-		PrecompiledAddressesHomestead = append(PrecompiledAddressesHomestead, k)
-	}
-	for k := range PrecompiledContractsByzantium {
-		PrecompiledAddressesByzantium = append(PrecompiledAddressesByzantium, k)
-	}
-	for k := range PrecompiledContractsIstanbul {
-		PrecompiledAddressesIstanbul = append(PrecompiledAddressesIstanbul, k)
-	}
-	for k := range PrecompiledContractsBerlin {
-		PrecompiledAddressesBerlin = append(PrecompiledAddressesBerlin, k)
+
+	PrecompiledAddresses["prime"] = []common.Address{
+		common.BytesToAddress([]byte{1}),
+		common.BytesToAddress([]byte{2}),
+		common.BytesToAddress([]byte{3}),
+		common.BytesToAddress([]byte{4}),
+		common.BytesToAddress([]byte{5}),
+		common.BytesToAddress([]byte{6}),
+		common.BytesToAddress([]byte{7}),
+		common.BytesToAddress([]byte{8}),
+		common.BytesToAddress([]byte{9}),
+	}
+	PrecompiledAddresses["cyprus"] = []common.Address{
+		common.HexToAddress("0x0A00000000000000000000000000000000000001"),
+		common.HexToAddress("0x0A00000000000000000000000000000000000002"),
+		common.HexToAddress("0x0A00000000000000000000000000000000000003"),
+		common.HexToAddress("0x0A00000000000000000000000000000000000004"),
+		common.HexToAddress("0x0A00000000000000000000000000000000000005"),
+		common.HexToAddress("0x0A00000000000000000000000000000000000006"),
+		common.HexToAddress("0x0A00000000000000000000000000000000000007"),
+		common.HexToAddress("0x0A00000000000000000000000000000000000008"),
+		common.HexToAddress("0x0A00000000000000000000000000000000000009"),
+	}
+	PrecompiledAddresses["cyprus1"] = []common.Address{
+		common.HexToAddress("0x1400000000000000000000000000000000000001"),
+		common.HexToAddress("0x1400000000000000000000000000000000000002"),
+		common.HexToAddress("0x1400000000000000000000000000000000000003"),
+		common.HexToAddress("0x1400000000000000000000000000000000000004"),
+		common.HexToAddress("0x1400000000000000000000000000000000000005"),
+		common.HexToAddress("0x1400000000000000000000000000000000000006"),
+		common.HexToAddress("0x1400000000000000000000000000000000000007"),
+		common.HexToAddress("0x1400000000000000000000000000000000000008"),
+		common.HexToAddress("0x1400000000000000000000000000000000000009"),
+	}
+	PrecompiledAddresses["cyprus2"] = []common.Address{
+		common.HexToAddress("0x1E00000000000000000000000000000000000001"),
+		common.HexToAddress("0x1E00000000000000000000000000000000000002"),
+		common.HexToAddress("0x1E00000000000000000000000000000000000003"),
+		common.HexToAddress("0x1E00000000000000000000000000000000000004"),
+		common.HexToAddress("0x1E00000000000000000000000000000000000005"),
+		common.HexToAddress("0x1E00000000000000000000000000000000000006"),
+		common.HexToAddress("0x1E00000000000000000000000000000000000007"),
+		common.HexToAddress("0x1E00000000000000000000000000000000000008"),
+		common.HexToAddress("0x1E00000000000000000000000000000000000009"),
+	}
+	PrecompiledAddresses["cyprus3"] = []common.Address{
+		common.HexToAddress("0x2800000000000000000000000000000000000001"),
+		common.HexToAddress("0x2800000000000000000000000000000000000002"),
+		common.HexToAddress("0x2800000000000000000000000000000000000003"),
+		common.HexToAddress("0x2800000000000000000000000000000000000004"),
+		common.HexToAddress("0x2800000000000000000000000000000000000005"),
+		common.HexToAddress("0x2800000000000000000000000000000000000006"),
+		common.HexToAddress("0x2800000000000000000000000000000000000007"),
+		common.HexToAddress("0x2800000000000000000000000000000000000008"),
+		common.HexToAddress("0x2800000000000000000000000000000000000009"),
+	}
+	PrecompiledAddresses["paxos"] = []common.Address{
+		common.HexToAddress("0x3200000000000000000000000000000000000001"),
+		common.HexToAddress("0x3200000000000000000000000000000000000002"),
+		common.HexToAddress("0x3200000000000000000000000000000000000003"),
+		common.HexToAddress("0x3200000000000000000000000000000000000004"),
+		common.HexToAddress("0x3200000000000000000000000000000000000005"),
+		common.HexToAddress("0x3200000000000000000000000000000000000006"),
+		common.HexToAddress("0x3200000000000000000000000000000000000007"),
+		common.HexToAddress("0x3200000000000000000000000000000000000008"),
+		common.HexToAddress("0x3200000000000000000000000000000000000009"),
+	}
+	PrecompiledAddresses["paxos1"] = []common.Address{
+		common.HexToAddress("0x3C00000000000000000000000000000000000001"),
+		common.HexToAddress("0x3C00000000000000000000000000000000000002"),
+		common.HexToAddress("0x3C00000000000000000000000000000000000003"),
+		common.HexToAddress("0x3C00000000000000000000000000000000000004"),
+		common.HexToAddress("0x3C00000000000000000000000000000000000005"),
+		common.HexToAddress("0x3C00000000000000000000000000000000000006"),
+		common.HexToAddress("0x3C00000000000000000000000000000000000007"),
+		common.HexToAddress("0x3C00000000000000000000000000000000000008"),
+		common.HexToAddress("0x3C00000000000000000000000000000000000009"),
+	}
+	PrecompiledAddresses["paxos2"] = []common.Address{
+		common.HexToAddress("0x4600000000000000000000000000000000000001"),
+		common.HexToAddress("0x4600000000000000000000000000000000000002"),
+		common.HexToAddress("0x4600000000000000000000000000000000000003"),
+		common.HexToAddress("0x4600000000000000000000000000000000000004"),
+		common.HexToAddress("0x4600000000000000000000000000000000000005"),
+		common.HexToAddress("0x4600000000000000000000000000000000000006"),
+		common.HexToAddress("0x4600000000000000000000000000000000000007"),
+		common.HexToAddress("0x4600000000000000000000000000000000000008"),
+		common.HexToAddress("0x4600000000000000000000000000000000000009"),
+	}
+	PrecompiledAddresses["paxos3"] = []common.Address{
+		common.HexToAddress("0x5000000000000000000000000000000000000001"),
+		common.HexToAddress("0x5000000000000000000000000000000000000002"),
+		common.HexToAddress("0x5000000000000000000000000000000000000003"),
+		common.HexToAddress("0x5000000000000000000000000000000000000004"),
+		common.HexToAddress("0x5000000000000000000000000000000000000005"),
+		common.HexToAddress("0x5000000000000000000000000000000000000006"),
+		common.HexToAddress("0x5000000000000000000000000000000000000007"),
+		common.HexToAddress("0x5000000000000000000000000000000000000008"),
+		common.HexToAddress("0x5000000000000000000000000000000000000009"),
+	}
+	PrecompiledAddresses["hydra"] = []common.Address{
+		common.HexToAddress("0x5A00000000000000000000000000000000000001"),
+		common.HexToAddress("0x5A00000000000000000000000000000000000002"),
+		common.HexToAddress("0x5A00000000000000000000000000000000000003"),
+		common.HexToAddress("0x5A00000000000000000000000000000000000004"),
+		common.HexToAddress("0x5A00000000000000000000000000000000000005"),
+		common.HexToAddress("0x5A00000000000000000000000000000000000006"),
+		common.HexToAddress("0x5A00000000000000000000000000000000000007"),
+		common.HexToAddress("0x5A00000000000000000000000000000000000008"),
+		common.HexToAddress("0x5A00000000000000000000000000000000000009"),
+	}
+	PrecompiledAddresses["hydra1"] = []common.Address{
+		common.HexToAddress("0x6400000000000000000000000000000000000001"),
+		common.HexToAddress("0x6400000000000000000000000000000000000002"),
+		common.HexToAddress("0x6400000000000000000000000000000000000003"),
+		common.HexToAddress("0x6400000000000000000000000000000000000004"),
+		common.HexToAddress("0x6400000000000000000000000000000000000005"),
+		common.HexToAddress("0x6400000000000000000000000000000000000006"),
+		common.HexToAddress("0x6400000000000000000000000000000000000007"),
+		common.HexToAddress("0x6400000000000000000000000000000000000008"),
+		common.HexToAddress("0x6400000000000000000000000000000000000009"),
+	}
+	PrecompiledAddresses["hydra2"] = []common.Address{
+		common.HexToAddress("0x6E00000000000000000000000000000000000001"),
+		common.HexToAddress("0x6E00000000000000000000000000000000000002"),
+		common.HexToAddress("0x6E00000000000000000000000000000000000003"),
+		common.HexToAddress("0x6E00000000000000000000000000000000000004"),
+		common.HexToAddress("0x6E00000000000000000000000000000000000005"),
+		common.HexToAddress("0x6E00000000000000000000000000000000000006"),
+		common.HexToAddress("0x6E00000000000000000000000000000000000007"),
+		common.HexToAddress("0x6E00000000000000000000000000000000000008"),
+		common.HexToAddress("0x6E00000000000000000000000000000000000009"),
+	}
+	PrecompiledAddresses["hydra3"] = []common.Address{
+		common.HexToAddress("0x7800000000000000000000000000000000000001"),
+		common.HexToAddress("0x7800000000000000000000000000000000000002"),
+		common.HexToAddress("0x7800000000000000000000000000000000000003"),
+		common.HexToAddress("0x7800000000000000000000000000000000000004"),
+		common.HexToAddress("0x7800000000000000000000000000000000000005"),
+		common.HexToAddress("0x7800000000000000000000000000000000000006"),
+		common.HexToAddress("0x7800000000000000000000000000000000000007"),
+		common.HexToAddress("0x7800000000000000000000000000000000000008"),
+		common.HexToAddress("0x7800000000000000000000000000000000000009"),
 	}
 }
 
 // ActivePrecompiles returns the precompiles enabled with the current configuration.
 func ActivePrecompiles(rules params.Rules) []common.Address {
-	switch {
-	case rules.IsBerlin:
-		return PrecompiledAddressesBerlin
-	case rules.IsIstanbul:
-		return PrecompiledAddressesIstanbul
-	case rules.IsByzantium:
-		return PrecompiledAddressesByzantium
-	default:
-		return PrecompiledAddressesHomestead
-	}
+	return PrecompiledAddresses[common.NodeLocation.Name()]
 }
 
 // RunPrecompiledContract runs and evaluates the output of a precompiled contract.
@@ -251,9 +346,10 @@ var (
 // modexpMultComplexity implements bigModexp multComplexity formula, as defined in EIP-198
 //
 // def mult_complexity(x):
-//    if x <= 64: return x ** 2
-//    elif x <= 1024: return x ** 2 // 4 + 96 * x - 3072
-//    else: return x ** 2 // 16 + 480 * x - 199680
+//
+//	if x <= 64: return x ** 2
+//	elif x <= 1024: return x ** 2 // 4 + 96 * x - 3072
+//	else: return x ** 2 // 16 + 480 * x - 199680
 //
 // where is x is max(length_of_MODULUS, length_of_BASE)
 func modexpMultComplexity(x *big.Int) *big.Int {