From 42deb1d29deecb30a065ebddc06e831a091862be Mon Sep 17 00:00:00 2001
From: Niko Storni <niko@lbry.io>
Date: Mon, 7 May 2018 16:26:46 -0400
Subject: [PATCH] address more errors

increase room for fees (Jeremy says just pay more)
add code to wait for daemon startup
---
 ytsync/setup.go  | 23 ++++++++++++++++++++---
 ytsync/ytsync.go |  5 +++--
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/ytsync/setup.go b/ytsync/setup.go
index 99938b2..a9ce788 100644
--- a/ytsync/setup.go
+++ b/ytsync/setup.go
@@ -8,6 +8,7 @@ import (
 	"github.com/lbryio/lbry.go/jsonrpc"
 	"github.com/lbryio/lbry.go/lbrycrd"
 
+	"github.com/lbryio/lbry.go/util"
 	"github.com/shopspring/decimal"
 	log "github.com/sirupsen/logrus"
 )
@@ -45,8 +46,12 @@ func (s *Sync) walletSetup() error {
 	log.Debugf("We already published %d videos", numPublished)
 
 	minBalance := (float64(numOnSource)-float64(numPublished))*publishAmount + channelClaimAmount
+	if numPublished > numOnSource {
+		util.SendToSlackError("something is going on as we published more videos than those available on source: %d/%d", numPublished, numOnSource)
+		minBalance = 1 //since we ended up in this function it means some juice is still needed
+	}
 	amountToAdd, _ := decimal.NewFromFloat(minBalance).Sub(balance).Float64()
-	amountToAdd *= 2 // add 100% margin for fees, future publishes, etc
+	amountToAdd *= 6 // add 600% margin for fees, future publishes, etc (insane i know)
 
 	if s.Refill > 0 {
 		if amountToAdd < 0 {
@@ -155,14 +160,15 @@ func (s *Sync) waitUntilUTXOsConfirmed() error {
 		if allUTXOsConfirmed(r) {
 			return nil
 		}
-		if time.Now().After(origin.Add(10 * time.Minute)) {
+		if time.Now().After(origin.Add(15 * time.Minute)) {
 			//lbryum is messing with us or something. restart the daemon
+			//this could also be a very long block
 			err := stopDaemonViaSystemd()
 			if err != nil {
 				logShutdownError(err)
 				return err
 			}
-			var waitTimeout time.Duration = 60 * 6
+			var waitTimeout time.Duration = 60 * 8
 			err = waitForDaemonProcess(waitTimeout)
 			if err != nil {
 				logShutdownError(err)
@@ -172,6 +178,17 @@ func (s *Sync) waitUntilUTXOsConfirmed() error {
 			if err != nil {
 				return err
 			}
+			log.Infoln("Waiting for daemon to finish starting...")
+			s.daemon = jsonrpc.NewClient("")
+			s.daemon.SetRPCTimeout(5 * time.Minute)
+
+			for {
+				_, err := s.daemon.WalletBalance()
+				if err == nil {
+					break
+				}
+				time.Sleep(5 * time.Second)
+			}
 		}
 		wait := 30 * time.Second
 		log.Println("Waiting " + wait.String() + "...")
diff --git a/ytsync/ytsync.go b/ytsync/ytsync.go
index 911b6a9..a2b6087 100644
--- a/ytsync/ytsync.go
+++ b/ytsync/ytsync.go
@@ -110,7 +110,7 @@ func (s *Sync) FullCycle() error {
 		} else {
 			// the cli will return long before the daemon effectively stops. we must observe the processes running
 			// before moving the wallet
-			var waitTimeout time.Duration = 60 * 6
+			var waitTimeout time.Duration = 60 * 8
 			processDeathError := waitForDaemonProcess(waitTimeout)
 			if processDeathError != nil {
 				logShutdownError(processDeathError)
@@ -257,6 +257,7 @@ func (s *Sync) startWorker(workerNum int) {
 						"download error: AccessDenied: Access Denied",
 						"Playback on other websites has been disabled by the video owner",
 						"Error in daemon: Cannot publish empty file",
+						"Error extracting sts from embedded url response",
 					}
 					if util.InSlice(err.Error(), errorsNoRetry) {
 						log.Println("This error should not be retried at all")
@@ -275,7 +276,7 @@ func (s *Sync) startWorker(workerNum int) {
 						log.Println("Retrying")
 						continue
 					}
-					util.SendToSlackInfo("Video failed after %d retries, skipping. Stack: %s", s.MaxTries, logMsg)
+					util.SendToSlackError("Video failed after %d retries, skipping. Stack: %s", s.MaxTries, logMsg)
 				}
 			}
 			break