GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-19 13:27:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
29954 commits 49 branches 359 tags 252 MiB
Commit graph

4018 commits

Author SHA1 Message Date
Andrew Poelstra
224becc171 Merge 5639d71a07 into merged_master (Bitcoin PR #16293) 2020-11-09 21:20:11 +00:00
Andrew Poelstra
62ce823f8f Merge c67ef2938c into merged_master (Elements PR #600) 
Also uncommented a bunch of PSBT functional tests (had to add a fee output
to one transaction, update `find_output` to skip CT outputs, and change two
constant checks at the end of the commented-out section).
 2020-11-09 21:20:10 +00:00
Andrew Poelstra
c6cdd071a6 Merge 2410088003 into merged_master (Bitcoin PR #16491) 2020-11-09 21:20:09 +00:00
Andrew Poelstra
0657bbeffa Merge 68da54987d into merged_master (Bitcoin PR #16471) 2020-11-09 21:20:09 +00:00
Andrew Poelstra
7b34c1b724 Merge 74ea1f3b0f into merged_master (Bitcoin PR #16399) 2020-11-09 21:20:09 +00:00
Andrew Poelstra
2d972fdeb0 Merge 3489b71512 into merged_master (Bitcoin PR #16464) 2020-11-09 21:20:09 +00:00
Andrew Poelstra
9a159f8617 Merge c606e6fc53 into merged_master (Bitcoin PR #15996) 2020-11-09 21:20:08 +00:00
Andrew Poelstra
3445ac7472 Merge fcc4025c12 into merged_master (Bitcoin PR #16459) 2020-11-09 21:20:08 +00:00
Andrew Poelstra
31aa2513fb Merge d5a54ce8f0 into merged_master (Bitcoin PR #15305) 2020-11-09 21:20:08 +00:00
Andrew Poelstra
83019c2acd Merge d960d5ca99 into merged_master (Bitcoin PR #16362) 2020-11-09 21:20:08 +00:00
Andrew Poelstra
3712040104 Merge 0626b8cbdf into merged_master (Bitcoin PR #16445) 2020-11-09 21:20:07 +00:00
Andrew Poelstra
4619326139 Merge 67923d6b3c into merged_master (Bitcoin PR #16366) 2020-11-09 21:20:07 +00:00
Andrew Poelstra
1e0c1107d3 Merge 065401bc63 into merged_master (Elements PR #674) 2020-11-09 21:20:07 +00:00
Andrew Poelstra
04f0e67e67 Merge 51a6e2c419 into merged_master (Bitcoin PR #15681) 2020-11-09 21:20:07 +00:00
Andrew Poelstra
dcd3f9fd69 Merge 59ce537a49 into merged_master (Bitcoin PR #16152) 2020-11-09 21:20:07 +00:00
Andrew Poelstra
bae56b4d8e Merge 89d7229c9c into merged_master (Bitcoin PR #16420) 2020-11-09 21:20:07 +00:00
Andrew Poelstra
1e09e584fd Merge 0515406acb into merged_master (Bitcoin PR #16374) 2020-11-09 21:20:06 +00:00
Andrew Poelstra
b57516e11a Merge 24dbcf3808 into merged_master (Bitcoin PR #15891) 
Disabled a test that `-acceptnonstdtxn` is disabled on mainnet, because
I couldn't figure out how to make the test jig choose mainnet.
 2020-11-09 21:20:06 +00:00
Andrew Poelstra
47aaf203e4 Merge 8f9725c83f into merged_master (Bitcoin PR #16390) 2020-11-09 21:20:06 +00:00
Andrew Poelstra
3a0de44d90 Merge 0822b44d8a into merged_master (Bitcoin PR #15282) 2020-11-09 21:20:06 +00:00
Andrew Poelstra
3b2e901b3e Merge 536590f358 into merged_master (Bitcoin PR #16334) 2020-11-09 21:20:06 +00:00
Wladimir J. van der Laan
1dfe19e284
Merge #20153: wallet: do not import a descriptor with hardened derivations into a watch-only wallet 
538be4219a wallet: fix importdescriptor silent fail (Ivan Metlushko)

Pull request description:

  Currently `importdescriptor` command will successfully import a descriptor with hardened derivations into a watch-only wallet while silently failing to expand the descriptor to fill the cache. This leads to a broken wallet state and failure to load such wallet due to missing cache on subsequent restart.

ACKs for top commit:
  laanwj:
    Code review ACK 538be4219a
  achow101:
    ACK 538be4219a
  meshcollider:
    utACK 538be4219a

Tree-SHA512: 4bdd0ab4437d55b3f1a79c3a300a0b186089155c020fe220a73d0cce274de47d90371d88918d39fd795f9fccf8db328f1e322d29a6062f9ce94a1c254398f004
 2020-11-09 20:19:00 +01:00
Wladimir J. van der Laan
79a3b59cc7
Merge #20120: net, rpc, test, bugfix: update GetNetworkName, GetNetworksInfo, regression tests 
7b5bd3102e test: add getnetworkinfo network name regression tests (Jon Atack)
9a75e1e569 rpc: update GetNetworksInfo() to not return unsupported networks (Jon Atack)
ba8997fb2e net: update GetNetworkName() with all enum Network cases (Jon Atack)

Pull request description:

  Following up on the BIP155 addrv2 changes, and starting with 7be6ff6 in #19845, RPC getnetworkinfo began returning networks with empty names.

  <details><summary><code>getnetworkinfo</code> on current master</summary><p>

  ```
    "networks": [
      {
        "name": "ipv4",
        "limited": false,
        "reachable": true,
        "proxy": "",
        "proxy_randomize_credentials": false
      },
      {
        "name": "ipv6",
        "limited": false,
        "reachable": true,
        "proxy": "",
        "proxy_randomize_credentials": false
      },
      {
        "name": "onion",
        "limited": false,
        "reachable": true,
        "proxy": "127.0.0.1:9050",
        "proxy_randomize_credentials": true
      },
      {
        "name": "",
        "limited": false,
        "reachable": true,
        "proxy": "",
        "proxy_randomize_credentials": false
      },
      {
        "name": "",
        "limited": false,
        "reachable": true,
        "proxy": "",
        "proxy_randomize_credentials": false
      }
    ],
  ```
  </p></details>

  <details><summary><code>getnetworkinfo</code> on this branch</summary><p>

  ```
    "networks": [
      {
        "name": "ipv4",
        "limited": false,
        "reachable": true,
        "proxy": "",
        "proxy_randomize_credentials": false
      },
      {
        "name": "ipv6",
        "limited": false,
        "reachable": true,
        "proxy": "",
        "proxy_randomize_credentials": false
      },
      {
        "name": "onion",
        "limited": false,
        "reachable": true,
        "proxy": "127.0.0.1:9050",
        "proxy_randomize_credentials": true
      }
    ],
  ```
  </p></details>

  This patch:
  - updates `GetNetworkName()` to the current Network enum
  - updates `getNetworksInfo()` to ignore as-yet unsupported networks
  - adds regression tests

ACKs for top commit:
  hebasto:
    re-ACK 7b5bd3102e
  vasild:
    ACK 7b5bd3102

Tree-SHA512: 8f12363eb430e6f45e59e3b1d69c2f2eb5ead254ce7a67547d116c3b70138d763157335a3c85b51f684a3b3b502c6aace4f6fa60ac3b988cf7a9475a7423c4d7
 2020-11-09 17:07:23 +01:00
Tyler Chambers
b6121edf70 swapped "is" for "==" in literal comparison 
update lint-python.sh to include check F632
 2020-11-09 10:21:51 -05:00
Wladimir J. van der Laan
4fd37d0a10
Merge #20292: test: Fix intermittent feature_taproot issue 
fab900802d ci: Bump timeout factor (MarcoFalke)
50eb0c2512 Small improvements to the Taproot functional tests (Pieter Wuille)
fac865b72d test: Fix intermittent feature_taproot issue (MarcoFalke)
fa1dea19fc test: Fix deser issue in create_block (MarcoFalke)
fa762a3fd4 test: Remove unused unnamed parameter from block.serialize call (MarcoFalke)

Pull request description:

  This fixes three bugs. Also, fix some unrelated code style issues.

  Please refer to the commit messages for more information.

ACKs for top commit:
  laanwj:
    Code review ACK fab900802d

Tree-SHA512: 4e22c240cf345710f3b21fc63243126b90014b3656d0865ff87156e958dd1442e6572c6c0a5701dbbe503eee931a0ceb66eeeb3553137f3d1f5afd27a9f9cada
 2020-11-09 15:47:04 +01:00
Wladimir J. van der Laan
663fd92b28
Merge #20266: wallet: fix change detection of imported internal descriptors 
bd93fc9945 Fix change detection of imported internal descriptors (Andrew Chow)

Pull request description:

  Import internal descriptors were having address book entries added which meant they would be detected as non-change. Fix this and add a test for it.

ACKs for top commit:
  laanwj:
    Code review ACK bd93fc9945
  meshcollider:
    utACK bd93fc9945
  promag:
    Code review ACK bd93fc9945.

Tree-SHA512: 8fa9e364be317627ec171eedffdb505976c0e7f1e55bc7e8cfdffa3aeea5db24d231f55166602cd0e97a5ba621acc871de0a765c75d0c65678f83e93c3b657c5
 2020-11-09 15:14:45 +01:00
Andrew Poelstra
7774f13936 Merge 6c1e45c4c4 into merged_master (Bitcoin PR #16322) 2020-11-09 03:58:21 +00:00
Andrew Poelstra
f245eedfcc Merge 345f42a9e3 into merged_master (Bitcoin PR #14505) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
15f0fb459f Merge 4882040182 into merged_master (Bitcoin PR #16291) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
2cfd0717bc Merge b5fa2319d8 into merged_master (Bitcoin PR #15687) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
2687bdb94a Merge 584168c7f9 into merged_master (Bitcoin PR #16326) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
13fa126076 Merge 1088b90cba into merged_master (Bitcoin PR #16327) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
3845f53ef3 Merge 1381ddbcfc into merged_master (Bitcoin PR #16329) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
7bcd9637cf Merge 11de669d8b into merged_master (Bitcoin PR #16325) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
c755b376d1 Merge 9339008a9d into merged_master (Bitcoin PR #15483) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
5faac4d177 Merge e06067387e into merged_master (Bitcoin PR #16250) 2020-11-09 03:58:18 +00:00
Andrew Poelstra
16a3be0fc8 Merge 2f717fb5cd into merged_master (Bitcoin PR #15427) 2020-11-09 03:58:18 +00:00
Andrew Poelstra
1750fbd46c Merge 545836e5b1 into merged_master (Elements PR #655) 2020-11-09 03:58:18 +00:00
Andrew Poelstra
969b50e413 Merge 1212808762 into merged_master (Bitcoin PR #16257) 2020-11-09 03:58:17 +00:00
Andrew Poelstra
d97e53163b Merge e7f3450b7d into merged_master (Bitcoin PR #16302) 2020-11-09 03:58:17 +00:00
Andrew Poelstra
ac51ef6930 Merge 2cbcc55ba6 into merged_master (Bitcoin PR #16239) 2020-11-06 15:20:17 +00:00
Andrew Poelstra
bb82340205 Merge 7b302eb99d into merged_master (Elements PR #663) 2020-11-06 15:20:17 +00:00
Andrew Poelstra
f59cc8301d Merge a409d015e9 into merged_master (Elements PR #661) 2020-11-06 15:20:17 +00:00
Andrew Poelstra
f68fbc1a56 Merge fd333e15a5 into merged_master (Bitcoin PR #16226) 2020-11-06 15:20:16 +00:00
Andrew Poelstra
c995586189 Merge 303ec103ba into merged_master (Bitcoin PR #16026) 2020-11-06 15:20:16 +00:00
Andrew Poelstra
399dd855d9 Merge ea45967e85 into merged_master (Bitcoin PR #16234) 2020-11-06 15:20:16 +00:00
Andrew Poelstra
6515bef81f Merge 413e438ea9 into merged_master (Bitcoin PR #16243) 2020-11-06 15:20:16 +00:00
Andrew Poelstra
4a70305bf8 Merge 44d8172323 into merged_master (Bitcoin PR #13756) 
This PR introduces a `avoid_reuse` flag to the `getnewaddress` `sendtoaddress` `getbalance`
RPCs, which we've also added some asset-specific stuff. Since both changes have default
values they aren't individually breaking, but together they are since some existing
asset-related RPC workflows now require the user to jam a `False` in there to make
the new avoid-reuse stuff go away.
 2020-11-06 15:20:16 +00:00
Andrew Poelstra
1b9fe24406 Merge ac4d38c337 into merged_master (Bitcoin PR #16236) 2020-11-06 15:20:16 +00:00
Andrew Poelstra
e596f32b6f Merge 0853d8d2fd into merged_master (Bitcoin PR #16112) 2020-11-06 15:20:15 +00:00