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

[Feature] Multi Offer #135

Merged
merged 15 commits into from
Sep 23, 2022
Merged

[Feature] Multi Offer #135

merged 15 commits into from
Sep 23, 2022

Conversation

WGB5445
Copy link
Collaborator

@WGB5445 WGB5445 commented Sep 19, 2022

Pull request type

Please check the type of change your PR introduces:

  • Bugfix
  • Feature
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • Documentation content changes
  • Other (please describe):

Issue Number: #125

@WGB5445
Copy link
Collaborator Author

WGB5445 commented Sep 20, 2022

增加自动转换数组结构

    public fun create<Offered: store>(account: &signer, offered: Offered, for: address, lock_period: u64) acquires Offers, Offer {
        let time_lock = Timestamp::now_seconds() + lock_period;
        //TODO should support multi Offer?
        let account_address = Signer::address_of(account);

        if(exists<Offers<Offered>>(account_address)){
            let offers = &mut borrow_global_mut<Offers<Offered>>(account_address).offers;
            Vector::push_back(offers, Offer<Offered> { offered, for, time_lock });
        }else {
            let offers = Vector::empty<Offer<Offered>>();
            if(exists<Offer<Offered>>(account_address)){
                Vector::push_back(&mut offers, move_from<Offer<Offered>>(account_address));
            };
            Vector::push_back(&mut offers, Offer<Offered> { offered, for, time_lock });
            move_to(account, Offers<Offered> { offers });
        }
    }

@WGB5445 WGB5445 marked this pull request as ready for review September 21, 2022 02:00
@WGB5445 WGB5445 changed the title [WIP] [Feature] Multi Offer [Feature] Multi Offer Sep 21, 2022

if(exists<Offers<Offered>>(account_address)){
let offers = &mut borrow_global_mut<Offers<Offered>>(account_address).offers;
Vector::push_back(offers, Offer<Offered> { offered, for, time_lock });
Copy link
Contributor

@baichuan3 baichuan3 Sep 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Offer需要考虑排重不?以及offers的长度限制

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Offer需要考虑排重不?以及offers的长度限制

由于Offer将资源 Offered放入其中,所以每一个item都应该是单独的资源,不能算作重复项

offers可能会有长度问题,但是该资源为当前 Account创建并发放 Offer应该不会有攻击问题。

但是这里引入另一个问题,Offer需要Account有收回的权限,这样 Offer过多可以退出一些

});
i = i - 1;
};
Vector::push_back(offers, Offer<Offered> {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这段应该在while循环里面把?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

现在的写法没问题,但是确实可以合到循环里面去

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

现在的写法没问题,但是确实可以合到循环里面去

已经改了效果还行

let Offer<Offered> { offered, for, time_lock } = if(exists<Offers<Offered>>(offer_address)){
let offers = &mut borrow_global_mut<Offers<Offered>>(offer_address).offers;
let op_index = find_offer(offers, account_address);
assert!(Option::is_some(&op_index),Errors::invalid_argument(EOFFER_DNE_FOR_ACCOUNT));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

如果没有offer的话,是不是直接返回空,不直接abort ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里需要兼容原有的函数,以防导致其他使用了 redeem 合约失效
在以前如果没有 Offer将会直接报错,函数接口也不好改动所以 abort处理应该是最好的选择了

@@ -53,32 +133,97 @@ module Offer {
include Timestamp::AbortsIfTimestampNotExists;
}

public fun redeem_v2<Offered: store>(account: &signer, offer_address: address, idx: u64): Offered acquires Offer, Offers {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

redeem和redeem_v2的代码可以考虑合并

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

redeem和redeem_v2的代码可以考虑合并

这里还是有一些差别,刚才试验了一下不太好合并

});
i = i - 1;
};
Vector::push_back(offers, Offer<Offered> {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

现在的写法没问题,但是确实可以合到循环里面去

pragma verify = false;
}

fun find_offer<Offered: store>(offers: &vector<Offer<Offered>>, for: address):Option::Option<u64>{
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里不考虑 for 接受多个 offer 吗?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个主要是为了兼容 redeem 一次一取应该可以满足了,剩下的可以调用redeem_v2精准取出

This comment was marked as spam.

if(exists<Offer<Offered>>(offer_address)){
borrow_global<Offer<Offered>>(offer_address).for
}else{
address_of_v2<Offered>(offer_address, 0)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

address_of 这个接口应该要废弃了,没必要加这个 else 吧

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

address_of 这个接口应该要废弃了,没必要加这个 else 吧

其他合约如果有依赖,对方的合约可能会直接挂掉

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

address_of 这个接口应该要废弃了,没必要加这个 else 吧

其他合约如果有依赖,对方的合约可能会直接挂掉

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

接口可以保留着。但是这样默认返回 0 的 address, 可能是错误的,而且调用者很难发现。

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

接口可以保留着。但是这样默认返回 0 的 address, 可能是错误的,而且调用者很难发现。

有道理,改为没有<Offer>就 abort 这样应该没问题了

Copy link
Member

@jolestar jolestar Sep 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

接口可以保留着。但是这样默认返回 0 的 address, 可能是错误的,而且调用者很难发现。

那感觉返回最后一个 offer 的 address,应该就和原来的逻辑是一样的

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

接口可以保留着。但是这样默认返回 0 的 address, 可能是错误的,而且调用者很难发现。

那感觉返回最后一个 offer 的 address,应该就和原来的逻辑是一样的

如果合约在编写时候不谨慎可能会有问题,给地址发 Offer,但这期间如果再调用 create 给其他人发(利用同一个资源不能存多份的特性,预期是失败)插入了新的 Offer ,如果后面需要做一些其他事情可能会导致流程卡死

let for = address_of(offer_address)
assert!( for == sender , error );
let offered = redeem(sender, offer_address);
// do some thing

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这种用法那就是用户的责任了,除非他用 Offer 的接口检查是否发送过。

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这种用法那就是用户的责任了,除非他用 Offer 的接口检查是否发送过。

好的,那我再恢复一下之前的部分写法

@WGB5445
Copy link
Collaborator Author

WGB5445 commented Sep 21, 2022

通过集成测试中的例子发现,原有的逻辑如果自动升级可能导致原有合约逻辑被破坏,如下测试中如果自动升级为 Offers 会导致 address 返回值与预期不符
感觉需要重新思考 Move 标准库升级的逻辑:
这种公开的方法如果有其他合约调用,但是返回值的结果与原有预期不同,假如该合约采用不可升级的模式,会导致该合约废掉,这不符合 stdlib 升级的本意
所以对于非必要 break 时 应该尽量采用 _v2 的方式扩展,保留_v1 的能力

script {
    use StarcoinFramework::Account;
    use StarcoinFramework::Offer;
    use StarcoinFramework::STC::STC;
    use StarcoinFramework::Signer;
    use StarcoinFramework::Token::Token;
    fun create_offer(account: signer) {
        let token = Account::withdraw<STC>(&account, 10000);
        Offer::create(&account, token, @bob, 5);
        // test Offer::exists_at
        assert!(Offer::exists_at<Token<STC>>(Signer::address_of(&account)), 1001);
        // test Offer::address_of
        assert!(Offer::address_of<Token<STC>>(Signer::address_of(&account)) == @bob, 1002);
    }
}

integration-tests/offer/offer.move Outdated Show resolved Hide resolved
integration-tests/offer/offer.move Show resolved Hide resolved
pragma verify = false;
}

public fun unpack_Offer_info(offer_info: OfferInfo):(address, u64){
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unpack_Offer_info 中间 Offer 的 O 大写有点奇怪

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

Comment on lines 239 to 242
let account_address = Signer::address_of(account);
assert!(exists_at<Offered>(account_address), Errors::invalid_argument(EOFFER_NOT_HAVE_OFFER));
let Offer<Offered> { offered: offered, for: _, time_lock: _ } = move_from<Offer<Offered>>(account_address);
offered
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sender 任何时候都能 retake 自己的 offer 吗?感觉也不太对。会出现发了 offer 又立刻取消的骗局。

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

另外原来没有 retake 方法,是不是不用区分 v1 和 v2 了?

Copy link
Collaborator Author

@WGB5445 WGB5445 Sep 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sender 任何时候都能 retake 自己的 offer 吗?感觉也不太对。会出现发了 offer 又立刻取消的骗局。

这里设计初衷是考虑如果时间锁设置过大会导致无法 redeem,增加 retake 可能会减少这种情况

感觉 retake 解决超时 一个月 时间未领取比较合理?时间设置过大是发起者的失误,合约不解决这个失误

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sender 任何时候都能 retake 自己的 offer 吗?感觉也不太对。会出现发了 offer 又立刻取消的骗局。

这里设计初衷是考虑如果时间锁设置过大会导致无法 redeem,增加 retake 可能会减少这种情况

感觉 retake 解决超时 一个月 时间未领取比较合理?时间设置过大是发起者的失误,合约不解决这个失误

感觉应该解决的是对方如果一直没来领取,然后 Offer 一直不能释放的问题。或者就设置成超过 lock_time*2 的时间后 sender 可以 retake 自己的 offer。这样可以留 lock_time 的时间给 for 来领取。

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sender 任何时候都能 retake 自己的 offer 吗?感觉也不太对。会出现发了 offer 又立刻取消的骗局。

这里设计初衷是考虑如果时间锁设置过大会导致无法 redeem,增加 retake 可能会减少这种情况
感觉 retake 解决超时 一个月 时间未领取比较合理?时间设置过大是发起者的失误,合约不解决这个失误

感觉应该解决的是对方如果一直没来领取,然后 Offer 一直不能释放的问题。或者就设置成超过 lock_time*2 的时间后 sender 可以 retake 自己的 offer。这样可以留 lock_time 的时间给 for 来领取。

有想过使用锁定的时间长度来控制是否可以 retake ,但是现有字段的用法是保存到期时间,实现这个锁定时间相关的东西需要改动的地方还不小,处理兼容性问题时会非常不优雅,不如这个版本先设定过期 3 个月,这个长度也比较合适

    /// A wrapper around value `offered` that can be claimed by the address stored in `for` when after lock time.
    struct Offer<Offered> has key, store { offered: Offered, for: address, time_lock: u64 }

Copy link
Member

@jolestar jolestar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

另外 Offer 是否应该提供 xx_entry 的方法,感觉也可以在斟酌下。因为不同的 Offer 的处理逻辑可能是不一样的。Offer 应该是个基础 module,在这个基础上封装 TokenOffer,NFTOffer 等,提供 entry 方法可能比较合适。

@WGB5445
Copy link
Collaborator Author

WGB5445 commented Sep 23, 2022

另外 Offer 是否应该提供 xx_entry 的方法,感觉也可以在斟酌下。因为不同的 Offer 的处理逻辑可能是不一样的。Offer 应该是个基础 module,在这个基础上封装 TokenOffer,NFTOffer 等,提供 entry 方法可能比较合适。

这个问题思考过,但take_offer带有 Collection2 功能所以想给Offer留一个底层entry的功能,续写了其他 entry.
从 Offer 合约作为基础库角度应该只提供redeem/retake 直接返回 Offered
原有的 Offer中存在的take_offer 带有 Collection2::put(&signer, Signer::address_of(&signer), offered);本次是否要废弃处理或者搁置

@jolestar
Copy link
Member

另外 Offer 是否应该提供 xx_entry 的方法,感觉也可以在斟酌下。因为不同的 Offer 的处理逻辑可能是不一样的。Offer 应该是个基础 module,在这个基础上封装 TokenOffer,NFTOffer 等,提供 entry 方法可能比较合适。

这个问题思考过,但take_offer带有 Collection2 功能所以想给Offer留一个底层entry的功能,续写了其他 entry. 从 Offer 合约作为基础库角度应该只提供redeem/retake 直接返回 Offered 原有的 Offer中存在的take_offer 带有 Collection2::put(&signer, Signer::address_of(&signer), offered);本次是否要废弃处理或者搁置

我觉得可以废弃掉,不然用户存到 Collection2 里,自己也拿不出来,还得自己部署合约处理,反倒麻烦。

sources/Offer.move Outdated Show resolved Hide resolved
sources/Offer.move Outdated Show resolved Hide resolved
@jolestar jolestar merged commit 4ec8c2f into starcoinorg:main Sep 23, 2022
nkysg added a commit that referenced this pull request Mar 2, 2023
nkysg added a commit that referenced this pull request Mar 2, 2023
nkysg added a commit that referenced this pull request Mar 3, 2023
nkysg added a commit that referenced this pull request Mar 3, 2023
* Revert "fix stake plugin for compatibility (#218)"

This reverts commit e618173.

* Revert "add some test_functions (#216)"

This reverts commit 87859a9.

* Revert "Add WithdrawPlugin (#214)"

This reverts commit a66f0f3.

* Revert "fix StakeToSBTPlugin install event (#215)"

This reverts commit 77a968a.

* Revert "add install plugin proposal for TreasuryPlugin (#213)"

This reverts commit a98de9e.

* Revert "Fix v12 (#210)"

This reverts commit bfd8fa6.

* Revert "release v12 (#205)"

This reverts commit 94be70e.

* Revert "Fix some entry function and do some clean (#203)"

This reverts commit 884f648.

* Revert "prepare v12 release (#200)"

This reverts commit 3bae7fd.

* Revert "Refactor root cap (#198)"

This reverts commit b30fdc9.

* Revert "feat: add entry for plugin marketplace (#199)"

This reverts commit 459ce12.

* Revert "Upgrade MerkleNFTDistributor::register to v2 (#196)"

This reverts commit 40178bb.

* Revert "[daospace] Refactor daospace functions name (#195)"

This reverts commit 0dd5c68.

* Revert "Accept Offer and Accept NFT (#192)"

This reverts commit 19b7d1d.

* Revert "Fix sign flag for SignedInteger64 zero (#191)"

This reverts commit 722a298.

* Revert "fix cmp (#190)"

This reverts commit fce8707.

* Revert "Fix (#189)"

This reverts commit 64d754d.

* Revert "feat: remove sender of update_plugin (#187)"

This reverts commit cb21b0a.

* Revert "Custom proposal's quorum_votes for plugin (#184)"

This reverts commit 45eb5ca.

* Revert "[Feature] Proposal add title and introduction (#183)"

This reverts commit 4ebe51b.

* Revert "[DAOSpace] Plugin marketplace remove NFT (#186)"

This reverts commit f186ec8.

* Revert "Migrate Genesis initialize to new DAOSpace (#181)"

This reverts commit 57e859e.

* Revert "Update GasOracle module"

This reverts commit f0270c3.

* Revert "Fix prologue gas token error"

This reverts commit 3c58061.

* Revert "[Feature] Simple map (#182)"

This reverts commit daa971f.

* Revert "add some function in Compare (#180)"

This reverts commit e5a3108.

* Revert "fix to_bytes need store (#179)"

This reverts commit 31792d4.

* Revert "[Feature] Member Grant Offer (#174)"

This reverts commit 0234cfc.

* Revert "migrate TreasuryWithdrawDaoProposal to DAOSpace TreasuryPlugin (#175)"

This reverts commit f44fd34.

* Revert "refactor plugin initialize (#176)"

This reverts commit e4c7bf8.

* Revert "update old links in README (#173)"

This reverts commit cb26bbd.

* Revert "[Bugfix]Fix ERR_EXPECT_NOT_MEMBER (#172)"

This reverts commit dca2274.

* Revert "Fix acount.txn_epilogue_v2 incompatible (#168)"

This reverts commit ad81d03.

* Revert "[Feature] Add dao create test (#167)"

This reverts commit dfbf3d7.

* Revert "Remove proposal after executed or rejected (#145)"

This reverts commit 1e17512.

* Revert "EasyGas support (#92)"

This reverts commit e142883.

* Revert "Reformat code and decrease_member_sbt when unstake (#166)"

This reverts commit 25148a4.

* Revert "upgrade mpm to 1.12.5 and fix integration tests (#163)"

This reverts commit 0fb8810.

* Revert "[Feature] DAOSpace add join_member_with_root_cap  (#164)"

This reverts commit 1518644.

* Revert "[Feature] Add ASCII module and TODO: ascii DAO name  (#161)"

This reverts commit d3eb047.

* Revert "[Feature]DAOAccount Todo : add exists_upgrade_plan_cap (#160)"

This reverts commit 1fb3b8a.

* Revert "fix eventutil (#146)"

This reverts commit d2c4f5c.

* Revert "[Feature] Make StarcoinDAO inherit Dao's config (#144)"

This reverts commit 8675779.

* Revert "migrate script to entry function (#142)"

This reverts commit 971a1a2.

* Revert "[Feature]  Multi Offer (#135)"

This reverts commit 4ec8c2f.

* Revert "add upgrade plan event (#128)"

This reverts commit e82c1d3.

* Revert "merge upgrade entry v12 and v12_1 (#126)"

This reverts commit 47b38ad.

* Revert "[Feature] NFTGallery Add Errors Assert (#138)"

This reverts commit 61392b0.

* Revert "Add event util (#134)"

This reverts commit 545f191.

* Revert "#131 Add only_new_module (#132) "

This reverts commit f1363a3.

* Revert "[Feature] DAO incompatible module upgrade test (#133)"

This reverts commit 022ca1a.

* Revert "update_module_upgrade_strategy support set min_time_limit (#127)"

This reverts commit c8c9ba7.

* Revert "Daospace support plugin marketplace (#116)"

This reverts commit 6cccb73.

* Revert "check StakeList existence (#124)"

This reverts commit dee9a0b.

* Revert "[ Feature ] do deposit when proposal state is DEFEATED (#122)"

This reverts commit 3274821.

* Revert "[daospace] Remove proposal info and add get function for proposal (#121)"

This reverts commit 7b44ee7.

* Revert "[integration-test] StarcoinDAO integration-test (#112)"

This reverts commit 45f017a.

* Revert "add assertion in stake to `StakeToSBTPlugin::stake` while the lock ti… (#117)"

This reverts commit 08928d4.

* Revert "Add Script function entry (#111)"

This reverts commit 4c32fda.

* Revert "Fix DAO Pulgin Event (#118)"

This reverts commit 3cda388.

* Revert "Plugin Event (#97)"

This reverts commit 31b9a9c.

* Revert "fix SalaryGovPlugin and migrate to test (#115)"

This reverts commit 3e95aef.

* Revert "[account] Retry when creating delegate account (#110)"

This reverts commit 7a38b4b.

* Revert "Add upgrade plugin And add  StarcoinDAO (#94)"

This reverts commit 85418d7.

* Revert "able to update DAOExt (#108)"

This reverts commit fc7ac4a.

* Revert "[Feature] Public Native  name_of  function (#107)"

This reverts commit 7263b0a.

* Revert "MintProposalPlugin (#105)"

This reverts commit ff2d802.

* Revert "add daospace module upgrade test (#98)"

This reverts commit 70429e2.

* Revert "Add DAO nft image and member image (#96)"

This reverts commit 2c89bbc.

* Revert "Dao integration test and upgrade mpm (#95)"

This reverts commit 82032cc.

* Revert "add integration-test for refund_grant (#93)"

This reverts commit 52fb86d.

* Revert "signature.move add secp256k1_verify function (#86)"

This reverts commit 9ea61ce.

* Revert "check DAOAccountCap (#89)"

This reverts commit 0404a53.

* Revert "Add  DAOSpace description (#85)"

This reverts commit a981f67.

* Revert "Remove decrease SBT when unstake item (#81)"

This reverts commit d401c37.

* Revert "[signature] Fix EVMAddress padding and crop bug (#84)"

This reverts commit 41ad861.

* Revert "fix dao snapshot deserialize when some option field is empty (#82)"

This reverts commit b272a6f.

* Revert "Complete DAOSpace  (#80)"

This reverts commit 98e96e6.

* Revert "[dao] Implement DAOSpace (#32)"

This reverts commit 0d37c89.

* Revert "Update README.md (#68)"

This reverts commit d3bb99f.

* Revert "Update .gitattributes (#63)"

This reverts commit 41ed34b.

* Revert "support installing mpm from source (#56)"

This reverts commit 3f46c6c.

* Revert "[WIP] add Block state root  (#39) (#41)"

This reverts commit 67027f9.

* Revert "Add multiple types of bcs skip and test (#52)"

This reverts commit a5dc012.

* Revert "upgrade rust toolchain 1.62.0 (#51)"

This reverts commit 81c1e51.

* Revert "implement Ring module (#44)"

This reverts commit c9582a6.

* Revert "support starcoin snapshot proof and verify (#45)"

This reverts commit 63b05ec.

* Revert "add bcs function  , byte to basic type (#43)"

This reverts commit e39dfeb.

* Revert "account events (#42)"

This reverts commit bfbe32c.

* Revert "[scripts] fix dev_setup package manager detection and mpm version on ubuntu18.04 (#37)"

This reverts commit 796fd3f.

* Revert "Upgrade mpm to v1.11.11 (#36)"

This reverts commit 92fb22a.

* Revert "[Feature] Identifier nft add borrow function  (#34)"

This reverts commit 3e24ac4.

* Revert "[account] Add create_delegate_account function (#31)"

This reverts commit a225d41.

* Revert "STRATEGY_FREEZE use invalid_argument  (#29)"

This reverts commit 51828cd.

* Revert "remove zero Balance or empty NFTGallery (#28)"

This reverts commit 0303214.

* Revert "update rust 1.61 (#27)"

This reverts commit 6da0321.

* Revert "[ci] Upgrade mpm version to v1.11.9 (#26)"

This reverts commit c2475ea.

* Revert "Improve spec of several modules (#25)"

This reverts commit 8f8e5a0.

* Revert "Update README.md"

This reverts commit 8fc83b6.

* Revert "Upgrade mpm to v1.11.5-alpha and rename `spectest` to `integrationt-test` (#24)"

This reverts commit a35c3f7.

* Revert "Update stdlib spec, remove redundant spec funcs and improve coding style (#23)"

This reverts commit 9c9922d.

* Revert "[doc] Add a readme template for generate docs (#22)"

This reverts commit 2c53e4f.

* Revert "[test] Add a signature test for verify message signature from starcoin cli. (#17)"

This reverts commit f88c277.

* Revert "Add a script to generate docs and commit docs to git (#21)"

This reverts commit 60c8002.

* Revert "#13 [Feature Request] Account::deposit(address, token)  auto create a… (#14)"

This reverts commit 88061e9.

* Revert "[ci] fix spectest (#15)"

This reverts commit 0b866e1.

* Revert "config Move highlighting (#12)"

This reverts commit 01c8419.

* Revert "simplify dev setup scripts (#2)"

This reverts commit d2a2fc9.

* Revert "[ci & doc] Add more document and setup ci github action workflow. (#1)"

This reverts commit 9fd1e52.

* add Cargo.lock
nkysg added a commit that referenced this pull request Mar 3, 2023
* Revert "fix stake plugin for compatibility (#218)"

This reverts commit e618173.

* Revert "add some test_functions (#216)"

This reverts commit 87859a9.

* Revert "Add WithdrawPlugin (#214)"

This reverts commit a66f0f3.

* Revert "fix StakeToSBTPlugin install event (#215)"

This reverts commit 77a968a.

* Revert "add install plugin proposal for TreasuryPlugin (#213)"

This reverts commit a98de9e.

* Revert "Fix v12 (#210)"

This reverts commit bfd8fa6.

* Revert "release v12 (#205)"

This reverts commit 94be70e.

* Revert "Fix some entry function and do some clean (#203)"

This reverts commit 884f648.

* Revert "prepare v12 release (#200)"

This reverts commit 3bae7fd.

* Revert "Refactor root cap (#198)"

This reverts commit b30fdc9.

* Revert "feat: add entry for plugin marketplace (#199)"

This reverts commit 459ce12.

* Revert "Upgrade MerkleNFTDistributor::register to v2 (#196)"

This reverts commit 40178bb.

* Revert "[daospace] Refactor daospace functions name (#195)"

This reverts commit 0dd5c68.

* Revert "Accept Offer and Accept NFT (#192)"

This reverts commit 19b7d1d.

* Revert "Fix sign flag for SignedInteger64 zero (#191)"

This reverts commit 722a298.

* Revert "fix cmp (#190)"

This reverts commit fce8707.

* Revert "Fix (#189)"

This reverts commit 64d754d.

* Revert "feat: remove sender of update_plugin (#187)"

This reverts commit cb21b0a.

* Revert "Custom proposal's quorum_votes for plugin (#184)"

This reverts commit 45eb5ca.

* Revert "[Feature] Proposal add title and introduction (#183)"

This reverts commit 4ebe51b.

* Revert "[DAOSpace] Plugin marketplace remove NFT (#186)"

This reverts commit f186ec8.

* Revert "Migrate Genesis initialize to new DAOSpace (#181)"

This reverts commit 57e859e.

* Revert "Update GasOracle module"

This reverts commit f0270c3.

* Revert "Fix prologue gas token error"

This reverts commit 3c58061.

* Revert "[Feature] Simple map (#182)"

This reverts commit daa971f.

* Revert "add some function in Compare (#180)"

This reverts commit e5a3108.

* Revert "fix to_bytes need store (#179)"

This reverts commit 31792d4.

* Revert "[Feature] Member Grant Offer (#174)"

This reverts commit 0234cfc.

* Revert "migrate TreasuryWithdrawDaoProposal to DAOSpace TreasuryPlugin (#175)"

This reverts commit f44fd34.

* Revert "refactor plugin initialize (#176)"

This reverts commit e4c7bf8.

* Revert "update old links in README (#173)"

This reverts commit cb26bbd.

* Revert "[Bugfix]Fix ERR_EXPECT_NOT_MEMBER (#172)"

This reverts commit dca2274.

* Revert "Fix acount.txn_epilogue_v2 incompatible (#168)"

This reverts commit ad81d03.

* Revert "[Feature] Add dao create test (#167)"

This reverts commit dfbf3d7.

* Revert "Remove proposal after executed or rejected (#145)"

This reverts commit 1e17512.

* Revert "EasyGas support (#92)"

This reverts commit e142883.

* Revert "Reformat code and decrease_member_sbt when unstake (#166)"

This reverts commit 25148a4.

* Revert "upgrade mpm to 1.12.5 and fix integration tests (#163)"

This reverts commit 0fb8810.

* Revert "[Feature] DAOSpace add join_member_with_root_cap  (#164)"

This reverts commit 1518644.

* Revert "[Feature] Add ASCII module and TODO: ascii DAO name  (#161)"

This reverts commit d3eb047.

* Revert "[Feature]DAOAccount Todo : add exists_upgrade_plan_cap (#160)"

This reverts commit 1fb3b8a.

* Revert "fix eventutil (#146)"

This reverts commit d2c4f5c.

* Revert "[Feature] Make StarcoinDAO inherit Dao's config (#144)"

This reverts commit 8675779.

* Revert "migrate script to entry function (#142)"

This reverts commit 971a1a2.

* Revert "[Feature]  Multi Offer (#135)"

This reverts commit 4ec8c2f.

* Revert "add upgrade plan event (#128)"

This reverts commit e82c1d3.

* Revert "merge upgrade entry v12 and v12_1 (#126)"

This reverts commit 47b38ad.

* Revert "[Feature] NFTGallery Add Errors Assert (#138)"

This reverts commit 61392b0.

* Revert "Add event util (#134)"

This reverts commit 545f191.

* Revert "#131 Add only_new_module (#132) "

This reverts commit f1363a3.

* Revert "[Feature] DAO incompatible module upgrade test (#133)"

This reverts commit 022ca1a.

* Revert "update_module_upgrade_strategy support set min_time_limit (#127)"

This reverts commit c8c9ba7.

* Revert "Daospace support plugin marketplace (#116)"

This reverts commit 6cccb73.

* Revert "check StakeList existence (#124)"

This reverts commit dee9a0b.

* Revert "[ Feature ] do deposit when proposal state is DEFEATED (#122)"

This reverts commit 3274821.

* Revert "[daospace] Remove proposal info and add get function for proposal (#121)"

This reverts commit 7b44ee7.

* Revert "[integration-test] StarcoinDAO integration-test (#112)"

This reverts commit 45f017a.

* Revert "add assertion in stake to `StakeToSBTPlugin::stake` while the lock ti… (#117)"

This reverts commit 08928d4.

* Revert "Add Script function entry (#111)"

This reverts commit 4c32fda.

* Revert "Fix DAO Pulgin Event (#118)"

This reverts commit 3cda388.

* Revert "Plugin Event (#97)"

This reverts commit 31b9a9c.

* Revert "fix SalaryGovPlugin and migrate to test (#115)"

This reverts commit 3e95aef.

* Revert "[account] Retry when creating delegate account (#110)"

This reverts commit 7a38b4b.

* Revert "Add upgrade plugin And add  StarcoinDAO (#94)"

This reverts commit 85418d7.

* Revert "able to update DAOExt (#108)"

This reverts commit fc7ac4a.

* Revert "[Feature] Public Native  name_of  function (#107)"

This reverts commit 7263b0a.

* Revert "MintProposalPlugin (#105)"

This reverts commit ff2d802.

* Revert "add daospace module upgrade test (#98)"

This reverts commit 70429e2.

* Revert "Add DAO nft image and member image (#96)"

This reverts commit 2c89bbc.

* Revert "Dao integration test and upgrade mpm (#95)"

This reverts commit 82032cc.

* Revert "add integration-test for refund_grant (#93)"

This reverts commit 52fb86d.

* Revert "signature.move add secp256k1_verify function (#86)"

This reverts commit 9ea61ce.

* Revert "check DAOAccountCap (#89)"

This reverts commit 0404a53.

* Revert "Add  DAOSpace description (#85)"

This reverts commit a981f67.

* Revert "Remove decrease SBT when unstake item (#81)"

This reverts commit d401c37.

* Revert "[signature] Fix EVMAddress padding and crop bug (#84)"

This reverts commit 41ad861.

* Revert "fix dao snapshot deserialize when some option field is empty (#82)"

This reverts commit b272a6f.

* Revert "Complete DAOSpace  (#80)"

This reverts commit 98e96e6.

* Revert "[dao] Implement DAOSpace (#32)"

This reverts commit 0d37c89.

* Revert "Update README.md (#68)"

This reverts commit d3bb99f.

* Revert "Update .gitattributes (#63)"

This reverts commit 41ed34b.

* Revert "support installing mpm from source (#56)"

This reverts commit 3f46c6c.

* Revert "[WIP] add Block state root  (#39) (#41)"

This reverts commit 67027f9.

* Revert "Add multiple types of bcs skip and test (#52)"

This reverts commit a5dc012.

* Revert "upgrade rust toolchain 1.62.0 (#51)"

This reverts commit 81c1e51.

* Revert "implement Ring module (#44)"

This reverts commit c9582a6.

* Revert "support starcoin snapshot proof and verify (#45)"

This reverts commit 63b05ec.

* Revert "add bcs function  , byte to basic type (#43)"

This reverts commit e39dfeb.
@nkysg nkysg mentioned this pull request Mar 3, 2023
7 tasks
nkysg added a commit that referenced this pull request Mar 6, 2023
fix Revert daospace (#226) commit msg
* Revert "fix stake plugin for compatibility (#218)"

This reverts commit e618173.

* Revert "add some test_functions (#216)"

This reverts commit 87859a9.

* Revert "Add WithdrawPlugin (#214)"

This reverts commit a66f0f3.

* Revert "fix StakeToSBTPlugin install event (#215)"

This reverts commit 77a968a.

* Revert "add install plugin proposal for TreasuryPlugin (#213)"

This reverts commit a98de9e.

* Revert "Fix v12 (#210)"

This reverts commit bfd8fa6.

* Revert "release v12 (#205)"

This reverts commit 94be70e.

* Revert "Fix some entry function and do some clean (#203)"

This reverts commit 884f648.

* Revert "prepare v12 release (#200)"

This reverts commit 3bae7fd.

* Revert "Refactor root cap (#198)"

This reverts commit b30fdc9.

* Revert "feat: add entry for plugin marketplace (#199)"

This reverts commit 459ce12.

* Revert "Upgrade MerkleNFTDistributor::register to v2 (#196)"

This reverts commit 40178bb.

* Revert "[daospace] Refactor daospace functions name (#195)"

This reverts commit 0dd5c68.

* Revert "Accept Offer and Accept NFT (#192)"

This reverts commit 19b7d1d.

* Revert "Fix sign flag for SignedInteger64 zero (#191)"

This reverts commit 722a298.

* Revert "fix cmp (#190)"

This reverts commit fce8707.

* Revert "Fix (#189)"

This reverts commit 64d754d.

* Revert "feat: remove sender of update_plugin (#187)"

This reverts commit cb21b0a.

* Revert "Custom proposal's quorum_votes for plugin (#184)"

This reverts commit 45eb5ca.

* Revert "[Feature] Proposal add title and introduction (#183)"

This reverts commit 4ebe51b.

* Revert "[DAOSpace] Plugin marketplace remove NFT (#186)"

This reverts commit f186ec8.

* Revert "Migrate Genesis initialize to new DAOSpace (#181)"

This reverts commit 57e859e.

* Revert "Update GasOracle module"

This reverts commit f0270c3.

* Revert "Fix prologue gas token error"

This reverts commit 3c58061.

* Revert "[Feature] Simple map (#182)"

This reverts commit daa971f.

* Revert "add some function in Compare (#180)"

This reverts commit e5a3108.

* Revert "fix to_bytes need store (#179)"

This reverts commit 31792d4.

* Revert "[Feature] Member Grant Offer (#174)"

This reverts commit 0234cfc.

* Revert "migrate TreasuryWithdrawDaoProposal to DAOSpace TreasuryPlugin (#175)"

This reverts commit f44fd34.

* Revert "refactor plugin initialize (#176)"

This reverts commit e4c7bf8.

* Revert "update old links in README (#173)"

This reverts commit cb26bbd.

* Revert "[Bugfix]Fix ERR_EXPECT_NOT_MEMBER (#172)"

This reverts commit dca2274.

* Revert "Fix acount.txn_epilogue_v2 incompatible (#168)"

This reverts commit ad81d03.

* Revert "[Feature] Add dao create test (#167)"

This reverts commit dfbf3d7.

* Revert "Remove proposal after executed or rejected (#145)"

This reverts commit 1e17512.

* Revert "EasyGas support (#92)"

This reverts commit e142883.

* Revert "Reformat code and decrease_member_sbt when unstake (#166)"

This reverts commit 25148a4.

* Revert "upgrade mpm to 1.12.5 and fix integration tests (#163)"

This reverts commit 0fb8810.

* Revert "[Feature] DAOSpace add join_member_with_root_cap  (#164)"

This reverts commit 1518644.

* Revert "[Feature] Add ASCII module and TODO: ascii DAO name  (#161)"

This reverts commit d3eb047.

* Revert "[Feature]DAOAccount Todo : add exists_upgrade_plan_cap (#160)"

This reverts commit 1fb3b8a.

* Revert "fix eventutil (#146)"

This reverts commit d2c4f5c.

* Revert "[Feature] Make StarcoinDAO inherit Dao's config (#144)"

This reverts commit 8675779.

* Revert "migrate script to entry function (#142)"

This reverts commit 971a1a2.

* Revert "[Feature]  Multi Offer (#135)"

This reverts commit 4ec8c2f.

* Revert "add upgrade plan event (#128)"

This reverts commit e82c1d3.

* Revert "merge upgrade entry v12 and v12_1 (#126)"

This reverts commit 47b38ad.

* Revert "[Feature] NFTGallery Add Errors Assert (#138)"

This reverts commit 61392b0.

* Revert "Add event util (#134)"

This reverts commit 545f191.

* Revert "#131 Add only_new_module (#132) "

This reverts commit f1363a3.

* Revert "[Feature] DAO incompatible module upgrade test (#133)"

This reverts commit 022ca1a.

* Revert "update_module_upgrade_strategy support set min_time_limit (#127)"

This reverts commit c8c9ba7.

* Revert "Daospace support plugin marketplace (#116)"

This reverts commit 6cccb73.

* Revert "check StakeList existence (#124)"

This reverts commit dee9a0b.

* Revert "[ Feature ] do deposit when proposal state is DEFEATED (#122)"

This reverts commit 3274821.

* Revert "[daospace] Remove proposal info and add get function for proposal (#121)"

This reverts commit 7b44ee7.

* Revert "[integration-test] StarcoinDAO integration-test (#112)"

This reverts commit 45f017a.

* Revert "add assertion in stake to `StakeToSBTPlugin::stake` while the lock ti… (#117)"

This reverts commit 08928d4.

* Revert "Add Script function entry (#111)"

This reverts commit 4c32fda.

* Revert "Fix DAO Pulgin Event (#118)"

This reverts commit 3cda388.

* Revert "Plugin Event (#97)"

This reverts commit 31b9a9c.

* Revert "fix SalaryGovPlugin and migrate to test (#115)"

This reverts commit 3e95aef.

* Revert "[account] Retry when creating delegate account (#110)"

This reverts commit 7a38b4b.

* Revert "Add upgrade plugin And add  StarcoinDAO (#94)"

This reverts commit 85418d7.

* Revert "able to update DAOExt (#108)"

This reverts commit fc7ac4a.

* Revert "[Feature] Public Native  name_of  function (#107)"

This reverts commit 7263b0a.

* Revert "MintProposalPlugin (#105)"

This reverts commit ff2d802.

* Revert "add daospace module upgrade test (#98)"

This reverts commit 70429e2.

* Revert "Add DAO nft image and member image (#96)"

This reverts commit 2c89bbc.

* Revert "Dao integration test and upgrade mpm (#95)"

This reverts commit 82032cc.

* Revert "add integration-test for refund_grant (#93)"

This reverts commit 52fb86d.

* Revert "signature.move add secp256k1_verify function (#86)"

This reverts commit 9ea61ce.

* Revert "check DAOAccountCap (#89)"

This reverts commit 0404a53.

* Revert "Add  DAOSpace description (#85)"

This reverts commit a981f67.

* Revert "Remove decrease SBT when unstake item (#81)"

This reverts commit d401c37.

* Revert "[signature] Fix EVMAddress padding and crop bug (#84)"

This reverts commit 41ad861.

* Revert "fix dao snapshot deserialize when some option field is empty (#82)"

This reverts commit b272a6f.

* Revert "Complete DAOSpace  (#80)"

This reverts commit 98e96e6.

* Revert "[dao] Implement DAOSpace (#32)"

This reverts commit 0d37c89.

* Revert "Update README.md (#68)"

This reverts commit d3bb99f.

* Revert "Update .gitattributes (#63)"

This reverts commit 41ed34b.

* Revert "support installing mpm from source (#56)"

This reverts commit 3f46c6c.

* Revert "[WIP] add Block state root  (#39) (#41)"

This reverts commit 67027f9.

* Revert "Add multiple types of bcs skip and test (#52)"

This reverts commit a5dc012.

* Revert "upgrade rust toolchain 1.62.0 (#51)"

This reverts commit 81c1e51.

* Revert "implement Ring module (#44)"

This reverts commit c9582a6.

* Revert "support starcoin snapshot proof and verify (#45)"

This reverts commit 63b05ec.

* Revert "add bcs function  , byte to basic type (#43)"

This reverts commit e39dfeb.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants