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.

Sign up for GitHub

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

Jump to bottom

Fix cw-abc hatcher instantiation #830

Merged
merged 1 commit into from
May 20, 2024
Merged

Fix cw-abc hatcher instantiation #830

merged 1 commit into from
May 20, 2024

Conversation

ismellike
Copy link
Contributor

@ismellike ismellike commented May 14, 2024 •
edited
Loading

Missed the case where instantiating the hatchers would error out, because the contract was not its own cw_owner.
#697

@JakeHartnell JakeHartnell merged commit 455880f into DA0-DA0:cw-abc May 20, 2024
4 checks passed
ismellike added a commit to Arena-DAO/dao-contracts that referenced this pull request Sep 18, 2024
@ismellike
Squashed commit of the following:
6670654 
commit a539980
Merge: 5631670 b3b2ce7
Author: ismellike <[email protected]>
Date:   Wed Sep 18 10:29:49 2024 -0500

    Merge branch 'pr/cw-orch-interface' into improvements/cw-abc

commit b3b2ce7
Author: ismellike <[email protected]>
Date:   Wed Sep 18 10:14:18 2024 -0500

    Update osmosis-test-tube to match cw-orch

commit 5631670
Author: ismellike <[email protected]>
Date:   Tue Sep 17 15:25:57 2024 -0500

    Cleanup dao-testing

commit 5dc69ca
Author: ismellike <[email protected]>
Date:   Tue Sep 17 12:42:11 2024 -0500

    Update schemas

commit b84971c
Author: ismellike <[email protected]>
Date:   Tue Sep 17 12:06:36 2024 -0500

    Return result in to_curve_fn

commit 9dd313e
Author: ismellike <[email protected]>
Date:   Tue Sep 17 11:14:43 2024 -0500

    Improved queries, tests, and error handling on cw-abc

commit 848cecd
Merge: 85654cf 455880f
Author: ismellike <[email protected]>
Date:   Tue Sep 17 09:27:32 2024 -0500

    Merge branch 'cw-abc' into improvements/cw-abc

commit 85654cf
Author: ismellike <[email protected]>
Date:   Tue Sep 10 05:37:43 2024 -0500

    Added cw_orch fn_name for proposal executes

    follows the same naming as `dao_proposal_sudo` execute

commit 685211d
Author: Jake Hartnell <[email protected]>
Date:   Wed Aug 14 17:59:24 2024 -0400

    Fix removing uninstalled packages

commit a9efb44
Author: Jake Hartnell <[email protected]>
Date:   Wed Aug 14 17:57:36 2024 -0400

    Attempt to free up more disk space

commit 6660b23
Author: Jake Hartnell <[email protected]>
Date:   Wed Aug 14 17:52:42 2024 -0400

    Attempt to free up disk space

commit 3990e13
Author: hard-nett <[email protected]>
Date:   Thu Jul 25 02:08:47 2024 +0000

    dao cw-orch interface

commit 0cc80ce
Author: hard-nett <[email protected]>
Date:   Thu Jul 25 00:42:30 2024 +0000

    cw-orch test suite for contracts

commit c255d1e
Author: Gabe <[email protected]>
Date:   Wed Jul 24 11:58:59 2024 -0500

    Exclude scripts from workspace

commit 06bca64
Author: Gabe <[email protected]>
Date:   Wed Jul 24 10:37:57 2024 -0500

    Update external.rs

commit 0ae02a1
Author: Gabe <[email protected]>
Date:   Wed Jul 24 10:34:31 2024 -0500

    Remove dao-interface-master from scripts

commit f5b9df5
Author: hard-nett <[email protected]>
Date:   Wed Jul 24 22:49:38 2024 +0000

    cargo lock

commit ed3020d
Author: hard-nett <[email protected]>
Date:   Wed Jul 24 20:20:20 2024 +0000

    bump ismellike cleanups

commit 3bdf843
Author: hard-nett <[email protected]>
Date:   Wed Jul 24 15:42:12 2024 +0000

    lint

commit cad9837
Author: hard-nett <[email protected]>
Date:   Wed Jul 24 15:27:45 2024 +0000

    remove tf issuer init for now

commit 73fe8c8
Author: Gabe <[email protected]>
Date:   Wed Jul 24 01:22:53 2024 -0500

    Clippy fixes

commit dc43643
Author: Gabe <[email protected]>
Date:   Tue Jul 23 17:12:34 2024 -0500

    Update integration_tests.yml

commit 9e36aed
Author: Gabe <[email protected]>
Date:   Tue Jul 23 16:00:04 2024 -0500

    Fix tokio dependency

commit 0bb200e
Author: hard-nett <[email protected]>
Date:   Tue Jul 23 23:28:10 2024 +0000

    cleanup script imports

commit 776ebe3
Author: hard-nett <[email protected]>
Date:   Tue Jul 23 23:08:05 2024 +0000

    good btsg cw-orch bump

commit 3b14168
Author: hard-nett <[email protected]>
Date:   Tue Jul 23 23:06:45 2024 +0000

    bump

commit bf0b668
Author: hard-nett <[email protected]>
Date:   Tue Jul 23 22:47:45 2024 +0000

    bump correct init

commit f2570de
Author: hard-nett <[email protected]>
Date:   Tue Jul 23 21:37:15 2024 +0000

    correct import

commit 65091bd
Author: hard-nett <[email protected]>
Date:   Tue Jul 23 21:23:30 2024 +0000

    add btsg-ft-factory to cw-orch setup

commit e836dd1
Author: Gabe <[email protected]>
Date:   Tue Jul 23 11:09:32 2024 -0500

    Add more payable flags + distribution contracts to external

commit 79f7052
Author: Gabe <[email protected]>
Date:   Mon Jul 22 17:13:40 2024 -0500

    Add orch payable flag to dao-voting-token-staked stake

commit 713366d
Author: Gabe <[email protected]>
Date:   Mon Jul 22 17:10:45 2024 -0500

    Squashed commit of the following:

    commit f0dceb1
    Author: noah <[email protected]>
    Date:   Mon Jul 22 14:48:52 2024 -0400

        replaced todo with descriptive error (DA0-DA0#858)

    commit aa0fa5f
    Author: noah <[email protected]>
    Date:   Mon Jul 22 14:48:45 2024 -0400

        reorganized publish more (DA0-DA0#857)

    commit cf86aed
    Author: noah <[email protected]>
    Date:   Mon Jul 22 13:51:46 2024 -0400

        added pre-propose v2.4.1 migration tests (DA0-DA0#856)

    commit be861a8
    Author: Jake Hartnell <[email protected]>
    Date:   Mon Jul 22 19:45:58 2024 +0200

        Add new contracts to publishing script. (DA0-DA0#853)

    commit 71dd109
    Author: noah <[email protected]>
    Date:   Mon Jul 22 03:56:52 2024 -0400

        updated migrate versions (DA0-DA0#855)

    commit 7e6f5ce
    Author: noah <[email protected]>
    Date:   Mon Jul 22 03:54:17 2024 -0400

        started adding pre-propose migration to v2.5.0 (DA0-DA0#854)

    commit 7646730
    Author: bekauz <[email protected]>
    Date:   Mon Jul 22 09:43:58 2024 +0200

        DAO rewards distributor emission rate updates (DA0-DA0#848)

    commit ce946ac
    Author: noah <[email protected]>
    Date:   Fri Jul 19 16:23:14 2024 -0400

        add info query to pre-propose-base (DA0-DA0#852)

    commit ebc7914
    Author: noah <[email protected]>
    Date:   Thu Jul 18 13:12:14 2024 -0400

        Support instantiate2 in `cw-admin-factory` (DA0-DA0#851)

    commit 8c37b9e
    Author: noah <[email protected]>
    Date:   Wed Jul 17 16:03:09 2024 -0400

        BitSong fantoken factory (DA0-DA0#845)

commit 9cea2d1
Author: hard-nett <[email protected]>
Date:   Tue Jul 23 20:38:00 2024 +0000

    add external contract cw-orch suites

commit 2478f28
Author: hard-nett <[email protected]>
Date:   Mon Jul 22 16:35:28 2024 +0000

    bump /external

commit c5995c0
Author: Gabe <[email protected]>
Date:   Fri Jul 19 12:08:16 2024 -0500

    Revert basic.yml

    i think caching is causing issues with the cargo.lock

commit 48c0067
Author: Gabe <[email protected]>
Date:   Fri Jul 19 12:06:17 2024 -0500

    Lint + not(target_arch = "wasm32") in lib.rs

commit 1d68601
Author: Gabe <[email protected]>
Date:   Fri Jul 19 02:40:02 2024 -0500

    Update to cw-orch .24.1

commit bcbaa7e
Author: Gabriel Lopez <[email protected]>
Date:   Thu Jul 18 20:56:03 2024 -0500

    Revert integration_tests.yml

commit ae81938
Author: Gabriel Lopez <[email protected]>
Date:   Wed Jul 17 13:18:11 2024 -0500

    Update basic.yml to cache only cargo deps

    Nightly toolchain is required for integration_tests

commit a90d77c
Author: Gabriel Lopez <[email protected]>
Date:   Wed Jul 17 12:45:09 2024 -0500

    Set integration_tests toolchain to latest stable

commit 485b7f7
Author: hard-nett <[email protected]>
Date:   Sat Jul 13 18:53:38 2024 +0000

    add cw-orch to external contract

commit 449e481
Author: Gabriel Lopez <[email protected]>
Date:   Thu Jul 11 02:21:52 2024 -0500

    Cargo schema + fix orch wasm build and tests

commit 5ccaa5e
Author: Gabriel Lopez <[email protected]>
Date:   Thu Jul 11 00:40:32 2024 -0500

    Fix cargo stuff

commit 3ff1cc7
Author: Gabriel Lopez <[email protected]>
Date:   Wed Jul 10 23:47:50 2024 -0500

    Add cache to basic.yml

commit 2c4db48
Author: Gabriel Lopez <[email protected]>
Date:   Wed Jul 10 23:47:40 2024 -0500

    Fix lints

    Also updates just lint to match basic.yml

commit 1cce2ea
Author: Kayanski <[email protected]>
Date:   Fri May 17 09:09:32 2024 +0000

    Added other derives

commit 7bf054c
Author: Kayanski <[email protected]>
Date:   Fri May 17 09:06:45 2024 +0000

    Added derive fns

commit 302b1aa
Author: Kayanski <[email protected]>
Date:   Fri May 17 08:54:07 2024 +0000

    Fix tests

commit 7999ce8
Author: Kayanski <[email protected]>
Date:   Fri May 17 08:52:54 2024 +0000

    Added Queryfns on voting

commit d06b377
Author: Kayanski <[email protected]>
Date:   Fri May 17 08:06:38 2024 +0000

    Finalize test changes

commit 364d12d
Author: Kayanski <[email protected]>
Date:   Fri May 17 07:40:35 2024 +0000

    More tests

commit 5fa3d44
Author: Kayanski <[email protected]>
Date:   Thu May 16 17:24:41 2024 +0000

    Added tests with cw-orch

commit 75d7492
Author: Kayanski <[email protected]>
Date:   Thu May 16 14:41:02 2024 +0000

    First test modifications

commit 455880f
Author: ismellike <[email protected]>
Date:   Mon May 20 13:06:39 2024 -0500

    Fix issue with instantiating cw-abc with hatchers (DA0-DA0#830)

    allow self to call method

commit f656e8a
Author: ismellike <[email protected]>
Date:   Tue May 14 13:44:13 2024 -0500

    ABC Improvements (DA0-DA0#818)

    * Make hatcher_allowlist a map

    Also cleans up state when going from Hatch -> Open
    Various spell-checking fixes

    * Allow existing tokens to be used with ABC's

    I think it's important for an existing token to be supported by an ABC.
    Token DAO's will be able to set up liquidity more easily by simply allowing mint & burn functionality after instantiating the ABC while holding ownership of it.

    *Also adds a query for hatcher allowlist
    *fixes spell checks I ran into
    *moves TokenInfo from dao-voting-token-staked to dao-interface for use in cw-abc

    * Complete funding pool logic

    Renamed fees_recipient to funding_pool_forwarding for better naming
    Made funding_pool_forwarding optional
    Allow updating the funding_pool_forwarding by owner
    Allow withdrawing from the funding pool by owner

    * Implement a circuit breaker

    Adds IS_PAUSED state that is checked in execute entry
    Also fixes naming in commands

    * Add query for initial supply at ABC creation

    * Allow donation into the reserve pool

    Also fixes donation state being lost after multiple donations

    * Move cw-abc curves to its own package cw-curves

    * Improve validation for max_supply

    * Support DAO membership in hatcher allowlist

    Could use a test here
    Also fixes some warnings and flag for cw-std

    * Clippy fix

    * Only clone decimals from curve_state

    also reorg buy command to be closer to sell command for readability

    * QoL improvements

    Derive copy on DecimalPlaces
    Catch OverflowError directly in ContractError
    Do not set initial supply as supply - will further remove allowing initial supplies

    * Revert support for initial supply

    * Fix clippy unnecessary clones

    * Donate only into the funding pool

    * Add a test for donate and withdraw from funding pool

    * Add test for dao hatchers + update schemas

    Also removes unused deps from cw-abc which now live in cw-curves

    * Update Cargo.toml

    * Buy & Sell Quotes

    Let users know the curve state and returned amount after x payment

    * Complete DAO hatchers w/ priority queue

    Disallow selling in the hatch phase
    Do not validate max_contribution against max_raise

    * Fix priority queue ordering on ties

    also clippy fixes

    * Couple more clippy fixes

commit 6d4b430
Author: Jake Hartnell <[email protected]>
Date:   Tue Mar 26 14:35:44 2024 +0100

    Post rebase fixups

commit 6ab116d
Author: Jake Hartnell <[email protected]>
Date:   Mon Jan 8 16:52:52 2024 -0800

    Clean up small TODO

commit 371d724
Author: Jake Hartnell <[email protected]>
Date:   Mon Jan 8 15:36:58 2024 -0800

    Remove unused deps

commit 7e923ef
Author: Jake Hartnell <[email protected]>
Date:   Tue Jan 2 22:51:51 2024 -0800

    Bump nightly version in CI

commit a0eb619
Author: Jake Hartnell <[email protected]>
Date:   Tue Jan 2 20:44:12 2024 -0800

    Fix clippy errors and test errors

commit 301b45a
Author: Jake Hartnell <[email protected]>
Date:   Fri Dec 29 14:07:42 2023 -0800

    Basic Integration Tests

commit 389484f
Author: Jake Hartnell <[email protected]>
Date:   Sat Dec 23 15:19:18 2023 -0800

    Fix wasm build

commit 4d4d70e
Author: Jake Hartnell <[email protected]>
Date:   Sat Dec 23 14:45:14 2023 -0800

    dao-abc-factory contract

    Creates new cw-abc DAOs.

commit 02e26e0
Author: Jake Hartnell <[email protected]>
Date:   Sat Dec 23 13:13:06 2023 -0800

    Remove token-bindings dep

commit 00b80d9
Author: Jake Hartnell <[email protected]>
Date:   Sat Dec 23 13:09:40 2023 -0800

    Fix cargo file after rebase

commit 9d069eb
Author: Jake Hartnell <[email protected]>
Date:   Tue Dec 12 14:46:50 2023 -0800

    Remove unused old tests

commit 84811db
Author: Jake Hartnell <[email protected]>
Date:   Tue Dec 12 14:41:41 2023 -0800

    Remove TokenFactoryMsg and TokenFactoryQuery, no token-bindings dep

commit 33927a1
Author: Jake Hartnell <[email protected]>
Date:   Tue Dec 12 14:30:03 2023 -0800

    More queries, update schema

commit 71832ce
Author: Jake Hartnell <[email protected]>
Date:   Wed Dec 6 13:01:57 2023 -0800

    Rename variables to make them more consistent and understandable

commit 0db6203
Author: Jake Hartnell <[email protected]>
Date:   Wed Dec 6 12:49:34 2023 -0800

    Add more information to the readme

commit 5be336a
Author: Jake Hartnell <[email protected]>
Date:   Tue Dec 5 17:16:41 2023 -0800

    Update schema

commit 9c8768e
Author: Jake Hartnell <[email protected]>
Date:   Tue Dec 5 17:09:04 2023 -0800

    Fix exit fees

commit 4080c01
Author: Jake Hartnell <[email protected]>
Date:   Tue Dec 5 16:15:38 2023 -0800

    Bug fixes, implement fees

commit c882469
Author: Jake Hartnell <[email protected]>
Date:   Mon Dec 4 18:33:27 2023 -0800

    to_binary -> to_json_binary

commit be5cc1e
Author: Jake Hartnell <[email protected]>
Date:   Mon Dec 4 17:47:32 2023 -0800

    Next pass at adding info to readme

commit f3b1216
Author: Jake Hartnell <[email protected]>
Date:   Mon Nov 20 14:54:14 2023 +0100

    Attempt at update curve tests

commit 60d7f61
Author: Jake Hartnell <[email protected]>
Date:   Mon Nov 20 14:25:21 2023 +0100

    More tests!

commit 69cd33b
Author: Jake Hartnell <[email protected]>
Date:   Mon Nov 20 14:02:37 2023 +0100

    Fix some tests

commit 8ef65d8
Author: Jake Hartnell <[email protected]>
Date:   Fri Nov 17 17:35:11 2023 +0100

    Update schema

commit 638b102
Author: Jake Hartnell <[email protected]>
Date:   Fri Nov 17 16:59:19 2023 +0100

    Rename methods, cleanup unused variables

commit 9e70057
Author: Jake Hartnell <[email protected]>
Date:   Fri Nov 17 16:54:59 2023 +0100

    Close curve, update curve, set max supply methods

commit 30dd7a5
Author: Jake Hartnell <[email protected]>
Date:   Fri Nov 17 14:36:50 2023 +0100

    Clean up, add notes for future work

commit 9f39048
Author: Jake Hartnell <[email protected]>
Date:   Thu Nov 16 17:11:11 2023 +0100

    Max Supply

commit ea21f4f
Author: Jake Hartnell <[email protected]>
Date:   Thu Nov 16 16:47:40 2023 +0100

    Contribution limits

commit 5fc2de8
Author: Jake Hartnell <[email protected]>
Date:   Thu Nov 16 15:04:37 2023 +0100

    Refactor update phase config, fix metadata, clean up

commit ecdfb9d
Author: Jake Hartnell <[email protected]>
Date:   Sun Nov 12 22:19:51 2023 +0100

    Happy path test, make notes

commit 4930042
Author: Jake Hartnell <[email protected]>
Date:   Thu Nov 9 15:56:33 2023 +0100

    Clean up, clippy, workspace deps, notes

commit 8985177
Author: Jake Hartnell <[email protected]>
Date:   Mon Nov 6 15:57:42 2023 +0100

    Note

commit b5c173b
Author: Jake Hartnell <[email protected]>
Date:   Mon Nov 6 15:57:29 2023 +0100

    Attempt to fix burn

commit 6f80580
Author: Jake Hartnell <[email protected]>
Date:   Thu Nov 2 18:12:32 2023 +0100

    More cleanup for clippy

commit b7247f4
Author: Jake Hartnell <[email protected]>
Date:   Mon Oct 30 20:39:43 2023 +0100

    Rebase cleanup, fix up tests

commit fc19b74
Author: Jake Hartnell <[email protected]>
Date:   Fri Sep 1 13:38:46 2023 -0700

    Fixups, burning tokens still doesn't work

commit 50eff27
Author: Jake Hartnell <[email protected]>
Date:   Thu Aug 31 09:21:13 2023 -0700

    Minting tokens works!

commit 93f16f6
Author: Jake Hartnell <[email protected]>
Date:   Wed Aug 30 18:40:08 2023 -0700

    Fix tests, need to investigate why this broke

commit 7d6b600
Author: Jake Hartnell <[email protected]>
Date:   Wed Aug 30 17:39:24 2023 -0700

    Get instantiation working with test-tube

commit 2f6bba4
Author: Jake Hartnell <[email protected]>
Date:   Wed Aug 30 17:09:25 2023 -0700

    Get test-tube tests running

commit fc5d5d6
Author: Jake Hartnell <[email protected]>
Date:   Wed Aug 30 16:23:14 2023 -0700

    Clean up and notes

commit a72ad95
Author: Jake Hartnell <[email protected]>
Date:   Wed Aug 30 16:22:59 2023 -0700

    Update schema

commit 988cf5d
Author: Jake Hartnell <[email protected]>
Date:   Wed Aug 30 16:05:01 2023 -0700

    Refactor

commit f05541b
Author: Jake Hartnell <[email protected]>
Date:   Wed Aug 30 15:31:27 2023 -0700

    Remove old attempt at fixing cw-multi-test

commit df6ebad
Author: Jake Hartnell <[email protected]>
Date:   Wed Aug 30 15:30:44 2023 -0700

    Refactor cw-abc contract to work with cw-tokenfactory-issuer

commit 98b0203
Author: Jake Hartnell <[email protected]>
Date:   Wed Aug 30 14:46:07 2023 -0700

    Start prepping for refactor and tests

commit 3b4965a
Author: Jake Hartnell <[email protected]>
Date:   Thu Aug 10 21:54:37 2023 +0200

    Attempt to get tests working

commit 84244ed
Author: Jake Hartnell <[email protected]>
Date:   Sun Jul 9 18:24:19 2023 +0200

    Remove boot / cw-orch, get cw-multi-test working with custom messages

commit 6097ea4
Author: Dat-Andre <[email protected]>
Date:   Mon May 8 22:17:13 2023 +0100

    697 (DA0-DA0#702)

    * update cw-orch dependency

    * add getrandom dependency to .toml

    ---------

    Co-authored-by: Jake Hartnell <[email protected]>

commit 0f390c3
Author: Jake Hartnell <[email protected]>
Date:   Tue May 2 13:21:49 2023 -0700

    Comments clean up

commit 52c6a98
Author: adairrr <[email protected]>
Date:   Wed Apr 26 00:30:21 2023 +0300

    cw-abc: Updated hatch phase mechanics, donations, queries (DA0-DA0#699)

    * Separate hatcher allowlist

    * Donation feature

    * Initial sell exit tax

    * Hatchers to amount

    * Hatch phase exit tax

    * TokenMsg methods

    * Format

    * Hatchers query

    * Fix bug where float was not taken into account in supply

    * Buy and sell refactoring

    * Update hatch phase config

    * Update phase config enum

    * Add adairrr to authors

    * Initial boot integration with custom msgs

    * Initial testing infrastructure

    * Abstract-OS to AbstractSDK

commit aceb8ba
Author: adairrr <[email protected]>
Date:   Sun Apr 23 04:52:07 2023 +0300

    Initial phase integration to cw-abc (DA0-DA0#698)

    * CwAbcResult

    * Hatch phase configuration and init msg refactor

    * Initial instantiate test

    * Implement separate phrases and phrase configs

    * Remove vesting phase and update funding pool

    * Separate commands and queries

    * Update init msg with string configs

    * Phase config query

    * MinMax and config query

    * Add some todos

    * cw-ownable integration

commit 088143c
Author: Jake Hartnell <[email protected]>
Date:   Wed Apr 19 18:55:01 2023 -0700

    Initial commit
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ismellike @JakeHartnell