diff --git a/app/lib/constants.js b/app/lib/constants.js index c2380be1262fe9b0bcf97eec275451df7108e2ea..a72cdfb506c63ed546c2e0d40d7e295704e503db 100644 --- a/app/lib/constants.js +++ b/app/lib/constants.js @@ -13,8 +13,8 @@ const INTEGER = "(0|[1-9]\\d{0,18})"; const RELATIVE_INTEGER = "(0|-?[1-9]\\d{0,18})"; const FLOAT = "\\d+\.\\d+"; const BOOLEAN = "[01]"; -const BLOCK_VERSION = "(6)"; -const TX_VERSION = "(3)"; +const BLOCK_VERSION = "(10)"; +const TX_VERSION = "(10)"; const SIGNATURE = "[A-Za-z0-9+\\/=]{87,88}"; const FINGERPRINT = "[A-F0-9]{64}"; const COMMENT = "[ a-zA-Z0-9-_:/;*\\[\\]()?!^\\+=@&~#{}|\\\\<>%.]{0,255}"; @@ -136,14 +136,14 @@ module.exports = { SIG: exact(SIGNATURE), BLOCK_UID: exact(BLOCK_UID), - DOCUMENTS_VERSION_REGEXP: /^2$/, + DOCUMENTS_VERSION_REGEXP: /^10$/, DOCUMENTS_BLOCK_VERSION_REGEXP: new RegExp("^" + BLOCK_VERSION + "$"), BLOCKSTAMP_REGEXP: new RegExp("^" + BLOCK_UID + "$"), - DOCUMENTS_TRANSACTION_VERSION_REGEXP: /^(2|3)$/, - DOCUMENTS_VERSION: 2, - BLOCK_GENERATED_VERSION: 6, - LAST_VERSION_FOR_TX: 3, - TRANSACTION_VERSION: 3, + DOCUMENTS_TRANSACTION_VERSION_REGEXP: /^(10)$/, + DOCUMENTS_VERSION: 10, + BLOCK_GENERATED_VERSION: 10, + LAST_VERSION_FOR_TX: 10, + TRANSACTION_VERSION: 10, REVOCATION_FACTOR: 2, // This is protocol fixed value NB_DIGITS_UD: 6, // This is protocol fixed value @@ -168,7 +168,7 @@ module.exports = { IDTY_UID: find('UniqueID: (' + USER_ID + ')') }, DOCUMENTS: { - DOC_VERSION: find('Version: (2)'), + DOC_VERSION: find('Version: (10)'), DOC_CURRENCY: find('Currency: (' + CURRENCY + ')'), DOC_ISSUER: find('Issuer: (' + PUBKEY + ')'), TIMESTAMP: find('Timestamp: (' + BLOCK_UID + ')') @@ -190,7 +190,7 @@ module.exports = { }, MEMBERSHIP: { BLOCK: find('Block: (' + BLOCK_UID + ')'), - VERSION: find('Version: (2)'), + VERSION: find('Version: (10)'), CURRENCY: find('Currency: (' + CURRENCY + ')'), ISSUER: find('Issuer: (' + PUBKEY + ')'), MEMBERSHIP: find('Membership: (IN|OUT)'), diff --git a/app/lib/rules/local_rules.js b/app/lib/rules/local_rules.js index 5699077387183dbba5f3fa1ad8bfc4f30b53a3b2..c7f4d95d7920f4930f3368bf868b8294b6f30df0 100644 --- a/app/lib/rules/local_rules.js +++ b/app/lib/rules/local_rules.js @@ -283,8 +283,8 @@ rules.FUNCTIONS = { const txs = block.getTransactions(); // Check rule against each transaction for (const tx of txs) { - if (tx.version != 3) { - throw Error('A transaction must have the version 3 for blocks with version >= 3'); + if (tx.version != 10) { + throw Error('A transaction must have the version 10'); } } return true; diff --git a/app/lib/system/network.js b/app/lib/system/network.js index ff7df89621197701b917a8ca8b53c1323f80ec33..7e746a4d560fc3534dcf1f003163b24fb63bc93a 100644 --- a/app/lib/system/network.js +++ b/app/lib/system/network.js @@ -105,7 +105,7 @@ module.exports = { if (whitelist.indexOf('127.0.0.1') === -1) { whitelist.push('127.0.0.1'); } - const ddosInstance = new ddos({ whitelist }); + const ddosInstance = new ddos({ whitelist, silent: true }); app.use(ddosInstance.express); // CORS for **any** HTTP request diff --git a/doc/Protocol.md b/doc/Protocol.md index 62e0f473b08ed33ca863f6f4f37cf0f4b3efd6a7..226c7317095506b86a134682b61856d0d2a77328 100644 --- a/doc/Protocol.md +++ b/doc/Protocol.md @@ -682,7 +682,7 @@ A transaction may be described with a more compact format, to be used in a [Bloc Here is an example compacting [example 2](#example-2) from above: - TX:3:1:3:1:0:0 + TX:10:1:3:1:0:0 204-00003E2B8A35370BA5A7064598F628A62D4E9EC1936BE8651CE9A85F2E06981B HsLShAtzXTVxeUtQd7yi5Z5Zh4zNvbu8sTEZ53nfKcqY 6:2:T:6991C993631BED4733972ED7538E41CCC33660F554E3C51963E2A0AC4D6453D3:0 @@ -696,7 +696,7 @@ Here is an example compacting [example 2](#example-2) from above: Here is an example compacting [example 3](#example-3) from above: - TX:3:3:6:3:1:0 + TX:10:3:6:3:1:0 204-00003E2B8A35370BA5A7064598F628A62D4E9EC1936BE8651CE9A85F2E06981B HsLShAtzXTVxeUtQd7yi5Z5Zh4zNvbu8sTEZ53nfKcqY CYYjHsNyg3HMRMpTHqCJAN9McjH5BwFLmDKGV3PmCuKp diff --git a/test/data/blockchain.json b/test/data/blockchain.json index c535304208e6e259dc5d3a4e955940a3f3a4dfc5..369e5231b7eb48827a19455e0a7a1d43df017312 100644 --- a/test/data/blockchain.json +++ b/test/data/blockchain.json @@ -1,12 +1,12 @@ { "blocks": [ { - "version": 6, - "nonce": 100000000001, + "version": 10, + "nonce": 300000000001, "number": 0, "powMin": 0, - "time": 1483612194, - "medianTime": 1483612194, + "time": 1483614905, + "medianTime": 1483614905, "membersCount": 2, "monetaryMass": null, "unitbase": 0, @@ -16,38 +16,38 @@ "len": 6, "currency": "duniter_unit_test_currency", "issuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV", - "signature": "noNgXC1JIeEVfZd8G7zXdToWioKbfnDP2abO4zcWUXBuauAnkPWt7Vp/PkKKgOUNippZ1iycxFI4P8HePKryBg==", - "hash": "79F3D06CF03C0DDB34713CEE91EA1660D54155FFA683FC9095AC84EF932445CD", + "signature": "WJourHkd6NnMxKDSEfrsiB7qE0mGbiFHSwy0cE8/q/is6hTd0mzlMNBPxDhoPkAiocfXJrQuIVeG0/ygxQrTBw==", + "hash": "0DCD782E25C04B3E77A7B5687893212AF0C8AE20687A13655D1068DA536FBF3E", "parameters": "0.007376575:3600:120:0:40:604800:31536000:1:604800:604800:0.9:31536000:3:20:960:10:20:0.6666666666666666", "previousHash": null, "previousIssuer": null, - "inner_hash": "18272124CAB127F86323300FEFF01FCCC972FF3C19DE263A8C9AFE5A75F0511C", + "inner_hash": "3969BE7A32853B2AB526662E88A2F1BFD852048C6B1DAEF0483F3DF64757AF48", "dividend": null, "identities": [ - "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV:eqxvNrwg0TZGmfBk/cdTs3gdDRiRvE7MZpjUMoZRYK4e8+SLD8hF4fegBIE8+qqQ0tnoMK0KkemDB7XCqtdICw==:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:tic", - "DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo:T727fILleI5XNiqpLj0UfRD/LJd/DGS2vpqJLwhYHyBoiuQ4ktaQFGtO4alUaWQgNkyZkhaatbad+53UBBBmBg==:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:toc" + "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV:1eubHHbuNfilHMM0G2bI30iZzebQ2cQ1PC7uPAw08FGMMmQCRerlF/3pc4sAcsnexsxBseA/3lY03KlONqJBAg==:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:tic", + "DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo:lcekuS0eP2dpFL99imJcwvDAwx49diiDMkG8Lj7FLkC/6IJ0tgNjUzCIZgMGi7bL5tODRiWi9B49UMXb8b3MAw==:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:toc" ], "joiners": [ - "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV:lgEsLYZSfzDyFjtxR2mnLamICcUtI8z8TQekxzlCyOVS/uegx0Q45Lk6ztQB+gmWI6lNiGmtjdoc26YFqqT3Ag==:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:tic", - "DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo:meZzYMYWTscR5cL99eglTDroJlgQEMAhLVlLwmaENkPfxhISzOxYgO9zQSm0K/xtU7TbFEh4JhyDN5F0AdxfBA==:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:toc" + "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV:s2hUbokkibTAWGEwErw6hyXSWlWFQ2UWs2PWx8d/kkElAyuuWaQq4Tsonuweh1xn4AC1TVWt4yMR3WrDdkhnAw==:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:tic", + "DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo:80pUx9YBk0RwqrVrQQA+PuxoNn21A8NwQ3824CQPU1ad9R1oDXc/pU6NVpQv92LM8gaWs/Pm1mLXNNVnr+m6BA==:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:toc" ], "actives": [], "leavers": [], "revoked": [], "excluded": [], "certifications": [ - "DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo:DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV:0:sxfdBIP6uZoq482yEB/eJzr3fZ1IVYGq8AQbPM4HfYkUr9hRodWWSW6Lv+L+CTGkDNzudPPDgejUHqZD6/naBw==", - "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV:DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo:0:pJ7uTPRJDM+CsTlW5HPnvkStYWPepnQ4jaIMQwnY0gnHymGIZL7oZ68pxXMFCRPWfeGQ2GVvCPEJQf5otCvKCw==" + "DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo:DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV:0:vMaYgBSnU+83AYOVQCZAx1XLpg/F1MmMztDfCnZvl8hPs4LE9tcDvCrrFogAwMEW2N7Y0gCH62/fBMgw4KrGCA==", + "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV:DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo:0:RKIGMgYIhB9FmjPbmyo4egPufg/iTpBznYGZp5hjK1WZ1a9imQldLNUMe0eiPlSKJTK/JD3gOlCiynOEY2csBA==" ], "transactions": [] }, { - "version": 6, - "nonce": 100000000001, + "version": 10, + "nonce": 200000000001, "number": 1, "powMin": 0, - "time": 1483619402, - "medianTime": 1483612194, + "time": 1483622114, + "medianTime": 1483614905, "membersCount": 2, "monetaryMass": 0, "unitbase": 0, @@ -57,12 +57,12 @@ "len": 0, "currency": "duniter_unit_test_currency", "issuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV", - "signature": "bLgJgRpAiF6DN7lccxHzkjyoKlsI/NPh2GIjzV5GUBb0lCfSw7fArAd3apDLJF3QiHS8iVy1fH5R3jyD8SRCDA==", - "hash": "2D46464E2A8D40F29051FA603E2D03E8349AA5F8EF2F721964AF38847D2BCBDC", + "signature": "XHoAuJI0OfwA3/yCA2J9Q2u9Xvn/p6njXDz7Psi1v7ia1ibjH2mTB97odI8O7Mda2mVtyoVl4Un01cso1ww0Aw==", + "hash": "7D6AE31DBD9EF372120ADEE5FA90DDD4EFACAE96B926BD54087E52641FC72BFC", "parameters": "", - "previousHash": "79F3D06CF03C0DDB34713CEE91EA1660D54155FFA683FC9095AC84EF932445CD", + "previousHash": "0DCD782E25C04B3E77A7B5687893212AF0C8AE20687A13655D1068DA536FBF3E", "previousIssuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV", - "inner_hash": "239597A84DB5CB243B788C48C27B73EBB0C9F6BCE1F99B7752E3D464C84232A8", + "inner_hash": "0FD9B1D8BBB6EE37572668F6B5E5CB66A546BE4337E05B31C09FB71B39F36EC6", "dividend": null, "identities": [], "joiners": [], @@ -74,12 +74,12 @@ "transactions": [] }, { - "version": 6, - "nonce": 100000000001, + "version": 10, + "nonce": 200000000001, "number": 2, "powMin": 0, - "time": 1483619402, - "medianTime": 1483615798, + "time": 1483622114, + "medianTime": 1483618509, "membersCount": 2, "monetaryMass": 240, "unitbase": 0, @@ -89,12 +89,12 @@ "len": 0, "currency": "duniter_unit_test_currency", "issuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV", - "signature": "RjSZ2sXAIA8JyuVzdVPov7/fTq8DNAETWEpKZZcZy0Zs6gUNcrll+avtXgVTEYLxvZTFBIXzkslD6lUEpX3UBQ==", - "hash": "7F356CBA3D4F92C943FA8F503DA0BFBFC537CCA6CD49C207A47AA1A7A8AF0C3F", + "signature": "TkyydTsP5A5UZtn4URK7kSNUftdFDqP9Ma9DH36y1tfopvy5BUHtLc3Huz1eaiEJClfmNGh+LU5qxoSVmny3Bg==", + "hash": "347E823BE5B446972B5A9ED162428AA247840FA695FBC125CC964F289453F17C", "parameters": "", - "previousHash": "2D46464E2A8D40F29051FA603E2D03E8349AA5F8EF2F721964AF38847D2BCBDC", + "previousHash": "7D6AE31DBD9EF372120ADEE5FA90DDD4EFACAE96B926BD54087E52641FC72BFC", "previousIssuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV", - "inner_hash": "4A5D65F938CAC7D131625FD493C0A55355E6AE5E499125C9E3D76AFA0592399B", + "inner_hash": "BBA373D017B83A8DAEE81FEC49E4A861AE624EE783B40554548595FB83C35409", "dividend": 120, "identities": [], "joiners": [], @@ -106,12 +106,12 @@ "transactions": [] }, { - "version": 6, - "nonce": 100000000001, + "version": 10, + "nonce": 300000000001, "number": 3, "powMin": 0, - "time": 1483619412, - "medianTime": 1483616999, + "time": 1483622124, + "medianTime": 1483619711, "membersCount": 2, "monetaryMass": 240, "unitbase": 0, @@ -121,12 +121,12 @@ "len": 8, "currency": "duniter_unit_test_currency", "issuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV", - "signature": "xB1fUtsIxlVVyruQ6x1tNfBd68qVXs9yq9XBNQxliX8ohUX1iWqrs1CnigPgl+vByv761A0IkOIZztTC01yfAA==", - "hash": "5702B880929B59BCA649F0C607F96A0AE68E8EAE50423A27CFCBFFFF2B838085", + "signature": "FsdVyz6yu/szV8U/yFrpCGBZADqfQmboOOt3QiNSqtVbVPzVXutYsz7o+mew+uQAP3cSrvMt8uSKD1InslunDw==", + "hash": "4747B5BF56F8F582B01EE78C93470745175F1254868341F29569503C6AD3B7CA", "parameters": "", - "previousHash": "7F356CBA3D4F92C943FA8F503DA0BFBFC537CCA6CD49C207A47AA1A7A8AF0C3F", + "previousHash": "347E823BE5B446972B5A9ED162428AA247840FA695FBC125CC964F289453F17C", "previousIssuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV", - "inner_hash": "D79BAFDFD18054218C04EAD4FEA10B86021DD56080340E780EF7FD71CEBAC816", + "inner_hash": "F3AD9B713ABF6F30135F35EFF3210B2E0C85F17A129A455CA352C559B5F98A06", "dividend": null, "identities": [], "joiners": [], @@ -137,8 +137,8 @@ "certifications": [], "transactions": [ { - "version": 3, - "blockstamp": "2-7F356CBA3D4F92C943FA8F503DA0BFBFC537CCA6CD49C207A47AA1A7A8AF0C3F", + "version": 10, + "blockstamp": "2-347E823BE5B446972B5A9ED162428AA247840FA695FBC125CC964F289453F17C", "locktime": 0, "issuers": [ "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV" @@ -155,22 +155,22 @@ ], "comments": [], "signatures": [ - "E3zJWPsoQymCULup73QGFOfAXTSniK/O8aSVQLKcb31+Z7rul9IZ8f7BWpdE0gQnHt5Om16/4xh+upMieZlTDg==" + "5rfA0vIZ5nZ5VtpnVpc3BeDxPssaYTCNHsit4n9mxafTkRXhDNxLO/hDIwSz934xxsSdbYXdS1F4FrSy+ooDCA==" ], "comment": "", "currency": "duniter_unit_test_currency", "block_number": 3, - "time": 1483616999 + "time": 1483619711 } ] }, { - "version": 6, - "nonce": 300000000001, + "version": 10, + "nonce": 100000000001, "number": 4, "powMin": 0, - "time": 1483617602, - "medianTime": 1483617602, + "time": 1483620314, + "medianTime": 1483620314, "membersCount": 2, "monetaryMass": 240, "unitbase": 0, @@ -180,12 +180,12 @@ "len": 9, "currency": "duniter_unit_test_currency", "issuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV", - "signature": "jIlJKQLcVzHjIF0rVbrb+rUyk/RpSDm4GvfRUWGOEcu4oCFcNt6cjMl8+Cwm8s/FVzTRyUpjxEdSoeQ4QEC4Bg==", - "hash": "A049508E4D9F636E5CA4891CBE39D6D1BBE433514503378C6349D1C88ED2A7E6", + "signature": "GGqAwEZmugRVfwEi4SjET+BtQkdcpoekL0noaqvNLXpt0n0DWBQNcbG4MBTQciQgZn9CTvjxXC1qohnlCkWOCQ==", + "hash": "C30D95C66C7323780CD6D137EBF75ED9FE1A12B1E767D8CD982F1F30217418B5", "parameters": "", - "previousHash": "5702B880929B59BCA649F0C607F96A0AE68E8EAE50423A27CFCBFFFF2B838085", + "previousHash": "4747B5BF56F8F582B01EE78C93470745175F1254868341F29569503C6AD3B7CA", "previousIssuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV", - "inner_hash": "4DE8039DDF85EE521FB0BAC5C68B761B7D2D579542D54D5E4DF941B031361F38", + "inner_hash": "4F76233A54A34BA6EF33C96996B27C5A5FCA3F79567E9AE4E5C075B355050510", "dividend": null, "identities": [], "joiners": [], @@ -196,15 +196,15 @@ "certifications": [], "transactions": [ { - "version": 3, - "blockstamp": "3-5702B880929B59BCA649F0C607F96A0AE68E8EAE50423A27CFCBFFFF2B838085", + "version": 10, + "blockstamp": "3-4747B5BF56F8F582B01EE78C93470745175F1254868341F29569503C6AD3B7CA", "locktime": 0, "issuers": [ "DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo" ], "inputs": [ "120:0:D:DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo:2", - "51:0:T:5B4BD2A20CB2D27DFAC915FA25B0D437D49ACC8CEAE3EE491DBE8633CFA61C6D:0" + "51:0:T:D77C05A6A346B58422DCAA779274F5F8D6D46F2DA9302BA257654183F055B366:0" ], "unlocks": [ "0:SIG(0)", @@ -215,22 +215,22 @@ ], "comments": [], "signatures": [ - "+UVRfXmPnw2WQUZ76XNikVLEzmFz+pR68W0NyTLt7DQ+PddSDFOqbXT9hxiwwO2W3Yr1N833ex4xeXZyUxVRCA==" + "K0XrFWiI143TLzsrWM1m8U9ZnloR5d6T6jWq/oXqo3RqFn0FS+CX1F9FqqxM94zG499NRXRkuQteT1Gd5qg+Ag==" ], "comment": "", "currency": "duniter_unit_test_currency", "block_number": 4, - "time": 1483617602 + "time": 1483620314 } ] }, { - "version": 6, + "version": 10, "nonce": 100000000001, "number": 5, "powMin": 0, - "time": 1483632032, - "medianTime": 1483617602, + "time": 1483634744, + "medianTime": 1483620314, "membersCount": 2, "monetaryMass": 240, "unitbase": 0, @@ -240,12 +240,12 @@ "len": 0, "currency": "duniter_unit_test_currency", "issuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV", - "signature": "OmvuphhkjeaCvMNbPc5KG5q8D1DEnUBeEBGLaupFXA2wELkaHwEmR709aM5GeOAZskBOBn37UpV7wnQ2y7oDBw==", - "hash": "886AD4E3EAF7663B494DAB66B2201E936B02015F56F4EFFFAB425BB784334F94", + "signature": "G05LWsvjnGULgHW4qtLr+rqLsGIvnffwHTtdCMmlLU9gzLaoeCPKmVaPBMFOuhePb0Wil2nonGbQ9X7+J/3cAg==", + "hash": "90F23DB9844EAB217EF0076F5B723D7CFBA4846F7CED42A1C7140DE048EF248A", "parameters": "", - "previousHash": "A049508E4D9F636E5CA4891CBE39D6D1BBE433514503378C6349D1C88ED2A7E6", + "previousHash": "C30D95C66C7323780CD6D137EBF75ED9FE1A12B1E767D8CD982F1F30217418B5", "previousIssuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV", - "inner_hash": "301EE056C6D5BCEE418C24405583C5A9206B43C2DFA672FCA2213600398E2FB1", + "inner_hash": "B694ADC464A518972C5AB5DC6804252B40AD2D38D17CA999532953404948AFD0", "dividend": null, "identities": [], "joiners": [], @@ -257,12 +257,12 @@ "transactions": [] }, { - "version": 6, - "nonce": 200000000001, + "version": 10, + "nonce": 300000000001, "number": 6, "powMin": 0, - "time": 1483620007, - "medianTime": 1483620007, + "time": 1483622719, + "medianTime": 1483622719, "membersCount": 2, "monetaryMass": 482, "unitbase": 0, @@ -272,12 +272,12 @@ "len": 0, "currency": "duniter_unit_test_currency", "issuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV", - "signature": "XbDFHJGPDmSTUQuLWT44aitZJwhx29A0/e71nMakK3/oYot7sOYmVW1p56FZsifi6cgDECBmeTROV+kWqJs8AQ==", - "hash": "15C5FA7029DAC05FD030F8A3C7455FAD2D902B39B5F9D8C59E8F6748C303ECD1", + "signature": "41zb+6309w9D2dZ1xUBIA8VzDAO3bVLIa0I911ZHiD23YVUKpSqk3oPWWs+sTgYASv2kk+i5ygMyxixyQrEMCA==", + "hash": "B6432A9F39B21B6A297F1C8784004FA58667E6CCBF8B6AF42621E6BABF25E375", "parameters": "", - "previousHash": "886AD4E3EAF7663B494DAB66B2201E936B02015F56F4EFFFAB425BB784334F94", + "previousHash": "90F23DB9844EAB217EF0076F5B723D7CFBA4846F7CED42A1C7140DE048EF248A", "previousIssuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV", - "inner_hash": "8D30E0A06CEDB46C99603F929EE7443A7E946438E9828A597D04B35784258A4D", + "inner_hash": "C7DF18844F115B02776B0579D0358503812227D27AAE368F0E0FB06498C98268", "dividend": 121, "identities": [], "joiners": [], @@ -289,12 +289,12 @@ "transactions": [] }, { - "version": 6, - "nonce": 100000000001, + "version": 10, + "nonce": 200000000001, "number": 7, "powMin": 0, - "time": 1483620007, - "medianTime": 1483620007, + "time": 1483622719, + "medianTime": 1483622719, "membersCount": 2, "monetaryMass": 482, "unitbase": 0, @@ -304,12 +304,12 @@ "len": 7, "currency": "duniter_unit_test_currency", "issuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV", - "signature": "B7Qv9Qg7xNtjfFwLC/TSpQPrLpHCAy6OEEUyDZNnyMeHTUwS4hRiPhe5eWxymtEjlTOt+1AigfyVDzJ5xIwLDQ==", - "hash": "A4D6C32557EC76109CB33C3AD78AABD8D7BEC70B64A46C5EE350DD6E24BEAEA4", + "signature": "qrncAMCOgoKQs+AVU6aA6lZRiwwmjyFFJ52huTOhUu03xGauGrA8vGt0N3tm7qEosLXwshGl3hx2L4yyG5YvDQ==", + "hash": "2A8FB524A4533C48242421A9D4F397EA55349546049404FADE69C6377FF548D1", "parameters": "", - "previousHash": "15C5FA7029DAC05FD030F8A3C7455FAD2D902B39B5F9D8C59E8F6748C303ECD1", + "previousHash": "B6432A9F39B21B6A297F1C8784004FA58667E6CCBF8B6AF42621E6BABF25E375", "previousIssuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV", - "inner_hash": "BB3AA464E7058B9CCE3A6B3B4E2D0A4922F78169C5A50F67FE77A76B0A5E0903", + "inner_hash": "BDF4F79493B49BE202AE4FC9A606FCDAD494799A5BABA21BBE3488D20FE2678E", "dividend": null, "identities": [], "joiners": [], @@ -320,8 +320,8 @@ "certifications": [], "transactions": [ { - "version": 3, - "blockstamp": "6-15C5FA7029DAC05FD030F8A3C7455FAD2D902B39B5F9D8C59E8F6748C303ECD1", + "version": 10, + "blockstamp": "6-B6432A9F39B21B6A297F1C8784004FA58667E6CCBF8B6AF42621E6BABF25E375", "locktime": 0, "issuers": [ "DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo" @@ -337,22 +337,22 @@ ], "comments": [], "signatures": [ - "37coPPe2SkZe11loDce7Q/Ewwv3hohNi3jNWFq12b3MXWcFgeGB/SiYSxwKre/VRL+uSEb1KJGH1o0p/TrTmBA==" + "e7V8ZKethWnOoPmEBhD01fz/QIFtaSgHDf7Dz9OP97AWY41q/GuKUc1NuQXKATUJZ7Mh4qRtyq1+RCAkZIzgDA==" ], "comment": "", "currency": "duniter_unit_test_currency", "block_number": 7, - "time": 1483620007 + "time": 1483622719 } ] }, { - "version": 6, - "nonce": 100000000001, + "version": 10, + "nonce": 300000000001, "number": 8, "powMin": 0, - "time": 1483620007, - "medianTime": 1483620007, + "time": 1483622719, + "medianTime": 1483622719, "membersCount": 2, "monetaryMass": 482, "unitbase": 0, @@ -362,12 +362,12 @@ "len": 8, "currency": "duniter_unit_test_currency", "issuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV", - "signature": "A4d9iSTM8Y68ffT+EavMblJ1eqbL7Bl6Rm17Qr5IPEvrsrp/4kImI6FiLpdZYKZAJSDKMiFetJ34nKogeKURAg==", - "hash": "CB0E3A01832EBC72342C2B2B88C38E537290C2AA0C88F1AFCC19F3D9D7AE2F1C", + "signature": "ZtV1UngKPYOJ5gwIQYjuFT8EilNJG7NVpyDosviRJ+9F5so/g9lGjF2i8DhVlCc8A0n9lW6Kio24XZsVykooCw==", + "hash": "999A84F9BAE0C3067752A21779FB8F2401EB18CC3F7FF7550A95BB2DF5C3670A", "parameters": "", - "previousHash": "A4D6C32557EC76109CB33C3AD78AABD8D7BEC70B64A46C5EE350DD6E24BEAEA4", + "previousHash": "2A8FB524A4533C48242421A9D4F397EA55349546049404FADE69C6377FF548D1", "previousIssuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV", - "inner_hash": "D6700969041F37D529155C8FE69303853423562248772CD95BE5987BC07233CD", + "inner_hash": "C75C356062DE5FB1ADC44F32412EB7A88F76D6F3C4FA78E47D2CAF6DEBEF4415", "dividend": null, "identities": [], "joiners": [], @@ -378,14 +378,14 @@ "certifications": [], "transactions": [ { - "version": 3, - "blockstamp": "7-A4D6C32557EC76109CB33C3AD78AABD8D7BEC70B64A46C5EE350DD6E24BEAEA4", + "version": 10, + "blockstamp": "7-2A8FB524A4533C48242421A9D4F397EA55349546049404FADE69C6377FF548D1", "locktime": 0, "issuers": [ "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV" ], "inputs": [ - "121:0:T:71A8E93E784B1D50B731B28C96E3EE3C318C6E2552A30EA5240CBB04A52A8F23:0" + "121:0:T:D54DF2479C4BF0D7E756F204AA7BC38F0C143EDDDC92DF9645BA031138E0477D:0" ], "unlocks": [ "0:SIG(0)" @@ -397,22 +397,22 @@ "ok" ], "signatures": [ - "JpLJ2qEaTKpn1e+povCBQ4gffHvv18taeiswFQ9SyetT8gQwJjcujz7UMgt+3pLlHUhueVbvE1/xRdhC81+4Bg==" + "CZ/PTKvdeIeh2Tcg+lcMO6V1wkVzHgEY2KYkIkdNv9o8R9Iq7QedyT6chbG7Qv55TJD8LCijIuutSmsgz5IMBg==" ], "comment": "ok", "currency": "duniter_unit_test_currency", "block_number": 8, - "time": 1483620007 + "time": 1483622719 } ] }, { - "version": 6, + "version": 10, "nonce": 100000000001, "number": 9, "powMin": 0, - "time": 1483620007, - "medianTime": 1483620007, + "time": 1483622719, + "medianTime": 1483622719, "membersCount": 2, "monetaryMass": 482, "unitbase": 0, @@ -422,12 +422,12 @@ "len": 8, "currency": "duniter_unit_test_currency", "issuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV", - "signature": "/TW1+AnNohrnVQ5IonXdWYPr3YCP+KLw/QVQR7dpkIZRI3oxIGnigNQz0vrMaMNJYATSyKhTiPHlYhIkNkqiAA==", - "hash": "F658FD78358DF218B326F4B16593607F91D3BB121E1EDEA8D2F1A860F21EF1B9", + "signature": "ZS8SZvAPwV+lzJIB9lzhXKbezvf2zYuqESorhi7hm5+h54gHVE1VdHq8kWqK8254e/E4+DBYGyUtmqkSzjp4DQ==", + "hash": "B087B0B7CF881355D0881BE61170168EBC0EAAA2640CD9119EDDCAFA6ED0D72B", "parameters": "", - "previousHash": "CB0E3A01832EBC72342C2B2B88C38E537290C2AA0C88F1AFCC19F3D9D7AE2F1C", + "previousHash": "999A84F9BAE0C3067752A21779FB8F2401EB18CC3F7FF7550A95BB2DF5C3670A", "previousIssuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV", - "inner_hash": "5B125FA9F149C9AE632D39707C9CDC86E568A052F4A462078F317F1967902D9A", + "inner_hash": "B712970F21A1297D04755240C083533448E17381763A9789B23E7A8A80E1F3F8", "dividend": null, "identities": [], "joiners": [], @@ -438,14 +438,14 @@ "certifications": [], "transactions": [ { - "version": 3, - "blockstamp": "7-A4D6C32557EC76109CB33C3AD78AABD8D7BEC70B64A46C5EE350DD6E24BEAEA4", + "version": 10, + "blockstamp": "7-2A8FB524A4533C48242421A9D4F397EA55349546049404FADE69C6377FF548D1", "locktime": 0, "issuers": [ "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV" ], "inputs": [ - "121:0:T:F9E46464D67B409C5932AD63B81F30D2167CFCCE175342B41781BDE873AE4B4A:0" + "121:0:T:5F779C409D291EC24D496703012EC703CCD5D4A1E3FC6977AD7FC6A17CBBB51A:0" ], "unlocks": [ "0:XHX(1872767826647264)" @@ -457,22 +457,22 @@ "okk" ], "signatures": [ - "YYygv5L1bSZuG5ipDIDB7r1hAk2PyKOA6P+7SaP7wup+AbFd62PIihyiYZNFN0vG8FpEaUohxUGE9b+5flhJCg==" + "0c6KHlaFOr7tzpMeh6cNWeM4u3CP6tq4n/8RU/lgCANqGieylYNi1l/rI6swaPR0+VveEME6TXxttckLHHchBg==" ], "comment": "okk", "currency": "duniter_unit_test_currency", "block_number": 9, - "time": 1483620007 + "time": 1483622719 } ] }, { - "version": 6, + "version": 10, "nonce": 100000000001, "number": 10, "powMin": 1, - "time": 1483620007, - "medianTime": 1483620007, + "time": 1483622719, + "medianTime": 1483622719, "membersCount": 2, "monetaryMass": 482, "unitbase": 0, @@ -482,12 +482,12 @@ "len": 7, "currency": "duniter_unit_test_currency", "issuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV", - "signature": "lUfMmipNNMVKpc6TyuVx4Ys6vxpkFq193A2ZLVtFy8coIBvXUvYyDpicHoSZdAR1qbiGEh079Qo0g1t0izaiBQ==", - "hash": "E67CB6C37205B822754D70CA9F3687E3BAB000F0688476A700D591306A153748", + "signature": "W6cestg9fjh6pG3jXz9N3j1BMd5urpOTI/PjcC5Z6bqIOw33d82XYYTudz6g49wBTA8ux/3bgdMh0Vu37dKsBw==", + "hash": "26B57CF37334A136A8BBC801C9163E3A769A8F2FBB4497DD5CDA39369DC89952", "parameters": "", - "previousHash": "F658FD78358DF218B326F4B16593607F91D3BB121E1EDEA8D2F1A860F21EF1B9", + "previousHash": "B087B0B7CF881355D0881BE61170168EBC0EAAA2640CD9119EDDCAFA6ED0D72B", "previousIssuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV", - "inner_hash": "ED5A9E757E6CABE2D7A617664223E689938530C14C2EF8AA4036CB5CAB6642B9", + "inner_hash": "BD4C859BB6BDA4F738D7913026CC65EFAE1FAFAF8580FB3DF8811F9830528B41", "dividend": null, "identities": [], "joiners": [], @@ -498,14 +498,14 @@ "certifications": [], "transactions": [ { - "version": 3, - "blockstamp": "9-F658FD78358DF218B326F4B16593607F91D3BB121E1EDEA8D2F1A860F21EF1B9", + "version": 10, + "blockstamp": "9-B087B0B7CF881355D0881BE61170168EBC0EAAA2640CD9119EDDCAFA6ED0D72B", "locktime": 0, "issuers": [ "DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo" ], "inputs": [ - "121:0:T:84BB9439E1110F4E600654E1B4801B1BFA64B9190384C1D837E73D6DB3D7432D:0" + "121:0:T:740955FB8D22AFB1E41B8F7F15CEE6082AFA45A138FE528A73ADB0B8761C6EEF:0" ], "unlocks": [ "0:SIG(0)" @@ -515,22 +515,22 @@ ], "comments": [], "signatures": [ - "BIvOvs/SnwUG0VEHpNybCRjI2dGeJbyY0qcsOba6ivOOdUBMSTT5BveJmBmFRrFfmCGZfB0RSu3+8hEY0hQ4CQ==" + "y4/kUzik/gqJuangJfSFJoX3pQS4l3qwnstT54I9YQl2G2i3A8EL6mWp4PYweLFKGBTrguhPKnM2moySWxslBw==" ], "comment": "", "currency": "duniter_unit_test_currency", "block_number": 10, - "time": 1483620007 + "time": 1483622719 } ] }, { - "version": 6, - "nonce": 300000000001, + "version": 10, + "nonce": 100000000001, "number": 11, "powMin": 1, - "time": 1483620007, - "medianTime": 1483620007, + "time": 1483622719, + "medianTime": 1483622719, "membersCount": 2, "monetaryMass": 482, "unitbase": 0, @@ -540,12 +540,12 @@ "len": 8, "currency": "duniter_unit_test_currency", "issuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV", - "signature": "WtkMAGEkPtY+jDCSEV4Fi1S3n/sQxrreK/86Y5ksJuD2PnzoZKRESjUFkVVkrEwJzYKkJjxqt3emiCO5d66tAw==", - "hash": "6DE6209D70C5BC4AA1B3E8DF4B7A3B9FB1995157927E5C2047B44BC0A0B128F2", + "signature": "97buQfxPg8ONEzLyBtlOGjXhhUft4TfJoXZkG/1Ou1KSj9R42On070cZjULH2cmheaX0ebjsKThEvQdFwlEfDQ==", + "hash": "2507D9FEFA73351D5FA79B3F0FB8450869AD40DA3986F8DAB6BD087169DC0C9E", "parameters": "", - "previousHash": "E67CB6C37205B822754D70CA9F3687E3BAB000F0688476A700D591306A153748", + "previousHash": "26B57CF37334A136A8BBC801C9163E3A769A8F2FBB4497DD5CDA39369DC89952", "previousIssuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV", - "inner_hash": "48ED327DE72790C360821722C5E3E882C5ACEFED5A069AAE5EB3D27CC45BC378", + "inner_hash": "463A572E9304858E241C43C83722C44552EE3984B637546F3DD2415CFB34BECC", "dividend": null, "identities": [], "joiners": [], @@ -556,14 +556,14 @@ "certifications": [], "transactions": [ { - "version": 3, - "blockstamp": "10-E67CB6C37205B822754D70CA9F3687E3BAB000F0688476A700D591306A153748", + "version": 10, + "blockstamp": "10-26B57CF37334A136A8BBC801C9163E3A769A8F2FBB4497DD5CDA39369DC89952", "locktime": 0, "issuers": [ "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV" ], "inputs": [ - "121:0:T:60A68F32B74D99C97CC1EF64527D82DC89C1F74084D5C295C6204B092C566A9F:0" + "121:0:T:230712F5F850602D2C0ACF26A7F60F791DFA9873A5E8B8374EE87938AD995EE5:0" ], "unlocks": [ "0:SIG(0)" @@ -575,12 +575,12 @@ "cross1" ], "signatures": [ - "Ut+cXNVvJwXtEbiEsOrfqH4JUhhcuZRUwxi+6w0O8lEoDnvV0qNnW4vqWl2L7rjO1oGHCG9WJzoOjE3yd5XtBw==" + "YLxw8AB+uVeLIMB2IWIOWGVvVRmnsYgl100vbPzNM+lfDU4wnmaftmoh8pMZzGjGUSBPSinIBvdJrVXZslymAA==" ], "comment": "cross1", "currency": "duniter_unit_test_currency", "block_number": 11, - "time": 1483620007 + "time": 1483622719 } ] } diff --git a/test/data/blocks.js b/test/data/blocks.js index f8766d0c3741641e5daef3d621f4b2366f2fa7ed..15d991f9a577c826551fc454ef935dc04390cfda 100644 --- a/test/data/blocks.js +++ b/test/data/blocks.js @@ -1,7 +1,7 @@ module.exports = { WRONG_SIGNATURE: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 50\n" + @@ -38,43 +38,40 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", VALID_ROOT: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + - "Currency: bb\n" + + "Currency: duniter_unit_test_currency\n" + "Number: 0\n" + "PoWMin: 0\n" + - "Time: 1458831706\n" + - "MedianTime: 1458831706\n" + + "Time: 1483614905\n" + + "MedianTime: 1483614905\n" + "UnitBase: 0\n" + - "Issuer: HgTTJLAQ5sqfknMq7yLPZbehtuLSsKj9CxWN7k8QvYJd\n" + - "IssuersFrame: 100\n" + + "Issuer: DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV\n" + + "IssuersFrame: 1\n" + "IssuersFrameVar: 0\n" + - "DifferentIssuersCount: 3\n" + - "Parameters: 0.007376575:2629800:100:0:40:604800:31536000:1:604800:604800:0.9:31536000:3:20:960:10:20:0.6666666666666666\n" + - "MembersCount: 3\n" + + "DifferentIssuersCount: 0\n" + + "Parameters: 0.007376575:3600:120:0:40:604800:31536000:1:604800:604800:0.9:31536000:3:20:960:10:20:0.6666666666666666\n" + + "MembersCount: 2\n" + "Identities:\n" + - "HgTTJLAQ5sqfknMq7yLPZbehtuLSsKj9CxWN7k8QvYJd:5PmGBvNj8AZ1T75Fe1rDLKy8lygwTFbrSwLYfMZS8eASxig5uHxx7P9l/hVgjIx7byPAkAsmrZIbYp/DEdnnDA==:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:cat\n" + - "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV:/FZ6zVzAw0qZ9qD67CesQTRSp5glmooF37Dxs6kRHOOGZnh4ICykG07/FB76Z3C4H9tq1Qq5Hwbxw96+9Qj1CA==:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:tic\n" + - "DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo:bQAaenbeQk89bcKHHi7XsJGyo3mOZXNIphFqSjcJxp/a85k9vOF+yS4T18ZYV3rShI2QV6W7JlLPc4q+YdWhDw==:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:toc\n" + + "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV:1eubHHbuNfilHMM0G2bI30iZzebQ2cQ1PC7uPAw08FGMMmQCRerlF/3pc4sAcsnexsxBseA/3lY03KlONqJBAg==:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:tic\n" + + "DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo:lcekuS0eP2dpFL99imJcwvDAwx49diiDMkG8Lj7FLkC/6IJ0tgNjUzCIZgMGi7bL5tODRiWi9B49UMXb8b3MAw==:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:toc\n" + "Joiners:\n" + - "HgTTJLAQ5sqfknMq7yLPZbehtuLSsKj9CxWN7k8QvYJd:ICfYCQvs33HQhusMRswIFljGRjUIcmZPu+pt9qTcGEUf8/wZlIbiY/dwV6RUa4tI6TbvGcg2HUlmKLhFg9AKBQ==:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:cat\n" + - "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV:njph4Y7Kn6vmycTp/rJplRj7PZVFiXv7YjZlC3mrSyXzvQNtX4JFAwXivsRDL6HcWnDesBqwEdrDAmiD28DNDQ==:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:tic\n" + - "DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo:RkJsHDZdz++fFjr7+Qfv0pkSsTxkpD0TKW410XXVCNrPqHOPMaPVGauy6f1V0LuzVOJIRYPhDVekQLIcyEbjDw==:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:toc\n" + + "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV:s2hUbokkibTAWGEwErw6hyXSWlWFQ2UWs2PWx8d/kkElAyuuWaQq4Tsonuweh1xn4AC1TVWt4yMR3WrDdkhnAw==:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:tic\n" + + "DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo:80pUx9YBk0RwqrVrQQA+PuxoNn21A8NwQ3824CQPU1ad9R1oDXc/pU6NVpQv92LM8gaWs/Pm1mLXNNVnr+m6BA==:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:toc\n" + "Actives:\n" + "Leavers:\n" + "Revoked:\n" + "Excluded:\n" + "Certifications:\n" + - "DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo:HgTTJLAQ5sqfknMq7yLPZbehtuLSsKj9CxWN7k8QvYJd:0:BXksBR6BU3b694HuLoyUzoDd5xjdaJfYOY4EO7xSD/UkktW5oKy709RL/nCHY5vfPA0HrwPyi8vXAVKNzmGUCQ==\n" + - "HgTTJLAQ5sqfknMq7yLPZbehtuLSsKj9CxWN7k8QvYJd:DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV:0:CStF7zf3SShRaW+E3YlU7iJNlMt78m/DDn2eoZZNfHLMwd0hqkBmjQWdVKcnJS3oHqiiFCnVIRAbF03cDlafCA==\n" + - "HgTTJLAQ5sqfknMq7yLPZbehtuLSsKj9CxWN7k8QvYJd:DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo:0:X8P6NZNWq9qTmobhoFB4ITrSZQbEqAxkPt2wRpXC8JVniP3LvQi1h8DyiRvE6SbF1pyUsgRHiVKq1iB32YAGAA==\n" + + "DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo:DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV:0:vMaYgBSnU+83AYOVQCZAx1XLpg/F1MmMztDfCnZvl8hPs4LE9tcDvCrrFogAwMEW2N7Y0gCH62/fBMgw4KrGCA==\n" + + "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV:DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo:0:RKIGMgYIhB9FmjPbmyo4egPufg/iTpBznYGZp5hjK1WZ1a9imQldLNUMe0eiPlSKJTK/JD3gOlCiynOEY2csBA==\n" + "Transactions:\n" + - "InnerHash: 6C6A4B7E433EE8B036820FEA0C70D93F8E3BF360BC0C52C8B39487833A56A97F\n" + - "Nonce: 1\n" + - "Rj8FJ2Cr2XUVcfzdIpRqbBr0/tqOhZmjrgweKAkAPVN915Lj/LT4QZc8WJ80dmb4a15UXwoWphBMfrAJ+o88CQ==\n", + "InnerHash: 3969BE7A32853B2AB526662E88A2F1BFD852048C6B1DAEF0483F3DF64757AF48\n" + + "Nonce: 300000000001\n" + + "WJourHkd6NnMxKDSEfrsiB7qE0mGbiFHSwy0cE8/q/is6hTd0mzlMNBPxDhoPkAiocfXJrQuIVeG0/ygxQrTBw==\n", WRONG_PROOF_OF_WORK: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 1\n" + @@ -101,7 +98,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", ROOT_WITHOUT_PARAMETERS: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -138,7 +135,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", NON_ROOT_WITH_PARAMETERS: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 5\n" + @@ -165,7 +162,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", ROOT_WITH_PREVIOUS_HASH: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -192,7 +189,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", ROOT_WITH_PREVIOUS_ISSUER: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -219,7 +216,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", NON_ROOT_WITHOUT_PREVIOUS_HASH: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 1\n" + @@ -245,7 +242,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", NON_ROOT_WITHOUT_PREVIOUS_ISSUER: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 1\n" + @@ -272,7 +269,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", COLLIDING_UIDS: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -309,7 +306,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", COLLIDING_PUBKEYS: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -346,7 +343,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONG_DATE_LOWER: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 50\n" + @@ -383,7 +380,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONG_DATE_HIGHER_BUT_TOO_FEW: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 10\n" + @@ -422,7 +419,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONG_DATE_HIGHER_BUT_TOO_HIGH: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 10\n" + @@ -461,7 +458,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONG_ROOT_TIMES: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -498,7 +495,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", GOOD_DATE_HIGHER: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 20\n" + @@ -537,7 +534,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONG_IDTY_MATCH_JOINS: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -573,7 +570,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", MULTIPLE_JOINERS: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 1\n" + @@ -608,7 +605,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", MULTIPLE_ACTIVES: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 1\n" + @@ -643,7 +640,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", MULTIPLE_LEAVES: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -682,7 +679,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", MULTIPLE_EXCLUDED: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -717,7 +714,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", MULTIPLE_OVER_ALL: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -751,7 +748,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", MULTIPLE_CERTIFICATIONS_FROM_SAME_ISSUER: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 2\n" + @@ -779,7 +776,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", IDENTICAL_CERTIFICATIONS: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -817,7 +814,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", LEAVER_WITH_CERTIFICATIONS: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -853,7 +850,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", EXCLUDED_WITH_CERTIFICATIONS: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -889,7 +886,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONGLY_SIGNED_IDENTITIES: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -926,7 +923,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONGLY_SIGNED_JOIN: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -963,7 +960,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONGLY_SIGNED_ACTIVE: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -997,7 +994,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONGLY_SIGNED_LEAVE: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -1029,7 +1026,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", CORRECTLY_SIGNED_LEAVE: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -1061,7 +1058,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONGLY_SIGNED_CERTIFICATION: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 29890\n" + @@ -1098,7 +1095,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", UNKNOWN_CERTIFIER: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -1135,7 +1132,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", UNKNOWN_CERTIFIED: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -1172,7 +1169,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", EXISTING_UID: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -1209,7 +1206,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", EXISTING_PUBKEY: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -1246,7 +1243,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", TOO_EARLY_CERTIFICATION_REPLAY: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -1283,7 +1280,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", EXPIRED_CERTIFICATIONS: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 90\n" + @@ -1312,7 +1309,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", EXPIRED_MEMBERSHIP: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 90\n" + @@ -1340,7 +1337,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", REVOKED_JOINER: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 113\n" + @@ -1369,7 +1366,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", NOT_ENOUGH_CERTIFICATIONS_JOINER: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 3\n" + @@ -1407,7 +1404,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", NOT_ENOUGH_CERTIFICATIONS_JOINER_BLOCK_0: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -1443,7 +1440,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", OUTDISTANCED_JOINER: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 3\n" + @@ -1474,7 +1471,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", VALID_NEXT: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 3\n" + @@ -1504,7 +1501,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONG_PREVIOUS_HASH: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 51\n" + @@ -1543,7 +1540,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONG_PREVIOUS_ISSUER: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 51\n" + @@ -1582,7 +1579,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONG_DIFFERENT_ISSUERS_COUNT_FOLLOWING_V2: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 51\n" + @@ -1621,7 +1618,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONG_DIFFERENT_ISSUERS_COUNT_FOLLOWING_V3: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 51\n" + @@ -1660,7 +1657,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONG_ISSUERS_FRAME_FOLLOWING_V2: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 51\n" + @@ -1699,7 +1696,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONG_ISSUERS_FRAME_FOLLOWING_V3: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 51\n" + @@ -1738,7 +1735,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONG_ISSUER: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 51\n" + @@ -1766,7 +1763,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONG_JOIN_BLOCK_TARGET_ROOT: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 51\n" + @@ -1795,7 +1792,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONG_JOIN_ROOT_NUMBER: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -1822,7 +1819,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONG_JOIN_ROOT_HASH: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -1849,7 +1846,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONG_JOIN_NUMBER_TOO_LOW: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 12\n" + @@ -1876,7 +1873,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONG_JOIN_BLOCK_TARGET: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 51\n" + @@ -1905,7 +1902,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONG_JOIN_ALREADY_MEMBER: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 51\n" + @@ -1934,7 +1931,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONG_ACTIVE_BLOCK_TARGET: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 51\n" + @@ -1963,7 +1960,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", KICKED_NOT_EXCLUDED: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 4\n" + @@ -1992,7 +1989,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", KICKED_EXCLUDED: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 4\n" + @@ -2022,7 +2019,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONG_MEMBERS_COUNT: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 4\n" + @@ -2052,7 +2049,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", NO_LEADING_ZERO: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 3\n" + @@ -2080,7 +2077,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", REQUIRES_4_LEADING_ZEROS: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 60\n" + @@ -2110,7 +2107,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", REQUIRES_7_LEADING_ZEROS: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 61\n" + @@ -2140,7 +2137,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", REQUIRES_6_LEADING_ZEROS: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 67\n" + @@ -2170,7 +2167,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", REQUIRES_5_LEADING_ZEROS: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 63\n" + @@ -2200,7 +2197,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", REQUIRES_7_LEADING_ZEROS_AGAIN: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 64\n" + @@ -2230,7 +2227,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", FIRST_BLOCK_OF_NEWCOMER: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 65\n" + @@ -2260,7 +2257,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", SECOND_BLOCK_OF_NEWCOMER: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 66\n" + @@ -2290,7 +2287,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONG_ROOT_DATES: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -2327,7 +2324,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONG_MEDIAN_TIME_ODD: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 101\n" + @@ -2355,7 +2352,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONG_MEDIAN_TIME_EVEN: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 102\n" + @@ -2383,7 +2380,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", GOOD_MEDIAN_TIME_ODD: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 103\n" + @@ -2411,7 +2408,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", GOOD_MEDIAN_TIME_EVEN: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 104\n" + @@ -2439,7 +2436,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", WRONG_CONFIRMED_DATE_MUST_CONFIRM: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 72\n" + @@ -2467,7 +2464,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", ROOT_BLOCK_WITH_UD: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -2506,7 +2503,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", UD_BLOCK_WIHTOUT_UD: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 80\n" + @@ -2534,7 +2531,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", UD_BLOCK_WIHTOUT_BASE: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 80\n" + @@ -2563,7 +2560,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", V3_ROOT_BLOCK_NOBASE: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -2587,7 +2584,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", V3_ROOT_BLOCK_POSITIVE_BASE: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -2615,7 +2612,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", BLOCK_WITH_WRONG_UD: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 81\n" + @@ -2645,7 +2642,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", BLOCK_WITH_WRONG_UD_V3: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 81\n" + @@ -2674,7 +2671,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", BLOCK_WITH_WRONG_UNIT_BASE: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 160\n" + @@ -2704,7 +2701,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", BLOCK_WITH_WRONG_UNIT_BASE_NO_UD: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 160\n" + @@ -2732,7 +2729,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", BLOCK_UNLEGITIMATE_UD: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 82\n" + @@ -2762,7 +2759,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", BLOCK_UNLEGITIMATE_UD_2: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 83\n" + @@ -2792,7 +2789,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", FIRST_UD_BLOCK_WITH_UD_THAT_SHOULDNT: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 20\n" + @@ -2822,7 +2819,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", FIRST_UD_BLOCK_WITH_UD_THAT_SHOULD: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 20\n" + @@ -2850,7 +2847,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", BLOCK_WITHOUT_TRANSACTIONS: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 83\n" + @@ -2880,7 +2877,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", BLOCK_WITH_GOOD_TRANSACTIONS: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 83\n" + @@ -2932,7 +2929,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", BLOCK_WITH_WRONG_TRANSACTION_SUMS: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 83\n" + @@ -2984,7 +2981,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", BLOCK_WITH_WRONG_TRANSACTION_UNIT_BASES: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 83\n" + @@ -3036,7 +3033,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", BLOCK_WITH_WRONG_UD_SOURCE: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 83\n" + @@ -3071,7 +3068,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", BLOCK_WITH_WRONG_TX_SOURCE: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 83\n" + @@ -3106,7 +3103,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", BLOCK_WITH_UNAVAILABLE_UD_SOURCE: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 83\n" + @@ -3142,7 +3139,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", BLOCK_WITH_UNAVAILABLE_TX_SOURCE: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 83\n" + @@ -3178,7 +3175,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", TRANSACTION_WITHOUT_ISSUERS: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 83\n" + @@ -3201,7 +3198,7 @@ module.exports = { "Excluded:\n" + "Certifications:\n" + "Transactions:\n" + - "TX:3:0:2:2:1:0:0\n" + + "TX:10:0:2:2:1:0:0\n" + "3-2A27BD040B16B7AF59DDD88890E616987F4DD28AA47B9ABDBBEE46257B88E945\n" + "4500:3:T:2C31D8915801E759F6D4FF3DA8DA983D7D56DCF4F8D94619FCFAD4B128362326:88\n" + "4500:3:T:2C31D8915801E759F6D4FF3DA8DA983D7D56DCF4F8D94619FCFAD4B128362326:88\n" + @@ -3213,7 +3210,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", TRANSACTION_WITHOUT_SOURCES: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 83\n" + @@ -3236,7 +3233,7 @@ module.exports = { "Excluded:\n" + "Certifications:\n" + "Transactions:\n" + - "TX:3:2:0:0:1:0:0\n" + + "TX:10:2:0:0:1:0:0\n" + "3-2A27BD040B16B7AF59DDD88890E616987F4DD28AA47B9ABDBBEE46257B88E945\n" + "HsLShAtzXTVxeUtQd7yi5Z5Zh4zNvbu8sTEZ53nfKcqY\n" + "G2CBgZBPLe6FSFUgpx2Jf1Aqsgta6iib3vmDRA1yLiqU\n" + @@ -3248,7 +3245,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", TRANSACTION_WITHOUT_RECIPIENT: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 83\n" + @@ -3271,7 +3268,7 @@ module.exports = { "Excluded:\n" + "Certifications:\n" + "Transactions:\n" + - "TX:3:2:2:2:0:0:0\n" + + "TX:10:2:2:2:0:0:0\n" + "3-2A27BD040B16B7AF59DDD88890E616987F4DD28AA47B9ABDBBEE46257B88E945\n" + "HsLShAtzXTVxeUtQd7yi5Z5Zh4zNvbu8sTEZ53nfKcqY\n" + "G2CBgZBPLe6FSFUgpx2Jf1Aqsgta6iib3vmDRA1yLiqU\n" + @@ -3286,7 +3283,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", TRANSACTION_WITH_DUPLICATED_SOURCE_SINGLE_TX: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 83\n" + @@ -3309,7 +3306,7 @@ module.exports = { "Excluded:\n" + "Certifications:\n" + "Transactions:\n" + - "TX:3:2:3:3:1:0:0\n" + + "TX:10:2:3:3:1:0:0\n" + "3-2A27BD040B16B7AF59DDD88890E616987F4DD28AA47B9ABDBBEE46257B88E945\n" + "HsLShAtzXTVxeUtQd7yi5Z5Zh4zNvbu8sTEZ53nfKcqY\n" + "G2CBgZBPLe6FSFUgpx2Jf1Aqsgta6iib3vmDRA1yLiqU\n" + @@ -3327,7 +3324,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", TRANSACTION_WITH_EMPTY_TX_CONDITIONS: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 83\n" + @@ -3350,7 +3347,7 @@ module.exports = { "Excluded:\n" + "Certifications:\n" + "Transactions:\n" + - "TX:3:2:2:2:2:0:0\n" + + "TX:10:2:2:2:2:0:0\n" + "3-2A27BD040B16B7AF59DDD88890E616987F4DD28AA47B9ABDBBEE46257B88E945\n" + "HsLShAtzXTVxeUtQd7yi5Z5Zh4zNvbu8sTEZ53nfKcqY\n" + "G2CBgZBPLe6FSFUgpx2Jf1Aqsgta6iib3vmDRA1yLiqU\n" + @@ -3367,7 +3364,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", TRANSACTION_WRONG_TOTAL: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 83\n" + @@ -3390,7 +3387,7 @@ module.exports = { "Excluded:\n" + "Certifications:\n" + "Transactions:\n" + - "TX:3:2:2:2:2:0:0\n" + + "TX:10:2:2:2:2:0:0\n" + "5-2C31D8915801E759F6D4FF3DA8DA983D7D56DCF4F8D94619FCFAD4B128362326\n" + "HsLShAtzXTVxeUtQd7yi5Z5Zh4zNvbu8sTEZ53nfKcqY\n" + "G2CBgZBPLe6FSFUgpx2Jf1Aqsgta6iib3vmDRA1yLiqU\n" + @@ -3407,7 +3404,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", TRANSACTION_V3_GOOD_AMOUNTS: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 83\n" + @@ -3430,7 +3427,7 @@ module.exports = { "Excluded:\n" + "Certifications:\n" + "Transactions:\n" + - "TX:3:1:3:3:17:1:0\n" + + "TX:10:1:3:3:17:1:0\n" + "33089-00004C8D3A7EAA34ADD20E36268F7A141A45B8D47C0872EFDB00187810E0BBFD\n" + "TENGx7WtzFsTXwnbrPEvb6odX2WnqYcnnrjiiLvp1mS\n" + "17602605:0:T:E4E8486E20D521AAB329376431BD633A59FE847EF533C38CDD2C9F6E820FF786:14\n" + @@ -3463,7 +3460,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", TRANSACTION_TOO_LONG: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: test_net\n" + "Number: 33520\n" + @@ -3486,7 +3483,7 @@ module.exports = { "Excluded:\n" + "Certifications:\n" + "Transactions:\n" + - "TX:3:1:48:48:2:0:0\n" + + "TX:10:1:48:48:2:0:0\n" + "33518-00001D9E2EA1F967667528817FAF17ECBACE6150EBB875A2196B4457C0366D2A\n" + "HnFcSms8jzwngtVomTTnzudZx7SHUQY8sVE1y8yBmULk\n" + "60:3:T:2A74F44780925586EA4C01BEE9DA5042FE8BDB0FB0506B9D69990750B555AC91:15\n" + @@ -3593,7 +3590,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", TRANSACTION_WRONG_TRANSFORM: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 83\n" + @@ -3616,7 +3613,7 @@ module.exports = { "Excluded:\n" + "Certifications:\n" + "Transactions:\n" + - "TX:3:2:3:3:3:0:0\n" + + "TX:10:2:3:3:3:0:0\n" + "5-2C31D8915801E759F6D4FF3DA8DA983D7D56DCF4F8D94619FCFAD4B128362326\n" + "HsLShAtzXTVxeUtQd7yi5Z5Zh4zNvbu8sTEZ53nfKcqY\n" + "G2CBgZBPLe6FSFUgpx2Jf1Aqsgta6iib3vmDRA1yLiqU\n" + @@ -3636,7 +3633,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", TRANSACTION_WRONG_TRANSFORM_LOW_BASE: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 83\n" + @@ -3659,7 +3656,7 @@ module.exports = { "Excluded:\n" + "Certifications:\n" + "Transactions:\n" + - "TX:3:1:6:6:8:1:0\n" + + "TX:10:1:6:6:8:1:0\n" + "33753-0000054FC8AC7B450BA7D8BA7ED873FEDD5BF1E98D5D3B0DEE38DED55CB80CB3\n" + "G2CBgZBPLe6FSFUgpx2Jf1Aqsgta6iib3vmDRA1yLiqU\n" + "150605:3:T:01B1AB40E7C1021712FF40D5605037C0ACEECA547BF519ABDCB6473A9F6BDF45:1\n" + @@ -3689,7 +3686,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", BLOCK_TX_V3_TOO_HIGH_OUTPUT_BASE: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 83\n" + @@ -3712,7 +3709,7 @@ module.exports = { "Excluded:\n" + "Certifications:\n" + "Transactions:\n" + - "TX:3:1:1:1:1:0:0\n" + + "TX:10:1:1:1:1:0:0\n" + "5-2C31D8915801E759F6D4FF3DA8DA983D7D56DCF4F8D94619FCFAD4B128362326\n" + "HsLShAtzXTVxeUtQd7yi5Z5Zh4zNvbu8sTEZ53nfKcqY\n" + "10:3:T:2C31D8915801E759F6D4FF3DA8DA983D7D56DCF4F8D94619FCFAD4B128362326:88\n" + @@ -3724,7 +3721,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", TRANSACTION_WITH_DUPLICATED_SOURCE_MULTIPLE_TX: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 83\n" + @@ -3747,7 +3744,7 @@ module.exports = { "Excluded:\n" + "Certifications:\n" + "Transactions:\n" + - "TX:3:2:2:2:1:0:0\n" + + "TX:10:2:2:2:1:0:0\n" + "3-2A27BD040B16B7AF59DDD88890E616987F4DD28AA47B9ABDBBEE46257B88E945\n" + "HsLShAtzXTVxeUtQd7yi5Z5Zh4zNvbu8sTEZ53nfKcqY\n" + "G2CBgZBPLe6FSFUgpx2Jf1Aqsgta6iib3vmDRA1yLiqU\n" + @@ -3758,7 +3755,7 @@ module.exports = { "80:0:SIG(BYfWYFrsyjpvpFysgu19rGK3VHBkz4MqmQbNyEuVU64g)\n" + "42yQm4hGTJYWkPg39hQAUgP6S6EQ4vTfXdJuxKEHL1ih6YHiDL2hcwrFgBHjXLRgxRhj2VNVqqc6b4JayKqTE14r\n" + "I6gJkJIQJ9vwDRXZ6kdBsOArQ3zzMYPmFxDbJqseBVq5NWlmJ7l7oY9iWtqhPF38rp7/iitbgyftsRR8djOGDg==\n" + - "TX:3:1:1:1:1:0:0\n" + + "TX:10:1:1:1:1:0:0\n" + "3-2A27BD040B16B7AF59DDD88890E616987F4DD28AA47B9ABDBBEE46257B88E945\n" + "HsLShAtzXTVxeUtQd7yi5Z5Zh4zNvbu8sTEZ53nfKcqY\n" + "200:1:T:2C31D8915801E759F6D4FF3DA8DA983D7D56DCF4F8D94619FCFAD4B128362326:88\n" + @@ -3770,7 +3767,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", TRANSACTION_WITH_WRONG_SIGNATURES: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 83\n" + @@ -3793,7 +3790,7 @@ module.exports = { "Excluded:\n" + "Certifications:\n" + "Transactions:\n" + - "TX:3:2:2:2:1:0:0\n" + + "TX:10:2:2:2:1:0:0\n" + "3-2A27BD040B16B7AF59DDD88890E616987F4DD28AA47B9ABDBBEE46257B88E945\n" + "HsLShAtzXTVxeUtQd7yi5Z5Zh4zNvbu8sTEZ53nfKcqY\n" + "G2CBgZBPLe6FSFUgpx2Jf1Aqsgta6iib3vmDRA1yLiqU\n" + @@ -3809,7 +3806,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", CERT_BASED_ON_NON_ZERO_FOR_ROOT: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -3836,7 +3833,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", CERT_BASED_ON_NON_EXISTING_BLOCK: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 1\n" + @@ -3863,7 +3860,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", REVOKED_WITH_MEMBERSHIPS: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -3892,7 +3889,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", REVOKED_WITH_DUPLICATES: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -3921,7 +3918,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", REVOKED_NOT_IN_EXCLUDED: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -3948,7 +3945,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", BLOCK_UNKNOWN_REVOKED: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -3976,7 +3973,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", BLOCK_WITH_YET_REVOKED: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + @@ -4004,7 +4001,7 @@ module.exports = { "kNsKdC8eH0d4zdHh1djyMzRXjFrwk3Bc3M8wo4DV/7clE9J66K/U0FljyS79SI78ZZUPaVmrImKJ9SNiubCiBg==\n", BLOCK_WITH_WRONG_REVOCATION_SIG: - "Version: 6\n" + + "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 0\n" + diff --git a/test/fast/block/block_format.js b/test/fast/block/block_format.js index 6ecd6b353c2705382fa6127e6b3404e56f75cd93..8593e1a2b691e72de5e6c1d01a8b634adb841e19 100644 --- a/test/fast/block/block_format.js +++ b/test/fast/block/block_format.js @@ -2,7 +2,7 @@ var should = require('should'); var parsers = require('../../../app/lib/streams/parsers'); -const raw = "Version: 6\n" + +const raw = "Version: 10\n" + "Type: Block\n" + "Currency: test_net\n" + "Number: 32029\n" + @@ -25,7 +25,7 @@ const raw = "Version: 6\n" + "Excluded:\n" + "Certifications:\n" + "Transactions:\n" + - "TX:3:1:6:6:2:1:0\n" + + "TX:10:1:6:6:2:1:0\n" + "32028-00001A8B07B4F5BD5473B83ECC02217E0DDE64A31D695B734C5D88F470B45606\n" + "F1pirjHYJYimekfvjVp2SGrVQSsJXb4H8JYKJddLzwVL\n" + "106930:3:D:F1pirjHYJYimekfvjVp2SGrVQSsJXb4H8JYKJddLzwVL:30580\n" + diff --git a/test/fast/peering.js b/test/fast/peering.js index 1f504c3066d49871038af3ed3244d4e919be3e9d..e6ec6d75bb9fb17ed311e4eed22257fe07feee72 100644 --- a/test/fast/peering.js +++ b/test/fast/peering.js @@ -4,7 +4,7 @@ var assert = require('assert'); var parsers = require('../../app/lib/streams/parsers'); var rawPeer = "" + - "Version: 2\n" + + "Version: 10\n" + "Type: Peer\n" + "Currency: beta_brousouf\n" + "PublicKey: 3Z7w5g4gC9oxwEbATnmK2UFgGWhLZPmZQb5dRxvNrXDu\n" + @@ -27,8 +27,8 @@ describe('Peer', function(){ done(); }); - it('should be version 2', function(){ - assert.equal(pr.version, 2); + it('should be version 10', function(){ + assert.equal(pr.version, 10); }); it('should have beta_brousoufs currency name', function(){ diff --git a/test/fast/pow/pow-engine.js b/test/fast/pow/pow-engine.js index 69e306ef082707ae17dae3dd680d0ad61fb2a852..b496580a3159d54e738ff47de6a72d00bb167e41 100644 --- a/test/fast/pow/pow-engine.js +++ b/test/fast/pow/pow-engine.js @@ -82,13 +82,13 @@ describe('PoW Engine', () => { block: { number: 35, time: 1, - inner_hash: '402281962743405E4DA969EF3DD076263310A9EF71632EB1A0974CC7E9C67948', - nonce: 20, - hash: '00825FA2FD9C56A1E58DBDD89AE467AAE9D771090CA4DD6BA1C1774BC33B0BD2', - signature: 'y7SkYyglqj/npBsWNludjcmTktlIiALtWWscermpzl4UFwy3W0I4D4TVGGKJj/+rt1OvvhO/ltdlxIUcKcMlBQ==' + inner_hash: '785EEAC3FB737D67FA56B9C82F5F6E7D4DF87988FF1785AFD4A080272C0C9414', + nonce: 202, + hash: '00729594838C945EC291D00997FB8C4254B3949CFE8295A68C78A9FAABE90106', + signature: 'cTFtHlldwptnm6hjw+f0DzkUtYiCbhHAnxXsj1B7V6V8tDUcFNNlGAPqZvVXrZevwjkAGm0pgdUCrdFGB6+FCw==' }, - testsCount: 19, - pow: '00825FA2FD9C56A1E58DBDD89AE467AAE9D771090CA4DD6BA1C1774BC33B0BD2', + testsCount: 201, + pow: '00729594838C945EC291D00997FB8C4254B3949CFE8295A68C78A9FAABE90106', } }); })); diff --git a/test/fast/tx_format.js b/test/fast/tx_format.js index 147a1add90bcf1ebe2c091444ec361668f9094b9..f679724fdfb17f3c1cf02cdc2988919b88aa5617 100644 --- a/test/fast/tx_format.js +++ b/test/fast/tx_format.js @@ -2,7 +2,7 @@ var should = require('should'); var parsers = require('../../app/lib/streams/parsers'); -var raw = "Version: 3\n" + +var raw = "Version: 10\n" + "Type: Transaction\n" + "Currency: test_net\n" + "Blockstamp: 3-2A27BD040B16B7AF59DDD88890E616987F4DD28AA47B9ABDBBEE46257B88E945\n" + diff --git a/test/fast/v1.0-local-index.js b/test/fast/v1.0-local-index.js index b28096f73ccc791d6036b878816bdebcd046eaae..c00efd19fc6e39e06b77d377fd253b63e14b335e 100644 --- a/test/fast/v1.0-local-index.js +++ b/test/fast/v1.0-local-index.js @@ -6,7 +6,7 @@ const parsers = require('../../app/lib/streams/parsers'); const indexer = require('../../app/lib/dup/indexer'); const constants = require('../../app/lib/constants'); -const raw = "Version: 6\n" + +const raw = "Version: 10\n" + "Type: Block\n" + "Currency: beta_brousouf\n" + "Number: 10\n" + @@ -42,7 +42,7 @@ const raw = "Version: 6\n" + "F5PtTpt8QFYMGtpZaETygB2C2yxCSxH1UW1VopBNZ6qg:G2CBgZBPLe6FSFUgpx2Jf1Aqsgta6iib3vmDRA1yLiqU:0:h8D/dx/z5K2dx06ktp7fnmLRdxkdV5wRkJgnmEvKy2k55mM2RyREpHfD7t/1CC5Ew+UD0V9N27PfaoLxZc1KCQ==\n" + "HgTTJLAQ5sqfknMq7yLPZbehtuLSsKj9CxWN7k8QvYJd:F5PtTpt8QFYMGtpZaETygB2C2yxCSxH1UW1VopBNZ6qg:0:eefk9Gg0Ijz0GvrNnRc55CCCBd4yk8j0fNzWzVZFKR3kZ7lsKav6dWyAsaVhlNG5S6XwEwvPoMwKJq1Vn7OjBg==\n" + "Transactions:\n" + - "TX:3:1:6:6:8:1:0\n" + + "TX:10:1:6:6:8:1:0\n" + "33753-0000054FC8AC7B450BA7D8BA7ED873FEDD5BF1E98D5D3B0DEE38DED55CB80CB3\n" + "G2CBgZBPLe6FSFUgpx2Jf1Aqsgta6iib3vmDRA1yLiqU\n" + "150605:3:T:01B1AB40E7C1021712FF40D5605037C0ACEECA547BF519ABDCB6473A9F6BDF45:1\n" + @@ -67,7 +67,7 @@ const raw = "Version: 6\n" + "2:0:SIG(G2CBgZBPLe6FSFUgpx2Jf1Aqsgta6iib3vmDRA1yLiqU)\n" + "all 10.6517\n" + "42yQm4hGTJYWkPg39hQAUgP6S6EQ4vTfXdJuxKEHL1ih6YHiDL2hcwrFgBHjXLRgxRhj2VNVqqc6b4JayKqTE14r\n" + - "TX:3:1:1:1:1:0:0\n" + + "TX:10:1:1:1:1:0:0\n" + "5-2C31D8915801E759F6D4FF3DA8DA983D7D56DCF4F8D94619FCFAD4B128362326\n" + "HsLShAtzXTVxeUtQd7yi5Z5Zh4zNvbu8sTEZ53nfKcqY\n" + "10:3:T:2C31D8915801E759F6D4FF3DA8DA983D7D56DCF4F8D94619FCFAD4B128362326:88\n" + @@ -80,8 +80,12 @@ const raw = "Version: 6\n" + describe("v1.0 Local Index", function(){ - const block = parsers.parseBlock.syncWrite(raw); - const index = indexer.localIndex(block, { sigValidity: 100, msValidity: 40 }); + let block, index; + + before(() => { + block = parsers.parseBlock.syncWrite(raw); + index = indexer.localIndex(block, { sigValidity: 100, msValidity: 40 }); + }); it('should have 30 index entries', () => { index.should.have.length(30); diff --git a/test/integration/http_api.js b/test/integration/http_api.js index 182af018dd6421cfd0aee861f93994f865c0d5a7..ec403a4a811e66280bd57d489fba039f4e2264e9 100644 --- a/test/integration/http_api.js +++ b/test/integration/http_api.js @@ -86,7 +86,7 @@ describe("HTTP API", function() { it('/membership should not accept wrong signature', function() { return http.expectError(400, 'wrong signature for membership', rp.post('http://127.0.0.1:7777/blockchain/membership', { json: { - membership: 'Version: 2\n' + + membership: 'Version: 10\n' + 'Type: Membership\n' + 'Currency: bb\n' + 'Issuer: 6upqFiJ66WV6N3bPc8x8y7rXT3syqKRmwnVyunCtEj7o\n' + diff --git a/test/integration/network.js b/test/integration/network.js index ae8017f3d583c966cafe0f8fcc91c0fe6af69fa1..585511c99cc201f60266e4da640e2df83d15ce18 100644 --- a/test/integration/network.js +++ b/test/integration/network.js @@ -65,24 +65,24 @@ describe("Network Merkle", function() { res.should.have.property('depth').equal(0); res.should.have.property('nodesCount').equal(0); res.should.have.property('leavesCount').equal(1); - res.should.have.property('root').equal('DEDB9A162DC1501491E5E62960E4899D5D644F31352174414C91CB34FB1FFC35'); + res.should.have.property('root').equal('C3EAB939F0BEF711461A140A1BA2649C75905107FACA3BE9C5F76F7FD1C7BC5E'); res.should.have.property('leaves').length(1); - res.leaves[0].should.equal('DEDB9A162DC1501491E5E62960E4899D5D644F31352174414C91CB34FB1FFC35'); + res.leaves[0].should.equal('C3EAB939F0BEF711461A140A1BA2649C75905107FACA3BE9C5F76F7FD1C7BC5E'); }); }); - it('/peers?leaf=DEDB9A162DC1501491E5E62960E4899D5D644F31352174414C91CB34FB1FFC35', function() { - return expectAnswer(rp('http://127.0.0.1:20501/network/peering/peers?leaf=DEDB9A162DC1501491E5E62960E4899D5D644F31352174414C91CB34FB1FFC35', { json: true }), (res) => { + it('/peers?leaf=C3EAB939F0BEF711461A140A1BA2649C75905107FACA3BE9C5F76F7FD1C7BC5E', function() { + return expectAnswer(rp('http://127.0.0.1:20501/network/peering/peers?leaf=C3EAB939F0BEF711461A140A1BA2649C75905107FACA3BE9C5F76F7FD1C7BC5E', { json: true }), (res) => { res.should.have.property('depth').equal(0); res.should.have.property('nodesCount').equal(0); res.should.have.property('leavesCount').equal(1); - res.should.have.property('root').equal('DEDB9A162DC1501491E5E62960E4899D5D644F31352174414C91CB34FB1FFC35'); + res.should.have.property('root').equal('C3EAB939F0BEF711461A140A1BA2649C75905107FACA3BE9C5F76F7FD1C7BC5E'); res.should.have.property('leaves').length(0); - res.should.have.property('leaf').have.property('hash').equal('DEDB9A162DC1501491E5E62960E4899D5D644F31352174414C91CB34FB1FFC35'); + res.should.have.property('leaf').have.property('hash').equal('C3EAB939F0BEF711461A140A1BA2649C75905107FACA3BE9C5F76F7FD1C7BC5E'); res.should.have.property('leaf').have.property('value'); res.should.have.property('leaf').have.property('value').have.property('pubkey').equal('HgTTJLAQ5sqfknMq7yLPZbehtuLSsKj9CxWN7k8QvYJd'); res.should.have.property('leaf').have.property('value').have.property('block').equal('0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855'); - res.should.have.property('leaf').have.property('value').have.property('signature').equal('sxV6GN28vEup0pqXeJQn+l1IAoLIQFbJaW5WLvmreUZj3+kS9N5MWYnLuTze6VDd3baHbx+yZJ25ULPaDUYdDA=='); + res.should.have.property('leaf').have.property('value').have.property('signature').equal('V4fA6+ll3aLIkh9ixhdQyd6xJxcYGcbRQhA4P9ATp3m0jCwKq3zbU5udGstBPTUn9EgCOxt08gO7teM4EYO/DQ=='); res.should.have.property('leaf').have.property('value').have.property('status').equal('UP'); res.should.have.property('leaf').have.property('value').have.property('currency').equal('bb'); res.should.have.property('leaf').have.property('value').have.property('endpoints').length(1); @@ -98,25 +98,25 @@ describe("Network Merkle", function() { res.should.have.property('depth').equal(1); res.should.have.property('nodesCount').equal(1); res.should.have.property('leavesCount').equal(2); - res.should.have.property('root').equal('75C5C6454FB56E1E999945454EF38EFD653686E516B13A571980B0DA3F899BFB'); + res.should.have.property('root').equal('61977D7C6EAF055F2F06D3C9DFC848C2B0E52E289DD728783FF608905002C840'); res.should.have.property('leaves').length(2); - res.leaves[0].should.equal('069EDBB63D06526422AA7BA673B69C9EC6606EA1A712D2F7304879403E4A3DE3'); - res.leaves[1].should.equal('DEDB9A162DC1501491E5E62960E4899D5D644F31352174414C91CB34FB1FFC35'); + res.leaves[0].should.equal('BDD850441E3CDEB9005345B425CDBDA83E7BC7E5D83E9130C6012084F93CD220'); + res.leaves[1].should.equal('C3EAB939F0BEF711461A140A1BA2649C75905107FACA3BE9C5F76F7FD1C7BC5E'); }); }); - it('/peers?leaf=069EDBB63D06526422AA7BA673B69C9EC6606EA1A712D2F7304879403E4A3DE3', function() { - return expectAnswer(rp('http://127.0.0.1:20502/network/peering/peers?leaf=069EDBB63D06526422AA7BA673B69C9EC6606EA1A712D2F7304879403E4A3DE3', { json: true }), (res) => { + it('/peers?leaf=BDD850441E3CDEB9005345B425CDBDA83E7BC7E5D83E9130C6012084F93CD220', function() { + return expectAnswer(rp('http://127.0.0.1:20502/network/peering/peers?leaf=BDD850441E3CDEB9005345B425CDBDA83E7BC7E5D83E9130C6012084F93CD220', { json: true }), (res) => { res.should.have.property('depth').equal(1); res.should.have.property('nodesCount').equal(1); res.should.have.property('leavesCount').equal(2); - res.should.have.property('root').equal('75C5C6454FB56E1E999945454EF38EFD653686E516B13A571980B0DA3F899BFB'); + res.should.have.property('root').equal('61977D7C6EAF055F2F06D3C9DFC848C2B0E52E289DD728783FF608905002C840'); res.should.have.property('leaves').length(0); - res.should.have.property('leaf').have.property('hash').equal('069EDBB63D06526422AA7BA673B69C9EC6606EA1A712D2F7304879403E4A3DE3'); + res.should.have.property('leaf').have.property('hash').equal('BDD850441E3CDEB9005345B425CDBDA83E7BC7E5D83E9130C6012084F93CD220'); res.should.have.property('leaf').have.property('value'); res.should.have.property('leaf').have.property('value').have.property('pubkey').equal('DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo'); res.should.have.property('leaf').have.property('value').have.property('block').equal('0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855'); - res.should.have.property('leaf').have.property('value').have.property('signature').equal('iwUI8OzkxuQPZj5rF5lCwmvaGOplNm0+J1BM90Q44uw3475g2ZafkNUqL/xy47NgsfRX2vcrVv3iClojuzPcAg=='); + res.should.have.property('leaf').have.property('value').have.property('signature').equal('pyQdsay3p2XUduM85A1eoUZbRu/7NnEQnMc+hWmIUpmylWTIMqoZmc3d6gIcaa/pvoVvV7QbldwXErpSy06FAQ=='); res.should.have.property('leaf').have.property('value').have.property('status').equal('UP'); res.should.have.property('leaf').have.property('value').have.property('currency').equal('bb'); res.should.have.property('leaf').have.property('value').have.property('endpoints').length(1); diff --git a/test/integration/proof-of-work.js b/test/integration/proof-of-work.js index 26e76341d11b7f03d41bba1bcf706ee1fba50951..98aba5a85c36812821bb96fab58808da0352a378 100644 --- a/test/integration/proof-of-work.js +++ b/test/integration/proof-of-work.js @@ -128,7 +128,7 @@ describe("Proof-of-work", function() { const res = yield toolbox.simpleNetworkOf2NodesAnd2Users({ participate: true, percentRot: 1, - powMin: 30 + powMin: 35 }), s1 = res.s1, s2 = res.s2; yield Promise.all([ s1.commit({ time: now }),