minter 2.0

Author: edwardstock

.circleci/conan_deps.sh

@@ -1,15 +1,15 @@
 #!/usr/bin/env bash
 
-conan install toolbox/3.2.1@edwardstock/latest -s build_type=Debug --build=missing
-conan install toolbox/3.2.1@edwardstock/latest -s build_type=Release --build=missing
+conan install toolbox/3.2.2@edwardstock/latest -s build_type=Debug --build=missing
+conan install toolbox/3.2.2@edwardstock/latest -s build_type=Release --build=missing
 
-conan install bip39/2.1.0@edwardstock/latest -s build_type=Debug --build=missing
-conan install bip39/2.1.0@edwardstock/latest -s build_type=Release --build=missing
+conan install bip39/2.1.1@edwardstock/latest -s build_type=Debug --build=missing
+conan install bip39/2.1.1@edwardstock/latest -s build_type=Release --build=missing
 
-conan install bigmath/1.0.0@edwardstock/latest -s build_type=Debug --build=missing
-conan install bigmath/1.0.0@edwardstock/latest -s build_type=Release --build=missing
+conan install bigmath/1.0.2@edwardstock/latest -s build_type=Debug --build=missing
+conan install bigmath/1.0.2@edwardstock/latest -s build_type=Release --build=missing
 
 conan install secp256k1_java/1.0.0@edwardstock/latest -s build_type=Debug --build=missing
 conan install secp256k1_java/1.0.0@edwardstock/latest -s build_type=Release --build=missing
 
-conan install gtest/1.8.1@bincrafters/stable -s build_type=Debug --build=missing
+conan install gtest/1.10.0@ -s build_type=Debug --build=missing

.circleci/config.yml

@@ -11,10 +11,9 @@ commands:
           command: git clone --recursive https://github.com/MinterTeam/cpp-minter .
   conan_remotes:
     steps:
-      - run: conan remote add -f edwardstock https://api.bintray.com/conan/edwardstock/conan-public
-      - run: conan remote add -f bincrafters https://api.bintray.com/conan/bincrafters/public-conan
-      - run: conan remote add -f minter https://api.bintray.com/conan/minterteam/minter
-      - run: conan user -p $BINTRAY_API_KEY -r minter edwardstock
+      - run: conan remote add -f edwardstock https://edwardstock.jfrog.io/artifactory/api/conan/conan
+      - run: conan remote add -f minter https://minter.jfrog.io/artifactory/api/conan/conan
+      - run: conan user -p $ARTIFACTORY_API_KEY -r minter edward.vstock@gmail.com
 
   conan_project_deps:
     steps:
@@ -34,12 +33,6 @@ commands:
           name: Deploy to Conan bintray
           command: $(which bash) .circleci/deploy.sh
 
-
-  #  make_package:
-  #    steps:
-  #      - run: bash cfg/package_make.sh -t package
-  #      - run: bash _build/package_upload.sh -t bintray
-
   do_all_centos:
     steps:
       - checkout_recursive
@@ -58,20 +51,6 @@ commands:
       - deploy_conan
 
 jobs:
-  #  package_all:
-  #    machine:
-  #      image: ubuntu-1604:202007-01
-  #    steps:
-  #      - run: bash cfg/add_repo.sh debian
-  #      - run: apt-get install dockerpack
-  #      - run: dockerpack build
-
-  gcc-4_8_5:
-    docker:
-      - image: docker.edwardstock.com/gcc_dev_el7
-    steps:
-      - do_all_centos
-
   gcc-5:
     docker:
       - image: conanio/gcc5
@@ -136,9 +115,6 @@ jobs:
 workflows:
   build_and_test:
     jobs:
-      - gcc-4_8_5:
-          context:
-            - remote_tokens
       - gcc-5:
           context:
             - remote_tokens

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.12)
 project(minter_tx
-        VERSION 1.0.0
+        VERSION 2.0.0
         DESCRIPTION "Minter Transaction SDK for C++"
         LANGUAGES CXX
         )
@@ -35,12 +35,12 @@ if (MSVC)
 	add_compile_options(/wd4834)
 elseif (MINGW)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fPIC -Wno-unknown-pragmas -Wno-shift-count-overflow")
-	set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
+	set(CMAKE_CXX_FLAGS_DEBUG "-g")
 	set(CMAKE_CXX_FLAGS_RELEASE "-O3")
 else ()
 	#-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_DEBUG "-g")
 	set(CMAKE_CXX_FLAGS_RELEASE "-O3")
 endif ()
 
@@ -52,9 +52,8 @@ include(conan_fallback)
 
 if (ENABLE_CONAN)
 	include(ConanInit)
-	add_conan_remote(bincrafters https://api.bintray.com/conan/bincrafters/public-conan)
-	add_conan_remote(minter https://api.bintray.com/conan/minterteam/minter)
-	add_conan_remote(edwardstock https://api.bintray.com/conan/edwardstock/conan-public)
+	add_conan_remote(minter https://minter.jfrog.io/artifactory/api/conan/conan)
+	add_conan_remote(edwardstock https://edwardstock.jfrog.io/artifactory/api/conan/conan)
 	conan_init()
 else ()
 	# toolbox
@@ -172,6 +171,19 @@ set(HEADERS
     include/minter/tx/tx_edit_multisig.h
     include/minter/tx/tx_price_vote.h
     include/minter/tx/tx_edit_candidate_public_key.h
+    include/minter/tx/tx_add_liquidity.h
+    include/minter/tx/tx_remove_liquidity.h
+    include/minter/tx/tx_sell_swap_pool.h
+    include/minter/tx/tx_buy_swap_pool.h
+    include/minter/tx/tx_sell_all_swap_pool.h
+    include/minter/tx/tx_edit_candidate_commission.h
+    include/minter/tx/tx_mint_token.h
+    include/minter/tx/tx_burn_token.h
+    include/minter/tx/tx_create_token.h
+    include/minter/tx/tx_recreate_token.h
+    include/minter/tx/tx_vote_commission.h
+    include/minter/tx/tx_vote_update.h
+    include/minter/tx/tx_create_swap_pool.h
     )
 
 set(SOURCES
@@ -209,6 +221,19 @@ set(SOURCES
     src/tx/tx_edit_multisig.cpp
     src/tx/tx_price_vote.cpp
     src/tx/tx_edit_candidate_public_key.cpp
+    src/tx/tx_add_liquidity.cpp
+    src/tx/tx_remove_liquidity.cpp
+    src/tx/tx_sell_swap_pool.cpp
+    src/tx/tx_buy_swap_pool.cpp
+    src/tx/tx_sell_all_swap_pool.cpp
+    src/tx/tx_edit_candidate_commission.cpp
+    src/tx/tx_mint_token.cpp
+    src/tx/tx_burn_token.cpp
+    src/tx/tx_create_token.cpp
+    src/tx/tx_recreate_token.cpp
+    src/tx/tx_vote_commission.cpp
+    src/tx/tx_vote_update.cpp
+    src/tx/tx_create_swap_pool.cpp
     )
 
 set(MINTER_TX_EXPORTING 1)
@@ -297,7 +322,7 @@ if (ENABLE_TEST)
 	    tests/tx_edit_coin_owner_test.cpp
 	    tests/tx_edit_multisig_test.cpp
 	    tests/tx_edit_candidate_public_key_test.cpp
-	    )
+	    tests/tx_swap_pool_test.cpp tests/tx_liquidity_add_remove_test.cpp tests/tx_edit_candidate_commission_test.cpp tests/tx_token_test.cpp)
 
 	add_executable(${PROJECT_NAME_TEST} ${TEST_SOURCES})
 	if (NOT MSVC)

README.md

@@ -22,22 +22,17 @@ Supported distributions:
 
 Steps:
 
-* Create `bintray-edwardstock.repo` file inside `/etc/yum.repos.d`
+* Create `edwardstock.repo` file inside `/etc/yum.repos.d`
 * Add below to this file
 
 ```ini
-[bintray-edwardstock]
-name=bintray-edwardstock
-baseurl=https://dl.bintray.com/edwardstock/rh/[paste here centos OR fedora]/$releasever/$basearch
-gpgcheck=0
-repo_gpgcheck=0
+[edwardstock]
+name=edwardstock
+baseurl=https://edwardstock.jfrog.io/artifactory/rhel/[centos or fedora]/$releasever/$basearch
 enabled=1
-```
-
-* Add repository gpg to trusted
-
-```bash
-curl -s https://bintray.com/user/downloadSubjectPublicKey?username=bintray | gpg --import
+gpgcheck=0
+gpgkey=https://edwardstock.jfrog.io/artifactory/rhel/[centos or fedora]/$releasever/$basearch/repodata/repomd.xml.key
+repo_gpgcheck=1
 ```
 
 * Update repository `yum -y update` or `dnf update`
@@ -54,14 +49,22 @@ If you using other distribution, just find what your system based on, for exampl
 Buster. In this case just change distribution name in `/etc/apt/sources.list` by yourself.
 
 ```bash
-echo "deb https://dl.bintray.com/edwardstock/debian $(lsb_release -c -s) main" | sudo tee -a /etc/apt/sources.list
-curl -s https://bintray.com/user/downloadSubjectPublicKey?username=bintray | sudo apt-key add -
+echo "deb https://edwardstock.jfrog.io/artifactory/debian $(lsb_release -c -s) main" | tee -a /etc/apt/sources.list
+curl -s https://edwardstock.jfrog.io/artifactory/api/gpg/key/public | apt-key add -
 apt update && apt install libminter_tx-dev
 ```
 
 If you got error **lsb_release: command not found** then just install `apt install lsb-release`. It can happened on
 naked Docker images.
 
+<br/><br/>
+After installing package from repository, you can use cmake-find module to find library:
+
+```cmake
+find_package(minter_tx 2.0.0 REQUIRED)
+target_link_libraries(MY_PROJECT minter_tx::minter_tx)
+```
+
 ## Using via Conan (very useful dependency manager for C++)
 
 **Debian**
@@ -91,9 +94,8 @@ pip3 install conan
 **Setup repositories**
 
 ```bash
-conan remote add scatter https://api.bintray.com/conan/edwardstock/scatter
-conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan
-conan remote add minter https://api.bintray.com/conan/minterteam/minter
+conan remote add minter https://minter.jfrog.io/artifactory/api/conan/conan
+conan remote add edwardstock https://edwardstock.jfrog.io/artifactory/api/conan/conan
 ```
 
 For more information, see official [docs](https://docs.conan.io/en/latest/getting_started.html)
@@ -104,7 +106,7 @@ For more information, see official [docs](https://docs.conan.io/en/latest/gettin
 
 You can just add to your conanfile.txt dependency:
 
-`minter_tx/1.0.0@minter/latest`
+`minter_tx/2.0.0@minter/latest`
 
 CMakeLists.txt
 

RELEASE.md

@@ -1,5 +1,26 @@
 # Release notes
 
+## 2.0.0
+
+- Added transactions:
+    - AddLiquidity (`tx_add_liquidity`)
+    - RemoveLiquidity (`tx_remove_liquidity`)
+    - BuySwapPool (`tx_buy_swap_pool`)
+    - SellSwapPool (`tx_sell_swap_pool`)
+    - SellAllSwapPool (`tx_sell_all_swap_pool`)
+    - CreateSwapPool (`tx_create_swap_pool`)
+    - CreateToken (`tx_create_token`)
+    - RecreateToken (`tx_recreate_token`)
+    - MintToken (`tx_mint_token`)
+    - BurnToken (`tx_burn_token`)
+    - EditCandidateCommission (`tx_edit_candidate_commission`)
+    - VoteCommission (`tx_vote_commission`)
+    - VoteUpdate (`tx_vote_update`)
+
+- Passing simple (not exactly) types by value instead of by const reference: dev::bigint, dev::bigdec18 etc
+- Added method overrides with `std::string` argument (float or integer representation) where by default
+  passing `dev::bigdec18` or `dev::bigint`
+
 ## 1.0.0 **Breaking changes**
 
 - Now coins represented by its ID. It means, all methods like `set_coin(std::string)` or `set_gas_coin(std::string)`

cfg/add_repo.sh

@@ -4,24 +4,23 @@ REPO_TYPE=$1
 
 case "${REPO_TYPE}" in
 centos | fedora)
-  cat <<REPO >/etc/yum.repos.d/bintray-edwardstock.repo
-[bintray-edwardstock]
-name=bintray-edwardstock
-baseurl=https://dl.bintray.com/edwardstock/rh/${REPO_TYPE}/\$releasever/\$basearch
-gpgcheck=0
-repo_gpgcheck=0
+  cat <<REPO >/etc/yum.repos.d/edwardstock.repo
+[edwardstock]
+name=edwardstock
+baseurl=https://edwardstock.jfrog.io/artifactory/rhel/${REPO_TYPE}/\$releasever/\$basearch
 enabled=1
+gpgcheck=0
+gpgkey=https://edwardstock.jfrog.io/artifactory/rhel/${REPO_TYPE}/\$releasever/\$basearch/repodata/repomd.xml.key
+repo_gpgcheck=1
 REPO
-
-  curl -s https://bintray.com/user/downloadSubjectPublicKey?username=bintray | gpg --import
   ;;
 
 debian)
-  EXIST_REPO=$(cat /etc/apt/sources.list | grep edwardstock/debian | head -n 1)
+  EXIST_REPO=$(cat /etc/apt/sources.list | grep "edwardstock.jfrog.io" | head -n 1)
   if [ "${EXIST_REPO}" == "" ]; then
-    echo "deb https://dl.bintray.com/edwardstock/debian $(lsb_release -c -s) main" | tee -a /etc/apt/sources.list
+    echo "deb https://edwardstock.jfrog.io/artifactory/debian $(lsb_release -c -s) main" | tee -a /etc/apt/sources.list
   fi
-  curl -s https://bintray.com/user/downloadSubjectPublicKey?username=bintray | apt-key add -
+  curl -s https://edwardstock.jfrog.io/artifactory/api/gpg/key/public | apt-key add -
   ;;
 *)
   echo "Unknown repo type"

cfg/package_make.sh

@@ -7,8 +7,6 @@ TYPE=""
 DRY_RUN=""
 CMAKE_OPTS=""
 BUILD_ROOT="${PWD}/_build"
-TEST_ONLY=""
-TEST_OPTION="ENABLE_TEST"
 
 function usage() {
   echo ""
@@ -17,7 +15,6 @@ function usage() {
   echo -e "    -h, --help       |  This help"
   echo -e "    -t, --type       |  Choose what package to build: archive or native OS package"
   echo -e "    --dry-run        |  Only echo commands without real building"
-  echo -e "    --test           |  Build and run only test configuration"
   echo -e "    -o, --options    |  Add string with additional cmake configure options. Example: -o \"-DVAR=1 -DVAR2=2\""
   echo -e "    -b, --buildroot  |  Path where to build project. Default: ${BUILD_ROOT}"
   echo ""
@@ -34,16 +31,6 @@ while (("$#")); do
     DRY_RUN=1
     shift
     ;;
-  --test)
-    if [ -n "$2" ]; then
-      TEST_ONLY=1
-      TEST_OPTION="$2"
-      shift 2
-    else
-      TEST_ONLY=1
-      shift
-    fi
-    ;;
   -t | --type)
     if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
       TYPE=$2
@@ -63,7 +50,7 @@ while (("$#")); do
     fi
     ;;
   -o | --options)
-    if [ -n "$2" ] && [ ${2:0:1} != "-" ]; then
+    if [ -n "$2" ]; then
       CMAKE_OPTS=$2
       shift 2
     else
@@ -90,19 +77,10 @@ else
   cpusCnt=$(lscpu | grep -E '^CPU\(' | awk '{print $2}') # cpus count
   tpcpu=$(lscpu | grep -E '^Thread' | awk '{print $4}')  # threads per core
   threadCount=$((cpusCnt * tpcpu))
-fi
-
-# create build root if not exists and go inside
-mkdir -p ${BUILD_ROOT} && cd ${BUILD_ROOT}
 
-# if need to test project only
-if [ "${TEST_ONLY}" == "1" ]; then
-  # delete everything inside just if build root already used
-  rm -rf ./*
-  cmake .. -DCMAKE_BUILD_TYPE=Debug -DENABLE_CONAN=Off -D${TEST_OPTION}=On
-  make -j ${threadCount}
-  make test
-  exit 0
+  if ((threadCount <= 0)); then
+    threadCount=2
+  fi
 fi
 
 if [ "${TYPE}" == "" ]; then
@@ -114,6 +92,7 @@ if [ "${TYPE}" == "archive" ]; then
   INTERNAL_OPTS="-DPACKAGE_ARCHIVE=On"
 fi
 
+mkdir -p ${BUILD_ROOT} && cd ${BUILD_ROOT}
 rm -rf ./*
 cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_CONAN=Off -DENABLE_TEST=Off ${INTERNAL_OPTS} ${CMAKE_OPTS}