diff --git a/CHANGELOG.md b/CHANGELOG.md index ac39c71a..a15d87be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### **1.2.6** (2023-04-20) + +- Improved transaction signing handling and error messages + ### **1.2.5** (2023-04-08) - Address public keys can now be exported during transaction signing diff --git a/assets/translations/da.json b/assets/translations/da.json index 448d6800..e4bad8e1 100644 --- a/assets/translations/da.json +++ b/assets/translations/da.json @@ -501,5 +501,15 @@ "app_settings_experimental_feature_watchOnlyWallets": "Observationstegnebøger", "watch_only": "Observer", "addresses_none": "Ingen adresser fundet", - "search_address": "Søg adresse" + "search_address": "Søg adresse", + "sign_transaction_step_2": "Indtast Transaktionshex", + "sign_transaction_input_label": "Transaktionshex", + "sign_transaction_step_3_button_alt": "Kopier hex til udklipsholderen", + "wallet_pop_menu_signing_transactions": "Underskriv Transaktion", + "sign_transaction_step_1_description": "Vælg den adresse, der skal underskrive transaktionen", + "sign_transaction_step_3": "Underskriv Transaktion", + "sign_transaction_step_3_description": "Dette er din underskrevne transaktionshex. Du kan trykke to gange for at kopiere det til udklipsholderen.", + "sign_transaction_input_selector_title": "Vælg hvilke input der skal signeres", + "sign_transaction_signing_failed": "Transaktionssignering mislykkedes.", + "sign_transaction_step_1_copy_pubkey": "Kopier den offentlige nøgle til udklipsholderen" } diff --git a/assets/translations/en.json b/assets/translations/en.json index c32918b6..4df6e355 100644 --- a/assets/translations/en.json +++ b/assets/translations/en.json @@ -353,7 +353,6 @@ "send_label": "Label (optional)", "send_oops": "Something went wrong, please try again", "send_op_return": "Metadata Message", - "send_qr": "QR-Code", "send_to": " to ", "send_total": "Total $amount $letter_code", "send_total_amount": "Total amount", diff --git a/assets/translations/es.json b/assets/translations/es.json index 97dba992..09e52fa6 100644 --- a/assets/translations/es.json +++ b/assets/translations/es.json @@ -496,5 +496,9 @@ "wallet_scan_finished": "Escaneo Finalizado", "wallet_scan_scanning_finished": "escaneo terminado", "wallet_scan_n_new_found": "$n carteras nuevas encontradas", - "wallet_scan_no_new_found": "No se encontraron nuevas carteras" + "wallet_scan_no_new_found": "No se encontraron nuevas carteras", + "app_settings_experimental_features": "Funciones Experimentales", + "search_address": "Buscar dirección", + "sign_transaction_signing_failed": "Error al firmar la transacción.", + "sign_transaction_step_1_copy_pubkey": "Copiar clave pública al portapapeles" } diff --git a/assets/translations/is.json b/assets/translations/is.json index d08c4251..0e54b322 100644 --- a/assets/translations/is.json +++ b/assets/translations/is.json @@ -501,5 +501,15 @@ "app_settings_experimental_features": "Tilraunaeiginleikar", "app_settings_experimental_feature_watchOnlyWallets": "Athugunarveski", "watch_only": "Fylgstu með", - "addresses_none": "Engin heimilisföng fundust" + "addresses_none": "Engin heimilisföng fundust", + "sign_transaction_step_3_button_alt": "Afritaðu hex á klemmuspjald", + "sign_transaction_input_selector_title": "Veldu hvaða inntak á að undirrita", + "sign_transaction_signing_failed": "Undirritun færslu mistókst.", + "sign_transaction_step_2": "Sláðu Inn Viðskipta Hex", + "sign_transaction_input_label": "Viðskipta Hex", + "sign_transaction_step_3": "Skrifaðu Undir Viðskipti", + "wallet_pop_menu_signing_transactions": "Skrifaðu Undir Viðskipti", + "sign_transaction_step_1_description": "Veldu heimilisfangið sem mun skrifa undir viðskiptin", + "sign_transaction_step_3_description": "Þetta er undirritaður viðskipta hex. Þú getur tvípikkað til að afrita það á klemmuspjaldið.", + "sign_transaction_step_1_copy_pubkey": "Afritaðu opinberan lykil á klemmuspjald" } diff --git a/assets/translations/nb_NO.json b/assets/translations/nb_NO.json index 84b831a7..0d438224 100644 --- a/assets/translations/nb_NO.json +++ b/assets/translations/nb_NO.json @@ -501,5 +501,15 @@ "search_address": "Søk adresse", "app_settings_experimental_feature_watchOnlyWallets": "Observasjonslommebøker", "watch_only": "Observer", - "addresses_none": "Finner ingen adresser" + "addresses_none": "Finner ingen adresser", + "sign_transaction_step_3": "Signer Transaksjon", + "sign_transaction_step_3_button_alt": "Kopier hex til utklippstavlen", + "sign_transaction_step_2": "Angi Transaksjonshex", + "sign_transaction_input_label": "Transaksjonshex", + "sign_transaction_signing_failed": "Transaksjonssignering mislyktes.", + "sign_transaction_input_selector_title": "Velg hvilke inputs som skal signeres", + "wallet_pop_menu_signing_transactions": "Signer Transaksjon", + "sign_transaction_step_1_description": "Velg adressen som skal signere transaksjonen", + "sign_transaction_step_3_description": "Dette er din signerte transaksjonshex. Du kan dobbelttrykke for å kopiere den til utklippstavlen.", + "sign_transaction_step_1_copy_pubkey": "Kopier offentlig nøkkel til utklippstavlen" } diff --git a/assets/translations/ro.json b/assets/translations/ro.json index 3ba3b60a..f0678359 100644 --- a/assets/translations/ro.json +++ b/assets/translations/ro.json @@ -296,8 +296,8 @@ "sign_step_1_description": "Selectați adresa care va semna mesajul", "sign_step_1_button": "Selectați", "sign_step_1_button_alt": "Schimbați", - "sign_step_2": "Introduceți mesajul", - "sign_step_3": "Semnați mesajul", + "sign_step_2": "Introduceți Mesajul", + "sign_step_3": "Semnați Mesajul", "sign_step_3_description": "Aceasta este semnătura dvs. Puteți atinge de două ori pentru a o copia în clipboard.", "sign_step_3_button": "Semnați", "sign_step_3_button_alt": "Copiați semnătura în clipboard", @@ -347,5 +347,125 @@ "wallet_scan_notice_bg_notifications": "Activarea notificărilor de fundal în Setările aplicației poate îmbunătăți considerabil fiabilitatea scanării.", "wallet_pop_menu_change_title": "Schimbați Titlul", "wallet_title_edit": "Editați Titlul Portofelului", - "wallet_title_edit_new_title": "Titlu Nou" + "wallet_title_edit_new_title": "Titlu Nou", + "currency_AFN": "Afghani Afganistan", + "currency_ANG": "Florinul Antilean Olandez", + "app_settings_price_feed_search": "Caută codul valutei", + "app_settings_language_search": "Caută limba", + "currency_GNF": "Franc Guinean", + "currency_GTQ": "Quetzal Guatemalian", + "currency_GYD": "Dollar Guyanez", + "currency_HKD": "Dollar Hong Kong", + "currency_HNL": "Lempira Hondurasiană", + "currency_HUF": "Forint Ungar", + "currency_ILS": "Shekel Nou Israilean", + "currency_IQD": "Dinar Iraqian", + "currency_ISK": "Kronă Islandeză", + "currency_JMD": "Dollar Jamaican", + "currency_JOD": "Dinar Jordanian", + "app_settings_experimental_features": "Funcții experimentale", + "app_settings_experimental_feature_watchOnlyWallets": "Vezi doar portofele", + "watch_only": "Vezi doar", + "addresses_none": "Nicio adresă găsită", + "currency_AED": "Dirhamul Emiratelor Arabe Unite", + "currency_ALL": "Lek Albanian", + "currency_AMD": "Dram Armean", + "currency_AOA": "Kwanza Angolez", + "currency_AWG": "Florin Aruban", + "currency_AZN": "Manat Azerbaijan", + "currency_BAM": "Marcă Convertibilă Bosniană", + "currency_BBD": "Dollar Barbadian or Bajanian", + "currency_BGN": "Leva Bulgară", + "currency_BHD": "Dinar Bahrainian", + "currency_BIF": "Franc Burundian", + "currency_BMD": "Dollar Bermudian", + "currency_BND": "Dollar Bruneian", + "currency_BSD": "Dollar Bahamian", + "currency_BWP": "Pula Botswaniană", + "currency_BYN": "Rublă Belorusă", + "currency_BZD": "Dollar Belizean", + "currency_CAD": "Dollar Canadian", + "currency_CDF": "Franc Congolez", + "currency_CHF": "Franc Elvețian", + "currency_CLF": "Fomento Unidadian", + "currency_COP": "Peso Columbian", + "currency_CRC": "Colón Costa-Rican", + "currency_CUP": "Peso Cubanez", + "currency_CVE": "Escudo Cape Verdean", + "currency_CZK": "Koruna Cehă", + "currency_DJF": "Franc Djiboutian", + "currency_DOP": "Peso Dominican", + "currency_EGP": "Pound Egyptian", + "currency_ERN": "Nakfa Eritrean", + "currency_ETB": "Birr Etiopian", + "currency_FJD": "Dollar Fijian", + "currency_GEL": "Lari Georgian", + "currency_GHS": "Cedi Ghanaian", + "currency_GIP": "Liră Gibraltară", + "currency_HTG": "Gourde Haitian", + "currency_KGS": "Som Kyrgyz", + "currency_KHR": "Riel Cambodian", + "currency_KMF": "Franc Comorian", + "currency_KPW": "Won Nord Korean", + "currency_KWD": "Dinar Kuwaitian", + "currency_KYD": "Dollar Caymanian", + "currency_LAK": "Kip Laoțian", + "currency_LBP": "Liră Lebanoniană", + "currency_LKR": "Rupee Sri Lankez", + "currency_LRD": "Dollar Liberian", + "currency_LSL": "Loti Basotez", + "currency_LYD": "Dinar Libyan", + "currency_MAD": "Dirham Morocan", + "currency_MDL": "Leu Moldovenesc", + "currency_MKD": "Denar Macedonian", + "currency_MMK": "Kyat Burmesian", + "currency_MNT": "Tögrög Mongolez", + "currency_MOP": "Pataca Macaueză", + "currency_MRU": "Ouguiya Mauritană", + "currency_MUR": "Rupee Mauritan", + "currency_MWK": "Kwacha Malavian", + "currency_MXN": "Peso Mexican", + "currency_MZN": "Metical Mozambican", + "currency_NAD": "Dolar Namibian", + "currency_NGN": "Naira Nigeriană", + "currency_NIO": "Cordoba Nicaraguană", + "currency_NPR": "Rupee Nepalez", + "currency_NZD": "Dolar Noua Zealandă", + "currency_OMR": "Rial Omaniez", + "currency_PEN": "Sol Peruvian", + "currency_PGK": "Kina Noua Papua Guinean", + "currency_PYG": "Guarani Paraguaian", + "currency_QAR": "Riyal Qatarian", + "currency_RSD": "Dinar Serb", + "currency_RWF": "Franc Rwandian", + "currency_SAR": "Riyal Saudian", + "currency_SCR": "Rupee Seychellian", + "currency_SDG": "Lira Sudaneză", + "currency_SGD": "Dolar Singapurian", + "currency_SHP": "Liră de Sfânta Elena", + "currency_SLL": "Leon Sierra Leonean", + "currency_SOS": "Shilling Somalian", + "currency_SRD": "Dolar Surinamez", + "currency_STN": "Dobra Sao Tomean", + "currency_SVC": "Colon Salvadorian", + "currency_SYP": "Liră Siriană", + "currency_SZL": "Lilangeni Swazian", + "currency_TJS": "Somoni Tajikistanian", + "currency_TMT": "Manat Turkmenistanian", + "currency_TND": "Dinar Tunisian", + "app_settings_wallet_order": "Comanda Portofel", + "currency_BOB": "Bolíviano Bolivian", + "currency_BTN": "Ngultrum Bhutanez", + "currency_CLP": "Peso Chilian", + "currency_DZD": "Dinar Algerian", + "currency_GMD": "Dalasi Gambian", + "currency_KZT": "Tenge Kazah", + "currency_MGA": "Ariary Malagasian", + "sign_transaction_signing_failed": "Semnarea tranzacției a eșuat.", + "currency_MVR": "Rufiyaa Maldiviană", + "currency_MYR": "Ringgit Malaysian", + "currency_PAB": "Balboa Panamez", + "currency_SBD": "Dolar al Insulelor Solomon", + "currency_SSP": "Liră Sud Sudaneză", + "currency_TOP": "Pa'anga Tonganian" } diff --git a/assets/translations/ru.json b/assets/translations/ru.json index 1a854b29..ee8dc533 100644 --- a/assets/translations/ru.json +++ b/assets/translations/ru.json @@ -39,7 +39,7 @@ "paperwallet_step_3": "Шаг 3", "paperwallet_step_3_text": "Проверить баланс", "paperwallet_step_4": "Шаг 4", - "paperwallet_step_4_text": "Очистить Бумажный Кошелек", + "paperwallet_step_4_text": "Очистить бумажный кошелек", "paperwallet_error_1": "Пустой кошелек \nили сумма ниже минимальной", "paperwallet_confirm_import": "Подтвердить и Импортировать", "paperwallet_success": "Бумажный кошелек успешно импортирован.\nТранзакция появится очень скоро.", @@ -296,8 +296,8 @@ "sign_step_1_description": "Выберите адрес который должен подписать сообщение", "sign_step_1_button": "Выбрать", "sign_step_1_button_alt": "Изменить", - "sign_step_2": "Введите сообщение", - "sign_step_3": "Подписать сообщение", + "sign_step_2": "Введите Сообщение", + "sign_step_3": "Подписать Сообщение", "sign_step_3_description": "Это ваша подпись. Вы можете дважды нажать, чтобы скопировать ее в буфер.", "sign_step_3_button": "Подписать", "sign_step_3_button_alt": "Скопировать подпись в буфер обмена", diff --git a/assets/translations/sv.json b/assets/translations/sv.json index 58f35e36..9cd6496a 100644 --- a/assets/translations/sv.json +++ b/assets/translations/sv.json @@ -501,5 +501,15 @@ "search_address": "Sök adress", "app_settings_experimental_feature_watchOnlyWallets": "Observationsplånböcker", "watch_only": "Observera", - "addresses_none": "Inga adresser hittades" + "addresses_none": "Inga adresser hittades", + "sign_transaction_input_label": "Transaktionshex", + "sign_transaction_step_3_button_alt": "Kopiera hex till urklippet", + "sign_transaction_step_3": "Signera Transaktion", + "sign_transaction_input_selector_title": "Välj vilka ingångar som ska signeras", + "sign_transaction_signing_failed": "Transaktionssignering misslyckades.", + "wallet_pop_menu_signing_transactions": "Signera Transaktion", + "sign_transaction_step_1_description": "Välj adressen som ska signera transaktionen", + "sign_transaction_step_2": "Ange Transaktionshex", + "sign_transaction_step_3_description": "Detta är din undertecknade transaktionshex. Du kan dubbeltrycka för att kopiera den till urklipp.", + "sign_transaction_step_1_copy_pubkey": "Kopiera den offentliga nyckeln till urklipp" } diff --git a/assets/translations/zh_Hant.json b/assets/translations/zh_Hant.json index 7e87b801..f7f93aae 100644 --- a/assets/translations/zh_Hant.json +++ b/assets/translations/zh_Hant.json @@ -6,7 +6,7 @@ "app_settings_delete": "刪除帳戶", "setup_legal_title": "法律聲明", "about_illustrations_button": "designs.AI", - "about_license": "根據 AGPL-3.0 許可", + "about_license": "AGPL-3.0 授權協議", "app_settings_logs": "調試日誌", "logout": "登出", "logout_title": "您即將退出", @@ -19,7 +19,7 @@ "about_data_declaration": "查看隐私和数据保护声明", "about_foundation": "此项目得到點點幣基金会的财务支持。\n请考虑捐赠给基金会，以进一步推动此应用的开发。", "about_foundation_button": "了解更多关于點點幣基金会", - "about_help_or_feedback": "需要帮助或想提供反馈意见吗？", + "about_help_or_feedback": "您是否需要協助或提供回饋？", "about_translate": "您可以协助将此应用翻译成點點幣 Weblate。", "about_go_weblate": "打开 Weblate", "about_illustrations": "设计插图感谢 designs.AI 的支持", @@ -35,14 +35,14 @@ "addressbook_edit_dialog_title": "编辑标签", "addressbook_edit_dialog_input": "新标签", "addressbook_export_dialog_title": "导出私钥", - "addressbook_export_dialog_button": "显示私钥", - "addressbook_export_dialog_hint": "此私钥是 WIF 格式。", - "addressbook_hide_change": "隐藏变更地址", - "addressbook_hide_empty": "隐藏空地址", - "addressbook_hide_used": "隐藏已使用地址", + "addressbook_export_dialog_button": "顯示私鑰", + "addressbook_export_dialog_hint": "該私鑰是WIF格式的。", + "addressbook_hide_change": "隱藏找零地址", + "addressbook_hide_empty": "隱藏空地址", + "addressbook_hide_used": "隱藏用過的地址", "addressbook_hide_unwatched": "隐藏未监视地址", - "addressbook_show_balance": "显示余额", - "addressbook_show_label": "显示标签", + "addressbook_show_balance": "顯示餘額", + "addressbook_show_label": "顯示標籤", "addressbook_no_label": "无标签", "addressbook_no_sending": "无地址", "addressbook_search": "插入地址、标签", @@ -71,8 +71,8 @@ "app_settings_notifications_heading_interval": "同步间隔", "app_settings_notifications_not_enabled": "后台通知当前已禁用。", "app_settings_notifications_hint_sync_1": "设置应用将在后台检查新交易的间隔时间。\n当前间隔：$minutes 分钟。", - "app_settings_revealAuthButton": "显示身份验证选项", - "app_settings_revealSeedButton": "显示种子短语", + "app_settings_revealAuthButton": "顯示驗證選項", + "app_settings_revealSeedButton": "顯示助記詞", "app_settings_seed": "种子短语", "app_settings_sendTransaction": "发送交易前需确认", "app_settings_shareseed": "分享种子", @@ -86,19 +86,19 @@ "app_settings_price_feed": "价格源和货币", "app_settings_price_feed_enable_button": "启用价格源 API", "app_settings_price_feed_disable_button": "禁用价格源 API", - "app_settings_price_alert_content": "这将启用我们的隐私友好的价格数据源。\n随时可以禁用。", + "app_settings_price_alert_content": "打開隱私友善的價格餵價。\n可隨時停用。", "app_wallets": "钱包", "authenticate_biometric_hint": "验证身份", "authenticate_biometric_reason": "请进行身份验证。", "authenticate_biometric_title": "需要身份验证", "authenticate_change_pin_success": "PIN 修改成功", "authenticate_confirm_title": "重新输入您的 PIN", - "authenticate_confirm_title_new": "重新输入新 PIN", + "authenticate_confirm_title_new": "重新輸入你的新PIN碼", "authenticate_retry_warning_title": "警告，您只剩一次重试机会。", "authenticate_subtitle_plural": "剩余 $retriesLeft 次尝试", "authenticate_subtitle_singular": "剩余 $retriesLeft 次尝试", "authenticate_title": "请输入您的 PIN", - "authenticate_title_new": "请输入您的新 PIN", + "authenticate_title_new": "請輸入您的新PIN碼", "buy_peercoin_dialog_title": "您将被转至第三方网站。", "buy_peercoin_dialog_content": "此应用程序的维护者对其内容不负责任。", "changelog_appbar": "更新日志", @@ -132,14 +132,14 @@ "id": "身份", "import_button": "导入", "import_seed_error_1": "必须有 12 个或更多单词", - "import_seed_error_2": "无效的种子短语", + "import_seed_error_2": "無效的助記詞", "import_wif_textfield_label": "私钥", "import_wif_error_empty": "请输入私钥", "import_wif_error_failed_parse": "您的私钥无效。它是 WIF 格式吗？", "import_wif_error_snack": "此地址已导入", "peercoin": "點點幣", "peercoinC": "點點幣", - "import_wif_intro": "请输入您希望导入的私钥。\n它必须是 WIF 格式。", + "import_wif_intro": "請輸入要匯入的私鑰。\n它必須是WIF格式。", "import_wif_success_snack": "私钥导入成功", "jail_countdown": "秒", "jail_dialog_button": "好的", @@ -152,9 +152,9 @@ "paperwallet_confirm_import": "确认并导入", "paperwallet_error_1": "錢包為空\n或金額低於最小輸出額", "paperwallet_step_1": "第 1 步", - "paperwallet_step_1_text": "扫描公钥", + "paperwallet_step_1_text": "掃描公鑰", "paperwallet_step_2": "第 2 步", - "paperwallet_step_2_text": "扫描私钥", + "paperwallet_step_2_text": "掃描私鑰", "paperwallet_step_3": "第 3 步", "paperwallet_step_3_text": "检查余额", "paperwallet_step_4": "第 4 步", @@ -172,7 +172,7 @@ "receive_website_credit": "使用信用卡购买", "receive_website_exchandes": "打开交易所列表", "receive_website_faucet": "您可以在此水龙头上获得免费测试网络硬币。", - "scan_qr": "扫描二维码", + "scan_qr": "掃描二維碼", "search": "搜索", "select_coin": "请选择币种", "send": "发送", @@ -185,8 +185,8 @@ "send_confirm_send": "确认并发送", "send_confirm_transaction": "请确认交易", "send_dust": "尘埃：-$amount $letter_code", - "send_dust_title": "交易尘埃", - "send_dust_hint": "交易尘埃将被销毁并计入手续费。", + "send_dust_title": "灰塵交易", + "send_dust_hint": "灰塵交易將被銷毀併計入費用。", "send_empty": "空钱包", "send_enter_address": "请输入地址", "verify_enter_message": "请输入消息", @@ -207,7 +207,7 @@ "send_add_address": "添加地址", "send_navigator": "地址 $index/$maximum", "send_address_already_exists": "地址已存在", - "server_add_title": "添加新服务器", + "server_add_title": "新增的伺服器", "server_add_input_label": "服务器 URL", "server_add_input_empty": "请输入 URL", "server_add_no_wss_or_ssl": "必须以 wss:// 或 ssl:// 开头\n目前不支持其他协议", @@ -221,12 +221,12 @@ "server_settings_alert_hardcoded_content": "无法删除硬编码的服务器，只能停用。", "server_settings_error_no_server_left": "至少需要一个可连接的服务器！", "setup_continue_alert_title": "继续之前", - "setup_create_pin": "创建 PIN", - "setup_import_title": "导入种子短语", + "setup_create_pin": "創造新的PIN碼", + "setup_import_title": "導入助記詞", "setup_finish": "完成设置", "setup_pin_no_biometrics": "您的設備不支持生物識別驗證。", "setup_pin": "請在繼續之前設置PIN碼。", - "setup_price_feed_allow": "允許價格源API", + "setup_price_feed_allow": "允許餵價 API", "setup_price_feed_description": "這將允許您的錢包餘額以實時匯率顯示。", "setup_price_feed_title": "外部API", "setup_price_feed_last_update": "上次更新：$timestamp", @@ -248,7 +248,7 @@ "transactions_none": "暫無交易", "transactions_out": "出金", "tx_address": "地址", - "tx_confirmations": "確認數", + "tx_confirmations": "確認", "tx_direction": "方向", "tx_fee": "手續費", "tx_rejected": "交易被網絡拒絕。請重試。", @@ -256,7 +256,7 @@ "tx_value": "數量", "tx_view_in_explorer": "在區塊瀏覽器中查看", "tx_retry_broadcast": "重試廣播", - "tx_show_hex": "顯示交易Hex", + "tx_show_hex": "顯示十六進位交易", "tx_retry_snack": "已重試廣播。如果成功，交易將稍後更新。", "unconfirmed": "未確認", "wallet_bottom_nav_addr": "地址", @@ -301,21 +301,21 @@ "sign_reset_alert_title": "您要重新開始嗎？", "sign_reset_alert_body": "這將重置所有字段並清除您的簽名。", "address_selector_title": "選擇要使用的地址", - "setup_legal_switch_tile": "我了解並確認只有我持有我的幣的密鑰，沒有人可以在沒有我的種子碼的情況下幫助我恢復它們。此應用程式的開發人員和點點幣基金會不提供任何保證。我將自行承擔使用此應用程式的風險。我已閱讀並理解上述許可。", + "setup_legal_switch_tile": "我理解並知曉，只有我擁有我的貨幣金鑰。 沒有人能夠在沒有我的助記詞的情況下幫助我恢復它們。 此應用程式的開發者和點點幣基金會不提供任何擔保。 我將自擔風險使用此應用程式。 我已閱讀並理解上述許可證。", "setup_legal_license": "查看許可", "setup_auth_title": "選擇網絡會話過期時間：", "setup_auth_subtitle_plural": "您的會話將在$days天後過期。", "setup_auth_subtitle_singular": "您的會話將在$days天後過期。", - "setup_auth_hint": "會話過期後，您必須重新輸入種子碼。", + "setup_auth_hint": "會話過期後，您必須重新輸入助記詞。", "about_donate_button": "立即捐贈PPC", - "app_settings_delete_description": "由於您在此應用程式中尚未創建帳戶，因此沒有任何東西可供刪除。您創建了一個\\\"錢包種子碼\\\"，這是一個數學計算。您的種子碼可以在支持種子碼的任何應用程式中使用。您也沒有任何帶有後台通知或價格源API的帳戶。此應用程式尊重您的隱私，並且設計為私密。", + "app_settings_delete_description": "由於您尚未在此應用程式中建立帳戶，因此沒有任何可刪除的內容。 您創建了一個“錢包助記詞”，它是一個密碼操作。 用您的助記詞，採用數學方法產生私鑰。 它可以在支援種子短語的任何應用程式中使用。 您也沒有任何有後台通知或價格資料來源 API 的帳戶。 此應用程式重視您的隱私，並以設計為私密。", "buy_peercoin": "購買點點幣", "about_data_protection": "此软件尽最大能力保护您的数据和隐私。\n此应用程序将所有必要数据存储在设备本地。\n其中不包含任何分析或广告软件。", "addressbook_add_new": "添加新地址", "addressbook_dialog_addr_watched": "地址 $address\n已监视", "addressbook_export_dialog_description": "此私钥可完全访问与此地址关联的币。\n请勿与任何人分享此私钥！\n除非您完全确定自己在做什么，否则不要继续。", "app_settings_default_description": "启动应用时，默认将打开该钱包。", - "app_settings_notifications_alert_content": "这将启用我们的隐私友好的后台通知。\n随时可以禁用。", + "app_settings_notifications_alert_content": "將啟用私密友善的後台通知。\n可在任何時間停用。", "app_settings_notifications_hint_sync_2": "通知可能会受到显著延迟，这取决于操作系统如何以及是否对后台任务进行限制。iOS 设备可能会有更长的间隔。", "authenticate_retry_warning_text": "应用将进入锁定状态，只能通过成功身份验证解锁。", "currency_ARS": "阿根廷比索", @@ -323,9 +323,9 @@ "currency_SEK": "瑞典克朗", "currency_VND": "越南盾", "import_wif_alert_content": "请确认您希望导入以下地址：\n\n$address", - "import_wif_hint": "当从种子还原钱包时，必须再次导入此密钥。它与种子没有关联。", + "import_wif_hint": "從助記詞恢復錢包時，必須再次導入密鑰。 它未連接到助記詞。", "notification_title": "$walletTitle - 收到新交易", - "paperwallet_step_4_text": "扫描纸钱包", + "paperwallet_step_4_text": "掃描紙錢包", "periodic_reminder_donate_body": "此应用由點點幣基金会开发。\n请考虑捐款以支持點點幣和此应用的开发。", "receive_website_description": "您可以直接使用信用卡（仅限非美国客户）或从各种交易所和服务购买點點幣。", "send_amount_below_minimum": "最小输出为 $amount。\n请选择大于或等于该金额的金额。", @@ -333,18 +333,18 @@ "send_fees_deducted": "信息：强制交易手续费已从上一个接收者中扣除。转到此地址的金额现在较低。", "send_transferring": "转账中 ", "server_add_no_wss": "必须以 wss:// 开头\n目前不支持其他协议", - "server_add_server_wrong_genesis": "创世区块哈希不匹配。\n此服务器不支持此币种。", + "server_add_server_wrong_genesis": "創世 hash 不符。\n此伺服器不支援此幣。", "setup_continue_alert_content": "确保已保存您的种子短语。\n您稍后可以在应用设置中访问它。", - "setup_import_note": "請輸入您要導入的種子碼。請注意，這不是私鑰。", + "setup_import_note": "請輸入您要匯入的錢包助記詞。 請勿將其與私鑰混淆。", "setup_bg_sync_description": "這將啟用錢包的後台通知。", "setup_text1": "如果您已經創建了錢包並且仍然有種子碼，那麼選擇", - "setup_save_text1": "以下單詞列表稱為種子碼。它是一個復雜的密碼，將完全控制您的錢包和所有的加密幣。", + "setup_save_text1": "下面這個單字清單稱為「助記詞」。 這是一個複雜的密碼，您將用它來完全控制您的錢包和所有的硬幣。", "wallet_pop_menu_paperwallet": "掃描紙錢包", "wallet_pop_menu_servers": "調整伺服器", "wallet_receive_label_hint_privacy": "出於隱私原因，不建議重複使用您的地址。如果您想重複使用此地址，使用後必須在地址簿中將其設置為“已關注”。", "wallet_scan_notice_bg_notifications": "在應用程式設定中啟用後台通知可以大幅提高掃描的可靠性。", "wallet_value_alert_content": "在移動錢包中存儲此數量的幣值存在風險。\n考慮將您的幣值轉移到Stakebox、Ledger硬件錢包或冷錢包。", - "store_description": "在手機上發送和接收點點幣，這是權益證明的先驅。\n\n請保護好您的錢包種子碼。\n此應用程式不提供任何保修。\n請自行承擔風險。\n\n功能：\n- 基於電子系統協議。\n- 發送和接收點點幣。\n- 安裝後即可進行交易（無需等待）。\n- 點點幣和點點幣測試網路錢包。\n- 地址簿管理。\n- 導入紙錢包。\n- 導入和導出私鑰（WIF）。\n- 伺服器管理。\n- 多語言支援。\n- 後台通知。\n\n已知限制請參閱Github存儲庫。", + "store_description": "在手機上發送和接收點點幣，這是權益證明的先驅。\n\n請保護好您的錢包助記詞。\n此應用程式不提供任何保修。\n請自行承擔風險。\n\n功能：\n- 基於電子系統協議。\n- 發送和接收點點幣。\n- 安裝後即可進行交易（無需等待）。\n- 點點幣和點點幣測試網路錢包。\n- 地址簿管理。\n- 導入紙錢包。\n- 導入和導出私鑰（WIF）。\n- 伺服器管理。\n- 多語言支援。\n- 後台通知。\n\n已知限制請參閱Github存儲庫。", "wallet_title_edit": "編輯錢包標題", "wallet_title_edit_new_title": "新標題", "wallet_pop_menu_change_title": "更改標題", diff --git a/lib/screens/wallet/wallet_sign_transaction.dart b/lib/screens/wallet/wallet_sign_transaction.dart index 37854a56..893d4155 100644 --- a/lib/screens/wallet/wallet_sign_transaction.dart +++ b/lib/screens/wallet/wallet_sign_transaction.dart @@ -1,4 +1,5 @@ import 'package:coinlib_flutter/coinlib_flutter.dart'; +import 'package:collection/collection.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -25,7 +26,7 @@ class _WalletSignTransactionScreenState late WalletProvider _walletProvider; bool _initial = true; bool _signingDone = false; - bool _signingError = false; + String _signingError = ''; String _signedTx = ''; String _signingAddress = ''; final TextEditingController _txInputController = TextEditingController(); @@ -167,18 +168,52 @@ class _WalletSignTransactionScreenState identifier: _walletName, address: _signingAddress, ); + final privKey = WIF.fromString(wif).privkey; - final tx = Transaction.fromHex(_txInputController.text); + Transaction tx = Transaction.fromHex(_txInputController.text); final selectedInputResult = await _showInputSelector(tx.inputs.length); if (selectedInputResult == false) return; if (_checkedInputs.values.every((element) => element == false)) return; + // conversion step for cointoolkit start + tx = Transaction( + inputs: tx.inputs.mapIndexed((i, input) { + if (!_checkedInputs.containsKey(i) || _checkedInputs[i]! == false) { + //don't convert this unselected input, return as is + return input; + } + + // Determine program from cointoolkit input script data + final program = Program.decompile(input.scriptSig); + + if (program is P2PKH) { + return P2PKHInput( + prevOut: input.prevOut, + publicKey: privKey.pubkey, + ); + } + + if (program is MultisigProgram) { + return P2SHMultisigInput( + prevOut: input.prevOut, + program: program, + ); + } + + return input; + }), + outputs: tx.outputs, + version: tx.version, + locktime: tx.locktime, + ); + // conversion step for cointoolkit end + Transaction txToSign = tx; _checkedInputs.forEach((key, value) { if (value) { txToSign = tx.sign( inputN: key, - key: WIF.fromString(wif).privkey, + key: privKey, ); } }); @@ -201,7 +236,7 @@ class _WalletSignTransactionScreenState e.toString(), ); setState(() { - _signingError = true; + _signingError = e.toString(); }); } } @@ -462,14 +497,15 @@ class _WalletSignTransactionScreenState active: _signingAddress.isNotEmpty && _txInputController.text.isNotEmpty, ), - _signingError + _signingError.isNotEmpty ? Padding( padding: const EdgeInsets.symmetric(vertical: 10), child: Text( key: const Key('signingError'), - AppLocalizations.instance.translate( + '${AppLocalizations.instance.translate( 'sign_transaction_signing_failed', - ), + )}\n$_signingError', + textAlign: TextAlign.center, style: TextStyle( color: Theme.of(context).colorScheme.error, ), diff --git a/pubspec.yaml b/pubspec.yaml index 8c08e078..0805314e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: peercoin description: A new Peercoin wallet. -version: 1.2.5+137 +version: 1.2.6+138 environment: sdk: '>=3.2.0 <4.0.0'