From 0d0d39380c306f7a20b33827bc40b8ca21ae700d Mon Sep 17 00:00:00 2001
From: Niko Storni <niko@odysee.com>
Date: Wed, 26 Jan 2022 07:11:26 +0100
Subject: [PATCH] fix spend amounts to save credits

---
 e2e/docker-compose.yml | 1 +
 manager/setup.go       | 8 +++++++-
 manager/transfer.go    | 2 +-
 manager/ytsync.go      | 5 ++---
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml
index 721b624..706d1ba 100644
--- a/e2e/docker-compose.yml
+++ b/e2e/docker-compose.yml
@@ -81,6 +81,7 @@ services:
       - walletserver
     environment:
       - LBRY_STREAMING_SERVER=0.0.0.0:5280
+      - LBRY_FEE_PER_NAME_CHAR=0
     volumes:
       - "./persist/.lbrynet:/home/lbrynet"
       - ".:/etc/lbry" #Put your daemon_settings.yml here
diff --git a/manager/setup.go b/manager/setup.go
index d606707..8f5c20c 100644
--- a/manager/setup.go
+++ b/manager/setup.go
@@ -110,7 +110,7 @@ func (s *Sync) walletSetup() error {
 	}
 	requiredBalance := float64(unallocatedVideos)*(publishAmount+estimatedMaxTxFee) + channelFee
 	if s.Manager.CliFlags.UpgradeMetadata {
-		requiredBalance += float64(notUpgradedCount) * 0.001
+		requiredBalance += float64(notUpgradedCount) * estimatedMaxTxFee
 	}
 
 	refillAmount := 0.0
@@ -127,6 +127,12 @@ func (s *Sync) walletSetup() error {
 		if err != nil {
 			return errors.Err(err)
 		}
+	} else if balance > requiredBalance {
+		extraLBC := balance - requiredBalance
+		if extraLBC > 5 {
+			sendBackAmount := extraLBC - 1
+			logUtils.SendInfoToSlack("channel %s has %.1f credits which is %.1f more than it should. We should send at least %.1f that back.", s.DbChannelData.ChannelId, balance, extraLBC, sendBackAmount)
+		}
 	}
 
 	claimAddress, err := s.daemon.AddressList(nil, nil, 1, 20)
diff --git a/manager/transfer.go b/manager/transfer.go
index 9bc592c..a492f38 100644
--- a/manager/transfer.go
+++ b/manager/transfer.go
@@ -241,7 +241,7 @@ func transferVideos(s *Sync) error {
 						},
 					},
 				},
-				Bid: util.PtrToString("0.005"), // Todo - Dont hardcode
+				Bid: util.PtrToString(fmt.Sprintf("%.5f", publishAmount/2.)),
 			}
 			videoStatus := shared.VideoStatus{
 				ChannelID:     s.DbChannelData.ChannelId,
diff --git a/manager/ytsync.go b/manager/ytsync.go
index af96543..9fe2416 100644
--- a/manager/ytsync.go
+++ b/manager/ytsync.go
@@ -33,11 +33,10 @@ import (
 
 const (
 	channelClaimAmount    = 0.01
-	estimatedMaxTxFee     = 0.1
+	estimatedMaxTxFee     = 0.0015
 	minimumAccountBalance = 1.0
 	minimumRefillAmount   = 1
-	publishAmount         = 0.01
-	maxReasonLength       = 500
+	publishAmount         = 0.002
 )
 
 // Sync stores the options that control how syncing happens