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

P2SH related RPC improvements #2830

Merged
merged 3 commits into from
Sep 13, 2013
Merged

P2SH related RPC improvements #2830

merged 3 commits into from
Sep 13, 2013

Conversation

petertodd
Copy link
Contributor

Some currently missing features like decoding a script and adding a specific P2SH redeemScript to the wallet.

@jgarzik
Copy link
Contributor

jgarzik commented Jul 22, 2013

ACK

@petertodd
Copy link
Contributor Author

Note: should be merged after sipa's watch-only address stuff is merged, and modified to work with it.

@sipa
Copy link
Member

sipa commented Jul 29, 2013

Related to that, is addredeemscript useful, if bitcoind has no logic to actually spend coins sent to anything but what is creatable through createmultisigaddress?

@sipa
Copy link
Member

sipa commented Jul 29, 2013

ACK on the other changes.

@petertodd
Copy link
Contributor Author

@sipa Actually bitcoind can spend any P2SH-encoded scriptPubKey that it knows how to spend, so you can (currently) put a pay-to-pubkey or a pay-to-pubkey-hash in redeemScript and things will work fine. In any case I think the feature of adding arbitrary redeemScripts makes the most sense in the context of watch-only-wallets where the actual mechanism to spend the coins can be handled elsewhere.

@gmaxwell
Copy link
Contributor

@petertodd Can you remove addredeemscript for now since it seems like the watch stuff is currently delayed?

@BitcoinPullTester
Copy link

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/22536422878d05a7229f74726148dd50051c883f for binaries and test log.
This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/
Contact BlueMatt on freenode if something looks broken.

@gmaxwell
Copy link
Contributor

ACK, changes look good and I tested all 0,1, and 2 byte scripts in decodescript and tried out validateaddress on some p2sh and non-p2sh addresses.

gmaxwell added a commit that referenced this pull request Sep 13, 2013
P2SH related RPC improvements
@gmaxwell gmaxwell merged commit 4c5969b into bitcoin:master Sep 13, 2013
@petertodd petertodd deleted the p2sh-rpc branch September 13, 2013 04:29
@petertodd petertodd restored the p2sh-rpc branch September 13, 2013 04:29
@petertodd petertodd deleted the p2sh-rpc branch September 13, 2013 04:29
Bushstar pushed a commit to Bushstar/omnicore that referenced this pull request Apr 8, 2020
This is a hackish version of dashpay#2824,
meant for 0.13.x only. The reason for this hackish version is that the
code has diverged quite a bit and its not worth the effort to backport
the hardening code.

Even though 0.13.x included a lot of fixes for sporks handling and syncing,
I still feel more safe with hardening the spork15 block height. If
something goes wrong with spork syncing (e.g. its slower then the first
DIP2/3 block arrives), the whole sync process will fail otherwise.
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants