update txjammer (#1021)

tools/txJammer/README.md

@@ -27,7 +27,7 @@ Options:
   -w2, --wallet2 <file>            you must send in a json wallet
   -p2, --password2 <password>      you must send in a password for wallet 2
   -d, --durationSeconds <number>   the seconds you want to run the txJammer for
-  -p, --pauseTimeSeconds <number>  the seconds you want to pause between actions
+  -p, --pauseTimeMSeconds <number>  the seconds you want to pause between actions
   -u, --txAmountInUsd <min-max>    the value of each tx in USD terms
   -s, --configActions <config>     custom action configuration
   -s, --configSwap <config>        custom swap configuration
@@ -46,7 +46,7 @@ Runs random txs with a monetary value between 1-3 USD for 60 secs with a pause b
 yarn ts-node txJammerCommander.ts \
  --wallet1 ./keystore1.txt --password1 123 \
  --wallet2 ./keystore2.txt --password2 123 \
- --durationSeconds 60 --pauseTimeSeconds 2 \
+ --durationSeconds 60 --pauseTimeMSeconds 2 \
  --txAmountInUsd 1-3 \
  --estimateOnly
 ```
@@ -72,7 +72,7 @@ Additionally, a specfic **Swap Config** specified with --configSwap, specifies t
 yarn ts-node txJammerCommander.ts \
  --wallet1 ./keystore1.txt --password1 123 \
  --wallet2 ./keystore2.txt --password2 123 \
- --durationSeconds 60 --pauseTimeSeconds 2 \
+ --durationSeconds 60 --pauseTimeMSeconds 2 \
  --txAmountInUsd 1-3 \
  --estimateOnly \
  --configActions "transfer 500, addLp 0, withdrawLp 0, swap 300" \
@@ -105,7 +105,7 @@ Additionally, a specfic **WithdrawLP Config** specified with --configWithdrawLp,
 yarn ts-node txJammerCommander.ts \
  --wallet1 ./keystore1.txt --password1 123 \
  --wallet2 ./keystore2.txt --password2 123 \
- --durationSeconds 60 --pauseTimeSeconds 2 \
+ --durationSeconds 60 --pauseTimeMSeconds 2 \
  --txAmountInUsd 1-3 \
  --estimateOnly \
  --configTransfer "BNB.BNB 300, BCH.BCH 200, * 50" \

tools/txJammer/package.json

@@ -27,8 +27,8 @@
     "@xchainjs/xchain-ethereum": "file:../../packages/xchain-ethereum",
     "@xchainjs/xchain-litecoin": "file:../../packages/xchain-litecoin",
     "@xchainjs/xchain-midgard": "file:../../packages/xchain-midgard",
-    "@xchainjs/xchain-thorchain": "file:../../packages/xchain-thorchain",
-    "@xchainjs/xchain-thorchain-amm": "file:../../packages/xchain-thorchain-amm",
+    "@xchainjs/xchain-thorchain": "0.28.17",
+    "@xchainjs/xchain-thorchain-amm": "0.8.18",
     "@xchainjs/xchain-thornode": "file:../../packages/xchain-thornode",
     "@xchainjs/xchain-util": "file:../../packages/xchain-util",
     "@xchainjs/xchain-avax": "file:../../packages/xchain-avax",
@@ -67,4 +67,4 @@
     "tslib": "^2.1.0",
     "typescript": "^4.2.3"
   }
-}
+}

tools/txJammer/txJammer.ts

@@ -55,7 +55,7 @@ export class TxJammer {
   private minAmount: number
   private maxAmount: number
   private durationSeconds: number
-  private pauseTimeSeconds: number
+  private pauseTimeMSeconds: number
 
   private keystore1FilePath: string
   private keystore1Password: string
@@ -75,7 +75,7 @@ export class TxJammer {
     minAmount: number,
     maxAmount: number,
     durationSeconds: number,
-    pauseTimeSeconds: number,
+    pauseTimeMSeconds: number,
     keystore1FilePath: string,
     keystore1Password: string,
     keystore2FilePath: string,
@@ -90,7 +90,7 @@ export class TxJammer {
     this.minAmount = minAmount
     this.maxAmount = maxAmount
     this.durationSeconds = durationSeconds
-    this.pauseTimeSeconds = pauseTimeSeconds
+    this.pauseTimeMSeconds = pauseTimeMSeconds
 
     this.keystore1FilePath = keystore1FilePath
     this.keystore1Password = keystore1Password
@@ -120,7 +120,6 @@ export class TxJammer {
 
     this.wallet1 = new Wallet(phrase1, this.thorchainQuery)
     this.wallet2 = new Wallet(phrase2, this.thorchainQuery)
-
     this.pools = await this.thorchainCache.getPools()
     this.setupWeightedActions()
     await this.setupWeightedChoices()
@@ -156,6 +155,7 @@ export class TxJammer {
       assetsIncludingSynths.push(asset)
       assetsIncludingSynths.push(assetToString(synth))
     }
+    assetsIncludingSynths.push('THOR.RUNE') // add rune to the list of assets
     this.setupWeightedSwaps(assetsIncludingSynths)
     this.setupWeightedTransfers(assetsIncludingSynths)
     this.setupWeightedAddLps(assets)
@@ -264,7 +264,7 @@ export class TxJammer {
       const action = weighted.select(this.weightedActions) as string
       console.log(`executing ${action}..`)
       await this.executeAction(action)
-      await delay(this.pauseTimeSeconds * 1000)
+      await delay(this.pauseTimeMSeconds)
       currentTime = new Date()
     }
     await this.writeToFile()

tools/txJammer/txJammerCommander.ts

@@ -122,7 +122,11 @@ program.requiredOption('-p1, --password1 <password>', 'you must send in a passwo
 program.requiredOption('-w2, --wallet2 <file> ', 'you must send in a json wallet ')
 program.requiredOption('-p2, --password2 <password>', 'you must send in a password for wallet 2')
 program.requiredOption('-d, --durationSeconds <number>', 'the seconds you want to run the txJammer for', parseInteger)
-program.requiredOption('-p, --pauseTimeSeconds <number>', 'the seconds you want to pause between actions', parseInteger)
+program.requiredOption(
+  '-p, --pauseTimeMSeconds <number>',
+  'the miliseconds you want to pause between actions',
+  parseInteger,
+)
 program.requiredOption('-u, --txAmountInUsd <min-max>', 'the value of each tx in USD terms', parseMinMaxAmounts)
 program.option('-s, --configActions <config>', 'custom action configuration ', parseCustomActions)
 program.option('-s, --configSwap <config>', 'custom swap configuration ', parseCustomSwap)
@@ -140,7 +144,7 @@ const txJammer = new TxJammer(
   Number(options.txAmountInUsd[0]),
   Number(options.txAmountInUsd[1]),
   Number(options.durationSeconds),
-  options.pauseTimeSeconds,
+  options.pauseTimeMSeconds,
   options.wallet1,
   options.password1,
   options.wallet2,