From 27e46f6f265f994a23d899e79eaf81cdf046593a Mon Sep 17 00:00:00 2001 From: Kim Neunert Date: Thu, 2 Jun 2022 17:45:46 +0200 Subject: [PATCH 1/6] Release-notes for v1.10.1 --- docs/release-notes.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/release-notes.md b/docs/release-notes.md index fcc7aebb8f..26e3597f47 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -1,3 +1,11 @@ +## v1.10.1 Juni 02, 2022 +- Feature: Basic auth in electron #1730 (djpnewton) +- Feature: Multisig beginner guide #1731 (relativisticelectron) +- Bugfix: Corrected build instructions and made virtuelenv name dynamic #1735 (relativisticelectron) +- Bugfix: issues while using specter as library #1740 (k9ert) +- Bugfix: PDF backup does not open for multisig #1741 (k9ert) +- UIUX: fix typo in error_logs #1739 (Bufo) + ## v1.10.0 Mai 27, 2022 - Feature: adding has_service() method to user #1732 (Kim Neunert) - Feature: Choose file button for labels import #1682 (Manolis) From 7ab14f2e217b907cb0382fce79a23bfbb021bf3b Mon Sep 17 00:00:00 2001 From: Kim Neunert Date: Fri, 3 Jun 2022 10:08:55 +0200 Subject: [PATCH 2/6] corrected release-notes --- docs/release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/release-notes.md b/docs/release-notes.md index 26e3597f47..a710622455 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -1,4 +1,4 @@ -## v1.10.1 Juni 02, 2022 +## v1.10.2 Juni 03, 2022 - Feature: Basic auth in electron #1730 (djpnewton) - Feature: Multisig beginner guide #1731 (relativisticelectron) - Bugfix: Corrected build instructions and made virtuelenv name dynamic #1735 (relativisticelectron) From fa20169b57936404a20bcbe95cc919a8e49d4b3f Mon Sep 17 00:00:00 2001 From: Manolis Mandrapilias <70536101+moneymanolis@users.noreply.github.com> Date: Sun, 5 Jun 2022 20:57:31 +0200 Subject: [PATCH 3/6] UIUX: Fixed html character codes for multisig guide & polishment of about page (#1743) * fixed unknown html character codes in links for multisig guide and documentation * some front end polishment of the about page. --- src/cryptoadvance/specter/static/styles.css | 1 - src/cryptoadvance/specter/templates/base.jinja | 12 ++++++------ .../wallet/new_wallet/new_wallet_type.jinja | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/cryptoadvance/specter/static/styles.css b/src/cryptoadvance/specter/static/styles.css index 7318cc2e30..3247216fcd 100644 --- a/src/cryptoadvance/specter/static/styles.css +++ b/src/cryptoadvance/specter/static/styles.css @@ -235,7 +235,6 @@ nav.side > a.item.active, nav.side > div > a.item.active{ max-width: 90%; padding-left: 1em; padding-right: 1em; - padding-top: .5em; margin-bottom: 1em; background-color: #263044; border: 1px solid #CCCCCC; diff --git a/src/cryptoadvance/specter/templates/base.jinja b/src/cryptoadvance/specter/templates/base.jinja index dda0fc82b3..59ca4df921 100644 --- a/src/cryptoadvance/specter/templates/base.jinja +++ b/src/cryptoadvance/specter/templates/base.jinja @@ -127,8 +127,8 @@ {% endif %}
-

{{ _("Specter Desktop is a convenient wallet interface to better use your Bitcoin Core node. It’s good for singlesig wallets, but comes with a special focus on multisignature setups for different hardware wallets and air-gapped signing devices.") }} - Learn 🕮 {{ _("here") }} more about multisig. +

{{ _("Specter Desktop is a convenient wallet interface to better use your Bitcoin Core node. It’s good for singlesig wallets, but comes with a special focus on multisignature setups for different hardware wallets and air-gapped signing devices.") }}

+ 📙 Learn {{ _("here") }} more about multisig.

@@ -243,14 +243,14 @@
{% endif %} -

{{ _('Have a look at our 🕮 help or FAQ') }}



- {{ _("Still having issues?") }}
+

👀{{ _(' Have a look at our documentation and the FAQ') }}


+ 🙇{{ _(" Still having issues?") }}
-

{{ _('Feel free to open an issue on the GitHub or ask in the Specter Community telegram chat') }}

+

{{ _('Feel free to open an issue on GitHub or ask in the Specter Community telegram chat') }}

-

+

{{ _('Help wanted: Do you like Specter?') }}
{{ _("Supported and maintained by") }}:
diff --git a/src/cryptoadvance/specter/templates/wallet/new_wallet/new_wallet_type.jinja b/src/cryptoadvance/specter/templates/wallet/new_wallet/new_wallet_type.jinja index 672890906f..5f84f565bf 100644 --- a/src/cryptoadvance/specter/templates/wallet/new_wallet/new_wallet_type.jinja +++ b/src/cryptoadvance/specter/templates/wallet/new_wallet/new_wallet_type.jinja @@ -55,8 +55,8 @@ {% include "wallet/new_wallet/components/import_wallet_account_map.jinja" %} - - New to Multisig? Read our 🕮 {{ _("Multisig guide") }} + + {{ _("New to multisig? ") }}📙{{ _(" Learn") }} here {{ _("more about multisig") }}.
From b83c26afcf3a9f945c040d06e200229bbcd0c169 Mon Sep 17 00:00:00 2001 From: Ankur Date: Fri, 10 Jun 2022 13:57:07 +0530 Subject: [PATCH 4/6] Docs: Corrected links in development.md (#1742) --- docs/development.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/development.md b/docs/development.md index 340eb3694c..d0c3c3f77f 100644 --- a/docs/development.md +++ b/docs/development.md @@ -224,7 +224,7 @@ it each time it's starting with the genesis-block. This has some implications: * Depending on whether you do one or the other, you cannot rely on transactionIDs. So if you run a test standalone twice, you can assert txids but you can't any longer when you run all the tests ### Cypress UI-testing -Cypress is just awesome. It's quite easy to create Frontend-tests and it's even recording all tests and you can immediately see how it went. So each test-run, the tests are kept for one day (see the ["artifacts-section"](https://github.com/k9ert/specter-desktop/blob/cypress/.gitlab-ci.yml#L53-L58)) and you can watch them by browsing the artifacts on any gitlab-job-page (right-hand-side marked with "Job artifacts"). +Cypress is just awesome. It's quite easy to create Frontend-tests and it's even recording all tests and you can immediately see how it went. So each test-run, the tests are kept for one day (see the ["artifacts-section"](https://github.com/cryptoadvance/specter-desktop/blob/master/.gitlab-ci.yml) and you can watch them by browsing the artifacts on any gitlab-job-page (right-hand-side marked with "Job artifacts"). Executing the tests is done via `./utils/test-cypress.sh`: ``` @@ -237,7 +237,7 @@ Executing the tests is done via `./utils/test-cypress.sh`: ``` The test_specifications which get executed are specified in `cypress.json`. -More details on cypress-testing can be found in [cypress-testing.md](docs/cypress-testing.md). +More details on cypress-testing can be found in [cypress-testing.md](./cypress-testing.md). Make sure to read it. The tooling we created around cypress might be quite helpful in daily development. In short, you can do this and the last command will give you a reliable development-environment which is the very same whenever you start it anew: ``` @@ -254,7 +254,7 @@ Other than Django, Flask is not opionoated at all. You can do all sorts of thing One strange thing which we're doing to get the tests working is forcing the reload of the controller-code (if necessary) [here](https://github.com/cryptoadvance/specter-desktop/blob/master/src/cryptoadvance/specter/server.py#L88-L93). The if-clause might be quite brittle which would result in very strange 404 in test_controller. -Check the [archblog](./docs/archblog.md) for a better explanation. +Check the [archblog](./archblog.md) for a better explanation. If Someone could figure out a better way to do that avoiding this strange this ... very welcome. ## More on the bitcoind requirements From 5f82e2a8f89f5532f2f609f75d8d7fd0152f02bd Mon Sep 17 00:00:00 2001 From: Harshit <52852877+ahv15@users.noreply.github.com> Date: Tue, 14 Jun 2022 19:27:34 +0530 Subject: [PATCH 5/6] Bugfix: Send max with multiple recipients (#1744) * Show subtract from field with appropriate recipient number when using send max for batch tx * New cypress test to cover this * Misc: spec_plugins adjusted Co-authored-by: moneymanolis --- cypress/integration/spec_plugins.js | 43 ++++++----- cypress/integration/spec_wallet_send.js | 73 +++++++++++++++++-- cypress/plugins/index.js | 1 - cypress/support/commands.js | 12 +++ .../templates/includes/fee-selection.html | 10 ++- .../wallet/send/new/wallet_send.jinja | 2 + 6 files changed, 113 insertions(+), 28 deletions(-) diff --git a/cypress/integration/spec_plugins.js b/cypress/integration/spec_plugins.js index 88f49d0c9e..dad1feba6b 100644 --- a/cypress/integration/spec_plugins.js +++ b/cypress/integration/spec_plugins.js @@ -1,35 +1,38 @@ -describe('plugins are working', () => { - - it('can create the associate button', () => { +describe('Test plugins', () => { + before(() => { + Cypress.config('includeShadowDom', true) + }) + + // Keeps the session cookie alive, Cypress by default clears all cookies before each test + beforeEach(() => { cy.viewport(1200,660) cy.visit('/') - + }) + + it('Associate an address with a service', () => { // choose address - cy.get('#test_hot_wallet_1-sidebar-list-item').click() - cy.get('[href="/wallets/wallet/test_hot_wallet_1/addresses/"]').click() - cy.get('addresses-table').shadow().find('address-row').eq(0).shadow().find('.explorer-link').eq(0).click({position: 'top'}) - cy.get('address-data').shadow().find('#associate-btn').click() - + cy.selectWallet("Wallet ghost") + cy.get('main').contains('Addresses').click() + // Click on the first address + cy.contains('td', '#0').siblings().contains('bcrt').click() + cy.get('#associate-btn').click() cy.contains("Service integration requires an authentication method that includes a password") - // ok, let's set a password + // OK, let's set a password cy.get('select').select("passwordonly") cy.get('#specter_password_only').type("mySecretPassword") cy.get('#submit-btn').click() cy.contains("Admin password successfully updated") - // choose address again - cy.get('#test_hot_wallet_1-sidebar-list-item').click() - cy.get('[href="/wallets/wallet/test_hot_wallet_1/addresses/"]').click() - cy.get('addresses-table').shadow().find('address-row').eq(0).shadow().find('.explorer-link').eq(0).click() - cy.get('address-data').shadow().find('#associate-btn').click() + // Choose address again + cy.selectWallet("Wallet ghost") + cy.get('main').contains('Addresses').click() + cy.contains('td', '#0').siblings().contains('bcrt').click() + cy.get('#associate-btn').click() cy.contains("Associating an address with a service will") - - }) - it('deactivates the password protection again', () => { - cy.viewport(1200,660) - cy.visit('/') + it('Deactivate password protection', () => { + // This flow only works if we don't keep the session alive! So, no Cypress.Cookies.preserveOnce('session') in beforeEach(). cy.get('#password').type("mySecretPassword") cy.get('#login-btn').click() cy.get('[href="/settings/"] > .svg-white').click() diff --git a/cypress/integration/spec_wallet_send.js b/cypress/integration/spec_wallet_send.js index 6d5b2171b5..b3be625414 100644 --- a/cypress/integration/spec_wallet_send.js +++ b/cypress/integration/spec_wallet_send.js @@ -1,7 +1,16 @@ -describe('Send transactions from bitcoin hotwallets', () => { - it('Creates a single sig bitcoin hotwallet on specter and send transaction', () => { +describe('Test sending transactions', () => { + before(() => { + Cypress.config('includeShadowDom', true) + }) + + // Keeps the session cookie alive, Cypress by default clears all cookies before each test + beforeEach(() => { cy.viewport(1200,660) cy.visit('/') + Cypress.Cookies.preserveOnce('session') + }) + + it('Send a standard transaction', () => { // empty so far cy.addHotDevice("Hot Device 1","bitcoin") cy.get('body').then(($body) => { @@ -42,9 +51,60 @@ describe('Send transactions from bitcoin hotwallets', () => { }) }) - it('Creates a multi sig wallet on specter and send transaction', () => { - cy.viewport(1200,660) - cy.visit('/') + it('Create a transaction with multiple recipients', () => { + // We need new sats but mine2wallet only works if a wallet is selected + cy.selectWallet("Test Hot Wallet 1") + cy.mine2wallet("btc") + cy.get('#btn_send').click() + /// The addresses are the first three from DIY ghost + cy.get('#address_0').type("bcrt1qvtdx75y4554ngrq6aff3xdqnvjhmct5wck95qs") + cy.get('#label_0').type("Recipient 1") + cy.get('#amount_0').type(10) + cy.get('#toggle_advanced').click() + cy.get('main').scrollTo('bottom') + cy.get('#add-recipient').click() + cy.get('#address_1').type("bcrt1qgzmq6e3tn67kveryf2je6nd3nv4txef4sl8wre") + cy.get('#label_1').type("Recipient 2") + cy.get('#amount_1').type(5) + cy.get('main').scrollTo('bottom') + cy.get('#add-recipient').click() + cy.get('#address_2').type("bcrt1q9mkrhmxcn7rslzfv6lke8859m7ntwudfjqmcx7") + cy.get('#label_2').type("Recipient 3") + cy.get('#send_max_2').click() + cy.get('main').scrollTo('bottom') + // Shadow DOM + // Check whether the subtract fees box is ticked + cy.get('#fee-selection-component').find('.fee_container').find('input#subtract').invoke('prop', 'checked').should('eq', true) + // Check whether the recipient number input field is visible (shadow DOM) + cy.get('#fee-selection-component').find('.fee_container').find('span#subtract_from').should('be.visible') + // Light DOM + // Check the values of the hidden inputs in the light DOM which are used for the form + // Note: Despite identical ids the hidden inputs seem to be fetched first since they are higher up in the DOM + cy.get('#fee-selection-component').find('#subtract').invoke('attr', 'value').should('eq', 'true') + // Send max was applied to the third recipient, so the value should be 3 + cy.get('#fee-selection-component').find('#subtract_from_input').invoke('attr', 'value').should('eq', '3') + + // Change recipient number to 2 + // Note: No easy way to increment / decrement by clicking, see: https://stackoverflow.com/questions/47180137/incrementing-and-decrementing-the-value-of-an-input-type-number-in-cypress + cy.get('#fee-selection-component').find('.fee_container').find('#subtract_from_input').clear() + cy.get('#fee-selection-component').find('.fee_container').find('#subtract_from_input').click().type('2{enter}') + cy.get('#fee-selection-component').find('#subtract_from_input').invoke('attr', 'value').should('eq', '2') + + // Change it back to recipient 3 + cy.get('#send_max_2').click() + + // The fee should be subtracted from the third recipient + cy.get('#create_psbt_btn').click() + cy.get('div.tx_info > :nth-child(3) > :nth-child(1)').then(($div) => { + const amount = parseFloat($div.text()) + expect(amount).to.be.lte(5) + }) + cy.get('#deletepsbt_btn').click() + // Clean up (Hot Device 1 is still needed below) + cy.deleteWallet("Test Hot Wallet 1") + }) + + it('Send a transaction from a multisig wallet', () => { cy.get('body').then(($body) => { if ($body.text().includes('Test Multisig Wallet 1')) { cy.get('#wallets_list > .item > svg').click() @@ -83,5 +143,8 @@ describe('Send transactions from bitcoin hotwallets', () => { const n = parseFloat($div.text()) expect(n).to.be.equals(0) }) + // Clean up + cy.deleteWallet("Test Multisig Wallet 1") + cy.deleteDevice("Hot Device 1") }) }) \ No newline at end of file diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js index 4483601a3a..e49f3e3114 100644 --- a/cypress/plugins/index.js +++ b/cypress/plugins/index.js @@ -48,7 +48,6 @@ module.exports = (on, config) => { } }) - // For future use, not used yet on('task', { 'delete:bitcoin-hotwallet': (name) => { console.log('connection details: %s', btc_conn) diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 7ac01e0ca9..c106b73e26 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -96,6 +96,9 @@ Cypress.Commands.add("deleteDevice", (name) => { cy.contains(name).click() cy.get('#forget_device').click() cy.reload() + // For hot wallets only + cy.task("delete:bitcoin-hotwallet") + cy.task("delete:elements-hotwallet") } }) }) @@ -162,8 +165,17 @@ Cypress.Commands.add("deleteWallet", (name) => { }) }) +Cypress.Commands.add("selectWallet", (name) => { + cy.get('body').then(($body) => { + if ($body.text().includes(name)) { + cy.contains(name).click() + } + }) +}) + Cypress.Commands.add("mine2wallet", (chain) => { // Fund it and check the balance + // Only works if a wallet is selected, use addHotWallet / selectWallet commands before if needed cy.get('#btn_transactions').click() cy.get('#fullbalance_amount', { timeout: Cypress.env("broadcast_timeout") }).then(($span) => { const oldBalance = parseFloat($span.text()) diff --git a/src/cryptoadvance/specter/templates/includes/fee-selection.html b/src/cryptoadvance/specter/templates/includes/fee-selection.html index 5169fe3a2e..a7e21fb3af 100644 --- a/src/cryptoadvance/specter/templates/includes/fee-selection.html +++ b/src/cryptoadvance/specter/templates/includes/fee-selection.html @@ -16,7 +16,7 @@

@@ -175,6 +175,7 @@ // subtract_from (the actual input field) this.ld.subtractFromInput = this.subtractFromInput.cloneNode(true); this.ld.subtractFromInput.type = "hidden"; + this.ld.subtractFromInput.name = "subtract_from"; this.appendChild(this.ld.subtractFromInput); // This is just for exposure to the jinja template for displaying, not needed for the form POST @@ -208,7 +209,7 @@ this.rbfUpdated(); }) - this.subtractFromInput.addEventListener("click", (event) => { + this.subtractFromInput.addEventListener("change", (event) => { this.subtractUpdated(); }) @@ -332,6 +333,11 @@ } catch(e) {console.log(e)} } + + setSubtractFrom(recipient) { + this.subtractFromInput.value = recipient + } + // Updates Light DOM values for the form subtractUpdated() { if (this.subtract.checked) { diff --git a/src/cryptoadvance/specter/templates/wallet/send/new/wallet_send.jinja b/src/cryptoadvance/specter/templates/wallet/send/new/wallet_send.jinja index 9cf66020db..26997ec54f 100644 --- a/src/cryptoadvance/specter/templates/wallet/send/new/wallet_send.jinja +++ b/src/cryptoadvance/specter/templates/wallet/send/new/wallet_send.jinja @@ -387,6 +387,8 @@ } async function setMaxAmount(i) { + FeeSelectionComponent.showSubtractFrom(true) + FeeSelectionComponent.setSubtractFrom(i + 1) let amountInput = document.getElementById('amount_' + i); if (!validAddress(i)) { return; From 14cb11b0509f906a69346e528122b91242e951f1 Mon Sep 17 00:00:00 2001 From: relativisticelectron <60378539+relativisticelectron@users.noreply.github.com> Date: Sun, 19 Jun 2022 14:28:37 +0200 Subject: [PATCH 6/6] Feature: combined test script for cypress and pytest (#1749) * Added test script * renamed * cypress run * Delete cypress output folders Co-authored-by: k9ert --- utils/test-all-linux.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100755 utils/test-all-linux.sh diff --git a/utils/test-all-linux.sh b/utils/test-all-linux.sh new file mode 100755 index 0000000000..b1f18e9bbb --- /dev/null +++ b/utils/test-all-linux.sh @@ -0,0 +1,23 @@ +#!/bin/bash + + +pip3 install virtualenv +virtualenv --python=python3 .env +source .env/bin/activate +pip3 install -r requirements.txt --require-hashes +pip3 install -e . +python3 setup.py install # also compiles the babel translation-files + + +pip3 install -r test_requirements.txt +./tests/install_noded.sh --bitcoin binary +./tests/install_noded.sh --elements binary + + +export PATH=./tests/elements/bin/:./tests/bitcoin/bin/:$PATH + +rm -Rf ./cypress/videos ./cypress/screenshots + +./utils/test-cypress.sh run +pytest +