CalDescent 241e2bef85 Merge branch 'master' into chain-weight-consensus ...

# Conflicts:
#	src/main/java/org/qortal/block/BlockChain.java
#	src/main/resources/blockchain.json
#	src/test/resources/test-chain-v2-founder-rewards.json
#	src/test/resources/test-chain-v2-leftover-reward.json
#	src/test/resources/test-chain-v2-minting.json
#	src/test/resources/test-chain-v2-qora-holder-extremes.json
#	src/test/resources/test-chain-v2-qora-holder.json
#	src/test/resources/test-chain-v2-reward-scaling.json
#	src/test/resources/test-chain-v2.json

2021-05-02 18:18:20 +01:00

..

Base58.js

Refactor to use BouncyCastle Ed25519/X25519, and more...

2019-04-17 12:32:03 +01:00

demo-node-ui.html

Massive refactor to change 'qora' references to 'qortal'.

2020-02-04 12:11:37 +00:00

ed25519-to-x25519.html

Fix sometimes erroneous Ed25519 public key to X25519 public key conversion.

2019-07-23 11:22:23 +01:00

ed25519-verify-example.html

Added Ed25519 signature verify test JavaScript

2019-08-16 12:33:21 +01:00

local-key-storage.html

Demo HTML/JS page to show encrypted local storage of private key

2019-07-23 12:48:47 +01:00

log4j2-test.properties

New asset pricing scheme (take 2)

2019-04-10 07:18:50 +01:00

nacl_factory.js

Fix Javascript shared-secret & proxy forging private key code

2019-07-23 10:20:20 +01:00

proxy-key-example.html

Proxy private keys are now SHA256(shared secret only) instead of SHA256(shared secret + public keys).

2019-07-23 11:09:25 +01:00

shared-secret-test.html

Fix Javascript shared-secret & proxy forging private key code

2019-07-23 10:20:20 +01:00

test-chain-v2-founder-rewards.json

Merge branch 'master' into chain-weight-consensus

2021-05-02 18:18:20 +01:00

test-chain-v2-leftover-reward.json

Merge branch 'master' into chain-weight-consensus

2021-05-02 18:18:20 +01:00

test-chain-v2-minting.json

Merge branch 'master' into chain-weight-consensus

2021-05-02 18:18:20 +01:00

test-chain-v2-qora-holder-extremes.json

Merge branch 'master' into chain-weight-consensus

2021-05-02 18:18:20 +01:00

test-chain-v2-qora-holder.json

Merge branch 'master' into chain-weight-consensus

2021-05-02 18:18:20 +01:00

test-chain-v2-reward-levels.json

Merge branch 'master' into chain-weight-consensus

2021-05-02 18:18:20 +01:00

test-chain-v2-reward-scaling.json

Merge branch 'master' into chain-weight-consensus

2021-05-02 18:18:20 +01:00

test-chain-v2.json

Merge branch 'master' into chain-weight-consensus

2021-05-02 18:18:20 +01:00

test-settings-v2-bitcoin-regtest.json

Initial Litecoin support

2020-09-15 17:53:54 +01:00

test-settings-v2-founder-rewards.json

Loads of work on CIYAM AT support, including BTC-QORT cross-chain trading.

2020-04-23 09:13:32 +01:00

test-settings-v2-leftover-reward.json

Changes to block reward distribution

2020-06-02 10:42:45 +01:00

test-settings-v2-minting.json

Loads of work on CIYAM AT support, including BTC-QORT cross-chain trading.

2020-04-23 09:13:32 +01:00

test-settings-v2-qora-holder-extremes.json

Fix wrong test blockchain config being used for legacy qora holder testing

2020-06-01 16:44:56 +01:00

test-settings-v2-qora-holder.json

Loads of work on CIYAM AT support, including BTC-QORT cross-chain trading.

2020-04-23 09:13:32 +01:00

test-settings-v2-reward-levels.json

Added unit test to test level 1 and 2 rewards.

2021-03-16 09:11:49 +00:00

test-settings-v2-reward-scaling.json

Changes to block reward distribution

2020-06-02 10:42:45 +01:00

test-settings-v2.json

Initial Litecoin support

2020-09-15 17:53:54 +01:00