This PR moves (some) account types into a standalone package, to avoid depending on signer/core from accounts/external.
		
			
				
	
	
		
			126 lines
		
	
	
		
			4.9 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			126 lines
		
	
	
		
			4.9 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2018 The go-ethereum Authors
 | |
| // This file is part of the go-ethereum library.
 | |
| //
 | |
| // The go-ethereum library is free software: you can redistribute it and/or modify
 | |
| // it under the terms of the GNU Lesser General Public License as published by
 | |
| // the Free Software Foundation, either version 3 of the License, or
 | |
| // (at your option) any later version.
 | |
| //
 | |
| // The go-ethereum library is distributed in the hope that it will be useful,
 | |
| // but WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 | |
| // GNU Lesser General Public License for more details.
 | |
| //
 | |
| // You should have received a copy of the GNU Lesser General Public License
 | |
| // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 | |
| 
 | |
| package core
 | |
| 
 | |
| import (
 | |
| 	"context"
 | |
| 	"encoding/json"
 | |
| 
 | |
| 	"github.com/ethereum/go-ethereum/common"
 | |
| 	"github.com/ethereum/go-ethereum/common/hexutil"
 | |
| 	"github.com/ethereum/go-ethereum/internal/ethapi"
 | |
| 	"github.com/ethereum/go-ethereum/log"
 | |
| 	"github.com/ethereum/go-ethereum/signer/core/apitypes"
 | |
| )
 | |
| 
 | |
| type AuditLogger struct {
 | |
| 	log log.Logger
 | |
| 	api ExternalAPI
 | |
| }
 | |
| 
 | |
| func (l *AuditLogger) List(ctx context.Context) ([]common.Address, error) {
 | |
| 	l.log.Info("List", "type", "request", "metadata", MetadataFromContext(ctx).String())
 | |
| 	res, e := l.api.List(ctx)
 | |
| 	l.log.Info("List", "type", "response", "data", res)
 | |
| 
 | |
| 	return res, e
 | |
| }
 | |
| 
 | |
| func (l *AuditLogger) New(ctx context.Context) (common.Address, error) {
 | |
| 	return l.api.New(ctx)
 | |
| }
 | |
| 
 | |
| func (l *AuditLogger) SignTransaction(ctx context.Context, args apitypes.SendTxArgs, methodSelector *string) (*ethapi.SignTransactionResult, error) {
 | |
| 	sel := "<nil>"
 | |
| 	if methodSelector != nil {
 | |
| 		sel = *methodSelector
 | |
| 	}
 | |
| 	l.log.Info("SignTransaction", "type", "request", "metadata", MetadataFromContext(ctx).String(),
 | |
| 		"tx", args.String(),
 | |
| 		"methodSelector", sel)
 | |
| 
 | |
| 	res, e := l.api.SignTransaction(ctx, args, methodSelector)
 | |
| 	if res != nil {
 | |
| 		l.log.Info("SignTransaction", "type", "response", "data", common.Bytes2Hex(res.Raw), "error", e)
 | |
| 	} else {
 | |
| 		l.log.Info("SignTransaction", "type", "response", "data", res, "error", e)
 | |
| 	}
 | |
| 	return res, e
 | |
| }
 | |
| 
 | |
| func (l *AuditLogger) SignData(ctx context.Context, contentType string, addr common.MixedcaseAddress, data interface{}) (hexutil.Bytes, error) {
 | |
| 	marshalledData, _ := json.Marshal(data) // can ignore error, marshalling what we just unmarshalled
 | |
| 	l.log.Info("SignData", "type", "request", "metadata", MetadataFromContext(ctx).String(),
 | |
| 		"addr", addr.String(), "data", marshalledData, "content-type", contentType)
 | |
| 	b, e := l.api.SignData(ctx, contentType, addr, data)
 | |
| 	l.log.Info("SignData", "type", "response", "data", common.Bytes2Hex(b), "error", e)
 | |
| 	return b, e
 | |
| }
 | |
| 
 | |
| func (l *AuditLogger) SignGnosisSafeTx(ctx context.Context, addr common.MixedcaseAddress, gnosisTx GnosisSafeTx, methodSelector *string) (*GnosisSafeTx, error) {
 | |
| 	sel := "<nil>"
 | |
| 	if methodSelector != nil {
 | |
| 		sel = *methodSelector
 | |
| 	}
 | |
| 	data, _ := json.Marshal(gnosisTx) // can ignore error, marshalling what we just unmarshalled
 | |
| 	l.log.Info("SignGnosisSafeTx", "type", "request", "metadata", MetadataFromContext(ctx).String(),
 | |
| 		"addr", addr.String(), "data", string(data), "selector", sel)
 | |
| 	res, e := l.api.SignGnosisSafeTx(ctx, addr, gnosisTx, methodSelector)
 | |
| 	if res != nil {
 | |
| 		data, _ := json.Marshal(res) // can ignore error, marshalling what we just unmarshalled
 | |
| 		l.log.Info("SignGnosisSafeTx", "type", "response", "data", string(data), "error", e)
 | |
| 	} else {
 | |
| 		l.log.Info("SignGnosisSafeTx", "type", "response", "data", res, "error", e)
 | |
| 	}
 | |
| 	return res, e
 | |
| }
 | |
| 
 | |
| func (l *AuditLogger) SignTypedData(ctx context.Context, addr common.MixedcaseAddress, data TypedData) (hexutil.Bytes, error) {
 | |
| 	l.log.Info("SignTypedData", "type", "request", "metadata", MetadataFromContext(ctx).String(),
 | |
| 		"addr", addr.String(), "data", data)
 | |
| 	b, e := l.api.SignTypedData(ctx, addr, data)
 | |
| 	l.log.Info("SignTypedData", "type", "response", "data", common.Bytes2Hex(b), "error", e)
 | |
| 	return b, e
 | |
| }
 | |
| 
 | |
| func (l *AuditLogger) EcRecover(ctx context.Context, data hexutil.Bytes, sig hexutil.Bytes) (common.Address, error) {
 | |
| 	l.log.Info("EcRecover", "type", "request", "metadata", MetadataFromContext(ctx).String(),
 | |
| 		"data", common.Bytes2Hex(data), "sig", common.Bytes2Hex(sig))
 | |
| 	b, e := l.api.EcRecover(ctx, data, sig)
 | |
| 	l.log.Info("EcRecover", "type", "response", "address", b.String(), "error", e)
 | |
| 	return b, e
 | |
| }
 | |
| 
 | |
| func (l *AuditLogger) Version(ctx context.Context) (string, error) {
 | |
| 	l.log.Info("Version", "type", "request", "metadata", MetadataFromContext(ctx).String())
 | |
| 	data, err := l.api.Version(ctx)
 | |
| 	l.log.Info("Version", "type", "response", "data", data, "error", err)
 | |
| 	return data, err
 | |
| 
 | |
| }
 | |
| 
 | |
| func NewAuditLogger(path string, api ExternalAPI) (*AuditLogger, error) {
 | |
| 	l := log.New("api", "signer")
 | |
| 	handler, err := log.FileHandler(path, log.LogfmtFormat())
 | |
| 	if err != nil {
 | |
| 		return nil, err
 | |
| 	}
 | |
| 	l.SetHandler(handler)
 | |
| 	l.Info("Configured", "audit log", path)
 | |
| 	return &AuditLogger{l, api}, nil
 | |
| }
 |