Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
57b9a5c
Renamed RestrictionType to AccountRestrictionType
rg911 Jul 31, 2019
194a59a
Refactored AccountRestrictionType
rg911 Aug 2, 2019
89e445b
Updated tests
rg911 Aug 5, 2019
be7f000
Added ts catbuffer codes (without aggregateTx)
rg911 Aug 7, 2019
440233f
Manually added aggregate transaction builder
rg911 Aug 7, 2019
cb694bd
Added embedded transaction builders
rg911 Aug 7, 2019
42eb3dc
Applied catbuffer on aggregate transaction
rg911 Aug 8, 2019
bf80aa6
Removed old flatbuffer staffs
rg911 Aug 8, 2019
4a98ddb
updated action types value
rg911 Aug 8, 2019
fbc3a8a
restored network config for e2e
rg911 Aug 8, 2019
cf17571
Fixed unit tests after swapping action type value
rg911 Aug 8, 2019
0d30788
Added ts catbuffer codes (without aggregateTx)
rg911 Aug 7, 2019
5b9b4ad
Manually added aggregate transaction builder
rg911 Aug 7, 2019
416ffda
Added embedded transaction builders
rg911 Aug 7, 2019
01234ca
Applied catbuffer on aggregate transaction
rg911 Aug 8, 2019
6abee2a
Removed old flatbuffer staffs
rg911 Aug 8, 2019
0cc91f4
updated action types value
rg911 Aug 8, 2019
1b26603
restored network config for e2e
rg911 Aug 8, 2019
1f6e049
Fixed unit tests after swapping action type value
rg911 Aug 8, 2019
12d32ee
Merge branch 'ts-catbuffer' of github.com:rg911/nem2-sdk-typescript-j…
rg911 Aug 14, 2019
4a270f5
Fixed merged conflic issues
rg911 Aug 14, 2019
af4bd94
Renamed RestrictionType to AccountRestrictionType
rg911 Jul 31, 2019
e339f33
Refactored AccountRestrictionType
rg911 Aug 2, 2019
9db1e90
Updated tests
rg911 Aug 5, 2019
7026e6a
Merge branch 'task/g218_block_outgoing_account_restriction' of github…
rg911 Aug 14, 2019
7774786
Refactored TransactionMapping
rg911 Aug 15, 2019
7794317
Removed `this.` in decodeBlock in Utilities.ts
rg911 Aug 15, 2019
503c278
Added `addTransactions` to aggregate transactions
rg911 Aug 15, 2019
355689d
Applied generated aggregate transaction from catbuffer-generator
rg911 Aug 19, 2019
0787adf
Fixed aggregate transaction creatFromPayload
rg911 Aug 19, 2019
24a8909
Added `addTransactions` to aggregate transactions
rg911 Aug 15, 2019
2ee54b3
Merge branch 'task/g229_add_addTransaction_to_aggregate' of github.co…
rg911 Aug 20, 2019
050bdef
Removed `this.` in decodeBlock in Utilities.ts
rg911 Aug 15, 2019
1cba186
Merge branch 'task/g230_Encoded_Block_Size' of github.com:rg911/nem2-…
rg911 Aug 20, 2019
eee44ef
Renamed RestrictionType to AccountRestrictionType
rg911 Jul 31, 2019
51f43f5
Refactored AccountRestrictionType
rg911 Aug 2, 2019
7721858
Updated tests
rg911 Aug 5, 2019
2583f86
Renamed RestrictionType to AccountRestrictionType
rg911 Jul 31, 2019
c62ab70
Refactored AccountRestrictionType
rg911 Aug 2, 2019
ed196f2
Fixed merge issues
rg911 Aug 20, 2019
069f2ab
Merge branch 'task/g218_block_outgoing_account_restriction' of github…
rg911 Aug 20, 2019
960def5
Added ts catbuffer codes (without aggregateTx)
rg911 Aug 7, 2019
b91aafb
Manually added aggregate transaction builder
rg911 Aug 7, 2019
17a4ab3
Added embedded transaction builders
rg911 Aug 7, 2019
ba6b189
Applied catbuffer on aggregate transaction
rg911 Aug 8, 2019
ccb154f
Removed old flatbuffer staffs
rg911 Aug 8, 2019
e8b5e8c
updated action types value
rg911 Aug 8, 2019
3ff80fa
restored network config for e2e
rg911 Aug 8, 2019
18e0cae
Fixed unit tests after swapping action type value
rg911 Aug 8, 2019
6c40ea5
Added ts catbuffer codes (without aggregateTx)
rg911 Aug 7, 2019
37f4eb0
Added embedded transaction builders
rg911 Aug 7, 2019
4cab9e6
Applied catbuffer on aggregate transaction
rg911 Aug 8, 2019
a2655c1
Removed old flatbuffer staffs
rg911 Aug 8, 2019
27d95fc
restored network config for e2e
rg911 Aug 8, 2019
9dfc574
Fixed merged conflic issues
rg911 Aug 14, 2019
9df0aa1
Refactored TransactionMapping
rg911 Aug 15, 2019
0fb2071
Applied generated aggregate transaction from catbuffer-generator
rg911 Aug 19, 2019
4ccde62
Fixed aggregate transaction creatFromPayload
rg911 Aug 19, 2019
0967115
Merge branch 'ts-catbuffer' of github.com:rg911/nem2-sdk-typescript-j…
rg911 Aug 20, 2019
2b17f55
Added metadata transactions
rg911 Aug 20, 2019
7a880a6
renamed namespaceMetadataTransaction unit test file name
rg911 Aug 20, 2019
4d7b019
Added missing exports
rg911 Aug 20, 2019
5b7f44c
Added missing mosaic restriction exports
rg911 Aug 20, 2019
0d31e3e
Renamed NamespaceMetaDataTransaction.ts
rg911 Aug 20, 2019
b682fc0
Rename NamespaceMetadata
rg911 Aug 20, 2019
dea2155
Added missing mosaicRestrictionType export
rg911 Aug 21, 2019
0fac822
Merge pull request #231 from rg911/task/g230_Encoded_Block_Size
rg911 Sep 2, 2019
b762e43
Merge branch 'master' into task/g229_add_addTransaction_to_aggregate
rg911 Sep 2, 2019
433fc74
Merge pull request #232 from rg911/task/g229_add_addTransaction_to_ag…
rg911 Sep 2, 2019
7ac0505
Merge branch 'master' into task/g218_block_outgoing_account_restriction
rg911 Sep 2, 2019
60c4e9c
Merge pull request #222 from rg911/task/g218_block_outgoing_account_r…
rg911 Sep 2, 2019
0925bd9
Added ts catbuffer codes (without aggregateTx)
rg911 Aug 7, 2019
da25ce7
Manually added aggregate transaction builder
rg911 Aug 7, 2019
6728a5d
Added embedded transaction builders
rg911 Aug 7, 2019
634d0ba
Applied catbuffer on aggregate transaction
rg911 Aug 8, 2019
806182b
Removed old flatbuffer staffs
rg911 Aug 8, 2019
b73893e
updated action types value
rg911 Aug 8, 2019
bfb1cb1
restored network config for e2e
rg911 Aug 8, 2019
917b19d
Fixed unit tests after swapping action type value
rg911 Aug 8, 2019
3467578
Added ts catbuffer codes (without aggregateTx)
rg911 Aug 7, 2019
970b7c2
Added embedded transaction builders
rg911 Aug 7, 2019
6e987f2
Applied catbuffer on aggregate transaction
rg911 Aug 8, 2019
17d92f9
Removed old flatbuffer staffs
rg911 Aug 8, 2019
7e7f799
restored network config for e2e
rg911 Aug 8, 2019
89de0ef
Fixed merged conflic issues
rg911 Aug 14, 2019
aa2be1b
Refactored TransactionMapping
rg911 Aug 15, 2019
1382a73
Applied generated aggregate transaction from catbuffer-generator
rg911 Aug 19, 2019
2194c8a
Fixed aggregate transaction creatFromPayload
rg911 Aug 19, 2019
51fc076
Added ts catbuffer codes (without aggregateTx)
rg911 Aug 7, 2019
7f19820
Manually added aggregate transaction builder
rg911 Aug 7, 2019
99fd613
Added embedded transaction builders
rg911 Aug 7, 2019
0749efe
Applied catbuffer on aggregate transaction
rg911 Aug 8, 2019
cba64e5
Removed old flatbuffer staffs
rg911 Aug 8, 2019
a70afb4
restored network config for e2e
rg911 Aug 8, 2019
e6a9f06
Added ts catbuffer codes (without aggregateTx)
rg911 Aug 7, 2019
12fe1b1
Applied catbuffer on aggregate transaction
rg911 Aug 8, 2019
e61ac93
Removed old flatbuffer staffs
rg911 Aug 8, 2019
ec243e8
restored network config for e2e
rg911 Aug 8, 2019
8cfc9f8
Fixed merged conflic issues
rg911 Aug 14, 2019
21964b2
Refactored TransactionMapping
rg911 Aug 15, 2019
36fe777
Applied generated aggregate transaction from catbuffer-generator
rg911 Aug 19, 2019
3275736
Merge branch 'ts-catbuffer' of github.com:rg911/nem2-sdk-typescript-j…
rg911 Sep 2, 2019
1ef0033
Fixed merge errors
rg911 Sep 2, 2019
70b8819
Added metadata transactions
rg911 Aug 20, 2019
71fd041
renamed namespaceMetadataTransaction unit test file name
rg911 Aug 20, 2019
49740ed
Added missing exports
rg911 Aug 20, 2019
45c1e1a
Added missing mosaic restriction exports
rg911 Aug 20, 2019
c05b448
Renamed NamespaceMetaDataTransaction.ts
rg911 Aug 20, 2019
b228d09
Rename NamespaceMetadata
rg911 Aug 20, 2019
b0e7433
Added missing mosaicRestrictionType export
rg911 Aug 21, 2019
1fd5a59
Merge branch 'task/g144_metadata_transaction' of github.com:rg911/nem…
rg911 Sep 2, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions e2e/conf/network.conf
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
{
"apiUrl": "http://localhost:3000",
"generationHash": "57F7DA205008026C776CB6AED843393F04CD458E0AA2D9F1D5F31A402072B2D6",
"generationHash": "5E34C898234E17E8553359D4DEAA123742C323F4C42758C511E6CC805934853E",
"testAccount": {
"privateKey": "D242FB34C2C4DD36E995B9C865F93940065E326661BA5A4A247331D211FE3A3D",
"address": "SBMYYFIM6VGG45KWGSZLSXFHP74WVT7MOF6UYBHT",
"publicKey": "2FC3872A792933617D70E02AFF8FBDE152821A0DF0CA5FB04CB56FC3D21C8863"
"privateKey": "C422CC3C9257A1568036E1726E64EB5923C8363A13D4344F9E66CD89C8789BC7",
"address": "SAMA2UEQNAQ45DWYDNJVLPWKQJDAHFZIVLWACIGN",
"publicKey": "8A78C9E9B0E59D0F74C0D47AB29FBD523C706293A3FA9CD9FE0EEB2C10EA924A"
},
"multisigAccount": {
"privateKey": "6EBE2AB0584C816771B494B36B40EC6CE1A0024C37DC6056D89D570A21A70262",
"address": "SCJAK5N6ICIE3JGHV5SVDSSNM5RUZZVDWQJ5G76N",
"publicKey": "224556169645EFAB772BFE1B5665490334428017E5D86FB3C9DFC4070B2F16A6"
"privateKey": "F6815438AE34F95F2CF364B4679D16F3602CA2107073C0709738BAB457B09A45",
"publicKey": "FAF3F9FD3E32EB43273E5351BAE705D0179D37CBDCC4DD78A0C73232DD3EF32C",
"address": "SDC4BXKIIDBQA2CY6RPRFO3WLC5OZHLKLJJ3NFEH"
},
"cosignatoryAccount": {
"privateKey": "44C0044B36AEF44C7743C407CEE4B6FD801BF6B0652AB7799B0991FFD3A81E71",
"address": "SCPL4YCGZYCML5WUSCIVN5MQF5YZAAF4GMZJIEL4",
"publicKey": "76C1622C7FB58986E500228E8FFB30C606CAAFC1CD78E770E82C73DAB7BD7C9F"
"privateKey": "F48EA053D7D2B47DC518FDD69B338D34C819D9AC51E8754378F2D86FC29783C7",
"publicKey": "D9FB51DDFA64CC56D7AEBB32976DA8A3A72C8C7D02838AA1041046FA0883EBC6",
"address": "SCHNSELDJ7JN5MPHBOKHNBR2QRST4GOGEMS4XZNE"
},
"cosignatory2Account": {
"privateKey": "F7B3A64652BAE6DB00D8B7C45F9D1C9BE0DB9E02002111A0B547AE1E220B7DDC",
"address": "SBISV4QCGJ7SSOLG64DBNPWU6J7SSY64R22D2L3Q",
"publicKey": "B5C2611E32E16482B0B9811ABF906A1DE84184DED1D343790482F517C02FB01C"
"privateKey": "E697E9E0D849ACD3BD9379E80C4E953B23375112C28D983AF94160AD269BE327",
"publicKey": "2B4598150E66B26D991FA56FAF691C539FD1A92EBEA99E2AF91808B9C7C4316F",
"address": "SAWZITCY4TCOFBSSINFO4DQZTRBSB5W5OBSQE237"
},
"cosignatory3Account": {
"privateKey": "A7D6ED74CDDECBF621DDC63558433DB604FA800D138810B3DF9B4EC880D0705F",
"address": "SD2UY5LHIAAZDVKRHBOYSS4MTLHVTJVUTQPEGV2U",
"publicKey": "3A33DA75E00F643C49C57E8BD3282149911B06FF107C37F7AEDFED5532166BDA"
"privateKey": "3F42F4308B3EA912A9FE482D6DD04CCFD8D37E4397BF9655AA2EF36894491CAB",
"publicKey": "26A339827614E7AEE9DB427323AA3A49A48456AA5656D9A2E1B50FF93DE90756",
"address": "SCGYYXGL3TLZBOA5TUCCQYIM6NSYSLVCBVHGYKKW"
},
"cosignatory4Account": {
"privateKey": "D2A12301F5595869EFD5374B3372F0ED7EC26BF73A71D310950CC018D3FA0B03",
"address": "SD7PYMM2BTT4SGSITZ2MBQBK4SXIQQQV4ZOP46VF",
"publicKey": "FDE589878756C2287056EC8D7B2829D9C1FA6D389EBDC808034813FE7810AAB0"
"privateKey": "53D6A6659A200DAF4930AD4C8A3B5B28ECAAA1F643E990C0A41C0B8EC9B3D05A",
"publicKey": "F721863CC533C3DF4429A957F822B986C81E62A91726A3E3BD0B861FA42F757D",
"address": "SD3JPQ2KXMQKLVOHJV7GTOYV73CL72ZSEOW7RIWE"
},
"testAccount2": {
"privateKey": "E5DCCEBDB01A8B03A7DB7BA5888E2E33FD4617B5F6FED48C4C09C0780F422713",
"address": "SBSBLBT7CIOQG6XUI7TRDMHV4TKS5O7QM3MWQYHL",
"publicKey": "5F14CD455A1C0B08073C657EFA09365921736C1ADAF0F0685848678AE966EE09"
"privateKey": "F0AB1010EFEE19EE5373719881DF5123C13E643C519655F7E97347BFF77175BF",
"publicKey": "9DBF67474D6E1F8B131B4EB1F5BA0595AFFAE1123607BC1048F342193D7E669F",
"address": "SDBC4JE7GTJAKN2XJCQWWRJMYA35AFOYQBATXOUA"
},
"testAccount3": {
"privateKey": "CA95470BEFF4487D692D501E5C41F86FAE9CE6DD15B7B64E150E42A18BDE9CF8",
"address": "SBCFDASM35I6JSLUPQMSX2WGJG55WOCNB53NNVPH",
"publicKey": "E97077A656D9E7F5679880D4950BBF2B3638B7ACE17C82CCB7881DE9BAF396C6"
"privateKey": "61C3C8F24E3708CFE17A64B66EBD29D747326DBF7962EBEE9340439725C04F11",
"publicKey": "399C1D18FDE3293DCF7BF522626266663C83453BDF7D38C9E96AFC795C07E0A2",
"address": "SC7PPZRJMEMQ7S32PURJTTNHOATDYQ4NPRFOAOUO"
},
"testAccountNoBalance": {
"privateKey": "A0591F79F588758280DFB4823A47FCEEC6A551344F794FFDE3760A9D7E1DE348",
"address": "SC5NTT5APX2FAUS4VQUII3UTMAD7GHRFTLDQOEDW",
"publicKey": "6D652E480E5B2997A19D0C7485724693D79A63FCD591A948B40240BD196BA7D6"
"privateKey": "6530E5ED4B6D32CB9AF2EE09D2889DC781C569B83C137854EDC7773B057074A1",
"publicKey": "559019D82C4CACAAE616A024544251D58BB4464CD36407224475A577F9649E78",
"address": "SCQP4B6BDNH5MZHTLL2ZNXIPYSLD5BU4NDXBZXNK"
},
"harvestingAccount": {
"privateKey": "0B9802C011DA2D61BCD203F4DC76C012898EE38BA54A7E030B86630A8FD43CA6",
"address": "SAALWHKCWH72J53M3M4LB6UYFGLQMAOXJACWJX2U",
"publicKey": "092CAAFEBCB51C64A7CE423050964492407B264CA306D063DBA927A2304C4DD8"
"privateKey": "AF39DCC819388A2CE9DC0922730D7579588571A63F349A0FB1BC44807C926E53",
"publicKey": "FAEDB16763F22870B75BF934EA5F2792BDF109EC0C504718DDCBD92DF13C2628",
"address": "SCNPFCWFV2FYQVMU5HMJJTMADRZ3LRXVA76F56N2"
}
}
6 changes: 3 additions & 3 deletions e2e/infrastructure/AccountHttp.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import {assert, expect} from 'chai';
import {AccountHttp} from '../../src/infrastructure/AccountHttp';
import { Listener, TransactionHttp } from '../../src/infrastructure/infrastructure';
import { Account } from '../../src/model/account/Account';
import { AccountRestrictionType } from '../../src/model/account/AccountRestrictionType';
import {Address} from '../../src/model/account/Address';
import {PublicAccount} from '../../src/model/account/PublicAccount';
import { RestrictionModificationType } from '../../src/model/account/RestrictionModificationType';
import { RestrictionType } from '../../src/model/account/RestrictionType';
import {NetworkType} from '../../src/model/blockchain/NetworkType';
import { NetworkCurrencyMosaic } from '../../src/model/mosaic/NetworkCurrencyMosaic';
import { AliasAction } from '../../src/model/namespace/AliasAction';
Expand Down Expand Up @@ -200,7 +200,7 @@ describe('AccountHttp', () => {
);
const addressModification = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction(
Deadline.create(),
RestrictionType.BlockAddress,
AccountRestrictionType.BlockIncomingAddress,
[addressPropertyFilter],
NetworkType.MIJIN_TEST,
);
Expand Down Expand Up @@ -426,7 +426,7 @@ describe('AccountHttp', () => {
);
const addressModification = AccountRestrictionTransaction.createAddressRestrictionModificationTransaction(
Deadline.create(),
RestrictionType.BlockAddress,
AccountRestrictionType.BlockIncomingAddress,
[addressPropertyFilter],
NetworkType.MIJIN_TEST,
);
Expand Down
Loading