Skip to content

merge changes from monero: cryptonote (PR #4779, PR #4683, PR #4688)#62

Merged
QuantumLeaper merged 3 commits into
uPlexa:masterfrom
bleepster:monero-merge-2019.10.06-cryptonote
Oct 21, 2019
Merged

merge changes from monero: cryptonote (PR #4779, PR #4683, PR #4688)#62
QuantumLeaper merged 3 commits into
uPlexa:masterfrom
bleepster:monero-merge-2019.10.06-cryptonote

Conversation

@bleepster

@bleepster bleepster commented Oct 18, 2019

Copy link
Copy Markdown
Contributor

Merging the following commits:

  • cryptonote_core: fix build error gcc 5.4.0 'sign-compare' (233f00c) PR #4779
  • core: fix handle_incoming_tx* comment about return value (3a85af4) PR #4683
  • Fix prune using receive time as tx_weight (5a2e54a) PR #4688

See individual commit messages for details.

xiphon and others added 3 commits October 18, 2019 08:29
@xiphon @bleepster
cryptonote_core: fix build error gcc 5.4.0 'sign-compare'
cf32cf2 
----
From: Merge pull request #4779
Merge Commit: 233f00c
@moneromooo-monero @bleepster
core: fix handle_incoming_tx* comment about return value
0592b15 
----
From: Merge pull request #4683
Commit Hash: 3a85af4
@Doy-lee @bleepster
Fix prune using receive time as tx_weight
b1ccab2 
----
From: Merge pull request #4688
Commit Hash: 5a2e54a

Conflicts:
    src/cryptonote_core/tx_pool.cpp
Resolve:
    prefer incoming change
@QuantumLeaper QuantumLeaper merged commit edc9435 into uPlexa:master Oct 21, 2019
bleepster added a commit to bleepster/uplexa that referenced this pull request Oct 22, 2019
@bleepster
fix build error in tx_pool.cpp
e14816a 
- current remove_transaction_keyimages() implementation has only one
parameter.
- the issue was introduced in uplexa PR uPlexa#62
- original Monero commit: 5a2e54a, PR #4688
@bleepster bleepster mentioned this pull request Oct 22, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@bleepster @QuantumLeaper @xiphon @moneromooo-monero @Doy-lee