Skip to content

Commit d1b8991

Browse files
axicaxic
authored
Merge pull request #13565 from ethereum/evmc-cleanup
EVMHost: a few more simplifications
2 parents cb5c559 + 50182d7 commit d1b8991

File tree

2 files changed

+145
-11
lines changed

2 files changed

+145
-11
lines changed

‎test/EVMHost.cpp

Lines changed: 144 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -495,9 +495,7 @@ evmc::result EVMHost::precompileIdentity(evmc_message const& _message) noexcept
495495
evmc::result EVMHost::precompileModExp(evmc_message const&) noexcept
496496
{
497497
// TODO implement
498-
evmc::result result({});
499-
result.status_code = EVMC_FAILURE;
500-
return result;
498+
return resultWithFailure();
501499
}
502500

503501
evmc::result EVMHost::precompileALTBN128G1Add(evmc_message const& _message) noexcept
@@ -773,9 +771,141 @@ evmc::result EVMHost::precompileALTBN128G1Mul(evmc_message const& _message) noex
773771

774772
evmc::result EVMHost::precompileALTBN128PairingProduct(evmc_message const& _message) noexcept
775773
{
776-
// This is a partial implementation - it always returns "success"
777-
bytes static data = fromHex("0000000000000000000000000000000000000000000000000000000000000001");
778-
return resultWithGas(_message, data);
774+
// NOTE this is a partial implementation for some inputs.
775+
static map<bytes, bytes> const inputOutput{
776+
{
777+
fromHex(
778+
"17c139df0efee0f766bc0204762b774362e4ded88953a39ce849a8a7fa163fa9"
779+
"01e0559bacb160664764a357af8a9fe70baa9258e0b959273ffc5718c6d4cc7c"
780+
"198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2"
781+
"1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed"
782+
"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
783+
"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
784+
"0000000000000000000000000000000000000000000000000000000000000001"
785+
"30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45"
786+
"0a09ccf561b55fd99d1c1208dee1162457b57ac5af3759d50671e510e428b2a1"
787+
"2e539c423b302d13f4e5773c603948eaf5db5df8ae8a9a9113708390a06410d8"
788+
"19b763513924a736e4eebd0d78c91c1bc1d657fee4214057d21414011cfcc763"
789+
"2f8d9f9ab83727c77a2fec063cb7b6e5eb23044ccf535ad49d46d394fb6f6bf6"
790+
),
791+
fromHex("0000000000000000000000000000000000000000000000000000000000000001")
792+
},
793+
{
794+
fromHex(
795+
"0000000000000000000000000000000000000000000000000000000000000001"
796+
"0000000000000000000000000000000000000000000000000000000000000002"
797+
"198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2"
798+
"1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed"
799+
"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
800+
"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
801+
"0000000000000000000000000000000000000000000000000000000000000001"
802+
"30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45"
803+
"198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2"
804+
"1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed"
805+
"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
806+
"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
807+
),
808+
fromHex("0000000000000000000000000000000000000000000000000000000000000001")
809+
},
810+
{
811+
fromHex(
812+
"1c76476f4def4bb94541d57ebba1193381ffa7aa76ada664dd31c16024c43f59"
813+
"3034dd2920f673e204fee2811c678745fc819b55d3e9d294e45c9b03a76aef41"
814+
"209dd15ebff5d46c4bd888e51a93cf99a7329636c63514396b4a452003a35bf7"
815+
"04bf11ca01483bfa8b34b43561848d28905960114c8ac04049af4b6315a41678"
816+
"2bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7ac41fadbf933c2a51be344d"
817+
"120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c9bb048165fe5e4de877550"
818+
"111e129f1cf1097710d41c4ac70fcdfa5ba2023c6ff1cbeac322de49d1b6df7c"
819+
"2032c61a830e3c17286de9462bf242fca2883585b93870a73853face6a6bf411"
820+
"198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2"
821+
"1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed"
822+
"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
823+
"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
824+
),
825+
fromHex("0000000000000000000000000000000000000000000000000000000000000001")
826+
},
827+
{
828+
fromHex(
829+
"2eca0c7238bf16e83e7a1e6c5d49540685ff51380f309842a98561558019fc02"
830+
"03d3260361bb8451de5ff5ecd17f010ff22f5c31cdf184e9020b06fa5997db84"
831+
"1213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee"
832+
"2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f"
833+
"21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237"
834+
"096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f"
835+
"06967a1237ebfeca9aaae0d6d0bab8e28c198c5a339ef8a2407e31cdac516db9"
836+
"22160fa257a5fd5b280642ff47b65eca77e626cb685c84fa6d3b6882a283ddd1"
837+
"198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2"
838+
"1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed"
839+
"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
840+
"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
841+
),
842+
fromHex("0000000000000000000000000000000000000000000000000000000000000001")
843+
},
844+
{
845+
fromHex(
846+
"0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd2"
847+
"16da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba"
848+
"2e89718ad33c8bed92e210e81d1853435399a271913a6520736a4729cf0d51eb"
849+
"01a9e2ffa2e92599b68e44de5bcf354fa2642bd4f26b259daa6f7ce3ed57aeb3"
850+
"14a9a87b789a58af499b314e13c3d65bede56c07ea2d418d6874857b70763713"
851+
"178fb49a2d6cd347dc58973ff49613a20757d0fcc22079f9abd10c3baee24590"
852+
"1b9e027bd5cfc2cb5db82d4dc9677ac795ec500ecd47deee3b5da006d6d049b8"
853+
"11d7511c78158de484232fc68daf8a45cf217d1c2fae693ff5871e8752d73b21"
854+
"198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2"
855+
"1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed"
856+
"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
857+
"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
858+
),
859+
fromHex("0000000000000000000000000000000000000000000000000000000000000001")
860+
},
861+
{
862+
fromHex(
863+
"2f2ea0b3da1e8ef11914acf8b2e1b32d99df51f5f4f206fc6b947eae860eddb6"
864+
"068134ddb33dc888ef446b648d72338684d678d2eb2371c61a50734d78da4b72"
865+
"25f83c8b6ab9de74e7da488ef02645c5a16a6652c3c71a15dc37fe3a5dcb7cb1"
866+
"22acdedd6308e3bb230d226d16a105295f523a8a02bfc5e8bd2da135ac4c245d"
867+
"065bbad92e7c4e31bf3757f1fe7362a63fbfee50e7dc68da116e67d600d9bf68"
868+
"06d302580dc0661002994e7cd3a7f224e7ddc27802777486bf80f40e4ca3cfdb"
869+
"186bac5188a98c45e6016873d107f5cd131f3a3e339d0375e58bd6219347b008"
870+
"122ae2b09e539e152ec5364e7e2204b03d11d3caa038bfc7cd499f8176aacbee"
871+
"1f39e4e4afc4bc74790a4a028aff2c3d2538731fb755edefd8cb48d6ea589b5e"
872+
"283f150794b6736f670d6a1033f9b46c6f5204f50813eb85c8dc4b59db1c5d39"
873+
"140d97ee4d2b36d99bc49974d18ecca3e7ad51011956051b464d9e27d46cc25e"
874+
"0764bb98575bd466d32db7b15f582b2d5c452b36aa394b789366e5e3ca5aabd4"
875+
"15794ab061441e51d01e94640b7e3084a07e02c78cf3103c542bc5b298669f21"
876+
"1b88da1679b0b64a63b7e0e7bfe52aae524f73a55be7fe70c7e9bfc94b4cf0da"
877+
"1213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee"
878+
"2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f"
879+
"21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237"
880+
"096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f"
881+
),
882+
fromHex("0000000000000000000000000000000000000000000000000000000000000001")
883+
},
884+
{
885+
fromHex(
886+
"20a754d2071d4d53903e3b31a7e98ad6882d58aec240ef981fdf0a9d22c5926a"
887+
"29c853fcea789887315916bbeb89ca37edb355b4f980c9a12a94f30deeed3021"
888+
"1213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee"
889+
"2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f"
890+
"21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237"
891+
"096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f"
892+
"1abb4a25eb9379ae96c84fff9f0540abcfc0a0d11aeda02d4f37e4baf74cb0c1"
893+
"1073b3ff2cdbb38755f8691ea59e9606696b3ff278acfc098fa8226470d03869"
894+
"217cee0a9ad79a4493b5253e2e4e3a39fc2df38419f230d341f60cb064a0ac29"
895+
"0a3d76f140db8418ba512272381446eb73958670f00cf46f1d9e64cba057b53c"
896+
"26f64a8ec70387a13e41430ed3ee4a7db2059cc5fc13c067194bcc0cb49a9855"
897+
"2fd72bd9edb657346127da132e5b82ab908f5816c826acb499e22f2412d1a2d7"
898+
"0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd2"
899+
"198a1f162a73261f112401aa2db79c7dab1533c9935c77290a6ce3b191f2318d"
900+
"198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2"
901+
"1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed"
902+
"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
903+
"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
904+
),
905+
fromHex("0000000000000000000000000000000000000000000000000000000000000001")
906+
}
907+
};
908+
return precompileGeneric(_message, inputOutput);
779909
}
780910

781911
evmc::result EVMHost::precompileGeneric(
@@ -786,11 +916,14 @@ evmc::result EVMHost::precompileGeneric(
786916
if (_inOut.count(input))
787917
return resultWithGas(_message, _inOut.at(input));
788918
else
789-
{
790-
evmc::result result({});
791-
result.status_code = EVMC_FAILURE;
792-
return result;
793-
}
919+
return resultWithFailure();
920+
}
921+
922+
evmc::result EVMHost::resultWithFailure() noexcept
923+
{
924+
evmc::result result({});
925+
result.status_code = EVMC_FAILURE;
926+
return result;
794927
}
795928

796929
evmc::result EVMHost::resultWithGas(

‎test/EVMHost.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ class EVMHost: public evmc::MockedHost
116116
/// @returns a result object with no gas usage and result data taken from @a _data.
117117
/// @note The return value is only valid as long as @a _data is alive!
118118
static evmc::result resultWithGas(evmc_message const& _message, bytes const& _data) noexcept;
119+
static evmc::result resultWithFailure() noexcept;
119120

120121
evmc::VM& m_vm;
121122
/// EVM version requested by the testing tool

0 commit comments

Comments
 (0)