Remove address builder and verifier (#80)

Signed-off-by: turuslan <[email protected]>

Author: turuslan

core/crypto/blake2/CMakeLists.txt

@@ -6,7 +6,6 @@
 add_library(blake2
     blake2s.c
     blake2b.c
-    blake2b_error.cpp
     blake2b160.cpp
     )
 target_link_libraries(blake2

core/crypto/blake2/blake2b160.cpp

@@ -9,31 +9,26 @@
 
 namespace fc::crypto::blake2b {
 
-  fc::outcome::result<Blake2b160Hash> blake2b_160(
-      gsl::span<const uint8_t> to_hash) {
+  Blake2b160Hash blake2b_160(gsl::span<const uint8_t> to_hash) {
     Blake2b160Hash res{};
-    if (::blake2b(res.data(),
-                  BLAKE2B160_HASH_LENGTH,
-                  nullptr,
-                  0,
-                  to_hash.data(),
-                  to_hash.size())
-        != 0)
-      return Blake2bError::CANNOT_INIT;
+    ::blake2b(res.data(),
+              BLAKE2B160_HASH_LENGTH,
+              nullptr,
+              0,
+              to_hash.data(),
+              to_hash.size());
     return res;
   }
 
-  fc::outcome::result<Blake2b256Hash> blake2b_256(
+  Blake2b256Hash blake2b_256(
       gsl::span<const uint8_t> to_hash) {
     Blake2b256Hash res{};
-    if (::blake2b(res.data(),
-                  BLAKE2B256_HASH_LENGTH,
-                  nullptr,
-                  0,
-                  to_hash.data(),
-                  to_hash.size())
-        != 0)
-      return Blake2bError::CANNOT_INIT;
+    ::blake2b(res.data(),
+              BLAKE2B256_HASH_LENGTH,
+              nullptr,
+              0,
+              to_hash.data(),
+              to_hash.size());
     return res;
   }
 

core/crypto/blake2/blake2b160.hpp

@@ -10,7 +10,6 @@
 
 #include "common/blob.hpp"
 #include "common/outcome.hpp"
-#include "crypto/blake2/blake2b_error.hpp"
 
 namespace fc::crypto::blake2b {
 
@@ -23,18 +22,16 @@ namespace fc::crypto::blake2b {
   /**
    * @brief Get blake2b-160 hash
    * @param to_hash - data to hash
-   * @return outcome with hash or error
+   * @return hash
    */
-  fc::outcome::result<Blake2b160Hash> blake2b_160(
-      gsl::span<const uint8_t> to_hash);
+  Blake2b160Hash blake2b_160(gsl::span<const uint8_t> to_hash);
 
   /**
    * @brief Get blake2b-256 hash
    * @param to_hash - data to hash
-   * @return outcome with hash or error
+   * @return hash
    */
-  fc::outcome::result<Blake2b256Hash> blake2b_256(
-      gsl::span<const uint8_t> to_hash);
+  Blake2b256Hash blake2b_256(gsl::span<const uint8_t> to_hash);
 
 }  // namespace fc::crypto::blake2b
 

core/crypto/blake2/blake2b_error.cpp

@@ -4,15 +4,11 @@
 add_library(address
     address.cpp
     address_codec.cpp
-    impl/address_verifier_impl.cpp
-    impl/address_builder_impl.cpp
     )
 target_link_libraries(address
     Boost::boost
     blake2
     blob
-    bls_provider
     cbor
     outcome
-    p2p::p2p_secp256k1_provider
     )

core/crypto/blake2/blake2b_error.hpp

@@ -44,18 +44,49 @@ namespace fc::primitives::address {
         [](const BLSPublicKeyHash &v) { return Protocol::BLS; });
   }
 
-  Address Address::makeFromId(uint64_t id) {
-    // TODO(turuslan): FIL-118 remove hardcoded TESTNET
-    return {TESTNET, id};
+  Address Address::makeFromId(uint64_t id, Network network) {
+    return {network, id};
   }
 
-  Address Address::makeActorExecAddress(gsl::span<const uint8_t> data) {
-    // TODO(turuslan): FIL-118 remove hardcoded TESTNET
-    return {TESTNET, ActorExecHash{blake2b_160(data).value()}};
+  Address Address::makeSecp256k1(const Sec256k1PublicKey &public_key,
+                                 Network network) {
+    return {network, Secp256k1PublicKeyHash{blake2b_160(public_key)}};
+  }
+
+  Address Address::makeActorExec(gsl::span<const uint8_t> data,
+                                 Network network) {
+    return {network, ActorExecHash{blake2b_160(data)}};
+  }
+
+  Address Address::makeBls(const BlsPublicKey &public_key, Network network) {
+    return {network, BLSPublicKeyHash{public_key}};
+  }
+
+  bool Address::verifySyntax(gsl::span<const uint8_t> seed_data) const {
+    return visit_in_place(
+        data,
+        [](uint64_t v) { return true; },
+        [&seed_data](const Secp256k1PublicKeyHash &v) {
+          if (seed_data.size() != libp2p::crypto::secp256k1::kPublicKeyLength) {
+            return false;
+          }
+          auto hash = blake2b_160(seed_data);
+          return std::equal(v.begin(), v.end(), hash.begin());
+        },
+        [&seed_data](const ActorExecHash &v) {
+          auto hash = blake2b_160(seed_data);
+          return std::equal(v.begin(), v.end(), hash.begin());
+        },
+        [&seed_data](const BLSPublicKeyHash &v) {
+          if (seed_data.size() != std::tuple_size<BlsPublicKey>::value) {
+            return false;
+          }
+          return std::equal(v.begin(), v.end(), seed_data.begin());
+        });
   }
 
   bool operator==(const Address &lhs, const Address &rhs) {
-    return lhs.network == rhs.network && lhs.getProtocol() == rhs.getProtocol()
+    return lhs.network == rhs.network
            && lhs.data == rhs.data;
   }
 

core/primitives/address/CMakeLists.txt

@@ -10,8 +10,12 @@
 
 #include <boost/variant.hpp>
 #include "common/blob.hpp"
+#include "crypto/bls/bls_types.hpp"
+#include "crypto/secp256k1/secp256k1_provider.hpp"
 
 namespace fc::primitives::address {
+  using Sec256k1PublicKey = libp2p::crypto::secp256k1::PublicKey;
+  using BlsPublicKey = crypto::bls::PublicKey;
 
   /**
    * @brief Potential errors creating and handling Filecoin addresses
@@ -27,6 +31,9 @@ namespace fc::primitives::address {
    */
   enum Network : uint8_t { MAINNET = 0x0, TESTNET = 0x1 };
 
+  // TODO(turuslan): FIL-118 remove hardcoded TESTNET
+  constexpr auto kDefaultNetwork = TESTNET;
+
   /**
    * @brief Known Address protocols
    */
@@ -66,9 +73,18 @@ namespace fc::primitives::address {
     bool isKeyType() const;
 
     /// id - number assigned to actors in a Filecoin Chain
-    static Address makeFromId(uint64_t id);
+    static Address makeFromId(uint64_t id, Network network = kDefaultNetwork);
+
+    static Address makeSecp256k1(const Sec256k1PublicKey &public_key,
+                                 Network network = kDefaultNetwork);
+
+    static Address makeActorExec(gsl::span<const uint8_t> data,
+                                 Network network = kDefaultNetwork);
+
+    static Address makeBls(const BlsPublicKey &public_key,
+                           Network network = kDefaultNetwork);
 
-    static Address makeActorExecAddress(gsl::span<const uint8_t> data);
+    bool verifySyntax(gsl::span<const uint8_t> seed_data) const;
 
     Network network;
     Payload data;