brief migration, fixes

libs/common-types/src/tokens.rs

@@ -31,13 +31,45 @@ pub enum CurrencyId {
     ForeignAsset(ForeignAssetId),
 }
 
-enum ForeignAssetId {
+
+#[derive(
+    Clone,
+    Copy,
+    PartialOrd,
+    Ord,
+    PartialEq,
+    Eq,
+    Debug,
+    Encode,
+    Decode,
+    TypeInfo,
+    MaxEncodedLen,
+    Serialize,
+    Deserialize,
+)]
+pub enum ForeignAssetId {
     ETH,
     USDT,
 }
 
+
+#[derive(
+    Clone,
+    Copy,
+    PartialOrd,
+    Ord,
+    PartialEq,
+    Eq,
+    Debug,
+    Encode,
+    Decode,
+    TypeInfo,
+    MaxEncodedLen,
+    Serialize,
+    Deserialize,
+)]
 /// The foreign owned account describes the chain 
-enum ForeignOwnedAccount {
+pub enum ForeignOwnedAccount {
     TRON([u8; 22]),
     ETH([u8; 20]),
 }
@@ -46,28 +78,30 @@ impl ForeignOwnedAccount {
     /// Here we can define which currencies per network we support
     /// For example when given a TRON account we can use this to see if the account
     /// and the currency are compatible.
-    fn ensure_supported_currency(&self, currency: CurrencyId) -> bool {
+    pub fn ensure_supported_currency(&self, currency: CurrencyId) -> bool {
         match currency {
-            Native => false,
-            KSM => false,
-            AUSD => false,
-            KAR => false,
-            MGX => false,
-            ForeignAsset(asset) => {
-                match self {
-                    ForeignOwnedAccount::TRON(_) => {
-                        match asset => {
+            CurrencyId::Native => false,
+            CurrencyId::KSM => false,
+            CurrencyId::AUSD => false,
+            CurrencyId::KAR => false,
+            CurrencyId::MGX => false,
+            CurrencyId::ForeignAsset(asset) => {
+
+                match &self {
+                     ForeignOwnedAccount::TRON(_) => {
+                        match asset {
                             ForeignAssetId::ETH => false,
                             ForeignAssetId::USDT => true
                         }
-                    },
-                    ForeignOwnedAccount::ETH(_) => {
-                        match asset => {
-                            ForeignAssetId::ETH => true,
-                            ForeignAssetId::USDT => true
-                        }
-                    }
-                }
+                     },
+                     ForeignOwnedAccount::ETH(_) => {
+                          match asset {
+                              ForeignAssetId::ETH => true,
+                              ForeignAssetId::USDT => true
+                          }
+                     }
+                 }
+
             },
         }
     }

pallets/briefs/src/integration_tests.rs

@@ -22,6 +22,7 @@ fn create_proposal_from_brief() {
             brief_id,
             CurrencyId::Native,
             get_milestones(10),
+            None,
         );
 
         assert_ok!(BriefsMod::commence_work(

pallets/briefs/src/lib.rs

@@ -152,6 +152,10 @@ pub mod pallet {
         MilestonesTotalPercentageMustEqual100,
         /// too many milestones here mate fixed with https://github.com/ImbueNetwork/imbue/issues/267
         TooManyMilestones,
+        /// If youre using a foreign currency then you need an external_owned_address.
+        EoaRequiredForForeignCurrencies,
+        /// Currency is not supported for this external address.
+        CurrencyAccountComboNotSupported,
     }
 
     #[pallet::call]
@@ -170,6 +174,7 @@ pub mod pallet {
             brief_id: BriefHash,
             currency_id: CurrencyId,
             milestones: BoundedProposedMilestones<T>,
+            external_owned_address: Option<common_types::ForeignOwnedAccount>,
         ) -> DispatchResult {
             let who = ensure_signed(origin)?;
 
@@ -178,6 +183,13 @@ pub mod pallet {
                 Error::<T>::BriefAlreadyExists
             );
 
+            if let CurrencyId::ForeignAsset(_) = currency_id {
+                ensure!(external_owned_address.is_some(), Error::<T>::EoaRequiredForForeignCurrencies);
+            }
+            if let Some(eoa) = external_owned_address {
+                ensure!(eoa.ensure_supported_currency(currency_id), Error::<T>::CurrencyAccountComboNotSupported);
+            }
+
             let total_percentage = milestones
                 .iter()
                 .fold(Percent::zero(), |acc: Percent, ms: &ProposedMilestone| {
@@ -230,6 +242,7 @@ pub mod pallet {
                 applicant,
                 milestones,
                 deposit_id,
+                external_owned_address,
             );
 
             Briefs::<T>::insert(brief_id, brief);
@@ -325,6 +338,7 @@ pub mod pallet {
                     .try_into()
                     .map_err(|_| Error::<T>::TooManyMilestones)?,
                 FundingPath::TakeFromReserved,
+                brief.eoa,
             )?;
 
             BriefContributions::<T>::remove(brief_id);
@@ -371,6 +385,7 @@ pub mod pallet {
         pub applicant: AccountIdOf<T>,
         pub milestones: BoundedProposedMilestones<T>,
         pub deposit_id: DepositIdOf<T>,
+        pub eoa: Option<common_types::ForeignOwnedAccount>,
     }
 
     impl<T: Config> Pallet<T> {
@@ -397,6 +412,7 @@ pub mod pallet {
             applicant: AccountIdOf<T>,
             milestones: BoundedProposedMilestones<T>,
             deposit_id: DepositIdOf<T>,
+            eoa: Option<common_types::ForeignOwnedAccount>
         ) -> Self {
             Self {
                 created_at,
@@ -406,6 +422,7 @@ pub mod pallet {
                 applicant,
                 milestones,
                 deposit_id,
+                eoa,
             }
         }
     }

pallets/briefs/src/migrations.rs

@@ -147,6 +147,64 @@ pub mod v2 {
     }
 }
 
+pub mod v3 {
+    use super::*;
+
+    pub struct MigrateToV3<T: Config>(T);
+    impl<T: Config> OnRuntimeUpgrade for MigrateToV2<T> {
+        #[cfg(feature = "try-runtime")]
+        fn pre_upgrade() -> Result<Vec<u8>, TryRuntimeError> {
+            let onchain = StorageVersion::<T>::on_chain_storage_version();
+            ensure!(onchain == 2, "onchain must be version 2 to run the migration.")
+            Ok(<Vec<u8> as Default>::default())
+        }
+
+        fn on_runtime_upgrade() -> Weight {
+            let current = Pallet::<T>::current_storage_version();
+            let onchain = StorageVersion::<T>::on_chain_storage_version();
+            let mut weight: Weight = Default::default();
+            if current == 3 && onchain == 2 {
+
+                Briefs::<T>::drain().for_each(|(key, brief)| {
+                    let migrated_brief = BriefData {
+                        created_at: brief.created_at,
+                        brief_owners: brief.brief_owners,
+                        budget: brief.budget,
+                        currency_id: brief.currency_id,
+                        applicant: brief.applicant,
+                        milestones: brief.milestones,
+                        deposit_id: brief.deposit_id,
+                        eoa: None,
+                    };
+
+                    T::DbWeight::get().reads_writes(2, 2)
+                    Briefs::<T>::insert(key, migrated_brief);
+                })
+
+                current.put::<Pallet<T>>();
+
+                log::warn!("v3 has been successfully applied");
+                weight = weight + T::DbWeight::get().reads_writes(2, 1);
+            } else {
+                log::warn!("Skipping v3, should be removed");
+                weight = weight + T::DbWeight::get().reads(1);
+            }
+            weight
+        }
+
+        #[cfg(feature = "try-runtime")]
+        fn post_upgrade(_state: Vec<u8>) -> Result<(), TryRuntimeError> {
+            frame_support::ensure!(
+                Pallet::<T>::on_chain_storage_version() == 3,
+                "v3 has not been applied"
+            );
+
+            Ok(())
+        }
+    }
+}
+
+
 #[cfg(test)]
 mod test {
     use super::*;

pallets/briefs/src/tests.rs

@@ -32,6 +32,7 @@ fn create_brief_brief_owner_overflow() {
                 gen_hash(1),
                 CurrencyId::Native,
                 get_milestones(10),
+                None,
             ),
             Error::<Test>::TooManyBriefOwners
         );
@@ -50,6 +51,7 @@ fn create_brief_with_no_contribution_ok() {
             gen_hash(1),
             CurrencyId::Native,
             get_milestones(10),
+                None,
         ));
     });
 }
@@ -70,6 +72,7 @@ fn create_brief_no_contribution_and_contribute() {
             brief_id,
             CurrencyId::Native,
             get_milestones(10),
+                None,
         ));
 
         (0..5).for_each(|_| {
@@ -111,6 +114,7 @@ fn contribute_to_brief_not_brief_owner() {
             brief_id,
             CurrencyId::Native,
             get_milestones(10),
+                None,
         ));
 
         assert_noop!(
@@ -139,6 +143,7 @@ fn contribute_to_brief_more_than_total_ok() {
             brief_id,
             CurrencyId::Native,
             get_milestones(10),
+                None,
         ));
         assert_ok!(BriefsMod::contribute_to_brief(
             RuntimeOrigin::signed(BOB),
@@ -163,6 +168,7 @@ fn create_brief_already_exists() {
             brief_id,
             CurrencyId::Native,
             get_milestones(10),
+                None,
         ));
 
         assert_noop!(
@@ -175,6 +181,7 @@ fn create_brief_already_exists() {
                 brief_id,
                 CurrencyId::Native,
                 get_milestones(10),
+                None,
             ),
             Error::<Test>::BriefAlreadyExists
         );
@@ -196,6 +203,7 @@ fn only_applicant_can_start_work() {
             brief_id,
             CurrencyId::Native,
             get_milestones(10),
+                None,
         ));
 
         assert_noop!(
@@ -225,6 +233,7 @@ fn initial_contribution_and_extra_contribution_aggregates() {
             brief_id,
             CurrencyId::Native,
             get_milestones(10),
+                None,
         ));
 
         assert_ok!(BriefsMod::contribute_to_brief(
@@ -261,6 +270,7 @@ fn reserved_funds_are_transferred_to_project_kitty() {
             brief_id,
             CurrencyId::Native,
             get_milestones(10),
+                None,
         );
 
         assert_ok!(BriefsMod::commence_work(
@@ -293,6 +303,7 @@ fn cancel_brief_works() {
             brief_id,
             CurrencyId::Native,
             get_milestones(10),
+                None,
         ));
 
         assert_ok!(BriefsMod::contribute_to_brief(
@@ -359,6 +370,7 @@ fn cancel_brief_not_brief_owner() {
             brief_id,
             CurrencyId::Native,
             get_milestones(10),
+                None,
         ));
 
         assert_noop!(

pallets/grants/src/integration_tests.rs

@@ -19,6 +19,7 @@ fn create_proposal_from_grant() {
             contribution_value,
             TreasuryOrigin::Imbue,
             grant_id,
+            None,
         ));
         assert!(Projects::<Test>::get(1).is_some());
     });

pallets/grants/src/lib.rs

@@ -101,6 +101,10 @@ pub mod pallet {
         InvalidTreasuryOrigin,
         /// Too many approvers
         TooManyApprovers,
+        /// If youre using a foreign currency then you need an external_owned_address.
+        EoaRequiredForForeignCurrencies,
+        /// Currency is not supported for this external address.
+        CurrencyAccountComboNotSupported,
     }
 
     #[pallet::call]
@@ -116,9 +120,17 @@ pub mod pallet {
             amount_requested: BalanceOf<T>,
             treasury_origin: TreasuryOrigin,
             grant_id: GrantId,
+            external_owned_address: Option<common_types::ForeignOwnedAccount>
         ) -> DispatchResultWithPostInfo {
             let submitter = ensure_signed(origin)?;
 
+            if let CurrencyId::ForeignAsset(_) = currency_id {
+                ensure!(external_owned_address.is_some(), Error::<T>::EoaRequiredForForeignCurrencies);
+            }
+            if let Some(eoa) = external_owned_address {
+                ensure!(eoa.ensure_supported_currency(currency_id), Error::<T>::CurrencyAccountComboNotSupported);
+            }
+
             let percentage_sum = proposed_milestones
                 .iter()
                 .fold(Default::default(), |acc: Percent, x| {
@@ -168,6 +180,7 @@ pub mod pallet {
                     .try_into()
                     .map_err(|_| Error::<T>::TooManyApprovers)?,
                 pallet_proposals::FundingPath::WaitForFunding,
+                external_owned_address,
             )?;
 
             GrantsSubmittedBy::<T>::insert(&submitter, grant_id, ());