Update to latest release of data

Gigamonkey-BSV · Aug 25, 2022 · 105f410 · 105f410
1 parent d2abe13
commit 105f410
Show file tree

Hide file tree

Showing 12 changed files with 167 additions and 160 deletions.
diff --git a/conanfile.py b/conanfile.py
@@ -15,7 +15,7 @@ class GigamonkeyConan(ConanFile):
     default_options = {"shared": False, "fPIC": True}
     generators = "cmake"
     exports_sources = "*"
-    requires = "boost/1.76.0", "openssl/1.1.1k", "cryptopp/8.5.0", "nlohmann_json/3.10.0", "gmp/6.2.1", "SECP256K1/0.1@proofofwork/stable", "data/0.2@proofofwork/stable"
+    requires = "boost/1.76.0", "openssl/1.1.1k", "cryptopp/8.5.0", "nlohmann_json/3.10.0", "gmp/6.2.1", "SECP256K1/0.1@proofofwork/stable", "data/v0.0.5@proofofwork/unstable"
 
     def set_version(self):
         if "CIRCLE_TAG" in environ:

diff --git a/extern/data b/extern/data
diff --git a/include/gigamonkey/accounts.hpp b/include/gigamonkey/accounts.hpp
@@ -113,7 +113,7 @@ namespace Gigamonkey::Bitcoin {
             if (txs.empty()) return *this;
             return data::fold([](const account& a, const event& e) -> account {
                 return a.reduce(e);
-            }, account{}, txs.values());
+            }, account{}, txs);
             return reduce(txs.first()).reduce(txs.rest());
         }
     };

diff --git a/include/gigamonkey/hash.hpp b/include/gigamonkey/hash.hpp
@@ -19,7 +19,7 @@ namespace Gigamonkey {
 
         operator bytes_view() const;
 
-        explicit operator math::number::N() const;
+        explicit operator N() const;
 
         byte* begin();
         byte* end();