Merge branch 'master'

Author: samgermain

.github/workflows/cs.yml

@@ -145,7 +145,9 @@ jobs:
         run: npm run export-exchanges
       - name: Live tests
         if: env.important_modified == 'true'
-        run: ./run-tests-simul.sh --csharp
+        run: |
+          npm run live-tests -- --csharp || true
+          npm run live-tests-ws -- --csharp
       - name: Live tests (specific)
         if: env.important_modified == 'false'
         run: ./run-tests-simul.sh --csharp "${{ env.rest_files }}" "${{ env.ws_files }}"

.github/workflows/go-app.yml

@@ -61,9 +61,26 @@ jobs:
         #   #   tsx build/goTranspiler.ts -- $exchange
         #   # done
         run : |
-          cleaned_rest_files=$(echo ${{ env.rest_files }} | tr -s ' ')
-          echo "Cleaned files: $cleaned_rest_files"
-          tsx utils/granular-go-build.ts $cleaned_rest_files
+          # cleaned_rest_files=$(echo ${{ env.rest_files }} | tr -s ' ')
+          # cleaned_ws_files=$(echo ${{ env.ws_files }} | tr -s ' ')
+          # # echo "Cleaned files: $cleaned_rest_files"
+          # # tsx utils/granular-go-build.ts $cleaned_rest_files
+          # if [ -n "$cleaned_rest_files" ]; then
+          #   echo "Cleaned files: $cleaned_rest_files"
+          #   tsx utils/granular-go-build.ts $cleaned_rest_files
+          # else
+          #   echo "No rest files to process; skipping."
+          # fi
+          # cleaned_ws_files=$(echo ${{ env.ws_files }} | tr -s ' ')
+          # if [ -n "$cleaned_ws_files" ]; then
+          #   echo "Cleaned files: $cleaned_ws_files"
+          #   tsx utils/granular-go-build.ts $cleaned_ws_files
+          # else
+          #   echo "No websocket files to process; skipping."
+          # fi
+          read -r -a files <<<"$(printf '%s %s' "${{ env.rest_files }}" "${{ env.ws_files }}" | xargs)"
+          echo "Files to process: ${files[*]}"
+          tsx utils/granular-go-build.ts "${files[@]}"
       # - name: Install dependencies
       #   run: cd go && go get ./ccxt && cd ..
       - name: Build

CHANGELOG.md

@@ -536,6 +536,10 @@ class NewTranspiler {
             return `return (Int64)res;`;
         }
 
+        if (unwrappedType === 'double') {
+            return `return (double)res;`;
+        }
+
         // handle the typescript type Dict
         if (unwrappedType === 'Dict') {
             return `return (Dictionary<string, object>)res;`;

README.md

@@ -46,4 +46,4 @@ try
 !
 1
 trrigger!
-go
+go!!!

build/csharpTranspiler.ts

@@ -83,9 +83,12 @@ const imports = [
 
 const VIRTUAL_BASE_METHODS: { [key: string]: boolean} = {
     "cancelOrder": true, // true if the method returns a channel (async in JS)
+    "cancelOrdersWithClientOrderIds": true,
+    "cancelOrderWithClient": true,
     "createExpiredOptionMarket": false,
     "createOrder": true,
     "editOrder": true,
+    "editOrderWithClientOrderId": true,
     "fetchAccounts": true,
     "fetchBalance": true,
     "fetchClosedOrders": true,
@@ -108,6 +111,7 @@ const VIRTUAL_BASE_METHODS: { [key: string]: boolean} = {
     "fetchTradingFees": true,
     "fetchOption": true,
     "fetchOrder": true,
+    "fetchOrderWithClientOrderId": true,
     "fetchOrderBook": true,
     "fetchOrderBooks": true,
     "fetchOrders": true,
@@ -236,9 +240,12 @@ const VIRTUAL_BASE_METHODS: { [key: string]: boolean} = {
 }
 
 const INTERFACE_METHODS = [
+    'cancelOrders',
+    'cancelOrdersWithClientOrderIds',
     'cancelAllOrders',
     'cancelAllOrdersAfter',
     'cancelOrder',
+    'cancelOrderWithClientOrderId',
     'cancelOrdersForSymbols',
     'createConvertTrade',
     'createDepositAddress',
@@ -268,6 +275,7 @@ const INTERFACE_METHODS = [
     'editLimitOrder',
     'editLimitSellOrder',
     'editOrder',
+    'editOrderWithClientOrderId',
     'editOrders',
     'fetchAccounts',
     'fetchAllGreeks',
@@ -329,6 +337,7 @@ const INTERFACE_METHODS = [
     'fetchOption',
     'fetchOptionChain',
     'fetchOrder',
+    'fetchOrderWithClientOrderId',
     'fetchOrderBook',
     'fetchOrderBooks',
     'fetchOrders',
@@ -1076,6 +1085,9 @@ class NewTranspiler {
             return `(res).(int64)`;
         }
 
+        if (unwrappedType === 'float64') {
+            return `(res).(float64)`;
+        }
         if (methodName.startsWith('watchOrderBook')) {
             return `NewOrderBookFromWs(res)`;
         }
@@ -1291,15 +1303,17 @@ class NewTranspiler {
             methodDoc.push(goComments[exchangeName][methodName]);
         }
 
-        let emtpyObject = `${unwrappedType}{}`;
+        let emptyObject = `${unwrappedType}{}`;
         if (unwrappedType.startsWith('[]')) {
-            emtpyObject = 'nil';
+            emptyObject = 'nil'
         } else if (unwrappedType.includes('int64')) {
-            emtpyObject = '-1';
+            emptyObject = '-1'
+        } else if (unwrappedType.includes('float64')) {
+            emptyObject = 'float64(-1)'
         } else if (unwrappedType === 'string') {
-            emtpyObject = '""';
+            emptyObject = '""'
         } else if (unwrappedType === 'interface{}') {
-            emtpyObject = 'nil';
+            emptyObject = 'nil';
         }
 
         const defaultParams =  this.getDefaultParamsWrappers(methodName, methodWrapper.parameters);
@@ -1317,7 +1331,7 @@ class NewTranspiler {
            `${defaultParams}`,
             `${two}res := <- ${accessor}${methodNameCapitalized}(${params})`,
             `${two}if IsError(res) {`,
-            `${three}return ${emtpyObject}, CreateReturnError(res)`,
+            `${three}return ${emptyObject}, CreateReturnError(res)`,
             `${two}}`,
             `${two}return ${this.createReturnStatement(methodName, unwrappedType)}, nil`,
             // `${two}}()`,

build/dummy.txt

@@ -104,13 +104,16 @@ class Transpiler {
     getCommonRegexes (): any[] {
 
         return [
-            [ /(?<!assert|equals)(\s\(?)(rsa|ecdsa|eddsa|jwt|totp|inflate)\s/g, '$1this.$2' ],
+            [ /(?<!assert|equals|verify)(\s\(?)(rsa|ecdsa|eddsa|jwt|totp|inflate)\s/g, '$1this.$2' ],
             [ /errorHierarchy/g, 'error_hierarchy'],
             [ /\.featuresGenerator/g, '.features_generator'],
             [ /\.featuresMapper/g, '.features_mapper'],
             [ /\.safeValue2/g, '.safe_value_2'],
             [ /\.safeInteger2/g, '.safe_integer_2'],
             [ /\.safeString2/g, '.safe_string_2'],
+            [ /safeString \(/g, 'safe_string('],
+            [ /safeInteger \(/g, 'safe_integer('],
+            [ /inArray \(/g, 'in_array('],
             [ /\.safeFloat2/g, '.safe_float_2'],
             [ /\.safeDict2/g, '.safe_dict_2'],
             [ /\.safeList2/g, '.safe_list_2'],
@@ -1159,7 +1162,7 @@ class Transpiler {
             const closure = variables && variables.length ? 'use (' + variables.map ((x: any) => '$' + x).join (', ') + ')': '';
             phpBody = '        return Async\\async(function () ' + closure + ' {\n    ' +  phpBody.replace (/\n/g, '\n    ') + '\n        }) ();'
         }
-
+        phpBody = phpBody.replaceAll(/parent::\$market/g, 'parent::market')
         return phpBody
     }
 
@@ -2002,6 +2005,9 @@ class Transpiler {
             "hmac = Exchange.hmac",
             "ecdsa = Exchange.ecdsa",
             "eddsa = Exchange.eddsa",
+            "safe_string = Exchange.safe_string",
+            "safe_integer = Exchange.safe_integer",
+            "in_array = Exchange.in_array",
             "jwt = Exchange.jwt",
             "crc32 = Exchange.crc32",
             "rsa = Exchange.rsa",

build/goTranspiler.ts

@@ -11,4 +11,5 @@ tox>=4.8.0
 mypy==1.6.1
 pyopenssl
 psutil
-protobuf==5.29.5
+protobuf==5.29.5
+coincurve==20.0.0

build/transpile.ts

@@ -98,7 +98,6 @@ function injectMissingUndefined (fn, args) {
         }
         args = newArgsArray;
     }
-    console.log (args);
     return args;
 }