Merge pull request #85 from mars-protocol/public/latest-master

Move latest public master changes

Author: piobab

Cargo.lock

@@ -38,13 +38,13 @@ members  = [
 ]
 
 [workspace.package]
-version       = "2.0.0"
+version       = "2.1.0"
 authors       = [
-  "Gabe R. <[email protected]>",
-  "Larry Engineer <[email protected]>",
-  "Piotr B. <[email protected]>",
+  "Piotr B. <[email protected]>",
   "Bob v.d. H. <[email protected]>",
   "Mark Watney <[email protected]>",
+  "Gabe R. <[email protected]>",
+  "Larry Engineer <[email protected]>",
   "Spike Spiegel <[email protected]>",
   "Brianna M. <[email protected]>",
   "Ahmad Kaouk",
@@ -64,8 +64,8 @@ apollo-utils       = "0.1.2"
 astroport          = "2.8.0"
 astroport-v5       = { package = "astroport", version = "5.2.0" }
 bech32             = "0.11.0"
-cosmwasm-schema    = "1.5.5"
-cosmwasm-std       = "1.5.5"
+cosmwasm-schema    = "1.5.7"
+cosmwasm-std       = "1.5.7"
 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"] }

Cargo.toml

@@ -10,10 +10,10 @@ default_to_workspace = false
 # Directory with wasm files used by integration tests (another directory can be used instead, for example 'artifacts' from rust-optimizer)
 ARTIFACTS_DIR_PATH = "target/wasm32-unknown-unknown/release"
 # If you bump this version, verify RUST_VERSION correctness
-RUST_OPTIMIZER_VERSION = "0.15.1"
-# Use rust version from rust-optimizer Dockerfile (see https://github.com/CosmWasm/optimizer/blob/v0.15.1/Dockerfile#L1)
+RUST_OPTIMIZER_VERSION = "0.16.0"
+# Use rust version from rust-optimizer Dockerfile (see https://github.com/CosmWasm/optimizer/blob/v0.16.0/Dockerfile#L1)
 # to be sure that we compile / test against the same version
-RUST_VERSION = "1.75.0"
+RUST_VERSION = "1.78.0"
 
 [tasks.install-stable]
 script = '''

Makefile.toml

@@ -174,43 +174,21 @@ cargo make test
 | mars-swapper           | [`osmo1wee0z8c7tcawyl647eapqs4a88q8jpa7ddy6nn2nrs7t47p2zhxswetwla`][20] | [`v2.0.7`][50] |
 | mars-zapper            | [`osmo17qwvc70pzc9mudr8t02t3pl74hhqsgwnskl734p4hug3s8mkerdqzduf7c`][21] | [`v2.0.0`][43] |
 
-### devnet (Osmosis)
-
-| Contract               | Address                                                                 |
-| ---------------------- | ----------------------------------------------------------------------- |
-| mars-address-provider  | [`osmo1g677w7mfvn78eeudzwylxzlyz69fsgumqrscj6tekhdvs8fye3asufmvxr`][11] |
-| mars-account-nft       | [`osmo1450hrg6dv2l58c0rvdwx8ec2a0r6dd50hn4frk370tpvqjhy8khqw7sw09`][12] |
-| mars-credit-manager    | [`osmo1f2m24wktq0sw3c0lexlg7fv4kngwyttvzws3a3r3al9ld2s2pvds87jqvf`][13] |
-| mars-health            | [`osmo1kqzkuyh23chjwemve7p9t7sl63v0sxtjh84e95w4fdz3htg8gmgspua7q4`][22] |
-| mars-incentives        | [`osmo1nkahswfr8shg8rlxqwup0vgahp0dk4x8w6tkv3rra8rratnut36sk22vrm`][15] |
-| mars-oracle            | [`osmo1mhznfr60vjdp2gejhyv2gax9nvyyzhd3z0qcwseyetkfustjauzqycsy2g`][16] |
-| mars-params            | [`osmo1aye5qcer5n52crrkaf35jprsad2807q6kg3eeeu7k79h4slxfausfqhc9y`][23] |
-| mars-red-bank          | [`osmo1c3ljch9dfw5kf52nfwpxd2zmj2ese7agnx0p9tenkrryasrle5sqf3ftpg`][18] |
-| mars-rewards-collector | [`osmo1urvqe5mw00ws25yqdd4c4hlh8kdyf567mpcml7cdve9w08z0ydcqvsrgdy`][19] |
-| mars-swapper           | [`osmo1wee0z8c7tcawyl647eapqs4a88q8jpa7ddy6nn2nrs7t47p2zhxswetwla`][20] |
-| mars-zapper            | [`osmo17qwvc70pzc9mudr8t02t3pl74hhqsgwnskl734p4hug3s8mkerdqzduf7c`][21] |
-
 ### neutron-1
 
 | Contract                  | Address                                                                    | Tag
 | ------------------------- | -------------------------------------------------------------------------- | --------------
-| mars-address-provider     | [`neutron17yehp4x7n79zq9dlw4g7xmnrvwdjjj2yecq26844sg8yu74knlxqfx5vqv`][24] | [`v1.2.0`][44] |
-| mars-incentives           | [`neutron1aszpdh35zsaz0yj80mz7f5dtl9zq5jfl8hgm094y0j0vsychfekqxhzd39`][25] | [`v1.2.0`][44] |
-| mars-oracle               | [`neutron1dwp6m7pdrz6rnhdyrx5ha0acsduydqcpzkylvfgspsz60pj2agxqaqrr7g`][26] | [`v1.3.0`][51] |
-| mars-red-bank             | [`neutron1n97wnm7q6d2hrcna3rqlnyqw2we6k0l8uqvmyqq6gsml92epdu7quugyph`][27] | [`v1.2.2`][48] |
-| mars-rewards-collector    | [`neutron1h4l6rvylzcuxwdw3gzkkdzfjdxf4mv2ypfdgvnvag0dtz6x07gps6fl2vm`][28] | [`v1.2.0`][44] |
-| mars-swapper              | [`neutron1udr9fc3kd743dezrj38v2ac74pxxr6qsx4xt4nfpcfczgw52rvyqyjp5au`][29] | [`v1.2.0`][44] |
-
-### pion-1 (Neutron)
-
-| Contract                  | Address                                                                    |
-| ------------------------- | -------------------------------------------------------------------------- |
-| mars-address-provider     | [`neutron187fjlesys2c0z7xzhu43we4rx7tc4twnr5m6r2u7u5hpm03wvjqs0gk2lp`][30] |
-| mars-incentives           | [`neutron187hw8pqfhmxt4tk9star7tkjhu438k566jtgjskz4889pndp2vysh73ezh`][31] |
-| mars-oracle               | [`neutron1g4samkydfdyjec424ccucvjcuuls0ql8mfp2glf739mg0uqr74yqhdx9kn`][32] |
-| mars-red-bank             | [`neutron15dn9w9vcdkpp2kfjuz4suqh2w8ajyqsgujlykm9x58hsjss5ff7qpmhlln`][33] |
-| mars-rewards-collector    | [`neutron1re4v85k6kr8r7f3j4s4vrk3dvlyefc3xeg7jetv2jlpskahs5xrs8d6vw5`][34] |
-| mars-swapper              | [`neutron16xdh5w4dynfjrvnfuhv9h2znks94fyt4gp448jhtmjs3xd6smjvqumh9x2`][35] |
+| mars-address-provider     | [`neutron17yehp4x7n79zq9dlw4g7xmnrvwdjjj2yecq26844sg8yu74knlxqfx5vqv`][24] | [`v2.1.0`][57] |
+| mars-account-nft          | [`neutron184kvu96rqtetmunkkmhu5hru8yaqg7qfhd8ldu5avjnamdqu69squrh3f5`][52] | [`v2.1.0`][57] |
+| mars-credit-manager       | [`neutron1qdzn3l4kn7gsjna2tfpg3g3mwd6kunx4p50lfya59k02846xas6qslgs3r`][53] | [`v2.1.0`][57] |
+| mars-health               | [`neutron17ktfwsr7ghlxzzma0gw0hke3j3rnssd58q87jv2wzfrk6uhawa3sv8xxtm`][54] | [`v2.1.0`][57] |
+| mars-incentives           | [`neutron1aszpdh35zsaz0yj80mz7f5dtl9zq5jfl8hgm094y0j0vsychfekqxhzd39`][25] | [`v2.1.0`][57] |
+| mars-oracle               | [`neutron1dwp6m7pdrz6rnhdyrx5ha0acsduydqcpzkylvfgspsz60pj2agxqaqrr7g`][26] | [`v2.1.0`][57] |
+| mars-params               | [`neutron1x4rgd7ry23v2n49y7xdzje0743c5tgrnqrqsvwyya2h6m48tz4jqqex06x`][55] | [`v2.1.0`][57] |
+| mars-red-bank             | [`neutron1n97wnm7q6d2hrcna3rqlnyqw2we6k0l8uqvmyqq6gsml92epdu7quugyph`][27] | [`v2.1.0`][57] |
+| mars-rewards-collector    | [`neutron1h4l6rvylzcuxwdw3gzkkdzfjdxf4mv2ypfdgvnvag0dtz6x07gps6fl2vm`][28] | [`v2.1.0`][57] |
+| mars-swapper              | [`neutron1udr9fc3kd743dezrj38v2ac74pxxr6qsx4xt4nfpcfczgw52rvyqyjp5au`][29] | [`v2.1.0`][57] |
+| mars-zapper               | [`neutron1dr0ckm3u2ztjuscmgqjr85lwyduphxkgl3tc02ac8zp54r05t5dqp5tgyq`][56] | [`v2.1.0`][57] |
 
 ### mars-1
 
@@ -252,12 +230,6 @@ Contents of this repository are open source under [GNU General Public License v3
 [27]: https://neutron.celat.one/neutron-1/contracts/neutron1n97wnm7q6d2hrcna3rqlnyqw2we6k0l8uqvmyqq6gsml92epdu7quugyph
 [28]: https://neutron.celat.one/neutron-1/contracts/neutron1h4l6rvylzcuxwdw3gzkkdzfjdxf4mv2ypfdgvnvag0dtz6x07gps6fl2vm
 [29]: https://neutron.celat.one/neutron-1/contracts/neutron1udr9fc3kd743dezrj38v2ac74pxxr6qsx4xt4nfpcfczgw52rvyqyjp5au
-[30]: https://neutron.celat.one/pion-1/contracts/neutron187fjlesys2c0z7xzhu43we4rx7tc4twnr5m6r2u7u5hpm03wvjqs0gk2lp
-[31]: https://neutron.celat.one/pion-1/contracts/neutron187hw8pqfhmxt4tk9star7tkjhu438k566jtgjskz4889pndp2vysh73ezh
-[32]: https://neutron.celat.one/pion-1/contracts/neutron1g4samkydfdyjec424ccucvjcuuls0ql8mfp2glf739mg0uqr74yqhdx9kn
-[33]: https://neutron.celat.one/pion-1/contracts/neutron15dn9w9vcdkpp2kfjuz4suqh2w8ajyqsgujlykm9x58hsjss5ff7qpmhlln
-[34]: https://neutron.celat.one/pion-1/contracts/neutron1re4v85k6kr8r7f3j4s4vrk3dvlyefc3xeg7jetv2jlpskahs5xrs8d6vw5
-[35]: https://neutron.celat.one/pion-1/contracts/neutron16xdh5w4dynfjrvnfuhv9h2znks94fyt4gp448jhtmjs3xd6smjvqumh9x2
 [36]: https://www.mintscan.io/mars-protocol/accounts/mars17xpfvakm2amg962yls6f84z3kell8c5ldy6e7x
 [37]: https://www.mintscan.io/mars-protocol/accounts/mars1s4hgh56can3e33e0zqpnjxh0t5wdf7u3pze575
 [38]: https://go.dev/
@@ -274,3 +246,9 @@ Contents of this repository are open source under [GNU General Public License v3
 [49]: https://github.com/mars-protocol/contracts/releases/tag/v2.0.5
 [50]: https://github.com/mars-protocol/contracts/releases/tag/v2.0.7
 [51]: https://github.com/mars-protocol/contracts/releases/tag/v1.3.0
+[52]: https://neutron.celat.one/neutron-1/contracts/neutron184kvu96rqtetmunkkmhu5hru8yaqg7qfhd8ldu5avjnamdqu69squrh3f5
+[53]: https://neutron.celat.one/neutron-1/contracts/neutron1qdzn3l4kn7gsjna2tfpg3g3mwd6kunx4p50lfya59k02846xas6qslgs3r
+[54]: https://neutron.celat.one/neutron-1/contracts/neutron17ktfwsr7ghlxzzma0gw0hke3j3rnssd58q87jv2wzfrk6uhawa3sv8xxtm
+[55]: https://neutron.celat.one/neutron-1/contracts/neutron1x4rgd7ry23v2n49y7xdzje0743c5tgrnqrqsvwyya2h6m48tz4jqqex06x
+[56]: https://neutron.celat.one/neutron-1/contracts/neutron1dr0ckm3u2ztjuscmgqjr85lwyduphxkgl3tc02ac8zp54r05t5dqp5tgyq
+[57]: https://github.com/mars-protocol/contracts/releases/tag/v2.1.0

README.md

@@ -36,5 +36,4 @@ cw-multi-test            = { workspace = true }
 mars-mock-credit-manager = { workspace = true }
 mars-mock-rover-health   = { workspace = true }
 mars-owner               = { workspace = true }
-proptest                 = { workspace = true }
 serde_json               = { workspace = true }

contracts/account-nft/Cargo.toml

@@ -5,12 +5,11 @@ use cosmwasm_std::{
 };
 use cw2::set_contract_version;
 use cw721_base::Cw721Contract;
-use mars_types::account_nft::{ExecuteMsg, InstantiateMsg, MigrateV1ToV2, NftConfig, QueryMsg};
+use mars_types::account_nft::{ExecuteMsg, InstantiateMsg, NftConfig, QueryMsg};
 
 use crate::{
     error::ContractError,
     execute::{burn, mint, update_config},
-    migrations::{self},
     query::{query_config, query_next_id},
     state::{CONFIG, NEXT_ID},
 };
@@ -61,19 +60,13 @@ pub fn execute(
     match msg {
         ExecuteMsg::Mint {
             user,
-            token_id,
-        } => mint(deps, info, &user, token_id),
+        } => mint(deps, info, &user),
         ExecuteMsg::UpdateConfig {
             updates,
         } => update_config(deps, info, updates),
         ExecuteMsg::Burn {
             token_id,
         } => burn(deps, env, info, token_id),
-        ExecuteMsg::Migrate(msg) => match msg {
-            MigrateV1ToV2::BurnEmptyAccounts {
-                limit,
-            } => migrations::v2_0_0::burn_empty_accounts(deps, limit),
-        },
         _ => Parent::default().execute(deps, env, info, msg.try_into()?).map_err(Into::into),
     }
 }
@@ -86,8 +79,3 @@ pub fn query(deps: Deps, env: Env, msg: QueryMsg) -> StdResult<Binary> {
         _ => Parent::default().query(deps, env, msg.try_into()?),
     }
 }
-
-#[cfg_attr(not(feature = "library"), entry_point)]
-pub fn migrate(deps: DepsMut, _env: Env, _msg: Empty) -> Result<Response, ContractError> {
-    migrations::v2_0_0::migrate(deps)
-}

contracts/account-nft/src/contract.rs

@@ -26,9 +26,4 @@ pub enum ContractError {
 
     #[error("{0}")]
     Version(#[from] cw2::VersionError),
-
-    #[error("Invalid token_id: {reason}")]
-    InvalidTokenId {
-        reason: String,
-    },
 }

contracts/account-nft/src/error.rs

@@ -18,26 +18,14 @@ use crate::{
     error::ContractError::{
         self, BaseError, BurnNotAllowed, CreditManagerContractNotSet, HealthContractNotSet,
     },
-    helpers::validate_token_id,
     state::{CONFIG, NEXT_ID},
 };
 
-pub fn mint(
-    deps: DepsMut,
-    info: MessageInfo,
-    user: &str,
-    token_id: Option<String>,
-) -> Result<Response, ContractError> {
-    let next_id = if let Some(ti) = token_id {
-        validate_token_id(&ti)?;
-        ti
-    } else {
-        let next_id = NEXT_ID.load(deps.storage)?;
-        NEXT_ID.save(deps.storage, &(next_id + 1))?;
-        next_id.to_string()
-    };
+pub fn mint(deps: DepsMut, info: MessageInfo, user: &str) -> Result<Response, ContractError> {
+    let next_id = NEXT_ID.load(deps.storage)?;
+    NEXT_ID.save(deps.storage, &(next_id + 1))?;
     Parent::default()
-        .mint(deps, info, next_id, user.to_string(), None, Empty {})
+        .mint(deps, info, next_id.to_string(), user.to_string(), None, Empty {})
         .map_err(Into::into)
 }
 

contracts/account-nft/src/execute.rs

@@ -1,7 +1,5 @@
 pub mod contract;
 pub mod error;
 pub mod execute;
-mod helpers;
-pub mod migrations;
 pub mod query;
 pub mod state;