Added amount parameter to farming pallet for deposit extrinsic (#3581) (

#3589)

This PR introduced additional parameter `amount` to allow user `deposit`
to specify any amount of LP tokens.

- upgrade runtime
- no node update

@kkast



- [ ] PR title is my best effort to provide summary of changes and has
clear text to be part of release notes
- [ ] I marked PR by `misc` label if it should not be in release notes
- [ ] I have linked Zenhub/Github or any other reference item if one
exists
- [ ] I was clear on what type of deployment required to release my
changes (node, runtime, contract, indexer, on chain operation, frontend,
infrastructure) if any in PR title or description
- [ ] I waited and did best effort for `Effect gate, automatically
merged if passed`(effects-job) to finish with success(green check mark)
with my changes
- [ ] I have added at least one reviewer in reviewers list
- [ ] I tagged(@) or used other form of notification of one person who I
think can handle best review of this PR

---------

Co-authored-by: Rust Ninja <[email protected]>

.github/workflows/build-test-deploy.yml → .github/workflows/build-test-deploy-flaky.yml

@@ -1,14 +1,10 @@
-name: "Build, Test, Deploy"
+name: "build-test-deploy-flaky"
 on:
   push:
     branches:
       - release-*
       - main
-
-  # For regular PRs.    
   pull_request_target:
-
-  # For PRs that need to run in the monorepo context.
   pull_request:
 
 permissions: 

.github/workflows/pr.yaml → .github/workflows/pr-workflow-check.yaml

@@ -1,20 +1,19 @@
-name: "pr"
+name: "pr-workflow-check"
 concurrency:
-  group: ${{ github.workflow }}-pr-${{ github.event.pull_request.number || github.ref }}
+  group: ${{ github.workflow }}-pr-workflow-check-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 on:
   push:
     branches:
       - release-*
       - main  
-  pull_request_target:
   pull_request:  
   merge_group:
     types: [checks_requested]
 
 jobs:
-  pr-workflow:
+  pr-workflow-check:
     uses: ./.github/workflows/pr-workflow.yml
     with:
       github_event_name: ${{ github.event_name }}

.github/workflows/pr-workflow-fork.yaml

@@ -0,0 +1,22 @@
+name: "pr-workflow-fork"
+concurrency:
+  group: ${{ github.workflow }}-pr-workflow-fork-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+on:
+  pull_request_target:
+
+jobs:
+  pr-workflow-fork:
+    uses: ./.github/workflows/pr-workflow.yml
+    with:
+      github_event_name: ${{ github.event_name }}
+      github_event_pull_request_head_repo_id : ${{ github.event.pull_request.head.repo.id }}
+      github_workflow: $ {{ github.workflow }}
+      github_event_pull_request_head_sha: ${{ github.event.pull_request.head.sha }}
+    secrets:
+      CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}          
+      DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
+      DOCKER_HUB_ACCESS_TOKEN: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+      PABLO_PROJ_JSON: ${{ secrets.PABLO_PROJ_JSON }}
+      VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}

.github/workflows/pr-workflow.yml

@@ -1,4 +1,7 @@
-name: "build-test-deploy"
+name: "pr-workflow"
+concurrency:
+  group: ${{ github.workflow }}-pr-workflow-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 on:
   workflow_call:
     inputs:
@@ -507,6 +510,9 @@ jobs:
       steps:
         - run: |
             echo "probably no bugs"
+        - if: ${{ cancelled() }}
+          run: |
+            exit 42
         
   draft-release-artifacts:
     name: "draft-release-artifacts"    

code/parachain/frame/farming/src/benchmarking.rs

@@ -59,6 +59,7 @@ fn deposit_lp_tokens<T: Config>(
 	assert_ok!(Farming::<T>::deposit(
 		RawOrigin::Signed(account_id.clone()).into(),
 		pool_currency_id.into(),
+		amount
 	));
 }
 
@@ -104,7 +105,7 @@ benchmarks! {
 			100u32.into(),
 		));
 
-	}: _(RawOrigin::Signed(origin), pool_currency_id.into())
+	}: _(RawOrigin::Signed(origin), pool_currency_id.into(), 100u32.into())
 
 	withdraw {
 		let origin: T::AccountId = account("Origin", 0, 0);

code/parachain/frame/farming/src/lib.rs

@@ -323,10 +323,13 @@ pub mod pallet {
 		#[pallet::call_index(2)]
 		#[pallet::weight(T::WeightInfo::deposit())]
 		#[transactional]
-		pub fn deposit(origin: OriginFor<T>, pool_currency_id: AssetIdOf<T>) -> DispatchResult {
+		pub fn deposit(
+			origin: OriginFor<T>,
+			pool_currency_id: AssetIdOf<T>,
+			amount: BalanceOf<T>,
+		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
 			// reserve lp tokens to prevent spending
-			let amount = T::MultiCurrency::free_balance(pool_currency_id, &who);
 			T::MultiCurrency::reserve(pool_currency_id, &who, amount)?;
 
 			// deposit lp tokens as stake

code/parachain/frame/farming/src/tests.rs

@@ -128,7 +128,7 @@ fn should_overwrite_existing_schedule() {
 fn mint_and_deposit(account_id: AccountId, amount: Balance) {
 	assert_ok!(Tokens::set_balance(RuntimeOrigin::root(), account_id, POOL_CURRENCY_ID, amount, 0));
 
-	assert_ok!(Farming::deposit(RuntimeOrigin::signed(account_id), POOL_CURRENCY_ID,));
+	assert_ok!(Farming::deposit(RuntimeOrigin::signed(account_id), POOL_CURRENCY_ID, amount));
 }
 
 #[test]

terraform/github.com/branches.tf

@@ -11,7 +11,7 @@ resource "github_branch_protection" "main" {
     # Require branches to be up to date before merging
     strict   = false
     # Status checks that are required.
-    contexts = ["pr-workflow / draft-release-check"]
+    contexts = ["pr-workflow-check"]
   }
 
   # Require a pull request before merging