Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
LukasBures committed Aug 3, 2018
2 parents 3e82035 + f75c524 commit 9b5d8ba
Show file tree
Hide file tree
Showing 40 changed files with 1,209 additions and 322 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ matrix:
sudo: required
language: c
- os: windows
sudo: required
env: TARGET_ARCH=x64
language: c
- os: linux
Expand Down
13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
[![Code Climate][codeclimate-img]][codeclimate-url]

# User Manuals
- v1.1.9: [Arizen v1.1.9 Wallet User Manual.pdf](https://github.com/ZencashOfficial/arizen/releases/download/v1.1.9/Arizen.v1.1.9.Wallet.User.Manual.pdf)
- v1.1.8: [Arizen v1.1.8 Wallet User Manual.pdf](https://github.com/ZencashOfficial/arizen/releases/download/v1.1.8/Arizen.v1.1.8.Wallet.User.Manual.pdf)
- v1.1.7: [Arizen v1.1.7 Wallet User Manual.pdf](https://github.com/ZencashOfficial/arizen/releases/download/v1.1.7/Arizen.v1.1.7.Wallet.User.Manual.pdf)
- v1.1.6: [Arizen v1.1.6 Wallet User Manual.pdf](https://github.com/ZencashOfficial/arizen/releases/download/v1.1.6/Arizen.v1.1.6.Wallet.User.Manual.pdf)
Expand All @@ -15,6 +16,18 @@

# Version History

## v1.1.9
- [x] Batch Split
- [x] Add certificate login to the Secure Node
- [x] Max button in withdraw tab
- [x] Speed-up
- [x] Minor fixes
- [x] More languages
- [x] Hide LEDs when Secure Node is not connected/setting is not presented
- [x] Less confusing "create wallet" dialog
- [x] Additional warnings and errors in the login process
- [x] Disallow generating/clicking on create new Z address when Secure Node is not connected

## v1.1.8
- [x] Refactor: batch-withdraw functionality
- [x] Introduce booster for batch-withdraw functionality (speed-up logic in case of many addresses)
Expand Down
9 changes: 8 additions & 1 deletion app/create_wallet.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,20 @@
<span style="text-align:center;"><label id="pswd_again_label" for="pswd_again" data-tr=createWallet.passwordAgain>Password again</label></span>
<span><input id="pswd_again" class="inputs" name="pswd_again" type="password" onkeyup="checkPasswdAgain();" tabindex="3" onfocus="selectColumn(false, false, true);checkPasswdAgain();"/></span>
</li>

<li>
<span class=checkmark style="text-align:center;" data-tr=createWallet.haveBackup>Do you have previous backup?
<input type=checkbox id=have_previous_backup_checkbox name=have_previous_backup_checkbox onclick="haveBackup()">
</span>
</li>
<li>
<div id="have_previous_backup">
<span class="marginLeft5p" data-tr=createWallet.selectWallet>Select Wallet
<input id="btWalletButton" class="buttons btWalletButtonClass" name="btWalletButton" type="button" data-tr=createWallet.selectWalletButton value="Browse" tabindex="4" onclick="document.getElementById('btWallet').click();"/>
<input id="btWallet" name="btWallet" style="display: none;" type='file' accept=".awd,.uawd" onchange="handleWalletFile()"/>
</span>
<span id="btWalletFilename" class="right"></span>

</div>
</li>
<li>
<div id="old_username_area">
Expand Down
18 changes: 18 additions & 0 deletions app/create_wallet.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,3 +150,21 @@ function handleWalletFile() {
}
document.getElementById("old_username_area").style.display = targetStyle;
}

function haveBackup() {
let re = /(?:\.([^.]+))?$/;
let targetStylePreviousBackup = "none";

if(document.getElementById("have_previous_backup_checkbox").checked){
targetStylePreviousBackup = "block";
document.getElementById("btWalletFilename").textContent = document.getElementById("btWallet").value;
if (re.exec(document.getElementById("btWallet").value)[1] === "awd") {
document.getElementById("old_username_area").style.display = "block";
}
} else {
targetStylePreviousBackup = "none";
document.getElementById("old_username_area").style.display = "none";
}

document.getElementById("have_previous_backup").style.display = targetStylePreviousBackup;
}
32 changes: 25 additions & 7 deletions app/lang/lang_ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"loginButton": "تسجيل الدخول",
"createWalletLink": "إنشاء محفظة",
"warningWrongUsernameOrPassword": "اسم المستخدم أو كلمة المرور خاطئة",
"dataImportFailed": "فشل استيراد البيانات، هل بيانات الاعتماد صحيحة؟",
"dataImportFailed1": "Data import failed, possible reason is wrong credentials or file is corrupted.",
"dataImportFailed2": "فشل استيراد البيانات، هل بيانات الاعتماد صحيحة؟",
"fileReplace": "هل تريد استبدال الملف؟",
"walletReplace": "استبدال المحفظة؟",
"walletReplaceMsg": "سيؤدي هذا إلى استبدال المحفظة الفعلية. هل أنت واثق؟",
Expand Down Expand Up @@ -40,7 +41,8 @@
"warningPasswordAgain": "يجب أن تستوفي كلمة المرور المتطلبات التالية:",
"warningPasswordAgainIdentical": "<strong>مطابق</strong>",
"errorCreationFailed": "أخفق إنشاء المحفظة",
"errorFailedResponse": "استجابة فاشلة"
"errorFailedResponse": "استجابة فاشلة",
"haveBackup": "Do you have previous backup?"
},
"notification": {
"settingsUpdated": "تم تحديث الإعدادات",
Expand Down Expand Up @@ -124,7 +126,8 @@
"error": "خطأ",
"success": "اكتملت المعاملة بنجاح",
"isCoinbaseUTXO": "Your address contains newly mined coins, also called coinbase unspent transaction outputs (coinbase UTXO). These need to be shielded and unshielded first before they can be spent, please import the private key of this address into a full wallet like Swing and then send all your coins from this address to a Z-address and then back to this T-address. You will be then able to spend them in Arizen as well.",
"tooManyUTXOs": "Your address consists of too many UTXOs, it is not possible to send this transaction via API!"
"tooManyUTXOs": "Your address consists of too many UTXOs, it is not possible to send this transaction via API!",
"noSourceAddress": "No source address was selected!"
}
},
"transactionHistory": {
Expand Down Expand Up @@ -168,6 +171,8 @@
"enableNotifications": "Desktop notifications",
"enableDomainFronting": "Domain fronting",
"secureNodeFQDN": "Secure Node FQDN",
"sshPrivateKey": "Path to SSH private key file",
"sshPassphrase": "Passphrase for SSH private key file (if necessary)",
"sshUsername": "SSH username",
"sshPassword": "SSH password",
"sshPort": "SSH port",
Expand All @@ -179,7 +184,8 @@
"domainFrontingUrl": "Domain fronting public base URL",
"domainFrontingHost": "Domain fronting private host",
"autoLogOffEnable": "Enable automatic log off",
"autoLogOffTimeout": "Auto log off timeout in seconds"
"autoLogOffTimeout": "Auto log off timeout in seconds",
"chooseKeyPath": "Browse"
},
"paperWallet": {
"label": "ورقة المحفظة",
Expand All @@ -194,8 +200,7 @@
},
"batchWithdraw": {
"label": "انسحاب متعددة",
"keepAmount": "المبلغ للحفاظ على",
"txFee": "رسوم التحويل"
"keepAmount": "المبلغ للحفاظ على"
},
"importSinglePrivateKey": {
"openButtonLabel": "Import Private Key",
Expand All @@ -220,7 +225,20 @@
"results": "RPC Results ...",
"status": "Status: ",
"testFunctionButton": "Test Function"
}
},
"batchSplit": {
"label": "Batch Split",
"splitToAmounts": "Split to amounts",
"toAddresses": "To addresses:",
"splitButtonLabel": "Split",
"messages": {
"splitToIsZero": "Split to amounts have to be greater than zero!",
"unknownAddress": "One of your destination address is not in your wallet!",
"tooManyInputsOutputs": "Your transaction contains too many inputs/outputs addresses, please try less address!"
}
},
"max": "Max",
"showBatchSplitDialog": "Batch Split"
},
"menu": {
"file": "ملف",
Expand Down
32 changes: 25 additions & 7 deletions app/lang/lang_bg.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"loginButton": "Влизане",
"createWalletLink": "Създаване на портфейл",
"warningWrongUsernameOrPassword": "Грешно <strong>име на портфейла</strong> или <strong>парола</strong>",
"dataImportFailed": "Неуспешно внасяне на данни, възможна причина е грешка в отчетените данни",
"dataImportFailed1": "Data import failed, possible reason is wrong credentials or file is corrupted.",
"dataImportFailed2": "Неуспешно внасяне на данни, възможна причина е грешка в отчетените данни",
"fileReplace": "Желаете ли да заместите файла?",
"walletReplace": "Заместване на портфейла?",
"walletReplaceMsg": "Това ще замести съществуващия Ви портфейл. Съгласявате ли се?",
Expand Down Expand Up @@ -40,7 +41,8 @@
"warningPasswordAgain": "Паролата трябва да отговаря на следните изисквания:",
"warningPasswordAgainIdentical": "<strong>Идентични</strong>",
"errorCreationFailed": "Неуспешно създаване на портфейл",
"errorFailedResponse": "Няма отговор"
"errorFailedResponse": "Няма отговор",
"haveBackup": "Do you have previous backup?"
},
"notification": {
"settingsUpdated": "Обновени настройки",
Expand Down Expand Up @@ -131,7 +133,8 @@
"error": "Грешка",
"success": "Транзакцията е изпратена успешно",
"isCoinbaseUTXO": "Вашият адрес съдържа новоизкопани койни, също наречени койнбейс незавършени транзакции от добив (coinbase UTXO). Те трябва да бъдат защитени и незащитени преди да могат да бъдат изразходвани. Моля, импортирайте частния ключ на този адрес в пълен портфейл като Swing и след това изпратете всичките си монети от този адрес на Z-адрес и след това обратно на този T-адрес. След това ще можете да ги похарчите в Arizen.",
"tooManyUTXOs": "Вашият адрес съдържа прекалено много UTXOs, не е възможно да изпълните тази транзакция чрез API!"
"tooManyUTXOs": "Вашият адрес съдържа прекалено много UTXOs, не е възможно да изпълните тази транзакция чрез API!",
"noSourceAddress": "No source address was selected!"
}
},
"transactionHistory": {
Expand Down Expand Up @@ -175,6 +178,8 @@
"enableNotifications": "Desktop notifications",
"enableDomainFronting": "Domain fronting",
"secureNodeFQDN": "Secure Node FQDN",
"sshPrivateKey": "Path to SSH private key file",
"sshPassphrase": "Passphrase for SSH private key file (if necessary)",
"sshUsername": "SSH потребителско име",
"sshPassword": "SSH парола",
"sshPort": "SSH порт",
Expand All @@ -186,7 +191,8 @@
"domainFrontingUrl": "Domain fronting public base URL",
"domainFrontingHost": "Domain fronting private host",
"autoLogOffEnable": "Активиране на автоматично потребителско излизане от системата",
"autoLogOffTimeout": "Времетраене до активирането на автоматично потребителско излизане от системата в секунди"
"autoLogOffTimeout": "Времетраене до активирането на автоматично потребителско излизане от системата в секунди",
"chooseKeyPath": "Browse"
},
"paperWallet": {
"label": "Хартиен портфейл",
Expand All @@ -201,8 +207,7 @@
},
"batchWithdraw": {
"label": "Групово изплащане",
"keepAmount": "Сума за запазване",
"txFee": "Такса за транзакция"
"keepAmount": "Сума за запазване"
},
"importSinglePrivateKey": {
"openButtonLabel": "Импортиране на частен ключ",
Expand All @@ -226,7 +231,20 @@
"results": "RPC резултати ...",
"status": "Състояние: ",
"testFunctionButton": "Тестване на функции"
}
},
"batchSplit": {
"label": "Batch Split",
"splitToAmounts": "Split to amounts",
"toAddresses": "To addresses:",
"splitButtonLabel": "Split",
"messages": {
"splitToIsZero": "Split to amounts have to be greater than zero!",
"unknownAddress": "One of your destination address is not in your wallet!",
"tooManyInputsOutputs": "Your transaction contains too many inputs/outputs addresses, please try less address!"
}
},
"max": "Max",
"showBatchSplitDialog": "Batch Split"
},
"menu": {
"file": "Файл",
Expand Down
32 changes: 25 additions & 7 deletions app/lang/lang_cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"loginButton": "Přihlásit",
"createWalletLink": "Vytvořit novou peněženku",
"warningWrongUsernameOrPassword": "Špatné <strong>jméno</strong> nebo <strong>heslo</strong>",
"dataImportFailed": "Import dat selhal, pravděpodobně díky špatným přihlašovacím údajům",
"dataImportFailed1": "Import dat selhal, pravděpodobně díky špatným přihlašovacím údajům nebo je soubor poškozený",
"dataImportFailed2": "Import dat selhal, pravděpodobně díky špatným přihlašovacím údajům",
"fileReplace": "Chcete soubor přepsat?",
"walletReplace": "Přepsání peněženky?",
"walletReplaceMsg": "Tato akce přepíše vaši aktuálné peněženku. Jste si jistý?",
Expand Down Expand Up @@ -40,7 +41,8 @@
"warningPasswordAgain": "Hesla musejí splnit následující požadavky",
"warningPasswordAgainIdentical": "<strong>Musí být identické</strong>",
"errorCreationFailed": "Vytvoření peněženky selhalo",
"errorFailedResponse": "Nezdařilo se"
"errorFailedResponse": "Nezdařilo se",
"haveBackup": "Máte předchozí zálohu?"
},
"notification": {
"settingsUpdated": "Nastavení aktualizováno",
Expand Down Expand Up @@ -124,7 +126,8 @@
"error": "Chyba",
"success": "Transakce úspěšně odeslána",
"isCoinbaseUTXO": "Vaše adresa obsahuje nově vytěžené ZENy, které jsou také nazývány coinbase unspent transaction outputs (coinbase UTXO). Tyto ZENy musí být nejdříve anonymizovány a deanonimizovány, než je bude možné poslat dále. Prosím importujte privátní klíč zdrojové adresy do plné peněženky, např. Swing. Následně pošlete všechny ZENy z této T adresy na Z adresu a opět zpět na tuto T adresu. Následně budete schopni odeslat vaše ZENy i v Arizen.",
"tooManyUTXOs": "Vaše adresa obsahuje příliš mnoho UTXO, není možné odeslat tuto transakci přes API!"
"tooManyUTXOs": "Vaše adresa obsahuje příliš mnoho UTXO, není možné odeslat tuto transakci přes API!",
"noSourceAddress": "Nebyla vabrána žádná zdrojová adresa!"
}
},
"transactionHistory": {
Expand Down Expand Up @@ -169,6 +172,8 @@
"enableNotifications": "Notifikace",
"enableDomainFronting": "Domain fronting",
"secureNodeFQDN": "Secure Node FQDN",
"sshPrivateKey": "Path to SSH private key file",
"sshPassphrase": "Passphrase for SSH private key file (if necessary)",
"sshUsername": "SSH jméno",
"sshPassword": "SSH heslo",
"sshPort": "SSH port",
Expand All @@ -180,7 +185,8 @@
"domainFrontingUrl": "Domain fronting veřejná URL",
"domainFrontingHost": "Domain fronting privátní host",
"autoLogOffEnable": "Zapnout automatické odhlášení",
"autoLogOffTimeout": "Časový limit automatického odhlášení"
"autoLogOffTimeout": "Časový limit automatického odhlášení",
"chooseKeyPath": "Procházet"
},
"paperWallet": {
"label": "Papírová peněženka",
Expand All @@ -195,8 +201,7 @@
},
"batchWithdraw": {
"label": "Hromadný výběr",
"keepAmount": "Minimální zůstatek",
"txFee": "Poplatek za transakci"
"keepAmount": "Minimální zůstatek"
},
"importSinglePrivateKey": {
"openButtonLabel": "Import privátního klíče",
Expand All @@ -221,7 +226,20 @@
"results": "RPC odpověď ...",
"status": "Status: ",
"testFunctionButton": "Otestuj funkci"
}
},
"batchSplit": {
"label": "Hromadné rozdělení",
"splitToAmounts": "Rozdělit do částí",
"toAddresses": "Na adresu:",
"splitButtonLabel": "Rozdělit",
"messages": {
"splitToIsZero": "Části do kterých chcete rozdelit musí být větší než nula!",
"unknownAddress": "Jedna z Vašich cílových adres není ve Vaší peněžence!",
"tooManyInputsOutputs": "Vaše transakce obsahuje příliš mnoho vstupních/výstupních adres, zkuste méně adres!"
}
},
"max": "Max",
"showBatchSplitDialog": "Dávkové rozdělení"
},
"menu": {
"file": "Soubor",
Expand Down
Loading

0 comments on commit 9b5d8ba

Please sign in to comment.