-
Notifications
You must be signed in to change notification settings - Fork 468
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1999 from OffchainLabs/external_signer
Add e2e test for external signer, fix access list for external signer, don't require account for sequencer if batchposter with external signer is enabled
- Loading branch information
Showing
4 changed files
with
257 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,188 @@ | ||
| package arbtest | ||
|
|
||
| import ( | ||
| "context" | ||
| "crypto/tls" | ||
| "crypto/x509" | ||
| "encoding/json" | ||
| "fmt" | ||
| "io" | ||
| "math/big" | ||
| "net/http" | ||
| "os" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/ethereum/go-ethereum/accounts/abi/bind" | ||
| "github.com/ethereum/go-ethereum/accounts/keystore" | ||
| "github.com/ethereum/go-ethereum/common" | ||
| "github.com/ethereum/go-ethereum/common/hexutil" | ||
| "github.com/ethereum/go-ethereum/core/types" | ||
| "github.com/ethereum/go-ethereum/rlp" | ||
| "github.com/ethereum/go-ethereum/signer/core/apitypes" | ||
| "github.com/offchainlabs/nitro/arbnode/dataposter" | ||
| ) | ||
|
|
||
| var ( | ||
| signerPort = 1234 | ||
| signerURL = fmt.Sprintf("https://localhost:%v", signerPort) | ||
| signerMethod = "test_signTransaction" | ||
| signerServerCert = "../arbnode/dataposter/testdata/localhost.crt" | ||
| signerServerKey = "../arbnode/dataposter/testdata/localhost.key" | ||
| signerClientCert = "../arbnode/dataposter/testdata/client.crt" | ||
| signerClientPrivateKey = "../arbnode/dataposter/testdata/client.key" | ||
| ) | ||
|
|
||
| func externalSignerTestCfg(addr common.Address) *dataposter.ExternalSignerCfg { | ||
| return &dataposter.ExternalSignerCfg{ | ||
| Address: common.Bytes2Hex(addr.Bytes()), | ||
| URL: signerURL, | ||
| Method: signerMethod, | ||
| RootCA: signerServerCert, | ||
| ClientCert: signerClientCert, | ||
| ClientPrivateKey: signerClientPrivateKey, | ||
| } | ||
| } | ||
|
|
||
| type server struct { | ||
| handlers map[string]func(*json.RawMessage) (string, error) | ||
| signerFn bind.SignerFn | ||
| address common.Address | ||
| } | ||
|
|
||
| type request struct { | ||
| ID *json.RawMessage `json:"id"` | ||
| Method string `json:"method"` | ||
| Params *json.RawMessage `json:"params"` | ||
| } | ||
|
|
||
| type response struct { | ||
| ID *json.RawMessage `json:"id"` | ||
| Result string `json:"result,omitempty"` | ||
| } | ||
|
|
||
| // newServer returns http server and server struct that implements RPC methods. | ||
| // It sets up an account in temporary directory and cleans up after test is | ||
| // done. | ||
| func newServer(ctx context.Context, t *testing.T) (*http.Server, *server) { | ||
| t.Helper() | ||
| signer, address, err := setupAccount("/tmp/keystore") | ||
| if err != nil { | ||
| t.Fatalf("Error setting up account: %v", err) | ||
| } | ||
| t.Cleanup(func() { os.RemoveAll("/tmp/keystore") }) | ||
|
|
||
| s := &server{signerFn: signer, address: address} | ||
| s.handlers = map[string]func(*json.RawMessage) (string, error){ | ||
| signerMethod: s.signTransaction, | ||
| } | ||
| m := http.NewServeMux() | ||
|
|
||
| clientCert, err := os.ReadFile(signerClientCert) | ||
| if err != nil { | ||
| t.Fatalf("Error reading client certificate: %v", err) | ||
| } | ||
| pool := x509.NewCertPool() | ||
| pool.AppendCertsFromPEM(clientCert) | ||
|
|
||
| httpSrv := &http.Server{ | ||
| Addr: fmt.Sprintf(":%v", signerPort), | ||
| Handler: m, | ||
| ReadTimeout: 5 * time.Second, | ||
| TLSConfig: &tls.Config{ | ||
| MinVersion: tls.VersionTLS12, | ||
| ClientAuth: tls.RequireAndVerifyClientCert, | ||
| ClientCAs: pool, | ||
| }, | ||
| } | ||
| m.HandleFunc("/", s.mux) | ||
| return httpSrv, s | ||
| } | ||
|
|
||
| // setupAccount creates a new account in a given directory, unlocks it, creates | ||
| // signer with that account and returns it along with account address. | ||
| func setupAccount(dir string) (bind.SignerFn, common.Address, error) { | ||
| ks := keystore.NewKeyStore( | ||
| dir, | ||
| keystore.StandardScryptN, | ||
| keystore.StandardScryptP, | ||
| ) | ||
| a, err := ks.NewAccount("password") | ||
| if err != nil { | ||
| return nil, common.Address{}, fmt.Errorf("creating account account: %w", err) | ||
| } | ||
| if err := ks.Unlock(a, "password"); err != nil { | ||
| return nil, common.Address{}, fmt.Errorf("unlocking account: %w", err) | ||
| } | ||
| txOpts, err := bind.NewKeyStoreTransactorWithChainID(ks, a, big.NewInt(1337)) | ||
| if err != nil { | ||
| return nil, common.Address{}, fmt.Errorf("creating transactor: %w", err) | ||
| } | ||
| return txOpts.Signer, a.Address, nil | ||
| } | ||
|
|
||
| // UnmarshallFirst unmarshalls slice of params and returns the first one. | ||
| // Parameters in Go ethereum RPC calls are marashalled as slices. E.g. | ||
| // eth_sendRawTransaction or eth_signTransaction, marshall transaction as a | ||
| // slice of transactions in a message: | ||
| // https://github.com/ethereum/go-ethereum/blob/0004c6b229b787281760b14fb9460ffd9c2496f1/rpc/client.go#L548 | ||
| func unmarshallFirst(params []byte) (*types.Transaction, error) { | ||
| var arr []apitypes.SendTxArgs | ||
| if err := json.Unmarshal(params, &arr); err != nil { | ||
| return nil, fmt.Errorf("unmarshaling first param: %w", err) | ||
| } | ||
| if len(arr) != 1 { | ||
| return nil, fmt.Errorf("argument should be a single transaction, but got: %d", len(arr)) | ||
| } | ||
| return arr[0].ToTransaction(), nil | ||
| } | ||
|
|
||
| func (s *server) signTransaction(params *json.RawMessage) (string, error) { | ||
| tx, err := unmarshallFirst(*params) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
| signedTx, err := s.signerFn(s.address, tx) | ||
| if err != nil { | ||
| return "", fmt.Errorf("signing transaction: %w", err) | ||
| } | ||
| data, err := rlp.EncodeToBytes(signedTx) | ||
| if err != nil { | ||
| return "", fmt.Errorf("rlp encoding transaction: %w", err) | ||
| } | ||
| return hexutil.Encode(data), nil | ||
| } | ||
|
|
||
| func (s *server) mux(w http.ResponseWriter, r *http.Request) { | ||
| body, err := io.ReadAll(r.Body) | ||
| if err != nil { | ||
| http.Error(w, "can't read body", http.StatusBadRequest) | ||
| return | ||
| } | ||
| var req request | ||
| if err := json.Unmarshal(body, &req); err != nil { | ||
| http.Error(w, "can't unmarshal JSON request", http.StatusBadRequest) | ||
| return | ||
| } | ||
| method, ok := s.handlers[req.Method] | ||
| if !ok { | ||
| http.Error(w, "method not found", http.StatusNotFound) | ||
| return | ||
| } | ||
| result, err := method(req.Params) | ||
| if err != nil { | ||
| fmt.Printf("error calling method: %v\n", err) | ||
| http.Error(w, "error calling method", http.StatusInternalServerError) | ||
| return | ||
| } | ||
| resp := response{ID: req.ID, Result: result} | ||
| respBytes, err := json.Marshal(resp) | ||
| if err != nil { | ||
| http.Error(w, fmt.Sprintf("error encoding response: %v", err), http.StatusInternalServerError) | ||
| return | ||
| } | ||
| w.Header().Set("Content-Type", "application/json") | ||
| if _, err := w.Write(respBytes); err != nil { | ||
| fmt.Printf("error writing response: %v\n", err) | ||
| } | ||
| } |