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

Merge upstream ~(130 commits) #1149

Merged
merged 139 commits into from
Jun 4, 2020
Merged

Merge upstream ~(130 commits) #1149

merged 139 commits into from
Jun 4, 2020

Conversation

Doy-lee
Copy link
Collaborator

@Doy-lee Doy-lee commented May 6, 2020

No description provided.

moneromooo-monero and others added 30 commits April 23, 2019 22:09
…sfers

And add them for pending transfers, where they were missing
>N limits display to alt chains with more than N blocks
-N limits display to alt chains younger than N blocks
Exceptions would otherwise terminate the process silently
We might have external access without having to do this
It would try to get their prunable hash, but v1 txes don't have one
In static member function ‘static boost::optional<cryptonote::rpc::output_distribution_data> cryptonote::rpc::RpcHandler::get_output_distribution(const std::function<bool(long unsigned int, long unsigned int, long unsigned int, long unsigned int&, std::vector<long unsigned int>&, long unsigned int&)>&, uint64_t, uint64_t, uint64_t, const std::function<crypto::hash(long unsigned int)>&, bool, uint64_t)’:
cc1plus: warning: ‘void* __builtin_memset(void*, int, long unsigned int)’: specified size 18446744073709551536 exceeds maximum object size 9223372036854775807 [-Wstringop-overflow=]
In that case, we'll still keep the "Monero is now disconnected
from the network" near the end of the log
Make bans control RPC sessions too. And auto-ban some bad requests.
Drops HTTP connections whenever response code is 500.
This is an inherently probabilistic check, which occasionally fails
for a matching distribution
The wallet was ignoring --restore-height and --restore-date params and
prompting for them again.
- getTxKey method throws an exception, e.g., when user declines txKey export
find_package(PythonInterp) needs to be called before the tests.
@@ -1234,6 +1234,7 @@ namespace cryptonote
if (tvc.m_double_spend) os << "Double spend TX, ";
if (tvc.m_invalid_input) os << "Invalid inputs, ";
if (tvc.m_invalid_output) os << "Invalid outputs, ";
if (tvc.m_too_few_outputs) os << "Need atleast 2 outputs, ";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need at least 1 space.

@@ -157,6 +157,7 @@ static_assert(STAKING_PORTIONS % 12 == 0, "Use a multiple of twelve, so that it
#define HF_VERSION_ED25519_KEY cryptonote::network_version_13_enforce_checkpoints
#define HF_VERSION_FEE_BURNING cryptonote::network_version_14_blink
#define HF_VERSION_BLINK cryptonote::network_version_14_blink
#define HF_VERSION_MIN_2_OUTPUTS cryptonote::network_version_16
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought this was already enforced. Or is it just done by the wallet but not enforced?

Copy link
Collaborator Author

@Doy-lee Doy-lee Jun 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just wallet, it would fail on construction, but if you tweak the wallet to allow it, like we do with LNS transactions then it goes through fine. (1 change output + tx extra burn fee).

@Doy-lee Doy-lee merged commit f6d9a03 into oxen-io:dev Jun 4, 2020
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.