Skip to content

Commit

Permalink
Add temporary SendTransactionAsync to PublicTransactionPoolAPI (ether…
Browse files Browse the repository at this point in the history
  • Loading branch information
patrickmn authored Dec 20, 2016
1 parent a5d3e90 commit 0c05f9f
Showing 1 changed file with 111 additions and 0 deletions.
111 changes: 111 additions & 0 deletions internal/ethapi/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ import (
"encoding/json"
"fmt"
"math/big"
"net/http"
"strings"
"sync"
"time"

"github.com/ethereum/ethash"
Expand Down Expand Up @@ -296,6 +298,115 @@ func (s *PrivateAccountAPI) SendTransaction(ctx context.Context, args SendTxArgs
return submitTransaction(ctx, s.b, tx, signature, isPrivate)
}

// Please note: This is a temporary integration to improve performance in low-latency
// environments when sending many private transactions. It will be removed at a later
// date when account management is handled outside Ethereum.

type AsyncSendTxArgs struct {
SendTxArgs
CallbackUrl string `json:"callbackUrl"`
}

type AsyncResult struct {
TxHash common.Hash `json:"txHash"`
Error string `json:"error"`
}

type argsAndPayload struct {
args AsyncSendTxArgs
b []byte
}

type Async struct {
sync.Mutex
sem chan struct{}
pool []*argsAndPayload
}

func (a *Async) send(ctx context.Context, s *PublicTransactionPoolAPI, asyncArgs AsyncSendTxArgs) {
res := new(AsyncResult)
defer func() {
buf := new(bytes.Buffer)
err := json.NewEncoder(buf).Encode(res)
if err != nil {
glog.V(logger.Info).Infof("Error encoding callback JSON: %v", err)
return
}
_, err = http.Post(asyncArgs.CallbackUrl, "application/json", buf)
if err != nil {
glog.V(logger.Info).Infof("Error sending callback: %v", err)
return
}
}()
args, err := prepareSendTxArgs(ctx, asyncArgs.SendTxArgs, s.b)
if err != nil {
glog.V(logger.Info).Infof("Async.send: Error doing prepareSendTxArgs: %v", err)
res.Error = err.Error()
return
}
b, err := private.P.Send(common.FromHex(args.Data), args.PrivateFrom, args.PrivateFor)
if err != nil {
glog.V(logger.Info).Infof("Error running Private.P.Send: %v", err)
res.Error = err.Error()
return
}
res.TxHash, err = a.save(ctx, s, args, b)
if err != nil {
res.Error = err.Error()
}
}

func (a *Async) save(ctx context.Context, s *PublicTransactionPoolAPI, args SendTxArgs, data []byte) (common.Hash, error) {
a.Lock()
defer a.Unlock()
if args.Nonce == nil {
nonce, err := s.b.GetPoolNonce(ctx, args.From)
if err != nil {
return common.Hash{}, err
}
args.Nonce = rpc.NewHexNumber(nonce)
}
var tx *types.Transaction
if args.To == nil {
tx = types.NewContractCreation(args.Nonce.Uint64(), args.Value.BigInt(), args.Gas.BigInt(), args.GasPrice.BigInt(), data)
} else {
tx = types.NewTransaction(args.Nonce.Uint64(), *args.To, args.Value.BigInt(), args.Gas.BigInt(), args.GasPrice.BigInt(), data)
}
signature, err := s.b.AccountManager().SignEthereum(args.From, tx.SigHash().Bytes())
if err != nil {
return common.Hash{}, err
}
return submitTransaction(ctx, s.b, tx, signature, len(args.PrivateFor) > 0)
}

func newAsync(n int) *Async {
a := &Async{
sem: make(chan struct{}, n),
}
return a
}

var async = newAsync(100)

// SendTransactionAsync creates a transaction for the given argument, signs it, and
// submits it to the transaction pool. This call returns immediately to allow sending
// many private transactions/bursts of transactions without waiting for the recipient
// parties to confirm receipt of the encrypted payloads. An optional callbackUrl may
// be specified--when a transaction is submitted to the transaction pool, it will be
// called with a POST request containing either {"error": "error message"} or
// {"txHash": "0x..."}.
//
// Please note: This is a temporary integration to improve performance in low-latency
// environments when sending many private transactions. It will be removed at a later
// date when account management is handled outside Ethereum.
func (s *PublicTransactionPoolAPI) SendTransactionAsync(ctx context.Context, args AsyncSendTxArgs) {
async.sem <- struct{}{}
go func() {
async.send(ctx, s, args)
<-async.sem
}()
}

// signHash is a helper function that calculates a hash for the given message that can be
// safely used to calculate a signature from. The hash is calulcated with:
// keccak256("\x19Ethereum Signed Message:\n"${message length}${message}).
Expand Down

0 comments on commit 0c05f9f

Please sign in to comment.