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

29954 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Poelstra
2cf627d0a6 Merge f735851be2 into merged_master (Bitcoin PR #16467) 2020-11-09 21:20:09 +00:00
Andrew Poelstra
22225267dd Merge 502ec02272 into merged_master (Bitcoin PR #16424) 2020-11-09 21:20:09 +00:00
Andrew Poelstra
524f35d7ef Merge 5c2885f9b2 into merged_master (Bitcoin PR #16481) 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
275c5c1835 Merge 94df084f2a into merged_master (Bitcoin PR #16468) 2020-11-09 21:20:08 +00:00
Andrew Poelstra
4b3841c699 Merge febf3a856b into merged_master (Bitcoin PR #15588) 2020-11-09 21:20:08 +00:00
Andrew Poelstra
0888ad0cf3 Merge 1139e3cb76 into merged_master (Bitcoin PR #16415) 2020-11-09 21:20:08 +00:00
Andrew Poelstra
29e9ba5bc9 Merge dfb7fd60f2 into merged_master (Bitcoin PR #16402) 2020-11-09 21:20:08 +00:00
Andrew Poelstra
9a159f8617 Merge c606e6fc53 into merged_master (Bitcoin PR #15996) 2020-11-09 21:20:08 +00:00
Andrew Poelstra
bf4ccc84dd Merge dbf4f3f86a into merged_master (Bitcoin PR #16301) 2020-11-09 21:20:08 +00:00
Andrew Poelstra
cbbe06eac4 Merge a54a12046e into merged_master (Bitcoin PR #16386) 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
e29f1987af Merge fe001925f8 into merged_master (Bitcoin PR #16455) 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
799f59c303 Merge e6e99d4f75 into merged_master (Bitcoin PR #16408) 2020-11-09 21:20:07 +00:00
Andrew Poelstra
a221eb6f32 Merge 848f245d04 into merged_master (Bitcoin PR #16355) 2020-11-09 21:20:07 +00:00
Andrew Poelstra
431c7dce23 Merge ad4391ca38 into merged_master (Bitcoin PR #16430) 2020-11-09 21:20:07 +00:00
Andrew Poelstra
06df3b4594 Merge 67737cf22a into merged_master (Bitcoin PR #16438) 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
48aa1829a6 Merge f4b1fe7165 into merged_master (Bitcoin PR #16412) 2020-11-09 21:20:07 +00:00
Andrew Poelstra
3c6370a930 Merge c7b7cf299a into merged_master (Bitcoin PR #16422) 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
051964ddf5 Merge e5abb59a9a into merged_master (Bitcoin PR #16379) 2020-11-09 21:20:07 +00:00
Andrew Poelstra
ee925f4cc7 Merge 65d12110d4 into merged_master (Bitcoin PR #16405) 2020-11-09 21:20:06 +00:00
Andrew Poelstra
1e09e584fd Merge 0515406acb into merged_master (Bitcoin PR #16374) 2020-11-09 21:20:06 +00:00
Andrew Poelstra
152198061a Merge 459baa1756 into merged_master (Bitcoin PR #16208) 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
1e58aac3d1 Merge 8f604361eb into merged_master (Bitcoin PR #16194) 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
7436b9cfea Merge 29082e8f40 into merged_master (Bitcoin PR #16380) 2020-11-09 21:20:06 +00:00
Andrew Poelstra
4ac0094f68 Merge 6d37ed888e into merged_master (Bitcoin PR #15824) 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
Andrew Poelstra
8dda4726db Merge 3453cf26db into merged_master (Bitcoin PR #15277) 2020-11-09 21:20:06 +00:00
Andrew Poelstra
9fbf23d6f2 Merge 3dd46d1730 into merged_master (Elements PR #675) 2020-11-09 21:19:26 +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
practicalswift
79b8f8d574 fuzz: Assert roundtrip equality for both addrv1 and addrv2 versions of CService 2020-11-09 15:29:15 +00:00
practicalswift
0e3a78a8ab fuzz: Check for addrv1 compatibility before using addrv1 serializer/deserializer on CSubNet 2020-11-09 15:27:41 +00: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
MarcoFalke
05aeeee34f
Merge #20339: ci: Run more ci configs on cirrus 
77777c8b5e ci: Run windows ci config on cirrus (MarcoFalke)
3333d6942e ci: Run macos ci config on cirrus (MarcoFalke)
fa8b1114e6 ci: Run arm ci config on cirrus (MarcoFalke)
fa0795f54d ci: Replace TRAVIS_OS_NAME with CI_OS_NAME (MarcoFalke)
fafce1a13a ci: Move documentation to correct config file (MarcoFalke)

Pull request description:

ACKs for top commit:
  hebasto:
    ACK 77777c8b5e

Tree-SHA512: 581d3bdb2c3e3da20bd8492c6b23d90f3b4f7f9300ade384667e41de9fbbe42bbcef26dd99328839dc0b49be6e303c4c6d1b66ceb5d8009800c52c97685f9080
 2020-11-09 15:31:20 +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
Wladimir J. van der Laan
f70eb51b05
Merge #20318: build: Ensure source tarball has leading directory name 
faa2f06f5e scripted-diff: [build] Ensure source tarball has leading directory name (MarcoFalke)

Pull request description:

  This has been fixed in 0.20, so it needs to be fixed on master as well to avoid a regression

  #18945

ACKs for top commit:
  laanwj:
    ACK faa2f06f5e
  hebasto:
    ACK faa2f06f5e, tested gitian builds only.
  promag:
    ACK faa2f06f5e.

Tree-SHA512: e3b025c29c45b025002abc35262bb5d771f6cbd807f1c256c477c243685e93cd43ad9f642b38e3cf218590912abe6ea0ddfec3bfbef36f99080aad74ed6cc0af
 2020-11-09 15:06:20 +01:00
MarcoFalke
77777c8b5e
ci: Run windows ci config on cirrus 2020-11-09 10:16:45 +01:00