Merge pull request #33 from Assassyn/fix/active-key-operation-stoped-…

…working Fix/active key operation stopped working
Assassyn · Jun 2, 2023 · a6aa860 · a6aa860
2 parents bc26e0f + b17b764
commit a6aa860
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 18 deletions.
diff --git a/build/build.yml b/build/build.yml
@@ -14,7 +14,7 @@ trigger:
 pool:
   vmImage: ubuntu-latest
 
-name: 0.9.0-$(Rev:r)
+name: 0.9.1-$(Rev:r)
 
 stages:
   - stage: BuildAndTest

diff --git a/src/Functional.UniversalBot.Hive/Hive.fs b/src/Functional.UniversalBot.Hive/Hive.fs
@@ -6,6 +6,12 @@ open System
 
 type HiveUrl = string 
 
+[<Literal>]
+let useActiveKey = true
+
+[<Literal>]
+let usePostingKey = true
+
 let private setToUserNameWhenTrue username isTrue =
     match isTrue with 
     | true -> [| username |]
@@ -18,12 +24,6 @@ let private createCustomJson username activeKey postingKey methodName json =
         required_auths = setToUserNameWhenTrue username activeKey,
         required_posting_auths = setToUserNameWhenTrue username postingKey)
 
-let createCustomJsonActiveKey username methodName json = 
-    createCustomJson username true false methodName json
-
-let createCustomJsonPostingKey username methodName json = 
-    createCustomJson username false true methodName json
-
 let brodcastTransactions hiveUrl operations key = 
     let hive = new CHived(new HttpClient(), hiveUrl)
     operations
@@ -33,6 +33,10 @@ let brodcastTransactions hiveUrl operations key =
         System.Threading.Thread.Sleep (3 |> TimeSpan.FromSeconds)
         transactionId)
 
-let buildCustomJson username method payload = 
+let buildActiveKeyedCustomJson username method payload = 
+    let json = System.Text.Json.JsonSerializer.Serialize (payload)
+    createCustomJson username useActiveKey (not usePostingKey) method json
+
+let buildPostingKeyedCustomJson username method payload = 
     let json = System.Text.Json.JsonSerializer.Serialize (payload)
-    createCustomJsonPostingKey username method json
+    createCustomJson username (not useActiveKey) usePostingKey method json
diff --git a/src/Functional.UniversalBot.Plugin.HiveEngine/Actions/AddTokenToPool.fs b/src/Functional.UniversalBot.Plugin.HiveEngine/Actions/AddTokenToPool.fs
@@ -29,7 +29,7 @@ let private scheduleTokenToPoolTransfer username tokenPair baseQuantity quoteQua
             maxSlippage = "1"
             maxDeviation = "0"
         |}
-    |> buildCustomJson username "ssc-mainnet-hive"
+    |> buildActiveKeyedCustomJson username "ssc-mainnet-hive"
     |> scheduleActiveOperation ModuleName tokenPair
 
 let action hive hiveEngineUrl tokenPair leftAmountCalculator rightAmountCalculator username (entity: PipelineProcessData<UniversalHiveBotResutls>) = 

diff --git a/src/Functional.UniversalBot.Plugin.HiveEngine/Actions/DelegateStake.fs b/src/Functional.UniversalBot.Plugin.HiveEngine/Actions/DelegateStake.fs
@@ -24,7 +24,7 @@ let action tokenSymbol delegateTo amountCalcualtor username (entity: PipelinePro
     if tokenBalance > 0M
     then 
         bindCustomJson "tokens" "delegate" {|``to`` = delegateTo;symbol = tokenSymbol;quantity = String.asString tokenBalance|}
-        |> buildCustomJson username "ssc-mainnet-hive" 
+        |> buildActiveKeyedCustomJson username "ssc-mainnet-hive" 
         |> scheduleActiveOperation ModuleName tokenSymbol 
         |> withResult entity 
     else 

diff --git a/src/Functional.UniversalBot.Plugin.HiveEngine/Actions/SellToken.fs b/src/Functional.UniversalBot.Plugin.HiveEngine/Actions/SellToken.fs
@@ -29,7 +29,7 @@ let action hive hiveEngineUrl tokenSymbol amountCalcualtor username (entity: Pip
     then 
         let tokenPrice = getTokenPrice hiveEngineUrl tokenSymbol amountToSell
         bindCustomJson "market" "sell" {| symbol = tokenSymbol; quantity = String.asString amountToSell; price = String.asString tokenPrice; |}
-        |> buildCustomJson username "ssc-mainnet-hive"
+        |> buildActiveKeyedCustomJson username "ssc-mainnet-hive"
         |> scheduleActiveOperation ModuleName tokenSymbol
         |> withResult entity
     else 

diff --git a/src/Functional.UniversalBot.Plugin.HiveEngine/Actions/StakeToken.fs b/src/Functional.UniversalBot.Plugin.HiveEngine/Actions/StakeToken.fs
@@ -19,7 +19,7 @@ let action tokenSymbol amountCalcualtor username (entity: PipelineProcessData<Un
     if tokenBalance > 0M
     then 
         bindCustomJson "tokens" "stake" {| ``to`` = username;symbol = tokenSymbol;quantity = String.asString tokenBalance|}
-        |> buildCustomJson username "ssc-mainnet-hive" 
+        |> buildActiveKeyedCustomJson username "ssc-mainnet-hive" 
         |> scheduleActiveOperation ModuleName tokenSymbol 
         |> withResult entity 
     else 

diff --git a/src/Functional.UniversalBot.Plugin.HiveEngine/Actions/TokenSwapAction.fs b/src/Functional.UniversalBot.Plugin.HiveEngine/Actions/TokenSwapAction.fs
@@ -21,7 +21,7 @@ let action hive hiveEngineUrl tokenPair tokenSymbol maxSlippage amountToSwapCalc
     if amountToSwap > 0M
     then 
         bindCustomJson "marketpools" "swapTokens" {| tokenPair = tokenPair; tokenSymbol = tokenSymbol; tokenAmount = String.asString amountToSwap; tradeType = "exactInput"; maxSlippage = maxSlippage |}
-        |> buildCustomJson username "ssc-mainnet-hive"
+        |> buildActiveKeyedCustomJson username "ssc-mainnet-hive"
         |> scheduleActiveOperation ModuleName tokenSymbol
         |> withResult entity
     else 

diff --git a/src/Functional.UniversalBot.Plugin.HiveEngine/Actions/TransferToken.fs b/src/Functional.UniversalBot.Plugin.HiveEngine/Actions/TransferToken.fs
@@ -23,7 +23,7 @@ let action tokenSymbol transferTo amountCalcualtor memo username (entity: Pipeli
     if tokenBalance > 0M
     then 
         bindCustomJson "tokens" "transfer" {| ``to`` = transferTo;symbol = tokenSymbol;quantity = String.asString tokenBalance; memo = memo|}
-        |> buildCustomJson username "ssc-mainnet-hive" 
+        |> buildActiveKeyedCustomJson username "ssc-mainnet-hive" 
         |> scheduleActiveOperation ModuleName tokenSymbol 
         |> withResult entity 
     else 

diff --git a/src/Functional.UniversalBot.Plugin.HiveEngine/Actions/UndelegateStake.fs b/src/Functional.UniversalBot.Plugin.HiveEngine/Actions/UndelegateStake.fs
@@ -20,7 +20,7 @@ let action tokenSymbol undelegateFrom amountCalcualtor username (entity: Pipelin
     if tokenBalance > 0M
     then
         bindCustomJson "tokens" "undelegate" {|from = undelegateFrom;symbol = tokenSymbol;quantity = String.asStringWithPrecision tokenBalance|}
-        |> buildCustomJson username "ssc-mainnet-hive" 
+        |> buildActiveKeyedCustomJson username "ssc-mainnet-hive" 
         |> scheduleActiveOperation ModuleName tokenSymbol 
         |> withResult entity 
     else 

diff --git a/src/Functional.UniversalBot.Plugin.HiveEngine/Actions/UnstakeToken.fs b/src/Functional.UniversalBot.Plugin.HiveEngine/Actions/UnstakeToken.fs
@@ -19,7 +19,7 @@ let action tokenSymbol amountCalcualtor username (entity: PipelineProcessData<Un
     if tokenBalance > 0M
     then 
         bindCustomJson "tokens" "unstake" {|symbol = tokenSymbol;quantity = String.asString tokenBalance|}
-        |> buildCustomJson username "ssc-mainnet-hive" 
+        |> buildActiveKeyedCustomJson username "ssc-mainnet-hive" 
         |> scheduleActiveOperation ModuleName tokenSymbol 
         |> withResult entity 
     else 

diff --git a/src/Functional.UniversalBot.Plugin.Terracore/Actions/TerracoreClaim.fs b/src/Functional.UniversalBot.Plugin.Terracore/Actions/TerracoreClaim.fs
@@ -24,7 +24,7 @@ let action amountCalcualtor username (entity: PipelineProcessData<UniversalHiveB
     if scrapBalance > 0M
     then 
         {| ``tx-hash`` = String.generateRandomString 22;amount = String.asString scrapBalance |}
-        |> buildCustomJson username "terracore_claim" 
+        |> buildPostingKeyedCustomJson username "terracore_claim" 
         |> schedulePostingOperation ModuleName tokenSymbol
         |> withResult entity 
     else