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

[Feature] Make StarcoinDAO inherit Dao's config #144

Merged
merged 3 commits into from
Sep 25, 2022
Merged

[Feature] Make StarcoinDAO inherit Dao's config #144

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ed4d3c
StarcoinDAO use old config
WGB5445 Sep 23, 2022
3dec406
fix build file
WGB5445 Sep 23, 2022
b0fbde6
Merge remote-tracking branch 'origin/main' into StarcoinDAO-config
WGB5445 Sep 25, 2022
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
2 changes: 1 addition & 1 deletion build/StarcoinFramework/BuildInfo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ compiled_package_info:
? address: "0x00000000000000000000000000000001"
name: YieldFarmingV2
: StarcoinFramework
source_digest: 9171A59A0F735B5531F80C357F850D2E91F7C8887F6DDE36390713DBDCD4C41E
source_digest: 1ADEA5313385E10ADEB6110458248AC32BAF6AD4D96BF3176C207B4AF8D5106B
build_flags:
dev_mode: false
test_mode: false
Expand Down
Binary file modified build/StarcoinFramework/bytecode_modules/StdlibUpgradeScripts.mv
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion build/StarcoinFramework/docs/StdlibUpgradeScripts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ The module for StdlibUpgrade init scripts
<b>use</b> <a href="DAOExtensionPoint.md#0x1_DAOExtensionPoint">0x1::DAOExtensionPoint</a>;
<b>use</b> <a href="DAOPluginMarketplace.md#0x1_DAOPluginMarketplace">0x1::DAOPluginMarketplace</a>;
<b>use</b> <a href="DAORegistry.md#0x1_DAORegistry">0x1::DAORegistry</a>;
<b>use</b> <a href="Dao.md#0x1_Dao">0x1::Dao</a>;
<b>use</b> <a href="GenesisNFT.md#0x1_GenesisNFT">0x1::GenesisNFT</a>;
<b>use</b> <a href="GenesisSignerCapability.md#0x1_GenesisSignerCapability">0x1::GenesisSignerCapability</a>;
<b>use</b> <a href="GrantProposalPlugin.md#0x1_GrantProposalPlugin">0x1::GrantProposalPlugin</a>;
Expand Down Expand Up @@ -366,7 +367,7 @@ deprecated, use <code>do_upgrade_from_v6_to_v7_with_language_version</code>.
<a href="UpgradeModulePlugin.md#0x1_UpgradeModulePlugin_initialize">UpgradeModulePlugin::initialize</a>();

//TODO : config rate need mind
<a href="StarcoinDAO.md#0x1_StarcoinDAO_create_dao">StarcoinDAO::create_dao</a>( 60000, 120000, 10, 10000, 1000 * 1000 * 1000 * 1000);
<a href="StarcoinDAO.md#0x1_StarcoinDAO_create_dao">StarcoinDAO::create_dao</a>( <a href="Dao.md#0x1_Dao_voting_delay">Dao::voting_delay</a>&lt;<a href="STC.md#0x1_STC">STC</a>&gt;(), <a href="Dao.md#0x1_Dao_voting_period">Dao::voting_period</a>&lt;<a href="STC.md#0x1_STC">STC</a>&gt;(), <a href="Dao.md#0x1_Dao_voting_quorum_rate">Dao::voting_quorum_rate</a>&lt;<a href="STC.md#0x1_STC">STC</a>&gt;(), <a href="Dao.md#0x1_Dao_min_action_delay">Dao::min_action_delay</a>&lt;<a href="STC.md#0x1_STC">STC</a>&gt;(), 1000 * 1000 * 1000 * 1000);
}
</code></pre>

Expand Down
Binary file modified build/StarcoinFramework/source_maps/StdlibUpgradeScripts.mvsm
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion sources/StdlibUpgradeScripts.move
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ module StdlibUpgradeScripts {
use StarcoinFramework::StakeToSBTPlugin;
use StarcoinFramework::UpgradeModulePlugin;
use StarcoinFramework::StarcoinDAO;
use StarcoinFramework::Dao;

spec module {
pragma verify = false;
Expand Down Expand Up @@ -134,7 +135,7 @@ module StdlibUpgradeScripts {
UpgradeModulePlugin::initialize();

//TODO : config rate need mind
StarcoinDAO::create_dao( 60000, 120000, 10, 10000, 1000 * 1000 * 1000 * 1000);
StarcoinDAO::create_dao( Dao::voting_delay<STC>(), Dao::voting_period<STC>(), Dao::voting_quorum_rate<STC>(), Dao::min_action_delay<STC>(), 1000 * 1000 * 1000 * 1000);
}
}
}