Merge pull request #198 from ethpandaops/pk910/fix-wallet-initilitzation-panic

fix wallet initilitzation panic

Author: pk910

spamoor/wallet.go

@@ -197,6 +197,9 @@ func (wallet *Wallet) IncrementSubmittedTxCount() {
 func (wallet *Wallet) GetBalance() *big.Int {
 	wallet.balanceMutex.RLock()
 	defer wallet.balanceMutex.RUnlock()
+	if wallet.balance == nil {
+		return new(big.Int)
+	}
 	return wallet.balance
 }
 

spamoor/walletpool.go

@@ -628,12 +628,12 @@ func (pool *WalletPool) prepareWallet(privkey string, client *Client, refillAmou
 	}
 
 	// Set up low balance notification
-	if pool.runFundings {
+	if pool.runFundings && refillBalance != nil {
 		childWallet.setLowBalanceNotification(pool.lowBalanceNotifyChan, refillBalance.ToBig())
 	}
 
 	var fundingReq *FundingRequest
-	if pool.runFundings && childWallet.GetBalance().Cmp(refillBalance.ToBig()) < 0 {
+	if pool.runFundings && refillBalance != nil && childWallet.GetBalance().Cmp(refillBalance.ToBig()) < 0 {
 		currentBalance := uint256.MustFromBig(childWallet.GetBalance())
 		fundingReq = &FundingRequest{
 			Wallet: childWallet,
@@ -777,7 +777,7 @@ func (pool *WalletPool) resupplyChildWallets() error {
 				return
 			}
 
-			if childWallet.GetBalance().Cmp(refillBalance.ToBig()) < 0 {
+			if refillBalance != nil && childWallet.GetBalance().Cmp(refillBalance.ToBig()) < 0 {
 				currentBalance := uint256.MustFromBig(childWallet.GetBalance())
 				reqsMutex.Lock()
 				fundingReqs = append(fundingReqs, &FundingRequest{
@@ -807,7 +807,7 @@ func (pool *WalletPool) resupplyChildWallets() error {
 				walletErr = err
 				return
 			}
-			if childWallet.GetBalance().Cmp(pool.config.RefillBalance.ToBig()) < 0 {
+			if pool.config.RefillBalance != nil && childWallet.GetBalance().Cmp(pool.config.RefillBalance.ToBig()) < 0 {
 				currentBalance := uint256.MustFromBig(childWallet.GetBalance())
 				reqsMutex.Lock()
 				fundingReqs = append(fundingReqs, &FundingRequest{
@@ -1128,7 +1128,7 @@ func (pool *WalletPool) CheckChildWalletBalance(childWallet *Wallet) error {
 		}
 	}
 
-	if childWallet.GetBalance().Cmp(refillBalance.ToBig()) >= 0 {
+	if refillBalance == nil || childWallet.GetBalance().Cmp(refillBalance.ToBig()) >= 0 {
 		return nil
 	}
 

webui/templates/index/index.html

@@ -676,7 +676,7 @@ <h5 class="modal-title">Edit Spammer</h5>
   }
 
   /* Load configuration */
-  const config = await fetch(`/api/scenarios/${scenarioName}/config`).then(r => r.text());
+  const config = await spamoor.authFetch(`/api/scenarios/${scenarioName}/config`).then(r => r.text());
   document.querySelector('#newSpammerForm [name="config"]').value = config;
 }