Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[audit] 8. Suboptimal storage update #867

Merged
merged 2 commits into from
Aug 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions contracts/external/cw-tokenfactory-issuer/tests/mod.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
// Ignore integration tests for code coverage since there will be problems with dynamic linking libosmosistesttube
// and also, tarpaulin will not be able read coverage out of wasm binary anyway
#![cfg(not(tarpaulin))]

#[cfg(feature = "test-tube")]
mod cases;
#[cfg(feature = "test-tube")]
Expand Down
14 changes: 8 additions & 6 deletions contracts/external/dao-migrator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

Here is the [discussion](https://github.com/DA0-DA0/dao-contracts/discussions/607).

A migrator module for a DAO DAO DAO which handles migration for DAO modules
A migrator module for a DAO DAO DAO which handles migration for DAO modules
and test it went successfully.

DAO core migration is handled by a proposal, which adds this module and do
Expand All @@ -14,6 +14,7 @@ If custom module is found, this TX fails and migration is cancelled, custom
module requires a custom migration to be done by the DAO.

# General idea

1. Proposal is made to migrate DAO core to V2, which also adds this module to the DAO.
2. On init of this contract, a callback is fired to do the migration.
3. Then we check to make sure the DAO doesn't have custom modules.
Expand All @@ -23,9 +24,10 @@ module requires a custom migration to be done by the DAO.
7. In any case where 1 migration fails, we fail the whole TX.

# Important notes
* custom modules cannot reliably be migrated by this contract,
because of that we fail the process to avoid any unwanted results.

* If any module migration fails we fail the whole thing,
this is to make sure that we either have a fully working V2,
or we do nothing and make sure the DAO is operational at any time.
- custom modules cannot reliably be migrated by this contract,
because of that we fail the process to avoid any unwanted results.

- If any module migration fails we fail the whole thing,
this is to make sure that we either have a fully working V2,
or we do nothing and make sure the DAO is operational at any time.
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ impl SuiteBuilder {
if let Some(candidates) = self.with_proposal {
suite
.propose(
&suite.sender(),
suite.sender(),
(0..candidates)
.map(|_| vec![unimportant_message()])
.collect(),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
// Ignore integration tests for code coverage since there will be problems with dynamic linking libosmosistesttube
// and also, tarpaulin will not be able read coverage out of wasm binary anyway
#![cfg(not(tarpaulin))]

mod integration_tests;
mod test_env;
5 changes: 4 additions & 1 deletion packages/dao-pre-propose-base/src/execute.rs
Original file line number Diff line number Diff line change
Expand Up @@ -207,10 +207,13 @@ where
.map(|d| d.into_checked(deps.as_ref(), dao))
.transpose()?;

if let Some(submision_policy) = &submission_policy {
submision_policy.validate()?
}

self.config
.update(deps.storage, |prev| -> Result<Config, PreProposeError> {
let new_submission_policy = if let Some(submission_policy) = submission_policy {
submission_policy.validate()?;
submission_policy
} else {
prev.submission_policy
Expand Down
4 changes: 0 additions & 4 deletions packages/dao-testing/src/test_tube/mod.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
// Ignore integration tests for code coverage since there will be problems with dynamic linking libosmosistesttube
// and also, tarpaulin will not be able read coverage out of wasm binary anyway
#![cfg(not(tarpaulin))]

// Integrationg tests using an actual chain binary, requires
// the "test-tube" feature to be enabled
// cargo test --features test-tube
Expand Down
Loading