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

BONUS kryprowaluty bez depozytu #248

Open
wants to merge 3,047 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3047 commits
Select commit Hold shift + click to select a range
60a6c4b
Fix units for regtest and scalenet
cculianu Oct 18, 2022
566e66e
Regtest via pytest
jonas-lundqvist Oct 19, 2022
b344576
Fix issue where --chipnet was not getting its directory created.
cculianu Oct 24, 2022
54fd359
Add servers_chipnet.json to setup.py
0e4ef622 Oct 30, 2022
17b4d99
Merge pull request #2494 from 0e4ef622/patch-1
cculianu Oct 31, 2022
54453d8
Remove LabelSync option
georgengelmann Nov 3, 2022
8fa6b67
Remove LabelSync: fixed setup.py, removed references in fusion and sh…
georgengelmann Nov 3, 2022
c5fa6e1
Merge pull request #2498 from georgengelmann/master
cculianu Nov 3, 2022
6ec4535
Add instructions to compile the icons for Qt (#2499)
georgengelmann Nov 7, 2022
1909b7d
Android: Bump chaquopy to 13.0.0
jonas-lundqvist Nov 7, 2022
14e2c10
Remove out of date comment
mhsmith Nov 8, 2022
5763790
Merge pull request #2500 from jonas-lundqvist/chaquo_13
mhsmith Nov 8, 2022
110c4e9
Remove RPA option for now for wallet creation.
fyookball Nov 12, 2022
955c230
Remove RPA send functionality until RPA server issues are fixed.
fyookball Nov 12, 2022
dc16848
Merge pull request #2503 from fyookball/master
cculianu Nov 12, 2022
aa5cf37
Build fixups for linux-appimage and wine builds
cculianu Nov 13, 2022
d82e055
Bumped version to 4.2.12, updated release notes for 4.2.12
cculianu Nov 13, 2022
08198f6
Updated translations (submodule pointer in contrib/electrum-locale)
cculianu Nov 13, 2022
667257c
Fix for building srcdist_docker on some docker envs
cculianu Nov 13, 2022
0340060
Updated releases.json for 4.2.12 so that the update checker may notif…
cculianu Nov 14, 2022
7603298
Add `tx_hashes` to exported payment requests
MrNaif2018 Nov 14, 2022
cb91c09
Merge pull request #2504 from bitcartcc/add-tx-hashes-to-invoices
cculianu Nov 20, 2022
fc49768
Merge pull request #2403 from jonas-lundqvist/regtest_rpc
cculianu Nov 21, 2022
e0600e0
Change bch.ninja to cashnode.bch.ninja
kzKallisti Nov 22, 2022
6e2e9bc
Merge pull request #2506 from kzKallisti/patch-2
cculianu Nov 22, 2022
b8b880e
Run tox in github action (#2508)
jonas-lundqvist Nov 23, 2022
02a8eb0
Set BitPay as requestor on jsonPayPro invoices
jonas-lundqvist Nov 24, 2022
bef304a
Merge pull request #2510 from jonas-lundqvist/bitpay_requestor
cculianu Nov 24, 2022
ffba676
Add basic test for jsonPaymentProtocol (#2511)
jonas-lundqvist Nov 26, 2022
d97e95a
Trigger on Master branch + Add GitHub Action badge to README (#2513)
melroy89 Nov 27, 2022
ac5d639
Fixed typo in main_window.py "unnused" -> "unused", plus whitespace nits
cculianu Nov 27, 2022
76afda3
Update electroncash.de servers
georgengelmann Dec 2, 2022
de6cb58
Merge pull request #2516 from georgengelmann/master
cculianu Dec 2, 2022
0fe5093
Nit: use spaces instead of tabs in servers_scalenet.json
cculianu Dec 16, 2022
6e5c2df
Remove python 3.6 from github workflow and/or tox.ini
cculianu Dec 16, 2022
ad8f0e1
Added Melory's BCH Explorer to the list of block explorers
cculianu Dec 18, 2022
a2a7c2f
Add chipnet.bch.ninja to servers_chipnet.json
kzKallisti Dec 23, 2022
3f5ea2c
Merge pull request #2520 from kzKallisti/patch-3
cculianu Dec 23, 2022
294a8c8
Use a non-zero nr of jobs (#2522)
melroy89 Dec 31, 2022
3081fd8
Allow zero-amount and partial payments in invoices (#2523)
MrNaif2018 Jan 10, 2023
b47b3ef
Updates to appimage building and wine dockerfile to fix building
cculianu Jan 11, 2023
93c4206
Tor: Update to version 0.4.7.11 with a patch for static linking
EchterAgo Dec 1, 2022
001ef6f
Tor: Update to version 0.4.7.12 with a patch for static linking
EchterAgo Jan 11, 2023
db302bc
Merge pull request #2529 from EchterAgo/tor_0_4_7_12
cculianu Jan 12, 2023
abe9bd0
Bumped version to 4.2.13, updated RELEASE-NOTES
cculianu Jan 12, 2023
c3ea059
Updated checkpoints for mainnet, testnet3, testnet4, and chipnet
cculianu Jan 12, 2023
e606142
Build: Update dnspython to version 2.2.0
SomberNight Jan 20, 2022
533836e
Servers: Add loping.net chipnet server
EchterAgo Jan 13, 2023
a9b972a
Explorers: Add loping.net chipnet explorer
EchterAgo Jan 13, 2023
46328bf
Merge pull request #2530 from EchterAgo/dnspython_update
cculianu Jan 13, 2023
d79b58d
Merge pull request #2531 from EchterAgo/loping_chipnet_server
cculianu Jan 13, 2023
86d79ef
Add builds to GitHub Actions (#2532)
jonas-lundqvist Jan 13, 2023
98e0629
Bump test versions (#2526)
jonas-lundqvist Jan 13, 2023
b4c97a3
Disable OSX build github action.
cculianu Jan 14, 2023
95da458
Update releases.json to 4.2.13 for update checker to notify
cculianu Jan 14, 2023
9c68cc1
Cleanup of top README
jonas-lundqvist Jan 14, 2023
19255e6
Merge pull request #2534 from jonas-lundqvist/readme_cleanup
cculianu Jan 14, 2023
b253526
Fix crashes in payment requests with amount of None
MrNaif2018 Jan 15, 2023
506db9e
Merge pull request #2535 from MrNaif2018/fix-payment-requests
cculianu Jan 15, 2023
0b8d516
test: Flip last bit in negative test cases
jonas-lundqvist Jan 15, 2023
e330948
Merge pull request #2536 from jonas-lundqvist/bitpay_test_flip_bit
cculianu Jan 15, 2023
ea83eb5
Remove references to Travis CI
jonas-lundqvist Jan 17, 2023
270d2d1
Enforce python >= 3.7 in setup.py
jonas-lundqvist Jan 17, 2023
3bfb050
Merge pull request #2537 from jonas-lundqvist/travis_cleanup
cculianu Jan 17, 2023
2931459
Merge pull request #2538 from jonas-lundqvist/require_python_37
cculianu Jan 17, 2023
d7a7972
Only archive GH Actions artifacts once
jonas-lundqvist Jan 17, 2023
815c36e
Split regtest in separate files
jonas-lundqvist Jan 17, 2023
1e92173
Merge pull request #2539 from jonas-lundqvist/gh_archive_artifacts_once
cculianu Jan 18, 2023
7e43a43
Merge pull request #2540 from jonas-lundqvist/regtest_split
cculianu Jan 18, 2023
afe5bb2
Fixes to get auto-build to work.
cculianu Jan 23, 2023
07d0b14
Bump version to 4.2.14, add RELEASE-NOTES entry for 4.2.14
cculianu Jan 23, 2023
f482d7f
Explorer: Add 3XPL explorer
EchterAgo Jan 24, 2023
bf74df2
Updated releases.json
cculianu Jan 24, 2023
be59897
Merge pull request #2546 from EchterAgo/3xpl_explorer
cculianu Jan 24, 2023
dbce985
Code cleanup: Fix some formatting issues and also a potential bug
cculianu Jan 24, 2023
ff28e0d
Bump winbind
jonas-lundqvist Feb 3, 2023
15e89c4
Merge pull request #2547 from jonas-lundqvist/bump_winbind
cculianu Feb 4, 2023
d06fa42
Build Android in GH Actions
jonas-lundqvist Feb 4, 2023
cde5d8b
Merge pull request #2548 from jonas-lundqvist/gh_build_android
cculianu Feb 5, 2023
3d6ebaf
Bump libssl-dev for AppImage build
jonas-lundqvist Feb 7, 2023
e26bebf
Bump xvfb for wine build
jonas-lundqvist Feb 7, 2023
9f21463
contrib: fix find_restricted_dependencies for deps with version range…
jonas-lundqvist Feb 7, 2023
ba468a6
Merge pull request #2550 from jonas-lundqvist/bump_appimage_ssl
cculianu Feb 8, 2023
f35b6f4
Merge pull request #2551 from jonas-lundqvist/bump_wine_xvfb
cculianu Feb 8, 2023
5b9b422
Perform GH actions builds on forked repos
jonas-lundqvist Feb 8, 2023
6242f78
Merge pull request #2552 from jonas-lundqvist/gh_build_fork_repo
cculianu Feb 10, 2023
19b1dbc
Bump OpenSSL to 1.1.1t
jonas-lundqvist Feb 10, 2023
ff3134c
Add GH Action pip-audit
jonas-lundqvist Feb 10, 2023
7c5815e
Merge pull request #2553 from jonas-lundqvist/bump_openssl
cculianu Feb 10, 2023
9cc0048
Merge pull request #2554 from jonas-lundqvist/gh_pip_audit
cculianu Feb 10, 2023
9b4aa35
Add build options in GH Actions
jonas-lundqvist Feb 10, 2023
c10e9dc
Add python 3.11 to tox
jonas-lundqvist Feb 10, 2023
c4552cd
Add workflow_dispatch to GH Test workflow
jonas-lundqvist Feb 10, 2023
608f0d2
Bump python depedencies
jonas-lundqvist Feb 11, 2023
bf1c6fd
Merge pull request #2555 from jonas-lundqvist/gh_build_inputs
cculianu Feb 11, 2023
43b9c1e
Merge pull request #2556 from jonas-lundqvist/tox_py311
cculianu Feb 11, 2023
3cf581b
Merge pull request #2557 from jonas-lundqvist/gh_tox_allow_dispatch
cculianu Feb 11, 2023
ed19c0c
Merge pull request #2558 from jonas-lundqvist/bump_python_deps
cculianu Feb 11, 2023
657c1f7
Remove LNS and web3 dependencies (#2559)
cculianu Feb 11, 2023
e8bbf82
Remove last vestige of web3 dependencies (#2560)
cculianu Feb 11, 2023
bf1b6fc
Add Android support to Fusion plugin
OPReturnCode Mar 6, 2023
8aebfd3
Add Fusion plugin base to Android
OPReturnCode Mar 6, 2023
898f3db
add fulcrum.criptolayer.net to servers.json
molecular Mar 12, 2023
833996e
Merge pull request #2564 from molecular/patch-1
cculianu Mar 13, 2023
43f1fcc
Add UI for Fusion plugin on Android
OPReturnCode Mar 6, 2023
f913401
Merge pull request #2563 from OPReturnCode/fusion_android
fyookball Mar 20, 2023
10b520b
Android Play Store changes
fyookball Mar 21, 2023
39356ae
Update README.md
fyookball Mar 21, 2023
3149f0a
Some nits and fixes, pluse removed fulcrum.fountainhead.cash from ser…
cculianu May 2, 2023
12827b0
Refactor BCDataStream into its own file (serialize.py), add token.py
cculianu Sep 9, 2022
599da88
Added token parsing test vectors
cculianu Sep 9, 2022
3e70f92
Added support for tokens to transaction.py, and to transaction_dialog.py
cculianu Sep 9, 2022
a7d3665
Rename txin['token'] -> txin['tokenData']
cculianu Sep 9, 2022
39cb542
Extended serialized txn format to also save tokenData
cculianu Sep 9, 2022
dc5dd71
Fixups to transaction_dialog
cculianu Sep 9, 2022
e566410
Added wallet support for cashtokens
cculianu Sep 10, 2022
d50e7fd
Remove a debug print thing from __init__.py
cculianu Sep 10, 2022
d499929
Update txdialog UI and associated code to correctly display input tokens
cculianu Sep 10, 2022
de7edaa
Fix a bug in txdialog if viewing unsigned txns
cculianu Sep 10, 2022
7febd08
Fixed a wallet ser/deser bug whereby we lost token info across restarts
cculianu Sep 10, 2022
bd8b652
Added TOKEN_PUBKEY_TYPE and TOKEN_SCRIPT_TYPE to cashaddr.py
cculianu Sep 11, 2022
7e41577
Fixes to properly support CashToken-aware addresses and P2SH32 addresses
cculianu Sep 12, 2022
e09e37c
Refactor Address class to simplify the treatment of "token-aware" addrs
cculianu Sep 12, 2022
c095ac1
Fixed a typo
cculianu Sep 12, 2022
33d7e0b
Added a tab for CashTokens
cculianu Sep 26, 2022
4dbf18c
Tokens tab: Don't clear selections or expanded items when it refreshes
cculianu Nov 8, 2022
2db4c49
Added context menu for CashTokens tab
cculianu Nov 8, 2022
ae9e84a
Some small refactor
cculianu Nov 12, 2022
177e17e
Add CashToken "create" form (to create new tokens)
cculianu May 3, 2023
29bb917
Nit: Prefer get_unused_address() and fall-back to utxo["address"]
cculianu May 3, 2023
29d9a87
Nit: Clarify help for NFT commitment that the hex chars must be even …
cculianu May 3, 2023
15abf0c
Fixup: make_unsigned_transaction was not passing down token_datas
cculianu May 3, 2023
0ea0e24
Reorganized CashTokens tab to drill down to per-utxo items
cculianu May 4, 2023
0ef3f59
Added BCH "Amount" column to the CashTokens tab
cculianu May 4, 2023
8c8eb65
CashToken tab: Make very long NFT commitments fit better
cculianu May 4, 2023
91176d1
Mention "Token Address" in the send tab "pay to" help.
cculianu May 4, 2023
ac3ae1c
Rename "TokenID" -> "Token ID"
cculianu May 5, 2023
5a7ecfd
Added "Send Token" form
cculianu May 6, 2023
8dafdaa
Made the "Send Tokens (xxx)..." context menu label counts better
cculianu May 6, 2023
9a0a7a1
Fixed a comment (typos)
cculianu May 6, 2023
b19c95e
Allow sending of cashtokens from the Coins tab, misc other fixups
cculianu May 6, 2023
6923d38
Got the sent tokens dialog to work and produce a tx!
cculianu May 7, 2023
34842a6
Some small nits (follow-up to last commit)
cculianu May 7, 2023
664d58c
Minor nit in Abstract_Wallet.make_token_send_tx
cculianu May 7, 2023
3ee95e5
Add Token History tab (#2601)
Andrew-128 May 7, 2023
e7b5b87
Rewrote wallet.get_input_tx a bit, added a small wallet tx cache
cculianu May 7, 2023
af6e11e
Fixup to token history tab: allow editing of labels
cculianu May 7, 2023
8fb0390
Added "minting baton" icon and use it.
cculianu May 7, 2023
2ab8d6f
More fixups to token send form
cculianu May 7, 2023
a7d1b7a
Reorganized the CashTokens tab slightly
cculianu May 7, 2023
87b96dd
Added "description" (label) box to token send dialog
cculianu May 8, 2023
30b531a
token send: Made successful broadcast of the tx auto-close the form
cculianu May 8, 2023
08c48e2
Made the token send form complain if not given a CashToken address
cculianu May 8, 2023
a600970
wallet "sweep" -- try to explicitly exclude cashtokens
cculianu May 8, 2023
8d874e3
Nit (follow-up to last commit)
cculianu May 8, 2023
33f5839
token send: Added defensive programming checks to ensure no token burns
cculianu May 8, 2023
5f0f900
Add "mutable" specific icon and use it
cculianu May 8, 2023
d2a5fe3
Implemented "Edit Commitment" UI action for minting/mutable NFTs
cculianu May 9, 2023
bd741e5
Call Immutable NFTs 'NFT's. Add Outpoint copy op.
Andrew-128 May 8, 2023
c67c7c3
Compress and align baton icon. Fix broken merge
Andrew-128 May 8, 2023
0541d4e
Merge pull request #2602 from Andrew-128/simplify-nft-description
cculianu May 9, 2023
7d9184e
Add a combined minting/mutable icon
Andrew-128 May 9, 2023
32124f4
Improve layout, and actually add icon file
Andrew-128 May 9, 2023
eafaf92
Fix unhandled None from token.get_nft_flag_text
Andrew-128 May 9, 2023
b1b56fe
Merge pull request #2605 from Andrew-128/combined-icon
cculianu May 9, 2023
de7bc12
Performance fixup for token history list
cculianu May 9, 2023
3fb6a05
Fixups to token history tab; added fungible total balance and nft bal…
cculianu May 9, 2023
c42fa64
Fixups to token history list
cculianu May 9, 2023
c12d438
Added history tab "CashToken" icon for txns involving CashTokens
cculianu May 9, 2023
b83296c
Rename "Token ID" -> "Category ID" to be consistent with the spec
cculianu May 9, 2023
ac973f6
Update main window status label to also show how much BCH in CashToke…
cculianu May 9, 2023
11ec9c0
Made app "notify" bubble mention CashTokens
cculianu May 10, 2023
8691cf1
Fixed red columns in token history list
cculianu May 10, 2023
8a8ef46
Fix bug in tx-dialog right-click on inputs not working as expected
cculianu May 10, 2023
b9ff8d3
Small nit
cculianu May 10, 2023
d5dd24f
De-uglified the Transaction Dialog cashtoken info
cculianu May 10, 2023
bd827b9
Added supper for minting new NFTs in Abstract_Wallet.make_token_send_…
cculianu May 10, 2023
422695c
Added 'qblockies.py' to qt/utils
cculianu May 10, 2023
d3bb2a9
Added token metadata management mechanism, added default token icons
cculianu May 10, 2023
df79074
Add dedicated columns for each capability
Andrew-128 May 11, 2023
de65c22
Added an optional "URL" field to the Create Token form
cculianu May 11, 2023
d94bb6a
Made the two CashToken tabs (history and token list) use alternating …
cculianu May 11, 2023
bfa4d46
Improve layout and fix tooltips
Andrew-128 May 11, 2023
62239dc
Remove combined minting-mutable icon
Andrew-128 May 11, 2023
cff6ebd
Add icon columns to CashTokens list
Andrew-128 May 11, 2023
cae2a97
Simplify and improve minting/mutable icon tooltips
Andrew-128 May 11, 2023
ce898f2
Add dedicated columns for each capability
Andrew-128 May 11, 2023
21d0345
Improve layout and fix tooltips
Andrew-128 May 11, 2023
cfb7253
Remove combined minting-mutable icon
Andrew-128 May 11, 2023
3e91bd7
Add icon columns to CashTokens list
Andrew-128 May 11, 2023
67e0a53
Simplify and improve minting/mutable icon tooltips
Andrew-128 May 11, 2023
316b942
Add "Mint NFTs" context menu
Andrew-128 May 9, 2023
ae041db
Flesh out Mint NFT window UI
Andrew-128 May 11, 2023
f119a1a
A few fixups
Andrew-128 May 11, 2023
d15f72a
Add category icon. Some tidying.
Andrew-128 May 11, 2023
a326b89
Link up Minting form to API
Andrew-128 May 11, 2023
fd28803
Make send_token panels manually resizable
Andrew-128 May 11, 2023
e85bf72
Use a more reasonable NFT mint count limit
Andrew-128 May 11, 2023
a712727
Don't use fstrings with translation system
Andrew-128 May 12, 2023
697990d
Merge pull request #2607 from Andrew-128/icon-columns
cculianu May 12, 2023
0a6f36b
Merge branch 'mint-tokens' into my-fixed-branch
Andrew-128 May 12, 2023
f00e1d4
Layout fixes
Andrew-128 May 12, 2023
eaacb79
Merge pull request #2606 from Andrew-128/mint-tokens
cculianu May 12, 2023
53a0dc9
Mint NFTs: Got rid of the "commitment" column in top box + various fi…
cculianu May 12, 2023
34e6385
Optimized composition of mint tx to not split fungible amounts out
cculianu May 12, 2023
be783c5
Fixed use of python f-strings in gettext _() calls
cculianu May 12, 2023
90d6aa8
Fix some of the layout quirks and simplify token_send.py
cculianu May 12, 2023
07f0222
Fix some quirks
cculianu May 12, 2023
9701116
A nit.
cculianu May 12, 2023
cd6993a
Make bottom panel resizable. Other layout tweaks
Andrew-128 May 12, 2023
6d13ded
Sort height ratios
Andrew-128 May 12, 2023
49bcb78
Added UI to edit token metadata properties
cculianu May 12, 2023
b78d8e5
Merge pull request #2608 from Andrew-128/layout-tweaks
cculianu May 12, 2023
6f6993b
Added support for edited token meta-date for "Decimals Point"
cculianu May 12, 2023
5622633
Renamed "Edit Token Metadata" -> "Token Properties..."
cculianu May 13, 2023
d339656
Adapted the token send form to use the metadata token decimal point (…
cculianu May 13, 2023
c6eb73b
Fix various token_send QTreeWidget layout issues
Andrew-128 May 13, 2023
11d8324
Clear Mint form when the Clear button is pushed!
Andrew-128 May 13, 2023
3732087
Fix derps
Andrew-128 May 13, 2023
e267e3b
Clear before rebuilding!
Andrew-128 May 13, 2023
c1cacb7
Merge pull request #2609 from Andrew-128/treewidget-fixes
cculianu May 13, 2023
63cc147
Fix "bleed through" of text from table cell behind edit cell
cculianu May 13, 2023
80cc686
Set boolean if in qdarkstyle
cculianu May 13, 2023
9221032
Select more precise widgets to make transparent
Andrew-128 May 13, 2023
a65ed3b
Remove leftover import
Andrew-128 May 13, 2023
1da4dd3
Remove no longer necessary theme flag
Andrew-128 May 13, 2023
bacae5e
Merge pull request #2610 from Andrew-128/treewidget-fixes
cculianu May 13, 2023
b74f5ca
Made UI display token name (and symbol) if set everywhere
cculianu May 13, 2023
2ed4db6
Fix counts being invisible on new window for send form "edit" mode.
cculianu May 13, 2023
bc5ed87
Standardize some terminology
cculianu May 13, 2023
6a9e956
Added profiler decoration for cashtoken TokenList update
cculianu May 13, 2023
b0b7c62
Added a few more permitted image file extensions
cculianu May 13, 2023
4b8d8eb
Move "Category Properties..." up to top of context menu
cculianu May 13, 2023
6d99140
Rename Details -> View Tx... in cashtokens tabs
cculianu May 13, 2023
0f1c2a6
CashTokens tab: Made the Capability column user-resizable and elidable
cculianu May 13, 2023
d65f1c4
Made the nft flag icon column be "interactive" resizeable
cculianu May 13, 2023
5ff4a29
Some nittls:
cculianu May 13, 2023
ee789f9
Rename "Copy Token Category" -> "Copy Token Name" in TxDialog
cculianu May 13, 2023
2b43ace
Get Python to GC the dead/defunct Send Token Form window
cculianu May 13, 2023
8104e59
Mint screen: Reworked a few things
cculianu May 13, 2023
06674c8
Use custom clear button on token property editor to avoid bad styles
cculianu May 13, 2023
0a92d6f
Fixup for create token dialog to not have ugly clear button
cculianu May 13, 2023
e6a1168
Added icon (from the current token) to the "Category Properties..." menu
cculianu May 13, 2023
56b578e
Fix build for appimage + wine build
cculianu May 13, 2023
d9cc88e
Merge branch 'master' into cashtokens
cculianu May 13, 2023
96072c7
Added Chipnet shortcut for the Windows installer build
cculianu May 13, 2023
e477a65
Fix for WINE build: A hash changed for the VS Installer
cculianu May 13, 2023
732f6df
Merge branch 'master' into cashtokens
cculianu May 13, 2023
14a2c9c
Fix for OSX build (was missing servers_chipnet.json from final pkg)
cculianu May 13, 2023
a97e0da
WINE build was missing servers_chipnet.json too.. grrr.. :/
cculianu May 13, 2023
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
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
.git
.tox
android/**/build
android/release
11 changes: 11 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
root = true

[*]
indent_style = space
trim_trailing_whitespace = true
end_of_line = lf
charset = utf-8

[*.py]
indent_size = 4
insert_final_newline = true
23 changes: 23 additions & 0 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Python Audit

on:
workflow_dispatch:
schedule:
- cron: '0 0 * * *'

jobs:
pip_audit:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- name: Check out source
uses: actions/checkout@v3
- name: Run Audit
uses: pypa/gh-action-pip-audit@v1.0.5
with:
inputs: |
contrib/deterministic-build/requirements-binaries.txt
contrib/deterministic-build/requirements-build-wine.txt
contrib/deterministic-build/requirements-hw.txt
contrib/deterministic-build/requirements-pip.txt
contrib/deterministic-build/requirements.txt
121 changes: 121 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
name: Building

on:
workflow_dispatch:
inputs:
appimage:
type: boolean
description: Build AppImage
default: true
sdist:
type: boolean
description: Build Linux sdist
default: true
win32:
type: boolean
description: Build Win32
default: true
android:
type: boolean
description: Build Android
default: true
# MacOS Building is expensive (in terms of minutes charged)
# but also unnecessary since this rarely breaks for us in practice.
macos:
type: boolean
description: Build macOS
default: false

schedule:
- cron: '0 0 * * 1'

jobs:
build_appimage:
if: (github.event.inputs.appimage == 'true' || github.event_name == 'schedule')
env:
GIT_REPO: ${{ github.server_url }}/${{ github.repository }}
runs-on: ubuntu-latest
timeout-minutes: 60
steps:
- name: Check out source
uses: actions/checkout@v3
with:
submodules: true
- name: Build AppImage
run: contrib/build-linux/appimage/build.sh ${{ github.ref_name }}
- name: Archive build
uses: actions/upload-artifact@v3
with:
path: dist/Electron-Cash*.AppImage
build_sdist:
if: (github.event.inputs.sdist == 'true' || github.event_name == 'schedule')
env:
GIT_REPO: ${{ github.server_url }}/${{ github.repository }}
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
- name: Check out source
uses: actions/checkout@v3
with:
submodules: true
- name: Build srcdist
run: contrib/build-linux/srcdist_docker/build.sh ${{ github.ref_name }}
- name: Archive build
uses: actions/upload-artifact@v3
with:
path: |
dist/Electron-Cash*.zip
dist/Electron-Cash*.tar.gz
build_win32:
if: (github.event.inputs.win32 == 'true' || github.event_name == 'schedule')
env:
GIT_REPO: ${{ github.server_url }}/${{ github.repository }}
runs-on: ubuntu-latest
timeout-minutes: 120
steps:
- name: Check out source
uses: actions/checkout@v3
with:
submodules: true
- name: Build wine
run: contrib/build-wine/build.sh ${{ github.ref_name }}
- name: Archive build
uses: actions/upload-artifact@v3
with:
path: dist/Electron-Cash*.exe
build_android:
if: (github.event.inputs.android == 'true' || github.event_name == 'schedule')
runs-on: ubuntu-latest
timeout-minutes: 60
steps:
- name: Check out source
uses: actions/checkout@v3
with:
submodules: true
- name: Build Android
run: |
cp android/dummykeystore.jks android/keystore.jks
android/build.sh
- name: Archive build
uses: actions/upload-artifact@v3
with:
path: android/release/*.apk
build_macos:
if: (github.event.inputs.macos == 'true')
runs-on: macos-latest
timeout-minutes: 60
steps:
- name: Check out source
uses: actions/checkout@v3
with:
submodules: true
- name: Build macOS
working-directory: contrib/osx
run: |
brew install coreutils
brew install pyenv
./make_osx
- name: Archive build
uses: actions/upload-artifact@v3
with:
path: dist/Electron-Cash*.dmg
43 changes: 43 additions & 0 deletions .github/workflows/run-tox.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Testing

on:
workflow_dispatch:
push:
branches:
- master
pull_request:
branches:
- master

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']

steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install tox tox-gh-actions
- name: Test with tox
run: tox
- name: Archive code coverage (Unittest)
if: (matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11')
uses: actions/upload-artifact@v3
with:
name: code-coverage-report
path: htmlcov
- name: Archive code coverage (Regtest)
if: (matrix.os == 'ubuntu-latest' && matrix.python-version == '3.11')
uses: actions/upload-artifact@v3
with:
name: code-coverage-report-regtest
path: htmlcov-regtest
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,15 @@ env/
bin/
/app.fil
tmp/
electroncash/*.so.0
electroncash/*.dylib
contrib/osx/*.dylib

# tox files
.cache/
.coverage
.coverage-regtest
htmlcov

# MacOSX
.DS_Store/
Expand All @@ -30,3 +35,9 @@ xcuserdata/

# IntelliJ Pycharm IDE
/.idea
# vs code
.vscode/
# mypy
.mypy_cache/

venv/
24 changes: 21 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
[submodule "contrib/osx/CalinsQRReader"]
path = contrib/osx/CalinsQRReader
url = https://github.com/cculianu/CalinsQRReader
[submodule "contrib/secp256k1"]
path = contrib/secp256k1
url = https://github.com/Electron-Cash/secp256k1.git
[submodule "contrib/electrum-locale"]
path = contrib/electrum-locale
url = https://github.com/Electron-Cash/electrum-locale
[submodule "contrib/zbar"]
path = contrib/zbar
url = https://github.com/mchehab/zbar
[submodule "contrib/openssl"]
path = contrib/openssl
url = https://github.com/openssl/openssl.git
[submodule "contrib/libevent"]
path = contrib/libevent
url = https://github.com/libevent/libevent.git
[submodule "contrib/zlib"]
path = contrib/zlib
url = https://github.com/madler/zlib.git
[submodule "contrib/tor"]
path = contrib/tor
url = https://github.com/EchterAgo/tor.git
12 changes: 0 additions & 12 deletions .travis.yml

This file was deleted.

13 changes: 10 additions & 3 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,17 @@ rdymac - Website and translations.
kyuupichan - Miscellaneous.
Sombernight - many fixes
Jonald Fyookball - Imperator
Calin Culianu - iOS version, MacOS packaging, MacOS QRScanner, miscellaneous
Calin Culianu - iOS version, MacOS packaging, MacOS QRScanner, CashShuffle, miscellaneous
Malcolm Smith - New Android Version, tuneups and fixups
Roger Taylor - new version 1.4 blockchain synch code, external plugin system, miscellanous
Mark Lundeberg - Windows zbar, SLP (Tokens) work, various miscellanity
Mark Lundeberg - Windows zbar, SLP (Tokens) work, cryptography, CashShuffle, miscellaneous
James Cramer - Simple Ledger Protocol (Tokens)
Jochen Hoenicke - Trezor, Ledger, and other miscellaneous fixes
Jonas Lundqvist - BIP70 fix, currency exchanges
Jonas Lundqvist - BIP70 fix, currency exchanges, Android
Marcel O'Neil - Miscellaneous + packaging fixups
Clifford - CashShuffle
imaginaryusername - UI and privacy recommendations
emergent_reasons - Code review and uncanny bug detection
Josh Ellithorpe - CashShuffle server
Axel Gembe - Ledger fixes, Windows Qt woes, miscellaneous
Alexander Schlarb - macOS ctypes bindings
9 changes: 5 additions & 4 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ include *.py
include electron-cash
include contrib/requirements/requirements.txt
include contrib/requirements/requirements-hw.txt
recursive-include lib *.py
recursive-include gui *.py
recursive-include plugins *.py
include contrib/requirements/requirements-binaries.txt
include contrib/requirements/requirements-web3.txt
recursive-include electroncash *.py
recursive-include electroncash_gui *.py
recursive-include electroncash_plugins *.py
recursive-include packages *.py
recursive-include packages cacert.pem
include icons.qrc
recursive-include icons *
recursive-include scripts *

Loading