remove rebase artifacts

BenWestgate · BenWestgate · commit 4423f5619561 · 2025-09-07T19:20:21.000-05:00
diff --git a/bip-0085.mediawiki b/bip-0085.mediawiki
@@ -225,12 +225,9 @@ OUTPUT:
 * DERIVED ENTROPY=ae131e2312cdc61331542efe0d1077bac5ea803adf24b313a4f0e48e9c51f37f
 * DERIVED BIP39 MNEMONIC=puppy ocean match cereal symbol another shed magic wrap hammer bulb intact gadget divorce twin tonight reason outdoor destroy simple truth cigar social volcano
 
-
 ===BIP93 (codex32)===
 Application Number: 93'
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 The derivation path format is: <code>m/83696968'/93'/{hrp}'/{threshold}'/{n}'/{byte_length}'/{id0}'/{id1}'/{id2}'/{id3}'/{index}'</code>
 
 Use this application to generate fresh codex32 strings (as defined in BIP-0093) for Shamir's Secret Sharing backups of BIP-0032 HD master seeds. Each codex32 string encodes a share or secret with a human-readable prefix (hrp), and a data part consisting of a threshold, identifier, share index, payload, and checksum.
@@ -243,20 +240,6 @@ Repeat until all required data characters are validly chosen.
 
 Example: a codex32 secret with <code>hrp = "ms"</code> (first index), <code>threshold = "0"</code>, <code>n = 1</code>, <code>byte_length = 16</code>, identifier <code>"c0??"</code> would have the path <code>m/83696968'/93'/0'/0'/1'/16'/24'/15'/32'/32'/0'</code>, the next secret would be <code>m/83696968'/93'/0'/0'/1'/16'/24'/15'/32'/32'/1'</code> (identifier <code>"c0zc"</code>) etc.
 
-=======
-The derivation path format is: <code>m/83696968'/93'/<hrp>'/<threshold>'/<n>'/<byte_length>'/<id0>'/<id1>'/<id2>'/<id3>'</code>
-=======
-The derivation path format is: <code>m/83696968'/93'/{hrp}'/{threshold}'/{n}'/{byte_length}'/{id0}'/{id1}'/{id2}'/{id3}'</code>
->>>>>>> 8a14663 (Finish polishing of bip-0085.mediawiki)
-
-Use this application to generate fresh codex32 strings (as defined in BIP-0093) for Shamir's Secret Sharing backups of BIP-0032 HD master seeds. Each codex32 string encodes a share or secret with a human-readable prefix (`hrp`), and a data part consisting of a threshold, identifier, share index, payload, and checksum.
-
-Create a BIP85 DRNG whose seed is the derived entropy. Read 1 byte from the DRNG and trim to the 5 most significant bits to obtain an integer (0–31), representing a bech32 character. Repeat until all required data characters are validly chosen.
-
-Example: a codex32 secret with <code>hrp = "ms"</code> (first index), <code>threshold = "0"</code>, <code>n = 1</code>, <code>byte_length = 16</code>, identifier <code>"c00l"</code> would have the path <code>m/83696968'/93'/0'/0'/1'/16'/24'/15'/15'/31'</code>, the next secret would be <code>m/83696968'/93'/0'/0'/1'/16'/24'/15'/15'/32'</code> (identifier <code>"c00?"</code>) etc.
-
-
->>>>>>> 8b99481 (Update bip-0085.mediawiki)
 Human-readable Prefix Table
 
 {|
@@ -274,11 +257,7 @@ Human-readable Prefix Table
 Threshold Table
 
 {|
-<<<<<<< HEAD
 !Threshold
-=======
-!threshold
->>>>>>> 8b99481 (Update bip-0085.mediawiki)
 !Code
 |-
 | "0"
@@ -313,8 +292,6 @@ Threshold Table
 Share Count Table
 
 {|
-<<<<<<< HEAD
-<<<<<<< HEAD
 !Threshold code
 !Number of Shares
 !Code
@@ -326,27 +303,12 @@ Share Count Table
 | not 0'
 | n (from 1 to 31)
 | n'
-=======
-! Number of Shares to Generate
-=======
-! Number of Shares
->>>>>>> 8a14663 (Finish polishing of bip-0085.mediawiki)
-!Code
-|-
-| n (from 1 to 31)
-| n'
-|-
->>>>>>> 8b99481 (Update bip-0085.mediawiki)
 |}
-Notes: If <code>threshold == "0"</code>, <code>n</code> must be ''1''.
-
 
 Bytes Length Table
 
 {|
 ! Bytes
-<<<<<<< HEAD
-<<<<<<< HEAD
 ! Data Length (Characters)
 !Code
 |-
@@ -418,7 +380,6 @@ Otherwise, for each initial share needed:
 * Recover secret at "s", if needed, for the default identifier.
 3. Prepend the <code>threshold</code> and identifier.
 
-<<<<<<< HEAD
 4. Compute and append the codex32 checksum.
 
 5. Translate the data part to characters using the table from BIP-0173 and prepend <code>hrp</code>1.
@@ -474,150 +435,6 @@ Examples:
 Generate 2 codex32 shares, 16-byte existing master seed, threshold 3, identifier <code>"g0??"</code>.
 
 Note: The share indices are alphabetized. The default identifier is the fingerprint of payload bytes of "s" had the <code>threshold</code been <code>n</code> (2 in this example).
-=======
-* Fresh Seeds (n >= t)
-  * Generate ''t'' shares with random payloads using the BIP85 DRNG:
-    * For each share, take the next available letter from the bech32 alphabet, in alphabetical order, as <code>a</code>, <code>c</code>, <code>d</code>, ..., to be the share index.
-    * Generate the payload as ceil(''byte_length * 8 / 5'') random symbols (5-bit values mapped to Bech32 chars).
-    * Note: The exact number of symbols depends on the byte_length.
-  * If ''n'' >= ''t'', use the DRNG to deterministically select additional unique indices.
-  * For additional shares ''n'' - ''t'', compute their payloads by interpolating using BIP-93 SSS rules from the initial ''t'' shares.
-  * Encode each share as a codex32 string per BIP-93.
-  * The secret can be recovered by interpolating any ''t'' shares at index "s".
-
-* Existing Master Seeds (n = t - 1)
-  * Generate ''n'' = ''t'' - 1 shares with random payloads using the DRNG, as above.
-  * Assign indices in fixed alphabetical order (<code>a</code>, <code>c</code>, <code>d</code>, ...).
-  * The existing master seed is treated as the ''t''-th share (encoded as codex32 secret with index "s").
-  * To generate additional shares, interpolate using the ''t'' points (''t''-1 generated shares + secret).
-  * Encode the generated shares as codex32 strings.
-  * To recover, combine any ''t'' shares to interpolate the secret at "s".
-  Note: For existing seeds, the software must know the master seed to compute additional shares or verify, but the derived entropy ensures deterministic randomness.
-=======
-! Data length
-=======
-! Data Length (Characters)
->>>>>>> 8a14663 (Finish polishing of bip-0085.mediawiki)
-!Code
-|-
-| 16
-| 45
-| 16'
-|-
-| 32
-| 71
-| 32'
-|-
-| 64
-| 124
-| 64'
-|}
-Note: Other lengths between 16 and 64 are valid but not recommended, using corresponding hardened indices.
-
-Identifer Table
-
-{|
-! Identifier
-!Code
-|-
-| id0, id1, id2, id3
-| id0'/id1'/id2'/id3'
-|-
-| Default (BIP-0032 fingerprint)
-| 32'/32'/32'/32'
-|}
-The identifier is four bech32 characters converted to four integers using the bech32 character table from BIP-0173. The default is the 20 most significant bits of the BIP-0032 fingerprint of the master seed converted to bech32. Values >= ''32'' use the default. This affects the derived entropy and resulting fingerprint allowing ''96 ^ 4'' independent default identifier codex32 backups to be generated by incrementing the hardened identifier indices.
-
-Rationale: This default assists users in locating the correct codex32 backup for their wallets, should be distinct for every master seed users may need to disambiguate and, since it is widely stored, improves overall error correction.
-
-====Unshared Secret====
-
-When <code>threshold == "0" and n == 1</code>, the output is a codex32 secret. The payload in a codex32 secret is a direct encoding of a BIP-0032 HD master seed.
-
-Note: <code>threshold == "0" and n > 1</code> is invalid.
-
-Examples:
-
-Generate a "cl" prefixed Core Lightning HSM secret, 32-bytes with identifier "cln2".
-
-INPUT:
-* MASTER BIP32 ROOT KEY: xprv9s21ZrQH143K2LBWUUQRFXhucrQqBpKdRRxNVq2zBqsx8HVqFk2uYo8kmbaLLHRdqtQpUm98uKfu3vca1LqdGhUtyoFnCNkfmXRyPXLjbKb
-* PATH: m/83696968'/93'/1'/0'/1'/32'/24'/31'/19'/10'
-OUTPUT:
-* DERIVED ENTROPY=
-* DERIVED BIP93 codex32=cl10cln2s...
-
-====Share Generation====
-
-If we already have a valid set of ''t'' initial codex32 strings, use BIP-0093 to derive ''n'' shares. The BIP85 dice application may be used to randomly select ''n'' share indices.
-
-Otherwise, for each initial share needed to reach ''t'':
-
-1. Take the next available letter from the bech32 alphabet, in alphabetical order, as <code>a</code>, <code>c</code>, <code>d</code>, ..., to be the share index.
-* Valid share index characters are the bech32 charset excluding "s" sorted alphabetically as ''acdefghjklmnpqrtuvwxyz023456789'' (31 share index characters).
-2. Generate ceil(''<code>byte_length</code> * 8 / 5'') random payload characters using the BIP85 DRNG.
-* Recover secret, if needed, for the default identifier.
-3. Prepend the <code>threshold</code> and identifier.
-
-4. Compute and append the codex32 checksum.
-
-5. Translate the data part to characters using the table from BIP-0173 and prepend <code>hrp</code>1.
-
-{|
-! Fresh master seeds
-!Existing master seeds
-|-
-| ''n'' >= ''t''
-| ''n'' < ''t''
-|}
-
-There are two ways to create an initial set of ''t'' valid codex32 strings, depending on whether the user already has an existing master seed. 
-
-=====For a fresh master seed=====
-
-Generate ''t'' initial random shares as above, then:
-* Derive the remaining 31 - ''t'' possible shares by interpolating from these initial ''t'' shares.
-* Use the DRNG to deterministically select ''n'' unique indices (excluding "s").
-* Output the shares with these indices.
-* The secret can be recovered by interpolating any ''t'' shares at index "s".
->>>>>>> 8b99481 (Update bip-0085.mediawiki)
-
-<<<<<<< HEAD
-* Constraints
-  * Index "s" is reserved for the secret (''t'' = 0').
-  * If ''n'' < ''t'' and ''n'' != ''t'' - 1, invalid.
-  * Payloads are generated as random symbols; final encoding includes checksums per BIP-93.
-  * For identifier omitted, compute as 4 bech32 characters of the BIP32 fingerprint of the seed (payload bytes of "s") or for ''n'' = ''t'' - 1 the BIP32 fingerprint of the share payload(s) bytes.
-
-* Rationale:
-  - Aligns with the BIP-85 convention of using the BIP number as the
-    application number where appropriate.
-  - Enables deterministic generation of Codex32-compatible master seeds
-    from a single root xprv, consistent with other BIP-85 applications.
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-=====Examples=====
-Generates 5 "ms" prefixed codex32 shares of 32 bytes each, threshold 3, identifier "qsqp" (assuming charset mapping for 0,16,0,1).
->>>>>>> 304e622 (reduce Table of Contents entries)
-=======
-====Examples====
-=======
-=====For an existing master seed=====
-
-Existing Master Seeds (n = t - 1)
-* Generate ''n'' = ''t'' - 1 shares with random payloads using the DRNG, as above.
-* The existing master seed is treated as the ''t''-th share (encoded as codex32 secret with index "s").
-* To generate additional shares, interpolate using the ''t'' points (''t''-1 generated shares + secret).
-* Encode the generated shares as codex32 strings.
-* To recover, combine any ''t'' shares to interpolate the secret at "s".
-Note: For existing seeds, the software must know the master seed to compute additional shares or verify, but the derived entropy ensures deterministic randomness.
-
-Examples:
-
->>>>>>> 8b99481 (Update bip-0085.mediawiki)
-Generates 5 "ms" prefixed codex32 shares for a 32 byte seed, threshold 3, identifier "qsqp" (assuming charset mapping for 0,16,0,1).
->>>>>>> f02a449 (Described examples and bumped them up a TOC level)
 
 INPUT:
 * MASTER BIP32 ROOT KEY: xprv9s21ZrQH143K2LBWUUQRFXhucrQqBpKdRRxNVq2zBqsx8HVqFk2uYo8kmbaLLHRdqtQpUm98uKfu3vca1LqdGhUtyoFnCNkfmXRyPXLjbKb
@@ -631,91 +448,14 @@ Generate 1 codex32 share for a 64-byte existing master seed, threshold 2, identi
 
 Note: Indices will be alphabetical. The default identifier is the fingerprint of payload bytes of share "a".
 
-<<<<<<< HEAD
-Generates 16-byte codex32 secret with identifier "test".
-
 INPUT:
 * MASTER BIP32 ROOT KEY: xprv9s21ZrQH143K2LBWUUQRFXhucrQqBpKdRRxNVq2zBqsx8HVqFk2uYo8kmbaLLHRdqtQpUm98uKfu3vca1LqdGhUtyoFnCNkfmXRyPXLjbKb
 * PATH: m/83696968'/93'/0'/2'/1'/64'/32'/29'/19'/19'/0'
 OUTPUT:
-<<<<<<< HEAD
 * DERIVED ENTROPY=bb4fb0e144930d545836177820d173cc250b9084ac50ce3aa6816efaed2dc750cc687b71c9c95a372009427ced155e78622a81defed03321aea49f4d4fdb688b
 * DERIVED BIP93 identifier=mann
 * DERIVED BIP93 codex32=ms12mannaczq4kkph3gtppqu5ehjes6fvsyh09m0tk3ag5z3tkq5p5menyjpukyy2dvddk4yu979949g08jlfdt4w946we8dynamcu22c0tr6s2rndpnrmqac6z23nd
-=======
-* DERIVED ENTROPY=
-* DERIVED BIP93 codex32=ms10tests...
-
-=======
->>>>>>> 8b99481 (Update bip-0085.mediawiki)
-Generates 3 codex32 shares, 16 bytes seed, threshold 2, identifier "name".
-=======
-Examples:
-
-Generate 3 codex32 shares for a 32 byte seed, threshold 2, default identifier.
-
-INPUT:
-* MASTER BIP32 ROOT KEY: xprv9s21ZrQH143K2LBWUUQRFXhucrQqBpKdRRxNVq2zBqsx8HVqFk2uYo8kmbaLLHRdqtQpUm98uKfu3vca1LqdGhUtyoFnCNkfmXRyPXLjbKb
-* PATH: m/83696968'/93'/0'/2'/3'/16'/32'/32'/32'/32'
-OUTPUT:
-* DERIVED ENTROPY=
-* DERIVED BIP93 codex32=ms12?????... ms12?????... ms12?????...
-
-Generate 10 codex32 shares for a 16 byte seed, threshold 3, identifier <code>"name"</code>.
->>>>>>> 8a14663 (Finish polishing of bip-0085.mediawiki)
-
-INPUT:
-* MASTER BIP32 ROOT KEY: xprv9s21ZrQH143K2LBWUUQRFXhucrQqBpKdRRxNVq2zBqsx8HVqFk2uYo8kmbaLLHRdqtQpUm98uKfu3vca1LqdGhUtyoFnCNkfmXRyPXLjbKb
-* PATH: m/83696968'/93'/0'/3'/10'/16'/19'/29'/27'/25'
-OUTPUT:
-* DERIVED ENTROPY=
-* DERIVED BIP93 codex32=ms13name... ms13name... ms13name... ms13name... ms13name...
-
-
-=====For an existing master seed=====
-
-Generate ''n'' = ''t'' - 1 initial random shares as above, then:
-* Output these shares with the alphabetized indices.
-* The existing master seed is treated as the ''t''-th share (encoded as codex32 secret with index "s").
-* To generate additional shares, interpolate using the ''t'' points (''t''-1 generated shares + secret).
-
-Examples:
-
-Generate 2 codex32 shares, 16 bytes seed, threshold 3, identifier "g0??".
-
-Note: The share indices are alphabetized. The default identifier is the fingerprint of payload bytes of "s" had the <code>threshold</code been <code>n</code> (2 in this example).
-
-INPUT:
-* MASTER BIP32 ROOT KEY: xprv9s21ZrQH143K2LBWUUQRFXhucrQqBpKdRRxNVq2zBqsx8HVqFk2uYo8kmbaLLHRdqtQpUm98uKfu3vca1LqdGhUtyoFnCNkfmXRyPXLjbKb
-* PATH: m/83696968'/93'/0'/3'/2'/16'/8'/15'/32'/32'/0'
-OUTPUT:
-* DERIVED ENTROPY=
-* DERIVED BIP93 codex32=ms13g0??a... ms13g0??c...
-
-Generate 1 shares for a 16-byte existing master seed, threshold 2, default identifier.
-
-Note: Indices will be alphabetical. The default identifier is the fingerprint of payload bytes of share "a".
-
-INPUT:
-* MASTER BIP32 ROOT KEY: xprv9s21ZrQH143K2LBWUUQRFXhucrQqBpKdRRxNVq2zBqsx8HVqFk2uYo8kmbaLLHRdqtQpUm98uKfu3vca1LqdGhUtyoFnCNkfmXRyPXLjbKb
-* PATH: m/83696968'/93'/0'/3'/2'/16'/32'/32'/32'/32'
-OUTPUT:
-* DERIVED ENTROPY=
-* DERIVED BIP93 codex32=ms12????a...
-
-<<<<<<< HEAD
-Generate 1 "cl" prefixed Core Lightning HSM secret, 32-bytes, identifier "cln2".
-
-INPUT:
-* MASTER BIP32 ROOT KEY: xprv9s21ZrQH143K2LBWUUQRFXhucrQqBpKdRRxNVq2zBqsx8HVqFk2uYo8kmbaLLHRdqtQpUm98uKfu3vca1LqdGhUtyoFnCNkfmXRyPXLjbKb
-* PATH: m/83696968'/93'/1'/0'/1'/32'/24'/31'/19'/10'
-OUTPUT:
-* DERIVED ENTROPY=
-* DERIVED BIP93 codex32=cl10cln2s...
->>>>>>> f02a449 (Described examples and bumped them up a TOC level)
 
-=======
->>>>>>> 8b99481 (Update bip-0085.mediawiki)
 ===HD-Seed WIF===
 Application number: 2'
 
@@ -920,11 +660,7 @@ OUTPUT
 
 This specification is not backwards compatible with any other existing specification.
 
-<<<<<<< HEAD
 This specification relies on BIP32 but is agnostic to how the BIP32 root key is derived. As such, this standard is able to derive wallets with initialization schemes like BIP39, codex32 or Electrum wallet style mnemonics.
-=======
-This specification relies on BIP32 but is agnostic to how the BIP32 root key is derived. As such, this standard is able to derive wallets with initialization schemes like Codex32 backups or BIP39 or Electrum wallet style mnemonics.
->>>>>>> 8a14663 (Finish polishing of bip-0085.mediawiki)
 
 ==References==
 
