Skip to content

Commit b1a555a

Browse files
rg911rg911
committed
Merge branch 'main' of github.com:nemtech/symbol-sdk-typescript-javascript into main
2 parents d29973f + dfe3b1a commit b1a555a

File tree

92 files changed

+1077
-1000
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+1077
-1000
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ Client Library | v0.7.20-alpha.6 | [nem2-sdk-openapi-typescript-node-client](ht
458458
- Fixed http repository `error handling` issues.
459459
- Fixed bugs in `Alias` interface.
460460
- Fixed `MosaicId significant byte` not detected properly in TransactionPayload.
461-
- Fixed only `MIJIN_TEST` network type allowed in NetworkTypeHttp.
461+
- Fixed only `PRIVATE_TEST` network type allowed in NetworkTypeHttp.
462462
- Applied latest OpenAPI doc (`v0.7.19`).
463463
- Changed `SignedTransaction` class constructor to public.
464464
- Changed `MosaicRestrictionKey` format to be Hexadecimal.

‎e2e/infrastructure/PersistentHarvesting.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ describe('PersistentHarvesting', () => {
3333

3434
const vrfKeyPair = Account.createFromPrivateKey(
3535
'82798EA9A2D2D202AFCCC82C40A287780BCA3C7F7A2FD5B754832804C6BE1BAA',
36-
NetworkType.MIJIN_TEST,
36+
NetworkType.PRIVATE_TEST,
3737
);
3838

3939
before(() => {
@@ -113,7 +113,7 @@ describe('PersistentHarvesting', () => {
113113
remoteAccount.privateKey,
114114
vrfKeyPair.privateKey,
115115
'cfd84eca83508bbee954668e4aecca736caefa615367da76afe6985d695381db',
116-
NetworkType.MIJIN_TEST,
116+
NetworkType.PRIVATE_TEST,
117117
helper.maxFee,
118118
);
119119

‎src/model/account/Address.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ export class Address {
5252
networkType = NetworkType.TEST_NET;
5353
} else if (addressTrimAndUpperCase.charAt(0) === 'N') {
5454
networkType = NetworkType.MAIN_NET;
55+
} else if (addressTrimAndUpperCase.charAt(0) === 'P') {
56+
networkType = NetworkType.PRIVATE;
57+
} else if (addressTrimAndUpperCase.charAt(0) === 'Q') {
58+
networkType = NetworkType.PRIVATE_TEST;
5559
} else {
5660
throw new Error('Address Network unsupported');
5761
}
@@ -69,7 +73,7 @@ export class Address {
6973

7074
/**
7175
* Determines the validity of an raw address string.
72-
* @param {string} rawAddress The raw address string. Expected format SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ
76+
* @param {string} rawAddress The raw address string. Expected format QATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA367I6OQ
7377
* @returns {boolean} true if the raw address string is valid, false otherwise.
7478
*/
7579
public static isValidRawAddress = (rawAddress: string): boolean => {

‎src/model/network/NetworkType.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,14 @@ export enum NetworkType {
3838
* @type {number}
3939
*/
4040
MIJIN_TEST = 0x90,
41+
/**
42+
* Private net network
43+
* @type {number}
44+
*/
45+
PRIVATE = 0x78,
46+
/**
47+
* Private test net network
48+
* @type {number}
49+
*/
50+
PRIVATE_TEST = 0x80,
4151
}

‎src/model/transaction/AggregateTransaction.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,8 +409,10 @@ export class AggregateTransaction extends Transaction {
409409
}
410410
// Check if current cosignature count is greater than requiredCosignatures.
411411
const calculatedCosignatures = requiredCosignatures > this.cosignatures.length ? requiredCosignatures : this.cosignatures.length;
412+
// version + public key + signature
413+
const sizePerCosignature = 8 + 32 + 64;
412414
// Remove current cosignature length and use the calculated one.
413-
const calculatedSize = this.size - this.cosignatures.length * 96 + calculatedCosignatures * 96;
415+
const calculatedSize = this.size - this.cosignatures.length * sizePerCosignature + calculatedCosignatures * sizePerCosignature;
414416
return DtoMapping.assign(this, {
415417
maxFee: UInt64.fromUint(calculatedSize * feeMultiplier),
416418
});

‎test/conf/conf.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,27 @@ import { NetworkType } from '../../src/model/network/NetworkType';
1919

2020
export const TestingAccount = Account.createFromPrivateKey(
2121
'26b64cb10f005e5988a36744ca19e20d835ccc7c105aaa5f3b212da593180930',
22-
NetworkType.MIJIN_TEST,
22+
NetworkType.PRIVATE_TEST,
2323
);
2424

2525
export const MultisigAccount = Account.createFromPrivateKey(
2626
'5edebfdbeb32e9146d05ffd232c8af2cf9f396caf9954289daa0362d097fff3b',
27-
NetworkType.MIJIN_TEST,
27+
NetworkType.PRIVATE_TEST,
2828
);
2929

3030
export const CosignatoryAccount = Account.createFromPrivateKey(
3131
'2a2b1f5d366a5dd5dc56c3c757cf4fe6c66e2787087692cf329d7a49a594658b',
32-
NetworkType.MIJIN_TEST,
32+
NetworkType.PRIVATE_TEST,
3333
);
3434

3535
export const Cosignatory2Account = Account.createFromPrivateKey(
3636
'b8afae6f4ad13a1b8aad047b488e0738a437c7389d4ff30c359ac068910c1d59',
37-
NetworkType.MIJIN_TEST,
37+
NetworkType.PRIVATE_TEST,
3838
);
3939

4040
export const Cosignatory3Account = Account.createFromPrivateKey(
4141
'111602be4d36f92dd60ca6a3c68478988578f26f6a02f8c72089839515ab603e',
42-
NetworkType.MIJIN_TEST,
42+
NetworkType.PRIVATE_TEST,
4343
);
4444

4545
export const NIS2_URL = 'http://localhost:3000';

‎test/core/format/IdGenerator.spec.ts

Lines changed: 80 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -40,100 +40,106 @@ const mosaicTestVector = [
4040
mosaicNonce: 2039925808,
4141
address_Public: 'NATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34SQ33Y',
4242
address_PublicTest: 'TATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA37JGO5Q',
43-
address_Mijin: 'MATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34YACRA',
44-
address_MijinTest: 'SATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34I2PMQ',
43+
address_Private: 'PATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA35OETNI',
44+
address_PrivateTest: 'QATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA367I6OQ',
4545
mosaicId_Public: '044C577DBDD6DC71',
4646
mosaicId_PublicTest: '1796754FB181EF1E',
47-
mosaicId_Mijin: '7DCEDD54DAEDF7B7',
48-
mosaicId_MijinTest: '5BCD295FC8801FE6',
47+
mosaicId_Private: '2DE5561540AAA72C',
48+
mosaicId_PrivateTest: '123F8027103B6A36',
4949
},
5050
{
5151
mosaicNonce: 1477337076,
5252
address_Public: 'NDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL2YCZOQQ',
5353
address_PublicTest: 'TDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL2YBO3KA',
54-
address_Mijin: 'MDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL22B27FI',
55-
address_MijinTest: 'SDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL2Z5UYYY',
54+
address_Private: 'PDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL2ZMEBFQ',
55+
address_PrivateTest: 'QDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL22JZIXY',
5656
mosaicId_Public: '7E45A001465DEEA0',
5757
mosaicId_PublicTest: '5E55573E3EBBB596',
58-
mosaicId_Mijin: '0D47486978FA4316',
59-
mosaicId_MijinTest: '55595BF89461E7C1',
58+
mosaicId_Private: '2F6D0DA76516DA99',
59+
mosaicId_PrivateTest: '3FAA7C57FDE45D34',
6060
},
6161
{
6262
mosaicNonce: 1921674920,
6363
address_Public: 'NCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRH6SYIQ',
6464
address_PublicTest: 'TCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRE3VIBQ',
65-
address_Mijin: 'MCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRFDHL7I',
66-
address_MijinTest: 'SCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRFENHXQ',
65+
address_Private: 'PCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTREWK33Q',
66+
address_PrivateTest: 'QCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTREIM2RQ',
6767
mosaicId_Public: '28E680397FDD9336',
6868
mosaicId_PublicTest: '2F05C98474E9B263',
69-
mosaicId_Mijin: '51B440266AE7F5B4',
70-
mosaicId_MijinTest: '5693742C8290F33E',
69+
mosaicId_Private: '686E0DC244F5093D',
70+
mosaicId_PrivateTest: '687F166E062368CC',
7171
},
7272
{
73-
mosaicNonce: 737150288,
74-
address_Public: 'NDZ4373ASEGJ7S7GQTKF26TIIMC7HK5EWFDDCHA',
75-
address_PublicTest: 'TDZ4373ASEGJ7S7GQTKF26TIIMC7HK5EWEPHRSI',
76-
address_Mijin: 'MDZ4373ASEGJ7S7GQTKF26TIIMC7HK5EWFN3NKY',
77-
address_MijinTest: 'SDZ4373ASEGJ7S7GQTKF26TIIMC7HK5EWH6N46A',
78-
mosaicId_Public: '75FAE31C9E1CEE38',
79-
mosaicId_PublicTest: '35C831D2A6D9702B',
80-
mosaicId_Mijin: '0476D83DF29A0426',
81-
mosaicId_MijinTest: '4F5597E18C0182BC',
73+
mosaicNonce: 812613930,
74+
publicKey: '2E834140FD66CF87B254A693A2C7862C819217B676D3943267156625E816EC6F',
75+
address_Public: 'NATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA34SQ33Y',
76+
address_PublicTest: 'TATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA37JGO5Q',
77+
address_Private: 'PATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA35OETNI',
78+
address_PrivateTest: 'QATNE7Q5BITMUTRRN6IB4I7FLSDRDWZA367I6OQ',
79+
mosaicId_Public: '296994F01121AFC9',
80+
mosaicId_PublicTest: '570FB3ED9379624C',
81+
mosaicId_Private: '09557FCB9DAB83DC',
82+
mosaicId_PrivateTest: '64B6C017D5535A6F',
8283
},
8384
{
84-
mosaicNonce: 4118830514,
85-
address_Public: 'NDI5I7Z3BRBAAHTZHGONGOXX742CW4W5QAZ4BMQ',
86-
address_PublicTest: 'TDI5I7Z3BRBAAHTZHGONGOXX742CW4W5QCY5ZUA',
87-
address_Mijin: 'MDI5I7Z3BRBAAHTZHGONGOXX742CW4W5QCLCVEA',
88-
address_MijinTest: 'SDI5I7Z3BRBAAHTZHGONGOXX742CW4W5QDVZG2I',
89-
mosaicId_Public: '656748D5F82E87A1',
90-
mosaicId_PublicTest: '1CB636C5A32F0293',
91-
mosaicId_Mijin: '35C2901E25DCF921',
92-
mosaicId_MijinTest: '18FF3D8F9FA932D4',
85+
mosaicNonce: 1456792364,
86+
publicKey: '4875FD2E32875D1BC6567745F1509F0F890A1BF8EE59FA74452FA4183A270E03',
87+
address_Public: 'NDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL2YCZOQQ',
88+
address_PublicTest: 'TDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL2YBO3KA',
89+
address_Private: 'PDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL2ZMEBFQ',
90+
address_PrivateTest: 'QDR6EW2WBHJQDYMNGFX2UBZHMMZC5PGL22JZIXY',
91+
mosaicId_Public: '14AA6D651D9081B4',
92+
mosaicId_PublicTest: '3A334999B5C56073',
93+
mosaicId_Private: '6D6DEB080F52932A',
94+
mosaicId_PrivateTest: '01AD1589A9461E6F',
9395
},
9496
{
95-
mosaicNonce: 2640226657,
96-
address_Public: 'NAA6RO4ZAPEDGTCVADE3G4C7SWAE3DBQ4SCMOAI',
97-
address_PublicTest: 'TAA6RO4ZAPEDGTCVADE3G4C7SWAE3DBQ4RTFBQY',
98-
address_Mijin: 'MAA6RO4ZAPEDGTCVADE3G4C7SWAE3DBQ4TEKNHA',
99-
address_MijinTest: 'SAA6RO4ZAPEDGTCVADE3G4C7SWAE3DBQ4RYAIEA',
100-
mosaicId_Public: '3840F6C79934A159',
101-
mosaicId_PublicTest: '5B0FFAA57C41D62E',
102-
mosaicId_Mijin: '11BA1D842237D52B',
103-
mosaicId_MijinTest: '0585182BF5BC7B57',
97+
mosaicNonce: 2843362027,
98+
publicKey: '9F780097FB6A1F287ED2736A597B8EA7F08D20F1ECDB9935DE6694ECF1C58900',
99+
address_Public: 'NCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRH6SYIQ',
100+
address_PublicTest: 'TCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTRE3VIBQ',
101+
address_Private: 'PCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTREWK33Q',
102+
address_PrivateTest: 'QCOXVZMAZJTT4I3F7EAZYGNGR77D6WPTREIM2RQ',
103+
mosaicId_Public: '4A0C3A1CA50F2CFC',
104+
mosaicId_PublicTest: '23CE1EAEBE30195A',
105+
mosaicId_Private: '4CC83B59753ED5FD',
106+
mosaicId_PrivateTest: '39C7DB9631F5FE3F',
104107
},
105108
{
106-
mosaicNonce: 1996615061,
107-
address_Public: 'NBEOZ72O73OYXFDLID5KGBMP67MROHONPQHVKAI',
108-
address_PublicTest: 'TBEOZ72O73OYXFDLID5KGBMP67MROHONPR72UPQ',
109-
address_Mijin: 'MBEOZ72O73OYXFDLID5KGBMP67MROHONPTHVSXQ',
110-
address_MijinTest: 'SBEOZ72O73OYXFDLID5KGBMP67MROHONPTACBLI',
111-
mosaicId_Public: '5AA0FF3892EF3345',
112-
mosaicId_PublicTest: '79BD9AF30668FBDF',
113-
mosaicId_Mijin: '0F8D3270B8ADDF77',
114-
mosaicId_MijinTest: '092E4A9D08A9C1C5',
109+
mosaicNonce: 1686841592,
110+
publicKey: '0815926E003CDD5AF0113C0E067262307A42CD1E697F53B683F7E5F9F57D72C9',
111+
address_Public: 'NDZ4373ASEGJ7S7GQTKF26TIIMC7HK5EWFDDCHA',
112+
address_PublicTest: 'TDZ4373ASEGJ7S7GQTKF26TIIMC7HK5EWEPHRSI',
113+
address_Private: 'PDZ4373ASEGJ7S7GQTKF26TIIMC7HK5EWELJG3Y',
114+
address_PrivateTest: 'QDZ4373ASEGJ7S7GQTKF26TIIMC7HK5EWESE7PY',
115+
mosaicId_Public: '75A9C882F9A89606',
116+
mosaicId_PublicTest: '748A1BD01A40DCF8',
117+
mosaicId_Private: '2397BBB964A3ACCB',
118+
mosaicId_PrivateTest: '1E93C145FA44F966',
115119
},
116120
{
117-
mosaicNonce: 205824978,
118-
address_Public: 'NAMJCSC2BEW52LVAULFRRJJTSRHLI7ABRG2X5RI',
119-
address_PublicTest: 'TAMJCSC2BEW52LVAULFRRJJTSRHLI7ABRHFJZ5I',
120-
address_Mijin: 'MAMJCSC2BEW52LVAULFRRJJTSRHLI7ABRG7GL5A',
121-
address_MijinTest: 'SAMJCSC2BEW52LVAULFRRJJTSRHLI7ABRGLZY6A',
122-
mosaicId_Public: '3AB75AF98A5E0365',
123-
mosaicId_PublicTest: '3494FFAE1F6B2B4D',
124-
mosaicId_Mijin: '3DF5D3B47E956692',
125-
mosaicId_MijinTest: '4AA757991E36C79C',
121+
mosaicNonce: 4206379750,
122+
publicKey: '3683B3E45E76870CFE076E47C2B34CE8E3EAEC26C8AA7C1ED752E3E840AF8A27',
123+
address_Public: 'NDI5I7Z3BRBAAHTZHGONGOXX742CW4W5QAZ4BMQ',
124+
address_PublicTest: 'TDI5I7Z3BRBAAHTZHGONGOXX742CW4W5QCY5ZUA',
125+
address_Private: 'PDI5I7Z3BRBAAHTZHGONGOXX742CW4W5QAAJTUI',
126+
address_PrivateTest: 'QDI5I7Z3BRBAAHTZHGONGOXX742CW4W5QDQKH7Y',
127+
mosaicId_Public: '3E949FBC6D09833D',
128+
mosaicId_PublicTest: '40B85E3227EE56A0',
129+
mosaicId_Private: '5A0D55D5D2F104F9',
130+
mosaicId_PrivateTest: '59C829B71AB2A92F',
126131
},
127132
{
128-
mosaicNonce: 3310277026,
129-
address_Public: 'NCOVTFVVDZGNURZFU4IJLJR37X5TXNWMTSEHR6I',
130-
address_PublicTest: 'TCOVTFVVDZGNURZFU4IJLJR37X5TXNWMTTXN3DI',
131-
address_Mijin: 'MCOVTFVVDZGNURZFU4IJLJR37X5TXNWMTTARXZQ',
132-
address_MijinTest: 'SCOVTFVVDZGNURZFU4IJLJR37X5TXNWMTSJ6YWY',
133-
mosaicId_Public: '213E6E2EC43285C4',
134-
mosaicId_PublicTest: '659C0D4A03D119D2',
135-
mosaicId_Mijin: '756AC167798FA3DF',
136-
mosaicId_MijinTest: '164D3F56862E9520',
133+
mosaicNonce: 2539328334,
134+
publicKey: '4F593111964B37A9CAC59D2A70BC959AE9269589B75FBD640145EB0038960540',
135+
address_Public: 'NAA6RO4ZAPEDGTCVADE3G4C7SWAE3DBQ4SCMOAI',
136+
address_PublicTest: 'TAA6RO4ZAPEDGTCVADE3G4C7SWAE3DBQ4RTFBQY',
137+
address_Private: 'PAA6RO4ZAPEDGTCVADE3G4C7SWAE3DBQ4QVXSZQ',
138+
address_PrivateTest: 'QAA6RO4ZAPEDGTCVADE3G4C7SWAE3DBQ4SFZ2DY',
139+
mosaicId_Public: '1B5FFAEBF3C9602A',
140+
mosaicId_PublicTest: '503EBA0288209C64',
141+
mosaicId_Private: '41CF06028C230DF4',
142+
mosaicId_PrivateTest: '11DD950C45CA34AE',
137143
},
138144
];
139145

@@ -193,8 +199,8 @@ describe('id generator', () => {
193199
mosaicTestVector.map((row) => {
194200
const addressPublic = Address.createFromRawAddress(row.address_Public);
195201
const addressTest = Address.createFromRawAddress(row.address_PublicTest);
196-
const addressMijin = Address.createFromRawAddress(row.address_Mijin);
197-
const addressMijinTest = Address.createFromRawAddress(row.address_MijinTest);
202+
const addressPrivate = Address.createFromRawAddress(row.address_Private);
203+
const addressPrivateTest = Address.createFromRawAddress(row.address_PrivateTest);
198204

199205
// Assert:
200206
expect(
@@ -206,13 +212,13 @@ describe('id generator', () => {
206212
'PublicTest',
207213
).to.deep.equal(row.mosaicId_PublicTest);
208214
expect(
209-
MosaicId.createFromNonce(MosaicNonce.createFromNumber(row.mosaicNonce), addressMijin).toHex(),
210-
'Mijin',
211-
).to.deep.equal(row.mosaicId_Mijin);
215+
MosaicId.createFromNonce(MosaicNonce.createFromNumber(row.mosaicNonce), addressPrivate).toHex(),
216+
'Private',
217+
).to.deep.equal(row.mosaicId_Private);
212218
expect(
213-
MosaicId.createFromNonce(MosaicNonce.createFromNumber(row.mosaicNonce), addressMijinTest).toHex(),
214-
'MijinTest',
215-
).to.deep.equal(row.mosaicId_MijinTest);
219+
MosaicId.createFromNonce(MosaicNonce.createFromNumber(row.mosaicNonce), addressPrivateTest).toHex(),
220+
'PrivateTest',
221+
).to.deep.equal(row.mosaicId_PrivateTest);
216222
});
217223
});
218224
});

0 commit comments

Comments
 (0)