Skip to content

Commit ab02918

Browse files
committed
merge dev
2 parents a97b95d + 1985c1a commit ab02918

10 files changed

+887
-1020
lines changed

.github/workflows/get_data_lint_files_deploy.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
run: cd utils/js && npm ci
5252

5353
- name: Get file and Author data
54+
if: github.base_ref == 'main' || github.ref == 'refs/heads/main' || github.base_ref == 'dev' || github.ref == 'refs/heads/dev'
5455
run: node utils/js/get_file_author_data.js
5556

5657
- name: Validate and Update links
@@ -63,11 +64,11 @@ jobs:
6364
run: node utils/js/h1_presence_checker.js
6465

6566
- name: Prepare data files for GPTs
66-
if: github.base_ref == 'main' || github.ref == 'refs/heads/main'
67+
if: github.base_ref == 'main' || github.ref == 'refs/heads/main' || github.base_ref == 'dev' || github.ref == 'refs/heads/dev'
6768
run: node utils/js/create_data_for_gpts.js
6869

6970
- name: Ensure change logs are updated
70-
if: github.base_ref == 'main' || github.ref == 'refs/heads/main'
71+
if: github.base_ref == 'main' || github.ref == 'refs/heads/main' || github.base_ref == 'dev' || github.ref == 'refs/heads/dev'
7172
run: node utils/js/ensure_changelog_update.js
7273

7374
- name: Set lint-fix branch name

data-for-gpts/all-content.txt

+196-302
Large diffs are not rendered by default.

data-for-gpts/antara-content.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -15791,7 +15791,7 @@ curl --user $rpcuser:$rpcpassword --data-binary '{"jsonrpc": "1.0", "id":"curlte
1579115791

1579215792
**tokenlist**
1579315793

15794-
The `tokenlist` method lists all available tokens on the asset chain.
15794+
The `tokenlist` method lists all available tokens on the smart chain.
1579515795

1579615796
### Arguments
1579715797

@@ -17310,11 +17310,11 @@ export const description = "This section contains information required to Setup
1731017310
This section of the documentation contains information required to Setup Antara based Smart Chains.
1731117311
export const title = "Activate Custom Consensus modules on a Komodo Smartchain";
1731217312
export const description =
17313-
"If you have an existing assetchain based on Komodo platform without Custom Consensus modules enabled, you can activate it at any time.";
17313+
"If you have an existing smartchain based on Komodo platform without Custom Consensus modules enabled, you can activate it at any time.";
1731417314

1731517315
# How to Activate Custom Consensus modules on an Existing Komodo Smartchain
1731617316

17317-
If you have an existing assetchain based on Komodo platform without Custom Consensus modules enabled, you can activate it at any time. Komodo daemon now supports the command-line parameter `-ac_ccactivate=height` , using which you can activate CC on a non-CC enabled chain in a future block height.
17317+
If you have an existing smartchain based on Komodo platform without Custom Consensus modules enabled, you can activate it at any time. Komodo daemon now supports the command-line parameter `-ac_ccactivate=height` , using which you can activate CC on a non-CC enabled chain in a future block height.
1731817318

1731917319
## Example
1732017320

@@ -17637,7 +17637,7 @@ In a P2PK transaction, the software checks the cryptographic signature of the pu
1763717637

1763817638
These simple transactions are common in coinbase transactions. (Recall that a coinbase transaction is the transaction that mints new coins onto a blockchain. Coinbase transactions are most frequently encountered as block rewards for miners/stakers, and in the Gensis Block of a chain.)
1763917639

17640-
If the reader would like a more thorough technical explanation of P2PK transactions, tutorials and explanations abound across the web. [Here is one such example.](https://komodoplatform.com/p2pk-pay-to-pubkey/)
17640+
If the reader would like a more thorough technical explanation of P2PK transactions, tutorials and explanations abound across the web. [Here is one such example.](https://komodoplatform.com/en/academy/p2pk-pay-to-pubkey/)
1764117641

1764217642
#### Quantum Computers, Cold Addresses, and Change
1764317643

@@ -17667,7 +17667,7 @@ Transactions that send funds to a cold address are called "Pay to Pubkey Hash" t
1766717667

1766817668
When performing a P2PKH transaction, the protocol has a few extra steps to perform. The protocol must check that the hash of the pubkey (which is included as a part of the cold address) is appropriately matched to the pubkey itself. The structure of a P2PKH transaction includes opreturns that instruct the daemon to perform these verification steps.
1766917669

17670-
The Internet contains many thorough explanations of P2PKH transactions. For more information, [here is one such tutorial.](https://komodoplatform.com/p2pkh-pay-to-pubkey-hash/)
17670+
The Internet contains many thorough explanations of P2PKH transactions. For more information, [here is one such tutorial.](https://komodoplatform.com/en/academy/p2pkh-pay-to-pubkey-hash/)
1767117671

1767217672
Once a cold address is associated with a pubkey, the Bitcoin protocol no longer attempts to use these quantum-secure P2PKH transactions, as they require an extra 25 bytes of data space. Instead, the protocol reverts to the original P2PK transactions.
1767317673

@@ -17683,7 +17683,7 @@ This method allows the user to lock their funds to the hash of a script. The scr
1768317683

1768417684
To unlock the funds, a user provides the original script. The blockchain daemon checks that the script matches the hash, executes the script, and the funds are unlocked.
1768517685

17686-
For more information about P2SH transactions, [a useful tutorial can be found here.](https://komodoplatform.com/p2sh-pay-to-script-hash/)
17686+
For more information about P2SH transactions, [a useful tutorial can be found here.](https://komodoplatform.com/en/academy/p2sh-pay-to-script-hash/)
1768717687

1768817688
#### Understanding Op Codes
1768917689

0 commit comments

Comments
 (0)