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

148 commits

Author SHA1 Message Date
Andrew Poelstra
3613ae283d Merge f60e0684d1 into merged_master (Elements PR #773) 2020-11-09 23:10:10 +00:00
Andrew Poelstra
75e090ffc0 Merge 4daadce36c into merged_master (Bitcoin PR #17162) 2020-11-09 21:20:41 +00:00
Andrew Poelstra
821f5256a5 Merge 46d6930f8c into merged_master (Bitcoin PR #16659) 2020-11-09 21:20:41 +00:00
Andrew Poelstra
9cc26a716a Merge 5b2fe5563b into merged_master (Elements PR #642) 
FIXME: we disable standardness checks for the non-PAK node in the PAK tests.
This is because of a bug in Elements which causes non-PAK nodes to reject
pegouts for standardness reasons. Need to fix it after the rebase.
 2020-11-09 21:20:21 +00:00
Andrew Poelstra
9f26fe6ceb Merge 9bc016f460 into merged_master (Elements PR #669) 2020-11-09 03:58:18 +00:00
Andrew Poelstra
68d9951825 Merge d0f81a96d9 into merged_master (Bitcoin PR #16129) 2020-11-06 15:20:13 +00:00
Andrew Poelstra
e5f9a5f873 Merge 1ccb0b67f9 into merged_master (Elements PR #610) 2020-11-06 15:20:11 +00:00
Andrew Poelstra
bbb4535a9d Merge c65c77c721 into merged_master (Bitcoin PR #14039) 2020-10-28 22:33:52 +00:00
Gregory Sanders
1d7847305c HF: Dyanfed pruned header now has extra root 2019-11-08 14:07:01 -05:00
practicalswift
084e17cebd Remove unused includes 2019-10-15 22:56:43 +00:00
Gregory Sanders
e2be2356dd Refactor IsPAKValid to not magically acquire chainparams 2019-09-05 10:51:09 -04:00
Gregory Sanders
6000752a92 Enforce PAK checks on dynafed proposals 2019-09-05 10:51:09 -04:00
Gregory Sanders
bd11097cec Add fedpeg_program field in dynafed header 2019-09-05 10:51:09 -04:00
Gregory Sanders
4ad2b8018d CreatePAKListFromExtensionSpace just uses FromBytes for correctness 2019-09-05 10:51:09 -04:00
Gregory Sanders
dddc040aa0 s/m_dyna_params/m_dynafed_params/ 2019-09-05 10:51:09 -04:00
Gregory Sanders
6ed63c1fb3 Light explanation of dynamic federations fields 2019-09-05 10:51:09 -04:00
Gregory Sanders
15996384d4 s/ConsensusParamEntry/DynaFedParamEntry/ 2019-09-05 10:51:09 -04:00
Gregory Sanders
642260a126 s/m_sbs_wit_limit/m_signblock_witness_limit/ 2019-09-05 10:51:09 -04:00
Gregory Sanders
b66804678c s/HF_MASK/DYNAFED_HF_MASK/ 2019-09-05 10:51:09 -04:00
Gregory Sanders
802a055191 ScriptHasValidPAKProof takes fedpeg as arg 2019-09-03 10:55:06 -04:00
Gregory Sanders
804cd9f75f Update PAK internals, helper functions 2019-09-03 10:55:06 -04:00
Gregory Sanders
a74accf7d1 Add dynamic federations blockheader serialization with HF bit 2019-09-03 10:50:16 -04:00
Gregory Sanders
2845e7811e Define dynamic federations primitives 2019-09-03 10:50:16 -04:00
Gregory Sanders
8a3d622040 Disallow issuance-stuffing in tx deserialization 2019-06-18 10:31:09 -04:00
Gregory Sanders
1ccb0b67f9
Merge #610: All peg-out related detection pushes should be <= OP_PUSHDATA4 
cff50f5 All peg-out related detection pushes should be <= OP_PUSHDATA4 (Gregory Sanders)

Pull request description:

  related to https://github.com/ElementsProject/elements/issues/598 , https://github.com/ElementsProject/elements/issues/596, https://github.com/ElementsProject/elements/pull/597

  This does not affect consensus, but affects consumers of these parsing rules such as rust-elements.

  cc @apoelstra @roconnor-blockstream

Tree-SHA512: 4ab6f0be52c3804b2af43c7b3eecbbe8f2868d3f33385dc54f3acb0e441188018a2b3df197801f2c20fa96e224b6acacb642ecf2f030227618e0aea1e2da44ea
 2019-06-05 11:28:27 +02:00
practicalswift
eca9767673 Make reasoning about dependencies easier by not including unused dependencies 2019-06-02 17:15:23 +02:00
Steven Roose
473e1e9ca1
MERGE-FIX: Fix compatibility functional tests 2019-05-22 16:54:46 +01:00
Steven Roose
39c2906dca
MERGE-FIX: Update src/primitives/bitcoin/ 2019-05-20 12:52:30 +01:00
Steven Roose
f4889a5253
UPSTREAM MERGE BROKEN: Merge upstream commit '519b0bc5dc' into master 2019-05-17 16:17:09 +01:00
Gregory Sanders
cff50f5c36 All peg-out related detection pushes should be <= OP_PUSHDATA4 2019-05-07 21:23:49 -04:00
Steven Roose
9f4f2e7519
MERGE-FIX: Fix compilation errors 2019-05-03 17:46:12 +01:00
Steven Roose
7f894ae00b
UPSTREAM MERGE BROKEN: Merge commit 'f617e05c38' into master 2019-05-01 19:18:18 +01:00
MarcoFalke
c65c77c721
Merge #14039: Disallow extended encoding for non-witness transactions 
bb530efa18 Disallow extended encoding for non-witness transactions (Pieter Wuille)

Pull request description:

  BIP144 specifies that transactions without witness should use the legacy encoding, which is currently not enforced.

  This rule was present in the original SegWit implementation (https://github.com/bitcoin/bitcoin/pull/8149), but was subsequently dropped (https://github.com/bitcoin/bitcoin/pull/8589).

  As all hashes, txids, and weights are always computed over a reserialized version of a transaction, it is mostly harmless to permit extended encoding for non-segwit transactions, but I'd rather strictly follow the BIP.

ACKs for commit bb530e:
  instagibbs:
    utACK https://github.com/bitcoin/bitcoin/pull/14039/commits/bb530efa1872ec963417f61da9a95185c7a7a7d6
  stevenroose:
    utACK bb530efa18

Tree-SHA512: 1aeccd6a555f43784fefb076ce2e8ad2f5ba7be49840544a50050d0390f82373f87201bf56cf8bb30841b4f9cd893b382261a080da875d4e11ab7051f8640dbe
 2019-04-25 14:15:43 -04:00
Pieter Wuille
e11c6f5580 Disallow extended encoding for non-witness transactions 2019-03-21 15:50:35 +00:00
Steven Roose
d53479c9ff
[BROKEN] Introduce CA in data structures 2019-03-20 12:05:45 +00:00
Steven Roose
04d06917d2
Rename con_elementswitness to con_elementsmode 
It will have effect on more than just witness structure from now on.
 2019-03-20 12:05:44 +00:00
Steven Roose
fde9fe1010
Add basic issuance boilerplate 2019-03-20 12:05:42 +00:00
Steven Roose
f81122f948
Add asset and value blinding functionality 2019-03-20 12:05:41 +00:00
Steven Roose
8b8256d9fa
Add ConfidentialCommitment-based types 2019-03-20 12:05:40 +00:00
Steven Roose
fb72ee8fc8 Add Elements-style witness serialization 2019-02-13 11:42:38 +00:00
Steven Roose
6ed8fd8ab0 Add -con_elementswitness flag and global variable 2019-02-13 11:42:38 +00:00
Steven Roose
3b72dab137 Add CalcFastMerkleRoot 2019-02-13 11:42:38 +00:00
Gregory Sanders
4202671221 MERGE FIX: spelling linter fixes 2019-01-31 10:55:03 +00:00
Gregory Sanders
51584e73a3 MERGE-FIX: various compilation fixes 2019-01-28 18:14:40 +00:00
Gregory Sanders
c62fab2d69 UPSTREAM MERGE BROKEN: Merge commit '3832c25f17' into merge_14225 2019-01-28 18:14:25 +00:00
Gregory Sanders
542b826c95 ScriptHasvalidPAKProof: Allow any standard single-key output script type 2019-01-24 11:07:11 -05:00
Gregory Sanders
6679823fc0 Create global PAK lists for config and blockchain state 2019-01-24 11:06:55 -05:00
Gregory Sanders
43424cbf71 Add PAK proof validation function 2019-01-24 11:06:55 -05:00
Gregory Sanders
378e594617 Define PAKList structure and operations 2019-01-24 11:06:25 -05:00
Steven Roose
037b2604d9 Serialize parent blocks without pegin flags 2019-01-02 16:13:32 +01:00