Merge pull request #2 from binance-chain/1.9.13-alpha0

[R4R] release 1.9.13-alpha0 for Rialto network

accounts/accounts.go

@@ -39,6 +39,7 @@ const (
  MimetypeDataWithValidator = "data/validator"
  MimetypeTypedData = "data/typed"
  MimetypeClique = "application/x-clique-header"
+ MimetypeParlia = "application/x-parlia-header"
  MimetypeTextPlain = "text/plain"
 )
 

accounts/external/backend.go

@@ -161,9 +161,9 @@ func (api *ExternalSigner) SignData(account accounts.Account, mimeType string, d
  hexutil.Encode(data)); err != nil {
  return nil, err
  }
- // If V is on 27/28-form, convert to to 0/1 for Clique
- if mimeType == accounts.MimetypeClique && (res[64] == 27 || res[64] == 28) {
- res[64] -= 27 // Transform V from 27/28 to 0/1 for Clique use
+ // If V is on 27/28-form, convert to to 0/1 for Clique and Parlia
+ if (mimeType == accounts.MimetypeClique || mimeType == accounts.MimetypeParlia) && (res[64] == 27 || res[64] == 28) {
+ res[64] -= 27 // Transform V from 27/28 to 0/1 for Clique and Parlia use
  }
  return res, nil
 }

cmd/faucet/faucet.go

@@ -82,6 +82,8 @@ var (
 
  noauthFlag = flag.Bool("noauth", false, "Enables funding requests without authentication")
  logFlag = flag.Int("loglevel", 3, "Log level to use for Ethereum and the faucet")
+
+ fixGasPrice = flag.Int64("faucet.fixedprice", 0, "Will use fixed gas price if specified")
 )
 
 var (
@@ -100,30 +102,15 @@ func main() {
 
  // Construct the payout tiers
  amounts := make([]string, *tiersFlag)
- periods := make([]string, *tiersFlag)
  for i := 0; i < *tiersFlag; i++ {
  // Calculate the amount for the next tier and format it
  amount := float64(*payoutFlag) * math.Pow(2.5, float64(i))
- amounts[i] = fmt.Sprintf("%s Ethers", strconv.FormatFloat(amount, 'f', -1, 64))
+ amounts[i] = fmt.Sprintf("%s BNBs", strconv.FormatFloat(amount, 'f', -1, 64))
  if amount == 1 {
  amounts[i] = strings.TrimSuffix(amounts[i], "s")
  }
- // Calculate the period for the next tier and format it
- period := *minutesFlag * int(math.Pow(3, float64(i)))
- periods[i] = fmt.Sprintf("%d mins", period)
- if period%60 == 0 {
- period /= 60
- periods[i] = fmt.Sprintf("%d hours", period)
-
- if period%24 == 0 {
- period /= 24
- periods[i] = fmt.Sprintf("%d days", period)
- }
- }
- if period == 1 {
- periods[i] = strings.TrimSuffix(periods[i], "s")
- }
  }
+
  // Load up and render the faucet website
  tmpl, err := Asset("faucet.html")
  if err != nil {
@@ -133,7 +120,6 @@ func main() {
  err = template.Must(template.New("").Parse(string(tmpl))).Execute(website, map[string]interface{}{
  "Network": *netnameFlag,
  "Amounts": amounts,
- "Periods": periods,
  "Recaptcha": *captchaToken,
  "NoAuth": *noauthFlag,
  })
@@ -223,6 +209,7 @@ func newFaucet(genesis *core.Genesis, port int, enodes []*discv5.Node, network u
  Name: "geth",
  Version: params.VersionWithCommit(gitCommit, gitDate),
  DataDir: filepath.Join(os.Getenv("HOME"), ".faucet"),
+ NoUSB: true,
  P2P: p2p.Config{
  NAT: nat.Any(),
  NoDiscovery: true,
@@ -297,6 +284,7 @@ func (f *faucet) listenAndServe(port int) error {
 
  http.HandleFunc("/", f.webHandler)
  http.HandleFunc("/api", f.apiHandler)
+ http.HandleFunc("/faucet-smart/api", f.apiHandler)
  return http.ListenAndServe(fmt.Sprintf(":%d", port), nil)
 }
 
@@ -571,8 +559,12 @@ func (f *faucet) refresh(head *types.Header) error {
  if nonce, err = f.client.NonceAt(ctx, f.account.Address, head.Number); err != nil {
  return err
  }
- if price, err = f.client.SuggestGasPrice(ctx); err != nil {
- return err
+ if fixGasPrice != nil && *fixGasPrice > 0 {
+ price = big.NewInt(*fixGasPrice)
+ } else {
+ if price, err = f.client.SuggestGasPrice(ctx); err != nil {
+ return err
+ }
  }
  // Everything succeeded, update the cached stats and eject old requests
  f.lock.Lock()
@@ -717,7 +709,7 @@ func authTwitter(url string) (string, string, common.Address, error) {
  address := common.HexToAddress(string(regexp.MustCompile("0x[0-9a-fA-F]{40}").Find(body)))
  if address == (common.Address{}) {
  //lint:ignore ST1005 This error is to be displayed in the browser
- return "", "", common.Address{}, errors.New("No Ethereum address found to fund")
+ return "", "", common.Address{}, errors.New("No Binance Smart Chain address found to fund")
  }
  var avatar string
  if parts = regexp.MustCompile("src=\"([^\"]+twimg.com/profile_images[^\"]+)\"").FindStringSubmatch(string(body)); len(parts) == 2 {
@@ -753,7 +745,7 @@ func authFacebook(url string) (string, string, common.Address, error) {
  address := common.HexToAddress(string(regexp.MustCompile("0x[0-9a-fA-F]{40}").Find(body)))
  if address == (common.Address{}) {
  //lint:ignore ST1005 This error is to be displayed in the browser
- return "", "", common.Address{}, errors.New("No Ethereum address found to fund")
+ return "", "", common.Address{}, errors.New("No Binance Smart Chain address found to fund")
  }
  var avatar string
  if parts = regexp.MustCompile("src=\"([^\"]+fbcdn.net[^\"]+)\"").FindStringSubmatch(string(body)); len(parts) == 2 {
@@ -769,7 +761,7 @@ func authNoAuth(url string) (string, string, common.Address, error) {
  address := common.HexToAddress(regexp.MustCompile("0x[0-9a-fA-F]{40}").FindString(url))
  if address == (common.Address{}) {
  //lint:ignore ST1005 This error is to be displayed in the browser
- return "", "", common.Address{}, errors.New("No Ethereum address found to fund")
+ return "", "", common.Address{}, errors.New("No Binance Smart Chain address found to fund")
  }
  return address.Hex() + "@noauth", "", address, nil
 }

cmd/faucet/faucet.html

@@ -5,7 +5,7 @@
  <meta http-equiv="X-UA-Compatible" content="IE=edge">
  <meta name="viewport" content="width=device-width, initial-scale=1">
 
- <title>{{.Network}}: Authenticated Faucet</title>
+ <title>{{.Network}}: Faucet</title>
 
  <link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" />
  <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" />
@@ -43,17 +43,17 @@
  <div class="container">
  <div class="row" style="margin-bottom: 16px;">
  <div class="col-lg-12">
- <h1 style="text-align: center;"><i class="fa fa-bath" aria-hidden="true"></i> {{.Network}} Authenticated Faucet</h1>
+ <h1 style="text-align: center;"><i class="fa fa-bath" aria-hidden="true"></i> {{.Network}} Faucet</h1>
  </div>
  </div>
  <div class="row">
  <div class="col-lg-8 col-lg-offset-2">
  <div class="input-group">
- <input id="url" name="url" type="text" class="form-control" placeholder="Social network URL containing your Ethereum address...">
+ <input id="url" name="url" type="text" class="form-control" placeholder="Input your Binance Smart Chain address...">
  <span class="input-group-btn">
- <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Give me Ether <i class="fa fa-caret-down" aria-hidden="true"></i></button>
+ <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Give me BNB <i class="fa fa-caret-down" aria-hidden="true"></i></button>
  <ul class="dropdown-menu dropdown-menu-right">{{range $idx, $amount := .Amounts}}
- <li><a style="text-align: center;" onclick="tier={{$idx}}; {{if $.Recaptcha}}grecaptcha.execute(){{else}}submit({{$idx}}){{end}}">{{$amount}} / {{index $.Periods $idx}}</a></li>{{end}}
+ <li><a style="text-align: center;" onclick="tier={{$idx}}; {{if $.Recaptcha}}grecaptcha.execute(){{else}}submit({{$idx}}){{end}}">{{$amount}}</a></li>{{end}}
  </ul>
  </span>
  </div>{{if .Recaptcha}}
@@ -70,33 +70,13 @@ <h1 style="text-align: center;"><i class="fa fa-bath" aria-hidden="true"></i> {{
  <table style="width: 100%"><tr>
  <td style="text-align: center;"><i class="fa fa-rss" aria-hidden="true"></i> <span id="peers"></span> peers</td>
  <td style="text-align: center;"><i class="fa fa-database" aria-hidden="true"></i> <span id="block"></span> blocks</td>
- <td style="text-align: center;"><i class="fa fa-heartbeat" aria-hidden="true"></i> <span id="funds"></span> Ethers</td>
+ <td style="text-align: center;"><i class="fa fa-heartbeat" aria-hidden="true"></i> <span id="funds"></span> BNBs</td>
  <td style="text-align: center;"><i class="fa fa-university" aria-hidden="true"></i> <span id="funded"></span> funded</td>
  </tr></table>
  </div>
  </div>
  </div>
  </div>
- <div class="row" style="margin-top: 32px;">
- <div class="col-lg-12">
- <h3>How does this work?</h3>
- <p>This Ether faucet is running on the {{.Network}} network. To prevent malicious actors from exhausting all available funds or accumulating enough Ether to mount long running spam attacks, requests are tied to common 3rd party social network accounts. Anyone having a Twitter or Facebook account may request funds within the permitted limits.</p>
- <dl class="dl-horizontal">
- <dt style="width: auto; margin-left: 40px;"><i class="fa fa-twitter" aria-hidden="true" style="font-size: 36px;"></i></dt>
- <dd style="margin-left: 88px; margin-bottom: 10px;"></i> To request funds via Twitter, make a <a href="https://twitter.com/intent/tweet?text=Requesting%20faucet%20funds%20into%200x0000000000000000000000000000000000000000%20on%20the%20%23{{.Network}}%20%23Ethereum%20test%20network." target="_about:blank">tweet</a> with your Ethereum address pasted into the contents (surrounding text doesn't matter).<br/>Copy-paste the <a href="https://support.twitter.com/articles/80586" target="_about:blank">tweets URL</a> into the above input box and fire away!</dd>
-
- <dt style="width: auto; margin-left: 40px;"><i class="fa fa-facebook" aria-hidden="true" style="font-size: 36px;"></i></dt>
- <dd style="margin-left: 88px; margin-bottom: 10px;"></i> To request funds via Facebook, publish a new <strong>public</strong> post with your Ethereum address embedded into the content (surrounding text doesn't matter).<br/>Copy-paste the <a href="https://www.facebook.com/help/community/question/?id=282662498552845" target="_about:blank">posts URL</a> into the above input box and fire away!</dd>
-
- {{if .NoAuth}}
- <dt class="text-danger" style="width: auto; margin-left: 40px;"><i class="fa fa-unlock-alt" aria-hidden="true" style="font-size: 36px;"></i></dt>
- <dd class="text-danger" style="margin-left: 88px; margin-bottom: 10px;"></i> To request funds <strong>without authentication</strong>, simply copy-paste your Ethereum address into the above input box (surrounding text doesn't matter) and fire away.<br/>This mode is susceptible to Byzantine attacks. Only use for debugging or private networks!</dd>
- {{end}}
- </dl>
- <p>You can track the current pending requests below the input field to see how much you have to wait until your turn comes.</p>
- {{if .Recaptcha}}<em>The faucet is running invisible reCaptcha protection against bots.</em>{{end}}
- </div>
- </div>
  </div>
  </div>
 
@@ -125,7 +105,7 @@ <h3>How does this work?</h3>
  };
  // Define a method to reconnect upon server loss
  var reconnect = function() {
- server = new WebSocket(((window.location.protocol === "https:") ? "wss://" : "ws://") + window.location.host + "/api");
+ server = new WebSocket(((window.location.protocol === "https:") ? "wss://" : "ws://") + window.location.host + "/faucet-smart/api");
 
  server.onmessage = function(event) {
  var msg = JSON.parse(event.data);