roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

cmd/faucet: fix nonce-gap problem (#22145)

Browse Source 
* cmd/faucet: avoid encoding for each client

* cmd/faucet: fix flaw in clearing of txs, avoid sending more than necessary

* cmd/faucet: fix flaw in tx cropping

* cmd/faucet: revert change to not always send tx info

* cmd/faucet: review fixes

* cmd/faucet: revert #22018, fix order in UI

* cmd/faucet: fix lock error

* cmd/faucet: revert json changes

* squashme
This commit is contained in:
Martin Holst Swende 2021-01-08 11:17:15 +01:00 committed by GitHub
parent 165f53fc6e
commit 6b88ab75bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/faucet/faucet.go
View File

@ -512,12 +512,12 @@ func (f *faucet) apiHandler(w http.ResponseWriter, r *http.Request) {
} }
continue continue
} }
f.reqs = append([]*request{{ f.reqs = append(f.reqs, &request{
Avatar: avatar, Avatar: avatar,
Account: address, Account: address,
Time: time.Now(), Time: time.Now(),
Tx: signed, Tx: signed,
}}, f.reqs...) })
timeout := time.Duration(*minutesFlag*int(math.Pow(3, float64(msg.Tier)))) * time.Minute timeout := time.Duration(*minutesFlag*int(math.Pow(3, float64(msg.Tier)))) * time.Minute
grace := timeout / 288 // 24h timeout => 5m grace grace := timeout / 288 // 24h timeout => 5m grace
@ -670,7 +670,6 @@ func send(conn *wsConn, value interface{}, timeout time.Duration) error {
} }
conn.wlock.Lock() conn.wlock.Lock()
defer conn.wlock.Unlock() defer conn.wlock.Unlock()
conn.conn.SetWriteDeadline(time.Now().Add(timeout)) conn.conn.SetWriteDeadline(time.Now().Add(timeout))
return conn.conn.WriteJSON(value) return conn.conn.WriteJSON(value)
} }

2
cmd/faucet/faucet.html
View File

@ -177,7 +177,7 @@
} }
// Iterate over our entire local collection and re-render the funding table // Iterate over our entire local collection and re-render the funding table
var content = ""; var content = "";
for (var i=0; i<requests.length; i++) { for (var i=requests.length-1; i >= 0; i--) {
var done = requests[i].time == ""; var done = requests[i].time == "";
var elapsed = moment().unix()-moment(requests[i].time).unix(); var elapsed = moment().unix()-moment(requests[i].time).unix();