Development

.github/workflows/check.yml

@@ -13,7 +13,7 @@ jobs:
     name: Windows
     runs-on: windows-2019
     env:
-      BOOST_ROOT: C:/tools/boost/x86_64
+      BOOST_ROOT: C:/local/boost_1_72_0
     steps:
       - uses: actions/checkout@master
 
@@ -54,7 +54,7 @@ jobs:
           mv build/src/Release/concealwallet.exe build/conceal
           mv build/src/Release/optimizer.exe build/conceal
           mv build/src/Release/walletd.exe build/conceal
-          mv build/tests/Release/*_tests.exe build/conceal
+          cp build/tests/Release/*_tests.exe build/conceal
 
       - name: Upload To GH Artifacts
         uses: actions/upload-artifact@v2
@@ -82,6 +82,90 @@ jobs:
         run: |
           cd build/conceal
           ./performance_tests.exe
+
+      - name: unit_tests
+        shell: powershell
+        run: |
+          cd build/tests
+          ctest -R UnitTests --output-on-failure
+
+  build-mingw:
+    name: MinGW
+    runs-on: windows-2019
+    steps:
+      - uses: msys2/setup-msys2@v2
+        with:
+          update: true
+          install: >-
+            git
+            base-devel
+            mingw-w64-x86_64-toolchain
+            mingw-w64-x86_64-boost
+            mingw-w64-x86_64-cmake
+
+      - uses: actions/checkout@master
+
+      - name: Prepare version
+        shell: powershell
+        id: setup
+        run: |
+          $os="mingw"
+          $ccx_version="${{ github.sha }}".SubString(0,7)
+          $release_name="ccx-cli-$os-dev-$ccx_version"
+          echo "::set-output name=release_name::${release_name}"
+
+      - name: Build
+        shell: msys2 {0}
+        id: build
+        run: |
+          ls
+          mkdir build
+          cd build
+          cmake .. -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=ON -DSTATIC=ON
+          cmake --build . --config Release
+
+      - name: Prepare release
+        shell: msys2 {0}
+        run: |
+          mkdir build/conceal
+          mv build/src/conceald.exe build/conceal
+          mv build/src/concealwallet.exe build/conceal
+          mv build/src/optimizer.exe build/conceal
+          mv build/src/walletd.exe build/conceal
+          cp build/tests/*_tests.exe build/conceal
+
+      - name: Upload To GH Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ steps.setup.outputs.release_name }}
+          path: build/conceal
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: core_tests
+        shell: powershell
+        run: |
+          cd build/conceal
+          ./core_tests.exe --generate_and_play_test_data
+
+      - name: difficulty_tests
+        shell: powershell
+        run: |
+          cp tests/Difficulty/data.txt build/conceal
+          cd build/conceal
+          ./difficulty_tests.exe data.txt
+
+      - name: performance_tests
+        shell: powershell
+        run: |
+          cd build/conceal
+          ./performance_tests.exe
+
+      - name: unit_tests
+        shell: powershell
+        run: |
+          cd build/tests
+          ctest -R UnitTests --output-on-failure
 
   build-ubuntu18:
     name: Ubuntu 18.04
@@ -117,7 +201,7 @@ jobs:
           mv build/src/concealwallet build/conceal
           mv build/src/optimizer build/conceal
           mv build/src/walletd build/conceal
-          mv build/tests/*_tests build/conceal
+          cp build/tests/*_tests build/conceal
 
       - name: Upload To GH Artifacts
         uses: actions/upload-artifact@v2
@@ -147,6 +231,11 @@ jobs:
         run: |
           cd build/conceal
           ./system_tests
+
+      - name: unit_tests
+        run: |
+          cd build/tests
+          ctest -R UnitTests --output-on-failure
 
   build-ubuntu20:
     name: Ubuntu 20.04
@@ -182,7 +271,7 @@ jobs:
           mv build/src/concealwallet build/conceal
           mv build/src/optimizer build/conceal
           mv build/src/walletd build/conceal
-          mv build/tests/*_tests build/conceal
+          cp build/tests/*_tests build/conceal
 
       - name: Upload To GH Artifacts
         uses: actions/upload-artifact@v2
@@ -213,6 +302,11 @@ jobs:
           cd build/conceal
           ./system_tests
 
+      - name: unit_tests
+        run: |
+          cd build/tests
+          ctest -R UnitTests --output-on-failure
+
   build-ubuntu20-clang:
     name: Ubuntu 20.04 clang
     runs-on: ubuntu-20.04
@@ -247,7 +341,7 @@ jobs:
           mv build/src/concealwallet build/conceal
           mv build/src/optimizer build/conceal
           mv build/src/walletd build/conceal
-          mv build/tests/*_tests build/conceal
+          cp build/tests/*_tests build/conceal
 
       - name: Upload To GH Artifacts
         uses: actions/upload-artifact@v2
@@ -278,6 +372,11 @@ jobs:
           cd build/conceal
           ./system_tests
 
+      - name: unit_tests
+        run: |
+          cd build/tests
+          ctest -R UnitTests --output-on-failure
+
   build-macos11:
     name: macOS
     runs-on: macos-11
@@ -311,7 +410,7 @@ jobs:
           mv build/src/concealwallet build/conceal
           mv build/src/optimizer build/conceal
           mv build/src/walletd build/conceal
-          mv build/tests/*_tests build/conceal
+          cp build/tests/*_tests build/conceal
 
       - name: Upload To GH Artifacts
         uses: actions/upload-artifact@v2
@@ -336,3 +435,8 @@ jobs:
         run: |
           cd build/conceal
           ./performance_tests
+
+      - name: unit_tests
+        run: |
+          cd build/tests
+          ctest -R UnitTests --output-on-failure

.github/workflows/windows.yml

@@ -10,7 +10,7 @@ jobs:
     name: Windows
     runs-on: windows-2019
     env:
-      BOOST_ROOT: C:/hostedtoolcache/windows/Boost/1.72.0/x86_64
+      BOOST_ROOT: C:/local/boost_1_72_0
     steps:
       - uses: actions/checkout@master
 

.travis.yml

@@ -1,28 +1,22 @@
-sudo: true
+dist: focal
 language: cpp
 
-matrix:
-  include:
+branches:
+  only:
+    - master
+    - travis
 
-  # Ubuntu, g++-6
-  - os: linux
-    dist: xenial
-    compiler: gcc
-    addons:
-        apt:
-          update: true
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - libboost-all-dev
-            - g++-6
-    env:
-    - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
-    - LABEL="linux"
-    - _DEPLOY="true"
+addons:
+  apt:
+    update: true
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - libboost-all-dev
+      - g++
 
 script:
   - mkdir build
   - cd build
   - cmake -DCMAKE_BUILD_TYPE=Release -DSTATIC=true ..
-  - make
+  - make -j2

CMakeLists.txt

@@ -27,7 +27,7 @@ if(APPLE OR FREEBSD)
   enable_language(ASM)
 endif()
 
-if(MSVC)
+if(MSVC OR MINGW)
   include_directories(src/Platform/Windows)
 elseif(APPLE)
   include_directories(src/Platform/OSX)
@@ -82,6 +82,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_FLAG}")
 
 set(STATIC ${MSVC} CACHE BOOL "Link libraries statically")
 
+if(MINGW AND STATIC)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libstdc++ -static-libgcc")
+endif()
+
 if(MSVC)
   add_definitions("/bigobj /MP /W3 /GS- /D_CRT_SECURE_NO_WARNINGS /wd4996 /wd4345 /D_WIN32_WINNT=0x0600 /DWIN32_LEAN_AND_MEAN /DGTEST_HAS_TR1_TUPLE=0 /D_VARIADIC_MAX=8 /D__SSE4_1__")
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:10485760")
@@ -120,7 +124,7 @@ else()
   set(C_WARNINGS "-Waggregate-return -Wnested-externs -Wold-style-definition -Wstrict-prototypes")
   set(CXX_WARNINGS "-Wno-reorder -Wno-missing-field-initializers")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${MINGW_FLAG} ${WARNINGS} ${C_WARNINGS}")
-  if(NOT APPLE)
+  if(NOT APPLE AND NOT MINGW)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
   endif()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${MINGW_FLAG} ${WARNINGS} ${CXX_WARNINGS}")
@@ -151,7 +155,7 @@ find_package(Boost 1.55 REQUIRED COMPONENTS system filesystem thread date_time c
 include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
 
 if(MINGW)
-  set(Boost_LIBRARIES "${Boost_LIBRARIES};ws2_32;mswsock")
+  set(Boost_LIBRARIES "${Boost_LIBRARIES};ws2_32;mswsock;bcrypt")
 elseif(APPLE)
   set(Boost_LIBRARIES "${Boost_LIBRARIES}")
 elseif(NOT MSVC)
@@ -199,5 +203,9 @@ else()
   endif()
 endif()
 
+if(MINGW AND STATIC)
+  set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive")
+endif()
+
 add_subdirectory(external)
 add_subdirectory(src)

include/IWalletLegacy.h

@@ -98,6 +98,7 @@ class IWalletLegacyObserver {
   virtual void externalTransactionCreated(TransactionId transactionId) {}
   virtual void sendTransactionCompleted(TransactionId transactionId, std::error_code result) {}
   virtual void transactionUpdated(TransactionId transactionId) {}
+  virtual void depositUpdated(const DepositId& depositId) {}
   virtual void depositsUpdated(const std::vector<DepositId>& depositIds) {}
 };
 
@@ -152,8 +153,11 @@ class IWalletLegacy {
   virtual std::list<TransactionOutputInformation> selectFusionTransfersToSend(uint64_t threshold, size_t minInputCount, size_t maxInputCount) = 0;
   virtual TransactionId sendFusionTransaction(const std::list<TransactionOutputInformation>& fusionInputs, uint64_t fee, const std::string& extra = "", uint64_t mixIn = 0, uint64_t unlockTimestamp = 0) = 0;
   virtual TransactionId deposit(uint32_t term, uint64_t amount, uint64_t fee, uint64_t mixIn = 0) = 0;
+  virtual TransactionId withdrawDeposit(const DepositId& depositId, uint64_t fee) = 0;
   virtual TransactionId withdrawDeposits(const std::vector<DepositId>& depositIds, uint64_t fee) = 0;
   virtual std::error_code cancelTransaction(size_t transferId) = 0;
+  virtual Deposit get_deposit(DepositId depositId) = 0;
+
 
 };
 

src/CMakeLists.txt

@@ -11,6 +11,7 @@ file(GLOB_RECURSE Http HTTP/*)
 file(GLOB_RECURSE InProcessNode InProcessNode/*)
 file(GLOB_RECURSE Logging Logging/*)
 file(GLOB_RECURSE Optimizer Optimizer/*)
+file(GLOB_RECURSE Mnemonics Mnemonics/*)
 file(GLOB_RECURSE NodeRpcProxy NodeRpcProxy/*)
 file(GLOB_RECURSE P2p P2p/*)
 file(GLOB_RECURSE Rpc Rpc/*)
@@ -23,7 +24,7 @@ file(GLOB_RECURSE JsonRpcServer JsonRpcServer/*)
 file(GLOB_RECURSE PaymentGate PaymentGate/*)
 file(GLOB_RECURSE PaymentGateService PaymentGateService/*)
 
-if(MSVC)
+if(MSVC OR MINGW)
   file(GLOB_RECURSE System System/* Platform/Windows/System/*)
 elseif(APPLE)
   file(GLOB_RECURSE System System/* Platform/OSX/System/*)
@@ -40,6 +41,7 @@ add_library(CryptoNoteCore STATIC ${CryptoNoteCore})
 add_library(Http STATIC ${Http})
 add_library(InProcessNode STATIC ${InProcessNode})
 add_library(Logging STATIC ${Logging})
+add_library(Mnemonics STATIC ${Mnemonics})
 add_library(NodeRpcProxy STATIC ${NodeRpcProxy})
 add_library(Rpc STATIC ${Rpc})
 add_library(P2P STATIC ${CryptoNoteProtocol} ${P2p})
@@ -59,8 +61,14 @@ if (MSVC)
   target_link_libraries(System ws2_32)
 endif ()
 
+if (MINGW)
+  target_link_libraries(Common dnsapi)
+  target_link_libraries(P2P bcrypt)
+  target_link_libraries(System ws2_32)
+endif ()
+
 target_link_libraries(Daemon CryptoNoteCore P2P Rpc System Http Logging Common crypto libminiupnpc-static BlockchainExplorer ${Boost_LIBRARIES} Serialization)
-target_link_libraries(SimpleWallet Wallet NodeRpcProxy Transfers Rpc Http CryptoNoteCore System Logging Common crypto ${Boost_LIBRARIES} Serialization)
+target_link_libraries(SimpleWallet Wallet NodeRpcProxy Transfers Rpc Http CryptoNoteCore System Logging Common crypto ${Boost_LIBRARIES} Serialization Mnemonics)
 target_link_libraries(PaymentGateService PaymentGate JsonRpcServer Wallet NodeRpcProxy Transfers CryptoNoteCore crypto P2P Rpc Http System Logging Common InProcessNode libminiupnpc-static BlockchainExplorer ${Boost_LIBRARIES} Serialization)
 target_link_libraries(Optimizer PaymentGate Rpc Http CryptoNoteCore Logging Serialization crypto System Common ${Boost_LIBRARIES})
 

src/Common/CommandLine.cpp

@@ -12,4 +12,9 @@ namespace command_line
   const arg_descriptor<bool> arg_help = {"help", "Produce help message"};
   const arg_descriptor<bool> arg_version = {"version", "Output version information"};
   const arg_descriptor<std::string> arg_data_dir = {"data-dir", "Specify data directory"};
+  const command_line::arg_descriptor<bool> arg_testnet_on = {
+    "testnet",
+    "Use testnet instead of mainnet",
+    false
+  };
 }

src/Common/CommandLine.h

@@ -176,4 +176,5 @@ namespace command_line
   extern const arg_descriptor<bool> arg_help;
   extern const arg_descriptor<bool> arg_version;
   extern const arg_descriptor<std::string> arg_data_dir;
+  extern const command_line::arg_descriptor<bool> arg_testnet_on;
 }