Merge remote-tracking branch 'origin/main' into loans/multi-cashflows

.github/actions/sccache-gcloud/action.yml

@@ -14,13 +14,13 @@ runs:
 
     - name: Auth gcloud
       id: gauth
-      uses: google-github-actions/auth@35b0e87d162680511bf346c299f71c9c5c379033 # @v1.1.1
+      uses: google-github-actions/auth@55bd3a7c6e2ae7cf1877fd1ccb9d54c0503c457c # @v2.1.2
       with:
         workload_identity_provider: ${{ inputs.GWIP }}
         service_account: ${{ inputs.GSA }}
 
     - name: Run sccache-cache
-      uses: mozilla-actions/sccache-action@8417cffc2ec64127ad83077aceaa8631f7cdc83e #v0.0.3
+      uses: mozilla-actions/sccache-action@2e7f9ec7921547d4b46598398ca573513895d0bd #v0.0.4
 
     - name: set GCS bucket sccache variables
       shell: bash

.github/workflows/build-docker.yml

@@ -3,11 +3,13 @@ on:
   # Keep in mind the Docker tagging on the "metadata" step if you add new triggers
   workflow_dispatch: # In case a repo contributor needs a specific docker tag built.
   push:
+    tags: ['v*.*.*']
     branches: [main]
   release:
     # Release logic:
     #  https://docs.github.com/en/webhooks/webhook-events-and-payloads?actionType=unpublished#release
-    types: [ created ] # GITHUB_REF == tag pushed with the release
+    # 
+    types: [ released ] # GITHUB_REF == tag pushed with the release
   pull_request:
     paths:
       - ".github/workflows/build-docker.yml"
@@ -35,13 +37,13 @@ jobs:
         uses: docker/setup-buildx-action@0d103c3126aa41d772a8362f6aa67afac040f80c #v3.1.0
 
       - name: DockerHub Registry Login
-        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20
+        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 #v3.1.0
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
 
       - name: Github Registry login
-        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20
+        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 #v3.1.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -55,7 +57,12 @@ jobs:
         with:
           images: |
             ghcr.io/centrifuge/centrifuge-chain
-            ${{ github.event_name != 'pull_request' && 'centrifugeio/centrifuge-chain' || ''}}
+            ${{ (github.event_name == 'release' || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))) && 'centrifugeio/centrifuge-chain' || ''}}
+          # TAGS:
+          # v.X.Y.Z when pushing a git tag (or a release)
+          # latest when triggered by a release
+          # PRXYZ when triggered from a PR (testing)
+          # {BRANCH_NAME} when triggered from branch push
           tags: |
             type=semver,pattern={{raw}},prefix=${{ matrix.target == 'test' && 'test-' || '' }}
             type=raw,value=latest,enable=${{ github.event_name == 'release' }}
@@ -77,7 +84,7 @@ jobs:
             core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
 
       - name: Build and push centrifugeio/centrifuge-chain
-        uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 #v5.1.0
+        uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 #v5.3.0
         with:
           context: .
           file: ./docker/centrifuge-chain/Dockerfile
@@ -105,12 +112,12 @@ jobs:
           enable-url-completion: true
 
       - name: Update GitHub release
-        if: github.event_name == 'release' && matrix.target == 'release'
+        if: github.event_name == 'release' && github.event.action == 'released' && matrix.target == 'release'
         uses: softprops/action-gh-release@v1
         with:
           append_body: true
           body: |
-            **Docker tags:**
+            **Docker tags (${{ env.NOW }}):**
                ${{ steps.meta.outputs.tags }}
 
       - if: failure()

.github/workflows/build-wasm.yml

@@ -27,7 +27,7 @@ jobs:
     steps:
     # PREP
       - name: Check out code
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab #3.5.2
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #4.1.4
 
       - name: Prep build on Ubuntu
         uses: ./.github/actions/prep-ubuntu

.github/workflows/codecov.yml

@@ -32,20 +32,21 @@ jobs:
           RUST_BACKTRACE: 1
         run: |
           cargo tarpaulin --timeout 300 -e runtime-integration-tests --features fast-runtime \
-          --exclude-files runtime/*/src/migrations.rs --exclude-files runtime/common/src/migrations \
-          --exclude-files pallets/rewards/src/migrations/new_instance.rs --exclude-files pallets/block-rewards/src/migrations.rs \
-          --workspace --exclude-files **/mock.rs **/weights.rs **/weights/* --out xml
+          --exclude-files runtime/*/src/migrations.rs \
+          --exclude-files runtime/common/src/migrations \
+          --exclude-files pallets/rewards/src/migrations/new_instance.rs \
+          --exclude-files pallets/block-rewards/src/migrations.rs \
+          --exclude-files **/mock.rs \
+          --exclude-files **/weights.rs \
+          --exclude-files **/weights/* \
+          --exclude-files node/ \
+          --exclude-files runtime \
+          --workspace --out xml
 
     # UPLOAD REPORTS (requires cargo 1.70.0)
       - name: Upload to codecov.io
-        if: ${{ always() }}
         uses: codecov/codecov-action@v3
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
-          # token: ${{ secrets.CODECOV_TOKEN }}
-          # files: ./coverage1.xml,./coverage2.xml # optional
-          # flags: unittests # optional
-          # name: codecov-umbrella # optional
-          fail_ci_if_error: true # optional (default = false)
           verbose: true # optional (default = false)       

.github/workflows/deploy-docs.yml

@@ -58,7 +58,7 @@ jobs:
           done
 
       - name: upload Docs files
-        uses: actions/upload-pages-artifact@0252fc4ba7626f0298f0cf00902a25c6afc77fa8 # v3.0
+        uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.0
         with:
           path: ./target/doc
 

.github/workflows/sanity-checks.yml

@@ -17,7 +17,7 @@ jobs:
                  lint-fmt, lint-clippy, cargo-build, docs-build, lint-taplo]
     steps:
       - name: Check out code
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab #3.5.2
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #4.1.4
 
       - name: Prep build
         uses: ./.github/actions/prep-ubuntu
@@ -41,7 +41,7 @@ jobs:
         runtime: [altair, centrifuge]
     steps:
       - name: Check out code
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab #3.5.2
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b #4.1.4
 
       - name: Prep build
         uses: ./.github/actions/prep-ubuntu

codecov.yaml

@@ -0,0 +1,7 @@
+github_checks:
+    annotations: false
+coverage:
+  status:
+    project:
+      default:
+        informational: true

libs/types/src/oracles.rs

@@ -1,3 +1,4 @@
+use cfg_primitives::{LoanId, PoolId};
 use frame_support::pallet_prelude::RuntimeDebug;
 use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
@@ -26,10 +27,18 @@ pub type Isin = [u8; 12];
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub enum OracleKey {
 	/// Identify a Isin price
+	#[codec(index = 0)]
 	Isin(Isin),
 
 	/// Identify a conversion from the first currency to the second one
+	#[codec(index = 1)]
 	ConversionRatio(CurrencyId, CurrencyId),
+
+	/// Identifies a single pool-loan-id combination.
+	/// This key is a fallback solution if no other keys are applicable for the
+	/// given oracle.
+	#[codec(index = 2)]
+	PoolLoanId(PoolId, LoanId),
 }
 
 impl From<(CurrencyId, CurrencyId)> for OracleKey {

pallets/loans/src/lib.rs

@@ -839,7 +839,7 @@ pub mod pallet {
 				Err(Error::<T>::UnrelatedChangeId)?
 			};
 
-			let (_, _count) = Self::transfer_debt_action(
+			let (repaid_amount, _count) = Self::transfer_debt_action(
 				&who,
 				pool_id,
 				from_loan_id,
@@ -946,7 +946,7 @@ pub mod pallet {
 			repaid_amount: RepaidInput<T>,
 			borrow_amount: PrincipalInput<T>,
 			permissionless: bool,
-		) -> Result<(T::Balance, u32), DispatchError> {
+		) -> Result<(RepaidInput<T>, u32), DispatchError> {
 			ensure!(
 				from_loan_id != to_loan_id,
 				Error::<T>::TransferDebtToSameLoan
@@ -963,7 +963,7 @@ pub mod pallet {
 			let count =
 				Self::borrow_action(who, pool_id, to_loan_id, &borrow_amount, permissionless)?;
 
-			Ok((repaid_amount.repaid_amount()?.total()?, count))
+			Ok((repaid_amount, count))
 		}
 
 		/// Set the maturity date of the loan to this instant.

pallets/loans/src/tests/mod.rs

@@ -18,7 +18,7 @@ use super::{
 			ActivePricing, Pricing,
 		},
 	},
-	pallet::{ActiveLoans, CreatedLoan, Error, LastLoanId, PortfolioValuation},
+	pallet::{ActiveLoans, CreatedLoan, Error, Event, LastLoanId, PortfolioValuation},
 	types::{
 		cashflow::{
 			tests::{last_secs_from_ymd, secs_from_ymdhms},

pallets/loans/src/tests/repay_loan.rs

@@ -162,18 +162,29 @@ fn with_success_half_amount() {
 		let loan_id = util::create_loan(util::base_internal_loan());
 		util::borrow_loan(loan_id, PrincipalInput::Internal(COLLATERAL_VALUE / 2));
 
+		let amount = RepaidInput {
+			principal: PrincipalInput::Internal(COLLATERAL_VALUE / 2),
+			interest: 1234, /* Will not be used */
+			unscheduled: 0,
+		};
+
 		config_mocks(COLLATERAL_VALUE / 2);
 		assert_ok!(Loans::repay(
 			RuntimeOrigin::signed(BORROWER),
 			POOL_A,
 			loan_id,
-			RepaidInput {
-				principal: PrincipalInput::Internal(COLLATERAL_VALUE / 2),
-				interest: 0,
-				unscheduled: 0,
-			},
+			amount.clone()
 		));
 		assert_eq!(0, util::current_loan_debt(loan_id));
+
+		System::assert_last_event(RuntimeEvent::Loans(Event::Repaid {
+			pool_id: POOL_A,
+			loan_id: loan_id,
+			amount: RepaidInput {
+				interest: 0,
+				..amount
+			},
+		}));
 	});
 }
 

pallets/loans/src/tests/transfer_debt.rs

@@ -361,7 +361,7 @@ fn with_success_internals() {
 
 		let repay_amount = RepaidInput {
 			principal: PrincipalInput::Internal(COLLATERAL_VALUE),
-			interest: 0,
+			interest: 1234, /* Will not be used */
 			unscheduled: 0,
 		};
 		let borrow_amount = PrincipalInput::Internal(COLLATERAL_VALUE);
@@ -372,8 +372,8 @@ fn with_success_internals() {
 			POOL_A,
 			loan_1,
 			loan_2,
-			repay_amount,
-			borrow_amount,
+			repay_amount.clone(),
+			borrow_amount.clone(),
 		));
 
 		assert_ok!(Loans::apply_transfer_debt(
@@ -384,6 +384,17 @@ fn with_success_internals() {
 
 		assert_eq!(0, util::current_loan_debt(loan_1));
 		assert_eq!(COLLATERAL_VALUE, util::current_loan_debt(loan_2));
+
+		System::assert_last_event(RuntimeEvent::Loans(Event::DebtTransferred {
+			pool_id: POOL_A,
+			from_loan_id: loan_1,
+			to_loan_id: loan_2,
+			repaid_amount: RepaidInput {
+				interest: 0,
+				..repay_amount
+			},
+			borrow_amount,
+		}));
 	});
 }