Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Japanese translations #5

Open
wants to merge 3,171 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3171 commits
Select commit Hold shift + click to select a range
83e324c
Fix file ending
AlphaX-Projects Jan 7, 2024
41645ac
Exclude reward share transactions from the online accounts blocks
AlphaX-Projects Jan 14, 2024
4251526
Merge pull request #166 from AlphaX-Projects/master
AlphaX-Projects Jan 14, 2024
03ba367
Update ElectrumX servers
QuickMythril Jan 17, 2024
15ae32e
Fix crosschain tests
QuickMythril Jan 17, 2024
747b1a4
Update dependencies
AlphaX-Projects Jan 17, 2024
9dd61f0
Merge pull request #170 from AlphaX-Projects/master
AlphaX-Projects Jan 17, 2024
140f14f
Set exclude reward share transactions blockheight
AlphaX-Projects Jan 17, 2024
867fe76
Bump version to 4.4.2
AlphaX-Projects Jan 17, 2024
21c4553
Enabled fee updates for foreign coin trade transactions.
kennycud Jan 18, 2024
b75c202
Out of Service
AlphaX-Projects Jan 21, 2024
0ed2722
Merge pull request #173 from AlphaX-Projects/master
AlphaX-Projects Jan 21, 2024
9c62740
Merge branch 'master' into fix-unit-tests
QuickMythril Jan 21, 2024
6051b85
Remove out of service
QuickMythril Jan 21, 2024
2120490
Fix wrong penaties
AlphaX-Projects Jan 30, 2024
070f14b
Bump version to 4.5.0
AlphaX-Projects Jan 30, 2024
f787648
Fixed vote weight results API call
QuickMythril Feb 1, 2024
dcedcf8
Merge pull request #176 from QuickMythril/votes-api-fix
crowetic Feb 1, 2024
d579606
Merge pull request #174 from QuickMythril/fix-unit-tests
crowetic Feb 1, 2024
4f9a4a2
Disable fix in order for the chain history to remain valid
AlphaX-Projects Feb 2, 2024
55f9414
Remove fix in order for the chain history to remain valid
AlphaX-Projects Feb 3, 2024
9e001df
Remove penalty fix
AlphaX-Projects Feb 3, 2024
587b063
Merge branch 'Qortal:master' into master
kennycud Feb 6, 2024
d05359d
Add debug logging when invalid timestamp is encountered
lgedgar Feb 7, 2024
3f29116
Foreign coin trade transaction summaries
kennycud Feb 12, 2024
ce8fb00
Merge pull request #179 from lgedgar/log-invalid-timestamps
AlphaX-Projects Feb 14, 2024
2d27901
Adding new algos
AlphaX-Projects Feb 18, 2024
c4a7fb3
Bump version to 4.5.1
AlphaX-Projects Feb 18, 2024
92d589a
Merge branch 'Qortal:master' into master
kennycud Feb 19, 2024
f6b91df
Merge pull request #181 from kennycud/master
crowetic Feb 27, 2024
f779344
call current blockchain height to ensure the current server is set to…
kennycud Mar 23, 2024
5c90c4b
Merge remote-tracking branch 'origin/master'
kennycud Mar 23, 2024
e83b226
some simple error logging
kennycud Mar 23, 2024
df39819
Update QDN file management
AlphaX-Projects Mar 25, 2024
cc740cc
Merge pull request #187 from AlphaX-Projects/master
crowetic Mar 25, 2024
d54f840
Merge pull request #185 from kennycud/master
crowetic Mar 25, 2024
498f409
Adding in foreign blockchain server configuration add and remove capa…
kennycud May 26, 2024
f916d35
Corrected incorrect language in the comments. This was copied and pas…
kennycud May 27, 2024
5910cef
Merge pull request #194 from kennycud/master
crowetic Jun 1, 2024
ef07a44
Removed unnecessary imports
AlphaX-Projects Jun 29, 2024
95d42db
Removed unnecessary semicolons
AlphaX-Projects Jun 29, 2024
61ede81
Replaced size() == / > 0 with isEmpty()
AlphaX-Projects Jun 29, 2024
d58fbab
Removed pointless boolean Expression
AlphaX-Projects Jun 29, 2024
806dc6d
Replaced string.equals() with string.isEmpty()
AlphaX-Projects Jun 29, 2024
64537ad
Fixed synchronization on a non-final field
AlphaX-Projects Jun 29, 2024
cc95106
Removed unnecessary continue (last statement in a loop)
AlphaX-Projects Jun 29, 2024
5db808e
Replaced reference method with qualifier (websockets)
AlphaX-Projects Jun 29, 2024
a6cbdaa
Updated to bouncycastle 1.70 (AT and Core)
AlphaX-Projects Jun 29, 2024
ea1d4dd
Updated electrumx with non null objects
AlphaX-Projects Jun 29, 2024
a140805
Updated group transactions (owner check)
AlphaX-Projects Jun 29, 2024
44b4b08
Added block minter thread check
AlphaX-Projects Jun 29, 2024
533df9f
Updated dependencies
AlphaX-Projects Jun 29, 2024
c1da495
Merge pull request #197 from AlphaX-Projects/master
crowetic Jun 30, 2024
2d9f1d6
Update minimum peer version
AlphaX-Projects Jun 30, 2024
a02d1ce
Bump version to 4.5.2
AlphaX-Projects Jun 30, 2024
e4134a7
Added sync from genesis and reindex function
AlphaX-Reloaded Jul 5, 2024
708a978
Activate checkpoints
AlphaX-Reloaded Jul 7, 2024
2125706
Revert enable heckpoints, raise private mail size and add testnet
AlphaX-Reloaded Jul 17, 2024
02346bd
Update testchain.json
AlphaX-Reloaded Jul 17, 2024
449aab0
Update testchain.json
AlphaX-Reloaded Jul 19, 2024
6377b67
Update settings-test.json
AlphaX-Reloaded Jul 19, 2024
456a2ae
Add start stop scripts for testnet
AlphaX-Reloaded Jul 19, 2024
f5cd664
I'm adding this in now for later use. These are the parameters needed…
kennycud Jul 25, 2024
1cd5dcc
Adding support for BitcoinyTBD, version parsing and crosschain offer …
kennycud Jul 25, 2024
661827f
Adding for later use.
kennycud Jul 25, 2024
4cf157b
Adding for later use.
kennycud Jul 25, 2024
da1ea9f
Adding for later use.
kennycud Jul 25, 2024
d4b0d47
Support for responding to multiple crosschain sell offers.
kennycud Jul 25, 2024
780bfe6
Support for responding to multiple crosschain sell offers.
kennycud Jul 25, 2024
a070521
Support for responding to multiple crosschain sell offers.
kennycud Jul 25, 2024
4f05b61
Support for responding to multiple crosschain sell offers.
kennycud Jul 25, 2024
8c1251d
Delegated buildOfferMessage functionality to CrossChainUtils and remo…
kennycud Jul 26, 2024
51feb96
Delegated buildOfferMessage functionality to CrossChainUtils and remo…
kennycud Jul 26, 2024
211fc0d
Protocol version error handling improvements.
kennycud Jul 26, 2024
da889f2
Including unconfirmed transactions for wallet balances while spending…
kennycud Jul 27, 2024
1451910
Responding to multiple trade offers on Pirate Chain now throws an inv…
kennycud Aug 30, 2024
1a42c52
Merge pull request #201 from kennycud/master
crowetic Sep 3, 2024
454c471
Changed gapLimit from 24 to 3 since we have mitigated the gap problem.
kennycud Sep 4, 2024
7f5692e
Merge remote-tracking branch 'origin/master'
kennycud Sep 4, 2024
acc37ce
storing blockchain data in a cache to reduce redundant RPCs to the El…
kennycud Sep 4, 2024
a64e905
consolidated the cache limits into an attribute in Settings.java
kennycud Sep 4, 2024
cbb171f
Merge pull request #202 from kennycud/master
crowetic Sep 6, 2024
0266248
Merge branch 'Qortal:master' into master
AlphaX-Reloaded Sep 11, 2024
f59e658
Disable batch reward on testnet
AlphaX-Reloaded Sep 11, 2024
bbb346a
Update dependencies
AlphaX-Reloaded Sep 11, 2024
9600185
Testnet new genesis
AlphaX-Reloaded Sep 12, 2024
b10dfd2
Fix Testnet
AlphaX-Reloaded Sep 12, 2024
51664f0
Fix testnet start script
AlphaX-Reloaded Sep 12, 2024
f14bc86
implemented arbitrary resources simple search
kennycud Sep 15, 2024
3fda19c
Merge branch 'Qortal:master' into master
kennycud Sep 15, 2024
885aa10
Added Rewardshare disabled
AlphaX-Reloaded Sep 16, 2024
b6272c1
Fix namecheck
AlphaX-Reloaded Sep 19, 2024
acd30ed
Added namecheck to feature triggers
AlphaX-Reloaded Sep 19, 2024
cf591be
Update testchain.json
AlphaX-Reloaded Sep 19, 2024
c58d2b5
Added get namecheck height
AlphaX-Reloaded Sep 19, 2024
d0139c2
Added member of group check
AlphaX-Reloaded Sep 21, 2024
d976904
added 2 endpoints providing sponsorship analytics
kennycud Sep 23, 2024
f825333
Merge remote-tracking branch 'origin/master'
kennycud Sep 23, 2024
a530b64
added transfer privs inquiries to sponsorship analytics
kennycud Sep 23, 2024
5a69176
bug fix, no rows should return zero counts instead of throwing an exc…
kennycud Sep 24, 2024
aba4c60
added new '/addresses/levels' API call that will pull an array of acc…
crowetic Sep 28, 2024
d42148c
Merge pull request #1 from Crowetic-Hardware-Development/master
kennycud Sep 28, 2024
bbf2787
removed import that was put in by accident on a merge
kennycud Sep 28, 2024
7c4b0bd
Merge remote-tracking branch 'origin/master'
kennycud Sep 28, 2024
639e1df
in sponsorship reports, exclude the recipients that get real reward s…
kennycud Sep 28, 2024
68a2e65
added MintershipReport endpoint, restructured the sponsorship report …
kennycud Sep 29, 2024
2b83c4b
fixed the query to get registered names
kennycud Sep 29, 2024
39da7ed
handled null pointer case caused by the last update
kennycud Sep 30, 2024
3162a83
Added bootstrap4.qortal.org to settings
QuickMythril Sep 30, 2024
f105af6
removed API restriction from pubkey conversion
QuickMythril Sep 30, 2024
d9ad0bd
sponsorship endpoints now return a different report type than the min…
kennycud Oct 3, 2024
7c9d82b
fixed the incorrect sell amounts by replacing the complex buy sell qu…
kennycud Oct 5, 2024
036d9b6
Merge pull request #205 from QuickMythril/pubkey-conversion
crowetic Oct 11, 2024
252bb84
Merge pull request #203 from kennycud/master
crowetic Oct 11, 2024
900e2a9
Merge pull request #204 from QuickMythril/add-bootstrap-server
crowetic Oct 12, 2024
85cf740
fixed a copy/paste error in toString by regenerating it
kennycud Oct 13, 2024
0a5ac37
Merge remote-tracking branch 'origin/master'
kennycud Oct 13, 2024
187a360
Implemented the HSQLDB Cache to enhance /arbitrary/resource/search. T…
kennycud Oct 13, 2024
27cc9e4
added support for limit set to zero or negative as no limit
kennycud Oct 14, 2024
5c7ffce
Merge pull request #1 from Qortal/master
AlphaX-Reloaded Oct 15, 2024
524ed2b
Merge pull request #207 from AlphaX-Reloaded/master
crowetic Oct 17, 2024
bd942dd
Merge branch 'Qortal:master' into master
kennycud Oct 17, 2024
1e90d87
Set feature triggers
AlphaX-Reloaded Oct 18, 2024
e44382a
Update minimum peer version
AlphaX-Reloaded Oct 18, 2024
ec8ddf2
Bump version to 4.6.0
AlphaX-Reloaded Oct 18, 2024
e6d1353
Merge branch 'Qortal:master' into master
kennycud Oct 18, 2024
3043d1c
replaced String array declarations with Object array declarations to …
kennycud Oct 20, 2024
8591057
broader exception handling and added verbosity to the logging
kennycud Oct 22, 2024
fa1e86a
added more descriptive labelling to the logging
kennycud Oct 24, 2024
2629e5f
broader exception handling and added verbosity to the logging to 4 mo…
kennycud Oct 24, 2024
c2d7dfe
allowing user to set thread priorities for numerous threads, added a …
kennycud Oct 27, 2024
ab78f22
The last update introduced an issue that blocked out the synchronizer…
kennycud Oct 29, 2024
881d9c9
Changes to thread priority and executor service
AlphaX-Reloaded Nov 1, 2024
941847d
Reduce thread pool size for less resource use
AlphaX-Reloaded Nov 1, 2024
209920b
Merge remote-tracking branch 'kenny/master'
crowetic Nov 1, 2024
a0c7e3d
made modifications to prevent double-setting the same priorities. Kep…
crowetic Nov 1, 2024
aa6c38e
Fix for most unit tests fails
QuickMythril Nov 3, 2024
5e315de
Made networking engine thread-safe and removed redundant locking.
kennycud Nov 4, 2024
fd5ba48
Merge kenny's changes to ExecuteProduceConsume making it threadsafe a…
crowetic Nov 4, 2024
bcf68ea
Adjusted network settings and added reboot
AlphaX-Reloaded Nov 5, 2024
56db39e
Fixed restart
AlphaX-Reloaded Nov 6, 2024
3f2fc5c
Give block archiver more time after started
AlphaX-Reloaded Nov 6, 2024
38fd0c5
pulled alpha's recent changes for hopefully final release candidate
crowetic Nov 6, 2024
497259f
Merge remote-tracking branch 'alphax/master'
crowetic Nov 6, 2024
2c017fc
added alpha's changes together with kenny's to make final BlockArchiv…
crowetic Nov 6, 2024
ea10759
Merge pull request #210 from crowetic/master
crowetic Nov 7, 2024
e74a06e
Update README.md
crowetic Nov 7, 2024
bb40dcd
Reduced connection error to a warning. Removed unnecessary return value.
kennycud Nov 7, 2024
a0b4853
Moved auto restart node as feature in settings
AlphaX-Reloaded Nov 8, 2024
65c6377
Merge remote-tracking branch 'alphax/master'
crowetic Nov 8, 2024
7fa1180
Merge remote-tracking branch 'kenny/master'
crowetic Nov 8, 2024
5e1ad82
Merged alpha default restart settings and kenny logging changes, made…
crowetic Nov 8, 2024
2ee5bc5
added README changes to build a single PR for new release candidate
crowetic Nov 8, 2024
d42acb7
Merge pull request #209 from QuickMythril/fix-unit-tests
crowetic Nov 8, 2024
93c8f78
Merge branch 'master' into master
crowetic Nov 8, 2024
50d6e38
Merge pull request #211 from crowetic/master
crowetic Nov 8, 2024
76f5d17
Reduced connection error to a warning. Removed unnecessary return val…
kennycud Nov 8, 2024
07474ab
Merge pull request #212 from kennycud/master
kennycud Nov 8, 2024
6648c4b
Bump version to 4.6.1
AlphaX-Reloaded Nov 8, 2024
0850654
add connect-src to csp
Philreact Nov 10, 2024
0cf9b23
remove log
Philreact Nov 10, 2024
0a47ca1
add font-src csp
Philreact Nov 11, 2024
1676098
Add missing feature triggers to unit tests
QuickMythril Nov 13, 2024
82d5d25
Add logging to block archive unit tests
QuickMythril Nov 13, 2024
3d83a79
Fix whitespace only
QuickMythril Nov 13, 2024
d79d64f
Removed name check and decreased difficulty for online signature
AlphaX-Qortal Nov 16, 2024
30a289b
Update dependencies
AlphaX-Qortal Nov 16, 2024
c45d59b
Merge pull request #216 from AlphaX-Qortal/master
crowetic Nov 17, 2024
8851331
Set timestamps
AlphaX-Qortal Nov 17, 2024
831ed72
Update minimum peer version
AlphaX-Qortal Nov 17, 2024
8319193
Bump version to 4.6.2
AlphaX-Qortal Nov 17, 2024
915bb1d
Merge pull request #74 from QuickMythril/4.6.1-unit-test-fix
QuickMythril Nov 17, 2024
652c902
Add missing feature triggers to unit tests
QuickMythril Nov 17, 2024
130bb6c
Added logging statements to demonstrate order of operations. This wil…
kennycud Nov 18, 2024
f55efe3
Removed logging statements to demonstrate order of operations to othe…
kennycud Nov 18, 2024
0eb551a
Merge pull request #214 from Philreact/master2
AlphaX-Qortal Nov 20, 2024
46395bf
Updare canMint and HSQLDB
AlphaX-Qortal Nov 20, 2024
fccd5a7
Merge pull request #219 from AlphaX-Qortal/master
AlphaX-Qortal Nov 20, 2024
39cc56c
Update minimum peer version
AlphaX-Qortal Nov 20, 2024
d89f7ad
Bump version to 4.6.3
AlphaX-Qortal Nov 20, 2024
f277611
Merge branch 'master' of https://github.com/kennycud/qortal
kennycud Nov 20, 2024
b0d43a1
minter group check optimizations
kennycud Nov 21, 2024
7803d6c
adjust timeouts for qortalrequests
Philreact Nov 25, 2024
c010ab4
Fix batch reward
AlphaX-Qortal Nov 25, 2024
1f9a2ed
Merge pull request #221 from kennycud/master
crowetic Nov 26, 2024
4b037ad
Merge pull request #222 from AlphaX-Qortal/master
AlphaX-Qortal Nov 26, 2024
0a44928
Set peer connect to a dedicated thread pool for non-blocking I/O (Tha…
AlphaX-Qortal Nov 26, 2024
cd6d7a3
Merge pull request #223 from AlphaX-Qortal/master
AlphaX-Qortal Nov 26, 2024
4d28ba6
Update minimum peer version
AlphaX-Qortal Nov 26, 2024
89999e6
Set feature trigger
AlphaX-Qortal Nov 26, 2024
2ce02fa
Bump version to 4.6.4
AlphaX-Qortal Nov 26, 2024
8ffb062
Bump version to 4.6.5
AlphaX-Qortal Nov 26, 2024
84b9737
restructuring database connections for better garbage collection, add…
kennycud Nov 28, 2024
2e3f97b
Merge remote-tracking branch 'origin/master'
kennycud Nov 28, 2024
08a2284
deleting file that interferes with building the last commit
kennycud Nov 28, 2024
61dec0e
add haschatreference query to activechats endpoint
Philreact Dec 1, 2024
adbba0f
Various changes
AlphaX-Qortal Dec 2, 2024
e3a8578
Update dependencies
AlphaX-Qortal Dec 2, 2024
7fb093e
Merge pull request #237 from Philreact/active-chat-haschatreference
crowetic Dec 2, 2024
2347118
Merge pull request #239 from kennycud/master
crowetic Dec 2, 2024
bd214a0
Merge pull request #220 from Qortal/master2
crowetic Dec 2, 2024
a8d7392
Merge pull request #238 from AlphaX-Qortal/master
crowetic Dec 2, 2024
8bd293c
Merge pull request #217 from QuickMythril/4.6.2-unit-test-fix
crowetic Dec 2, 2024
2e989aa
A merge of just alpha's validation changes, phil and quick's commits,…
crowetic Dec 3, 2024
448b536
Modified start script to work with optimized Garbage Collection made …
crowetic Dec 3, 2024
8d68301
Changes need to be reverted prior to new PR from crowetic repo.
crowetic Dec 4, 2024
9b20192
Changes need to be reverted prior to the PR from crowetic repo being …
crowetic Dec 4, 2024
749143e
Merge pull request #241 from crowetic/master
crowetic Dec 4, 2024
04203e7
modified autoUpdateRepos further to plan ahead.
crowetic Dec 6, 2024
a23eb02
Revert "modified autoUpdateRepos further to plan ahead."
crowetic Dec 6, 2024
071325c
Bump version to 4.6.6 to prepare for update, modified auto-update rep…
crowetic Dec 6, 2024
386387f
Added modifications to current Windows Installer build in preparation…
crowetic Dec 6, 2024
c2bfa26
Merge pull request #242 from crowetic/master
crowetic Dec 6, 2024
5346c97
added logging to help solve the updated field problem, the problem is…
kennycud Dec 10, 2024
543d0a7
Merge remote-tracking branch 'origin/master'
kennycud Dec 10, 2024
5e145de
Balance Recorder initial implementation.
kennycud Dec 12, 2024
c71f5fa
added another logging line to troubleshoot QDN problem
kennycud Dec 13, 2024
e9b75b0
added seller/buyer to filter completed trades
Philreact Dec 24, 2024
5ac0027
fix css for qdn resource loading
Philreact Dec 25, 2024
4f0aabf
For Balance Recorder, reward recordings only, that is the default.
kennycud Dec 25, 2024
3952705
Admin replace founders hardfork and online validation fail-safe hardf…
kennycud Dec 26, 2024
45d88c1
Admin share typo fix and new test case submission.
kennycud Dec 26, 2024
bdbbd01
updated the hard fork heights for the test chain
kennycud Dec 28, 2024
a300ac2
added capabilities for groups with null ownership including banning a…
kennycud Dec 30, 2024
c2ba9d1
crowetic's logging suggestions for the new reward distribution update
kennycud Dec 30, 2024
8bbb994
Merge pull request #2 from Philreact/master
kennycud Dec 30, 2024
ebc58c5
qualified Groups table name, so it will be compatible with HSQLDB upd…
kennycud Dec 31, 2024
950c4a5
Merge remote-tracking branch 'origin/master'
kennycud Dec 31, 2024
756f3a2
negate founder effective minting level for admins replace founders ha…
kennycud Dec 31, 2024
278243f
rollback the negation of founder effective minting level, because I m…
kennycud Dec 31, 2024
8f6b55a
rollback the Groups table back quotes, because this only works with m…
kennycud Dec 31, 2024
f5d3384
Since the Groups table is now named `Groups` with back ticks, it is n…
kennycud Jan 3, 2025
2392b7b
system info and database connection status access
kennycud Jan 5, 2025
d9a7648
access to decoded online accounts by block
kennycud Jan 5, 2025
2805bb8
corrected an arithmetic error
kennycud Jan 7, 2025
a8a8904
removed the NULL account from the dev admin reward distribution and a…
kennycud Jan 9, 2025
70f4ff4
ignore level for reward share feature hard fork
kennycud Jan 12, 2025
69cba78
exclude blocked implementation completion
kennycud Jan 12, 2025
b2dbcbb
made adjustments to support the ignore level feature trigger and remo…
kennycud Jan 13, 2025
72f0194
get admin query fix and hardfork
kennycud Jan 18, 2025
ea9a24d
Merge pull request #244 from kennycud/master
crowetic Jan 22, 2025
d6cf45b
bump version to 4.7.0 and set featureTrigger block heights
crowetic Jan 22, 2025
4c35239
Merge pull request #245 from crowetic/master
crowetic Jan 22, 2025
4991618
updates/fixes to publish-auto-update.pl
crowetic Jan 22, 2025
999cfaf
Merge pull request #246 from crowetic/master
crowetic Jan 22, 2025
8b797b5
push featureTrigger blocks back a bit to give more time for auto-update.
crowetic Jan 22, 2025
996d5e0
push featureTrigger blocks back a bit to give more time for auto-update.
crowetic Jan 22, 2025
e434a28
Merge remote-tracking branch 'origin/master'
crowetic Jan 22, 2025
ca238c9
push featureTrigger blocks back a bit to give more time for auto-update.
crowetic Jan 22, 2025
faee7c8
Merge pull request #247 from crowetic/master
crowetic Jan 22, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
33 changes: 33 additions & 0 deletions .github/workflows/pr-testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: PR testing

on:
pull_request:
branches: [ master ]

jobs:
mavenTesting:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Cache local Maven repository
uses: actions/cache@v3
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Set up the Java JDK
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'adopt'

- name: Run all tests
run: |
mvn -B clean test -DskipTests=false --file pom.xml
if [ -f "target/site/jacoco/index.html" ]; then echo "Total coverage: $(cat target/site/jacoco/index.html | grep -o 'Total[^%]*%' | grep -o '[0-9]*%')"; fi

- name: Log coverage percentage
run: |
if [ ! -f "target/site/jacoco/index.html" ]; then echo "No coverage information available"; fi
if [ -f "target/site/jacoco/index.html" ]; then echo "Total coverage: $(cat target/site/jacoco/index.html | grep -o 'Total[^%]*%' | grep -o '[0-9]*%')"; fi
21 changes: 18 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/db*
/lists/
/bin/
/target/
/qortal-backup/
/log.txt.*
/arbitrary*
/Qortal-BTC*
Expand All @@ -12,7 +14,20 @@
/.mvn.classpath
/notes*
/settings.json
/testnet*
/settings*.json
/testchain.json
/run-testnet.sh
/testchain*.json
/run-testnet*.sh
/.idea
/qortal.iml
.DS_Store
/src/main/resources/resources
/*.jar
/run.pid
/run.log
/WindowsInstaller/Install Files/qortal.jar
/*.7z
/tmp
/wallets
/data*
/src/test/resources/arbitrary/*/.qortal/cache
apikey.txt
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"java.compile.nullAnalysis.mode": "automatic"
}
29 changes: 26 additions & 3 deletions AutoUpdates.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# Auto Updates

## TL;DR: how-to

* Prepare new release version (see way below for details)
* Assuming you are in git 'master' branch, at HEAD
* Shutdown local node if running
* Build auto-update download: `tools/build-auto-update.sh` - uploads auto-update file into new git branch
* Restart local node
* Publish auto-update transaction using *private key* for **non-admin** member of "dev" group:
`tools/publish-auto-update.pl non-admin-dev-member-private-key-in-base58`
* Wait for auto-update `ARBITRARY` transaction to be confirmed into a block
* Have "dev" group admins 'approve' auto-update using `tools/approve-auto-update.sh`
This tool will prompt for *private key* of **admin** of "dev" group
* A minimum number of admins are required for approval, and a minimum number of blocks must pass also.
* Nodes will start to download, and apply, the update over the next 20 minutes or so (see CHECK_INTERVAL in AutoUpdate.java)

## Theory
* Using a specific git commit (e.g. abcdef123) we produce a determinstic JAR with consistent hash.
* To avoid issues with over-eager anti-virus / firewalls we obfuscate JAR using very simplistic XOR-based method.
Expand All @@ -25,8 +40,8 @@ The same method is used to obfuscate and de-obfuscate:

## Typical download locations
The git SHA1 commit hash is used to replace `%s` in various download locations, e.g.:
* https://github.com/QORT/qortal/raw/%s/qortal.update
* https://[email protected]/QORT/qortal/%s/qortal.update
* https://github.com/Qortal/qortal/raw/%s/qortal.update
* https://[email protected]/Qortal/qortal/%s/qortal.update

These locations are part of the org.qortal.settings.Settings class and can be overriden in settings.json like:
```
Expand All @@ -45,4 +60,12 @@ $ java -cp qortal.jar org.qortal.XorUpdate
usage: XorUpdate <input-file> <output-file>
$ java -cp qortal.jar org.qortal.XorUpdate qortal.jar qortal.update
$
```
```

## Preparing new release version

* Shutdown local node
* Modify `pom.xml` and increase version inside `<version>` tag
* Commit new `pom.xml` and push to github, e.g. `git commit -m 'Bumped to v1.4.2' -- pom.xml; git push`
* Tag this new commit with same version: `git tag v1.4.2`
* Push tag up to github: `git push origin v1.4.2`
12 changes: 9 additions & 3 deletions DATABASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ You can examine your node's database using [HSQLDB's "sqltool"](http://www.hsqld
It's a good idea to install "rlwrap" (ReadLine wrapper) too as sqltool doesn't support command history/editing.

Typical command line for sqltool would be:
`rlwrap java -cp ${HSQLDB_JAR}:${SQLTOOL_JAR} org.hsqldb.cmdline.SqlTool --rcFile=${SQLTOOL_RC} qora`
`rlwrap java -cp ${HSQLDB_JAR}:${SQLTOOL_JAR} org.hsqldb.cmdline.SqlTool --rcFile=${SQLTOOL_RC} qortal`

`${HSQLDB_JAR}` should be set with pathname where Maven downloaded hsqldb,
typically `${HOME}/.m2/repository/org/hsqldb/hsqldb/2.5.0/hsqldb-2.5.0.jar`
typically `${HOME}/.m2/repository/org/hsqldb/hsqldb/2.5.1/hsqldb-2.5.1.jar`

`${SQLTOOL_JAR}` should be set with pathname where Maven downloaded sqltool,
typically `${HOME}/.m2/repository/org/hsqldb/sqltool/2.5.0/sqltool-2.5.0.jar`
Expand All @@ -25,10 +25,16 @@ Above `url` component `file:db/blockchain` assumes you will call `sqltool` from

Another idea is to assign a shell alias in your `.bashrc` like:
```
export HSQLDB_JAR=${HOME}/.m2/repository/org/hsqldb/hsqldb/2.5.0/hsqldb-2.5.0.jar
export HSQLDB_JAR=${HOME}/.m2/repository/org/hsqldb/hsqldb/2.5.1/hsqldb-2.5.1.jar
export SQLTOOL_JAR=${HOME}/.m2/repository/org/hsqldb/sqltool/2.5.0/sqltool-2.5.0.jar
alias sqltool='rlwrap java -cp ${HSQLDB_JAR}:${SQLTOOL_JAR} org.hsqldb.cmdline.SqlTool --rcFile=${SQLTOOL_RC}'
```
So you can simply type: `sqltool qortal`

Don't forget to use `SHUTDOWN;` before exiting sqltool so that database files are closed cleanly.

## Quick and dirty version

With `sqltool-2.5.0.jar` and `qortal.jar` in current directory, and database in `db/`

`java -cp qortal.jar:sqltool-2.5.0.jar org.hsqldb.cmdline.SqlTool --inlineRc=url=jdbc:hsqldb:file:db/blockchain`
26 changes: 26 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
FROM maven:3-openjdk-11 as builder

WORKDIR /work
COPY ./ /work/
RUN mvn clean package

###
FROM openjdk:11

RUN useradd -r -u 1000 -g users qortal && \
mkdir /usr/local/qortal /qortal && \
chown 1000:100 /qortal

COPY --from=builder /work/log4j2.properties /usr/local/qortal/
COPY --from=builder /work/target/qortal*.jar /usr/local/qortal/qortal.jar

USER 1000:100

EXPOSE 12391 12392
HEALTHCHECK --start-period=5m CMD curl -sf http://127.0.0.1:12391/admin/info || exit 1

WORKDIR /qortal
VOLUME /qortal

ENTRYPOINT ["java"]
CMD ["-Djava.net.preferIPv4Stack=false", "-jar", "/usr/local/qortal/qortal.jar"]
Loading