Merge pull request #128 from automata-network/cf/anydao

Add daoportal to ContextFree

Author: RyuH1

Cargo.lock

@@ -8,8 +8,8 @@ compile_error!("Feature 1 and 2 are mutually exclusive and cannot be enabled tog
 use automata_primitives::{AccountId, Block, BlockId, Index};
 // #[cfg(feature = "automata")]
 // use automata_runtime::apis::DAOPortalApi as DAOPortalRuntimeApi;
-// #[cfg(feature = "contextfree")]
-// use contextfree_runtime::apis::DAOPortalApi as DAOPortalRuntimeApi;
+#[cfg(feature = "contextfree")]
+use contextfree_runtime::apis::DAOPortalApi as DAOPortalRuntimeApi;
 #[cfg(feature = "finitestate")]
 use finitestate_runtime::apis::DAOPortalApi as DAOPortalRuntimeApi;
 

rpc/src/daoportal.rs

@@ -81,6 +81,7 @@ pallet-liveness = { default-features = false, git = 'https://github.com/automata
 pallet-bridge = { default-features = false, git = 'https://github.com/automata-network/automata-common', version = '0.1.0'}
 pallet-bridgetransfer = { default-features = false, git = 'https://github.com/automata-network/automata-common', version = '0.1.0'}
 pallet-game = { default-features = false, git = 'https://github.com/automata-network/automata-common', branch = 'main' }
+pallet-daoportal = { default-features = false, git = 'https://github.com/automata-network/automata-common', branch = 'main' }
 automata-primitives = { default-features = false, path = "../../primitives" }
 automata-runtime-common = { path = "../common", default-features = false }
 
@@ -130,6 +131,7 @@ std = [
     'pallet-utility/std',
     'pallet-vesting/std',
     'pallet-game/std',
+    'pallet-daoportal/std',
     'serde',
     'sp-api/std',
     'sp-block-builder/std',

runtime/contextfree/Cargo.toml

@@ -1,5 +1,6 @@
-// use automata_primitives::{AccountId, Hash};
-// use sp_std::vec::Vec;
+use automata_primitives::{AccountId, Hash};
+use pallet_daoportal::datastructures::{DAOProposal, Project, ProjectId, ProposalId};
+use sp_std::vec::Vec;
 
 sp_api::decl_runtime_apis! {
     pub trait TransferApi {
@@ -8,4 +9,12 @@ sp_api::decl_runtime_apis! {
             signature_raw_bytes: [u8; 65]
         ) -> Result<(), ()>;
     }
+
+    pub trait DAOPortalApi {
+        fn get_projects() -> Vec<(ProjectId, Project<AccountId>)>;
+
+        fn get_proposals(project_id: ProjectId) -> Vec<(ProposalId, DAOProposal<AccountId>)>;
+
+        fn get_all_proposals() -> Vec<(ProjectId, ProposalId, DAOProposal<AccountId>)>;
+    }
 }

runtime/contextfree/src/apis.rs

@@ -19,6 +19,7 @@ pub fn wasm_binary_unwrap() -> &'static [u8] {
 use codec::{Decode, Encode};
 use fp_rpc::TransactionStatus;
 use frame_system::{EnsureOneOf, EnsureRoot};
+use pallet_daoportal::datastructures::{DAOProposal, Project, ProjectId, ProposalId};
 use pallet_grandpa::fg_primitives;
 use pallet_grandpa::{AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList};
 use pallet_im_online::sr25519::AuthorityId as ImOnlinedId;
@@ -125,7 +126,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     //   `spec_version`, and `authoring_version` are the same between Wasm and native.
     // This value is set to 100 to notify Polkadot-JS App (https://polkadot.js.org/apps) to use
     //   the compatible custom types.
-    spec_version: 1004,
+    spec_version: 1005,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 1,
@@ -180,6 +181,7 @@ impl Contains<Call> for CallFilter {
             | Call::BridgeTransfer(_)
             | Call::ChainBridge(_)
             | Call::ElectionProviderMultiPhase(_)
+            | Call::DAOPortal(_)
             | Call::Democracy(_)
             | Call::Council(_)
             | Call::TechnicalCommittee(_)
@@ -555,6 +557,26 @@ impl pallet_game::Config for Runtime {
     type WeightInfo = pallet_game::weights::SubstrateWeight<Runtime>;
 }
 
+parameter_types! {
+    pub const MinDuration: u64 = 3600000;
+    pub const MaxDuration: u64 = 2592000000;
+    pub const MaxOptionCount: u8 = 10;
+    pub const MaxWorkspace: u32 = 10;
+    pub const MaxStrategy: u32 = 10;
+}
+
+impl pallet_daoportal::Config for Runtime {
+    type Event = Event;
+    type Currency = Balances;
+    type MinDuration = MinDuration;
+    type MaxDuration = MaxDuration;
+    type MaxOptionCount = MaxOptionCount;
+    type MaxWorkspace = MaxWorkspace;
+    type MaxStrategy = MaxStrategy;
+    type UnixTime = Timestamp;
+    type DAOPortalWeightInfo = pallet_daoportal::weights::SubstrateWeight<Runtime>;
+}
+
 impl pallet_sudo::Config for Runtime {
     type Event = Event;
     type Call = Call;
@@ -1053,6 +1075,7 @@ construct_runtime!(
         ChainBridge: pallet_bridge::{Pallet, Call, Storage, Event<T>},
         BridgeTransfer: pallet_bridgetransfer::{Pallet, Call, Event<T>},
         Game: pallet_game::{Pallet, Call, Storage, Event<T>},
+        DAOPortal: pallet_daoportal::{Pallet, Call, Storage, Event<T>},
     }
 );
 
@@ -1275,6 +1298,20 @@ impl_runtime_apis! {
     //     }
     // }
 
+    impl apis::DAOPortalApi<Block> for Runtime {
+        fn get_projects() -> Vec<(ProjectId, Project<AccountId>)> {
+            DAOPortal::get_projects()
+        }
+
+        fn get_proposals(project_id: ProjectId) -> Vec<(ProjectId, DAOProposal<AccountId>)> {
+            DAOPortal::get_proposals(project_id)
+        }
+
+        fn get_all_proposals() -> Vec<(ProjectId, ProposalId, DAOProposal<AccountId>)> {
+            DAOPortal::get_all_proposals()
+        }
+    }
+
     impl fp_rpc::EthereumRuntimeRPCApi<Block> for Runtime {
         fn chain_id() -> u64 {
             <Runtime as pallet_evm::Config>::ChainId::get()