Merge branch 'main' of https://github.com/small-debug/qubic-cli

Author: small-debug

.github/workflows/cmake-multi-platform.yml

@@ -0,0 +1,66 @@
+# This starter workflow is for a CMake project running on multiple platforms. There is a different starter workflow if you just want a single platform.
+# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml
+name: Multi-Platform Build
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
+      fail-fast: false
+
+      # Set up a matrix to run the following 3 configurations:
+      # 1. <Windows, Release, latest MSVC compiler toolchain on the default runner image, default generator>
+      # 2. <Linux, Release, latest GCC compiler toolchain on the default runner image, default generator>
+      # 3. <Linux, Release, latest Clang compiler toolchain on the default runner image, default generator>
+      #
+      # To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list.
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+        build_type: [Release]
+        cpp_compiler: [g++, clang++, cl]
+        include:
+          - os: windows-latest
+            cpp_compiler: cl
+          - os: ubuntu-latest
+            cpp_compiler: g++
+          - os: ubuntu-latest
+            cpp_compiler: clang++
+        exclude:
+          - os: windows-latest
+            cpp_compiler: g++
+          - os: windows-latest
+            cpp_compiler: clang++
+          - os: ubuntu-latest
+            cpp_compiler: cl
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set reusable strings
+      # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
+      id: strings
+      shell: bash
+      run: |
+        echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
+
+    - name: Configure CMake
+      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+      run: >
+        cmake -B ${{ steps.strings.outputs.build-output-dir }}
+        -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
+        -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+        -S ${{ github.workspace }}
+
+    - name: Build
+      # Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
+      run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }}
+      

.gitignore

@@ -2,4 +2,5 @@
 build/
 # geany editor
 *geany
+tmp/
 

CMakeLists.txt

@@ -15,8 +15,9 @@ SET(FILES ${CMAKE_SOURCE_DIR}/connection.cpp
 		  ${CMAKE_SOURCE_DIR}/proposal.cpp
 		  ${CMAKE_SOURCE_DIR}/qearn.cpp
 		  ${CMAKE_SOURCE_DIR}/qvault.cpp
-		  ${CMAKE_SOURCE_DIR}/msvault.cpp
-		  ${CMAKE_SOURCE_DIR}/nostromo.cpp
+		  ${CMAKE_SOURCE_DIR}/msvault.cpp 
+		  ${CMAKE_SOURCE_DIR}/qswap.cpp
+      ${CMAKE_SOURCE_DIR}/nostromo.cpp
 )
 SET(HEADER_FILES
 	K12AndKeyUtil.h
@@ -43,7 +44,9 @@ SET(HEADER_FILES
 	qearn.h
 	qvault.h
 	msvault.h
-	nostromo.h
+	qswap.h
+	qswap_struct.h
+  nostromo.h
 )
 if(MSVC)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)

README.md

@@ -3,6 +3,9 @@
 Qubic Core client
 
 An intermediate tool to communicate to qubic core node.
+
+> [![MultiPlatformBuild](https://github.com/qubic/qubic-cli/actions/workflows/cmake-multi-platform.yml/badge.svg?branch=main)](https://github.com/qubic/qubic-cli/actions/workflows/cmake-multi-platform.yml)
+
 ```
 ./qubic-cli [basic config] [command] [command extra parameters]
 -help print this message
@@ -250,8 +253,36 @@ Command:
 	-msvaultgetvaultowners <VAULT_ID>
 			Get MsVault owners given vault ID.
 
-[NOSTROMO COMMANDS]
+[QSWAP COMMANDS]
+	-qswapgetfee
+		Show current Qswap fees.
+	-qswapissueasset <ASSET_NAME> <NUMBER_OF_UNIT> <UNIT_OF_MEASUREMENT> <NUM_DECIMAL>
+		Create an asset via Qswap contract.
+	-qswaptransferasset <ASSET_NAME> <ISSUER_IN_HEX> <NEW_OWNER_IDENTITY> <AMOUNT_OF_SHARE>
+		Transfer an asset via Qswap contract.
+	-qswapcreatepool <ASSET_NAME> <ISSUER_IN_HEX>
+		Create an AMM pool via Qswap contract.
+	-qswapgetpoolbasicstate <ASSET_NAME> <ISSUER_IN_HEX>
+		Get the basic info of a pool, totol liquidity, qu reserved, asset reserved.
+
+    -qswapaddliquidity <ASSET_NAME> <ISSUER_IN_HEX> <QU_AMOUNT_IN> <ASSET_AMOUNT_DESIRED> <QU_AMOUNT_MIN> <ASSET_AMOUNT_MIN>
+    	Add liquidity with restriction to an AMM pool via Qswap contract.
+    -qswapremoveliquidity <ASSET_NAME> <ISSUER_IN_HEX> <BURN_LIQUIDITY> <QU_AMOUNT_MIN> <ASSET_AMOUNT_MIN>
+    	Remove liquidity with restriction from an AMM pool via Qswap contract.
+	-qswapswapexactquforasset <ASSET_NAME> <ISSUER_IN_HEX> <QU_AMOUNT_IN> <ASSET_AMOUNT_OUT_MIN>
+		Swap qu for asset via Qswap contract, only execute if asset_amount_out >= ASSET_AMOUNT_OUT_MIN.
+	-qswapswapquforexactasset <ASSET_NAME> <ISSUER_IN_HEX> <ASSET_AMOUNT_OUT> <QU_AMOUNT_IN_MAX>
+		Swap qu for asset via Qswap contract, only execute if qu_amount_in <= QU_AMOUNT_IN_MAX.
+	-qswapswapexactassetforqu <ASSET_NAME> <ISSUER_IN_HEX> <ASSET_AMOUNT_IN> <QU_AMOUNT_OUT_MIN>
+		Swap asset for qu via Qswap contract, only execute if qu_amount_out >= QU_AMOUNT_OUT_MIN.
+	-qswapswapassetforexactqu <ASSET_NAME> <ISSUER_IN_HEX> <QU_AMOUNT_OUT> <ASSET_AMOUNT_IN_MAX>
+		Swap asset for qu via Qswap contract, only execute if asset_amount_in <= ASSET_AMOUNT_IN_MAX.
+	-qswapgetliquidityof <ASSET_NAME> <ISSUER_IN_HEX> [LIQUIDITY_STAKER(in qublic format)]
+		Get the staker's liquidity in a pool.
+	-qswapquote exact_qu_input/exact_qu_output/exact_asset_input/exact_asset_output <ASSET_NAME> <ISSUER_IN_HEX> <AMOUNT>
+    	Quote amount_out/amount_in with given amount_in/amount_out.
 
+[NOSTROMO COMMANDS]
 	-nostromoregisterintier <TIER_LEVEL>
 			Register in tier.
 	-nostromologoutfromtier 

SCUtils.cpp

@@ -37,7 +37,12 @@ void dumpQxContractToCSV(const char* input, const char* output)
     std::shared_ptr<QX> qxState = std::make_shared<QX>();
 
     f = fopen(input, "rb");
-    fread(qxState.get(), 1, sizeof(QX), f);
+    if (fread(qxState.get(), 1, sizeof(QX), f) != sizeof(QX))
+    {
+        LOG("Failed to read QX state\n");
+        fclose(f);
+        return;
+    }
     fclose(f);
 
     f = fopen(output, "w");