Final submission

Author: atoumbre

7-defi-devpost/kl_protocol/README.md

@@ -81,4 +81,43 @@ Another feature made available by the LendingPoolManager is liquidation. Liquida
 
 
 
-There are two types of liquidation: The manual liquidation, that is available to any user and auto_liquidation that is reserved to admin batch liquidation. Both have different mechanics. Manual liquidation targets a specific collateral that the liquidator wants and provides required loan payment to get the liquidation to happen. On the other end, auto_liquidation analyzes the whole CDP and performs direct asset sales to improve the health factor.
+There are two types of liquidation: The manual liquidation, that is available to any user and auto_liquidation that is reserved to admin batch liquidation. Both have different mechanics. Manual liquidation targets a specific collateral that the liquidator wants and provides required loan payment to get the liquidation to happen. On the other end, auto_liquidation analyzes the whole CDP and performs direct asset sales to improve the health factor.
+
+nter image description here](https://res.cloudinary.com/daisvxhyu/image/upload/v1679682535/action_flow_fxh6v4.png)
+
+## Testing
+
+KL Protocol is shipped with a fully function App available to try feature like lending and borrowing. Not all feature from the blueprint are implemented like multiple interns rate scheme. and flash loan to swap debit or collateral. For a compete test of all feature, we create some resim tests script written in Javascript using google ZX library. testing script are in the /simulation forder and can be run using the command:
+
+    cd simulation
+    npm i
+    npm start
+
+The user interface is a Sveltkit project using the Radix Developper Toolkit to interact with the Radix Betanet.
+To get started, navigate to the /frontend folder and run 
+
+    cd frontend
+    npm i
+    nmp run dev
+
+This will spin p a dev server and you will get and home page with tree menu option. Cliec the admin menu this will give you the Dap setup page as show bellow:
+
+![Admin menu for setting app KL Protocol](https://res.cloudinary.com/daisvxhyu/image/upload/v1679684371/Radix/ui_setup.png)
+
+Once the setup complete the admin app will look like the picture bellow. the admin screen also make possible to change price of Faucet asset to help simulate variation on loan heal factors.
+
+![Setup completed](https://res.cloudinary.com/daisvxhyu/image/upload/v1679684371/Radix/ui_setup_completed.png)
+
+From there you can go to the Faucet menu to get some test resources:
+
+![Faucet for test resources](https://res.cloudinary.com/daisvxhyu/image/upload/v1679684370/Radix/faucet.png)
+
+Now we can go to the App menu and start playing with the protocol. For the borrowing feature, you will need to mint a CDP NFT :
+
+![CDP NFT Is required for borring](https://res.cloudinary.com/daisvxhyu/image/upload/v1679684370/Radix/borrowing_first_pages.png)
+
+Some screenshot of the DAPP:
+
+![The BORROW page](https://res.cloudinary.com/daisvxhyu/image/upload/v1679684370/Radix/borrowing.png)
+
+![The LENDING page](https://res.cloudinary.com/daisvxhyu/image/upload/v1679684372/Radix/lending.png)

7-defi-devpost/kl_protocol/frontend/img/action_flow.png

@@ -1,8 +1,7 @@
 Tx ID
-829c45f749c4ca86765132e45a4bb6b3b7a2e830775336eb511db97f6e5ac4cb
+c18ae6fb1e217d5c17d2f7f5bf445578b64e90887fc58a55ec3f5cda83071899
 Package address
-package_tdx_b_1qy8fdtykc2m0kuprfqy6cxk88r938rr4ty8zyxlcdfxq9srfny
+package_tdx_b_1q8c5vknglhcqw7nrg83yrwmrhy69xndpk4ndmnect29s7n56us
 
-
-a58ac3bf64665067c87bcca05a5d6905257f4e70b69ec222e44041e7d603cb85
-component_tdx_b_1q25sgetk4q4r4znhpgzj4ypdk8uqxv74edcjh72t7xysg398qd
+30844b13b5856810ca7a213d7b7424d43ab22a3b5623b048d0f6a08d8fd23a99
+e92b9a78f25c8ae4b884fd2a172e02ae29434d4f0ba5e77dfa70b2261e0e8735

7-defi-devpost/kl_protocol/frontend/img/borrowing.png

@@ -34,6 +34,7 @@
 		"@svelteuidev/core": "^0.10.0",
 		"radix-icons-svelte": "^1.2.1",
 		"svelte-forms": "^2.3.1",
-		"svelte-local-storage-store": "^0.4.0"
+		"svelte-local-storage-store": "^0.4.0",
+		"svelte-modals": "^1.2.1"
 	}
 }

7-defi-devpost/kl_protocol/frontend/img/borrowing_first_pages.png

@@ -1,5 +1,11 @@
-import { persisted } from "svelte-local-storage-store";
-import { XRD } from "./transactions/admin";
+
+
+
+// export const TIME_FACTOR = 32
+export const INTEREST_RATE_TYPE = 1
+export const XRD = 'resource_tdx_b_1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq8z96qp'
+export const DAPP_ID = ''
+export const PACKAGE_ADDRESS = ''
 
 export type PoolInfo = {
     //
@@ -18,36 +24,18 @@ export type PoolInfo = {
     liquidation_closing_factor: number;
 }
 
-let _price_chages: Record<string, number> = {}
-
-export const price_changes = persisted('price_changes', _price_chages)
-
-export const dapp_data = persisted('persited_data', {
-    accountAddress: '',
-    dAppId: 'account_tdx_b_1pqwzpeqv8mph3u80g5zch24gtpky3wy3demlg6ta6q4qhkdpd8',
-    packageAddress: 'package_tdx_b_1qy8fdtykc2m0kuprfqy6cxk88r938rr4ty8zyxlcdfxq9srfny',
-
-    faucetComponentAddress: '',
-    faucetAdminBadgeAddress: '',
-    faucetCreationTxHash: '',
-
-    lendingMarketCreationTxHash: '',
-    lendingMarketComponentAddress: '',
-    lendingMarketAdminBadgeAddress: '',
-})
-
 export const default_asset_list: PoolInfo[] = [
-    {
-        resource_address: XRD,
-        symbol: 'XRD',
-        name: 'Radix',
-        icon: 'https://s2.coinmarketcap.com/static/img/coins/64x64/11948.png',
-        initial_price: 250,
-        liquidation_threshold: 0.7,
-        liquidation_closing_factor: 0.5,
-        liquidation_spread: 0.05,
-        flashloan_fee_rate: 0.05
-    },
+    // {
+    //     resource_address: XRD,
+    //     symbol: 'XRD',
+    //     name: 'Radix',
+    //     icon: 'https://s2.coinmarketcap.com/static/img/coins/64x64/11948.png',
+    //     initial_price: 250,
+    //     liquidation_threshold: 0.7,
+    //     liquidation_closing_factor: 0.5,
+    //     liquidation_spread: 0.05,
+    //     flashloan_fee_rate: 0.05
+    // },
     {
         symbol: 'BTC',
         name: 'Bitcoin',

7-defi-devpost/kl_protocol/frontend/img/faucet.png

@@ -1,4 +1,6 @@
-import { load_faucet_state, load_manager_pool_state } from '$lib/state/pool_state';
+import { loan_user_resources } from '$lib/state/account';
+import { dapp_state } from '$lib/state/dapp';
+import { load_manager_pool_state, } from '$lib/state/lending_pool_manager';
 import {
     StateApi,
     StatusApi,
@@ -7,7 +9,6 @@ import {
 } from '@radixdlt/babylon-gateway-api-sdk';
 import { RadixDappToolkit } from "@radixdlt/radix-dapp-toolkit";
 import { get } from 'svelte/store';
-import { dapp_data } from '../data';
 
 
 export const dAppId = 'account_tdx_b_1pqwzpeqv8mph3u80g5zch24gtpky3wy3demlg6ta6q4qhkdpd8'
@@ -29,14 +30,17 @@ export const rdt = RadixDappToolkit(
         }).map(({ data: { accounts } }) => {
             console.log(accounts)
             if (accounts == undefined) return
-            dapp_data.set({ ...get(dapp_data), accountAddress: (accounts.length >= 1 ? accounts[0].address : '') })
+            dapp_state.set({ ...get(dapp_state), accountAddress: (accounts.length >= 1 ? accounts[0].address : '') })
 
+            update_dapp_state(0)
         });
+
+
     },
     {
         networkId: 11,
         onDisconnect: () => {
-            dapp_data.set({ ...get(dapp_data), accountAddress: '' })
+            dapp_state.set({ ...get(dapp_state), accountAddress: '' })
         },
         onInit: async (data) => {
 
@@ -45,18 +49,20 @@ export const rdt = RadixDappToolkit(
             let accounts = data.accounts
 
             if (accounts == undefined || accounts.length === 0) {
-                dapp_data.set({ ...get(dapp_data), accountAddress: '' })
+                dapp_state.set({ ...get(dapp_state), accountAddress: '' })
             } else {
-                dapp_data.set({ ...get(dapp_data), accountAddress: (accounts.length >= 1 ? accounts[0].address : '') })
-
-                let state = await stateApi.entityResources({ entityResourcesRequest: { address: accounts[0].address } })
-
-                console.log(state)
-
-                await load_faucet_state()
-                await load_manager_pool_state()
+                dapp_state.set({ ...get(dapp_state), accountAddress: (accounts.length >= 1 ? accounts[0].address : '') })
             }
 
+            update_dapp_state(0)
         }
     }
 );
+
+
+export function update_dapp_state(waiting_time = 1000) {
+    setTimeout(async () => {
+        await load_manager_pool_state()
+        await loan_user_resources()
+    }, waiting_time);
+}

7-defi-devpost/kl_protocol/frontend/img/lending.png

@@ -0,0 +1,54 @@
+import { openModal, closeModal } from "svelte-modals";
+import { rdt, update_dapp_state } from "./api/rdt";
+
+
+import Modal1 from '$lib/modals/Modal1.svelte';
+import NumberInputModal from '$lib/modals/NumberInputModal.svelte';
+import type { ManifestBuilder } from "@radixdlt/radix-dapp-toolkit";
+
+
+export async function send_transaction(txManifest: ManifestBuilder) {//, callback: Function = async () => undefined) {
+    openModal(Modal1, { title: '' });
+
+    let transactionManifest = txManifest.build().toString()
+
+    console.log(transactionManifest)
+
+    let result = await rdt.sendTransaction({
+        transactionManifest,
+        version: 1
+    });
+
+    console.log(result)
+
+    if (result.isErr()) {
+
+        closeModal();
+
+
+        throw result.error
+        ///
+    } else {
+
+    }
+
+    closeModal();
+
+    window.location.reload();
+
+    update_dapp_state()
+
+    // return result
+}
+
+
+export async function get_number_input(
+    { title, min, max, onSubmit }
+        : { title: string; min: number; max: number; onSubmit: (input: number) => any; }
+) {
+    openModal(NumberInputModal, {
+        title,
+        min, max,
+        onclick: onSubmit,
+    });
+}

7-defi-devpost/kl_protocol/overview.png renamed to 7-defi-devpost/kl_protocol/frontend/img/overview.png

@@ -0,0 +1,31 @@
+<script lang="ts">
+	import { format_number } from '$lib/utils';
+	import { Group, Text, type SvelteUINumberSize } from '@svelteuidev/core';
+
+	// export let market: PoolState;
+	// export let cdp_id: string;
+
+	export let label: string;
+	export let amount: number;
+	export let price: number = 0;
+	export let size: SvelteUINumberSize = 'sm';
+	export let price_size: SvelteUINumberSize = 'xs';
+	export let percent = false;
+	export let short = false;
+</script>
+
+<Group position="center" noWrap spacing="xs">
+	<Text {size}>{label} :</Text>
+
+	{#if !percent}
+		<Text {size} weight={'bold'}>{format_number(amount, short ? 'compact' : undefined)}</Text>
+		{#if price != 0}
+			<Text size={price_size}
+				>(${format_number(price * amount, short ? 'compact' : undefined)})</Text
+			>
+		{/if}
+	{:else}
+		<Text {size} weight={'bold'}>{format_number(amount * 100, undefined)} %</Text>
+		<!-- else content here -->
+	{/if}
+</Group>

7-defi-devpost/kl_protocol/frontend/img/ui_setup.png

@@ -1,6 +1,5 @@
 <script lang="ts">
 	import { Card, Container, Group, Space, Text, Image } from '@svelteuidev/core';
-	import type { PoolInfo } from '../models';
 
 	export let name: string;
 	export let value: number | undefined;

7-defi-devpost/kl_protocol/frontend/img/ui_setup_completed.png

@@ -0,0 +1,16 @@
+<script lang="ts">
+	import { Loader, Modal } from '@svelteuidev/core';
+	import { closeModal } from 'svelte-modals';
+
+	// provided by <Modals />
+	export let isOpen: boolean;
+
+	export let title: string;
+	// export let message: string;
+</script>
+
+{#if isOpen}
+	<Modal centered opened={isOpen} withCloseButton={false} size="xs" {title}>
+		<Loader size="lg" />
+	</Modal>
+{/if}