Use code generation for suave precompiles switch

core/vm/contracts_suave.go

@@ -324,7 +324,7 @@ func (b *suaveRuntime) buildEthBlock(blockArgs types.BuildBlockArgs, bid types.B
 }
 
 func (b *suaveRuntime) confidentialInputs() ([]byte, error) {
-	return nil, nil
+	return (&confidentialInputsPrecompile{}).RunConfidential(b.backend, nil)
 }
 
 func (b *suaveRuntime) confidentialStoreRetrieve(bidId types.BidId, key string) ([]byte, error) {

core/vm/suave.go

@@ -1,8 +1,6 @@
 package vm
 
 import (
-	"fmt"
-
 	"github.com/ethereum/go-ethereum/common"
 	suave "github.com/ethereum/go-ethereum/suave/core"
 )
@@ -51,37 +49,10 @@ func (p *SuavePrecompiledContractWrapper) Run(input []byte) ([]byte, error) {
 		},
 	}
 
-	switch p.addr {
-	case isConfidentialAddress:
+	if p.addr == isConfidentialAddress {
+		// 'isConfidential' is a special precompile
 		return (&isConfidentialPrecompile{}).RunConfidential(p.backend, input)
-
-	case confidentialInputsAddress:
-		return (&confidentialInputsPrecompile{}).RunConfidential(p.backend, input)
-
-	case confStoreStoreAddress:
-		return stub.confidentialStoreStore(input)
-
-	case confStoreRetrieveAddress:
-		return stub.confidentialStoreRetrieve(input)
-
-	case newBidAddress:
-		return stub.newBid(input)
-
-	case fetchBidsAddress:
-		return stub.fetchBids(input)
-
-	case extractHintAddress:
-		return stub.extractHint(input)
-
-	case simulateBundleAddress:
-		return stub.simulateBundle(input)
-
-	case buildEthBlockAddress:
-		return stub.buildEthBlock(input)
-
-	case submitEthBlockBidToRelayAddress:
-		return stub.submitEthBlockBidToRelay(input)
 	}
 
-	return nil, fmt.Errorf("precompile %s not found", p.addr)
+	return stub.run(p.addr, input)
 }

suave/gen/main.go

@@ -238,10 +238,24 @@ type SuaveRuntime interface {
 	{{.Name}}({{range .Input}}{{.Name}} {{typ2 .Typ}}, {{end}}) ({{range .Output.Fields}}{{typ2 .Typ}}, {{end}}error){{end}}
 }
 
+var ({{range .Functions}}
+	{{.Name}}Addr = common.HexToAddress("{{.Address}}"){{end}}
+)
+
 type SuaveRuntimeAdapter struct {
 	impl SuaveRuntime
 }
 
+func (b *SuaveRuntimeAdapter) run(addr common.Address, input []byte) ([]byte, error) {
+	switch addr { {{range .Functions}}
+	case {{.Name}}Addr:
+		return b.{{.Name}}(input)
+		{{end}}
+	default:
+		return nil, fmt.Errorf("suave precompile not found for " + addr.String())
+	}
+}
+
 {{range .Functions}}
 func (b *SuaveRuntimeAdapter) {{.Name}}(input []byte) (res []byte, err error) {
 	var (