forked from symbol/desktop-wallet
-
Notifications
You must be signed in to change notification settings - Fork 2
/
harvesting.patch
2781 lines (2745 loc) · 100 KB
/
harvesting.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/__mocks__/Accounts.ts b/__mocks__/Accounts.ts
index ad68e985..77b35339 100644
--- a/__mocks__/Accounts.ts
+++ b/__mocks__/Accounts.ts
@@ -35,15 +35,51 @@ export const simpleWallet1 = SimpleWallet.createFromPrivateKey(
account1Params.networkType,
)
-export const WalletsModel1: AccountModel = {
+export const AccountModel1: AccountModel = {
id: 'someId',
node: '',
- profileName: 'profile_name',
+ profileName: 'profile1',
name: account1Params.accountName,
- type: AccountType.PRIVATE_KEY,
+ type: AccountType.SEED,
address: simpleWallet1.address.plain(),
publicKey: account1.publicKey,
encryptedPrivateKey: simpleWallet1.encryptedPrivateKey,
- path: '',
+ path: "m/44'/4343'/1'/0'/0'",
isMultisig: false,
}
+
+const TEST_ACCOUNTS = {
+ cosigner1: {
+ networkType: NetworkType.MIJIN_TEST,
+ privateKey: '27002B109810E4C25E8E6AE964FAF129CC3BFD1A95CB99062E0205060041D0C9',
+ },
+ remoteTestnet: {
+ networkType: NetworkType.TEST_NET,
+ privateKey: '803040D4A33983C4B233C6C2054A24B9C655E8CAC6C06AECCED56B8FE424FF2B',
+ },
+ remoteMijin: {
+ networkType: NetworkType.MIJIN_TEST,
+ privateKey: '803040D4A33983C4B233C6C2054A24B9C655E8CAC6C06AECCED56B8FE424FF2B',
+ },
+ cosigner2: {
+ networkType: NetworkType.MIJIN_TEST,
+ privateKey: '8472FA74A64A97C85F0A285299D9FD2D44D71CB5698FE9C7E88C33001F9DD83F',
+ },
+ multisig1: {
+ networkType: NetworkType.MIJIN_TEST,
+ privateKey: 'CAD57FEC0C7F2106AD8A6203DA67EE675A1A3C232C676945306448DF5B4124F8',
+ },
+ multisig2: {
+ networkType: NetworkType.MIJIN_TEST,
+ privateKey: '72B08ACF80558B285EADA206BB1226A44038C65AC4649108B2284591641657B5',
+ },
+}
+
+export const getTestAccount = (name: string): Account => {
+ if (!(name in TEST_ACCOUNTS)) {
+ throw new Error('Test account with name: ' + name + ' could not be found in __mocks__/accounts.ts')
+ }
+
+ const spec = TEST_ACCOUNTS[name]
+ return Account.createFromPrivateKey(spec.privateKey, spec.networkType)
+}
diff --git a/__mocks__/profiles.ts b/__mocks__/profiles.ts
index b62a7b83..16e0d75a 100644
--- a/__mocks__/profiles.ts
+++ b/__mocks__/profiles.ts
@@ -13,40 +13,27 @@
* See the License for the specific language governing permissions and limitations under the License.
*
*/
-import { Account, NetworkType } from 'symbol-sdk'
-const TEST_ACCOUNTS = {
- cosigner1: {
- networkType: NetworkType.MIJIN_TEST,
- privateKey: '27002B109810E4C25E8E6AE964FAF129CC3BFD1A95CB99062E0205060041D0C9',
- },
- remoteTestnet: {
- networkType: NetworkType.TEST_NET,
- privateKey: '803040D4A33983C4B233C6C2054A24B9C655E8CAC6C06AECCED56B8FE424FF2B',
- },
- remoteMijin: {
- networkType: NetworkType.MIJIN_TEST,
- privateKey: '803040D4A33983C4B233C6C2054A24B9C655E8CAC6C06AECCED56B8FE424FF2B',
- },
- cosigner2: {
- networkType: NetworkType.MIJIN_TEST,
- privateKey: '8472FA74A64A97C85F0A285299D9FD2D44D71CB5698FE9C7E88C33001F9DD83F',
- },
- multisig1: {
- networkType: NetworkType.MIJIN_TEST,
- privateKey: 'CAD57FEC0C7F2106AD8A6203DA67EE675A1A3C232C676945306448DF5B4124F8',
- },
- multisig2: {
+import { NetworkType } from 'symbol-sdk'
+import { ProfileModel } from '@/core/database/entities/ProfileModel'
+
+const TEST_PROFILES = {
+ profile1: {
+ generationHash: 'ACECD90E7B248E012803228ADB4424F0D966D24149B72E58987D2BF2F2AF03C4',
+ profileName: 'profile1',
+ hint: 'password is password',
networkType: NetworkType.MIJIN_TEST,
- privateKey: '72B08ACF80558B285EADA206BB1226A44038C65AC4649108B2284591641657B5',
+ password: '0b831096cf25adbd7324ad2dbb3d99a829b40b53c6f76dd50fb2ef56fceded2f2kixTXdr/q/ci5PPwWVCiA==',
+ accounts: "['AccountModel1']",
+ seed:
+ '4fcd1e1b896551f68c3d5314be1f8d2fad48d7b492e65ecf4ac1ac2dfc9749a08CyBF9Q5APg07qXEMWQzQIcN+/KBekkw0T2hBPfdAd5VxXkdzWikv46dIaYxyHCn9hdr839ITfgIWYnAiE54jRWfFKkDvyEZL4pchX6mAqCcc0Ew9VGFfHjKStHWFeBezrhp/MlNeSw/EbxiCFo5C2pmeSuGz5NABUXT+BoDi62gB8r6gyF9hjB8J7Lz6D4SBf6J4cvj9krCXzkkWX1jqg==',
},
}
-export const getTestAccount = (name: string): Account => {
- if (!(name in TEST_ACCOUNTS)) {
+export const getTestProfile = (name: string): ProfileModel => {
+ if (!(name in TEST_PROFILES)) {
throw new Error('Test account with name: ' + name + ' could not be found in __mocks__/accounts.ts')
}
- const spec = TEST_ACCOUNTS[name]
- return Account.createFromPrivateKey(spec.privateKey, spec.networkType)
+ return TEST_PROFILES[name]
}
diff --git a/__tests__/components/AmountInput.spec.ts b/__tests__/components/AmountInput.spec.ts
index 9f632243..e78cd338 100644
--- a/__tests__/components/AmountInput.spec.ts
+++ b/__tests__/components/AmountInput.spec.ts
@@ -68,22 +68,15 @@ describe('AmountInput', () => {
await flushPromises()
expect(wrapper.emitted().input[0]).toEqual(['10.1234567'])
})
- test("divisibility of the mosaic '534CD11F6D984B4B' is 6", async () => {
- const rule = wrapper.vm.validationRules.amount
- const falseResult = await validate('10.1234567', rule)
- expect(falseResult.valid).toBeFalsy()
- const rightResult = await validate('10.123456', rule)
- expect(rightResult.valid).toBeTruthy()
- })
- test("divisibility of the mosaic '534CD11F6D984B4B' is 5 ", async () => {
+ test("divisibility of the mosaic '519FC24B9223E0B4' is 6", async () => {
wrapper.setProps({
- mosaicHex: '534CD11F6D984B4B',
+ mosaicHex: '519FC24B9223E0B4',
})
await flushPromises()
const rule = wrapper.vm.validationRules.amount
- const falseResult = await validate('10.123456', rule)
+ const falseResult = await validate('10.1234567', rule)
expect(falseResult.valid).toBeFalsy()
- const rightResult = await validate('10.12345', rule)
+ const rightResult = await validate('10.123456', rule)
expect(rightResult.valid).toBeTruthy()
})
})
diff --git a/__tests__/services/AccountService.spec.ts b/__tests__/services/AccountService.spec.ts
index 05de99b8..72a3bba4 100644
--- a/__tests__/services/AccountService.spec.ts
+++ b/__tests__/services/AccountService.spec.ts
@@ -16,7 +16,7 @@
import { NetworkType, Account, Password, Crypto } from 'symbol-sdk'
import { AccountService } from '@/services/AccountService'
import { MnemonicPassPhrase } from 'symbol-hd-wallets'
-import { account1Params, WalletsModel1 } from '@MOCKS/Accounts'
+import { account1Params, AccountModel1 } from '@MOCKS/Accounts'
// Sample mnemonic passphrase
const mnemonic = new MnemonicPassPhrase(
@@ -46,7 +46,7 @@ const expectedAccounts = Object.values(expectedPrivateKeys).map((key) =>
const generatedAccounts = new AccountService().generateAccountsFromMnemonic(mnemonic, NetworkType.TEST_NET, 2)
const generatedAddresses = new AccountService().getAddressesFromMnemonic(mnemonic, NetworkType.TEST_NET, 2)
-describe('services/WalletServices', () => {
+describe('services/AccountService', () => {
describe('generateAccountsFromMnemonic() should', () => {
test('generate correct child account given mnemonic', () => {
expect(generatedAccounts).toBeDefined()
@@ -109,11 +109,11 @@ describe('services/WalletServices', () => {
const service = new AccountService()
// get initial encrypted private key values
- const initialEncPrivate = WalletsModel1.encryptedPrivateKey
+ const initialEncPrivate = AccountModel1.encryptedPrivateKey
// update the model
const updatedWallet = service.updateWalletPassword(
- WalletsModel1,
+ AccountModel1,
account1Params.password,
new Password('password2'),
)
@@ -132,7 +132,7 @@ describe('services/WalletServices', () => {
test('should throw if provided with an incorrect password', () => {
const service = new AccountService()
expect(() => {
- service.updateWalletPassword(WalletsModel1, new Password('wrong_password'), new Password('password2'))
+ service.updateWalletPassword(AccountModel1, new Password('wrong_password'), new Password('password2'))
}).toThrow()
})
})
diff --git a/__tests__/services/RemoteAccountService.spec.ts b/__tests__/services/RemoteAccountService.spec.ts
new file mode 100644
index 00000000..2b4b0fc6
--- /dev/null
+++ b/__tests__/services/RemoteAccountService.spec.ts
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2020 NEM Foundation (https://nem.io)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and limitations under the License.
+ *
+ */
+import { NetworkType, Password, RepositoryFactoryHttp, Address, AccountInfo, UInt64, AccountType } from 'symbol-sdk'
+import { RemoteAccountService } from '@/services/RemoteAccountService'
+import { AccountModel1 } from '@MOCKS/Accounts'
+import { getTestProfile } from '@MOCKS/profiles'
+import { of } from 'rxjs'
+
+describe('services/RemoteAccountService', () => {
+ describe('getAvailableRemotePublicKey()', () => {
+ test('should return the first linkable public key', async (done) => {
+ // prepare
+ const accountRepository = new RepositoryFactoryHttp('http://localhost:3000').createAccountRepository()
+ accountRepository.getAccountsInfo = jest.fn(() => of([]))
+
+ // act
+ const remoteAccount = await new RemoteAccountService(
+ AccountModel1,
+ getTestProfile('profile1'),
+ accountRepository,
+ ).getAvailableRemoteAccount(new Password('password'))
+
+ expect(remoteAccount.publicKey).toBe('BB6FF99C52B3C9D880D5E59C10AD696D90CF84A8E825CCA16F584A8BCE4D17E6')
+ done()
+ })
+
+ test('should return the second public key if the first one is not availalbe', async (done) => {
+ // prepare
+ const accountRepository = new RepositoryFactoryHttp('http://localhost:3000').createAccountRepository()
+ const fakeLinkedAccount = new AccountInfo(
+ Address.createFromPublicKey(
+ 'BB6FF99C52B3C9D880D5E59C10AD696D90CF84A8E825CCA16F584A8BCE4D17E6',
+ NetworkType.MIJIN_TEST,
+ ),
+ UInt64.fromUint(0),
+ 'BB6FF99C52B3C9D880D5E59C10AD696D90CF84A8E825CCA16F584A8BCE4D17E6',
+ UInt64.fromUint(0),
+ AccountType.Remote,
+ [],
+ [],
+ [],
+ UInt64.fromUint(0),
+ UInt64.fromUint(0),
+ )
+
+ accountRepository.getAccountsInfo = jest.fn(() => of([fakeLinkedAccount]))
+
+ // act
+ const remoteAccount = await new RemoteAccountService(
+ AccountModel1,
+ getTestProfile('profile1'),
+ accountRepository,
+ ).getAvailableRemoteAccount(new Password('password'))
+
+ expect(remoteAccount.publicKey).toBe('FA0939C5F11FC89A8EB997329C64AC785CDD23AE9D73C3E060D3B5FF0BABC2A4')
+ done()
+ })
+ })
+})
diff --git a/__tests__/transactions/ViewAliasTransaction.spec.ts b/__tests__/transactions/ViewAliasTransaction.spec.ts
deleted file mode 100644
index e6dce7ec..00000000
--- a/__tests__/transactions/ViewAliasTransaction.spec.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2020 NEM Foundation (https://nem.io)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and limitations under the License.
- *
- */
-import { AliasAction, Deadline, MosaicAliasTransaction, MosaicId, NamespaceId, NetworkType } from 'symbol-sdk'
-import { createStore } from '@MOCKS/Store'
-import { ViewAliasTransaction } from '@/core/transactions/ViewAliasTransaction'
-
-const store = createStore({})
-
-describe('transactions/ViewAliasTransaction', () => {
- describe('use() should', () => {
- test('populate mosaic alias transaction fields', () => {
- const namespaceId = new NamespaceId('alias')
- const mosaicId = new MosaicId('747B276C30626442')
- const alias = MosaicAliasTransaction.create(
- Deadline.create(),
- AliasAction.Link,
- namespaceId,
- mosaicId,
- NetworkType.MIJIN_TEST,
- )
-
- const view = new ViewAliasTransaction(store, alias)
-
- // assert
- expect(view).toBeDefined()
- expect(view.transaction).toBeDefined()
- expect(view.detailItems.length).toBe(3)
- })
-
- // XXX test recognition of Namespace vs Address for recipient
- // XXX test recognition of Namespace vs MosaicId for mosaics
- })
-})
diff --git a/__tests__/transactions/ViewHashLockTransaction.spec.ts b/__tests__/transactions/ViewHashLockTransaction.spec.ts
deleted file mode 100644
index e6bd8bb3..00000000
--- a/__tests__/transactions/ViewHashLockTransaction.spec.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2020 NEM Foundation (https://nem.io)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and limitations under the License.
- *
- */
-import {
- AggregateTransaction,
- Deadline,
- LockFundsTransaction,
- NetworkCurrencyLocal,
- NetworkType,
- UInt64,
-} from 'symbol-sdk'
-import { createStore } from '@MOCKS/Store'
-import { getTestAccount } from '@MOCKS/profiles'
-import { ViewHashLockTransaction } from '@/core/transactions/ViewHashLockTransaction'
-
-const store = createStore({})
-
-describe('transactions/ViewHashLockTransaction', () => {
- describe('use() should', () => {
- test('populate hash lock transaction fields', () => {
- const generationHash = '57F7DA205008026C776CB6AED843393F04CD458E0AA2D9F1D5F31A402072B2D6'
- const aggregateTransaction = AggregateTransaction.createBonded(Deadline.create(), [], NetworkType.MIJIN_TEST, [])
- const signedTransaction = getTestAccount('cosigner1').sign(aggregateTransaction, generationHash)
- const hashLock = LockFundsTransaction.create(
- Deadline.create(),
- NetworkCurrencyLocal.createRelative(10),
- UInt64.fromUint(10),
- signedTransaction,
- NetworkType.MIJIN_TEST,
- )
-
- // act
- const view = new ViewHashLockTransaction(store, hashLock)
-
- // assert
- expect(view).toBeDefined()
- expect(view.transaction).toBeDefined()
- expect(view.detailItems.length).toBe(3)
- })
- })
-})
diff --git a/__tests__/transactions/ViewTransferTransaction.spec.ts b/__tests__/transactions/ViewTransferTransaction.spec.ts
deleted file mode 100644
index 38745102..00000000
--- a/__tests__/transactions/ViewTransferTransaction.spec.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2020 NEM Foundation (https://nem.io)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and limitations under the License.
- *
- */
-import { Account, Deadline, NamespaceId, NetworkType, PlainMessage, TransferTransaction } from 'symbol-sdk'
-import { createStore } from '@MOCKS/Store'
-import { ViewTransferTransaction } from '@/core/transactions/ViewTransferTransaction'
-
-const store = createStore({})
-
-describe('transactions/ViewTransferTransaction', () => {
- describe('use() should', () => {
- test('populate transfer transaction fields', () => {
- // prepare
- const alias = new NamespaceId('test')
-
- const transferTransaction = TransferTransaction.create(
- Deadline.create(),
- alias,
- [],
- PlainMessage.create('test-message'),
- NetworkType.MIJIN_TEST,
- )
-
- store.getters['account/currentSignerAddress'] = Account.generateNewAccount(NetworkType.MAIN_NET).address
-
- // act
- const view = new ViewTransferTransaction(store, transferTransaction)
-
- // assert
- expect(view).toBeDefined()
- expect(view.transaction).toBeDefined()
-
- expect(view.detailItems.length).toBe(3)
- })
- })
-})
diff --git a/src/components/AccountAddressDisplay/AccountAddressDisplay.vue b/src/components/AccountAddressDisplay/AccountAddressDisplay.vue
index c6393141..714ac1f7 100644
--- a/src/components/AccountAddressDisplay/AccountAddressDisplay.vue
+++ b/src/components/AccountAddressDisplay/AccountAddressDisplay.vue
@@ -2,8 +2,8 @@
<div class="account-detail-row-3cols">
<span class="label">{{ $t('account_address') }}</span>
<div class="value accountAddress">
- {{ getAccountPrettyAddress() }}
- <ButtonCopyToClipboard v-model="account.address">
+ {{ getPrettyAddress() }}
+ <ButtonCopyToClipboard v-model="address">
<img src="@/views/resources/img/account/copyIcon.png" class="copy-icon" />
</ButtonCopyToClipboard>
</div>
diff --git a/src/components/AccountAddressDisplay/AccountAddressDisplayTs.ts b/src/components/AccountAddressDisplay/AccountAddressDisplayTs.ts
index d862100d..8633cabe 100644
--- a/src/components/AccountAddressDisplay/AccountAddressDisplayTs.ts
+++ b/src/components/AccountAddressDisplay/AccountAddressDisplayTs.ts
@@ -13,11 +13,14 @@
* See the License for the specific language governing permissions and limitations under the License.
*
*/
+// external dependencies
+import { Address } from 'symbol-sdk'
import { Component, Prop, Vue } from 'vue-property-decorator'
+
// internal dependencies
-import { AccountModel } from '@/core/database/entities/AccountModel'
//@ts-ignore
import ButtonCopyToClipboard from '@/components/ButtonCopyToClipboard/ButtonCopyToClipboard.vue'
+import { UIHelpers } from '@/core/utils/UIHelpers'
@Component({
components: {
@@ -28,12 +31,15 @@ export class AccountAddressDisplayTs extends Vue {
@Prop({
default: null,
})
- account: AccountModel
+ address: string
- public getAccountPrettyAddress(): string {
- return (this.account && AccountModel.getObjects(this.account).address.pretty()) || ''
- }
+ /**
+ * UI Helpers
+ * @var {UIHelpers}
+ */
+ public uiHelpers = UIHelpers
- /// region computed properties getter/setter
- /// end-region computed properties getter/setter
+ public getPrettyAddress(): string {
+ return this.address ? Address.createFromRawAddress(this.address).pretty() : ''
+ }
}
diff --git a/src/components/MaxFeeSelector/MaxFeeSelectorTs.ts b/src/components/MaxFeeSelector/MaxFeeSelectorTs.ts
index 459b2efe..07d4c011 100644
--- a/src/components/MaxFeeSelector/MaxFeeSelectorTs.ts
+++ b/src/components/MaxFeeSelector/MaxFeeSelectorTs.ts
@@ -19,11 +19,14 @@ import { mapGetters } from 'vuex'
import feesConfig from '@/../config/fees.conf.json'
// @ts-ignore
import FormLabel from '@/components/FormLabel/FormLabel.vue'
+// @ts-ignore
+import FormRow from '@/components/FormRow/FormRow.vue'
import { NetworkCurrencyModel } from '@/core/database/entities/NetworkCurrencyModel'
@Component({
components: {
FormLabel,
+ FormRow,
},
computed: {
...mapGetters({
@@ -39,6 +42,11 @@ export class MaxFeeSelectorTs extends Vue {
})
public className: string
+ @Prop({
+ default: false,
+ })
+ withLabel: boolean
+
/**
* Networks currency mosaic name
* @var {string}
diff --git a/src/components/NetworkNodeSelector/NetworkNodeSelector.vue b/src/components/NetworkNodeSelector/NetworkNodeSelector.vue
new file mode 100644
index 00000000..bca73dde
--- /dev/null
+++ b/src/components/NetworkNodeSelector/NetworkNodeSelector.vue
@@ -0,0 +1,23 @@
+<template>
+ <FormRow class-name="emphasis">
+ <template v-slot:label> {{ $t('Node_URL') }}: </template>
+ <template v-slot:inputs>
+ <div class="row-75-25 inputs-container">
+ <AutoComplete
+ v-model="formItems.nodeUrl"
+ :data="customNodeData"
+ class="auto-complete-size auto-complete-style"
+ :placeholder="$t('form_label_network_node_url')"
+ @on-select="fetchNodePublicKey"
+ @on-change="handleInput"
+ ></AutoComplete>
+
+ <Icon v-if="isFetchingNodeInfo" type="ios-loading" size="18" class="demo-spin-icon-load"></Icon>
+ </div>
+ </template>
+ </FormRow>
+</template>
+<script lang="ts">
+import { NetworkNodeSelectorTs } from './NetworkNodeSelectorTs'
+export default class NetworkNodeSelector extends NetworkNodeSelectorTs {}
+</script>
diff --git a/src/components/NetworkNodeSelector/NetworkNodeSelectorTs.ts b/src/components/NetworkNodeSelector/NetworkNodeSelectorTs.ts
new file mode 100644
index 00000000..d40c4886
--- /dev/null
+++ b/src/components/NetworkNodeSelector/NetworkNodeSelectorTs.ts
@@ -0,0 +1,101 @@
+// external dependencies
+import { Component, Vue, Prop } from 'vue-property-decorator'
+import { NodeHttp, NodeInfo } from 'symbol-sdk'
+import { mapGetters } from 'vuex'
+
+// internal dependencies
+import { ValidationRuleset } from '@/core/validation/ValidationRuleset'
+import { URLHelpers } from '@/core/utils/URLHelpers'
+import { NodeModel } from '@/core/database/entities/NodeModel'
+
+// @ts-ignore
+import FormWrapper from '@/components/FormWrapper/FormWrapper.vue'
+// @ts-ignore
+import FormRow from '@/components/FormRow/FormRow.vue'
+
+@Component({
+ components: {
+ FormWrapper,
+ FormRow,
+ },
+ computed: {
+ ...mapGetters({
+ knowNodes: 'network/knowNodes',
+ repositoryFactory: 'network/repositoryFactory',
+ }),
+ },
+})
+export class NetworkNodeSelectorTs extends Vue {
+ @Prop({ default: () => [] }) excludeRoles: number[]
+
+ /**
+ * Validation rules
+ */
+ public validationRules = ValidationRuleset
+
+ public knowNodes: NodeModel[]
+
+ /**
+ * Form items
+ */
+ protected formItems = { nodeUrl: '' }
+
+ public customNodeData = []
+ public isFetchingNodeInfo = false
+
+ /**
+ * Hook called when the submit button is clicked
+ * @protected
+ * @returns {Promise<void>}
+ */
+ protected async handleInput(): Promise<void> {
+ try {
+ const nodeUrl = URLHelpers.getNodeUrl(this.formItems.nodeUrl)
+ new URL(nodeUrl)
+
+ const publicKey = await this.fetchNodePublicKey()
+
+ if (publicKey && publicKey.length) {
+ this.$emit('input', publicKey)
+
+ const associationValues: Array<string> = /.+\u003a\d{2,}/.test(nodeUrl) ? [nodeUrl] : [nodeUrl + ':3000']
+ this.customNodeData = associationValues
+ }
+ } catch (error) {
+ // set error in the error tooltip
+ this.$emit('error', error.message)
+ }
+ }
+
+ /**
+ * Checks if the given node is eligible for harvesting
+ * @protected
+ * @returns {Promise<void>}
+ */
+ protected async fetchNodePublicKey(): Promise<string> {
+ if (!this.formItems.nodeUrl.length) {
+ return ''
+ }
+
+ let nodeInfo: NodeInfo
+ this.isFetchingNodeInfo = true
+ try {
+ const nodeUrl = URLHelpers.getNodeUrl(this.formItems.nodeUrl)
+ nodeInfo = await new NodeHttp(nodeUrl).getNodeInfo().toPromise()
+ } catch (error) {
+ console.log(error)
+ throw new Error('Node_connection_failed')
+ } finally {
+ this.isFetchingNodeInfo = false
+ }
+
+ if (this.excludeRoles.length && this.excludeRoles.includes(nodeInfo.roles))
+ throw new Error('harvesting_node_not_eligible')
+
+ return nodeInfo.publicKey
+ }
+
+ public created() {
+ this.customNodeData = this.knowNodes.map((n) => n.url)
+ }
+}
diff --git a/src/components/NetworkStatisticsPanel/NetworkStatisticsPanel.less b/src/components/NetworkStatisticsPanel/NetworkStatisticsPanel.less
index 7a1a3020..e1785b7d 100644
--- a/src/components/NetworkStatisticsPanel/NetworkStatisticsPanel.less
+++ b/src/components/NetworkStatisticsPanel/NetworkStatisticsPanel.less
@@ -59,6 +59,10 @@
display: inline-block;
color: #5200c6;
line-height: 40px;
+
+ button.button-style {
+ padding: 0;
+ }
}
.speed {
diff --git a/src/components/NetworkStatisticsPanel/NetworkStatisticsPanel.vue b/src/components/NetworkStatisticsPanel/NetworkStatisticsPanel.vue
index ac18c560..cc44cee1 100644
--- a/src/components/NetworkStatisticsPanel/NetworkStatisticsPanel.vue
+++ b/src/components/NetworkStatisticsPanel/NetworkStatisticsPanel.vue
@@ -1,6 +1,20 @@
<template>
<div class="top_network_info radius">
<div class="top_account_info">
+ <div class="xym-outline account-info-tile">
+ <div class="title">
+ <span class="title_txt">{{ $t('harvesting') }}</span>
+ </div>
+ <img :src="officialIcons.harvest" />
+ <div class="txt_info">
+ <button
+ class="centered-button button-style validation-button submit-button"
+ @click="isHarvestingWizardDisplayed = !isHarvestingWizardDisplayed"
+ >
+ {{ $t('show_wizard') }}
+ </button>
+ </div>
+ </div>
<div class="xym-outline account-info-tile">
<div class="title">
<span class="title_txt">{{ $t('accounts') }}</span>
@@ -19,14 +33,6 @@
<AnimatedNumber v-model="currentHeight" />
</span>
</div>
- <div class="xym-outline account-info-tile">
- <div class="title">
- <span class="title_txt">{{ $t('speed') }}</span>
- </div>
- <img src="@/views/resources/img/monitor/speed.png" />
- <span class="txt_info speed"> {{ blockGenerationTargetTime }}s </span>
- <span class="speed-blocks">/{{ $t('block') }}</span>
- </div>
<div class="xym-outline account-info-tile">
<div class="title">
<span class="title_txt">{{ $t('peers_number') }}</span>
@@ -37,6 +43,12 @@
</span>
</div>
</div>
+
+ <ModalHarvestingWizard
+ v-if="isHarvestingWizardDisplayed"
+ :visible="isHarvestingWizardDisplayed"
+ @close="isHarvestingWizardDisplayed = false"
+ />
</div>
</template>
diff --git a/src/components/NetworkStatisticsPanel/NetworkStatisticsPanelTs.ts b/src/components/NetworkStatisticsPanel/NetworkStatisticsPanelTs.ts
index d2a6edf6..a514da6e 100644
--- a/src/components/NetworkStatisticsPanel/NetworkStatisticsPanelTs.ts
+++ b/src/components/NetworkStatisticsPanel/NetworkStatisticsPanelTs.ts
@@ -19,12 +19,17 @@ import { mapGetters } from 'vuex'
// child components
// @ts-ignore
import AnimatedNumber from '@/components/AnimatedNumber/AnimatedNumber.vue'
+// @ts-ignore
+import ModalHarvestingWizard from '@/views/modals/ModalHarvestingWizard/ModalHarvestingWizard.vue'
+import { officialIcons } from '@/views/resources/Images'
+
import { NodeModel } from '@/core/database/entities/NodeModel'
import { NetworkConfigurationModel } from '@/core/database/entities/NetworkConfigurationModel'
@Component({
components: {
AnimatedNumber,
+ ModalHarvestingWizard,
},
computed: {
...mapGetters({
@@ -38,6 +43,8 @@ import { NetworkConfigurationModel } from '@/core/database/entities/NetworkConfi
},
})
export class NetworkStatisticsPanelTs extends Vue {
+ public officialIcons = officialIcons
+
/**
* The network configuration.
*/
@@ -68,6 +75,11 @@ export class NetworkStatisticsPanelTs extends Vue {
*/
public currentPeerInfo: NodeModel
+ /**
+ * Whether harvesting wizard is currently displayed
+ */
+ protected isHarvestingWizardDisplayed = false
+
/**
* Current network target block time
*/
diff --git a/src/components/ProtectedPrivateKeyDisplay/ProtectedPrivateKeyDisplayTs.ts b/src/components/ProtectedPrivateKeyDisplay/ProtectedPrivateKeyDisplayTs.ts
index c3fc93d0..b98dbf23 100644
--- a/src/components/ProtectedPrivateKeyDisplay/ProtectedPrivateKeyDisplayTs.ts
+++ b/src/components/ProtectedPrivateKeyDisplay/ProtectedPrivateKeyDisplayTs.ts
@@ -34,7 +34,7 @@ export class ProtectedPrivateKeyDisplayTs extends Vue {
@Prop({
default: null,
})
- account: AccountModel
+ account: AccountModel | Account
/**
* Whether account is currently being unlocked
@@ -53,7 +53,7 @@ export class ProtectedPrivateKeyDisplayTs extends Vue {
* @internal
* @var {string}
*/
- private plainInformation: string = ''
+ protected plainInformation: string = ''
/**
* seconds counter
@@ -113,6 +113,13 @@ export class ProtectedPrivateKeyDisplayTs extends Vue {
* @return {void}
*/
public onClickDisplay() {
+ // don't prompt for password when an Account is povided as a prop
+ if (this.account instanceof Account) {
+ this.onAccountUnlocked(this.account)
+ return
+ }
+
+ // prompt for password when an AccountModel is provided as a prop
this.hasAccountUnlockModal = true
}
diff --git a/src/core/database/entities/AccountModel.ts b/src/core/database/entities/AccountModel.ts
index 4543ebfb..89d64232 100644
--- a/src/core/database/entities/AccountModel.ts
+++ b/src/core/database/entities/AccountModel.ts
@@ -53,6 +53,7 @@ export class AccountModel {
public readonly encryptedPrivateKey: string
public readonly path: string
public readonly isMultisig: boolean
+ public readonly encRemoteAccountPrivateKey?: string
/**
* Permits to return specific field's mapped object instances
diff --git a/src/core/transactions/TransactionViewFactory.ts b/src/core/transactions/TransactionViewFactory.ts
index 89d50427..9ec06a6a 100644
--- a/src/core/transactions/TransactionViewFactory.ts
+++ b/src/core/transactions/TransactionViewFactory.ts
@@ -24,6 +24,7 @@ import {
Transaction,
TransactionType,
TransferTransaction,
+ AccountKeyLinkTransaction,
} from 'symbol-sdk'
import { ViewUnknownTransaction } from '@/core/transactions/ViewUnknownTransaction'
import { ViewHashLockTransaction } from '@/core/transactions/ViewHashLockTransaction'
@@ -33,6 +34,7 @@ import { ViewMosaicSupplyChangeTransaction } from '@/core/transactions/ViewMosai
import { ViewNamespaceRegistrationTransaction } from '@/core/transactions/ViewNamespaceRegistrationTransaction'
import { ViewTransferTransaction } from '@/core/transactions/ViewTransferTransaction'
import { ViewAliasTransaction } from '@/core/transactions/ViewAliasTransaction'
+import { ViewAccountKeyLinkTransaction } from '@/core/transactions/ViewAccountKeyLinkTransaction'
import { Store } from 'vuex'
import { TransactionView } from '@/core/transactions/TransactionView'
@@ -50,7 +52,6 @@ export class TransactionViewFactory {
switch (transaction.type) {
/// region XXX views for transaction types not yet implemented
case TransactionType.ACCOUNT_ADDRESS_RESTRICTION:
- case TransactionType.ACCOUNT_KEY_LINK:
case TransactionType.VOTING_KEY_LINK:
case TransactionType.VRF_KEY_LINK:
case TransactionType.NODE_KEY_LINK:
@@ -86,6 +87,8 @@ export class TransactionViewFactory {
return new ViewAliasTransaction($store, transaction as MosaicAliasTransaction)
case TransactionType.ADDRESS_ALIAS:
return new ViewAliasTransaction($store, transaction as AddressAliasTransaction)
+ case TransactionType.ACCOUNT_KEY_LINK:
+ return new ViewAccountKeyLinkTransaction($store, transaction as AccountKeyLinkTransaction)
default:
throw new Error(`View not implemented for transaction type '${transaction.type}'`)
}
diff --git a/src/core/transactions/ViewAccountKeyLinkTransaction.ts b/src/core/transactions/ViewAccountKeyLinkTransaction.ts
new file mode 100644
index 00000000..511b5b24
--- /dev/null
+++ b/src/core/transactions/ViewAccountKeyLinkTransaction.ts
@@ -0,0 +1,35 @@
+/**
+ *
+ * Copyright 2020 Grégory Saive for NEM (https://nem.io)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+// external dependencies
+import { AccountKeyLinkTransaction } from 'symbol-sdk'
+
+// internal dependencies
+import { TransactionView } from './TransactionView'
+import { TransactionDetailItem } from '@/core/transactions/TransactionDetailItem'
+
+// eslint-disable-next-line max-len
+export class ViewAccountKeyLinkTransaction extends TransactionView<AccountKeyLinkTransaction> {
+ /**
+ * Displayed items
+ */
+ protected resolveDetailItems(): TransactionDetailItem[] {
+ return [
+ { key: 'remotePublicKey', value: this.transaction.linkedPublicKey },
+ { key: 'linkAction', value: this.transaction.linkAction },
+ ]
+ }
+}
diff --git a/src/language/en-US.json b/src/language/en-US.json
index 175cc9c2..f1746e01 100644
--- a/src/language/en-US.json
+++ b/src/language/en-US.json
@@ -553,7 +553,6 @@
"word": "Word",
"x_seconds": "{seconds}s.",
"network_type": "Network type",
- "current_network": "Current Network",
"node_list": "List of nodes",
"node_url": "Node url",
"automatically_generated_by_node_url": "Automatically generated by node url",
@@ -561,5 +560,28 @@
"network_settings": "Network settings",
"current_speed": "The current speed",
"unknown": "Unknown",
- "input_here": "Input here"
+ "input_here": "Input here",
+ "harvesting_subtitle_overview": "Overview",
+ "harvesting_subtitle_delegation": "Node selection",
+ "harvesting_subtitle_confirmation": "Overview",
+ "harvesting_remote_account": "remote account",
+ "harvesting_create_remote_account": "You will first need to setup a remote account, if you have not done this before.",
+ "harvesting_remote_account_description_1": "For security reasons, we will create a remote account (proxy) for delegated harvesting.",
+ "harvesting_remote_account_description_3": "Enter your password and click \"Start\" to create a remote account.",
+ "harvesting_remote_account_creation_successful_1": "Your remote account has been created successfully. Please keep its private key secure",
+ "harvesting_remote_linked_description_1": "Your account is currently linked to the following remote account (proxy) for delegated harvesting.",
+ "harvesting_remote_linked_description_2": "You can unlink your account from this remote account in the Accounts section. Click Next to configure a delegation request for the harvesting node of your choice.",
+ "harvesting_delegation_description_1": "Select the account that should start harvesting and select the harvesting node to which you want to send a delegation request.",
+ "harvesting_delegation_description_2": "Then, select a max fee to include in the transaction. You can send delegation requests to multiple nodes.",
+ "harvesting_confirmation_description_1": "You can see the transaction(s) details displayed below. After you have entered your password, and pressed the Next button, these transaction(s) will be announced to the network.",
+ "harvesting_confirmation_description_2": "Harvesting will be activated automatically provided that the network node is harvesting and accepts delegation requests.",
+ "harvesting_node_get_node_info": "Get node info ",
+ "harvesting_node_not_eligible": "This not is not eligible for harvesting",
+ "ACCOUNT_LINK": "Account link",
+ "SET_UP": "Node selection",
+ "CONFIRMATION": "Confirmation",
+ "news_read_more": "Read more",
+ "article_by": "Article by {creator}",
+ "harvesting": "Harvesting",
+ "show_wizard": "Show wizard"
}
diff --git a/src/language/ja-JP.json b/src/language/ja-JP.json
index dc412bb6..508bf3f9 100644
--- a/src/language/ja-JP.json
+++ b/src/language/ja-JP.json
@@ -134,6 +134,7 @@
"create_sub_namespace": "サブネームスペース作成",
"creation_successful": "おめでとうございます、プロファイルは正常に作成されました！",
"current_endpoint": "現在のノード",
+ "current_network": "Current Network",
"current_validity": "有効期限",
"deadline": "期限",
"decrease": "減少",
@@ -267,6 +268,7 @@
"label_of": "{min} / {max}",
"label_postfix_multisig": "(マルチシグ)",
"label_signed_by": "連署者の署名 =>",
+ "latest_news_articles": "Latest news articles",
"link": "リンク",
"loading": "読込中…",
"locked_mosaic": "ロック済みモザイク",
@@ -338,6 +340,7 @@
"no_mnemonic": "ニーモニックなし",
"no_network_currency_alert": "ウォレットにはネットワーク通貨に関するデータを取得できません (例: symbol:xym) 有効なノードに接続してください。",
"no_profiles_in_database": "ウォレットデータベースにプロファイルはありません",
+ "no_partial_transactions": "There are currently no partial transactions",
"no_unconfirmed_transactions": "未承認トランザクションなし",
"no_confirmed_transactions": "承認済トランザクションなし",
"node_connection_failed": "ノード接続に失敗",
@@ -428,6 +431,7 @@
"relative": "相対",
"removal_greater_than_cosignatories": "There are {delta} more required cosignatories for min removal than available cosignatories. Please add cosignatories or reduce the min. removal number.",
"repeat_password_label": "パスワードの再確認",
+ "reset": "Reset",
"resolving_address": "アドレス {address} 解決中...",
"restore_mnemonic": "ニーモニック語群のリストア",
"restrictable": "制限可",
@@ -457,6 +461,8 @@
"sidebar_item_multisig": "マルチシグ",
"sidebar_item_namespaces": "ネームスペース",
"sidebar_item_settings": "設定",
+ "signature": "Signature",
+ "signer_public_key": "Signer public key",
"skip": "スキップ",
"speed": "速度",
"status": "ステータス",
@@ -545,5 +551,37 @@
"warning_already_a_cosignatory": "このアカウントは既に連署者です",
"welcome": "Catapult ウォレット",
"word": "文字",
- "x_seconds": "{seconds}秒"
+ "x_seconds": "{seconds}秒",
+ "network_type": "Network type",
+ "node_list": "List of nodes",
+ "node_url": "Node url",
+ "automatically_generated_by_node_url": "Automatically generated by node url",
+ "peer_tip": "You can use the {setting} page for node management or to configure a new network",
+ "network_settings": "Network settings",
+ "current_speed": "The current speed",