소스 검색

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

* 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
Martin Holst Swende 4 년 전
부모
커밋
6b88ab75bc
2개의 변경된 파일3개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 3
      cmd/faucet/faucet.go
  2. 1 1
      cmd/faucet/faucet.html

+ 2 - 3
cmd/faucet/faucet.go

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

+ 1 - 1
cmd/faucet/faucet.html

@@ -177,7 +177,7 @@
 						}
 						// Iterate over our entire local collection and re-render the funding table
 						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 elapsed = moment().unix()-moment(requests[i].time).unix();