update to v2.3.0 (#134)

* update to v2.3.0

* fix package.json

Author: markonmars

package.json

@@ -35,17 +35,17 @@
 		"csv-writer": "^1.6.0",
 		"dotenv": "^16.0.2",
 		"lodash": "^4.17.21",
-		"mars-liquidation-node": "1.0.0",
-		"mars-rover-health-computer-node": "2.2.0",
-		"marsjs-types": "2.0.2",
+		"marsjs-types": "2.3.0",
 		"osmojs": "^16.5.1",
 		"prom-client": "^15.1.3",
 		"redis": "^4.3.0",
 		"request": "^2.88.2",
 		"requests": "^0.3.0",
 		"ts-jest": "^29.2.5",
 		"ts-node": "^10.9.1",
-		"uuid": "^9.0.0"
+		"uuid": "^9.0.0",
+		"mars-rover-health-computer-node": "2.3.0-node",
+		"mars-liquidation": "2.3.0"
 	},
 	"devDependencies": {
 		"@babel/core": "^7.21.0",

src/rover/ActionGenerator.ts

@@ -19,7 +19,7 @@ import {
 	LiquidationAmountInputs,
 	calculate_liquidation_amounts_js,
 	HealthData,
-} from 'mars-liquidation-node'
+} from 'mars-liquidation'
 import { AssetParamsBaseForAddr } from 'marsjs-types/mars-params/MarsParams.types.js'
 
 const MAX_DEBT_AMOUNT = 1000000000

src/rover/RoverExecutor.ts

@@ -26,7 +26,7 @@ import { RouteRequester } from '../query/routing/RouteRequesterInterface'
 import { compute_health_js, HealthComputer } from 'mars-rover-health-computer-node'
 import { TokensResponse } from 'marsjs-types/mars-account-nft/MarsAccountNft.types'
 import { ChainQuery } from '../query/chainQuery'
-import { HealthData } from 'mars-liquidation-node'
+import { HealthData } from 'mars-liquidation'
 
 interface CreateCreditAccountResponse {
 	tokenId: number

test/rover/mocks/stateMock.ts

@@ -15,7 +15,7 @@ import {
 	PerpParams,
 	RedBankSettings,
 } from 'marsjs-types/mars-params/MarsParams.types'
-import { HealthData, HealthValuesResponse } from 'mars-liquidation-node'
+import { HealthData, HealthValuesResponse } from 'mars-liquidation'
 import { compute_health_js, HealthComputer } from 'mars-rover-health-computer-node'
 
 export class StateMock {
@@ -152,6 +152,13 @@ export const defaultAssetParams: AssetParamsBaseForAddr = {
 	credit_manager: defaultCmSettingsForAddr,
 	denom: 'uatom',
 	deposit_cap: '100000000000',
+	interest_rate_model: {
+		base: '0',
+		optimal_utilization_rate: '0.85',
+		slope_1: '0.1',
+		slope_2: '1.2',
+	},
+	reserve_factor: '0.1',
 	liquidation_bonus: defaultLiquidationBonus,
 	liquidation_threshold: '0.85',
 	max_loan_to_value: '0.8',

yarn.lock

@@ -5186,18 +5186,23 @@ map-obj@^4.3.0:
 
 mars-liquidation-node@1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/mars-liquidation-node/-/mars-liquidation-node-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/mars-liquidation-node/-/mars-liquidation-node-1.0.0.tgz#3751c4f1271b38dbd8f72ba8709291740ccc5427"
   integrity sha512-dSfUUvENgdFN1lsLOVOlzc7X9A3kf1evBggy5vscvE9ugtGRMqa/tLhM3DwVajilc6hE0J5KQ/5OEc6CWYZF6A==
 
-mars-rover-health-computer-node@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/mars-rover-health-computer-node/-/mars-rover-health-computer-node-2.2.0.tgz"
-  integrity sha512-wPJHY/E7jIURgfNkokTUR25fax7jd9+ew0gLht/BDLPPjQQtWRwthD1y8Le0t0AUq5/77tRLdeBM6wTjM5EBDA==
+mars-liquidation@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/mars-liquidation/-/mars-liquidation-2.3.0.tgz#09eb2a7d650033eec5f1a2c4c0cdb6f196469651"
+  integrity sha512-IueJ7rHFLcod+dmT9olyxKMqqKAY6tdrIArtK5PhHCbHAGvCrEr7+qtkYAASktiWv10dDbzO9VmvwZ0wiIMcOQ==
 
-marsjs-types@2.0.2:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/marsjs-types/-/marsjs-types-2.0.2.tgz"
-  integrity sha512-cMGolNdcAAH+jR2azOeQGrvIoGnuIWPKUZsAJrZNXAjowqDzn7wupAtsTlFGqHwtAhM0jjktsSoTOd4+DhYvOw==
+mars-rover-health-computer-node@2.3.0-node:
+  version "2.3.0-node"
+  resolved "https://registry.yarnpkg.com/mars-rover-health-computer-node/-/mars-rover-health-computer-node-2.3.0-node.tgz#385f926eb106bca8cba9e715a341f8de05b1fd23"
+  integrity sha512-dZSE8JTV7tvLgqna7HvZiSoAQyfktlNbfeVN3rJrM4Wtv9as0ghYLzYOr3o5ZzUB0NdU6ZrWm8Knewrf8t01rQ==
+
+marsjs-types@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/marsjs-types/-/marsjs-types-2.3.0.tgz#7bd7a7ed5833f38a590d9a14df83376d1f19174e"
+  integrity sha512-pRvGzU/l2yPtkeHYvBuoZlipLiMHsK31BtpcRXGkHL7yFnsZ7p9zK0I7QJBdhDAYBGgqzOcRWEwf91bGaD8yJw==
   dependencies:
     "@cosmjs/amino" "^0.29.4"