multisigs, deeplinks, fixed build for osx, updated examples etc

Author: edwardstock

.circleci/config.yml

@@ -38,10 +38,9 @@ jobs:
           keys:
             - conan-dir-{{ checksum "conanfile.py" }}
       - run: conan install gtest/1.8.1@bincrafters/stable
-      - run: conan install toolbox/3.1.0@edwardstock/latest
+      - run: conan install toolbox/3.1.1@edwardstock/latest
       - run: conan install bip39/2.0.0@edwardstock/latest
-      - run: conan install boost_multiprecision/1.69.0@bincrafters/stable
-      - run: conan install boost_exception/1.69.0@bincrafters/stable
+      - run: conan install boost/1.70.0@conan/stable
       - run:
           name: Configuring
           command: conan remove --locks && cd _build && cmake .. -DCMAKE_BUILD_TYPE=Debug -DMINTER_TX_TEST=ON

.gitignore

@@ -1,6 +1,7 @@
 # Created by .ignore support plugin (hsz.mobi)
 cmake-build-debug
 cmake-build-debug-*
+.DS_Store
 *.so
 *.o
 .idea

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10)
 project(minter_tx
-        VERSION 0.5.1
+        VERSION 0.6.0
         DESCRIPTION "Minter Transaction Maker"
         LANGUAGES CXX
         )
@@ -33,8 +33,9 @@ elseif (MINGW)
 	set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
 	set(CMAKE_CXX_FLAGS_RELEASE "-O3")
 else ()
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fvisibility=hidden -fPIC -Wextra -pedantic -Wno-unknown-pragmas -Wno-unused-parameter -Wno-shift-count-overflow")
-	set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -D_LIBCPP_DEBUG=1")
+	#-fvisibility=hidden
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fPIC -Wextra -pedantic -Wno-unknown-pragmas -Wno-unused-parameter -Wno-shift-count-overflow")
+	set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
 	set(CMAKE_CXX_FLAGS_RELEASE "-O3")
 endif ()
 
@@ -166,7 +167,9 @@ set(HEADERS
     include/minter/address.h
     include/minter/private_key.h
     include/minter/minter_tx_config.h
-    include/minter/tx/check_tx.h include/minter/check.h)
+    include/minter/tx/check_tx.h
+    include/minter/check.h
+    include/minter/tx/tx_deeplink.h)
 
 set(SOURCES
     ${HEADERS}
@@ -192,7 +195,7 @@ set(SOURCES
     src/tx/tx_builder.cpp
     src/data/public_key.cpp
     src/data/hash.cpp
-    src/data/private_key.cpp src/tx/tx_data.cpp src/tx/check_tx.cpp src/data/check.cpp)
+    src/data/private_key.cpp src/tx/tx_data.cpp src/tx/check_tx.cpp src/data/check.cpp src/tx/tx_deeplink.cpp)
 
 set(MINTER_TX_EXPORTING 1)
 if (ENABLE_SHARED)
@@ -268,7 +271,8 @@ if (MINTER_TX_TEST)
 	    tests/rlp_test.cpp
 	    tests/address_test.cpp
 	    tests/pub_key_test.cpp
-	    tests/check_tx_test.cpp include/minter/eth/types.h)
+	    tests/check_tx_test.cpp
+	    tests/tx_create_multisig_address_test.cpp tests/tx_deeplink_test.cpp)
 
 	add_executable(${PROJECT_NAME_TEST} ${TEST_SOURCES})
 	if (NOT MSVC)

README.md

@@ -53,7 +53,7 @@ For more information, see official [docs](https://docs.conan.io/en/latest/gettin
 ## Use as conan dependency without manually build
 You can just add to your conanfile.txt dependency:
 
-`minter_tx/0.5.1@minter/latest`
+`minter_tx/0.6.0@minter/latest`
 
 CMakeLists.txt
 ```cmake
@@ -117,7 +117,7 @@ To build other configurations, just change `--config Debug` to one of: Release,
 ## Examples:
 See here [link](examples)
 
-#### Build mnemonic generator
+#### Bucket mnemonic generator
 ```bash
 git clone --recursive https://github.com/MinterTeam/cpp-minter.git
 cd examples/generate

RELEASE.md

@@ -1,5 +1,16 @@
 # Release notes
 
+## 0.6.0
+ - Fixed build for macos (removed LIBCPP_DEBUG flag)
+ - Updated examples:
+   - minter-pretty:
+     - fixed searching by single word
+   - minter-generator:
+     - updated dependencies, using conanfile.py instead of conanfile.txt
+ - Added multisig send test
+ - Added test for CreateMultisigAddress transaction
+ - Added external multisig and sign-only function to get only transaction signature without transaction hash
+ - Added deeplink generator and parser
 ## 0.5.1
  - Set boost version to 1.70 for compatibility 
 

conanfile.py

@@ -49,8 +49,8 @@ class MinterTxConan(ConanFile):
     default_channel = "latest"
 
     requires = (
-        'bip39/2.0.0@edwardstock/latest',
-        'toolbox/3.1.0@edwardstock/latest',
+        'bip39/2.0.1@edwardstock/latest',
+        'toolbox/3.1.1@edwardstock/latest',
         'boost/1.70.0@conan/stable',
     )
 

examples/generate/README.md

@@ -0,0 +1,25 @@
+Minter bucket mnemonic generator
+-------------------------
+
+## Presequences
+**Conan** must be installed to build this example.
+
+## Build
+```bash
+git clone --recursive https://github.com/MinterTeam/cpp-minter.git
+cd examples/generate
+mkdir build && cd build
+CONAN_LOCAL=1 cmake .. -DCMAKE_BUILD_TYPE=Debug
+CONAN_LOCAL=1 cmake --build . -- -j4
+```
+
+## Run
+```bash
+./bin/minter-gen
+```
+
+Or run with simple argument:
+```bash
+./bin/minter-gen 300
+```
+Generates 300 mnemonics and print it to stdout

examples/generate/conanfile.py

@@ -0,0 +1,28 @@
+import os
+from conans import ConanFile, CMake, tools
+
+
+class MinterTxConan(ConanFile):
+    name = "minter_generator"
+    version = "1.0.0"
+    license = "MIT"
+    author = "Eduard Maximovich edward.vstock@gmail.com"
+    url = "https://github.com/MinterTeam/cpp-minter"
+    description = "Example how to generate a bucket of minter wallets"
+    topics = ("minter", "minter-network", "minter-blockchain", "blockchain", "tendermint")
+    settings = "os", "compiler", "build_type", "arch"
+    options = {"shared": [True, False]}
+    default_options = {
+        "shared": False,
+        "boost:shared": False,
+        "bip39:shared": False,
+        "bip39:enableC": False,
+        "bip39:enableJNI": False,
+    }
+    generators = "cmake"
+    default_user = "minter"
+    default_channel = "latest"
+
+    requires = (
+        'minter_tx/0.6.0@minter/latest'
+    )

examples/generate/conanfile.txt

@@ -6,41 +6,41 @@
  * \author Eduard Maximovich (edward.vstock@gmail.com)
  * \link   https://github.com/edwardstock
  */
-#include <sstream>
+#include <bip3x/Bip39Mnemonic.h>
 #include <iostream>
-#include <string>
-#include <stdexcept>
-
-#include <minter/bip39/Bip39Mnemonic.h>
 #include <minter/address.h>
 #include <minter/private_key.h>
 #include <minter/public_key.h>
+#include <sstream>
+#include <stdexcept>
+#include <string>
 
 int main(int argc, char** argv) {
 
     int32_t n = 1;
 
-    if(argc > 1) {
+    if (argc > 1) {
         try {
             n = std::stoi(argv[1]);
-            if(n < 1) {
+            if (n < 1) {
                 throw std::invalid_argument("");
             }
-        } catch (const std::invalid_argument &e) {
+        } catch (const std::invalid_argument& e) {
             std::cerr << "unable to generate N mnemonics: invalid digit \"" << argv[1] << "\"" << std::endl;
             return 0xFF;
         }
     }
 
     std::stringstream out_buff;
 
-    if(n > 10) {
-        std::cout << "Processing...\n" << std::endl;
+    if (n > 10) {
+        std::cout << "Processing...\n"
+                  << std::endl;
     }
 
-    for(size_t i = 0; i < n; i++) {
+    for (size_t i = 0; i < n; i++) {
         // generate english mnemonic with default parameters
-        auto mnemonic = minter::Bip39Mnemonic::generate();
+        auto mnemonic = bip3x::Bip39Mnemonic::generate();
 
         // getting raw mnemonic phrase
         std::string mnemonic_phrase = mnemonic.raw;
@@ -68,8 +68,5 @@ int main(int argc, char** argv) {
     std::cout << out_buff.str() << std::endl;
     out_buff.clear();
 
-
     return 0;
 }
- 
-