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

rpc: Disable Sprout address generation #5368 #5474

Merged
merged 1 commit into from
Jan 25, 2022

Conversation

LarryRuane
Copy link
Collaborator

Closes #5368.

@LarryRuane LarryRuane added the A-rpc-interface Area: RPC interface label Jan 13, 2022
@LarryRuane LarryRuane self-assigned this Jan 13, 2022
Copy link
Contributor

@nuttycom nuttycom left a comment

Choose a reason for hiding this comment

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

One very minor change required.

src/wallet/rpcwallet.cpp Outdated Show resolved Hide resolved
@mdr0id mdr0id added the safe-to-build Used to send PR to prod CI environment label Jan 14, 2022
@mdr0id
Copy link
Contributor

mdr0id commented Jan 14, 2022

Error for windows @LarryRuane :

libtool: warning: '-version-info/-version-number' is ignored for convenience libraries
  CC       randombytes/internal/librdrand_la-randombytes_internal_random.lo
libtool: warning: '-version-info/-version-number' is ignored for convenience libraries
  CCLD     libssse3.la
In file included from randombytes/internal/randombytes_internal_random.c:55:
In file included from ./include/sodium/private/common.h:248:
In file included from /workspace/source/depends/x86_64-w64-mingw32/native/lib/clang/13.0.0/include/intrin.h:12:
In file included from /usr/x86_64-w64-mingw32/include/intrin.h:41:
/usr/x86_64-w64-mingw32/include/psdk_inc/intrin-impl.h:1944:18: error: function cannot return function type 'int (unsigned int)'
unsigned __int64 _xgetbv(unsigned int);
                 ^
/workspace/source/depends/x86_64-w64-mingw32/native/lib/clang/13.0.0/include/xsaveintrin.h:35:42: note: expanded from macro '_xgetbv'
#define _xgetbv(A) __builtin_ia32_xgetbv((long long)(A))
                                         ^
In file included from randombytes/internal/randombytes_internal_random.c:55:
In file included from ./include/sodium/private/common.h:248:
In file included from /workspace/source/depends/x86_64-w64-mingw32/native/lib/clang/13.0.0/include/intrin.h:12:
In file included from /usr/x86_64-w64-mingw32/include/intrin.h:41:
/usr/x86_64-w64-mingw32/include/psdk_inc/intrin-impl.h:1947:18: error: function cannot return function type 'int (unsigned int)'
unsigned __int64 _xgetbv(unsigned int index)
                 ^
/workspace/source/depends/x86_64-w64-mingw32/native/lib/clang/13.0.0/include/xsaveintrin.h:35:42: note: expanded from macro '_xgetbv'
#define _xgetbv(A) __builtin_ia32_xgetbv((long long)(A))
                                         ^
libtool: warning: '-version-info/-version-number' is ignored for convenience libraries
  CCLD     libavx2.la
libtool: warning: '-version-info/-version-number' is ignored for convenience libraries
randombytes/internal/randombytes_internal_random.c:128:8: warning: unknown attribute 'thread' ignored [-Wunknown-attributes]
static TLS InternalRandom stream = {
       ^~~
randombytes/internal/randombytes_internal_random.c:98:26: note: expanded from macro 'TLS'
#  define TLS __declspec(thread)
                         ^~~~~~
<built-in>:346:38: note: expanded from here
#define __declspec(a) __attribute__((a))
                                     ^
1 warning and 2 errors generated.
make[4]: *** [Makefile:2307: randombytes/internal/librdrand_la-randombytes_internal_random.lo] Error 1
make[4]: *** Waiting for unfinished jobs....
make[4]: Leaving directory '/workspace/source/depends/work/build/x86_64-w64-mingw32/libsodium/1.0.18-40c4aa5332d/src/libsodium'
make[3]: *** [Makefile:3111: all-recursive] Error 1
make[3]: Leaving directory '/workspace/source/depends/work/build/x86_64-w64-mingw32/libsodium/1.0.18-40c4aa5332d/src/libsodium'
make[2]: Leaving directory '/workspace/source/depends/work/build/x86_64-w64-mingw32/libsodium/1.0.18-40c4aa5332d/src'
make[2]: *** [Makefile:400: all-recursive] Error 1
make[1]: *** [Makefile:515: all-recursive] Error 1
make[1]: Leaving directory '/workspace/source/depends/work/build/x86_64-w64-mingw32/libsodium/1.0.18-40c4aa5332d'
make: *** [funcs.mk:248: /workspace/source/depends/work/build/x86_64-w64-mingw32/libsodium/1.0.18-40c4aa5332d/./.stamp_built] Error 2
make: Leaving directory '/workspace/source/depends'

zcash-build-ipfs-qtcnt-zcash-lint-build-upload-pinata-n74-hlpv2__step-build__log.txt

@nuttycom
Copy link
Contributor

That's a weird error, nothing in this PR affects the dependencies, and that's a failure in the libsodium build.

@LarryRuane LarryRuane force-pushed the 2022-01-disable-sprout-addr-gen branch from 4858660 to ce4fe1a Compare January 18, 2022 15:18
@LarryRuane
Copy link
Collaborator Author

Thanks for your review, @nuttycom, force-pushed to fix -1 error.

@str4d str4d added this to the Core Sprint 2022-02 milestone Jan 20, 2022
nuttycom
nuttycom previously approved these changes Jan 20, 2022
Copy link
Contributor

@nuttycom nuttycom left a comment

Choose a reason for hiding this comment

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

utACK

Copy link
Contributor

@defuse defuse left a comment

Choose a reason for hiding this comment

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

Changes requested from @daira and me.

src/wallet/rpcwallet.cpp Outdated Show resolved Hide resolved
src/wallet/rpcwallet.cpp Outdated Show resolved Hide resolved
src/wallet/rpcwallet.cpp Outdated Show resolved Hide resolved
qa/rpc-tests/remove_sprout_shielding.py Show resolved Hide resolved
Use the transaction builder to implement z_sendmany.
@LarryRuane
Copy link
Collaborator Author

Force-pushed fixes for review comments, thanks.

Copy link
Contributor

@nuttycom nuttycom left a comment

Choose a reason for hiding this comment

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

re-utACK

@nuttycom nuttycom requested a review from defuse January 25, 2022 15:36
Copy link
Contributor

@daira daira left a comment

Choose a reason for hiding this comment

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

utACK

Copy link
Contributor

@defuse defuse left a comment

Choose a reason for hiding this comment

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

utACK

@nuttycom nuttycom merged commit 28eddb7 into zcash:master Jan 25, 2022
@LarryRuane LarryRuane deleted the 2022-01-disable-sprout-addr-gen branch January 25, 2022 17:57
@daira daira changed the title rpc: Disable Sprout address generation at Canopy #5368 rpc: Disable Sprout address generation #5368 Feb 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-rpc-interface Area: RPC interface safe-to-build Used to send PR to prod CI environment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Disable Sprout address generation for the zcashd wallet as of the Canopy upgrade.
6 participants