Skip to content

feat: improving unit tests for Basic BLS and enforcing Basic BLS for Evo Nodes #5463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PastaPastaPasta merged 2 commits into from
Nov 8, 2023
Merged

feat: improving unit tests for Basic BLS and enforcing Basic BLS for Evo Nodes #5463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb844f7
fix: for Evo nodes should be used only bls basic, enforce that rule
knst Jun 18, 2023
11add29
feat: more tests with basic BLS for trivially valid EVO txes
knst Sep 18, 2023
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
6 changes: 6 additions & 0 deletions src/evo/providertx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ bool CProRegTx::IsTriviallyValid(bool is_basic_scheme_active, TxValidationState&
if (nVersion == 0 || nVersion > GetVersion(is_basic_scheme_active)) {
return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-protx-version");
}
if (nVersion != BASIC_BLS_VERSION && nType == MnType::Evo) {
return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-protx-evo-version");
}
if (!IsValidMnType(nType)) {
return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-protx-type");
}
Expand Down Expand Up @@ -92,6 +95,9 @@ bool CProUpServTx::IsTriviallyValid(bool is_basic_scheme_active, TxValidationSta
if (nVersion == 0 || nVersion > GetVersion(is_basic_scheme_active)) {
return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-protx-version");
}
if (nVersion != BASIC_BLS_VERSION && nType == MnType::Evo) {
return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-protx-evo-version");
}

return true;
}
Expand Down
5 changes: 3 additions & 2 deletions src/evo/providertx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ class CProRegTx
// unknown version, bail out early
return;
}

@PastaPastaPasta PastaPastaPasta Nov 8, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit unrelated

READWRITE(
obj.nType,
obj.nMode,
Expand All @@ -71,7 +72,7 @@ class CProRegTx
obj.scriptPayout,
obj.inputsHash
);
if (obj.nVersion == BASIC_BLS_VERSION && obj.nType == MnType::Evo) {
if (obj.nType == MnType::Evo) {
READWRITE(
obj.platformNodeID,
obj.platformP2PPort,
Expand Down Expand Up @@ -159,7 +160,7 @@ class CProUpServTx
obj.scriptOperatorPayout,
obj.inputsHash
);
if (obj.nVersion == BASIC_BLS_VERSION && obj.nType == MnType::Evo) {
if (obj.nType == MnType::Evo) {
READWRITE(
obj.platformNodeID,
obj.platformP2PPort,
Expand Down
47 changes: 47 additions & 0 deletions src/test/data/trivially_invalid.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1,97 @@
[
["Transaction Hash,Transaction Type,Transaction Data,Expected Error,Notes"],
[
"1db1a7731e16476e49e86d05a8db9694f8599247a00b5793874b68154db5fbf6",
"proregtx",
"basic",
"03000100018f49c4126c412d3f5b30ef17df0ddd5e76c0bc722a9a2b78ca04a2e8cfb89327000000006a47304402203f855e7b078b8f492a488246fdf60d037cf0672a3a3946661c04882fff16f6e0022048199a8452c7f77f26b89959961a513d2a76e437d36aa078ebc0a840efa2b2770121021868735b6d9e84f42b7ba3671ccaeaef80211924d3e455b0f89981385419096bfeffffff01a37c1e00000000001976a9149a327a189094776111a274ac9e7f145f13c9b28088ac00000000fd2a01010001000000cf220263e6a359004531eda8c2a02831dae8056c139d3748c4d4823fa58e66410100000000000000000000000000ffff55d1f158270f8887ae9e25ab2bf112c11840adf6f09c1f12f9ee90ed3b279798232b1b99051716f29e69ad2a6f5901235cd4b5b8b2df287a7b44ea119a48a46cb2d5617852e25a642ed1ff05bd2e60087694720f379a17fb11b7fadfb2ae00001976a9147c41f9e12e330ccd61ff79ceee3f4fc2f6f80bfc88ac3b88c25fbb288aaeeccbd01bb0757c802c923b1a432a28eaf777d51012b70182495940c6d4ee7a0a8dcb12587506f142ea6460082068bb01411f4434de66730a29a9bb6d9b496bffb3003e57b8832f8c0dfd447589227144fa8b6019413387ecde369c5e3fc2802fa676fed1a820062483a54040131782a444c9",
"bad-protx-evo-version",
"evo node with legacy bls"
],
[
"1db1a7731e16476e49e86d05a8db9694f8599247a00b5793874b68154db5fbf6",
"proregtx",
"legacy",
"03000100018f49c4126c412d3f5b30ef17df0ddd5e76c0bc722a9a2b78ca04a2e8cfb89327000000006a47304402203f855e7b078b8f492a488246fdf60d037cf0672a3a3946661c04882fff16f6e0022048199a8452c7f77f26b89959961a513d2a76e437d36aa078ebc0a840efa2b2770121021868735b6d9e84f42b7ba3671ccaeaef80211924d3e455b0f89981385419096bfeffffff01a37c1e00000000001976a9149a327a189094776111a274ac9e7f145f13c9b28088ac00000000fd2a01010001000000cf220263e6a359004531eda8c2a02831dae8056c139d3748c4d4823fa58e66410100000000000000000000000000ffff55d1f158270f8887ae9e25ab2bf112c11840adf6f09c1f12f9ee90ed3b279798232b1b99051716f29e69ad2a6f5901235cd4b5b8b2df287a7b44ea119a48a46cb2d5617852e25a642ed1ff05bd2e60087694720f379a17fb11b7fadfb2ae00001976a9147c41f9e12e330ccd61ff79ceee3f4fc2f6f80bfc88ac3b88c25fbb288aaeeccbd01bb0757c802c923b1a432a28eaf777d51012b70182495940c6d4ee7a0a8dcb12587506f142ea6460082068bb01411f4434de66730a29a9bb6d9b496bffb3003e57b8832f8c0dfd447589227144fa8b6019413387ecde369c5e3fc2802fa676fed1a820062483a54040131782a444c9",
"bad-protx-evo-version",
"basic bls while active legacy bls"
],
[
"051b5b801a256b12f6fb43caf6413685f2b40eec0bcaa2b889f485e35fc4a458",
"proupservtx",
"legacy",
"0300020001748a9f191c0953cf0cece2217253f780dea0fad7da0c7b2a6848c3601a082cd8000000006a473044022026f75bdb601110373a5357cf56ccb30eb5d2fa16716ecf92e610d0b73904b317022037c4160489e75070d2c959b42235b32e8f9ddc1d4112172e50791fac6c921ac60121035ffbab73725c430b2904c10563007c5047257aae6caefcda4b47ed70c03b2f6efeffffff017f407b00000000001976a914b734da3d63094c95589fcf9252cd8d9c46eebafa88ac00000000b70200000067e3d709b387c484f5a034f1783e2ec31cdfefcd9f48bf738069ec195f6561c600000000000000000000ffff87b50840270f00961a777a95c4471bd4c6b3fdc8b634b452b3d0146529ad0fc3b27af2526dfd75806d92738bcf3e6aa9bb35417b44b83b4012a9f0e811feeac83764a01ebd4304518d1781f1ecdc08a65df5a9fe144ab70f8758cf3dae59717e3c6ae927a7a3dc15aa06e025c05e6b9169da5d1d215e897901b2edcaefb13d70f2efec79d63518",
"bad-protx-version",
"basic bls while active legacy bls"
],
[
"ffc74cb5d8e74907687a90beaf2514b76d07edbdfa6978510f5e82a18c9901a0",
"proupregtx",
"legacy",
"030003000167f85f47dfc7b47c5c0034d950725e7561b932d980e62597ba431bb9d44affd3000000006a473044022001e2fe47108745bd403cc4f55c4317a8a738f0487e94d7c08d63d18fb52a8b430220076980710eefe404ee090c0926528ad4c3a7f22f1bb4fa6af2b9bd54a6c2d954012103f4e143e0ad58b3b710d867acc58c5e2c44a1c378cd959c363808dbc222bb20fafeffffff01be930700000000001976a9145a9a1dd769f834237d287a363d32407bf4b10a0288ac00000000e402003323591ecb17b1fa99dcf067c656cfb2d009583af60d5d918b2492d8b62e8f090000a86680f5adb7ca1b90784e78932d7e9649eed04ca08804c96524ea0ff8c729e7de8b21b8abd4c1843fe50ef633f96b9e299d864ed70ebf5f39e980eb0feb623add4f22531976a91423c29c6db8b982960846f6c964dde53a630930bc88ac67aa2f81057856f4c0e76469a30a35cdce1018f3dcb8b5cc24075a7061c8e0c341205d3e41dbfd83e5beb475c8e6b3f6c9aa98e6e363ebf23cd055a3cd0a5dd2d54c20110b254f043a66eb4599fec3f670aa37d653f8259b653e9014efa78836409b",
"bad-protx-version",
"basic bls while active legacy bls"
],
[
"4eb416679d71b480ffb67714c68592a64c3b0d93ca28c01fe280dde00968b97b",
"prouprevtx",
"legacy",
"0300040001c252c6a17964918ef6ee30128b1b003e767912f83bcd13e0f1abbaef90e4a4a2000000006a47304402206e69a4bcfaef862da25d0f70a2ff19bd783a35597f0c3a79392d1cdcbb7bf31c022074846a514a7af6c9a2e2949f558f61272a29b7aa5a170f07e55fb56df91ca9490121035ffbab73725c430b2904c10563007c5047257aae6caefcda4b47ed70c03b2f6efeffffff0166327b00000000001976a914b734da3d63094c95589fcf9252cd8d9c46eebafa88ac00000000a40200cb1002143ac5db461791432aee2d8dea8a5822ec1f194e21948e48b054af1c750100572391a43fa586d85102dbc4c89982ed36b8d789c80eef9697a2b1b97ab750378369767f8fe0ec9a8abbd91a0b6da8644271342848739a152ea336e0ac800884a73ffb539ab4fb93a5c0326103bf504609e635248348b68b5599e99bbc5923f65b46af02fa85645a7e2a9cd359540a362d551ed87ae572f716f7a0875a632373",
"bad-protx-version",
"basic bls while active legacy bls"
],
[
"34689d74e8b6dcf794e399f034dc124751d2d14c70be05ea3f1524d24fa97d41",
"proregtx",
"legacy",
"03000100010000000000000000000000000000000000000000000000000000000000000000ffffffff016affffffff0100f2052a01000000016a00000000fd1201010000000000a118920655e3b87bea5b066e45ad5a02e55ff9eee970eaad9097371579d35f020000000000000000000000000000ffff0363a5fc270f85b0c1edc20ec4437ab5f936a7e1691498dd0a73819b06c0c3b7b7f48373244aff72171ec3fa982cd5b8c8f57e411cc1e6463ba260280cbe4d3e3a31d4c6d24be6d4f58406e8e188526a5ba38bcafc6fdd191ccff20b9dc100001976a91485b0c1edc20ec4437ab5f936a7e1691498dd0a7388ac9dcd2d150b6e2348a6c13c99b2e9d761feb0c4db1670e990e2da81c8b0d24bcd416666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666",
"bad-protx-payee-reuse",
"Transaction with keyIDOwner and scriptPayout using the same address"
],
[
"7e8ae3e4f97691ff8966bafabf4aad72c6de53f943683db295ac386ed731be6d",
"proregtx",
"legacy",
"03000100010000000000000000000000000000000000000000000000000000000000000000ffffffff016affffffff0100f2052a01000000016a00000000fd12010100000000000b89a4a2c40bc0992a71fe5cb62fe361cade298efcc7016db1c825128f7b89250100000000000000000000000000ffff58630b1f270fffb6ea3b32fd801dbe11597d221c5d20f22e26b6000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001976a9149cb70b0143c834ac6cd1c6598eeb9756e786ca5088ac8ee3de540f3808bd3a9493032865d3058acae9237e608e952fbc6831d413fe35416666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666",
"bad-protx-key-null",
"Transaction with valid keyIDOwner and invalid keyIDVoting, pubKeyOperator"
],
[
"2686f47dd694aab6abe53c1eeb2e3af427527c47bcbbb642a7681f5f830759fd",
"proregtx",
"legacy",
"03000100010000000000000000000000000000000000000000000000000000000000000000ffffffff016affffffff0100f2052a01000000016a00000000fa010000000000f8f78f64327dd795e13b9104557507202a2ce4c863f37792accd07c7d73cc8a50100000000000000000000000000ffffae22e9cb270fbe28fa180835be8c4ecb6068d22d1cc4ce83eac988b4342a1c9996f56589cf46fdb7372b37a0dcb56252acca3c56e17b87eb21d6d2bffb3a27fc641bc98f2574762f6bf409c7deb3962b8df8f61961747570589b9a4b56ae0000016ad399091458f5b3764889c16e3ea191f9409c1feb78520a68af4918bd2c3aa0b3416666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666",
"bad-protx-payee",
"Transaction with scriptPayout neither a P2SH nor a P2PK"
],
[
"4edaeceb793b22b40ef6cd609d6e96edea523fee7f02a23609656d4b0a894798",
"proregtx",
"legacy",
"03000100010000000000000000000000000000000000000000000000000000000000000000ffffffff016affffffff0100f2052a01000000016a00000000fd120101000000000037834e505aa17140ce446c4f2e6d9af0a4d97322d811b548de5121069c87acd00100000000000000000000000000ffffb009d205270f48ecfbd2b4447d51a4cb25e7e7cf42b307b7fa79018cdbd7e89a3b0f51a72c418b11ff31552fd5aca89bb5832085bfc6f8f46632297b0721eb206c508be82793697756467bdb5f1ddf0324078619d07c7312af05fdac5a8bffff1976a91452e222a92dadbd15031f1b1ca1a74d14e165bbad88ac8e4145c64752863d1fadcc2c073038d234c15b480b3992585e844ef491112299416666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666",
"bad-protx-operator-reward",
"Transaction with operator reward set to uint16_t numerical limit"
],
[
"299767699266aa16f38176037c393e093f03dbfa5429e76ad4f756f70b22ff5b",
"proupregtx",
"legacy",
"03000300010000000000000000000000000000000000000000000000000000000000000000ffffffff016affffffff0100f2052a01000000016a00000000e40100b2d3e8dea42b9c8331472962bb36dea7b684b0f6dc8f5869c80fc24936199a040000934e4e541c310c2d17df7b48040d6ae9446fab9530abcbebdd1b46d847a5b4f8898057060143436dc7003e1e6fd9bf4500000000000000000000000000000000000000001976a914b9a701d799b3d96b91a4d0311fb39c29ebad98ed88ac280b34567afd60136868e50b86db2c7e35510ed9072fe34439b9e665f9cc6492416666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666",
"bad-protx-key-null",
"Transaction with invalid keyIDVoting"
],
[
"95cb5e1af901021c776b9dc43147924502e05301ba9aa9e32e9eb0abc1daa910",
"proupregtx",
"legacy",
"03000300010000000000000000000000000000000000000000000000000000000000000000ffffffff016affffffff0100f2052a01000000016a00000000e40000bfd280d22a21574ea9f568f7a729b370f4051b89eab6df3d0d74b65fde1bdb7900000a6a7fb814db71eb6ef12341749d81b5fd326eb4b9445a3be65668da9856910b378ec6427fe18fc81c39499e7c7060647618f8ec94404051e4a7ab68f1b017fd9e7f94761976a914c18e0b18e0d992e7471d8a4d4da428e8e191328788ac959ca83b61eeb3f5543973253da6da8e9ac23f9e7844453ac5543b51d0177799416666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666666",
"gettxpayload-fail",
"Transaction with version set to null"
],
[
"e0aef1c6faa5d1f640355c2a9b41b72a4969bb8227f09c4900271ee1c9ef49a3",
"prouprevtx",
"legacy",
"03000400010000000000000000000000000000000000000000000000000000000000000000ffffffff016affffffff0100f2052a01000000016a00000000a401005f6d5e103c0f35f091201d9b7f26bc8a81ec870b2b1167021b08fc32dbd192aeffff81a667e71154308cc67481aa7da40f3cbfa48dca9075832e5c5977ab56c193c51286f9b11119a67e8c85eb57843f29655a97d41012c030204d09c6032006b8e49efd6c449580f8e49f553a22dba78d3306bcf18015a4eced33c19e43d1932522655e1f70e0f4409e7cf836a1f8ca609952c4b459f75e93f6aeb2a094e5485617",
"bad-protx-reason",
"Transaction with reason set to uint16_t numerical limit"
Expand Down
Loading