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

fix masari #2296

Merged
merged 1 commit into from
Mar 10, 2019
Merged

fix masari #2296

merged 1 commit into from
Mar 10, 2019

Conversation

psychocrypt
Copy link
Collaborator

fix #2278 #2233

Since masari increased the block size the miner crashed each time it
gets connected with a masari pool.

This PR extent the possible size of a block to 128 byte and updated the
kernel.

@Murtpoiss
Copy link

How can i get this version ?

@Dead2
Copy link
Contributor

Dead2 commented Mar 10, 2019

Needs another change:

--- a/xmrstak/cli/cli-miner.cpp
+++ b/xmrstak/cli/cli-miner.cpp
@@ -874,8 +874,8 @@ int do_benchmark(int block_version, int wait_sec, int work_sec)

     printer::inst()->print_msg(L0, "Prepare benchmark for block version %d", block_version);

-    uint8_t work[112];
-    memset(work,0,112);
+    uint8_t work[128];
+    memset(work,0,128);
     work[0] = static_cast<uint8_t>(block_version);

     xmrstak::pool_data dat;

@Dead2
Copy link
Contributor

Dead2 commented Mar 10, 2019

And probably

--- a/xmrstak/net/msgstruct.hpp
+++ b/xmrstak/net/msgstruct.hpp
@@ -12,7 +12,7 @@
 struct pool_job
 {
     char        sJobID[64];
-    uint8_t     bWorkBlob[112];
+    uint8_t     bWorkBlob[128];
     uint64_t    iTarget;
     uint32_t    iWorkLen;

@psychocrypt
Copy link
Collaborator Author

psychocrypt commented Mar 10, 2019 via email

@Spudz76
Copy link
Contributor

Spudz76 commented Mar 10, 2019

I have changed my tree to use a #define MAXWORKSIZE 128 in miner_work.hpp
And then that macro everywhere 128 occurs, and (MAXWORKSIZE-4) everywhere 124 occurs in relation to workblobs

This way there is only one place to change it (in the future)

Since masari increased the block size the miner crashed each time it
gets connected with a masari pool.

This PR extent the possible size of a block to 128 byte and updated the
kernel.
@psychocrypt
Copy link
Collaborator Author

I have changed my tree to use a #define MAXWORKSIZE 128 in miner_work.hpp
And then that macro everywhere 128 occurs, and (MAXWORKSIZE-4) everywhere 124 occurs in relation to workblobs

This way there is only one place to change it (in the future)

I hope it is never needed again^^

@fireice-uk fireice-uk merged commit b7b1510 into fireice-uk:dev Mar 10, 2019
@psychocrypt psychocrypt mentioned this pull request Mar 11, 2019
gnagel pushed a commit to gnagel/xmr-stak that referenced this pull request Mar 23, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug currency Add/Modify a Currency
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants