Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream merge 4 #99

Closed
wants to merge 63 commits into from
Closed

Upstream merge 4 #99

wants to merge 63 commits into from

Conversation

camthegeek
Copy link

@camthegeek camthegeek commented Feb 19, 2019

Following @stoffu's last PR format.

This pull request merges upstream patches after monero-project#4129 which is the last one included in #90. This PR includes upstream PRs from monero-project#3528 merged on August 15 up to monero-project#4223 merged on August 23:

Additionally, monero-project#4274 was added to fix a compile issue on Ubuntu 18.10.

Notable updates:
Wallet RPC new commands

Wallet CLI

  • 4188 allows users to import tx secret keys after restoring a wallet that was originally created using 3rd party wallet services such as web wallets so that tx proofs can then be generated.

This group of upstream merges contains many fixes that get us ready for the next patch that will contain many more major updates to AEON.

moneromooo-monero and others added 30 commits February 14, 2019 18:15
as per "An Empirical Analysis of Linkability in the Monero
Blockchain", by Miller et al.
And percent if usefull (% < 99) /monero#4020
It was accepting any character for the dot (yeah, massive big I know)
avoids people thinking it's somehow a generic AE system
Fixes failing test during Arch package build (due to attempt to write to
~/.bitmonero/...).

Prefix temp dir path with "monero-" because we are not putting it on the
system, so good to identify ourselves in case the dir gets left over due
to crash, etc.
That takes a lot of time for even not so large wallets
@shigutso
Copy link

Will test this ASAP, thanks for your hard work, cam!

@BigslimVdub
Copy link

Nice work Cam. I will have a chance to build on OSX high Sierra and windoze 10 hopefully tonight or tomorrow when I get my build environment set up on my new machine.

@420coupe
Copy link

Built on Ubuntu 18.10
had to remove ustat.h from util.cpp to get it to build.

Built and tested wallet/daemon commands on testnet.

No issues.

@stoffu
Copy link

stoffu commented Feb 20, 2019

@BigslimVdub
Copy link

BigslimVdub commented Feb 20, 2019

Build success on native Mac OS 10.13.6.
Version: Aeon 'Sophia' (v0.12.8.0-master-7c1d244f) I should probably add this to tester sheet to verify build hash is correct for PR
Brew installed all dependencies.
Testing:
wallet-cli: opens wallet, syncs properly, transaction send and receive ok, all tested functions of CLI commands work
Daemon functions properly after sync, all tested function in daemon commands work

Issues:
Daemon will not start syncing if blockchain file not in the standard location
Using --data-dir=location of DB I was able to achieve a full function of daemon after DB reorg.

Edit

Testing on windows 10
Build success on Windows 10 18.09
version: Aeon 'Sophia' (v0.12.8.0-master-7c1d244f)
Msys2 64bit
Testing:
wallet-cli: opens wallet, syncs properly, transaction send and receive ok, all tested functions of CLI commands work
Daemon functions properly after sync, all tested function in daemon commands work

No issues observed during testing. Daemon functions properly.

stoffu and others added 8 commits February 20, 2019 03:32
### Fix license of use, 
update 2019; 
Format ISO 8869-1;
----------------------------------------------------------------------------------------------------------------------
in Memoriam Guto Schiavon 
![guto-schiavon_bitcoin](https://user-images.githubusercontent.com/7637553/50562143-a7506f80-0cf8-11e9-9e58-bed4565c4715.jpg)
R.I.P pioneer and friend. 

#ripGUTO
`pacman -Syuu` can either upgrade or degrade the packages (depending upon the package lists), and should not be normally used. Instead of that, one should use `pacman -Syu` which only upgrades the packages.
Adding my gpg key for aeon
Otherwise it'd end up with whatever was included last
@camthegeek
Copy link
Author

Closing in favor of #100 -- rebased and removed duplicate merge.

@camthegeek camthegeek closed this Feb 20, 2019
@camthegeek camthegeek deleted the upstream-4-aug branch February 20, 2019 08:48
@stoffu
Copy link

stoffu commented Feb 20, 2019

Opening multiple PRs on the same subject without good reason is not helpful in general. You could have just made whatever changes to your existing branch (e.g. git reset or git rebase) and force pushed the updated branch (git push -f).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.