From fc16b81caf2fa08205fdf03497423a63520e45e3 Mon Sep 17 00:00:00 2001 From: Jacek Sieka Date: Wed, 13 Mar 2024 18:38:54 +0100 Subject: [PATCH] chore(nim): use compile-time string formatting (#13945) Nim 2.2 comes with compile-time string formatting that doesn't raise exceptions if the format string is invalid - instead a compile-time error is given. This PR introduces a backport of that feature which improves performance and reduces the risk that formatting causes the app to crash and will help migrating the codebase to newer nim versions that track exceptions more carefully. There should be no change in runtime behavior (except formatting being a bit faster) --- src/app/core/tasks/marathon.nim | 2 +- src/app/global/utils.nim | 2 +- src/app/modules/main/activity_center/item.nim | 2 +- src/app/modules/main/activity_center/token_data_item.nim | 2 +- src/app/modules/main/app_search/location_menu_item.nim | 2 +- src/app/modules/main/app_search/location_menu_sub_item.nim | 2 +- src/app/modules/main/app_search/location_menu_sub_model.nim | 2 +- src/app/modules/main/app_search/result_item.nim | 2 +- src/app/modules/main/app_search/result_model.nim | 2 +- src/app/modules/main/browser_section/bookmark/item.nim | 2 +- src/app/modules/main/browser_section/bookmark/model.nim | 2 +- src/app/modules/main/browser_section/dapps/accounts.nim | 2 +- src/app/modules/main/browser_section/dapps/dapps.nim | 2 +- src/app/modules/main/browser_section/dapps/item.nim | 2 +- src/app/modules/main/browser_section/dapps/permissions.nim | 2 +- src/app/modules/main/chat_section/item.nim | 2 +- src/app/modules/main/chat_section/model.nim | 2 +- src/app/modules/main/chat_section/module.nim | 2 +- .../modules/main/communities/models/curated_community_item.nim | 2 +- .../modules/main/communities/models/discord_category_item.nim | 2 +- .../modules/main/communities/models/discord_channel_item.nim | 2 +- src/app/modules/main/communities/models/discord_file_item.nim | 2 +- .../main/communities/models/discord_import_error_item.nim | 2 +- .../main/communities/models/discord_import_progress_item.nim | 2 +- .../main/communities/models/discord_import_task_item.nim | 2 +- .../modules/main/communities/models/pending_request_item.nim | 2 +- src/app/modules/main/communities/tokens/models/token_item.nim | 2 +- src/app/modules/main/communities/tokens/models/token_model.nim | 2 +- .../main/communities/tokens/models/token_owners_item.nim | 2 +- .../main/communities/tokens/models/token_owners_model.nim | 2 +- src/app/modules/main/module.nim | 2 +- .../modules/main/network_connection/network_connection_item.nim | 2 +- src/app/modules/main/profile_section/ens_usernames/module.nim | 2 +- .../profile/models/profile_preferences_collectible_item.nim | 2 +- src/app/modules/main/profile_section/wallet/accounts/model.nim | 2 +- .../main/profile_section/wallet/networks/combined_item.nim | 2 +- .../main/profile_section/wallet/networks/combined_model.nim | 2 +- src/app/modules/main/profile_section/wallet/networks/item.nim | 2 +- src/app/modules/main/profile_section/wallet/networks/model.nim | 2 +- src/app/modules/main/stickers/item.nim | 2 +- src/app/modules/main/stickers/module.nim | 2 +- src/app/modules/main/wallet_section/accounts/model.nim | 2 +- .../modules/main/wallet_section/activity/collectibles_item.nim | 2 +- .../modules/main/wallet_section/activity/collectibles_model.nim | 2 +- src/app/modules/main/wallet_section/activity/entry.nim | 2 +- src/app/modules/main/wallet_section/activity/model.nim | 2 +- .../main/wallet_section/activity/multi_transaction_item.nim | 2 +- src/app/modules/main/wallet_section/buy_sell_crypto/item.nim | 2 +- src/app/modules/main/wallet_section/filter.nim | 2 +- src/app/modules/main/wallet_section/networks/item.nim | 2 +- src/app/modules/main/wallet_section/networks/model.nim | 2 +- src/app/modules/main/wallet_section/overview/item.nim | 2 +- src/app/modules/main/wallet_section/saved_addresses/item.nim | 2 +- src/app/modules/main/wallet_section/saved_addresses/model.nim | 2 +- src/app/modules/main/wallet_section/send/accounts_model.nim | 2 +- src/app/modules/main/wallet_section/send/network_item.nim | 2 +- src/app/modules/main/wallet_section/send/network_model.nim | 2 +- .../modules/main/wallet_section/send/suggested_route_model.nim | 2 +- src/app/modules/main/wallet_section/send/transaction_routes.nim | 2 +- src/app/modules/shared_models/collectible_ownership_model.nim | 2 +- src/app/modules/shared_models/collectible_trait_model.nim | 2 +- src/app/modules/shared_models/collectibles_entry.nim | 2 +- src/app/modules/shared_models/collectibles_model.nim | 2 +- src/app/modules/shared_models/collectibles_nested_item.nim | 2 +- src/app/modules/shared_models/collectibles_nested_model.nim | 2 +- src/app/modules/shared_models/color_hash_item.nim | 2 +- src/app/modules/shared_models/currency_amount.nim | 2 +- src/app/modules/shared_models/derived_address_item.nim | 2 +- src/app/modules/shared_models/derived_address_model.nim | 2 +- src/app/modules/shared_models/discord_message_item.nim | 2 +- src/app/modules/shared_models/keypair_account_item.nim | 2 +- src/app/modules/shared_models/keypair_account_model.nim | 2 +- src/app/modules/shared_models/keypair_item.nim | 2 +- src/app/modules/shared_models/keypair_model.nim | 2 +- src/app/modules/shared_models/link_preview_item.nim | 2 +- src/app/modules/shared_models/link_preview_model.nim | 2 +- src/app/modules/shared_models/member_item.nim | 2 +- src/app/modules/shared_models/member_model.nim | 2 +- src/app/modules/shared_models/message_item.nim | 2 +- src/app/modules/shared_models/message_model.nim | 2 +- src/app/modules/shared_models/message_reaction_item.nim | 2 +- src/app/modules/shared_models/message_reaction_model.nim | 2 +- .../shared_models/message_transaction_parameters_item.nim | 2 +- src/app/modules/shared_models/section_item.nim | 2 +- src/app/modules/shared_models/section_model.nim | 2 +- src/app/modules/shared_models/token_criteria_item.nim | 2 +- src/app/modules/shared_models/token_list_item.nim | 2 +- .../modules/shared_models/token_permission_chat_list_item.nim | 2 +- src/app/modules/shared_models/token_permission_item.nim | 2 +- src/app/modules/shared_models/user_item.nim | 2 +- src/app/modules/shared_models/user_model.nim | 2 +- src/app/modules/shared_models/wallet_account_item.nim | 2 +- .../shared_modules/keycard_popup/models/keycard_item.nim | 2 +- .../shared_modules/keycard_popup/models/keycard_model.nim | 2 +- src/app/modules/startup/models/fetching_data_item.nim | 2 +- src/app/modules/startup/models/fetching_data_model.nim | 2 +- src/app_service/common/conversion.nim | 2 +- src/app_service/service/accounts/service.nim | 2 +- src/app_service/service/activity_center/dto/notification.nim | 2 +- src/app_service/service/activity_center/dto/token_data.nim | 2 +- src/app_service/service/chat/dto/chat.nim | 2 +- src/app_service/service/chat/service.nim | 2 +- src/app_service/service/community/service.nim | 2 +- src/app_service/service/community_tokens/service.nim | 2 +- src/app_service/service/contacts/dto/contacts.nim | 2 +- src/app_service/service/contacts/service.nim | 2 +- src/app_service/service/ens/dto/ens_username_dto.nim | 2 +- src/app_service/service/ens/utils.nim | 2 +- src/app_service/service/eth/utils.nim | 2 +- src/app_service/service/gif/dto.nim | 2 +- src/app_service/service/gif/service.nim | 2 +- src/app_service/service/language/service.nim | 2 +- src/app_service/service/message/dto/link_preview.nim | 2 +- src/app_service/service/message/dto/link_preview_thumbnail.nim | 2 +- src/app_service/service/message/dto/standard_link_preview.nim | 2 +- .../message/dto/status_community_channel_link_preview.nim | 2 +- .../service/message/dto/status_community_link_preview.nim | 2 +- .../service/message/dto/status_contact_link_preview.nim | 2 +- src/app_service/service/message/dto/urls_unfurling_plan.nim | 2 +- src/app_service/service/message/message_cursor.nim | 2 +- src/app_service/service/message/service.nim | 2 +- src/app_service/service/network/dto.nim | 2 +- .../service/profile/dto/profile_showcase_preferences.nim | 2 +- src/app_service/service/stickers/dto/stickers.nim | 2 +- src/app_service/service/token/async_tasks.nim | 2 +- src/app_service/service/token/dto.nim | 2 +- src/app_service/service/token/service_items.nim | 2 +- src/app_service/service/transaction/cryptoRampDto.nim | 2 +- src/app_service/service/transaction/dto.nim | 2 +- src/app_service/service/transaction/service.nim | 2 +- src/app_service/service/wallet_account/dto/account_dto.nim | 2 +- .../service/wallet_account/dto/account_token_item.nim | 2 +- src/app_service/service/wallet_account/dto/keypair_dto.nim | 2 +- src/app_service/service/wallet_account/service.nim | 2 +- src/backend/activity.nim | 2 +- src/backend/backend.nim | 2 +- src/backend/collectibles.nim | 2 +- src/backend/collectibles_types.nim | 2 +- src/backend/connection_status.nim | 2 +- src/backend/core.nim | 2 +- src/backend/response_type.nim | 2 +- src/backend/transactions.nim | 2 +- src/env_cli_vars.nim | 2 +- src/nim_status_client.nim | 2 +- vendor/nim-result | 2 +- vendor/nim-stew | 2 +- 146 files changed, 146 insertions(+), 146 deletions(-) diff --git a/src/app/core/tasks/marathon.nim b/src/app/core/tasks/marathon.nim index c5c191b432..3f1fc5249b 100644 --- a/src/app/core/tasks/marathon.nim +++ b/src/app/core/tasks/marathon.nim @@ -1,5 +1,5 @@ import # std libs - strformat, tables + stew/shims/strformat, tables import # vendor libs chronicles diff --git a/src/app/global/utils.nim b/src/app/global/utils.nim index eac34d4153..13db10b9b5 100644 --- a/src/app/global/utils.nim +++ b/src/app/global/utils.nim @@ -1,4 +1,4 @@ -import NimQml, strutils, uri, strformat, strutils, stint, re +import NimQml, strutils, uri, stew/shims/strformat, strutils, stint, re import stew/byteutils import ./utils/qrcodegen import ./utils/time_utils diff --git a/src/app/modules/main/activity_center/item.nim b/src/app/modules/main/activity_center/item.nim index f8bb9a66da..cd5b476305 100644 --- a/src/app/modules/main/activity_center/item.nim +++ b/src/app/modules/main/activity_center/item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat import ../../shared_models/message_item_qobject import ../../../../app_service/service/activity_center/dto/notification import ../../../../app_service/service/chat/dto/chat diff --git a/src/app/modules/main/activity_center/token_data_item.nim b/src/app/modules/main/activity_center/token_data_item.nim index c6d9aa3e5c..dc9f56504f 100644 --- a/src/app/modules/main/activity_center/token_data_item.nim +++ b/src/app/modules/main/activity_center/token_data_item.nim @@ -1,4 +1,4 @@ -import NimQml, strutils, strformat +import NimQml, strutils, stew/shims/strformat QtObject: type TokenDataItem* = ref object of QObject diff --git a/src/app/modules/main/app_search/location_menu_item.nim b/src/app/modules/main/app_search/location_menu_item.nim index fc1dc6c264..67338fd6ab 100644 --- a/src/app/modules/main/app_search/location_menu_item.nim +++ b/src/app/modules/main/app_search/location_menu_item.nim @@ -1,5 +1,5 @@ -import json, strformat +import json, stew/shims/strformat import base_item, location_menu_sub_model, location_menu_sub_item type diff --git a/src/app/modules/main/app_search/location_menu_sub_item.nim b/src/app/modules/main/app_search/location_menu_sub_item.nim index 5f37ae5b8b..dfa7f6bf1a 100644 --- a/src/app/modules/main/app_search/location_menu_sub_item.nim +++ b/src/app/modules/main/app_search/location_menu_sub_item.nim @@ -1,4 +1,4 @@ -import json, strformat, sequtils, sugar +import json, stew/shims/strformat, sequtils, sugar import base_item import ../../shared_models/[color_hash_item, color_hash_model] diff --git a/src/app/modules/main/app_search/location_menu_sub_model.nim b/src/app/modules/main/app_search/location_menu_sub_model.nim index 788237dc77..534cde26b8 100644 --- a/src/app/modules/main/app_search/location_menu_sub_model.nim +++ b/src/app/modules/main/app_search/location_menu_sub_model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, strformat +import NimQml, Tables, strutils, stew/shims/strformat import location_menu_sub_item diff --git a/src/app/modules/main/app_search/result_item.nim b/src/app/modules/main/app_search/result_item.nim index 990b84f7db..aa87a5bbd6 100644 --- a/src/app/modules/main/app_search/result_item.nim +++ b/src/app/modules/main/app_search/result_item.nim @@ -1,4 +1,4 @@ -import strformat, sequtils, sugar +import stew/shims/strformat, sequtils, sugar import ../../shared_models/[color_hash_item, color_hash_model] diff --git a/src/app/modules/main/app_search/result_model.nim b/src/app/modules/main/app_search/result_model.nim index 980f8e3ef0..0b860fb0e6 100644 --- a/src/app/modules/main/app_search/result_model.nim +++ b/src/app/modules/main/app_search/result_model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, strformat +import NimQml, Tables, strutils, stew/shims/strformat import result_item diff --git a/src/app/modules/main/browser_section/bookmark/item.nim b/src/app/modules/main/browser_section/bookmark/item.nim index e946fe6b28..944d939dab 100644 --- a/src/app/modules/main/browser_section/bookmark/item.nim +++ b/src/app/modules/main/browser_section/bookmark/item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat type Item* = object diff --git a/src/app/modules/main/browser_section/bookmark/model.nim b/src/app/modules/main/browser_section/bookmark/model.nim index 22c6eca7f7..c5d8a9b9f2 100644 --- a/src/app/modules/main/browser_section/bookmark/model.nim +++ b/src/app/modules/main/browser_section/bookmark/model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, strformat +import NimQml, Tables, strutils, stew/shims/strformat import item diff --git a/src/app/modules/main/browser_section/dapps/accounts.nim b/src/app/modules/main/browser_section/dapps/accounts.nim index 8502772d7d..d8682f8035 100644 --- a/src/app/modules/main/browser_section/dapps/accounts.nim +++ b/src/app/modules/main/browser_section/dapps/accounts.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, strformat +import NimQml, Tables, strutils, stew/shims/strformat import ../../../../../app_service/service/wallet_account/service as wallet_account_service type diff --git a/src/app/modules/main/browser_section/dapps/dapps.nim b/src/app/modules/main/browser_section/dapps/dapps.nim index 0bb888db43..ae6720cef2 100644 --- a/src/app/modules/main/browser_section/dapps/dapps.nim +++ b/src/app/modules/main/browser_section/dapps/dapps.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, strformat, json +import NimQml, Tables, strutils, stew/shims/strformat, json import ./item type diff --git a/src/app/modules/main/browser_section/dapps/item.nim b/src/app/modules/main/browser_section/dapps/item.nim index 1831a464d8..8bcd13cc10 100644 --- a/src/app/modules/main/browser_section/dapps/item.nim +++ b/src/app/modules/main/browser_section/dapps/item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat import ./permissions import ./accounts import ../../../../../app_service/service/wallet_account/service as wallet_account_service diff --git a/src/app/modules/main/browser_section/dapps/permissions.nim b/src/app/modules/main/browser_section/dapps/permissions.nim index f5338992b6..6749304805 100644 --- a/src/app/modules/main/browser_section/dapps/permissions.nim +++ b/src/app/modules/main/browser_section/dapps/permissions.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, strformat +import NimQml, Tables, strutils, stew/shims/strformat type ModelRole {.pure.} = enum diff --git a/src/app/modules/main/chat_section/item.nim b/src/app/modules/main/chat_section/item.nim index 97ce2e0f72..30cc1fc05f 100644 --- a/src/app/modules/main/chat_section/item.nim +++ b/src/app/modules/main/chat_section/item.nim @@ -1,4 +1,4 @@ -import sequtils, sugar, strformat, json +import sequtils, sugar, stew/shims/strformat, json import ../../../../app_service/common/types import ../../../../app_service/service/contacts/dto/contacts diff --git a/src/app/modules/main/chat_section/model.nim b/src/app/modules/main/chat_section/model.nim index 5846672230..9531085b66 100644 --- a/src/app/modules/main/chat_section/model.nim +++ b/src/app/modules/main/chat_section/model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, strformat, json, sequtils, system +import NimQml, Tables, strutils, stew/shims/strformat, json, sequtils, system import ../../../../app_service/common/types import ../../../../app_service/service/chat/dto/chat from ../../../../app_service/service/contacts/dto/contacts import TrustStatus diff --git a/src/app/modules/main/chat_section/module.nim b/src/app/modules/main/chat_section/module.nim index c3734490bc..1878692bd2 100644 --- a/src/app/modules/main/chat_section/module.nim +++ b/src/app/modules/main/chat_section/module.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, chronicles, json, sequtils, strformat, sugar, marshal +import NimQml, Tables, chronicles, json, sequtils, stew/shims/strformat, sugar, marshal import io_interface import ../io_interface as delegate_interface diff --git a/src/app/modules/main/communities/models/curated_community_item.nim b/src/app/modules/main/communities/models/curated_community_item.nim index 840b3aa96e..4dbc6aab78 100644 --- a/src/app/modules/main/communities/models/curated_community_item.nim +++ b/src/app/modules/main/communities/models/curated_community_item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat import ../../../shared_models/[token_permissions_model, token_permission_item] type diff --git a/src/app/modules/main/communities/models/discord_category_item.nim b/src/app/modules/main/communities/models/discord_category_item.nim index 5b3cc631b9..4a49be2478 100644 --- a/src/app/modules/main/communities/models/discord_category_item.nim +++ b/src/app/modules/main/communities/models/discord_category_item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat type DiscordCategoryItem* = object diff --git a/src/app/modules/main/communities/models/discord_channel_item.nim b/src/app/modules/main/communities/models/discord_channel_item.nim index 933452a4d5..63bed8d2a5 100644 --- a/src/app/modules/main/communities/models/discord_channel_item.nim +++ b/src/app/modules/main/communities/models/discord_channel_item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat type DiscordChannelItem* = object diff --git a/src/app/modules/main/communities/models/discord_file_item.nim b/src/app/modules/main/communities/models/discord_file_item.nim index 638a3eec40..ca22eab1d1 100644 --- a/src/app/modules/main/communities/models/discord_file_item.nim +++ b/src/app/modules/main/communities/models/discord_file_item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat type DiscordFileItem* = object filePath*: string diff --git a/src/app/modules/main/communities/models/discord_import_error_item.nim b/src/app/modules/main/communities/models/discord_import_error_item.nim index 6143bc43da..90e5e5e840 100644 --- a/src/app/modules/main/communities/models/discord_import_error_item.nim +++ b/src/app/modules/main/communities/models/discord_import_error_item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat type DiscordImportErrorItem* = object taskId*: string diff --git a/src/app/modules/main/communities/models/discord_import_progress_item.nim b/src/app/modules/main/communities/models/discord_import_progress_item.nim index ce78726b9c..60f22c36b6 100644 --- a/src/app/modules/main/communities/models/discord_import_progress_item.nim +++ b/src/app/modules/main/communities/models/discord_import_progress_item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat type DiscordImportProgressItem* = object communityId*: string diff --git a/src/app/modules/main/communities/models/discord_import_task_item.nim b/src/app/modules/main/communities/models/discord_import_task_item.nim index e42c4a1069..6115635779 100644 --- a/src/app/modules/main/communities/models/discord_import_task_item.nim +++ b/src/app/modules/main/communities/models/discord_import_task_item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat import discord_import_errors_model, discord_import_error_item import ../../../../../app_service/service/community/dto/community diff --git a/src/app/modules/main/communities/models/pending_request_item.nim b/src/app/modules/main/communities/models/pending_request_item.nim index a27ac5ae13..c6d7c63bbe 100644 --- a/src/app/modules/main/communities/models/pending_request_item.nim +++ b/src/app/modules/main/communities/models/pending_request_item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat type PendingRequestItem* = ref object diff --git a/src/app/modules/main/communities/tokens/models/token_item.nim b/src/app/modules/main/communities/tokens/models/token_item.nim index 8952cc6b2a..ef34da34e3 100644 --- a/src/app/modules/main/communities/tokens/models/token_item.nim +++ b/src/app/modules/main/communities/tokens/models/token_item.nim @@ -1,4 +1,4 @@ -import strformat, sequtils, stint +import stew/shims/strformat, sequtils, stint import ../../../../../../app_service/service/community_tokens/dto/community_token import ../../../../../../app_service/service/community_tokens/community_collectible_owner import ../../../../../../app_service/service/network/dto diff --git a/src/app/modules/main/communities/tokens/models/token_model.nim b/src/app/modules/main/communities/tokens/models/token_model.nim index 71ff123135..06365c26eb 100644 --- a/src/app/modules/main/communities/tokens/models/token_model.nim +++ b/src/app/modules/main/communities/tokens/models/token_model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strformat, sequtils, stint +import NimQml, Tables, stew/shims/strformat, sequtils, stint import token_item import token_owners_item import token_owners_model diff --git a/src/app/modules/main/communities/tokens/models/token_owners_item.nim b/src/app/modules/main/communities/tokens/models/token_owners_item.nim index d15a68d3dd..c928c88b22 100644 --- a/src/app/modules/main/communities/tokens/models/token_owners_item.nim +++ b/src/app/modules/main/communities/tokens/models/token_owners_item.nim @@ -1,4 +1,4 @@ -import strformat, stint +import stew/shims/strformat, stint import backend/collectibles_types import ../../../../../../app_service/common/types diff --git a/src/app/modules/main/communities/tokens/models/token_owners_model.nim b/src/app/modules/main/communities/tokens/models/token_owners_model.nim index 42c7d0a7d7..53cfc850ff 100644 --- a/src/app/modules/main/communities/tokens/models/token_owners_model.nim +++ b/src/app/modules/main/communities/tokens/models/token_owners_model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strformat, stint +import NimQml, Tables, stew/shims/strformat, stint import token_owners_item type diff --git a/src/app/modules/main/module.nim b/src/app/modules/main/module.nim index f431a52956..aa097e3b8b 100644 --- a/src/app/modules/main/module.nim +++ b/src/app/modules/main/module.nim @@ -1,4 +1,4 @@ -import NimQml, tables, json, sugar, sequtils, strformat, marshal, times, chronicles, stint +import NimQml, tables, json, sugar, sequtils, stew/shims/strformat, marshal, times, chronicles, stint import io_interface, view, controller, chat_search_item, chat_search_model import ephemeral_notification_item, ephemeral_notification_model diff --git a/src/app/modules/main/network_connection/network_connection_item.nim b/src/app/modules/main/network_connection/network_connection_item.nim index 860f117665..d73b1599b6 100644 --- a/src/app/modules/main/network_connection/network_connection_item.nim +++ b/src/app/modules/main/network_connection/network_connection_item.nim @@ -1,4 +1,4 @@ -import NimQml, strformat +import NimQml, stew/shims/strformat QtObject: type NetworkConnectionItem* = ref object of QObject diff --git a/src/app/modules/main/profile_section/ens_usernames/module.nim b/src/app/modules/main/profile_section/ens_usernames/module.nim index 81e47b0ac9..d93ee46fbf 100644 --- a/src/app/modules/main/profile_section/ens_usernames/module.nim +++ b/src/app/modules/main/profile_section/ens_usernames/module.nim @@ -1,4 +1,4 @@ -import NimQml, json, stint, sequtils, strutils, sugar, strformat, parseutils, chronicles +import NimQml, json, stint, sequtils, strutils, sugar, stew/shims/strformat, parseutils, chronicles import io_interface import ../io_interface as delegate_interface diff --git a/src/app/modules/main/profile_section/profile/models/profile_preferences_collectible_item.nim b/src/app/modules/main/profile_section/profile/models/profile_preferences_collectible_item.nim index 73d9104288..806c189466 100644 --- a/src/app/modules/main/profile_section/profile/models/profile_preferences_collectible_item.nim +++ b/src/app/modules/main/profile_section/profile/models/profile_preferences_collectible_item.nim @@ -1,4 +1,4 @@ -import json, strutils, strformat, stint, json_serialization, tables +import json, strutils, stew/shims/strformat, stint, json_serialization, tables import profile_preferences_base_item diff --git a/src/app/modules/main/profile_section/wallet/accounts/model.nim b/src/app/modules/main/profile_section/wallet/accounts/model.nim index e77b277824..71dd31d8c7 100644 --- a/src/app/modules/main/profile_section/wallet/accounts/model.nim +++ b/src/app/modules/main/profile_section/wallet/accounts/model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, sequtils, strformat +import NimQml, Tables, strutils, sequtils, stew/shims/strformat import ../../../../shared_models/wallet_account_item diff --git a/src/app/modules/main/profile_section/wallet/networks/combined_item.nim b/src/app/modules/main/profile_section/wallet/networks/combined_item.nim index 58a9d6e92e..f9d21f7d17 100644 --- a/src/app/modules/main/profile_section/wallet/networks/combined_item.nim +++ b/src/app/modules/main/profile_section/wallet/networks/combined_item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat import ./item diff --git a/src/app/modules/main/profile_section/wallet/networks/combined_model.nim b/src/app/modules/main/profile_section/wallet/networks/combined_model.nim index 6ee46b5b03..2fa07541f7 100644 --- a/src/app/modules/main/profile_section/wallet/networks/combined_model.nim +++ b/src/app/modules/main/profile_section/wallet/networks/combined_model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, strformat +import NimQml, Tables, strutils, stew/shims/strformat import ./combined_item diff --git a/src/app/modules/main/profile_section/wallet/networks/item.nim b/src/app/modules/main/profile_section/wallet/networks/item.nim index 46eb3be855..124b3d8d5c 100644 --- a/src/app/modules/main/profile_section/wallet/networks/item.nim +++ b/src/app/modules/main/profile_section/wallet/networks/item.nim @@ -1,4 +1,4 @@ -import NimQml, strformat +import NimQml, stew/shims/strformat QtObject: type Item* = ref object of QObject diff --git a/src/app/modules/main/profile_section/wallet/networks/model.nim b/src/app/modules/main/profile_section/wallet/networks/model.nim index 749b2ddad5..1ee6ca59fe 100644 --- a/src/app/modules/main/profile_section/wallet/networks/model.nim +++ b/src/app/modules/main/profile_section/wallet/networks/model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, strformat +import NimQml, Tables, strutils, stew/shims/strformat import ./item diff --git a/src/app/modules/main/stickers/item.nim b/src/app/modules/main/stickers/item.nim index 9a19e4f2c3..924509cdc2 100644 --- a/src/app/modules/main/stickers/item.nim +++ b/src/app/modules/main/stickers/item.nim @@ -1,4 +1,4 @@ -import strformat, stint +import stew/shims/strformat, stint ##### # Sticker Item diff --git a/src/app/modules/main/stickers/module.nim b/src/app/modules/main/stickers/module.nim index 07d24d9aab..ccb783dc6c 100644 --- a/src/app/modules/main/stickers/module.nim +++ b/src/app/modules/main/stickers/module.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, stint, sugar, sequtils, json, strutils, strformat, parseutils, chronicles +import NimQml, Tables, stint, sugar, sequtils, json, strutils, stew/shims/strformat, parseutils, chronicles import ./io_interface, ./view, ./controller, ./item, ./models/sticker_pack_list import ../io_interface as delegate_interface import app/global/global_singleton diff --git a/src/app/modules/main/wallet_section/accounts/model.nim b/src/app/modules/main/wallet_section/accounts/model.nim index 3c05ed5fee..ca53751e04 100644 --- a/src/app/modules/main/wallet_section/accounts/model.nim +++ b/src/app/modules/main/wallet_section/accounts/model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, strformat +import NimQml, Tables, strutils, stew/shims/strformat import ./item import ../../../shared_models/currency_amount diff --git a/src/app/modules/main/wallet_section/activity/collectibles_item.nim b/src/app/modules/main/wallet_section/activity/collectibles_item.nim index 044c3ff504..ca79fcbc37 100644 --- a/src/app/modules/main/wallet_section/activity/collectibles_item.nim +++ b/src/app/modules/main/wallet_section/activity/collectibles_item.nim @@ -1,4 +1,4 @@ -import strformat, stint +import stew/shims/strformat, stint import backend/activity as backend type diff --git a/src/app/modules/main/wallet_section/activity/collectibles_model.nim b/src/app/modules/main/wallet_section/activity/collectibles_model.nim index fe1bc716a6..bd87738399 100644 --- a/src/app/modules/main/wallet_section/activity/collectibles_model.nim +++ b/src/app/modules/main/wallet_section/activity/collectibles_model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, strformat, sequtils, stint +import NimQml, Tables, strutils, stew/shims/strformat, sequtils, stint import logging import ./collectibles_item diff --git a/src/app/modules/main/wallet_section/activity/entry.nim b/src/app/modules/main/wallet_section/activity/entry.nim index 94954d5498..63686f3cf8 100644 --- a/src/app/modules/main/wallet_section/activity/entry.nim +++ b/src/app/modules/main/wallet_section/activity/entry.nim @@ -1,4 +1,4 @@ -import NimQml, json, strformat, sequtils, strutils, logging, stint +import NimQml, json, stew/shims/strformat, sequtils, strutils, logging, stint import backend/activity as backend import app/modules/shared_models/currency_amount diff --git a/src/app/modules/main/wallet_section/activity/model.nim b/src/app/modules/main/wallet_section/activity/model.nim index b3977ae8a3..5211f68b8a 100644 --- a/src/app/modules/main/wallet_section/activity/model.nim +++ b/src/app/modules/main/wallet_section/activity/model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, strformat, sequtils, logging, options +import NimQml, Tables, strutils, stew/shims/strformat, sequtils, logging, options import ./entry diff --git a/src/app/modules/main/wallet_section/activity/multi_transaction_item.nim b/src/app/modules/main/wallet_section/activity/multi_transaction_item.nim index 95175577d1..f6aa11ff28 100644 --- a/src/app/modules/main/wallet_section/activity/multi_transaction_item.nim +++ b/src/app/modules/main/wallet_section/activity/multi_transaction_item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat import ./backend/transactions diff --git a/src/app/modules/main/wallet_section/buy_sell_crypto/item.nim b/src/app/modules/main/wallet_section/buy_sell_crypto/item.nim index 1759349e19..22c40f4179 100644 --- a/src/app/modules/main/wallet_section/buy_sell_crypto/item.nim +++ b/src/app/modules/main/wallet_section/buy_sell_crypto/item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat type Item* = object name: string diff --git a/src/app/modules/main/wallet_section/filter.nim b/src/app/modules/main/wallet_section/filter.nim index 74cfdff1c4..2499278069 100644 --- a/src/app/modules/main/wallet_section/filter.nim +++ b/src/app/modules/main/wallet_section/filter.nim @@ -1,4 +1,4 @@ -import strformat, sequtils, sugar +import stew/shims/strformat, sequtils, sugar import ./controller diff --git a/src/app/modules/main/wallet_section/networks/item.nim b/src/app/modules/main/wallet_section/networks/item.nim index 242dce6b0f..d297572947 100644 --- a/src/app/modules/main/wallet_section/networks/item.nim +++ b/src/app/modules/main/wallet_section/networks/item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat type UxEnabledState* {.pure.} = enum diff --git a/src/app/modules/main/wallet_section/networks/model.nim b/src/app/modules/main/wallet_section/networks/model.nim index c3ad326b0e..eb6d4cafde 100644 --- a/src/app/modules/main/wallet_section/networks/model.nim +++ b/src/app/modules/main/wallet_section/networks/model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, strformat, sequtils, sugar +import NimQml, Tables, strutils, stew/shims/strformat, sequtils, sugar import app_service/service/network/types import ./item diff --git a/src/app/modules/main/wallet_section/overview/item.nim b/src/app/modules/main/wallet_section/overview/item.nim index 63ea8f712b..f788edfc31 100644 --- a/src/app/modules/main/wallet_section/overview/item.nim +++ b/src/app/modules/main/wallet_section/overview/item.nim @@ -1,4 +1,4 @@ -import strformat, strutils +import stew/shims/strformat, strutils type Item* = object diff --git a/src/app/modules/main/wallet_section/saved_addresses/item.nim b/src/app/modules/main/wallet_section/saved_addresses/item.nim index 266ec7b09b..34b8d17b9c 100644 --- a/src/app/modules/main/wallet_section/saved_addresses/item.nim +++ b/src/app/modules/main/wallet_section/saved_addresses/item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat import app_service/common/account_constants diff --git a/src/app/modules/main/wallet_section/saved_addresses/model.nim b/src/app/modules/main/wallet_section/saved_addresses/model.nim index 89318d076d..b55eb32fb1 100644 --- a/src/app/modules/main/wallet_section/saved_addresses/model.nim +++ b/src/app/modules/main/wallet_section/saved_addresses/model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, strformat +import NimQml, Tables, strutils, stew/shims/strformat import item import app_service/common/account_constants diff --git a/src/app/modules/main/wallet_section/send/accounts_model.nim b/src/app/modules/main/wallet_section/send/accounts_model.nim index e898600d7b..6206f44a7f 100644 --- a/src/app/modules/main/wallet_section/send/accounts_model.nim +++ b/src/app/modules/main/wallet_section/send/accounts_model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, strformat +import NimQml, Tables, strutils, stew/shims/strformat import ./account_item import ../../../shared_models/currency_amount diff --git a/src/app/modules/main/wallet_section/send/network_item.nim b/src/app/modules/main/wallet_section/send/network_item.nim index 03e2fdb7f9..10cf70f10e 100644 --- a/src/app/modules/main/wallet_section/send/network_item.nim +++ b/src/app/modules/main/wallet_section/send/network_item.nim @@ -1,4 +1,4 @@ -import strformat, strutils +import stew/shims/strformat, strutils import app/modules/shared_models/currency_amount diff --git a/src/app/modules/main/wallet_section/send/network_model.nim b/src/app/modules/main/wallet_section/send/network_model.nim index 87d4946890..74b41cafee 100644 --- a/src/app/modules/main/wallet_section/send/network_model.nim +++ b/src/app/modules/main/wallet_section/send/network_model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, strformat, sequtils, sugar, json, stint +import NimQml, Tables, strutils, stew/shims/strformat, sequtils, sugar, json, stint import app_service/service/network/types import app/modules/shared_models/currency_amount diff --git a/src/app/modules/main/wallet_section/send/suggested_route_model.nim b/src/app/modules/main/wallet_section/send/suggested_route_model.nim index b1c583cd29..4637b1795f 100644 --- a/src/app/modules/main/wallet_section/send/suggested_route_model.nim +++ b/src/app/modules/main/wallet_section/send/suggested_route_model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, strformat +import NimQml, Tables, strutils, stew/shims/strformat import ./suggested_route_item diff --git a/src/app/modules/main/wallet_section/send/transaction_routes.nim b/src/app/modules/main/wallet_section/send/transaction_routes.nim index 83cfb1da2c..e3a2516b23 100644 --- a/src/app/modules/main/wallet_section/send/transaction_routes.nim +++ b/src/app/modules/main/wallet_section/send/transaction_routes.nim @@ -1,4 +1,4 @@ -import NimQml, strformat, stint +import NimQml, stew/shims/strformat, stint import ./gas_estimate_item, ./suggested_route_model, ./network_model diff --git a/src/app/modules/shared_models/collectible_ownership_model.nim b/src/app/modules/shared_models/collectible_ownership_model.nim index d1e4e5614d..cec64c6b1b 100644 --- a/src/app/modules/shared_models/collectible_ownership_model.nim +++ b/src/app/modules/shared_models/collectible_ownership_model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, strformat +import NimQml, Tables, strutils, stew/shims/strformat import stint import backend/collectibles_types as backend diff --git a/src/app/modules/shared_models/collectible_trait_model.nim b/src/app/modules/shared_models/collectible_trait_model.nim index 6fe7cb5499..36bed82a9d 100644 --- a/src/app/modules/shared_models/collectible_trait_model.nim +++ b/src/app/modules/shared_models/collectible_trait_model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, strformat +import NimQml, Tables, strutils, stew/shims/strformat import backend/collectibles as backend diff --git a/src/app/modules/shared_models/collectibles_entry.nim b/src/app/modules/shared_models/collectibles_entry.nim index edf02cf455..d818d36a89 100644 --- a/src/app/modules/shared_models/collectibles_entry.nim +++ b/src/app/modules/shared_models/collectibles_entry.nim @@ -1,4 +1,4 @@ -import NimQml, json, strformat, sequtils, strutils, stint, strutils +import NimQml, json, stew/shims/strformat, sequtils, strutils, stint, strutils import options import backend/collectibles as backend diff --git a/src/app/modules/shared_models/collectibles_model.nim b/src/app/modules/shared_models/collectibles_model.nim index 5a31eb3ce9..7c0e349a89 100644 --- a/src/app/modules/shared_models/collectibles_model.nim +++ b/src/app/modules/shared_models/collectibles_model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, strformat, sequtils, stint, json +import NimQml, Tables, strutils, stew/shims/strformat, sequtils, stint, json import logging import ./collectibles_entry diff --git a/src/app/modules/shared_models/collectibles_nested_item.nim b/src/app/modules/shared_models/collectibles_nested_item.nim index 5049c0249d..03898916fe 100644 --- a/src/app/modules/shared_models/collectibles_nested_item.nim +++ b/src/app/modules/shared_models/collectibles_nested_item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat import app_service/common/types type diff --git a/src/app/modules/shared_models/collectibles_nested_model.nim b/src/app/modules/shared_models/collectibles_nested_model.nim index da90c86be4..5aab306239 100644 --- a/src/app/modules/shared_models/collectibles_nested_model.nim +++ b/src/app/modules/shared_models/collectibles_nested_model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, strformat, sequtils +import NimQml, Tables, strutils, stew/shims/strformat, sequtils import ./collectibles_model as flat_model import ./collectibles_entry as flat_item diff --git a/src/app/modules/shared_models/color_hash_item.nim b/src/app/modules/shared_models/color_hash_item.nim index b4fb07c95f..92d7df8e0a 100644 --- a/src/app/modules/shared_models/color_hash_item.nim +++ b/src/app/modules/shared_models/color_hash_item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat type Item* = ref object diff --git a/src/app/modules/shared_models/currency_amount.nim b/src/app/modules/shared_models/currency_amount.nim index 74bd2def7f..8501d3f3eb 100644 --- a/src/app/modules/shared_models/currency_amount.nim +++ b/src/app/modules/shared_models/currency_amount.nim @@ -1,4 +1,4 @@ -import NimQml, strformat, json +import NimQml, stew/shims/strformat, json include app_service/common/json_utils diff --git a/src/app/modules/shared_models/derived_address_item.nim b/src/app/modules/shared_models/derived_address_item.nim index afe7b61907..209d3a60da 100644 --- a/src/app/modules/shared_models/derived_address_item.nim +++ b/src/app/modules/shared_models/derived_address_item.nim @@ -1,4 +1,4 @@ -import NimQml, strformat +import NimQml, stew/shims/strformat QtObject: type DerivedAddressItem* = ref object of QObject diff --git a/src/app/modules/shared_models/derived_address_model.nim b/src/app/modules/shared_models/derived_address_model.nim index 754e551f54..01178fbc0d 100644 --- a/src/app/modules/shared_models/derived_address_model.nim +++ b/src/app/modules/shared_models/derived_address_model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, sequtils, sugar, strformat +import NimQml, Tables, strutils, sequtils, sugar, stew/shims/strformat import ./derived_address_item diff --git a/src/app/modules/shared_models/discord_message_item.nim b/src/app/modules/shared_models/discord_message_item.nim index d9524718ab..2cc326ef81 100644 --- a/src/app/modules/shared_models/discord_message_item.nim +++ b/src/app/modules/shared_models/discord_message_item.nim @@ -1,4 +1,4 @@ -import Nimqml, json, strformat +import Nimqml, json, stew/shims/strformat import ../../../app_service/service/message/dto/message diff --git a/src/app/modules/shared_models/keypair_account_item.nim b/src/app/modules/shared_models/keypair_account_item.nim index 6593c2cc61..75f708d6c2 100644 --- a/src/app/modules/shared_models/keypair_account_item.nim +++ b/src/app/modules/shared_models/keypair_account_item.nim @@ -1,4 +1,4 @@ -import NimQml, strformat +import NimQml, stew/shims/strformat import app_service/service/wallet_account/dto/account_dto as wa_dto import ./currency_amount diff --git a/src/app/modules/shared_models/keypair_account_model.nim b/src/app/modules/shared_models/keypair_account_model.nim index 016bc9e084..983f31bb75 100644 --- a/src/app/modules/shared_models/keypair_account_model.nim +++ b/src/app/modules/shared_models/keypair_account_model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strformat, strutils +import NimQml, Tables, stew/shims/strformat, strutils import keypair_account_item import ./currency_amount diff --git a/src/app/modules/shared_models/keypair_item.nim b/src/app/modules/shared_models/keypair_item.nim index 87ef9ed49e..111a558117 100644 --- a/src/app/modules/shared_models/keypair_item.nim +++ b/src/app/modules/shared_models/keypair_item.nim @@ -1,4 +1,4 @@ -import NimQml, strformat, sequtils, sugar +import NimQml, stew/shims/strformat, sequtils, sugar import keypair_account_model import ./currency_amount diff --git a/src/app/modules/shared_models/keypair_model.nim b/src/app/modules/shared_models/keypair_model.nim index d0793d6a7d..4cdc4a9fa3 100644 --- a/src/app/modules/shared_models/keypair_model.nim +++ b/src/app/modules/shared_models/keypair_model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strformat, sequtils, sugar +import NimQml, Tables, stew/shims/strformat, sequtils, sugar import keypair_item import ./currency_amount diff --git a/src/app/modules/shared_models/link_preview_item.nim b/src/app/modules/shared_models/link_preview_item.nim index 7e15064992..23979260e2 100644 --- a/src/app/modules/shared_models/link_preview_item.nim +++ b/src/app/modules/shared_models/link_preview_item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat import ../../../app_service/service/message/dto/link_preview type diff --git a/src/app/modules/shared_models/link_preview_model.nim b/src/app/modules/shared_models/link_preview_model.nim index ceccf92b0a..1e0bfa4d27 100644 --- a/src/app/modules/shared_models/link_preview_model.nim +++ b/src/app/modules/shared_models/link_preview_model.nim @@ -1,4 +1,4 @@ -import NimQml, strformat, tables, sequtils, sets +import NimQml, stew/shims/strformat, tables, sequtils, sets import ./link_preview_item import ../../../app_service/service/message/dto/link_preview import ../../../app_service/service/message/dto/standard_link_preview diff --git a/src/app/modules/shared_models/member_item.nim b/src/app/modules/shared_models/member_item.nim index f33754b0a2..96b3d35917 100644 --- a/src/app/modules/shared_models/member_item.nim +++ b/src/app/modules/shared_models/member_item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat import user_item import ../../../app_service/common/types diff --git a/src/app/modules/shared_models/member_model.nim b/src/app/modules/shared_models/member_model.nim index 72b92ffcd3..451e2d7695 100644 --- a/src/app/modules/shared_models/member_model.nim +++ b/src/app/modules/shared_models/member_model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strformat, sequtils, sugar +import NimQml, Tables, stew/shims/strformat, sequtils, sugar # TODO: use generics to remove duplication between user_model and member_model diff --git a/src/app/modules/shared_models/message_item.nim b/src/app/modules/shared_models/message_item.nim index e72020dd0d..6a4206803f 100644 --- a/src/app/modules/shared_models/message_item.nim +++ b/src/app/modules/shared_models/message_item.nim @@ -1,4 +1,4 @@ -import json, strformat, strutils +import json, stew/shims/strformat, strutils import ../../../app_service/common/types import ../../../app_service/service/contacts/dto/contact_details import ../../../app_service/service/message/dto/message diff --git a/src/app/modules/shared_models/message_model.nim b/src/app/modules/shared_models/message_model.nim index e605d6f5a3..2dfaf70f79 100644 --- a/src/app/modules/shared_models/message_model.nim +++ b/src/app/modules/shared_models/message_model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, json, sets, algorithm, sequtils, strutils, strformat, sugar +import NimQml, Tables, json, sets, algorithm, sequtils, strutils, stew/shims/strformat, sugar import message_item, message_reaction_item, message_transaction_parameters_item diff --git a/src/app/modules/shared_models/message_reaction_item.nim b/src/app/modules/shared_models/message_reaction_item.nim index 2833b61c11..88b42a4882 100644 --- a/src/app/modules/shared_models/message_reaction_item.nim +++ b/src/app/modules/shared_models/message_reaction_item.nim @@ -1,4 +1,4 @@ -import json, strformat +import json, stew/shims/strformat type EmojiId* {.pure.} = enum diff --git a/src/app/modules/shared_models/message_reaction_model.nim b/src/app/modules/shared_models/message_reaction_model.nim index 353ae4d8a6..b3ba3feb55 100644 --- a/src/app/modules/shared_models/message_reaction_model.nim +++ b/src/app/modules/shared_models/message_reaction_model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, json, strutils, strformat +import NimQml, Tables, json, strutils, stew/shims/strformat import message_reaction_item diff --git a/src/app/modules/shared_models/message_transaction_parameters_item.nim b/src/app/modules/shared_models/message_transaction_parameters_item.nim index b5a042ffe9..f24ef2f67a 100644 --- a/src/app/modules/shared_models/message_transaction_parameters_item.nim +++ b/src/app/modules/shared_models/message_transaction_parameters_item.nim @@ -1,4 +1,4 @@ -import Nimqml, json, strformat +import Nimqml, json, stew/shims/strformat QtObject: type diff --git a/src/app/modules/shared_models/section_item.nim b/src/app/modules/shared_models/section_item.nim index 0f6ae4c6f7..8a970e1cc3 100644 --- a/src/app/modules/shared_models/section_item.nim +++ b/src/app/modules/shared_models/section_item.nim @@ -1,4 +1,4 @@ -import strformat, stint +import stew/shims/strformat, stint import ./member_model, ./member_item import ../main/communities/models/[pending_request_item, pending_request_model] import ../main/communities/tokens/models/token_model as community_tokens_model diff --git a/src/app/modules/shared_models/section_model.nim b/src/app/modules/shared_models/section_model.nim index af092f7418..360260afb9 100644 --- a/src/app/modules/shared_models/section_model.nim +++ b/src/app/modules/shared_models/section_model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, strformat +import NimQml, Tables, strutils, stew/shims/strformat import json diff --git a/src/app/modules/shared_models/token_criteria_item.nim b/src/app/modules/shared_models/token_criteria_item.nim index 258b7bc9bc..daf4fc4cea 100644 --- a/src/app/modules/shared_models/token_criteria_item.nim +++ b/src/app/modules/shared_models/token_criteria_item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat type TokenCriteriaItem* = object diff --git a/src/app/modules/shared_models/token_list_item.nim b/src/app/modules/shared_models/token_list_item.nim index bde326204c..31ac111aa0 100644 --- a/src/app/modules/shared_models/token_list_item.nim +++ b/src/app/modules/shared_models/token_list_item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat type TokenListItemCategory* {.pure.}= enum Community = 0, diff --git a/src/app/modules/shared_models/token_permission_chat_list_item.nim b/src/app/modules/shared_models/token_permission_chat_list_item.nim index c794cc8da8..4fe7aedac2 100644 --- a/src/app/modules/shared_models/token_permission_chat_list_item.nim +++ b/src/app/modules/shared_models/token_permission_chat_list_item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat type TokenPermissionChatListItem* = object diff --git a/src/app/modules/shared_models/token_permission_item.nim b/src/app/modules/shared_models/token_permission_item.nim index 1a9c367f4c..e2fe1132a5 100644 --- a/src/app/modules/shared_models/token_permission_item.nim +++ b/src/app/modules/shared_models/token_permission_item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat import ../../../app_service/service/community/dto/community import ../../../app_service/service/chat/dto/chat import token_criteria_model diff --git a/src/app/modules/shared_models/user_item.nim b/src/app/modules/shared_models/user_item.nim index 33a5f50784..115a48320b 100644 --- a/src/app/modules/shared_models/user_item.nim +++ b/src/app/modules/shared_models/user_item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat import ../../../app_service/common/types import ../../../app_service/service/contacts/dto/contacts diff --git a/src/app/modules/shared_models/user_model.nim b/src/app/modules/shared_models/user_model.nim index eb8f8c47e0..3d16f61397 100644 --- a/src/app/modules/shared_models/user_model.nim +++ b/src/app/modules/shared_models/user_model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strformat, sequtils, sugar +import NimQml, Tables, stew/shims/strformat, sequtils, sugar import user_item import ../../../app_service/common/types diff --git a/src/app/modules/shared_models/wallet_account_item.nim b/src/app/modules/shared_models/wallet_account_item.nim index 2fca7287c4..58028d31e8 100644 --- a/src/app/modules/shared_models/wallet_account_item.nim +++ b/src/app/modules/shared_models/wallet_account_item.nim @@ -1,4 +1,4 @@ -import NimQml, strformat +import NimQml, stew/shims/strformat import app_service/service/wallet_account/dto/account_dto as wa_dto export wa_dto diff --git a/src/app/modules/shared_modules/keycard_popup/models/keycard_item.nim b/src/app/modules/shared_modules/keycard_popup/models/keycard_item.nim index e8ab1ad4cb..14cd200986 100644 --- a/src/app/modules/shared_modules/keycard_popup/models/keycard_item.nim +++ b/src/app/modules/shared_modules/keycard_popup/models/keycard_item.nim @@ -1,4 +1,4 @@ -import NimQml, strformat +import NimQml, stew/shims/strformat import ../../../shared_models/keypair_item export keypair_item diff --git a/src/app/modules/shared_modules/keycard_popup/models/keycard_model.nim b/src/app/modules/shared_modules/keycard_popup/models/keycard_model.nim index 00a8d2f0a0..41f62e816f 100644 --- a/src/app/modules/shared_modules/keycard_popup/models/keycard_model.nim +++ b/src/app/modules/shared_modules/keycard_popup/models/keycard_model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strformat, sequtils +import NimQml, Tables, stew/shims/strformat, sequtils import keycard_item export keycard_item diff --git a/src/app/modules/startup/models/fetching_data_item.nim b/src/app/modules/startup/models/fetching_data_item.nim index 77ef6c76d0..e76f5eab4d 100644 --- a/src/app/modules/startup/models/fetching_data_item.nim +++ b/src/app/modules/startup/models/fetching_data_item.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat type Item* = ref object diff --git a/src/app/modules/startup/models/fetching_data_model.nim b/src/app/modules/startup/models/fetching_data_model.nim index 5f387f0466..98c003da79 100644 --- a/src/app/modules/startup/models/fetching_data_model.nim +++ b/src/app/modules/startup/models/fetching_data_model.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, strutils, strformat +import NimQml, Tables, strutils, stew/shims/strformat import fetching_data_item diff --git a/src/app_service/common/conversion.nim b/src/app_service/common/conversion.nim index be21eaa562..0122a3a633 100644 --- a/src/app_service/common/conversion.nim +++ b/src/app_service/common/conversion.nim @@ -1,4 +1,4 @@ -import strutils, strformat, stint, chronicles +import strutils, stew/shims/strformat, stint, chronicles from web3 import Address, fromHex const CompressedKeyChars* = {'0'..'9', 'A','B','C','D','E','F','G','H','J','K','L','M','N','P','Q','R','S','T','U','V','W','X','Y','Z','a','b','c','d','e','f','g','h','i','j','k','m','n','o','p','q','r','s','t','u','v','w','x','y','z'} diff --git a/src/app_service/service/accounts/service.nim b/src/app_service/service/accounts/service.nim index 764654804c..6059d8e514 100644 --- a/src/app_service/service/accounts/service.nim +++ b/src/app_service/service/accounts/service.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, os, json, strformat, sequtils, strutils, uuids, times +import NimQml, Tables, os, json, stew/shims/strformat, sequtils, strutils, uuids, times import json_serialization, chronicles import ../../../app/global/global_singleton diff --git a/src/app_service/service/activity_center/dto/notification.nim b/src/app_service/service/activity_center/dto/notification.nim index 89300f91b5..169cb193fe 100644 --- a/src/app_service/service/activity_center/dto/notification.nim +++ b/src/app_service/service/activity_center/dto/notification.nim @@ -1,6 +1,6 @@ {.used.} -import json, strformat, strutils, stint, json_serialization +import json, stew/shims/strformat, strutils, stint, json_serialization import ../../message/dto/message import ../../contacts/dto/contacts import token_data diff --git a/src/app_service/service/activity_center/dto/token_data.nim b/src/app_service/service/activity_center/dto/token_data.nim index a65adddefc..b3af89c8e0 100644 --- a/src/app_service/service/activity_center/dto/token_data.nim +++ b/src/app_service/service/activity_center/dto/token_data.nim @@ -1,6 +1,6 @@ {.used.} -import json, strformat +import json, stew/shims/strformat include ../../../common/json_utils include ../../../common/utils diff --git a/src/app_service/service/chat/dto/chat.nim b/src/app_service/service/chat/dto/chat.nim index 544e3d8bc3..6a2680aeaf 100644 --- a/src/app_service/service/chat/dto/chat.nim +++ b/src/app_service/service/chat/dto/chat.nim @@ -1,6 +1,6 @@ {.used.} -import json, strformat, strutils, tables +import json, stew/shims/strformat, strutils, tables import ../../community/dto/community import ../../shared_urls/dto/url_data diff --git a/src/app_service/service/chat/service.nim b/src/app_service/service/chat/service.nim index 2427f91009..626f98c617 100644 --- a/src/app_service/service/chat/service.nim +++ b/src/app_service/service/chat/service.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, json, sequtils, strformat, chronicles, os, std/algorithm, strutils, uuids, base64 +import NimQml, Tables, json, sequtils, stew/shims/strformat, chronicles, os, std/algorithm, strutils, uuids, base64 import std/[times, os] import ../../../app/core/tasks/[qt, threadpool] diff --git a/src/app_service/service/community/service.nim b/src/app_service/service/community/service.nim index e0e11c811b..5a1e4ed885 100644 --- a/src/app_service/service/community/service.nim +++ b/src/app_service/service/community/service.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, json, sequtils, std/sets, std/algorithm, strformat, strutils, chronicles, json_serialization, sugar, times +import NimQml, Tables, json, sequtils, std/sets, std/algorithm, stew/shims/strformat, strutils, chronicles, json_serialization, sugar, times import json_serialization/std/tables as ser_tables import ./dto/community as community_dto diff --git a/src/app_service/service/community_tokens/service.nim b/src/app_service/service/community_tokens/service.nim index 4c087e3bf0..de9829a0d3 100644 --- a/src/app_service/service/community_tokens/service.nim +++ b/src/app_service/service/community_tokens/service.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, chronicles, json, stint, strutils, sugar, sequtils, strformat +import NimQml, Tables, chronicles, json, stint, strutils, sugar, sequtils, stew/shims/strformat import ../../../app/global/global_singleton import ../../../app/core/eventemitter import ../../../app/core/tasks/[qt, threadpool] diff --git a/src/app_service/service/contacts/dto/contacts.nim b/src/app_service/service/contacts/dto/contacts.nim index 78d091fd50..7b7951e6c2 100644 --- a/src/app_service/service/contacts/dto/contacts.nim +++ b/src/app_service/service/contacts/dto/contacts.nim @@ -1,6 +1,6 @@ {.used.} -import json, strformat, strutils +import json, stew/shims/strformat, strutils import ../../../common/social_links include ../../../common/json_utils diff --git a/src/app_service/service/contacts/service.nim b/src/app_service/service/contacts/service.nim index 63651df08d..c1d6187f18 100644 --- a/src/app_service/service/contacts/service.nim +++ b/src/app_service/service/contacts/service.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, json, sequtils, strformat, chronicles, strutils, times, std/times +import NimQml, Tables, json, sequtils, stew/shims/strformat, chronicles, strutils, times, std/times import ../../../app/global/global_singleton import ../../../app/core/signals/types diff --git a/src/app_service/service/ens/dto/ens_username_dto.nim b/src/app_service/service/ens/dto/ens_username_dto.nim index 525983bed8..58b7c43156 100644 --- a/src/app_service/service/ens/dto/ens_username_dto.nim +++ b/src/app_service/service/ens/dto/ens_username_dto.nim @@ -1,6 +1,6 @@ {.used.} -import json, strformat, hashes +import json, stew/shims/strformat, hashes include ../../../common/json_utils type EnsUsernameDto* = ref object diff --git a/src/app_service/service/ens/utils.nim b/src/app_service/service/ens/utils.nim index d6d447d537..5b7043729b 100644 --- a/src/app_service/service/ens/utils.nim +++ b/src/app_service/service/ens/utils.nim @@ -1,5 +1,5 @@ import Tables, json, chronicles, strutils -import strformat, sets, options +import stew/shims/strformat, sets, options import chronicles, libp2p/[multihash, multicodec, cid] import nimcrypto, stint import ../../common/conversion as common_conversion diff --git a/src/app_service/service/eth/utils.nim b/src/app_service/service/eth/utils.nim index 6541fa0401..cc8d23d4f3 100644 --- a/src/app_service/service/eth/utils.nim +++ b/src/app_service/service/eth/utils.nim @@ -1,6 +1,6 @@ import json, tables, sequtils, httpclient, net -import json, strutils, strformat, tables, chronicles, unicode, times +import json, strutils, stew/shims/strformat, tables, chronicles, unicode, times import json_serialization, chronicles, libp2p/[multihash, multicodec, cid], stint, nimcrypto from sugar import `=>`, `->` diff --git a/src/app_service/service/gif/dto.nim b/src/app_service/service/gif/dto.nim index 34c4f3154b..bce04a8db9 100644 --- a/src/app_service/service/gif/dto.nim +++ b/src/app_service/service/gif/dto.nim @@ -1,4 +1,4 @@ -import json, strformat +import json, stew/shims/strformat type GifDto* = object diff --git a/src/app_service/service/gif/service.nim b/src/app_service/service/gif/service.nim index 729567b17f..1eedf110c4 100644 --- a/src/app_service/service/gif/service.nim +++ b/src/app_service/service/gif/service.nim @@ -1,5 +1,5 @@ import json -import strformat +import stew/shims/strformat import os import uri import chronicles diff --git a/src/app_service/service/language/service.nim b/src/app_service/service/language/service.nim index 8413924503..53d7e2b2a8 100644 --- a/src/app_service/service/language/service.nim +++ b/src/app_service/service/language/service.nim @@ -1,5 +1,5 @@ import NimQml -import chronicles, os, strformat, re +import chronicles, os, stew/shims/strformat, re import ../../../constants as main_constants import ../../../app/global/global_singleton diff --git a/src/app_service/service/message/dto/link_preview.nim b/src/app_service/service/message/dto/link_preview.nim index 747023a6e8..00423cd803 100644 --- a/src/app_service/service/message/dto/link_preview.nim +++ b/src/app_service/service/message/dto/link_preview.nim @@ -1,4 +1,4 @@ -import json, strformat, tables +import json, stew/shims/strformat, tables import ./status_link_preview, ./standard_link_preview import ./status_contact_link_preview, ./status_community_link_preview, ./status_community_channel_link_preview import ../../contacts/dto/contact_details diff --git a/src/app_service/service/message/dto/link_preview_thumbnail.nim b/src/app_service/service/message/dto/link_preview_thumbnail.nim index 5d9aeb007f..1b2bbcfb74 100644 --- a/src/app_service/service/message/dto/link_preview_thumbnail.nim +++ b/src/app_service/service/message/dto/link_preview_thumbnail.nim @@ -1,4 +1,4 @@ -import json, strformat, NimQml, chronicles +import json, stew/shims/strformat, NimQml, chronicles include ../../../common/json_utils QtObject: diff --git a/src/app_service/service/message/dto/standard_link_preview.nim b/src/app_service/service/message/dto/standard_link_preview.nim index da8fb8c44c..b754cf26a3 100644 --- a/src/app_service/service/message/dto/standard_link_preview.nim +++ b/src/app_service/service/message/dto/standard_link_preview.nim @@ -1,4 +1,4 @@ -import json, strformat, NimQml +import json, stew/shims/strformat, NimQml import ./link_preview_thumbnail include ../../../common/json_utils diff --git a/src/app_service/service/message/dto/status_community_channel_link_preview.nim b/src/app_service/service/message/dto/status_community_channel_link_preview.nim index 0011f41e59..c40f5062cc 100644 --- a/src/app_service/service/message/dto/status_community_channel_link_preview.nim +++ b/src/app_service/service/message/dto/status_community_channel_link_preview.nim @@ -1,4 +1,4 @@ -import json, strformat, NimQml, chronicles +import json, stew/shims/strformat, NimQml, chronicles import link_preview_thumbnail import status_community_link_preview import ../../community/dto/community diff --git a/src/app_service/service/message/dto/status_community_link_preview.nim b/src/app_service/service/message/dto/status_community_link_preview.nim index 03158cb53f..2e5f392ba3 100644 --- a/src/app_service/service/message/dto/status_community_link_preview.nim +++ b/src/app_service/service/message/dto/status_community_link_preview.nim @@ -1,4 +1,4 @@ -import json, strformat, NimQml, chronicles +import json, stew/shims/strformat, NimQml, chronicles import link_preview_thumbnail import ../../community/dto/community diff --git a/src/app_service/service/message/dto/status_contact_link_preview.nim b/src/app_service/service/message/dto/status_contact_link_preview.nim index a77a49d5ce..375f8780ac 100644 --- a/src/app_service/service/message/dto/status_contact_link_preview.nim +++ b/src/app_service/service/message/dto/status_contact_link_preview.nim @@ -1,4 +1,4 @@ -import json, strformat, NimQml, chronicles +import json, stew/shims/strformat, NimQml, chronicles import link_preview_thumbnail import ../../contacts/dto/contact_details diff --git a/src/app_service/service/message/dto/urls_unfurling_plan.nim b/src/app_service/service/message/dto/urls_unfurling_plan.nim index d303d780c3..3baeb46aea 100644 --- a/src/app_service/service/message/dto/urls_unfurling_plan.nim +++ b/src/app_service/service/message/dto/urls_unfurling_plan.nim @@ -1,4 +1,4 @@ -import json, strformat, chronicles, Tables +import json, stew/shims/strformat, chronicles, Tables include ../../../common/json_utils type diff --git a/src/app_service/service/message/message_cursor.nim b/src/app_service/service/message/message_cursor.nim index 67ef21d604..420cd38476 100644 --- a/src/app_service/service/message/message_cursor.nim +++ b/src/app_service/service/message/message_cursor.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat type CursorValue* = string diff --git a/src/app_service/service/message/service.nim b/src/app_service/service/message/service.nim index 12ce831826..52fd157db8 100644 --- a/src/app_service/service/message/service.nim +++ b/src/app_service/service/message/service.nim @@ -1,4 +1,4 @@ -import NimQml, tables, json, re, sequtils, strformat, strutils, chronicles, times, oids, uuids +import NimQml, tables, json, re, sequtils, stew/shims/strformat, strutils, chronicles, times, oids, uuids import ../../../app/core/tasks/[qt, threadpool] import ../../../app/core/signals/types diff --git a/src/app_service/service/network/dto.nim b/src/app_service/service/network/dto.nim index 91dcad67b1..7d66ce546d 100644 --- a/src/app_service/service/network/dto.nim +++ b/src/app_service/service/network/dto.nim @@ -1,5 +1,5 @@ -import hashes, strformat, json_serialization +import hashes, stew/shims/strformat, json_serialization import ./types diff --git a/src/app_service/service/profile/dto/profile_showcase_preferences.nim b/src/app_service/service/profile/dto/profile_showcase_preferences.nim index 1ed365c0bc..f728aa87fb 100644 --- a/src/app_service/service/profile/dto/profile_showcase_preferences.nim +++ b/src/app_service/service/profile/dto/profile_showcase_preferences.nim @@ -1,4 +1,4 @@ -import json, strutils, strformat, stint, sequtils, json_serialization +import json, strutils, stew/shims/strformat, stint, sequtils, json_serialization include ../../../common/json_utils include ../../../common/utils diff --git a/src/app_service/service/stickers/dto/stickers.nim b/src/app_service/service/stickers/dto/stickers.nim index ed900d9c66..e20c448ddd 100644 --- a/src/app_service/service/stickers/dto/stickers.nim +++ b/src/app_service/service/stickers/dto/stickers.nim @@ -1,6 +1,6 @@ {.used.} -import json, strformat, strutils, stint, json_serialization, chronicles +import json, stew/shims/strformat, strutils, stint, json_serialization, chronicles include ../../../common/json_utils include ../../../common/utils diff --git a/src/app_service/service/token/async_tasks.nim b/src/app_service/service/token/async_tasks.nim index 1e1de10896..d2a54294ce 100644 --- a/src/app_service/service/token/async_tasks.nim +++ b/src/app_service/service/token/async_tasks.nim @@ -1,4 +1,4 @@ -import times, strformat +import times, stew/shims/strformat import backend/backend as backend include app_service/common/json_utils diff --git a/src/app_service/service/token/dto.nim b/src/app_service/service/token/dto.nim index 4696867a76..6b2c56a1ce 100644 --- a/src/app_service/service/token/dto.nim +++ b/src/app_service/service/token/dto.nim @@ -1,4 +1,4 @@ -import json, strformat +import json, stew/shims/strformat include app_service/common/json_utils diff --git a/src/app_service/service/token/service_items.nim b/src/app_service/service/token/service_items.nim index 944e866960..c3abf410e2 100644 --- a/src/app_service/service/token/service_items.nim +++ b/src/app_service/service/token/service_items.nim @@ -1,4 +1,4 @@ -import strformat +import stew/shims/strformat import app_service/common/types as common_types diff --git a/src/app_service/service/transaction/cryptoRampDto.nim b/src/app_service/service/transaction/cryptoRampDto.nim index f77fbb72a6..823a565bbd 100644 --- a/src/app_service/service/transaction/cryptoRampDto.nim +++ b/src/app_service/service/transaction/cryptoRampDto.nim @@ -1,4 +1,4 @@ -import json, strformat +import json, stew/shims/strformat include ../../common/json_utils diff --git a/src/app_service/service/transaction/dto.nim b/src/app_service/service/transaction/dto.nim index c50520486b..e4fd318ec5 100644 --- a/src/app_service/service/transaction/dto.nim +++ b/src/app_service/service/transaction/dto.nim @@ -1,4 +1,4 @@ -import json, strutils, stint, json_serialization, strformat, sugar, sequtils +import json, strutils, stint, json_serialization, stew/shims/strformat, sugar, sequtils import web3/ethtypes diff --git a/src/app_service/service/transaction/service.nim b/src/app_service/service/transaction/service.nim index 93e4c4b4c2..86d01f7060 100644 --- a/src/app_service/service/transaction/service.nim +++ b/src/app_service/service/transaction/service.nim @@ -1,4 +1,4 @@ -import Tables, NimQml, chronicles, sequtils, sugar, stint, strutils, json, strformat, algorithm +import Tables, NimQml, chronicles, sequtils, sugar, stint, strutils, json, stew/shims/strformat, algorithm import ../../../backend/collectibles as collectibles import ../../../backend/transactions as transactions diff --git a/src/app_service/service/wallet_account/dto/account_dto.nim b/src/app_service/service/wallet_account/dto/account_dto.nim index a6749bc7ac..59b3fe2e15 100644 --- a/src/app_service/service/wallet_account/dto/account_dto.nim +++ b/src/app_service/service/wallet_account/dto/account_dto.nim @@ -1,4 +1,4 @@ -import tables, json, strformat, strutils +import tables, json, stew/shims/strformat, strutils import account_token_item diff --git a/src/app_service/service/wallet_account/dto/account_token_item.nim b/src/app_service/service/wallet_account/dto/account_token_item.nim index dd39d60261..694c4f43b2 100644 --- a/src/app_service/service/wallet_account/dto/account_token_item.nim +++ b/src/app_service/service/wallet_account/dto/account_token_item.nim @@ -1,4 +1,4 @@ -import stint, strformat +import stint, stew/shims/strformat type BalanceItem* = ref object of RootObj account*: string diff --git a/src/app_service/service/wallet_account/dto/keypair_dto.nim b/src/app_service/service/wallet_account/dto/keypair_dto.nim index 6b938bab7c..ee2ab7eb8c 100644 --- a/src/app_service/service/wallet_account/dto/keypair_dto.nim +++ b/src/app_service/service/wallet_account/dto/keypair_dto.nim @@ -1,4 +1,4 @@ -import tables, json, strformat, strutils, sequtils, sugar, chronicles +import tables, json, stew/shims/strformat, strutils, sequtils, sugar, chronicles import account_dto, keycard_dto diff --git a/src/app_service/service/wallet_account/service.nim b/src/app_service/service/wallet_account/service.nim index 32c879430a..0cab07d58d 100644 --- a/src/app_service/service/wallet_account/service.nim +++ b/src/app_service/service/wallet_account/service.nim @@ -1,4 +1,4 @@ -import NimQml, Tables, json, sequtils, sugar, chronicles, strformat, stint, httpclient +import NimQml, Tables, json, sequtils, sugar, chronicles, stew/shims/strformat, stint, httpclient import net, strutils, os, times, algorithm, options import web3/ethtypes diff --git a/src/backend/activity.nim b/src/backend/activity.nim index 2611829f6e..06cf7c6fa8 100644 --- a/src/backend/activity.nim +++ b/src/backend/activity.nim @@ -1,4 +1,4 @@ -import times, strformat, options, logging +import times, stew/shims/strformat, options, logging import json, json_serialization import core, response_type import stint diff --git a/src/backend/backend.nim b/src/backend/backend.nim index b7371749c4..f104c73ad6 100644 --- a/src/backend/backend.nim +++ b/src/backend/backend.nim @@ -1,4 +1,4 @@ -import json, json_serialization, strformat +import json, json_serialization, stew/shims/strformat import hashes import ./core, ./response_type import app_service/service/saved_address/dto as saved_address_dto diff --git a/src/backend/collectibles.nim b/src/backend/collectibles.nim index e00cdcf663..de577270f3 100644 --- a/src/backend/collectibles.nim +++ b/src/backend/collectibles.nim @@ -1,4 +1,4 @@ -import json, strformat +import json, stew/shims/strformat import stint, Tables, strutils import core import response_type, collectibles_types diff --git a/src/backend/collectibles_types.nim b/src/backend/collectibles_types.nim index 8530d9fd11..e8da69505e 100644 --- a/src/backend/collectibles_types.nim +++ b/src/backend/collectibles_types.nim @@ -1,4 +1,4 @@ -import json, strformat, json_serialization +import json, stew/shims/strformat, json_serialization import stint, Tables, options, strutils import community_tokens_types diff --git a/src/backend/connection_status.nim b/src/backend/connection_status.nim index ddfaef7329..321b304fbe 100644 --- a/src/backend/connection_status.nim +++ b/src/backend/connection_status.nim @@ -1,4 +1,4 @@ -import json, strformat, tables +import json, stew/shims/strformat, tables const INVALID_TIMESTAMP* = -1 diff --git a/src/backend/core.nim b/src/backend/core.nim index 690ba333a3..256f4244fb 100644 --- a/src/backend/core.nim +++ b/src/backend/core.nim @@ -1,4 +1,4 @@ -import json, json_serialization, strformat, chronicles +import json, json_serialization, stew/shims/strformat, chronicles import status_go import response_type diff --git a/src/backend/response_type.nim b/src/backend/response_type.nim index 05045149b9..252ca982d1 100644 --- a/src/backend/response_type.nim +++ b/src/backend/response_type.nim @@ -1,6 +1,6 @@ {.used.} -import strformat +import stew/shims/strformat type RpcException* = object of CatchableError diff --git a/src/backend/transactions.nim b/src/backend/transactions.nim index 1210fbf324..0ed1e6344a 100644 --- a/src/backend/transactions.nim +++ b/src/backend/transactions.nim @@ -1,4 +1,4 @@ -import Tables, json, stint, json_serialization, strformat +import Tables, json, stint, json_serialization, stew/shims/strformat import ../app_service/service/eth/dto/transaction import ./core as core diff --git a/src/env_cli_vars.nim b/src/env_cli_vars.nim index 1af8d22e52..439e64c9d9 100644 --- a/src/env_cli_vars.nim +++ b/src/env_cli_vars.nim @@ -1,4 +1,4 @@ -import os, sequtils, strutils, strformat, chronicles +import os, sequtils, strutils, stew/shims/strformat, chronicles import # vendor libs confutils diff --git a/src/nim_status_client.nim b/src/nim_status_client.nim index be933b5417..e5a3a64a57 100644 --- a/src/nim_status_client.nim +++ b/src/nim_status_client.nim @@ -1,4 +1,4 @@ -import NimQml, chronicles, os, strformat, strutils, times, md5, json +import NimQml, chronicles, os, stew/shims/strformat, strutils, times, md5, json import status_go import keycard_go diff --git a/vendor/nim-result b/vendor/nim-result index 113d433f48..e2adf66b8b 160000 --- a/vendor/nim-result +++ b/vendor/nim-result @@ -1 +1 @@ -Subproject commit 113d433f48894ee8e7da3e340c8fe19ad7b9db4d +Subproject commit e2adf66b8bc2f41606e8469a5f0a850d1e545b55 diff --git a/vendor/nim-stew b/vendor/nim-stew index 2c2544aec1..a0c085a51f 160000 --- a/vendor/nim-stew +++ b/vendor/nim-stew @@ -1 +1 @@ -Subproject commit 2c2544aec13536304438be045bfdd22452741466 +Subproject commit a0c085a51fe4f2d82aa96173ac49b3bfe6043858