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

improve detection for own claims vs their claims

Browse source
This commit is contained in:
Niko Storni 2019-10-01 16:55:43 +02:00
parent c7272e988a
commit d2bbb36312
3 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
manager/setup.go
View file

@ -141,11 +141,10 @@ func (s *Sync) walletSetup() error {
return nil return nil
} }
func (s *Sync) getDefaultAccount() (string, error) {
func (s *Sync) ensureEnoughUTXOs() error {
accounts, err := s.daemon.AccountList() accounts, err := s.daemon.AccountList()
if err != nil { if err != nil {
return errors.Err(err) return "", errors.Err(err)
} }
accountsNet := (*accounts).LBCMainnet accountsNet := (*accounts).LBCMainnet
if logUtils.IsRegTest() { if logUtils.IsRegTest() {
@ -159,7 +158,15 @@ func (s *Sync) ensureEnoughUTXOs() error {
} }
} }
if defaultAccount == "" { if defaultAccount == "" {
return errors.Err("No default account found") return "", errors.Err("No default account found")
}
return defaultAccount, nil
}
func (s *Sync) ensureEnoughUTXOs() error {
defaultAccount, err := s.getDefaultAccount()
if err != nil {
return err
} }
utxolist, err := s.daemon.UTXOList(&defaultAccount) utxolist, err := s.daemon.UTXOList(&defaultAccount)

10
manager/transfer.go
View file

@ -38,8 +38,12 @@ waiting:
func abandonSupports(s *Sync) (float64, error) { func abandonSupports(s *Sync) (float64, error) {
totalPages := uint64(1) totalPages := uint64(1)
var allSupports []jsonrpc.Claim var allSupports []jsonrpc.Claim
defaultAccount, err := s.getDefaultAccount()
if err != nil {
return 0, err
}
for page := uint64(1); page <= totalPages; page++ { for page := uint64(1); page <= totalPages; page++ {
supports, err := s.daemon.SupportList(nil, page, 50) supports, err := s.daemon.SupportList(&defaultAccount, page, 50)
if err != nil { if err != nil {
return 0, errors.Prefix("cannot list claims", err) return 0, errors.Prefix("cannot list claims", err)
} }
@ -53,7 +57,7 @@ func abandonSupports(s *Sync) (float64, error) {
if ok { if ok {
continue continue
} }
supportOnTransferredClaim := support.Address == s.publishAddress supportOnTransferredClaim := support.Address == s.publishAddress //todo: probably not needed anymore
if supportOnTransferredClaim { if supportOnTransferredClaim {
continue continue
} }
@ -98,7 +102,7 @@ func transferVideos(s *Sync) error {
StreamCreateOptions: &jsonrpc.StreamCreateOptions{ StreamCreateOptions: &jsonrpc.StreamCreateOptions{
ClaimCreateOptions: jsonrpc.ClaimCreateOptions{ClaimAddress: &s.publishAddress}, ClaimCreateOptions: jsonrpc.ClaimCreateOptions{ClaimAddress: &s.publishAddress},
}, },
Bid: util.PtrToString("0.009"), // Todo - Dont hardcode Bid: util.PtrToString("0.008"), // Todo - Dont hardcode
} }
videoStatus := sdk.VideoStatus{ videoStatus := sdk.VideoStatus{

4
manager/ytsync.go
View file

@ -495,11 +495,15 @@ func (s *Sync) fixDupes(claims []jsonrpc.Claim) (bool, error) {
claimToAbandon = cl claimToAbandon = cl
videoIDs[videoID] = c videoIDs[videoID] = c
} }
if claimToAbandon.Address != s.publishAddress && !s.syncedVideos[videoID].Transferred {
log.Debugf("abandoning %+v", claimToAbandon) log.Debugf("abandoning %+v", claimToAbandon)
_, err := s.daemon.StreamAbandon(claimToAbandon.Txid, claimToAbandon.Nout, nil, false) _, err := s.daemon.StreamAbandon(claimToAbandon.Txid, claimToAbandon.Nout, nil, false)
if err != nil { if err != nil {
return true, err return true, err
} }
} else {
log.Debugf("lbrynet stream abandon --txid=%s --nout=%d", claimToAbandon.Txid, claimToAbandon.Nout)
}
abandonedClaims = true abandonedClaims = true
//return true, nil //return true, nil
} }