Skip to content

S
sgxwallet
Unverified Commit 505be9be authored by Oleh Nikolaiev's avatar Oleh Nikolaiev Committed by GitHub
Browse files
Options

Merge pull request #378 from skalenetwork/enhancement/SKALE-4954-update-threshold-encryption-api 

SKALE-4954 change getDecryptionShare to getDecryptionShares
parents 56e798c8 ebf576eb
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 46 deletions
SGXWalletServer.cpp
View file @ 505be9be
...@@ -985,7 +985,7 @@ SGXWalletServer::createBLSPrivateKeyV2Impl(const string &_blsKeyName, const stri ...@@ -985,7 +985,7 @@ SGXWalletServer::createBLSPrivateKeyV2Impl(const string &_blsKeyName, const stri
RETURN_SUCCESS(result); RETURN_SUCCESS(result);
} }
Json::Value SGXWalletServer::getDecryptionShareImpl(const std::string& blsKeyName, const std::string& publicDecryptionValue) { Json::Value SGXWalletServer::getDecryptionSharesImpl(const std::string& blsKeyName, const Json::Value& publicDecryptionValues) {
spdlog::info("Entering {}", __FUNCTION__); spdlog::info("Entering {}", __FUNCTION__);
INIT_RESULT(result) INIT_RESULT(result)
...@@ -994,15 +994,23 @@ Json::Value SGXWalletServer::getDecryptionShareImpl(const std::string& blsKeyNam ...@@ -994,15 +994,23 @@ Json::Value SGXWalletServer::getDecryptionShareImpl(const std::string& blsKeyNam
throw SGXException(BLS_SIGN_INVALID_KS_NAME, string(__FUNCTION__) + ":Invalid BLSKey name"); throw SGXException(BLS_SIGN_INVALID_KS_NAME, string(__FUNCTION__) + ":Invalid BLSKey name");
} }
if ( publicDecryptionValue.length() < 7 || publicDecryptionValue.length() > 78 * 4 ) { if (!publicDecryptionValues.isArray()) {
throw SGXException(INVALID_DECRYPTION_VALUE_FORMAT, string(__FUNCTION__) + ":Invalid publicDecryptionValue format"); throw SGXException(INVALID_DECRYPTION_VALUE_FORMAT,
string(__FUNCTION__) + ":Public decryption values should be an array");
} }
shared_ptr<string> encryptedKeyHex_ptr = readFromDb(blsKeyName); for (int i = 0; i < publicDecryptionValues.size(); ++i) {
std::string publicDecryptionValue = publicDecryptionValues[i].asString();
if ( publicDecryptionValue.length() < 7 || publicDecryptionValue.length() > 78 * 4 ) {
throw SGXException(INVALID_DECRYPTION_VALUE_FORMAT, string(__FUNCTION__) + ":Invalid publicDecryptionValue format");
}
shared_ptr<string> encryptedKeyHex_ptr = readFromDb(blsKeyName);
vector<string> decryptionValueVector = calculateDecryptionShare(encryptedKeyHex_ptr->c_str(), publicDecryptionValue); vector<string> decryptionValueVector = calculateDecryptionShare(encryptedKeyHex_ptr->c_str(), publicDecryptionValue);
for (uint8_t i = 0; i < 4; ++i) { for (uint8_t j = 0; j < 4; ++j) {
result["decryptionShare"][i] = decryptionValueVector.at(i); result["decryptionShares"][i][j] = decryptionValueVector.at(j);
}
} }
} HANDLE_SGX_EXCEPTION(result) } HANDLE_SGX_EXCEPTION(result)
...@@ -1109,8 +1117,8 @@ SGXWalletServer::createBLSPrivateKeyV2(const string &blsKeyName, const string &e ...@@ -1109,8 +1117,8 @@ SGXWalletServer::createBLSPrivateKeyV2(const string &blsKeyName, const string &e
return createBLSPrivateKeyV2Impl(blsKeyName, ethKeyName, polyName, SecretShare, t, n); return createBLSPrivateKeyV2Impl(blsKeyName, ethKeyName, polyName, SecretShare, t, n);
} }
Json::Value SGXWalletServer::getDecryptionShare(const std::string& blsKeyName, const std::string& publicDecryptionValue) { Json::Value SGXWalletServer::getDecryptionShares(const std::string& blsKeyName, const Json::Value& publicDecryptionValues) {
return getDecryptionShareImpl(blsKeyName, publicDecryptionValue); return getDecryptionSharesImpl(blsKeyName, publicDecryptionValues);
} }
shared_ptr <string> SGXWalletServer::readFromDb(const string &name, const string &prefix) { shared_ptr <string> SGXWalletServer::readFromDb(const string &name, const string &prefix) {
......
SGXWalletServer.hpp
View file @ 505be9be
...@@ -113,7 +113,7 @@ public: ...@@ -113,7 +113,7 @@ public:
virtual Json::Value createBLSPrivateKeyV2(const std::string& blsKeyName, const std::string& ethKeyName, const std::string& polyName, const std::string & SecretShare, int t, int n); virtual Json::Value createBLSPrivateKeyV2(const std::string& blsKeyName, const std::string& ethKeyName, const std::string& polyName, const std::string & SecretShare, int t, int n);
virtual Json::Value getDecryptionShare(const std::string& blsKeyName, const std::string& publicDecryptionValue); virtual Json::Value getDecryptionShares(const std::string& blsKeyName, const Json::Value& publicDecryptionValues);
static shared_ptr<string> readFromDb(const string &name, const string &prefix = ""); static shared_ptr<string> readFromDb(const string &name, const string &prefix = "");
...@@ -173,7 +173,7 @@ public: ...@@ -173,7 +173,7 @@ public:
static Json::Value createBLSPrivateKeyV2Impl(const std::string& blsKeyName, const std::string& ethKeyName, const std::string& polyName, const std::string & SecretShare, int t, int n); static Json::Value createBLSPrivateKeyV2Impl(const std::string& blsKeyName, const std::string& ethKeyName, const std::string& polyName, const std::string & SecretShare, int t, int n);
static Json::Value getDecryptionShareImpl(const std::string& KeyName, const std::string& publicDecryptionValue); static Json::Value getDecryptionSharesImpl(const std::string& KeyName, const Json::Value& publicDecryptionValues);
static void printDB(); static void printDB();
......
abstractstubserver.h
View file @ 505be9be
...@@ -63,7 +63,7 @@ class AbstractStubServer : public jsonrpc::AbstractServer<AbstractStubServer> ...@@ -63,7 +63,7 @@ class AbstractStubServer : public jsonrpc::AbstractServer<AbstractStubServer>
this->bindAndAddMethod(jsonrpc::Procedure("dkgVerificationV2", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_OBJECT, "publicShares",jsonrpc::JSON_STRING, "ethKeyName",jsonrpc::JSON_STRING, "secretShare",jsonrpc::JSON_STRING,"t",jsonrpc::JSON_INTEGER, "n",jsonrpc::JSON_INTEGER, "index",jsonrpc::JSON_INTEGER, NULL), &AbstractStubServer::dkgVerificationV2I); this->bindAndAddMethod(jsonrpc::Procedure("dkgVerificationV2", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_OBJECT, "publicShares",jsonrpc::JSON_STRING, "ethKeyName",jsonrpc::JSON_STRING, "secretShare",jsonrpc::JSON_STRING,"t",jsonrpc::JSON_INTEGER, "n",jsonrpc::JSON_INTEGER, "index",jsonrpc::JSON_INTEGER, NULL), &AbstractStubServer::dkgVerificationV2I);
this->bindAndAddMethod(jsonrpc::Procedure("createBLSPrivateKeyV2", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_OBJECT, "blsKeyName",jsonrpc::JSON_STRING, "ethKeyName",jsonrpc::JSON_STRING, "polyName", jsonrpc::JSON_STRING, "secretShare",jsonrpc::JSON_STRING,"t", jsonrpc::JSON_INTEGER,"n",jsonrpc::JSON_INTEGER, NULL), &AbstractStubServer::createBLSPrivateKeyV2I); this->bindAndAddMethod(jsonrpc::Procedure("createBLSPrivateKeyV2", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_OBJECT, "blsKeyName",jsonrpc::JSON_STRING, "ethKeyName",jsonrpc::JSON_STRING, "polyName", jsonrpc::JSON_STRING, "secretShare",jsonrpc::JSON_STRING,"t", jsonrpc::JSON_INTEGER,"n",jsonrpc::JSON_INTEGER, NULL), &AbstractStubServer::createBLSPrivateKeyV2I);
this->bindAndAddMethod(jsonrpc::Procedure("getDecryptionShare", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_OBJECT, "blsKeyName",jsonrpc::JSON_STRING,"publicDecryptionValue",jsonrpc::JSON_STRING, NULL), &AbstractStubServer::getDecryptionShareI); this->bindAndAddMethod(jsonrpc::Procedure("getDecryptionShares", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_OBJECT, "blsKeyName",jsonrpc::JSON_STRING,"publicDecryptionValues",jsonrpc::JSON_ARRAY, NULL), &AbstractStubServer::getDecryptionSharesI);
} }
inline virtual void importBLSKeyShareI(const Json::Value &request, Json::Value &response) inline virtual void importBLSKeyShareI(const Json::Value &request, Json::Value &response)
...@@ -163,9 +163,9 @@ class AbstractStubServer : public jsonrpc::AbstractServer<AbstractStubServer> ...@@ -163,9 +163,9 @@ class AbstractStubServer : public jsonrpc::AbstractServer<AbstractStubServer>
response = this->createBLSPrivateKeyV2(request["blsKeyName"].asString(), request["ethKeyName"].asString(), request["polyName"].asString(),request["secretShare"].asString(),request["t"].asInt(), request["n"].asInt()); response = this->createBLSPrivateKeyV2(request["blsKeyName"].asString(), request["ethKeyName"].asString(), request["polyName"].asString(),request["secretShare"].asString(),request["t"].asInt(), request["n"].asInt());
} }
inline virtual void getDecryptionShareI(const Json::Value &request, Json::Value &response) inline virtual void getDecryptionSharesI(const Json::Value &request, Json::Value &response)
{ {
response = this->getDecryptionShare(request["blsKeyName"].asString(), request["publicDecryptionValue"].asString()); response = this->getDecryptionShares(request["blsKeyName"].asString(), request["publicDecryptionValues"]);
} }
virtual Json::Value importBLSKeyShare(const std::string& keyShare, const std::string& keyShareName) = 0; virtual Json::Value importBLSKeyShare(const std::string& keyShare, const std::string& keyShareName) = 0;
...@@ -194,7 +194,7 @@ class AbstractStubServer : public jsonrpc::AbstractServer<AbstractStubServer> ...@@ -194,7 +194,7 @@ class AbstractStubServer : public jsonrpc::AbstractServer<AbstractStubServer>
virtual Json::Value dkgVerificationV2( const std::string& publicShares, const std::string& ethKeyName, const std::string& SecretShare, int t, int n, int index) = 0; virtual Json::Value dkgVerificationV2( const std::string& publicShares, const std::string& ethKeyName, const std::string& SecretShare, int t, int n, int index) = 0;
virtual Json::Value createBLSPrivateKeyV2(const std::string& blsKeyName, const std::string& ethKeyName, const std::string& polyName, const std::string & SecretShare, int t, int n) = 0; virtual Json::Value createBLSPrivateKeyV2(const std::string& blsKeyName, const std::string& ethKeyName, const std::string& polyName, const std::string & SecretShare, int t, int n) = 0;
virtual Json::Value getDecryptionShare(const std::string& KeyName, const std::string& publicDecryptionValue) = 0; virtual Json::Value getDecryptionShares(const std::string& KeyName, const Json::Value& publicDecryptionValues) = 0;
}; };
#endif //JSONRPC_CPP_STUB_ABSTRACTSTUBSERVER_H_ #endif //JSONRPC_CPP_STUB_ABSTRACTSTUBSERVER_H_
stubclient.h
View file @ 505be9be
...@@ -214,13 +214,13 @@ class StubClient : public jsonrpc::Client ...@@ -214,13 +214,13 @@ class StubClient : public jsonrpc::Client
throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString()); throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
} }
Json::Value getDecryptionShare(const std::string& blsKeyName, const std::string& publicDecryptionValue) Json::Value getDecryptionShares(const std::string& blsKeyName, const Json::Value& publicDecryptionValues)
{ {
Json::Value p; Json::Value p;
p["blsKeyName"] = blsKeyName; p["blsKeyName"] = blsKeyName;
p["publicDecryptionValue"] = publicDecryptionValue; p["publicDecryptionValues"] = publicDecryptionValues["publicDecryptionValues"];
Json::Value result = this->CallMethod("getDecryptionShare",p); Json::Value result = this->CallMethod("getDecryptionShares",p);
if (result.isObject()) if (result.isObject())
return result; return result;
else else
......
testw.cpp
View file @ 505be9be
...@@ -1248,21 +1248,43 @@ TEST_CASE_METHOD(TestFixture, "Test decryption share for threshold encryption", ...@@ -1248,21 +1248,43 @@ TEST_CASE_METHOD(TestFixture, "Test decryption share for threshold encryption",
libff::alt_bn128_Fr key = libff::alt_bn128_Fr( libff::alt_bn128_Fr key = libff::alt_bn128_Fr(
"6507625568967977077291849236396320012317305261598035438182864059942098934847"); "6507625568967977077291849236396320012317305261598035438182864059942098934847");
libff::alt_bn128_G2 decryption_value = libff::alt_bn128_G2::random_element(); libff::alt_bn128_G2 decryption_value1 = libff::alt_bn128_G2::random_element();
decryption_value.to_affine_coordinates(); libff::alt_bn128_G2 decryption_value2 = libff::alt_bn128_G2::random_element();
auto decrytion_value_str = convertG2ToString( decryption_value, ':' ); decryption_value1.to_affine_coordinates();
auto decryption_share = c.getDecryptionShare( name, decrytion_value_str )["decryptionShare"]; decryption_value2.to_affine_coordinates();
libff::alt_bn128_G2 share; auto decrytion_value_str1 = convertG2ToString( decryption_value1, ':' );
share.Z = libff::alt_bn128_Fq2::one(); auto decrytion_value_str2 = convertG2ToString( decryption_value2, ':' );
share.X.c0 = libff::alt_bn128_Fq( decryption_share[0].asCString() ); Json::Value publicDecryptionValues;
share.X.c1 = libff::alt_bn128_Fq( decryption_share[1].asCString() ); publicDecryptionValues["publicDecryptionValues"][0] = decrytion_value_str1;
share.Y.c0 = libff::alt_bn128_Fq( decryption_share[2].asCString() ); publicDecryptionValues["publicDecryptionValues"][1] = decrytion_value_str2;
share.Y.c1 = libff::alt_bn128_Fq( decryption_share[3].asCString() );
REQUIRE( share == key * decryption_value ); auto decryptionShares = c.getDecryptionShares( name, publicDecryptionValues );
auto decryption_share1 = decryptionShares["decryptionShares"][0];
auto decryption_share2 = decryptionShares["decryptionShares"][1];
libff::alt_bn128_G2 share1;
share1.Z = libff::alt_bn128_Fq2::one();
share1.X.c0 = libff::alt_bn128_Fq( decryption_share1[0].asCString() );
share1.X.c1 = libff::alt_bn128_Fq( decryption_share1[1].asCString() );
share1.Y.c0 = libff::alt_bn128_Fq( decryption_share1[2].asCString() );
share1.Y.c1 = libff::alt_bn128_Fq( decryption_share1[3].asCString() );
REQUIRE( share1 == key * decryption_value1 );
libff::alt_bn128_G2 share2;
share2.Z = libff::alt_bn128_Fq2::one();
share2.X.c0 = libff::alt_bn128_Fq( decryption_share2[0].asCString() );
share2.X.c1 = libff::alt_bn128_Fq( decryption_share2[1].asCString() );
share2.Y.c0 = libff::alt_bn128_Fq( decryption_share2[2].asCString() );
share2.Y.c1 = libff::alt_bn128_Fq( decryption_share2[3].asCString() );
REQUIRE( share2 == key * decryption_value2 );
} }
TEST_CASE_METHOD(TestFixture, "Test decryption share for threshold encryption via zmq", "[te-decryption-share-zmq]") { TEST_CASE_METHOD(TestFixture, "Test decryption share for threshold encryption via zmq", "[te-decryption-share-zmq]") {
...@@ -1277,21 +1299,43 @@ TEST_CASE_METHOD(TestFixture, "Test decryption share for threshold encryption vi ...@@ -1277,21 +1299,43 @@ TEST_CASE_METHOD(TestFixture, "Test decryption share for threshold encryption vi
libff::alt_bn128_Fr key = libff::alt_bn128_Fr( libff::alt_bn128_Fr key = libff::alt_bn128_Fr(
"6507625568967977077291849236396320012317305261598035438182864059942098934847"); "6507625568967977077291849236396320012317305261598035438182864059942098934847");
libff::alt_bn128_G2 decryption_value = libff::alt_bn128_G2::random_element(); libff::alt_bn128_G2 decryption_value1 = libff::alt_bn128_G2::random_element();
decryption_value.to_affine_coordinates(); libff::alt_bn128_G2 decryption_value2 = libff::alt_bn128_G2::random_element();
decryption_value1.to_affine_coordinates();
decryption_value2.to_affine_coordinates();
auto decrytion_value_str1 = convertG2ToString( decryption_value1, ':' );
auto decrytion_value_str2 = convertG2ToString( decryption_value2, ':' );
Json::Value publicDecryptionValues;
publicDecryptionValues["publicDecryptionValues"][0] = decrytion_value_str1;
publicDecryptionValues["publicDecryptionValues"][1] = decrytion_value_str2;
auto decryptionShares = client->getDecryptionShares( name, publicDecryptionValues );
auto decryption_share1 = decryptionShares[0];
auto decryption_share2 = decryptionShares[1];
libff::alt_bn128_G2 share1;
share1.Z = libff::alt_bn128_Fq2::one();
share1.X.c0 = libff::alt_bn128_Fq( decryption_share1[0].asCString() );
share1.X.c1 = libff::alt_bn128_Fq( decryption_share1[1].asCString() );
share1.Y.c0 = libff::alt_bn128_Fq( decryption_share1[2].asCString() );
share1.Y.c1 = libff::alt_bn128_Fq( decryption_share1[3].asCString() );
auto decrytion_value_str = convertG2ToString( decryption_value, ':' ); REQUIRE( share1 == key * decryption_value1 );
auto decryption_share = client->getDecryptionShare( name, decrytion_value_str );
libff::alt_bn128_G2 share; libff::alt_bn128_G2 share2;
share.Z = libff::alt_bn128_Fq2::one(); share2.Z = libff::alt_bn128_Fq2::one();
share.X.c0 = libff::alt_bn128_Fq( decryption_share[0].asCString() ); share2.X.c0 = libff::alt_bn128_Fq( decryption_share2[0].asCString() );
share.X.c1 = libff::alt_bn128_Fq( decryption_share[1].asCString() ); share2.X.c1 = libff::alt_bn128_Fq( decryption_share2[1].asCString() );
share.Y.c0 = libff::alt_bn128_Fq( decryption_share[2].asCString() ); share2.Y.c0 = libff::alt_bn128_Fq( decryption_share2[2].asCString() );
share.Y.c1 = libff::alt_bn128_Fq( decryption_share[3].asCString() ); share2.Y.c1 = libff::alt_bn128_Fq( decryption_share2[3].asCString() );
REQUIRE( share == key * decryption_value ); REQUIRE( share2 == key * decryption_value2 );
} }
TEST_CASE_METHOD(TestFixtureZMQSign, "ZMQ-ecdsa", "[zmq-ecdsa]") { TEST_CASE_METHOD(TestFixtureZMQSign, "ZMQ-ecdsa", "[zmq-ecdsa]") {
......
zmq_src/ReqMessage.cpp
View file @ 505be9be
...@@ -265,11 +265,11 @@ Json::Value deleteBLSKeyReqMessage::process() { ...@@ -265,11 +265,11 @@ Json::Value deleteBLSKeyReqMessage::process() {
Json::Value GetDecryptionShareReqMessage::process() { Json::Value GetDecryptionShareReqMessage::process() {
auto blsKeyName = getStringRapid("blsKeyName"); auto blsKeyName = getStringRapid("blsKeyName");
auto publicDecryptionValue = getStringRapid("publicDecryptionValue"); auto publicDecryptionValues = getJsonValueRapid("publicDecryptionValues");
if (checkKeyOwnership && !isKeyByOwner(blsKeyName, getStringRapid("cert"))) { if (checkKeyOwnership && !isKeyByOwner(blsKeyName, getStringRapid("cert"))) {
throw std::invalid_argument("Only owner of the key can access it"); throw std::invalid_argument("Only owner of the key can access it");
} }
auto result = SGXWalletServer::getDecryptionShareImpl(blsKeyName, publicDecryptionValue); auto result = SGXWalletServer::getDecryptionSharesImpl(blsKeyName, publicDecryptionValues);
result["type"] = ZMQMessage::GET_DECRYPTION_SHARE_RSP; result["type"] = ZMQMessage::GET_DECRYPTION_SHARE_RSP;
return result; return result;
} }
zmq_src/RspMessage.h
View file @ 505be9be
...@@ -255,7 +255,7 @@ public: ...@@ -255,7 +255,7 @@ public:
virtual Json::Value process(); virtual Json::Value process();
Json::Value getShare() { Json::Value getShare() {
return getJsonValueRapid("decryptionShare"); return getJsonValueRapid("decryptionShares");
} }
}; };
......
zmq_src/ZMQClient.cpp
View file @ 505be9be
...@@ -496,11 +496,11 @@ bool ZMQClient::deleteBLSKey(const string& blsKeyName) { ...@@ -496,11 +496,11 @@ bool ZMQClient::deleteBLSKey(const string& blsKeyName) {
return result->isSuccessful(); return result->isSuccessful();
} }
Json::Value ZMQClient::getDecryptionShare(const string& blsKeyName, const string& publicDecryptionValue) { Json::Value ZMQClient::getDecryptionShares(const string& blsKeyName, const Json::Value& publicDecryptionValues) {
Json::Value p; Json::Value p;
p["type"] = ZMQMessage::GET_DECRYPTION_SHARE_REQ; p["type"] = ZMQMessage::GET_DECRYPTION_SHARE_REQ;
p["blsKeyName"] = blsKeyName; p["blsKeyName"] = blsKeyName;
p["publicDecryptionValue"] = publicDecryptionValue; p["publicDecryptionValues"] = publicDecryptionValues["publicDecryptionValues"];
auto result = dynamic_pointer_cast<GetDecryptionShareRspMessage>(doRequestReply(p)); auto result = dynamic_pointer_cast<GetDecryptionShareRspMessage>(doRequestReply(p));
CHECK_STATE(result); CHECK_STATE(result);
CHECK_STATE(result->getStatus() == 0); CHECK_STATE(result->getStatus() == 0);
......
zmq_src/ZMQClient.h
View file @ 505be9be
...@@ -122,7 +122,7 @@ public: ...@@ -122,7 +122,7 @@ public:
bool deleteBLSKey(const string& blsKeyName); bool deleteBLSKey(const string& blsKeyName);
Json::Value getDecryptionShare(const string& blsKeyName, const string& publicDecryptionValue); Json::Value getDecryptionShares(const string& blsKeyName, const Json::Value& publicDecryptionValues);
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment