LBRYCommunity/ytsync
1
0
Fork 0
Code Issues 39 Pull requests 8 Projects Releases 197 Packages Wiki Activity

fix balance refill issue

Browse source 
add additional debugging
This commit is contained in:
Niko Storni 2019-09-04 19:24:11 +02:00
parent 14668c339e
commit bdd55c9965
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
manager/setup.go
View file

@ -94,14 +94,19 @@ func (s *Sync) walletSetup() error {
videosOnYoutube = s.Manager.videosLimit videosOnYoutube = s.Manager.videosLimit
} }
unallocatedVideos := videosOnYoutube - (publishedCount + failedCount) unallocatedVideos := videosOnYoutube - (publishedCount + failedCount)
requiredBalance := float64(unallocatedVideos)*(publishAmount+estimatedMaxTxFee) + channelClaimAmount channelFee := channelClaimAmount
channelAlreadyClaimed := s.lbryChannelID != ""
if channelAlreadyClaimed {
channelFee = 0.0
}
requiredBalance := float64(unallocatedVideos)*(publishAmount+estimatedMaxTxFee) + channelFee
if s.Manager.SyncFlags.UpgradeMetadata { if s.Manager.SyncFlags.UpgradeMetadata {
requiredBalance += float64(notUpgradedCount) * 0.001 requiredBalance += float64(notUpgradedCount) * 0.001
} }
refillAmount := 0.0 refillAmount := 0.0
if balance < requiredBalance || balance < minimumAccountBalance { if balance < requiredBalance || balance < minimumAccountBalance {
refillAmount = math.Max(requiredBalance-balance, minimumRefillAmount) refillAmount = math.Max(math.Max(requiredBalance-balance, minimumAccountBalance-balance), minimumRefillAmount)
} }
if s.Refill > 0 { if s.Refill > 0 {

8
manager/ytsync.go
View file

@ -39,7 +39,7 @@ import (
const ( const (
channelClaimAmount = 0.01 channelClaimAmount = 0.01
estimatedMaxTxFee = 0.1 estimatedMaxTxFee = 0.1
minimumAccountBalance = 4.0 minimumAccountBalance = 1.0
minimumRefillAmount = 1 minimumRefillAmount = 1
publishAmount = 0.01 publishAmount = 0.01
maxReasonLength = 500 maxReasonLength = 500
@ -545,6 +545,9 @@ func (s *Sync) updateRemoteDB(claims []jsonrpc.Claim) (total, fixed, removed int
if !claimInDatabase { if !claimInDatabase {
log.Debugf("%s: Published but is not in database (%s - %s)", videoID, c.Name, c.ClaimID) log.Debugf("%s: Published but is not in database (%s - %s)", videoID, c.Name, c.ClaimID)
} }
if s.syncedVideos[videoID].Transferred {
log.Debugf("%s: Marked as transferred while in fact it's not (%s - %s). Publish address: %s, expected: %s", videoID, c.Name, c.ClaimID, c.Address, s.publishAddress)
}
if !claimInDatabase || metadataDiffers || claimIDDiffers || claimNameDiffers || claimMarkedUnpublished { if !claimInDatabase || metadataDiffers || claimIDDiffers || claimNameDiffers || claimMarkedUnpublished {
claimSize, err := c.GetStreamSizeByMagic() claimSize, err := c.GetStreamSizeByMagic()
if err != nil { if err != nil {
@ -569,7 +572,8 @@ func (s *Sync) updateRemoteDB(claims []jsonrpc.Claim) (total, fixed, removed int
idsToRemove := make([]string, 0, len(videoIDMap)) idsToRemove := make([]string, 0, len(videoIDMap))
for vID, sv := range s.syncedVideos { for vID, sv := range s.syncedVideos {
if sv.Transferred { if sv.Transferred {
log.Infof("%s: claim was transferred, ignoring") log.Infof("%s: claim was transferred, ignoring", vID)
count++ //still count them as publishes
continue continue
} }
_, ok := videoIDMap[vID] _, ok := videoIDMap[vID]