STAGING -> MASTER (#813)

* Adjust perf test to use spends (#799) The old perf test did not use spends, so we didn't detect the recent drop in perf due to spend validation. This adds spends to all blocks. * Fix Faucet API Request (#808) * Fix count error * Fix API workarounds * Bump version (#812) Co-authored-by: Jason Spafford <[email protected]>
iron-fish · Dec 22, 2021 · 6a7bee9 · 6a7bee9
1 parent 6f4e9e3
commit 6a7bee9
Show file tree

Hide file tree

Showing 5 changed files with 2,859 additions and 2,046 deletions.
diff --git a/ironfish-cli/src/commands/service/faucet.ts b/ironfish-cli/src/commands/service/faucet.ts
@@ -144,14 +144,14 @@ export default class Faucet extends IronfishCommand {
 
     this.warnedFund = false
 
-    const count = Math.max(
-      Number(BigInt(response.content.confirmed) / BigInt(FAUCET_AMOUNT)),
+    const count = Math.min(
+      Number(BigInt(response.content.confirmed) / BigInt(FAUCET_AMOUNT + FAUCET_FEE)),
       MAX_RECIPIENTS_PER_TRANSACTION,
     )
 
     const faucetTransactions = await api.getNextFaucetTransactions(count)
 
-    if (!faucetTransactions || faucetTransactions.length === 0) {
+    if (faucetTransactions.length === 0) {
       this.log('No faucet jobs, waiting 5s')
       await PromiseUtils.sleep(5000)
       return

diff --git a/ironfish/package.json b/ironfish/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ironfish",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "gitHash": "",
   "private": true,
   "author": "Iron Fish <[email protected]> (https://ironfish.network)",