Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: inconsistencies between network versions #1016

Merged
merged 16 commits into from Jan 25, 2019

Conversation

Projects
None yet
4 participants
@alexbarnsley
Copy link
Member

commented Jan 24, 2019

Proposed changes

This PR fixes a few things:

  • Broadcasting when there's no peers
  • Finding peers on v1 networks
  • Dealing with v1 endpoints on v2 networks (possibly added as a result of API headers being different - E.g. Phantom's vendor header for API version)
  • Getting peers from a peer that uses https
  • Transaction timestamp based on current network's Epoch, not Ark's

Types of changes

  • Bugfix (non-breaking change which fixes an issue)
  • Refactoring (improve a current implementation without adding a new feature or fixing a bug)

Checklist

  • I have read the CONTRIBUTING documentation
  • Lint and unit tests pass locally with my changes
@luciorubeens
Copy link
Member

left a comment

SGTM, worked as expected.

@alexbarnsley

This comment has been minimized.

Copy link
Member Author

commented Jan 25, 2019

:crazypuppy: thanks darling

@alexbarnsley alexbarnsley merged commit b620890 into develop Jan 25, 2019

1 check passed

ci/circleci: test-node-9 Your tests passed on CircleCI!
Details
@codecov-io

This comment has been minimized.

Copy link

commented Jan 25, 2019

Codecov Report

Merging #1016 into develop will decrease coverage by 0.08%.
The diff coverage is 24.59%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #1016      +/-   ##
===========================================
- Coverage    38.44%   38.35%   -0.09%     
===========================================
  Files          200      200              
  Lines         4979     5003      +24     
  Branches       981      984       +3     
===========================================
+ Hits          1914     1919       +5     
- Misses        2949     2963      +14     
- Partials       116      121       +5
Impacted Files Coverage Δ
...action/TransactionForm/TransactionFormTransfer.vue 5.42% <ø> (ø) ⬆️
...ransaction/TransactionForm/TransactionFormVote.vue 7.76% <0%> (-0.08%) ⬇️
...TransactionForm/TransactionFormSecondSignature.vue 10.11% <0%> (-0.12%) ⬇️
...actionForm/TransactionFormDelegateRegistration.vue 8.64% <0%> (-0.11%) ⬇️
src/renderer/services/client.js 65.29% <14.28%> (-2.84%) ⬇️
src/renderer/store/modules/peer.js 68.86% <52.38%> (-0.52%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8e75f69...47d56f5. Read the comment docs.

@alexbarnsley alexbarnsley deleted the fix/v1-added-networks branch Jan 25, 2019

@@ -100,7 +100,7 @@ export default {
*/
best: (_, getters) => (ignoreCurrent = true, networkId = null) => {
const peers = getters['bestPeers'](undefined, ignoreCurrent)
if (!peers || !peers.length) {

This comment has been minimized.

Copy link
@dated

dated Jan 29, 2019

Contributor

why was this removed? 🤔 i guess it still works as intended, but the modified condition does not stop the execution as intended.

luciorubeens added a commit that referenced this pull request Jan 29, 2019

chore: release 2.2.1 (#1041)
* improvement: make wallet heading name more visible in dark mode (#996)

* fix: correctly handle zero balance on wallet heading info (#1000)

* fix: conditional alignment of items (#1005)

* improvement: adjust announcement section to fit new design (#982)

* improvement: new instructions section for wallet import/new and network overview page (#1003)

* improvement: new instructions section for wallet import page
* improvement: new instructions section for wallet new page
* improvement: new instructions section for network overview page

* refactor: new wallet selection styles and ui (#1006)

* fix: do not shake when generating new wallets (#1008)

* refactor: success/error colors and delay on clipboard button tooltip (#1010)

* refactor: success/error colors and delay on clipboard button tooltip

* misc: use tailwind classes


Co-authored-by: Lúcio Rubens <luciorubeens@gmail.com>

* docs: fix and improve the instructions of how to translate the app (#1004)

* feat: adapt the contact creation page to new style (#1012)

* refactor: how to infer which background to use on contact new page

* test: adapt the tests

* misc: include the new background for the contact creation page

* feat: add new design to the contact creation page

* refactor: rename contact creation background from `purse.svg` to `wallet.svg`

* refactor: remove unnecessary delegate api calls (#995)

* refactor: differentiate between wallet and contact rename (#988)

* feat/fix: validation on sign/verify modals & signed messages alignment (#1014)

* feat: validation on sign/verify modals

* misc: add :focus color to input icons

* fix: signed message alignment

* refactor: remove nested if branch

* fix: json validation

* misc: update example json format

* feat: different network name style & add ledger flags (#991)

* feat: different style for names provided by the network

* fix: show only ledger wallet if address is also watch only wallet

* fix: correct sorting by name if numerical

* refactor: ledger badge in wallet sidebar

* fix: show wallet/contact name

* feat: make whole wallet/contact card clickable

* feat: network name tooltip on wallet/contact grid view

* fix: create contact card alignment

* misc: set hover styles to wallet/contact name on card

* fix: network name tooltip condition

* misc: remove wallet/contact name hover classes

* misc: stop click propagation on card name and balance

* misc: ledger badge styles and tooltip

* fix: sidebar truncation length if ledger

* docs: remove the beta warning and collpase list of commands (#1020)

* feat: allow expanding and collapsing the wallet/contact sidebar (#1015)

* fix: inconsistencies between network versions (#1016)

* fix: transaction fees for v1 networks

* chore: update @arkecosystem/client

* fix: store isHttps for current peer in client

* fix: broadcast tx if no other peers

* refactor: rename method to get peer api version

* fix: check config for core-api excluding prefix(es)

* fix: getters return empty array if no peers

* fix: check peer if v2 to update props, not network

* refactor: get /config from wallet to remove header

* fix: only swap ports on refresh if not already

* test: fix by passing peers in as v2 peers not v1

* fix: set tx timestamp based on network epoch

* fix: sending to single peer if broadcast off

* fix: use 3s timeout when broadcasting to peers

* fix: add forged to delegate model (#1017)

* fix: add forged to delegate model

* test: adjust delegate fixtures and tests

* feat: persistent sorting in wallet/contact table (#1002)

* feat: persistent sorting in wallet/contact table

* test: add getter & setter tests

* refactor: replace the profile avatars with a new component `ProfileAvatar` (#1019)

* refactor: extract the `ProfileAvatar` component from the main sidemenu

* refactor: `ProfileAll` to include `ProfileAvatar`

* fix: avoid breaking the layout and displacing links when the profile balance has 8 decimals

* refactor: extract the `ProfileAvatar` component from the main sidemenu

* refactor: `ProfileAll` to include `ProfileAvatar`

* fix: avoid breaking the layout and displacing links when the profile balance has 8 decimals

* refactor: use the `ProfileAvatar` on the wallets page

* refactor: use the `ProfileAvatar` on the remove profile confirmation

* fix: adjust the position of the avatar on wallet page

* fix: importing of profile avatar selection modal component (#1031)

* feat: adapt the contacts page to new design (#1007)

* feat: show contact balance on list layout

* feat: adapt the contacts page to the new style

* refactor: increase padding

* fix: increase the font weight of the "i" badge on contact placeholder

* feat: show contact balance on list layout

* feat: adapt the contacts page to the new style

* refactor: increase padding

* fix: increase the font weight of the "i" badge on contact placeholder


Co-authored-by: Alex Barnsley <8069294+alexbarnsley@users.noreply.github.com>
Co-authored-by: Lúcio Rubens <luciorubeens@gmail.com>

* refactor: invert identicon hover behaviour (#1025)

* feat: add sidebar animation (#1021)

* feat: add sidebar animation

* misc: speed up transition

* fix: errors during and after removing profiles (#1033)

* fix: do not fail on the profile creation page when removing the last profile

* fix: do not fail at start due not having an active profile

* test: the profile removal confirmation

* fix: avoid errors when removing a profile

* feat: loading screen when broadcasting to many peers (#1023)

* fix: don't modify modal loader state

* chore: correct ModalLoder name

* feat: ModalLoader emit closed

* feat: show loader on broadcast to many peers

* fix: timeout when getting peer config

* feat: allow close warning message override

* refactor: update close message for slow broadcasting


Co-authored-by: Juan <j-a-m-l@users.noreply.github.com>

* fix: allow selecting the balance on the wallet page heading (#994)

* fix: show "Unvote" action on delegate tab when using Ledger (#1032)

* fix: do not fail when voting with Ledger

* fix: show the "Unvote" button at the bottom of the delegate tab when using Ledger wallets

* refactor: new selection design for the network overview (#1037)

* change instructions image

* refactor: new selection design for the network overview

* fix: broadcasting modal not closing on unvote (#1038)

* chore: update @arkecosystem/client (#1036)

* feat: use network static fees as max (#1022)

* chore: update @arkecosystem/client to 0.1.19

* feat: client method to fetch static fees

* feat: tx store method to update static fees

* feat: update static fees on peer change

* feat: inputFee component use static if available

* test: fix failing

* test: api client service fetchStaticFees

* test: transaction store with static fees

* docs: jsdoc for new methods

* refactor: store fees against network, not profile

* test: refactor to use network not profile

* fix: update fees when changing peer or custom

* chore: update wallet import and networks pages headings (#1039)

* fix: numbers with colon (",") and other formats on the send transfer inputs (#1009)

* chore: bump to 2.2.1 (#1040)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.