General cleanup (#398)

* Clean fixme. * Bump JS deps. * Fix deployment. * Bump cw deps.
mars-protocol · Jun 5, 2024 · 9572675 · 9572675
1 parent 96715dd
commit 9572675
Show file tree

Hide file tree

Showing 79 changed files with 3,614 additions and 2,750 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -55,15 +55,15 @@ documentation = "https://docs.marsprotocol.io/"
 keywords      = ["mars", "cosmos", "cosmwasm"]
 
 [workspace.dependencies]
-anyhow             = "1.0.80"
+anyhow             = "1.0.86"
 apollo-cw-asset    = { version = "0.1.2", features = ["astroport"] }
 apollo-utils       = "0.1.2"
 astroport          = "2.8.0"
 # TODO: update with official release once ready
 astroport-v5       = { package = "astroport", version = "=5.0.0-rc.1-tokenfactory" }
-bech32             = "0.9.1"
-cosmwasm-schema    = "1.5.3"
-cosmwasm-std       = "1.5.4"
+bech32             = "0.11.0"
+cosmwasm-schema    = "1.5.5"
+cosmwasm-std       = "1.5.5"
 cw2                = "1.1.2"
 cw721              = { git = "https://github.com/CosmWasm/cw-nfts/", branch = "main" }
 cw721-base         = { git = "https://github.com/CosmWasm/cw-nfts/", branch = "main", features = ["library"] }
@@ -73,22 +73,22 @@ cw-storage-plus    = "1.2.0"
 cw-utils           = "1.0.3"
 cw-vault-standard  = { version = "0.4.0", features = ["lockup", "force-unlock"] }
 ica-oracle         = { git = "https://github.com/Stride-Labs/ica-oracle", rev = "2fdf76f", features = ["library"] }
-itertools          = "0.12.1"
+itertools          = "0.13.0"
 mars-owner         = { version = "2.0.0", features = ["emergency-owner"] }
-neutron-sdk        = "0.8.0"
+neutron-sdk        = "0.10.0"
 osmosis-std        = "0.22.0"
-prost              = { version = "0.12.3", default-features = false }
+prost              = { version = "0.12.6", default-features = false }
 pyth-sdk-cw        = "1.2.0"
 regex              = "1.10.4"
-schemars           = "0.8.16"
-serde              = { version = "1.0.197", default-features = false }
-serde_json         = "1.0.114"
+schemars           = "0.8.21"
+serde              = { version = "1.0.203", default-features = false }
+serde_json         = "1.0.117"
 serde-json-wasm    = "1.0.1"
-serde-wasm-bindgen = "0.6.4"
-strum              = "0.26.1"
-thiserror          = "1.0.57"
+serde-wasm-bindgen = "0.6.5"
+strum              = "0.26.2"
+thiserror          = "1.0.61"
 tsify              = "0.4.5"
-wasm-bindgen       = "0.2.91"
+wasm-bindgen       = "0.2.92"
 
 # dev-dependencies
 cw-multi-test     = { version = "0.20.0", features = ["cosmwasm_1_1"] }

diff --git a/scripts/deploy/addresses/pion-1-deployer-owner.json b/scripts/deploy/addresses/pion-1-deployer-owner.json
@@ -1,8 +1,13 @@
 {
-  "address-provider": "neutron187fjlesys2c0z7xzhu43we4rx7tc4twnr5m6r2u7u5hpm03wvjqs0gk2lp",
-  "red-bank": "neutron15dn9w9vcdkpp2kfjuz4suqh2w8ajyqsgujlykm9x58hsjss5ff7qpmhlln",
-  "incentives": "neutron187hw8pqfhmxt4tk9star7tkjhu438k566jtgjskz4889pndp2vysh73ezh",
-  "oracle": "neutron1g4samkydfdyjec424ccucvjcuuls0ql8mfp2glf739mg0uqr74yqhdx9kn",
-  "rewards-collector": "neutron1re4v85k6kr8r7f3j4s4vrk3dvlyefc3xeg7jetv2jlpskahs5xrs8d6vw5",
-  "swapper": "neutron16xdh5w4dynfjrvnfuhv9h2znks94fyt4gp448jhtmjs3xd6smjvqumh9x2"
+  "addressProvider": "neutron1flekqdht5rsvad7pa67ndfr29xzzc735xvgq7u0hyu0nza4rad9qzxjgsz",
+  "redBank": "neutron1gstclf8hp7t9njzv5czl8c206ax0p4zkqfvwnv62hz3y3666dqysff33g8",
+  "incentives": "neutron1m2qf6c27m7qgdfdszu89zm69p5l57x0s4ryk9f9fems5pcuxwfvq3gjdd8",
+  "oracle": "neutron13vmzg7z402tc2xhesgf9afzmme4nfz059w7ejcftxvafkwzmwxxq5286nu",
+  "rewardsCollector": "neutron1x3xhqku3uymfztjxxh4ygneknyj68q4gapcvt3fnsv4rmjm60e2seypse0",
+  "swapper": "neutron1hka6ejaxdnwaz2rk2l7ysscn0lyzqe3ugljtcrd0lfkx7fthy03qe67kv4",
+  "params": "neutron1u9ahluvknuhvz3ptmlq6a5yvdzw76px04x92gq6sxqn2gy4kfvmsyl0jp4",
+  "zapper": "neutron1xkpakdplj6mrw7m87c0ysehtfqd4es4sk0d3y79r0vhtm3skzecsp7tv55",
+  "health": "neutron1d76ke6a2yz2tgqs4qgq64zg7yxfg438dnpgqcah9565mgqw5rusqdm0y6t",
+  "creditManager": "neutron1sw2t0pfwpuu56p674qyu2qd76q828tgkg43w40yxsdp0z92ug57sfe3emf",
+  "accountNft": "neutron1xf7wjf4ku3lek3s86ptaknt8u3cd7arcgvrkh602r35hhx9xxyjsm59l88"
 }
diff --git a/scripts/deploy/base/deployer.ts b/scripts/deploy/base/deployer.ts
@@ -1,6 +1,7 @@
 import { SigningCosmWasmClient } from '@cosmjs/cosmwasm-stargate'
 import {
   AssetConfig,
+  AstroportConfig,
   DeploymentConfig,
   OracleConfig,
   SwapperExecuteMsg,
@@ -20,7 +21,10 @@ import {
   ExecuteMsg as CreditManagerExecute,
   InstantiateMsg as RoverInstantiateMsg,
 } from '../../types/generated/mars-credit-manager/MarsCreditManager.types'
-import { InstantiateMsg as AstroportSwapperInstantiateMsg } from '../../types/generated/mars-swapper-astroport/MarsSwapperAstroport.types'
+import {
+  InstantiateMsg as AstroportSwapperInstantiateMsg,
+  AstroportConfig as SwapperAstroportConfig,
+} from '../../types/generated/mars-swapper-astroport/MarsSwapperAstroport.types'
 import { InstantiateMsg as OsmosisSwapperInstantiateMsg } from '../../types/generated/mars-swapper-osmosis/MarsSwapperOsmosis.types'
 import { InstantiateMsg as ParamsInstantiateMsg } from '../../types/generated/mars-params/MarsParams.types'
 import { ExecuteMsg as ParamsExecuteMsg } from '../../types/generated/mars-params/MarsParams.types'
@@ -282,33 +286,6 @@ export class Deployer {
     )
   }
 
-  async grantCreditLines() {
-    if (this.storage.actions.grantedCreditLines) {
-      printGray('Credit lines already granted')
-      return
-    }
-
-    const wallet = await getWallet(this.config.deployerMnemonic, this.config.chain.prefix)
-    const client = await setupClient(this.config, wallet)
-    const addr = await getAddress(wallet)
-
-    for (const creditLineCoin of this.config.creditLineCoins) {
-      const msg = {
-        update_uncollateralized_loan_limit: {
-          user: this.storage.addresses.creditManager,
-          denom: creditLineCoin.denom,
-          new_limit: creditLineCoin.creditLine,
-        },
-      }
-      printBlue(
-        `Granting credit line to Rover for: ${creditLineCoin.creditLine} ${creditLineCoin.denom}`,
-      )
-      await client.execute(addr, this.storage.addresses.redBank!, msg, 'auto')
-    }
-
-    this.storage.actions.grantedCreditLines = true
-  }
-
   async updateCreditManagerOwner() {
     if (!this.config.multisigAddr) throw new Error('No multisig addresses to transfer ownership to')
 
@@ -531,6 +508,25 @@ export class Deployer {
     this.storage.actions.vaultsSet.push(vaultConfig.vault.addr)
   }
 
+  async updateSwapperAstroportConfig(config: AstroportConfig) {
+    printBlue(`Updating swapper astroport config...`)
+
+    const swapperConfig: SwapperAstroportConfig = {
+      router: config.router,
+      factory: config.factory,
+      oracle: this.storage.addresses.oracle!,
+    }
+
+    await this.cwClient.execute(
+      this.deployerAddr,
+      this.storage.addresses.swapper!,
+      { update_config: { config: swapperConfig } },
+      'auto',
+    )
+
+    printYellow(`Swapper astroport config updated.`)
+  }
+
   async setRoutes() {
     printBlue('Setting Swapper Routes')
     for (const route of this.config.swapper.routes) {

diff --git a/scripts/deploy/base/index.ts b/scripts/deploy/base/index.ts
@@ -15,16 +15,16 @@ export const taskRunner = async ({ config, label }: TaskRunnerProps) => {
     await deployer.assertDeployerBalance()
 
     // Upload contracts
-    await deployer.upload('redBank', 'mars_red_bank.wasm')
-    await deployer.upload('addressProvider', 'mars_address_provider.wasm')
-    await deployer.upload('incentives', 'mars_incentives.wasm')
-    await deployer.upload('oracle', `mars_oracle_${config.oracle.name}.wasm`)
+    await deployer.upload('redBank', wasmFile('mars_red_bank'))
+    await deployer.upload('addressProvider', wasmFile('mars_address_provider'))
+    await deployer.upload('incentives', wasmFile('mars_incentives'))
+    await deployer.upload('oracle', wasmFile(`mars_oracle_${config.oracle.name}`))
     await deployer.upload(
       'rewardsCollector',
-      `mars_rewards_collector_${config.rewardsCollector.name}.wasm`,
+      wasmFile(`mars_rewards_collector_${config.rewardsCollector.name}`),
     )
-    await deployer.upload('swapper', `mars_swapper_${config.swapper.name}.wasm`)
-    await deployer.upload('params', `mars_params.wasm`)
+    await deployer.upload('swapper', wasmFile(`mars_swapper_${config.swapper.name}`))
+    await deployer.upload('params', wasmFile(`mars_params`))
     await deployer.upload('accountNft', wasmFile('mars_account_nft'))
     await deployer.upload('mockVault', wasmFile('mars_mock_vault'))
     await deployer.upload('zapper', wasmFile(config.zapperContractName))
@@ -51,6 +51,10 @@ export const taskRunner = async ({ config, label }: TaskRunnerProps) => {
 
     await deployer.updateAddressProvider()
 
+    if (config.swapper.name == 'astroport') {
+      await deployer.updateSwapperAstroportConfig(config.astroportConfig!)
+    }
+
     // setup
     for (const asset of config.assets) {
       await deployer.updateAssetParams(asset)
@@ -64,8 +68,6 @@ export const taskRunner = async ({ config, label }: TaskRunnerProps) => {
     }
     await deployer.setRoutes()
 
-    await deployer.grantCreditLines()
-
     // Test basic user flows
     if (config.runTests && config.testActions) {
       await deployer.executeDeposit()

diff --git a/scripts/deploy/neutron/mainnet-config.ts b/scripts/deploy/neutron/mainnet-config.ts
@@ -75,8 +75,8 @@ export const atomOracle: OracleConfig = {
       price_feed_id: pythAtomID,
       denom_decimals: 6,
       max_staleness: 60,
-      max_confidence: '0.1', // FIXME: provide correct values
-      max_deviation: '0.1', // FIXME: provide correct values
+      max_confidence: '0.1',
+      max_deviation: '0.15',
     },
   },
 }
@@ -89,8 +89,8 @@ export const axlUSDCOracle: OracleConfig = {
       price_feed_id: pythUsdcID,
       denom_decimals: 6,
       max_staleness: 60,
-      max_confidence: '0.1', // FIXME: provide correct values
-      max_deviation: '0.1', // FIXME: provide correct values
+      max_confidence: '0.1',
+      max_deviation: '0.15',
     },
   },
 }

diff --git a/scripts/deploy/neutron/testnet-config.ts b/scripts/deploy/neutron/testnet-config.ts
@@ -9,7 +9,7 @@ const protocolAdminAddr = 'neutron1ke0vqqzyymlp5esr8gjwuzh94ysnpvj8er5hm7'
 
 const marsNeutronChannelId = 'channel-97'
 const chainId = 'pion-1'
-const rpcEndpoint = 'https://testnet-neutron-rpc.marsprotocol.io:443'
+const rpcEndpoint = 'https://rpc-palvus.pion-1.ntrn.tech'
 
 // Astroport configuration
 const astroportFactory = 'neutron1jj0scx400pswhpjes589aujlqagxgcztw04srynmhf0f6zplzn2qqmhwj7'
@@ -323,7 +323,7 @@ export const neutronTestnetConfig: DeploymentConfig = {
   feeCollectorAddr: feeCollectorAddr,
   chain: {
     baseDenom: 'untrn',
-    defaultGasPrice: 0.01,
+    defaultGasPrice: 0.02,
     id: chainId,
     prefix: 'neutron',
     rpcEndpoint: rpcEndpoint,
@@ -363,4 +363,8 @@ export const neutronTestnetConfig: DeploymentConfig = {
   assets: [ntrnAsset, atomAsset, axlUSDCAsset],
   vaults: [],
   oracleConfigs: [usdOracle, axlUSDCOracle, atomOracle, ntrnOracle],
+  astroportConfig: {
+    factory: astroportFactory,
+    router: astroportRouter,
+  },
 }