julian
143e1d821a
remove duplicate map entries
2023-07-27 11:35:44 -06:00
julian
aa2ab89f73
fix formatting
2023-07-27 11:33:39 -06:00
sneurlax
9b4c1abf35
Merge remote-tracking branch 'origin/staging' into fusion
2023-07-27 12:03:55 -05:00
ryleedavis
197d760102
Merge branch 'staging' into add-xtz
...
# Conflicts:
# pubspec.lock
2023-07-27 10:45:41 -06:00
julian
4281fa5d33
Merge remote-tracking branch 'origin_SW/staging' into ui-fixes
2023-07-27 10:43:49 -06:00
sneurlax
87f12d9c3c
Merge remote-tracking branch 'origin/staging' into fusion
2023-07-27 10:33:03 -05:00
julian
8b88890e05
refactor network call into mockable provider and handle errors
2023-07-27 09:28:01 -06:00
julian
6f2ddf7423
fix: auto format code and remove electrumx coin control
2023-07-27 08:11:32 -06:00
julian
a194594b4d
Merge remote-tracking branch 'origin_SW/staging' into add-xlm
2023-07-27 07:57:58 -06:00
likho
bce20eab32
Resolve merge conflicts
2023-07-27 15:05:27 +02:00
likho
7061c3c40b
Add testnet to coin list
2023-07-27 13:09:56 +02:00
julian
f51cf2e395
extra temp check on firo
2023-07-26 17:15:11 -06:00
julian
46e0258737
Merge remote-tracking branch 'origin_SW/staging' into ordinals
...
# Conflicts:
# lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_features.dart
# lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/more_features/more_features_dialog.dart
# pubspec.yaml
2023-07-26 17:05:33 -06:00
julian
f27e818d97
Merge remote-tracking branch 'origin_SW/staging' into add-monkey
2023-07-26 16:29:32 -06:00
sneurlax
19a968472b
move CashFusion fuse() demo into FusionInterface
2023-07-26 17:08:29 -05:00
sneurlax
04f0049710
add hasFusionSupport bool
2023-07-26 17:06:17 -05:00
sneurlax
d71ca45657
add fusion interface as mixin
2023-07-26 17:06:02 -05:00
julian
80dad5156a
Merge remote-tracking branch 'origin_SW/ui-fixes' into ordinals
...
# Conflicts:
# lib/db/isar/main_db.dart
2023-07-26 15:11:03 -06:00
sneurlax
5cd8b4864e
Merge remote-tracking branch 'origin/staging' into fusion
2023-07-26 15:31:28 -05:00
ryleedavis
ea9f997d0b
Merge branch 'staging' into add-monkey
...
# Conflicts:
# lib/services/coins/banano/banano_wallet.dart
2023-07-26 12:07:36 -06:00
Jonald Fyookball
6c0dbfbde8
Push local changes to branch.
2023-07-26 14:07:30 -04:00
ryleedavis
2eb10e249f
add monkey image to hive and display on wallet card
2023-07-26 11:54:10 -06:00
julian
6733a367e3
create mockable wrapper function
2023-07-26 11:47:49 -06:00
likho
58364a6c88
Update themes, use PUBNET instead of testnet
2023-07-26 16:19:40 +02:00
julian
7b8f26206e
show sent to self jmint transactions correctly
2023-07-25 20:48:03 -06:00
julian
57839c2d18
WIP fixing _refreshLelantusData
2023-07-25 20:29:44 -06:00
julian
c9da22601e
clean up spam logs a bit
2023-07-25 20:28:51 -06:00
julian
5d3e976601
always add lelantus coin to locale db
2023-07-25 16:08:54 -06:00
julian
c1f73a89be
store jmint separately from updated coins
2023-07-25 15:41:06 -06:00
julian
90b16c576e
clean up
2023-07-25 15:36:37 -06:00
julian
759e5624e4
stop storing public coin
2023-07-25 15:11:34 -06:00
julian
ce1dce1130
comment and fix error messages
2023-07-25 14:56:31 -06:00
julian
2cca59532e
delete by index instead of public Coin since who tf knows what it could be in our code
2023-07-25 14:14:07 -06:00
julian
04658f8eef
null error bandaid
2023-07-25 13:55:19 -06:00
julian
20c706c7e5
add todo check
2023-07-25 12:16:08 -06:00
julian
3c1a3f23e3
clean up
2023-07-25 12:07:09 -06:00
julian
5f9b1f77f5
clearer exception
2023-07-25 11:17:54 -06:00
julian
a8abd38827
invalid vsize fix
2023-07-25 11:17:30 -06:00
julian
140f1468f9
remove unused code
2023-07-25 09:04:09 -06:00
julian
99a36f1587
fix mint limit constant
2023-07-25 09:03:26 -06:00
julian
18f3a2056c
check anon set when creating list of mints
2023-07-25 08:55:50 -06:00
likho
f7741fa043
Update theme with Stellar images
2023-07-25 15:58:29 +02:00
julian
462b845bd4
clean up unspent coins
2023-07-24 16:54:38 -06:00
julian
2fb94444c4
no more firo specific hive
2023-07-24 16:49:11 -06:00
julian
c97de6017b
update lelantus coin schema
2023-07-24 16:44:12 -06:00
julian
df0b004b82
finish up basic migrate lcoins hive => isar
2023-07-24 12:30:01 -06:00
julian
6ff4c5d49a
clean up
2023-07-24 09:06:10 -06:00
likho
be8ede7750
Fix txs being sending and receiving, and missing fee and height in tx view
2023-07-24 16:53:04 +02:00
sneurlax
ce1bd8212f
remove Future<bool> inscriptionInAddresses(List<String> addresses)
...
inscriptionInAddress is next, after its usage is removed from _updateUTXOs, updateUTXOs (or another hook for detecting if a refresh has detected a new output) will trigger the more general refreshInscriptions
2023-07-23 23:20:07 -05:00
sneurlax
18a0bf279e
refresh inscriptions if new output detected
2023-07-23 18:29:42 -05:00
sneurlax
abd4bf9d7a
refresh inscriptions if needed and add utility func
2023-07-23 18:19:38 -05:00
sneurlax
f32359ac1e
refresh inscriptions after general refresh if any are detected
2023-07-23 18:01:51 -05:00
sneurlax
7da49c7ea0
improve ordinal heuristic
...
and formatting
2023-07-22 22:14:18 -05:00
sneurlax
475490d4f0
remove commented functions
2023-07-22 21:10:22 -05:00
sneurlax
55e55ef8c8
print->throw Exception
2023-07-22 21:09:42 -05:00
likho
89aba8874e
Clean up/ refactor
2023-07-22 10:26:53 +02:00
likho
4bdda9354c
WIP: Clean up and fixes
2023-07-22 10:26:10 +02:00
likho
c68b2e0d02
allow sending to unfunded account
2023-07-22 10:26:10 +02:00
likho
bbd070ba7f
Fix send
2023-07-22 10:24:41 +02:00
detherminal
e0df4723ae
feat: add xlm
2023-07-22 10:21:04 +02:00
julian
dffa33abd3
load ordinals into isar as a cache and backend view model
2023-07-21 18:43:59 -06:00
julian
48109f3c49
use isar ordinal model
2023-07-21 18:18:26 -06:00
julian
051fc7d1ef
Merge remote-tracking branch 'origin_SW/staging' into ordinals
2023-07-21 17:18:18 -06:00
julian
e7b480e585
add ba/nano wallet representative change option to wallet settings, remove coin control from ba/nano, and some other clean up
2023-07-21 14:11:30 -06:00
julian
b8fcc98ac6
eth token balance fix
2023-07-21 13:23:36 -06:00
sneurlax
f46a37d4d4
convert/map/cast InscriptionData->Ordinal
2023-07-21 11:48:31 -05:00
sneurlax
39eaa937fc
add convenience method, remove ord-litecoin API file, cast dynamic->int
2023-07-21 10:06:34 -05:00
sneurlax
af30826e9e
remove ord-litecoin imports
2023-07-21 10:03:05 -05:00
sneurlax
20fdcf4817
refactor manager var out to _manager, comment update
2023-07-20 17:15:25 -05:00
sneurlax
b773811eac
working proof of concept
2023-07-20 16:49:26 -05:00
sneurlax
4db0328c73
WIP _db not initialized, refresh on ordinals view for poc
2023-07-20 16:30:39 -05:00
julian
461267ec95
eth api error handling clean up and token flag
2023-07-20 15:13:56 -06:00
sneurlax
06c433ff85
add init method, build on poc
2023-07-20 15:56:11 -05:00
sneurlax
ca8e930904
move demo into refresh button, add refreshInscriptions() stub w prev poc
2023-07-20 15:32:39 -05:00
sneurlax
4be7919e46
expand upon demo
...
TODO remove WIP, hook directly into StreamBuilder
2023-07-20 14:53:20 -05:00
sneurlax
22e222ffd6
paginate inscription responses
2023-07-20 14:53:15 -05:00
sneurlax
a322c13954
return inscriptions in batches of 1000
2023-07-20 14:53:13 -05:00
sneurlax
f046912c89
litescribe api and demo
2023-07-20 14:53:09 -05:00
sneurlax
d02b7f7ad4
formatting and model updates
2023-07-20 14:05:51 -05:00
sneurlax
0284bb2951
use https api, implement other methods
2023-07-19 17:13:54 -05:00
sneurlax
bc8f5ce8f9
update OrdinalsInterface to not need baseUrl declared by withee classes
2023-07-19 15:58:26 -05:00
sneurlax
8e17556e41
use an OrdinalsResponse response type which can return an error
2023-07-19 13:03:17 -05:00
sneurlax
d3b4be5d66
Merge remote-tracking branch 'origin/ordinals' into ord-litecoin
2023-07-19 12:05:00 -05:00
julian
895903b9ca
Merge branch 'ui-fixes' into ordinals
2023-07-19 11:03:29 -06:00
sneurlax
697f40fce1
add preview endpoint
2023-07-19 10:55:46 -05:00
sneurlax
d623480a75
add content endpoint
2023-07-19 10:51:46 -05:00
sneurlax
6d772b0acd
add block endpoint
2023-07-19 10:50:56 -05:00
sneurlax
f972c34dc4
add address endpoint
2023-07-19 10:48:54 -05:00
sneurlax
48e4f8c577
add output endpoint
2023-07-19 10:45:18 -05:00
sneurlax
828782f00c
add sat endpoint
2023-07-19 10:41:23 -05:00
sneurlax
51155372d3
add inscription endpoint
2023-07-19 10:37:42 -05:00
likho
45af21dc27
Fix merge conflicts with staging
2023-07-19 16:37:54 +02:00
detherminal
d387fcc7b9
feat: update xtz
2023-07-19 16:21:13 +02:00
detherminal
0ae747aebc
feat: add xtz
2023-07-19 16:19:48 +02:00
julian
58c97de86c
WIP ordinal ui
2023-07-18 10:15:05 -06:00
julian-CStack
27c2f34a33
macos specific notifications fix
2023-07-17 10:36:45 -06:00
julian-CStack
bc85b97f5f
null error fix on isar exchange data cache instance
2023-07-17 10:36:33 -06:00
julian-CStack
27d97ebf49
number format hack/fix
2023-07-12 16:06:41 -06:00
julian-CStack
ebf67df3a9
Merge branch 'staging' into add-onchain-notes-for-epic
2023-07-05 11:58:29 -06:00
likho
ca27f13d7b
WIP:Add onchain notes for Epic
2023-07-05 14:57:17 +02:00
julian
ab9e734b80
fix: dogecoin custom fee slider and possible absurd fees error
2023-07-04 10:25:13 -06:00
julian
fa1dbdbe51
extra logging and exit properly instead of rethrowing what is isn't really a true exception but rather an expected result if not transactions are found. Thanks API designers
2023-07-01 13:49:10 -06:00
julian
bd5a0c1631
actually use price interval
2023-06-30 15:30:33 -06:00
julian
f2e43bfaee
fix: wallets coin sorting matching Coin enum order
2023-06-19 13:59:46 -06:00
julian
0778deb6d3
feat: custom fee for sends on mobile for supported coins
2023-06-17 10:42:23 -06:00
julian
968bf390f4
fix: eth rescan (and optimise eth txn refreshing)
2023-06-15 16:39:42 -06:00
julian
aac6c0fdb6
fix: token transactions refresh interruption
2023-06-15 13:53:16 -06:00
julian
a8a5e8b573
requested monero address check
2023-06-09 11:44:50 -06:00
julian
0af9af1ad2
fix: add (ba)nano periodic refreshes
2023-06-08 14:48:51 -06:00
julian
72bbf81c4c
fix: do not throw but just return from updateSentCachedTxData for now
2023-06-08 14:32:07 -06:00
julian
53be1f53db
fix: old block errors
2023-06-08 14:25:09 -06:00
julian
885310395e
fix: banano prepareSend int overflow
2023-06-08 14:10:08 -06:00
julian
2c49f9f9ec
fix: transactions not updating in (ba)nano right away on refresh
2023-06-08 13:45:59 -06:00
julian
1d2d01d1de
fix: banano price
2023-06-08 12:21:28 -06:00
julian
ed120f552a
Merge branch 'ba_nano_fixes' into ui-fixes
2023-06-08 11:03:50 -06:00
ryleedavis
c4545c3eb0
rearrange coin order
2023-06-08 10:54:22 -06:00
julian
3c026ab730
add more logging and return zero fees
2023-06-08 09:00:55 -06:00
julian
dd7792195c
fix: banano address type
2023-06-07 14:33:53 -06:00
julian
3a58955f60
fix: banano address type
2023-06-07 14:28:00 -06:00
julian
9046379d18
fix: (ba)nano sync/refresh bugs and address optimizations
2023-06-07 13:44:45 -06:00
julian
cb1922d2c7
fix: (ba)nano testNetworkConnection always returning false
2023-06-07 12:28:11 -06:00
Diego Salazar
f032db9a6b
Merge pull request #573 from cypherstack/handle-price_change_percentage_24h-being-null
...
Handle price_change_percentage_24h being null and not able to parse a…
2023-06-06 12:50:29 -06:00
likho
14f9dc2c05
Handle price_change_percentage_24h being null and not able to parse as double
2023-06-06 16:34:43 +02:00
julian
a353ab341a
Merge remote-tracking branch 'origin_SW/staging' into flutter_upgrade
...
# Conflicts:
# crypto_plugins/flutter_libmonero
2023-06-05 16:26:28 -06:00
julian
91dd677e28
fix: banano network pinging, clean up imports, move file to separate folder
2023-06-05 15:04:11 -06:00
julian
117007180e
fix: missing coin cases
2023-06-05 14:55:41 -06:00
julian
b92fb5b547
Merge remote-tracking branch 'origin_SW/add_nano' into flutter_upgrade
...
# Conflicts:
# pubspec.lock
2023-06-05 14:48:03 -06:00
julian-CStack
58b8509b41
Merge pull request #569 from fossephate/add-nano
...
Banano support
2023-06-05 14:07:14 -06:00
julian-CStack
84fabcf300
Merge pull request #564 from detherminal/staging
...
fix: recent logs
2023-06-05 14:00:31 -06:00
fossephate
3c524b2ea4
add banano support
2023-05-30 19:19:31 -04:00
detherminal
9e4c8dbc77
fix: recent logs
2023-05-31 00:46:11 +03:00
julian
e81bba2357
fix: exception implementations
2023-05-30 10:41:27 -06:00
julian
3275039d01
nano clean up and optimisations
2023-05-30 10:00:24 -06:00
julian
1449814e35
Merge branch 'amount_display_precision' into add_nano
...
# Conflicts:
# lib/pages/pinpad_views/create_pin_view.dart
# lib/widgets/custom_pin_put/custom_pin_put_state.dart
2023-05-30 09:11:41 -06:00
julian
7484353854
Merge remote-tracking branch 'origin_SW/staging' into persistence
...
# Conflicts:
# test/electrumx_test.mocks.dart
2023-05-29 16:24:25 -06:00
Josh Babb
86fabcf9ff
port f113904a
periodiocPingCheck changes to other electrumx coins
2023-05-29 11:06:57 -05:00
julian
f113904a22
fix: bug in setting _isConnected as well as adding call to refresh on reconnection established
2023-05-29 09:54:14 -06:00
likho
83778bb121
Fix Epiccash caching issue, add additional status messages as in Epicpay
2023-05-28 14:57:05 +02:00
julian-CStack
3f7b547cfd
Merge pull request #557 from detherminal/add_nano
...
add copyright generating script
2023-05-26 16:46:34 -06:00
detherminal
95a0309b8b
docs: add header to source code again
2023-05-27 00:21:16 +03:00
detherminal
ccf5e68fc6
Revert "docs: add copyright header to all source code"
...
This reverts commit 84ac798bb8
.
2023-05-27 00:19:24 +03:00
detherminal
97e25a73be
docs: explain and comment code
2023-05-26 22:25:59 +03:00
fossephate
3586383f93
balance fixes, sync status working, and transaction view working
2023-05-26 14:47:50 -04:00
fossephate
e0efbe669d
fix for open blocks + fix for new wallet creation
2023-05-26 12:47:11 -04:00
detherminal
84ac798bb8
docs: add copyright header to all source code
2023-05-26 19:33:04 +03:00
julian
28e4764ec4
fix: namecoin tx signing
2023-05-26 08:59:20 -06:00
julian
c8b7d3aab8
Merge remote-tracking branch 'origin_SW/staging' into persistence
2023-05-25 15:41:11 -06:00
julian
e0e4ffe0f4
fix: cached electrumx constructor usage
2023-05-25 14:37:34 -06:00
julian
74d3175d87
fix: Handle sent to self transactions when sent to a change address
2023-05-25 09:24:07 -06:00
fossephate
c5f2480634
receive nano transactions
2023-05-24 15:09:00 -04:00
julian
35b631f329
fix: block possible ordinal containing utxos
2023-05-24 13:07:44 -06:00
julian
d7aa8134d3
block possible ordinal containing utxos
2023-05-24 13:02:36 -06:00
fossephate
97ecb72ecf
Merge branch 'add_nano' of https://github.com/cypherstack/stack_wallet into add-nano
2023-05-24 14:20:38 -04:00
fossephate
b6ace4ef27
save
2023-05-24 14:19:49 -04:00
julian
feabebcce5
amount fix
2023-05-24 12:11:33 -06:00
julian
bc868a7d38
fix: merge clean up
2023-05-24 12:08:32 -06:00
julian
553e035ca7
Merge remote-tracking branch 'origin_SW/staging' into add_nano
...
# Conflicts:
# lib/models/isar/stack_theme.dart
# lib/models/isar/stack_theme.g.dart
# lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart
# lib/services/coins/firo/firo_wallet.dart
# lib/themes/coin_icon_provider.dart
# lib/themes/coin_image_provider.dart
# lib/utilities/constants.dart
# lib/utilities/enums/coin_enum.dart
2023-05-24 11:37:37 -06:00
julian
0933546806
fix: various eCash tweaks + 0 conf
2023-05-24 11:00:54 -06:00
julian
1a8aefa45c
fix: quick hack to show incoming joinsplit txns
2023-05-24 10:25:13 -06:00
fossephate
03d69d44ce
small cleanup
2023-05-24 12:12:28 -04:00
fossephate
7a95c20645
nano sending + minor sats constants refactor
2023-05-24 11:56:44 -04:00
julian
40dfced949
fix: default to 0 mint index if none saved
2023-05-23 10:43:08 -06:00
julian
a77c8c02fd
ensure skipping tx if it is a jmint
2023-05-23 10:11:44 -06:00
julian
304675351a
WIP: firo tx parsing clean up and fixes
2023-05-23 09:46:34 -06:00
julian
ee830a4788
Merge remote-tracking branch 'origin_SW/staging' into firo_cleanup
2023-05-23 07:32:12 -06:00
julian
b7619c3108
default to 12 word seeds for new wallets
2023-05-19 16:44:49 -06:00
detherminal
8f89f19b91
feat: add nano
2023-05-19 13:20:16 +03:00
julian
d7fa52e9cd
add ecash to price fetch service
2023-05-18 17:01:58 -06:00
julian
a3422696ba
fix
2023-05-17 15:55:17 -06:00
julian
dfc283c757
ecashaddrs working?
2023-05-17 13:14:16 -06:00
julian
23a6236b4c
update branch
2023-05-17 12:16:38 -06:00
julian
0d7a0a8fb9
Merge branch 'staging' into add-ecash
...
# Conflicts:
# lib/utilities/assets.dart
# lib/utilities/theme/color_theme.dart
2023-05-17 12:11:08 -06:00
julian
e406374796
clean up and optimizations
2023-05-17 11:34:40 -06:00
julian
d270ea38a2
clean up tx count function
2023-05-17 08:37:27 -06:00
julian
ab78e3fbca
clean up _getUnspentCoins()
2023-05-16 15:59:06 -06:00
julian
9725ed32be
WIP rework of anon balance calc
2023-05-16 15:15:08 -06:00
julian
02fe1103cb
fix assignment issue
2023-05-16 14:43:52 -06:00
julian
01999e4f29
revert if pointless or breaks things?
2023-05-16 14:38:24 -06:00
Josh Babb
7d8f03dd20
add warning
2023-05-16 15:20:18 -05:00
julian
eac4ee54f1
logging on possible bad data
2023-05-16 14:17:12 -06:00
julian
a513e90082
make function easier to read: Part 2
2023-05-16 14:13:14 -06:00
julian
87507585b8
make function easier to read
2023-05-16 14:08:25 -06:00
julian
d0c53c2673
Strongly typed used serials list
2023-05-16 13:29:48 -06:00
julian
1b92f2b36b
no more derivations stored for firo
2023-05-16 11:33:00 -06:00
julian
59c1a49ee7
Merge branch 'ui-fixes' into address_book_isar
...
# Conflicts:
# lib/pages_desktop_specific/address_book_view/subwidgets/desktop_contact_details.dart
# lib/utilities/db_version_migration.dart
2023-05-15 14:15:34 -06:00
julian
52bffbac08
add contacts migration from hive to isar and remove contact class conversion
2023-05-15 14:12:06 -06:00
julian
8351821c89
disable xpubs temporarily
2023-05-15 11:15:35 -06:00
julian
127564f2ac
fix: bch remove bad address type
2023-05-15 07:48:50 -06:00
detherminal
524f4c5514
feat: move address books to isar
2023-05-14 18:06:47 +03:00
julian
539dec13f5
clean up and fixed bugs found while porting themes to duo
2023-05-13 21:25:46 -06:00
julian
fe0155edc7
Merge remote-tracking branch 'origin_SW/staging' into themes
2023-05-12 11:16:32 -06:00
julian
4213eca928
Merge remote-tracking branch 'origin_SW/staging' into themes
...
# Conflicts:
# lib/db/isar/main_db.dart
2023-05-09 18:00:17 -06:00
julian
511ac393b6
untested notifications wrapper
2023-05-09 11:54:15 -06:00
likho
f57ec039b2
Stop epicbox listener when wallet is syncing
2023-05-09 11:49:20 +02:00
julian
2cf7d6de93
fix: more bch zero conf special case fixes
2023-05-08 16:15:39 -06:00
Diego Salazar
6efa5597bf
Merge pull request #520 from cypherstack/add-epic-send-to-address
...
fix: Add send to address for epic when sending
2023-05-05 16:16:56 -06:00
julian
0ab96ad6a1
fix: some exchange api error propagation
2023-05-05 10:25:56 -06:00
likho
4d785e113c
Merge branch 'staging' into add-epic-send-to-address
2023-05-05 14:01:02 +02:00
likho
affee53ca6
Add send to address for epic when sending
2023-05-05 13:58:53 +02:00
julian
34d9360f20
delete empty/unused files
2023-05-04 12:20:08 -06:00
julian-CStack
87ed2af7ce
remove empty file
2023-05-04 08:57:24 -06:00
julian
3a97623e5b
WIP exchange screen state refactor
2023-05-03 14:03:31 -06:00
julian
3564426248
show trocador provider options
2023-05-02 10:22:35 -06:00
julian
e81521e374
WIP exchange process refactor to handle multiple sub providers per exchange provider
2023-05-01 16:26:12 -06:00
julian
34f7d80051
Merge branch 'ui-fixes' into trocador
2023-05-01 13:50:27 -06:00
julian
e05caa589f
bch block height showing as pending in ui fix
2023-05-01 13:41:53 -06:00
julian
b9211ad2c3
pass abi parsing errors (or other token init errors) up and show a simple dialog
2023-05-01 11:20:40 -06:00
julian
d14fd88e01
trocador debug prints
2023-04-28 15:27:38 -06:00
julian
33ec3f5a25
hack to isolate Trocador exchange name
2023-04-28 14:40:36 -06:00
julian
73b7af77f6
add trocador currencies to loading/caching process
2023-04-28 14:32:44 -06:00
julian
05c4d01ee4
initial Trocador integration
2023-04-28 14:31:26 -06:00
julian
da9b921ddc
pass around estimate instead of just rateId
2023-04-28 14:29:10 -06:00
julian
da9b679d3c
trocador api tweaks and clean up
2023-04-28 14:26:51 -06:00
julian
9c414068d3
trocador api and response DTOs
2023-04-28 10:30:31 -06:00
julian
1e9642ec94
gap check fix ported from btc to bch
2023-04-27 09:01:14 -06:00
julian
cce4336f43
ensure all addresses with history have been generated before scanning for tx history on restore
2023-04-26 17:05:45 -06:00
julian
5a50f7d256
ensure notification address is added to local db
2023-04-26 16:19:24 -06:00
julian
9749443472
clean up notif node calls
2023-04-26 16:12:24 -06:00
julian
b14263eca5
clean up root node calls
2023-04-26 16:11:28 -06:00
julian
1dc2a3ce15
fix signing paynym received inputs
2023-04-26 15:12:36 -06:00
julian
d0bb0183f3
btc all own addresses query fix
2023-04-26 13:11:56 -06:00
julian
a236316291
unused code cleanup
2023-04-26 13:11:24 -06:00
julian
8018a887cf
paynym address generation clean up
2023-04-26 12:27:29 -06:00
julian
ce01269dbe
clean up unneeded code
2023-04-26 09:28:04 -06:00
julian
2bfce21058
btc restore gap fix
2023-04-26 09:27:29 -06:00
julian
fea0aeea64
paynym amount fixes
2023-04-25 15:08:00 -06:00
julian
8c3fffde9d
segwit paynym.is updates and fixes
2023-04-25 15:06:12 -06:00
julian
cf694d6cdd
init fix
2023-04-25 11:32:57 -06:00
julian
5ad161e6a9
add initial segwit paynym support
2023-04-25 10:45:02 -06:00
julian
6fb93b00ff
organize constants
2023-04-25 09:24:14 -06:00
julian
573668a333
bch testnet send fix
2023-04-24 12:10:46 -06:00
julian
f9aac8ea36
clean up remaining add derivation stuff in btc and paynyms
2023-04-20 18:47:07 -06:00
julian
0734d9ee8a
move to cleaner tx signing and stop adding derivations on address generation as we now have the info we need in the Address class. Old derivations should still be checked as not all old addresses are guaranteed to had a derivation path property
2023-04-20 18:36:43 -06:00
julian
58bc67f9ea
some derivations additions cleaned up in btc
2023-04-20 18:00:08 -06:00
julian
6c3cddb48a
clean up bch restore process
2023-04-20 17:53:09 -06:00
julian
8e73e3ecba
pass bip32 root node is available to save generation time
2023-04-20 12:35:08 -06:00
julian
703ceee86d
clean up btc restore, stop storing derivations as they aren't needed anymore, and ensure all previous unused addresses are saved.
2023-04-20 12:34:31 -06:00
julian
1714e2a7d8
set wow confs to 15
2023-04-20 11:00:52 -06:00
julian-CStack
2ff27956d1
init cache db no matter what on startup
2023-04-18 16:51:50 -06:00
julian
9a6dcba631
Merge branch 'ui-fixes' into add-ecash
2023-04-17 15:55:09 -06:00
julian
9974f60b4c
zero conf possible null fix
2023-04-17 15:44:50 -06:00
julian
154ad80137
reformat auto save
2023-04-17 15:36:16 -06:00
julian
8b76ef4f30
ecash derivation path
2023-04-17 12:58:34 -06:00
julian
f87c5e8aa7
duplicate code clean up
2023-04-17 09:47:51 -06:00
julian
e01b422573
check server version
2023-04-17 09:42:55 -06:00
julian
9df5bc4f36
non batched tx history fetching if server doesn't support batching
2023-04-17 09:28:02 -06:00
julian
9c5c0cb179
non batched tx count if server doesn't support batching
2023-04-17 09:18:50 -06:00
julian
ba77b40674
non batched utxo fetch if server doesn't support batching
2023-04-17 08:27:44 -06:00
julian-CStack
93b040bc5f
WIP e-cash
2023-04-17 07:53:39 -06:00
julian
788d1f5205
set min wownero confirmations to 4
2023-04-15 12:00:28 -06:00
julian
1e71e3d615
epic amount type cast error fix
2023-04-12 08:09:04 -06:00
julian
b36c98f003
better error handling
2023-04-11 16:09:18 -06:00
julian
b5a58064ac
eth gas tracker fixes and token send tweaks
2023-04-11 15:36:37 -06:00
julian
723ec64354
eth fixes
2023-04-11 14:25:13 -06:00
julian
eae2ad1651
delete unused file
2023-04-11 13:17:49 -06:00
julian
e72f2018d0
missed firo amount
2023-04-11 11:20:57 -06:00
julian
ce67673a94
duplicated lower cased eth address fix
2023-04-11 09:53:26 -06:00
julian
b3efbda2e4
some amount sending fixes
2023-04-11 09:17:58 -06:00
sneurlax
aeff2f82ae
remove typo
2023-04-10 16:58:07 -05:00
sneurlax
af1993cc01
amount-related ui fixes for firo/spend-mints
2023-04-10 16:56:17 -05:00
sneurlax
5262bd8933
Merge remote-tracking branch 'stack_wallet_origin/ui-fixes' into firo/spend-mints
2023-04-10 16:05:52 -05:00
sneurlax
d883aaf602
Merge remote-tracking branch 'stack_wallet_origin/ui-fixes' into firo/spend-mints
2023-04-10 16:04:14 -05:00
sneurlax
80ca2f2d2c
check if mint txs are confirmed
2023-04-10 15:58:56 -05:00
sneurlax
d3db4e6868
instead of assuming mint = confirmed, move logic down so isUnconfirmed has an exception
2023-04-10 15:35:25 -05:00
sneurlax
77b1e23144
assume mints listed in lelantus txs are confirmed
...
TODO make sure that mints/_mintTxnData only contains confirmed tx / filter unconfirmed
2023-04-10 15:21:33 -05:00
julian
051eb6c924
change now token contract "fix"
2023-04-10 14:14:03 -06:00
julian
0ea4517952
quicker token wallet loading
2023-04-10 12:00:23 -06:00
julian
004c39102c
token balance fix
2023-04-10 12:00:23 -06:00
julian
5bf678d41a
Balance class clean up
2023-04-10 12:00:23 -06:00
julian
c0105a2058
available balance fix
2023-04-09 13:07:09 -06:00
julian
72d6e636f0
Merge remote-tracking branch 'origin/staging' into ui-fixes
...
# Conflicts:
# lib/services/coins/manager.dart
2023-04-07 18:56:59 -06:00
julian
839ee314a2
xpub refactor to include coin network type in generation
2023-04-07 18:44:43 -06:00
julian
51211b34f5
eth token fee parsing fix
2023-04-07 16:02:28 -06:00
julian
94896dfd60
Amount fixes
2023-04-06 17:49:13 -06:00
julian
25ff880280
move amount.dart file
2023-04-06 15:24:56 -06:00
julian
ecc075d5fc
Merge remote-tracking branch 'origin/staging' into add-ethereum
...
# Conflicts:
# lib/utilities/theme/forest_colors.dart
2023-04-06 12:42:05 -06:00
julian
81c612ddd7
WIP use Amount
2023-04-05 16:06:31 -06:00
Diego Salazar
366c152521
Merge pull request #455 from cypherstack/epic/2-confs
...
Reduce Epic Cash minimum confirmations to 3
2023-04-03 17:19:32 -06:00
sneurlax
a6c2a30af4
bump min confs to 3
2023-04-03 14:36:06 -05:00
sneurlax
74344168f2
reduce MINIMUM_CONFIRMATIONS to 2
2023-04-03 14:30:36 -05:00
julian
87aab96e58
get real nonce for eth txns
2023-04-03 11:25:56 -06:00
julian
563799feee
Merge remote-tracking branch 'origin/staging' into add-ethereum
2023-04-03 10:37:51 -06:00
julian
b1e6ee8d47
Revert "disabled mb"
...
This reverts commit c9eba36f31
.
2023-04-01 09:04:34 -06:00
julian
9a86a6fe9e
remove value from estimate for token tx
2023-03-31 18:30:32 -06:00
julian
e584070b96
Merge remote-tracking branch 'origin/staging' into add-ethereum
2023-03-31 17:19:31 -06:00
julian
6704d82889
eth + token send fixes
2023-03-31 17:17:15 -06:00
julian
1de0eec6cc
get current address nonce
2023-03-31 16:31:19 -06:00
julian
d4cba56e81
fetch raw tx call
2023-03-31 15:38:22 -06:00
julian
bcadb07e9b
temp debugging print
2023-03-31 15:14:45 -06:00
likho
516a916b9d
Fix Epiccash sendAll not enough funds error
2023-03-31 20:27:27 +02:00
julian
c8139007e3
use new transaction nonce property
2023-03-31 10:18:51 -06:00
julian
8d0dcafccf
WIP token send logic
2023-03-31 09:26:43 -06:00
julian
b3c4e690c7
move confirmSend to a nicer place
2023-03-31 09:25:08 -06:00
julian
a04223e0b7
eth gas tracker updated
2023-03-30 14:55:51 -06:00
julian
61894c9e8e
price service token tweaks
2023-03-30 10:41:28 -06:00
julian
b7eaf9a8c2
fetch correct proxy token ABI
2023-03-29 15:57:52 -06:00
julian
f69f9a5038
Merge remote-tracking branch 'origin/staging' into add-ethereum
...
# Conflicts:
# lib/widgets/wallet_card.dart
2023-03-29 14:09:23 -06:00
julian
bfeb3e0d30
WIP eth fees
2023-03-29 12:49:12 -06:00
julian
5e5730d5a5
eth token wallet general ui and wallet selection interface
2023-03-28 16:18:11 -06:00
julian
24904f3476
Merge remote-tracking branch 'origin/staging' into add-ethereum
...
# Conflicts:
# lib/utilities/show_loading.dart
2023-03-28 12:37:09 -06:00
julian
b4a344ebad
firo balance bug fix
2023-03-28 08:14:48 -06:00
Diego Salazar
36d222ebd8
Merge pull request #436 from cypherstack/disable_mb
...
Disable mb
2023-03-27 14:58:58 -06:00
julian
21e0113439
sync getter
2023-03-27 14:29:08 -06:00
julian
e29d8dc047
Merge remote-tracking branch 'origin/staging' into add-ethereum
...
# Conflicts:
# lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart
2023-03-27 08:50:10 -06:00
julian
6612dde2ef
show only token transfers in token tx history (for now)
2023-03-27 08:43:35 -06:00
julian
4bd87e8dce
start using Amount
2023-03-27 08:41:59 -06:00
julian
c9eba36f31
disabled mb
2023-03-25 19:27:42 -06:00
julian
951c9638f3
bch zero conf fixes
2023-03-24 16:44:25 -06:00
julian
678a926ff3
bch zero conf fixes
2023-03-24 16:43:34 -06:00
julian
b2b9accee1
add serialized amount string to transaction
2023-03-24 15:31:05 -06:00
julian
e53683ac68
WIP token tx parsing
2023-03-24 10:11:18 -06:00
julian
361d3a8095
get token info fix
2023-03-24 08:37:47 -06:00
julian
af2c674809
remove unused variable
2023-03-23 18:26:55 -06:00
julian
3e1e68237a
Merge remote-tracking branch 'origin/staging' into add-ethereum
...
# Conflicts:
# lib/models/isar/models/blockchain_data/address.dart
# lib/pages/add_wallet_views/create_or_restore_wallet_view/create_or_restore_wallet_view.dart
# lib/pages/settings_views/global_settings_view/appearance_settings_view.dart
# lib/pages_desktop_specific/settings/settings_menu/appearance_settings.dart
# lib/utilities/db_version_migration.dart
# test/pages/send_view/send_view_test.mocks.dart
# test/screen_tests/address_book_view/subviews/add_address_book_view_screen_test.mocks.dart
# test/screen_tests/address_book_view/subviews/address_book_entry_details_view_screen_test.mocks.dart
# test/screen_tests/address_book_view/subviews/edit_address_book_entry_view_screen_test.mocks.dart
# test/screen_tests/exchange/exchange_view_test.mocks.dart
# test/screen_tests/lockscreen_view_screen_test.mocks.dart
# test/screen_tests/main_view_tests/main_view_screen_testA_test.mocks.dart
# test/screen_tests/main_view_tests/main_view_screen_testB_test.mocks.dart
# test/screen_tests/main_view_tests/main_view_screen_testC_test.mocks.dart
# test/screen_tests/onboarding/backup_key_view_screen_test.mocks.dart
# test/screen_tests/onboarding/backup_key_warning_view_screen_test.mocks.dart
# test/screen_tests/onboarding/create_pin_view_screen_test.mocks.dart
# test/screen_tests/onboarding/restore_wallet_view_screen_test.mocks.dart
# test/screen_tests/onboarding/verify_backup_key_view_screen_test.mocks.dart
# test/screen_tests/settings_view/settings_subviews/currency_view_screen_test.mocks.dart
# test/screen_tests/settings_view/settings_subviews/network_settings_subviews/add_custom_node_view_screen_test.mocks.dart
# test/screen_tests/settings_view/settings_subviews/network_settings_subviews/node_details_view_screen_test.mocks.dart
# test/screen_tests/settings_view/settings_subviews/wallet_backup_view_screen_test.mocks.dart
# test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/rescan_warning_view_screen_test.mocks.dart
# test/screen_tests/settings_view/settings_subviews/wallet_settings_subviews/wallet_delete_mnemonic_view_screen_test.mocks.dart
# test/screen_tests/settings_view/settings_subviews/wallet_settings_view_screen_test.mocks.dart
# test/screen_tests/settings_view/settings_view_screen_test.mocks.dart
# test/screen_tests/transaction_subviews/transaction_search_results_view_screen_test.mocks.dart
# test/screen_tests/wallet_view/confirm_send_view_screen_test.mocks.dart
# test/screen_tests/wallet_view/receive_view_screen_test.mocks.dart
# test/screen_tests/wallet_view/send_view_screen_test.mocks.dart
# test/screen_tests/wallet_view/wallet_view_screen_test.mocks.dart
# test/widget_tests/managed_favorite_test.mocks.dart
# test/widget_tests/table_view/table_view_row_test.mocks.dart
# test/widget_tests/transaction_card_test.mocks.dart
# test/widget_tests/wallet_info_row/sub_widgets/wallet_info_row_balance_future_test.mocks.dart
# test/widget_tests/wallet_info_row/wallet_info_row_test.mocks.dart
2023-03-23 18:13:24 -06:00
julian
b27b90c08a
WIP eth token abi fetch and parsing
2023-03-23 18:05:35 -06:00
julian
85c416fb50
eth trueblocks fetch token abi call
2023-03-23 18:04:47 -06:00
julian
c51ef8ee26
edit wallet token list
2023-03-23 16:28:20 -06:00
julian
1fd7e129e2
empty token tx check
2023-03-23 13:51:56 -06:00
julian
09b2c68cd5
get token contract info updates and fixes
2023-03-23 13:48:38 -06:00
julian
40cceed8e6
use trueblocks api to grab transactions
2023-03-23 12:19:51 -06:00
julian
be11b18eb8
handle user added wallet contracts
2023-03-23 12:16:28 -06:00
julian
b1d5b7f6ea
store user added token contracts in wallet hive box for now
2023-03-23 09:39:22 -06:00
julian-CStack
e16bd90a68
BCH 0-conf
2023-03-23 09:09:30 -06:00
sneurlax
68bf6a6565
add mint/anonymization txs to balance
...
currently breaks when a mint/anonymization tx is correctly recognized as a send but not correctly recognized as isUsed
2023-03-22 18:05:52 -05:00
sneurlax
79706d51f5
increment mint index by 1
2023-03-22 17:29:20 -05:00
julian
d2bddcdd8d
add token view button to wallet nav bar
2023-03-22 09:39:28 -06:00
julian
9fa2d4535d
merge fixes
2023-03-22 09:25:21 -06:00
julian
702054ac61
Merge remote-tracking branch 'origin/staging' into add-ethereum
...
# Conflicts:
# assets/svg/themed/forest/ethereum.png
# assets/svg/themed/forest/ethereum.svg
# lib/pages/add_wallet_views/create_or_restore_wallet_view/create_or_restore_wallet_view.dart
# lib/pages/receive_view/addresses/edit_address_label_view.dart
# lib/pages/receive_view/addresses/receiving_addresses_view.dart
# lib/pages/wallet_view/sub_widgets/wallet_navigation_bar.dart
# lib/pages/wallet_view/wallet_view.dart
# lib/route_generator.dart
# lib/utilities/assets.dart
# lib/utilities/constants.dart
# lib/widgets/animated_widgets/rotate_icon.dart
# pubspec.lock
# pubspec.yaml
2023-03-22 08:54:25 -06:00
julian
ea933e0474
do not freeze notification tx change outputs
2023-03-20 09:23:33 -06:00
julian
d0be86f4ba
WIP desktop 'more features' and coin control
2023-03-13 14:37:05 -06:00
julian
d45caa47b3
block sent notification tx change output with reason
2023-03-09 15:49:23 -06:00
julian
0cace4d7bc
partial derivation not found null fix
2023-03-09 15:08:13 -06:00
julian
c04723840f
fix bug that can cause transaction broadcast to fail in the case where two or more input utxos come from the same parent transaction
2023-03-09 13:49:39 -06:00
julian
260771061c
prepare paynym interface to use SigningData
2023-03-09 12:31:36 -06:00
julian
645ec5c2a0
delete unused file
2023-03-09 12:29:38 -06:00
julian
e6b5e847c3
coin control utxos fix
2023-03-09 10:30:10 -06:00
julian
b30f1db45b
enable coin control for selected other coins
2023-03-08 16:11:46 -06:00
julian
ec237d0001
Merge remote-tracking branch 'origin/staging' into coin_control
2023-03-08 13:42:12 -06:00
julian
79dc8e5329
balance display update events to properly reflect changes done in coin control, as well as clean up of old future builders no longer used
2023-03-08 13:21:25 -06:00
julian
2b1d438953
balance refresh and total display fixes
2023-03-08 13:03:04 -06:00
julian
ea49ed32ab
update balance after viewing coin control
2023-03-08 12:22:33 -06:00
julian
ffdb74d0e8
mark utxos as used on successful tx broadcast
2023-03-08 09:56:32 -06:00
julian
4aae0fc76e
update coinSelection to handle custom list of UTXOs
2023-03-08 09:47:35 -06:00
julian
650584ad74
MB order notification lookup fix
2023-03-07 14:13:12 -06:00
julian
6465faa4e1
btc update utxo set
2023-03-07 09:00:42 -06:00
julian
251f90834c
update UTXO schema
2023-03-06 14:39:41 -06:00
julian
3982ca29a6
MB doesn't store trade/order history indefinitely
2023-03-06 13:59:30 -06:00
Likho
a940a0e75b
Fix send error
2023-03-06 19:18:46 +02:00
julian
7319f509f0
add coin control option to mobile more menu + assets fix
2023-03-06 10:34:41 -06:00
julian-CStack
e8e8ffdf60
Merge branch 'staging' into mb-fixes
2023-03-03 15:15:58 -06:00
julian
40ca565d54
mb order status util and extra logging
2023-03-03 14:46:53 -06:00
julian
22b7da2206
WIP eth tx parsing
2023-03-03 11:36:40 -06:00
julian
b617b3e5e0
added more logging
2023-03-03 11:36:28 -06:00
Diego Salazar
aadbeff488
Merge pull request #382 from cypherstack/fix/epic-create
...
Fix epic wallet creation epicbox config error by adding and using an EpicBoxConfigModel and an EpicBoxServerModel
2023-03-03 08:55:06 -07:00
Diego Salazar
9a04f5db31
Merge branch 'staging' into fix/epic-delete
2023-03-03 08:54:32 -07:00
julian
5ba44d5b8e
rename eth token wallet class
2023-03-03 08:36:56 -06:00
julian
f26fb19453
do not use secure storage for token ABIs
2023-03-03 08:35:43 -06:00
sneurlax
0089dc8333
send real config, not epicbox config, to deletewallet
2023-03-02 19:08:58 -06:00
julian
babbd75da3
use database contract data and contract management updates
2023-03-02 18:40:12 -06:00
julian
a5d8fdde79
parse eth tx json to data transfer objects
2023-03-02 15:07:25 -06:00
sneurlax
83d0157600
add and use EpicBoxConfigModel and EpicBoxServerModel
2023-03-02 14:51:19 -06:00
julian
b4b4c5e696
WIP eth api refactor to use chifra based api
2023-03-02 13:28:51 -06:00
sneurlax
6f27184619
type handling
...
hack not fix (model is fix)
2023-03-01 18:09:25 -06:00
julian
8466180b47
get token abi fixes
2023-03-01 18:02:53 -06:00
sneurlax
a8e079bd84
pass config param to wallet deletion method
...
had to add param because existing rust wallet deletion method can't check for existence without it but I'd like to do this differently on the rust side and revert this change
plus the type handling (`decoded is String`) is a hack vs making a model like it probably should be
2023-03-01 17:59:20 -06:00
julian
16efeea1db
project structure
2023-03-01 15:52:13 -06:00
julian
e732c4f1b7
eth wallet token list fixes
2023-03-01 15:27:10 -06:00
julian
11177b50c3
tx parsing fix
2023-03-01 15:19:53 -06:00
julian
8812efaefb
temp disable broken blockscout api
2023-03-01 14:50:14 -06:00
julian
100ab39847
add get token balance for address function
2023-03-01 14:04:25 -06:00
julian
508fc48462
dirty proxy contract function injection hack
2023-03-01 14:03:23 -06:00
likho
ca6fa2d101
Add check for domain for epicbox address
2023-03-01 14:27:35 +02:00
julian
e3548c5ecc
WIP wallet token management
2023-02-28 18:36:54 -06:00
julian
70335286be
custom eth api exception
2023-02-28 16:03:36 -06:00
julian
0c11e859aa
changenow v2 currencies call to access tokenContract param
2023-02-28 14:27:42 -06:00
julian
f1bfe72b73
eth token price service updates
2023-02-28 10:36:24 -06:00
julian
305b252573
replace 'net_*' calls with 'eth_*' alternatives
2023-02-27 16:49:20 -06:00
julian
82842f1aa0
token view refresh, and WIP token icon assets and other small fixes
2023-02-27 11:42:22 -06:00
julian
fcd8f01d93
convert token service to change notifier, add token cache per eth wallet, token balances, and fix routing issues
2023-02-27 10:01:06 -06:00
julian
2287cd751e
Merge remote-tracking branch 'origin/paynyms' into add-ethereum
2023-02-27 08:42:35 -06:00
likho
716dbe706b
Fix epicbox config issue when creating new wallet
2023-02-25 11:42:21 +02:00
julian
3d668c2cba
Merge remote-tracking branch 'origin/staging' into paynyms
2023-02-24 20:26:53 -06:00
julian
05d14b0e42
blinding bugfix
2023-02-24 20:26:32 -06:00
julian
9c8fd22bfb
WIP load and display token transactions
2023-02-24 14:07:59 -06:00
julian
057066950e
get token transactions refactor
2023-02-24 10:22:25 -06:00
julian
58280010f8
refactor import
2023-02-24 08:45:34 -06:00
julian
5aed55235c
WIP eth refactor
2023-02-23 16:59:58 -06:00
julian
1653bb2096
Merge remote-tracking branch 'origin/ui-fixes' into add-ethereum
2023-02-23 14:36:38 -06:00
julian
d657681d23
Merge remote-tracking branch 'origin/staging' into add-ethereum
...
# Conflicts:
# pubspec.lock
2023-02-23 14:27:49 -06:00
julian
3f80c17777
added bch to MB map as well as some other wallet coins preemptively
2023-02-23 14:11:14 -06:00
julian
a57cd88696
use segwit change address for notification tx
2023-02-23 14:01:36 -06:00
julian
a63af1787a
explicitly check p2pkh change address on refresh
2023-02-23 13:49:27 -06:00
julian
9ae95b3591
add firo to majestic bank hard coded map
2023-02-23 11:26:48 -06:00
julian
6bb133c552
notification tx absurd fees error fix when estimating a tx size
2023-02-22 15:12:17 -06:00
julian
8b777655ca
missing inputs notification tx fix
2023-02-22 06:21:19 -06:00
julian-CStack
9c510119d7
Merge branch 'staging' into paynyms
2023-02-22 05:48:41 -06:00
julian
4bd55f6ee3
disable broken paynym connection status caching
2023-02-22 05:47:30 -06:00
Diego Salazar
7d7acfc567
Merge branch 'staging' into epicbox-failover
2023-02-21 17:11:52 -07:00
sneurlax
6a6b3767aa
comment update
2023-02-21 17:56:08 -06:00
sneurlax
9333a28180
reorder function and add comment for clarity
2023-02-21 15:37:54 -06:00