Skip to content

Commit dd45ca1

Browse files
author
Grégory Saive
authored
Merge pull request #66 from evias/task/g55-alias-transactions
task/g55-alias-transactions: Added AddressAliasTransaction and MosaicAliasTransaction features
2 parents 93c2217 + 7e34170 commit dd45ca1

36 files changed

+1344
-193
lines changed

‎e2e/infrastructure/NamespaceHttp.spec.ts‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,17 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
import {deepEqual} from 'assert';
1617
import {expect} from 'chai';
1718
import {NamespaceHttp} from '../../src/infrastructure/NamespaceHttp';
1819
import {PublicAccount} from '../../src/model/account/PublicAccount';
1920
import {NetworkType} from '../../src/model/blockchain/NetworkType';
21+
import {NetworkCurrencyMosaic} from '../../src/model/mosaic/NetworkCurrencyMosaic';
2022
import {NamespaceId} from '../../src/model/namespace/NamespaceId';
2123
import {APIUrl} from '../conf/conf.spec';
2224

2325
describe('NamespaceHttp', () => {
24-
const namespaceId = new NamespaceId([929036875, 2226345261]);
26+
const namespaceId = NetworkCurrencyMosaic.NAMESPACE_ID;
2527
const publicAccount = PublicAccount.createFromPublicKey('B4F12E7C9F6946091E2CB8B6D3A12B50D17CCBBF646386EA27CE2946A7423DCF',
2628
NetworkType.MIJIN_TEST);
2729
const namespaceHttp = new NamespaceHttp(APIUrl);
@@ -69,4 +71,25 @@ describe('NamespaceHttp', () => {
6971
});
7072
});
7173
});
74+
75+
describe('getLinkedMosaicId', () => {
76+
it('should return mosaicId given currency namespaceId', (done) => {
77+
namespaceHttp.getLinkedMosaicId(namespaceId)
78+
.subscribe((mosaicId) => {
79+
expect(mosaicId).to.not.be.null;
80+
deepEqual(mosaicId, NetworkCurrencyMosaic.MOSAIC_ID);
81+
done();
82+
});
83+
});
84+
});
85+
86+
describe('getLinkedAddress', () => {
87+
it('should return address given namespaceId', (done) => {
88+
namespaceHttp.getLinkedAddress(namespaceId)
89+
.subscribe((address) => {
90+
expect(address).to.be.null;
91+
done();
92+
});
93+
});
94+
});
7295
});

‎e2e/infrastructure/TransactionHttp.spec.ts‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import {NetworkType} from '../../src/model/blockchain/NetworkType';
2828
import {MosaicId} from '../../src/model/mosaic/MosaicId';
2929
import {MosaicProperties} from '../../src/model/mosaic/MosaicProperties';
3030
import {MosaicSupplyType} from '../../src/model/mosaic/MosaicSupplyType';
31-
import {XEM} from '../../src/model/mosaic/XEM';
31+
import {NetworkCurrencyMosaic} from '../../src/model/mosaic/NetworkCurrencyMosaic';
3232
import {AggregateTransaction} from '../../src/model/transaction/AggregateTransaction';
3333
import {CosignatureSignedTransaction} from '../../src/model/transaction/CosignatureSignedTransaction';
3434
import {CosignatureTransaction} from '../../src/model/transaction/CosignatureTransaction';
@@ -97,7 +97,7 @@ describe('TransactionHttp', () => {
9797
const transferTransaction = TransferTransaction.create(
9898
Deadline.create(),
9999
Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'),
100-
[XEM.createRelative(10)],
100+
[NetworkCurrencyMosaic.createRelative(10)],
101101
PlainMessage.create('test-message'),
102102
NetworkType.MIJIN_TEST,
103103
);
@@ -244,7 +244,7 @@ describe('TransactionHttp', () => {
244244
);
245245

246246
const lockFundsTransaction = LockFundsTransaction.create(Deadline.create(),
247-
XEM.createRelative(10),
247+
NetworkCurrencyMosaic.createRelative(10),
248248
UInt64.fromUint(10000),
249249
signedTransaction,
250250
NetworkType.MIJIN_TEST);
@@ -265,7 +265,7 @@ describe('TransactionHttp', () => {
265265
const transferTransaction = TransferTransaction.create(
266266
Deadline.create(),
267267
Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'),
268-
[XEM.createRelative(1)],
268+
[NetworkCurrencyMosaic.createRelative(1)],
269269
PlainMessage.create('test-message'),
270270
NetworkType.MIJIN_TEST,
271271
);
@@ -279,7 +279,7 @@ describe('TransactionHttp', () => {
279279
);
280280

281281
const lockFundsTransaction = LockFundsTransaction.create(Deadline.create(),
282-
XEM.createRelative(10),
282+
NetworkCurrencyMosaic.createRelative(10),
283283
UInt64.fromUint(10000),
284284
signedTransaction,
285285
NetworkType.MIJIN_TEST);
@@ -316,7 +316,7 @@ describe('TransactionHttp', () => {
316316
const signedTransaction = account.sign(aggregateTransaction);
317317

318318
const lockFundsTransaction = LockFundsTransaction.create(Deadline.create(),
319-
XEM.createRelative(10),
319+
NetworkCurrencyMosaic.createRelative(10),
320320
UInt64.fromUint(10000),
321321
signedTransaction,
322322
NetworkType.MIJIN_TEST);
@@ -333,7 +333,7 @@ describe('TransactionHttp', () => {
333333
);
334334
const signedTransaction = account.sign(aggregateTransaction);
335335
const lockFundsTransaction = LockFundsTransaction.create(Deadline.create(),
336-
XEM.createRelative(10),
336+
NetworkCurrencyMosaic.createRelative(10),
337337
UInt64.fromUint(10),
338338
signedTransaction,
339339
NetworkType.MIJIN_TEST);
@@ -351,7 +351,7 @@ describe('TransactionHttp', () => {
351351
it('standalone', (done) => {
352352
const secretLockTransaction = SecretLockTransaction.create(
353353
Deadline.create(),
354-
XEM.createAbsolute(10),
354+
NetworkCurrencyMosaic.createAbsolute(10),
355355
UInt64.fromUint(100),
356356
HashType.Op_Sha3_256,
357357
sha3_256.create().update(nacl_catapult.randomBytes(20)).hex(),
@@ -365,7 +365,7 @@ describe('TransactionHttp', () => {
365365
it('aggregate', (done) => {
366366
const secretLockTransaction = SecretLockTransaction.create(
367367
Deadline.create(),
368-
XEM.createAbsolute(10),
368+
NetworkCurrencyMosaic.createAbsolute(10),
369369
UInt64.fromUint(100),
370370
HashType.Op_Sha3_256,
371371
sha3_256.create().update(nacl_catapult.randomBytes(20)).hex(),
@@ -384,7 +384,7 @@ describe('TransactionHttp', () => {
384384
it('standalone', (done) => {
385385
const secretLockTransaction = SecretLockTransaction.create(
386386
Deadline.create(),
387-
XEM.createAbsolute(10),
387+
NetworkCurrencyMosaic.createAbsolute(10),
388388
UInt64.fromUint(100),
389389
HashType.Op_Keccak_256,
390390
sha3_256.create().update(nacl_catapult.randomBytes(20)).hex(),
@@ -398,7 +398,7 @@ describe('TransactionHttp', () => {
398398
it('aggregate', (done) => {
399399
const secretLockTransaction = SecretLockTransaction.create(
400400
Deadline.create(),
401-
XEM.createAbsolute(10),
401+
NetworkCurrencyMosaic.createAbsolute(10),
402402
UInt64.fromUint(100),
403403
HashType.Op_Keccak_256,
404404
sha3_256.create().update(nacl_catapult.randomBytes(20)).hex(),
@@ -417,7 +417,7 @@ describe('TransactionHttp', () => {
417417
it('standalone', (done) => {
418418
const secretLockTransaction = SecretLockTransaction.create(
419419
Deadline.create(),
420-
XEM.createAbsolute(10),
420+
NetworkCurrencyMosaic.createAbsolute(10),
421421
UInt64.fromUint(100),
422422
HashType.Op_Hash_160,
423423
sha3_256.create().update(nacl_catapult.randomBytes(20)).hex(),
@@ -431,7 +431,7 @@ describe('TransactionHttp', () => {
431431
it('aggregate', (done) => {
432432
const secretLockTransaction = SecretLockTransaction.create(
433433
Deadline.create(),
434-
XEM.createAbsolute(10),
434+
NetworkCurrencyMosaic.createAbsolute(10),
435435
UInt64.fromUint(100),
436436
HashType.Op_Hash_160,
437437
sha3_256.create().update(nacl_catapult.randomBytes(20)).hex(),
@@ -450,7 +450,7 @@ describe('TransactionHttp', () => {
450450
it('standalone', (done) => {
451451
const secretLockTransaction = SecretLockTransaction.create(
452452
Deadline.create(),
453-
XEM.createAbsolute(10),
453+
NetworkCurrencyMosaic.createAbsolute(10),
454454
UInt64.fromUint(100),
455455
HashType.Op_Hash_256,
456456
sha3_256.create().update(nacl_catapult.randomBytes(20)).hex(),
@@ -464,7 +464,7 @@ describe('TransactionHttp', () => {
464464
it('aggregate', (done) => {
465465
const secretLockTransaction = SecretLockTransaction.create(
466466
Deadline.create(),
467-
XEM.createAbsolute(10),
467+
NetworkCurrencyMosaic.createAbsolute(10),
468468
UInt64.fromUint(100),
469469
HashType.Op_Hash_256,
470470
sha3_256.create().update(nacl_catapult.randomBytes(20)).hex(),
@@ -488,7 +488,7 @@ describe('TransactionHttp', () => {
488488
const proof = convert.uint8ToHex(secretSeed);
489489
const secretLockTransaction = SecretLockTransaction.create(
490490
Deadline.create(),
491-
XEM.createAbsolute(10),
491+
NetworkCurrencyMosaic.createAbsolute(10),
492492
UInt64.fromUint(100),
493493
HashType.Op_Sha3_256,
494494
secret,
@@ -515,7 +515,7 @@ describe('TransactionHttp', () => {
515515
const proof = convert.uint8ToHex(secretSeed);
516516
const secretLockTransaction = SecretLockTransaction.create(
517517
Deadline.create(),
518-
XEM.createAbsolute(10),
518+
NetworkCurrencyMosaic.createAbsolute(10),
519519
UInt64.fromUint(100),
520520
HashType.Op_Sha3_256,
521521
secret,
@@ -548,7 +548,7 @@ describe('TransactionHttp', () => {
548548
const proof = convert.uint8ToHex(secretSeed);
549549
const secretLockTransaction = SecretLockTransaction.create(
550550
Deadline.create(),
551-
XEM.createAbsolute(10),
551+
NetworkCurrencyMosaic.createAbsolute(10),
552552
UInt64.fromUint(100),
553553
HashType.Op_Keccak_256,
554554
secret,
@@ -575,7 +575,7 @@ describe('TransactionHttp', () => {
575575
const proof = convert.uint8ToHex(secretSeed);
576576
const secretLockTransaction = SecretLockTransaction.create(
577577
Deadline.create(),
578-
XEM.createAbsolute(10),
578+
NetworkCurrencyMosaic.createAbsolute(10),
579579
UInt64.fromUint(100),
580580
HashType.Op_Keccak_256,
581581
secret,
@@ -607,7 +607,7 @@ describe('TransactionHttp', () => {
607607
const proof = convert.uint8ToHex(secretSeed);
608608
const secretLockTransaction = SecretLockTransaction.create(
609609
Deadline.create(),
610-
XEM.createAbsolute(10),
610+
NetworkCurrencyMosaic.createAbsolute(10),
611611
UInt64.fromUint(100),
612612
HashType.Op_Hash_160,
613613
secret,
@@ -634,7 +634,7 @@ describe('TransactionHttp', () => {
634634
const proof = convert.uint8ToHex(secretSeed);
635635
const secretLockTransaction = SecretLockTransaction.create(
636636
Deadline.create(),
637-
XEM.createAbsolute(10),
637+
NetworkCurrencyMosaic.createAbsolute(10),
638638
UInt64.fromUint(100),
639639
HashType.Op_Hash_160,
640640
secret,
@@ -666,7 +666,7 @@ describe('TransactionHttp', () => {
666666
const proof = convert.uint8ToHex(secretSeed);
667667
const secretLockTransaction = SecretLockTransaction.create(
668668
Deadline.create(),
669-
XEM.createAbsolute(10),
669+
NetworkCurrencyMosaic.createAbsolute(10),
670670
UInt64.fromUint(100),
671671
HashType.Op_Hash_256,
672672
secret,
@@ -693,7 +693,7 @@ describe('TransactionHttp', () => {
693693
const proof = convert.uint8ToHex(secretSeed);
694694
const secretLockTransaction = SecretLockTransaction.create(
695695
Deadline.create(),
696-
XEM.createAbsolute(10),
696+
NetworkCurrencyMosaic.createAbsolute(10),
697697
UInt64.fromUint(100),
698698
HashType.Op_Hash_256,
699699
secret,
@@ -857,7 +857,7 @@ describe('TransactionHttp', () => {
857857
const tx = TransferTransaction.create(
858858
Deadline.create(),
859859
Address.createFromRawAddress('SAGY2PTFX4T2XYKYXTJXYCTQRP3FESQH5MEQI2RQ'),
860-
[XEM.createRelative(10)],
860+
[NetworkCurrencyMosaic.createRelative(10)],
861861
EmptyMessage,
862862
NetworkType.MIJIN_TEST,
863863
);

‎e2e/infrastructure/TransactionUtils.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {TransactionHttp} from '../../src/infrastructure/TransactionHttp';
1818
import {Account} from '../../src/model/account/Account';
1919
import {Address} from '../../src/model/account/Address';
2020
import {NetworkType} from '../../src/model/blockchain/NetworkType';
21-
import {XEM} from '../../src/model/mosaic/XEM';
21+
import {NetworkCurrencyMosaic} from '../../src/model/mosaic/NetworkCurrencyMosaic';
2222
import {AggregateTransaction} from '../../src/model/transaction/AggregateTransaction';
2323
import {CosignatureTransaction} from '../../src/model/transaction/CosignatureTransaction';
2424
import {Deadline} from '../../src/model/transaction/Deadline';
@@ -47,7 +47,7 @@ export class TransactionUtils {
4747
const transferTransaction = TransferTransaction.create(
4848
Deadline.create(),
4949
Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'),
50-
[XEM.createRelative(100000000000)],
50+
[NetworkCurrencyMosaic.createRelative(100000000000)],
5151
PlainMessage.create('test-message'),
5252
NetworkType.MIJIN_TEST,
5353
);
@@ -59,7 +59,7 @@ export class TransactionUtils {
5959
const transferTransaction = TransferTransaction.create(
6060
Deadline.create(),
6161
Address.createFromRawAddress('SBILTA367K2LX2FEXG5TFWAS7GEFYAGY7QLFBYKC'),
62-
[XEM.createRelative(100000000000)],
62+
[NetworkCurrencyMosaic.createRelative(100000000000)],
6363
PlainMessage.create('test-message'),
6464
NetworkType.MIJIN_TEST,
6565
);

‎package-lock.json‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"@types/crypto-js": "^3.1.43",
5454
"crypto-js": "^3.1.9-1",
5555
"js-joda": "^1.6.2",
56-
"nem2-library": "^0.9.6",
56+
"nem2-library": "^0.9.7",
5757
"request": "^2.83.0",
5858
"request-promise-native": "^1.0.5",
5959
"rxjs": "^6.2.1",

‎src/infrastructure/Listener.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,17 @@ export class Listener {
156156
});
157157
}
158158

159-
/**
159+
/**
160160
* returns a boolean that repressents the open state
161161
* @returns a boolean
162162
*/
163163
public isOpen(): boolean {
164-
if(this.webSocket){
164+
if (this.webSocket) {
165165
return this.webSocket.readyState === WebSocket.OPEN;
166166
}
167167
return false;
168168
}
169-
169+
170170
/**
171171
* Close web socket connection.
172172
* @returns void

0 commit comments

Comments
 (0)