bugfix 20240805.1

readme update

DONATION

@@ -1,7 +1,11 @@
 
-DONATION FOR SOLOMINER 2
-------------------------
-Open source project for the improvement of decentralization and public awareness of cryptocurrency.
+SOLOMINER 2
+===========
+
+Free and Open Source project for the improvement of public awareness and decentralization of digital currency.
+
+DONATION
+--------
 
 If you wish to fuel development of SOLOMINER with a donation you are welcome to do so here :
 
@@ -15,6 +19,16 @@ Let us know if you wish to have your name/pseudo and a custom text appear in the
 
 For donations related to feature request, drop us a note beforehand to avoid any disappointment.
 
+REFERRAL
+--------
+
+Solominer2 trading features use Xeggex low fee exchange, if you don't have an account you may create one
+using our referral link:
+
+<https://xeggex.com?ref=658a9ac948bb17dc13997793&campaign=solominer2&source=github>
+
+
+
 Thank you for your support!
 
 Contact: [email protected]

README.md

@@ -48,6 +48,10 @@ for you automatically.*
 and trading directly from the user interface.*
 \
 (WARNING: this is a non fully debugged BETA feature, only use for testing or development purpose at this time!)
+\
+Trading features use Xeggex low fee exchange, if you don't have an account you may create one using our referral link:
+\
+<https://xeggex.com?ref=658a9ac948bb17dc13997793&campaign=solominer2&source=github>
 
 ### ![text](https://cdn.jsdelivr.net/gh/Readme-Workflows/Readme-Icons@main/icons/octicons/ApprovedChanges.svg) *version*
 
@@ -227,7 +231,6 @@ Windows/MSVC port will follow right after.
 
 ### ***Stay tuned !***
 
-
 Donation
 --------
 

depends/tiny/tiny-os.h

@@ -531,6 +531,10 @@ TINYFUN OsTimerTime OsTimerConvertToNanosec( OsTimerCycle cycles );
 //! must call OsTimerGetResolution before calling this function
 //TODO .. not
 
+inline OsTimerTime OsTimerNow( void ) {
+    return OsTimerConvertToMs( OsTimerGetTimeNow() );
+}
+
 //////////////////////////////////////////////////////////////////////////
 //! file (drive)
 

src/interface/IMarket.h

@@ -136,6 +136,8 @@ struct MarketOrder {
         //! <0 market rate ,else limit price
         //! NB stop order handled using IBroker
 
+    enum Side { Sell=0 ,Buy } side;
+
     TimeSec validity; //! time until order is valid
 
     double quantityFilled; //! order quantity already filled
@@ -152,7 +154,7 @@ inline bool isSpotOrder( const MarketOrder &order ) {
 }
 
 template <> inline MarketOrder &Zero( MarketOrder &p ) {
-    p = { "" ,"" ,{ 0. ,"" } ,"" ,0. }; return p;
+    p = { "" ,"" ,{ 0. ,"" } ,"" ,0. ,MarketOrder::Sell ,0 ,0. }; return p;
 }
 
 //////////////////////////////////////////////////////////////////////////////

src/markets/markets.h

@@ -55,6 +55,8 @@ class CMarketService : public IMarket ,public CService
 
     static const char *category() { return "market"; }
 
+    API_DECL(void) noCache() {}
+
 public: ///-- IService
     //...
 

src/markets/xeggex/xeggex-api.cpp

@@ -700,18 +700,22 @@ bool CApi2::marketGetBySymbol( const char *symbol ,Market2 &market ) {
 bool CApi2::marketGetOrderBookBySymbol( const char *symbol ,OrderBook &book ) {
     String response; long status;
 
-    if( !HttpSend( "/market/getorderbookbysymbol/" ,symbol ,nullptr ,response ,status ,false ,false ) )
+    if( !HttpSend( "/market/getorderbookbysymbol/" ,symbol ,nullptr ,response ,status ,false ,m_noCache ) )
         return( false );
 
+    m_noCache = false;
+
     return parseResponseStruct_( response ,book );
 }
 
 bool CApi2::marketGetOrderBookByMarketId( const char *marketId ,OrderBook &book ) {
     String response; long status;
 
-    if( !HttpSend( "/market/getorderbookbymarketid/" ,marketId ,nullptr ,response ,status ,false ,false ) )
+    if( !HttpSend( "/market/getorderbookbymarketid/" ,marketId ,nullptr ,response ,status ,false ,m_noCache ) )
         return( false );
 
+    m_noCache = false;
+
     return parseResponseStruct_( response ,book );
 }
 
@@ -826,12 +830,12 @@ bool CApi2::getOrder( const char *orderId ,Order &order ) {
     return parseResponseStruct_( response ,order );
 }
 
-bool CApi2::getOrders( const char *ticker ,const char *orderStatus ,ListOf<Order> &orders ,int limit ,int skip ) {
+bool CApi2::getOrders( const char *marketPair ,const char *orderStatus ,ListOf<Order> &orders ,int limit ,int skip ) {
     String response; long status;
 
     std::stringstream ss;
 
-    ss << "?ticker=" << ticker << "&status=" << orderStatus << "&limit=" << limit << "&skip=" << skip;
+    ss << "?symbol=" << marketPair << "&status=" << orderStatus << "&limit=" << limit << "&skip=" << skip;
 
     if( !HttpSend( "/getorders" ,ss.str().c_str() ,nullptr ,response ,status ,true ,true ) )
         return( false );

src/markets/xeggex/xeggex-api.h

@@ -475,14 +475,18 @@ class CApi2 {
 
     ApiConfig m_config;
 
+    bool m_noCache; //! cache use for next request only
+
 public:
-    CApi2( IHttp &http ) : m_http(http)
+    CApi2( IHttp &http ) : m_http(http) ,m_noCache(false)
     {}
 
     const ApiConfig &config() const { return m_config; }
 
     ApiConfig &config() { return m_config; }
 
+    void noCache() { m_noCache = true; }
+
 //////////////////////////////////////////////////////////////////////////////
 //! APIv2
 
@@ -511,7 +515,7 @@ class CApi2 {
     bool getDeposits( const char *ticker ,ListOf<Deposit> &deposits ,int limit=0 ,int skip=500 );
     bool getWithdrawals( const char *ticker ,ListOf<Withdrawal> &withdrawals ,int limit=0 ,int skip=500 );
     bool getOrder( const char *orderId ,Order &order );
-    bool getOrders( const char *ticker ,const char *orderStatus ,ListOf<Order> &orders ,int limit=0 ,int skip=500 );
+    bool getOrders( const char *marketPair ,const char *orderStatus ,ListOf<Order> &orders ,int limit=100 ,int skip=0 );
 
     bool getTrades( const char *symbol ,ListOf<Trade> &trades ,int limit=0 ,int skip=500 );
     bool getTradesSince( const char *ticker ,ListOf<Trade> &trades ,const char *sinceTimestampMs ,int limit=0 ,int skip=500 );

src/markets/xeggex/xeggex-market.cpp

@@ -222,7 +222,7 @@ xeggex::OrderToCreate &toManifest( const MarketOrder &p ,xeggex::OrderToCreate &
 
     manifest.userProvidedId = p.userId;
     manifest.symbol = toMarketSymbol( symbol ,p.amount.value ,p.toValue );
-    manifest.side = "sell";
+    manifest.side = (p.side == MarketOrder::Sell) ? "sell" : "buy";
     manifest.type = (p.price < 0.) ? "market" : "limit";
     manifest.quantity = toString( p.amount.amount );
     manifest.price = toString( MAX( p.price ,0. ) );
@@ -263,13 +263,15 @@ MarketOrder &fromManifest( MarketOrder &p ,const xeggex::Order &manifest ) {
         swap( primaryAsset ,secondaryAsset );
 
     p.id = manifest.id;
+    p.userId = manifest.userProvidedId;
 
     p.amount.amount = fromString<double>( manifest.quantity );
     p.amount.value = primaryAsset;
     p.toValue = secondaryAsset;
     p.price = fromString<double>( manifest.price );
-    // p.validity;
+    p.side = (manifest.side == "buy") ? MarketOrder::Buy : MarketOrder::Sell;
 
+    // p.validity; //TODO
     p.quantityFilled = fromString<double>( manifest.executedQuantity );
 
     p.status = manifest.status;
@@ -533,8 +535,20 @@ IAPI_DEF CMarketXeggex::listWithdrawals( const char *value ,std::vector<MarketWi
 }
 
 IAPI_DEF CMarketXeggex::listOrders( const char *pair ,std::vector<MarketOrder> &orders ,int from ,int count ) {
-    //TODO here ... and other IMarket to XeggeX
-    return INOEXEC;
+    ListOf<xeggex::Order> xorders;
+
+    if( !api().getOrders( pair ,"active" ,xorders ) ) //! TODO .. limit vs since ?
+        return IERROR;
+
+    MarketOrder order;
+
+    for( const auto &it : xorders ) {
+        fromManifest( order ,it );
+
+        orders.emplace_back( order );
+    }
+
+    return IOK;
 }
 
 //////////////////////////////////////////////////////////////////////////////

src/markets/xeggex/xeggex-market.h

@@ -53,6 +53,8 @@ class CMarketXeggex : public CMarketService ,public xeggex::IHttp {
 
     xeggex::CApi2 &api() { return m_api; }
 
+    API_IMPL(void) noCache() IOVERRIDE { api().noCache(); }
+
 public: ///-- IMarket
     IAPI_IMPL getAssetList( ListOf<String> &assets ) IOVERRIDE;
 

src/solominer.cpp

@@ -510,6 +510,7 @@ void mainAppLoop() {
 //! Main
 
 // #include "test-graph.hpp"
+#include "test-trade.hpp"
 
 #define ERROR_OK            0
 #define ERROR_ARGS          -1
@@ -532,9 +533,11 @@ int main( int argc ,char *argv[] ) {
     //////////////////////////////////////////////////////////////////////////////
     //! TEST
 
-    /* OsTimerGetResolution();
+    test::test_trade();
+    return 0;
 
-    // algo::test_graph();
+    /*
+    algo::test_graph();
 
     while( OsSystemDoEvents() == ENOERROR ) {
         OsSleep(10);