1244 commits

Author	SHA1	Message	Date
likho	13a171f3ef	WIP:Replace libepiccash calls with calls to abstract class, add error handling and return types other than strings	2023-09-27 17:53:10 +02:00
julian	154c727316	Refactor getUnusedReservedChangeAddresses so it doesn't depend on purely Isar links to Transaction objects which will not guarantee to catch all used addresses.	2023-09-22 17:32:38 -06:00
julian	593d2c7e7e	named record params and clear variable names	2023-09-22 17:00:56 -06:00
julian	55d8738acb	check change addresses for transactions automatically in fusion interface change address getter function	2023-09-22 16:39:59 -06:00
julian	a4f8c52148	pass in getter function for electrumx instance instead of keeping an old reference if the node connection info has changed. This ensures the electrumx calls done from the fusion interface use the updated node info	2023-09-22 15:59:07 -06:00
julian	5527678b94	tor fusion service	2023-09-22 15:44:40 -06:00
julian	59ac1563bc	decode hex	2023-09-22 14:25:38 -06:00
sneurlax	f2854c0bc6	fix scriptPubKeyHex	2023-09-22 14:49:08 -05:00
julian	7d2aaa28aa	fix merge issue	2023-09-22 13:33:36 -06:00
sneurlax	722a72cff6	Merge remote-tracking branch 'origin/fusion' into fusion	2023-09-22 14:20:50 -05:00
sneurlax	55e6e56a2d	replace bitcoindart with coinlib	2023-09-22 14:20:19 -05:00
julian	40b029351d	slight change to output mapping	2023-09-22 13:01:02 -06:00
julian	af40bf3667	some FusionTransaction extension TODO cleanup	2023-09-22 12:50:59 -06:00
sneurlax	d1603d5f72	add pubKey to fusion inputs	2023-09-22 12:18:43 -05:00
julian	ec8d3ae1d8	Merge remote-tracking branch 'origin_SW/fusion' into fusion ... # Conflicts: # lib/services/mixins/fusion_wallet_interface.dart	2023-09-22 10:50:01 -06:00
julian	4b964f611c	fix static variable usage	2023-09-22 10:48:14 -06:00
sneurlax	ecdb49d84c	add derivationPath in toFusionOutput	2023-09-22 11:45:16 -05:00
sneurlax	504fdaa239	query isar for pubkey of address	2023-09-22 00:38:32 -05:00
sneurlax	a2e3a2aafa	implement schnorrVerify, documentation, comments, etc	2023-09-21 23:12:08 -05:00
sneurlax	7788ec7ace	implement getAddressFromOutputScript in fusiondart and update comments	2023-09-21 16:57:21 -05:00
sneurlax	c898ffb30f	Merge branch 'arti' into fusion	2023-09-20 11:05:54 -05:00
sneurlax	6b0dd30dee	refactor address model changes back into fusion interface	2023-09-20 10:17:52 -05:00
julian	67c73076a2	run loading futures together	2023-09-20 09:10:29 -06:00
sneurlax	c43cf94c38	Merge branch 'arti' into fusion	2023-09-19 23:59:10 -05:00
sneurlax	12b3dd58a8	remove prints from prod	2023-09-19 23:57:52 -05:00
sneurlax	4180cf6c44	refactor interface changes back into the interface	2023-09-19 22:14:34 -05:00
sneurlax	ef38e58b57	query electrum for missing tx info	2023-09-19 17:58:55 -05:00
sneurlax	183ac9dd27	placeholder pubkey and comment updates	2023-09-19 14:28:15 -05:00
sneurlax	2dcb82f049	update tor handling in fusion wallet interface ... removed inaccurate comments ... Stack shouldn't use Tor unless useTor	2023-09-15 16:02:25 -05:00
sneurlax	ea223ff7cd	docs	2023-09-15 16:01:31 -05:00
sneurlax	b2203a6cc7	resolve the futures	2023-09-15 16:01:23 -05:00
sneurlax	28b2f4f6b6	Merge remote-tracking branch 'origin/arti' into fusion	2023-09-15 15:06:10 -05:00
julian	4e3390a7c0	refactor TorService	2023-09-15 13:51:20 -06:00
sneurlax	a220b76c34	add todo note about fusion tor service	2023-09-15 14:22:05 -05:00
sneurlax	e173660715	formatting	2023-09-15 14:21:36 -05:00
julian	682ea4d898	WIP TorService refactor	2023-09-15 12:10:51 -06:00
Josh Babb	fafdb45e48	add getSocksProxyAddress passin, documentation, and comments	2023-09-14 17:28:11 -05:00
Josh Babb	67f3217daf	Merge arti into fusion	2023-09-14 14:45:47 -05:00
julian	6214688768	fix price test and update mocks	2023-09-13 10:58:02 -06:00
sneurlax	6594e3c0cf	don't await on disable and add documentation and comments	2023-09-12 15:47:39 -05:00
sneurlax	53baad66b6	cypherstack/tor ios and mac updates and toggle tor plugin _enabled more	2023-09-12 15:28:16 -05:00
sneurlax	50466ff509	use updated cargokit, rename tor->tor_ffi_plugin	2023-09-12 13:49:25 -05:00
sneurlax	20e5f74ab2	Revert "do not use Majestic Bank-supplied onion service address for MB API" ... This reverts commit 090262017a.	2023-09-11 18:40:18 -05:00
sneurlax	090262017a	do not use Majestic Bank-supplied onion service address for MB API ... intentionally left unused imports TODO enable tor services in cypherstack/tor then revert this snippet, see https://github.com/cypherstack/tor/issues/10#issuecomment-1714731696	2023-09-11 18:23:53 -05:00
sneurlax	d342dd5cb9	fix currency filter	2023-09-11 18:12:56 -05:00
sneurlax	45e6354fb6	replace get supportsTor with an exchangesWithTorSupport List<Exchange> ... more convenient to use elsewhere	2023-09-11 18:07:59 -05:00
sneurlax	dcfb6e9dac	WIP exchange tor support	2023-09-11 16:31:48 -05:00
ryleedavis	bcb92ae638	price api use tor HTTP	2023-09-11 14:38:40 -06:00
ryleedavis	5053e7d97a	WIP: tor http connection	2023-09-11 14:20:40 -06:00
julian	4160196135	clean up epic wallet file	2023-09-10 13:43:41 -06:00
julian	381672d368	apply scans error propagation fix	2023-09-10 13:43:41 -06:00
julian	6efcdf97ea	clean up cancel transaction in epiccash wallet	2023-09-10 13:43:41 -06:00
ryleedavis	126229a38b	Merge branch 'arti' of https://github.com/cypherstack/stack_wallet into arti	2023-09-08 16:53:14 -06:00
ryleedavis	dea35fd801	WIP: tor http connection	2023-09-08 16:53:09 -06:00
julian	b278f691cc	add init function to TorService so the compiled rust lib isn't loaded on instance creation but rather on init being called	2023-09-08 15:44:25 -06:00
ryleedavis	f240163a91	WIP: tor http connection	2023-09-08 15:09:59 -06:00
julian	9d6cdfd2c1	Modify HTTP to take in proxy info rather than rely on the tor service singleton	2023-09-08 14:41:39 -06:00
sneurlax	cf27dd9252	remove tor service status getter	2023-09-08 10:30:49 -05:00
julian	3e9a225470	HTTP basic updates	2023-09-08 09:18:55 -06:00
julian	02ae941a98	Merge remote-tracking branch 'origin_SW/staging' into arti	2023-09-08 07:54:14 -06:00
julian	81bbdb1b62	add a couple notes	2023-09-08 07:53:06 -06:00
julian-CStack	d38d482b87	Merge branch 'staging' into httpsend-error-fix	2023-09-08 07:28:12 -06:00
sneurlax	79c1dee7ad	hook up existing ui elements to the tor service ... and add a status getter to the tor service	2023-09-07 18:28:55 -05:00
sneurlax	5cf202efc0	add a status getter to the tor service and document it	2023-09-07 17:56:48 -05:00
julian	bc25d5b3af	WIP stellar memo field on send screens as well as in trade details and exchange flow	2023-09-07 16:41:44 -06:00
sneurlax	a0491b9d22	move tor_connection_status_changed_event.dart to event_bus global folder	2023-09-07 17:13:27 -05:00
sneurlax	2c77ac1b5d	fire TorConnectionStatusChangedEvents from tor service ... and move tor_service file and unableToConnect->disconnected	2023-09-07 16:27:00 -05:00
sneurlax	3e36723da3	TorStatusChangedEvent->TorPreferenceChangedEvent	2023-09-07 15:37:23 -05:00
julian	98f3046e04	stellar sync error fix	2023-09-07 14:05:25 -06:00
sneurlax	622085ca5c	Merge remote-tracking branch 'origin/staging' into arti	2023-09-07 13:12:20 -05:00
julian	6e625e2c74	add tor status change event and fire on pref changed	2023-09-07 09:20:45 -06:00
likho	150ccdf57d	Return more descriptive error for http send	2023-09-06 18:26:31 +02:00
likho	41e3c2371d	Fix HTTP send error	2023-09-06 15:18:23 +02:00
julian	ca95612d69	fix firo lelantus sends to non wallet addresses not showing as confirmed in wallet ui	2023-09-05 10:19:58 -06:00
sneurlax	aba37faacb	WIP join session, return early from covert ... TODO fix `pubKey`s, `amount`s, etc passed in as 0000 or String? (whereas parameter is String for example, ie null awareness/safety) Can instantiate a cached electrum client and call eg txid for info missing from the transaction blockchain model	2023-08-30 11:41:45 -05:00
sneurlax	5f1e936435	WIP refactoring, documentation, comments, warning reduction, formatting	2023-08-25 13:50:18 -05:00
sneurlax	a381cd0a47	FusionInterface->FusionWalletInterface ... a la PayNymWalletInterface (big ups, mad respec)	2023-08-24 11:22:13 -05:00
julian	6e4a23007b	fix some rescan functionality	2023-08-23 14:58:22 -06:00
julian	3cd31d1bf2	clean up	2023-08-23 14:56:40 -06:00
julian	4b5686d8a4	handle stellar rescan properly	2023-08-23 14:31:34 -06:00
julian	31cac4b950	code formatting	2023-08-23 14:12:11 -06:00
julian	19a6e0b826	fix tezos refresh function	2023-08-23 11:58:16 -06:00
julian	63ab0b09e8	revert enum name	2023-08-23 11:29:10 -06:00
ryleedavis	02b67c2a2e	add parameter to initializeNew for tezos	2023-08-23 11:08:32 -06:00
ryleedavis	cceab1a036	Merge branch 'staging' into add-xtz ... # Conflicts: # lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart # lib/pages/settings_views/global_settings_view/manage_nodes_views/node_details_view.dart # lib/widgets/node_card.dart	2023-08-23 10:53:34 -06:00
Likho	c44b64f4c0	Merge branch 'staging' into xlm-bug-fixes	2023-08-23 15:24:43 +02:00
likho	961b687e27	Test node connection when updating and node and show error codes on send fail instead of generic error	2023-08-23 15:13:17 +02:00
julian	04bba2bf2a	new wallet mnemonic options for supported coins	2023-08-22 15:07:08 -06:00
likho	2732b2fe71	WIP: XLM fixes and refactor	2023-08-22 18:33:24 +02:00
likho	444860da53	Return just one value for fees since endpoint returns only one value for fees	2023-08-16 15:17:58 +02:00
likho	e8d5c3ad8b	Return tx id when sending, implement updateSentTx	2023-08-16 14:46:21 +02:00
likho	e3fb83a61f	Send all	2023-08-15 18:01:51 +02:00
likho	0a77dad7ec	Refactor Update transactions call	2023-08-15 16:49:28 +02:00
likho	520ceabf79	Clean up and refactor	2023-08-15 15:28:53 +02:00
ryleedavis	373637701c	Fix tezos network status	2023-08-14 16:53:44 -06:00
sneurlax	e90fc3f271	remove misleading comment	2023-08-14 11:00:35 -05:00
likho	a6d3941858	Fix send and refactoring	2023-08-14 16:36:27 +02:00
sneurlax	bae46bb27d	pass getUnusedReservedChangeAddresses to Fusion class	2023-08-08 09:32:11 -05:00
sneurlax	80ddbe2b20	implement reserve_change_addresses as _getUnusedReservedChangeAddresses ... and remove orphaned lib/services/cashfusion/fusion.dart	2023-08-07 14:39:46 -05:00
sneurlax	8eef870375	type disambiguation	2023-08-07 14:29:56 -05:00
sneurlax	32c0c55830	WIP generateChangeAddress->createNewReservedChangeAddress	2023-08-07 14:15:08 -05:00
julian	e4aa34509a	WIP reserve addresses stuff	2023-08-07 12:54:44 -06:00
sneurlax	221c4e3fb7	WIP pass address generation function in	2023-08-07 13:07:37 -05:00
julian	3e5035bd66	fix start issues	2023-08-07 11:52:36 -06:00
likho	3c05c568eb	Merge branch 'staging' into add-xtz	2023-08-07 17:13:55 +02:00
sneurlax	c620a5e23a	WIP nextChangeAddress ... WIP move reserve_change_addresses(int addresses) to fusion interface	2023-08-06 22:57:34 -05:00
sneurlax	6246b6c931	refactor CashFusion Address model and add toFusionAddress method ... to go from Stack Address -> CashFusion Address	2023-08-06 22:02:40 -05:00
sneurlax	2692ebfc68	WIP demo get current receiving address	2023-08-06 21:15:05 -05:00
sneurlax	2ffbcda188	Merge remote-tracking branch 'fyookball/fusion' into fusion	2023-08-06 19:35:12 -05:00
detherminal	182a8cc732	implement fees and sending?	2023-08-06 00:16:19 +03:00
Jonald Fyookball	387e4ba99c	update fusion.dart to get to runround stage	2023-08-03 08:50:28 -04:00
Josh Babb	10eb56ef43	Merge remote-tracking branch 'origin/staging' into fusion	2023-08-01 11:01:11 -05:00
julian	e48afa4c6a	parse firo masternode payments	2023-07-31 10:06:56 -06:00
detherminal	a1ef84fbe6	fix stellarTestNet and dependency problems	2023-07-28 23:00:14 +03:00
julian	bd090a3e92	ensure no rescan flag on newly created or restored firo wallets	2023-07-28 13:17:21 -06:00
detherminal	f4688bd041	xtz: filter other operations	2023-07-28 22:16:04 +03:00
julian	92f19de43c	WIP one time firo rescan	2023-07-28 10:55:04 -06:00
ryleedavis	724f6193d7	merge conflicts	2023-07-28 10:50:05 -06:00
ryleedavis	b66b25eb1f	Merge branch 'staging' into add-xtz ... # Conflicts: # lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart # lib/pages/settings_views/global_settings_view/manage_nodes_views/node_details_view.dart # lib/services/coins/coin_service.dart # lib/services/price.dart # lib/utilities/amount/amount_unit.dart # lib/utilities/block_explorers.dart # lib/utilities/constants.dart # lib/utilities/default_nodes.dart # lib/utilities/enums/coin_enum.dart # lib/utilities/enums/derive_path_type_enum.dart # lib/widgets/node_card.dart # lib/widgets/node_options_sheet.dart # pubspec.yaml	2023-07-28 10:48:52 -06:00
ryleedavis	5c06d9dc59	format adjustments + remove tezos from themeAssetsv1	2023-07-28 10:32:50 -06:00
ryleedavis	be0d820822	Merge branch 'add-xtz' of https://github.com/cypherstack/stack_wallet into add-xtz	2023-07-28 08:45:49 -06:00
detherminal	3077465e81	xtz: update api and add price	2023-07-28 13:39:07 +03:00
julian	f9fa0acb8c	pass in only required utxo data	2023-07-27 17:23:25 -06:00
julian	8e767d200e	use updated package	2023-07-27 17:13:03 -06:00
julian	cf03526d45	Merge remote-tracking branch 'origin_SW/staging' into fusion ... # Conflicts: # lib/pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/desktop_wallet_features.dart	2023-07-27 15:48:11 -06:00
Josh Babb	5f604eba3c	fix response-counting logic ... could be improved yet...	2023-07-27 15:32:18 -05:00
detherminal	2ee65b584e	fix: fetch from nodes instead of tzkt	2023-07-27 23:15:49 +03:00
sneurlax	c847656ca5	autoformatting	2023-07-27 14:47:22 -05:00
sneurlax	c584cb862d	don't assume list isn't null	2023-07-27 14:47:16 -05:00
sneurlax	d0e3474368	move fusion dart code to fusiondart package as submodule ... https://github.com/cypherstack/fusiondart	2023-07-27 14:39:36 -05:00
sneurlax	571fd960b8	autoformatting	2023-07-27 13:43:25 -05:00
sneurlax	59379faa4c	Merge remote-tracking branch 'fyookball/fusion' into fusion	2023-07-27 13:40:08 -05:00
Jonald Fyookball	e91ac3d355	Fixes for registerAndWait.	2023-07-27 14:29:03 -04:00
sneurlax	40d9a8aa9e	include exception if non-null	2023-07-27 13:14:19 -05:00
sneurlax	6ace239647	check if Exception	2023-07-27 13:13:15 -05:00
julian	2e9c5bde8e	clean up compile time errors only	2023-07-27 12:11:30 -06:00
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