github/prysm
1
1
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-10 07:58:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix Goerli Faucet (#4289)

Browse Source 
* fix faucet

* minor fixes
This commit is contained in:
Nishant Das
2019-12-15 22:21:29 +08:00
committed by Preston Van Loon
parent 325a2503f7
commit fd93751bf7
4 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
beacon-chain/core/helpers/committee_test.go
View File

@@ -6,8 +6,8 @@ import (
"strings"
"testing"
"github.com/prysmaticlabs/go-bitfield"
ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1"
"github.com/prysmaticlabs/go-bitfield"
pb "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
"github.com/prysmaticlabs/prysm/shared/featureconfig"
"github.com/prysmaticlabs/prysm/shared/params"

2
shared/stateutil/attestations.go
View File

@@ -139,7 +139,7 @@ func (h *stateRootHasher) pendingAttestationRoot(att *pb.PendingAttestation) ([3
return [32]byte{}, err
}
if att != nil && h.rootsCache != nil {
h. rootsCache.Set(string(enc), res, 32)
h.rootsCache.Set(string(enc), res, 32)
}
return res, nil
}

2
shared/stateutil/validators.go
View File

@@ -61,7 +61,7 @@ func (h *stateRootHasher) validatorRegistryRoot(validators []*ethpb.Validator) (
}
hashKey := hashutil.FastSum256(hashKeyElements)
if hashKey != emptyKey && h.rootsCache != nil{
if hashKey != emptyKey && h.rootsCache != nil {
if found, ok := h.rootsCache.Get(string(hashKey[:])); found != nil && ok {
return found.([32]byte), nil
}

38
tools/faucet/server.go
View File

@@ -22,8 +22,11 @@ import (
"google.golang.org/grpc/metadata"
)
const ipLimit = 3
var fundingAmount = big.NewInt(3.5 * params.Ether)
var funded = make(map[string]bool)
var ipCounter = make(map[string]int)
var fundingLock sync.Mutex
type faucetServer struct {
@@ -69,13 +72,7 @@ func newFaucetServer(
}
}
func (s *faucetServer) verifyRecaptcha(ctx context.Context, req *faucetpb.FundingRequest) error {
md, ok := metadata.FromIncomingContext(ctx)
if !ok || len(md.Get("x-forwarded-for")) < 1 {
return errors.New("metadata not ok")
}
peer := md.Get("x-forwarded-for")[0]
func (s *faucetServer) verifyRecaptcha(peer string, req *faucetpb.FundingRequest) error {
fmt.Printf("Sending captcha request for peer %s\n", peer)
rr, err := s.r.Check(peer, req.RecaptchaResponse)
@@ -105,13 +102,23 @@ func (s *faucetServer) verifyRecaptcha(ctx context.Context, req *faucetpb.Fundin
// RequestFunds from the ethereum 1.x faucet. Requires a valid captcha
// response.
func (s *faucetServer) RequestFunds(ctx context.Context, req *faucetpb.FundingRequest) (*faucetpb.FundingResponse, error) {
if err := s.verifyRecaptcha(ctx, req); err != nil {
peer, err := s.getPeer(ctx)
if err != nil {
fmt.Printf("peer failure %v\n", err)
return &faucetpb.FundingResponse{Error: "peer error"}, nil
}
if err := s.verifyRecaptcha(peer, req); err != nil {
fmt.Printf("Recaptcha failure %v\n", err)
return &faucetpb.FundingResponse{Error: "recaptcha error"}, nil
}
fundingLock.Lock()
if funded[req.WalletAddress] {
exceedPeerLimit := ipCounter[peer] >= ipLimit
if funded[req.WalletAddress] || exceedPeerLimit {
if exceedPeerLimit {
fmt.Printf("peer %s trying to get funded despite being over peer limit\n", peer)
}
fundingLock.Unlock()
return &faucetpb.FundingResponse{Error: "funded too recently"}, nil
}
@@ -122,6 +129,10 @@ func (s *faucetServer) RequestFunds(ctx context.Context, req *faucetpb.FundingRe
if err != nil {
return &faucetpb.FundingResponse{Error: fmt.Sprintf("Failed to send transaction %v", err)}, nil
}
fundingLock.Lock()
ipCounter[peer]++
fundingLock.Unlock()
fmt.Printf("Funded with TX %s\n", txHash)
return &faucetpb.FundingResponse{
@@ -158,3 +169,12 @@ func (s *faucetServer) fundAndWait(to common.Address) (string, error) {
return tx.Hash().Hex(), nil
}
func (s *faucetServer) getPeer(ctx context.Context) (string, error) {
md, ok := metadata.FromIncomingContext(ctx)
if !ok || len(md.Get("x-forwarded-for")) < 1 {
return "", errors.New("metadata not ok")
}
peer := md.Get("x-forwarded-for")[0]
return peer, nil
}