rebase with upstream main

.github/workflows/test.yml

@@ -18,4 +18,4 @@ jobs:
       - name: Patch Scarb.toml
         run: ./scripts/patchScarbToml.sh
 
-      - run: snforge test
+      - run: scarb run test

Scarb.toml

@@ -22,7 +22,7 @@ sort-module-level-items = true
 [[tool.snforge.fork]]
 name = "Mainnet"
 url = "https://starknet-mainnet.public.blastapi.io/rpc/v0_7"
-block_id.number = "652612" # "700000"
+block_id.number = "652612"
 
 [tool.voyager]
 singleton = { path = "singleton.cairo" }
@@ -37,7 +37,8 @@ createPosition = "scarb --profile release build && node --loader ts-node/esm ./s
 deployDevnet = "scarb --profile release build && node --loader ts-node/esm ./scripts/deployDevnet.ts"
 deployMainnet = "scarb --profile release build && node --loader ts-node/esm ./scripts/deployMainnet.ts"
 deploySepolia = "scarb --profile release build && node --loader ts-node/esm ./scripts/deploySepolia.ts"
-deployTimelock = "scarb --profile release build && node --loader ts-node/esm ./scripts/deployTimelock.ts"
+deployExtensions = "scarb --profile release build && node --loader ts-node/esm ./scripts/deployExtensions.ts"
+verifyPool = "scarb --profile release build && node --loader ts-node/esm ./scripts/verifyPool.ts"
 checkGasReport = "scarb --profile release build && node --loader ts-node/esm ./scripts/gasReport.ts --check"
 updateGasReport = "scarb --profile release build && node --loader ts-node/esm ./scripts/gasReport.ts --write"
-test = "snforge test"
+test = "snforge test --max-n-steps 100000000"

Scarb.toml.template

@@ -40,4 +40,4 @@ deploySepolia = "scarb --profile release build && node --loader ts-node/esm ./sc
 deployTimelock = "scarb --profile release build && node --loader ts-node/esm ./scripts/deployTimelock.ts"
 checkGasReport = "scarb --profile release build && node --loader ts-node/esm ./scripts/gasReport.ts --check"
 updateGasReport = "scarb --profile release build && node --loader ts-node/esm ./scripts/gasReport.ts --write"
-test = "snforge test"
+test = "snforge test --max-n-steps 10000000"

gas-report.txt

@@ -2,19 +2,19 @@ Summary:
 ┌─────────────┬─────────────────────────┬─────────┬────────────────┬────────────────┬─────────────────┬───────────┬──────────────┬──────────────────────────────┬───────────────┬──────────────────┬─────────┐
 │   (index)   │       Actual fee        │ Fee usd │ Fee without DA │ Gas without DA │ Computation gas │ Event gas │ Calldata gas │ Max computation per Category │ Storage diffs │      DA fee      │ DA mode │
 ├─────────────┼─────────────────────────┼─────────┼────────────────┼────────────────┼─────────────────┼───────────┼──────────────┼──────────────────────────────┼───────────────┼──────────────────┼─────────┤
-│ Create pool │ '1.452.040.000.000.000' │ 5.8081  │ 24840000000000 │      690       │       628       │    144    │      62      │           'steps'            │      206      │ 1427200000000000 │ 'BLOB'  │
-│    Lend     │  '111.768.000.000.000'  │  0.447  │ 15768000000000 │      438       │       436       │    12     │      2       │        'range_check'         │      12       │  96000000000000  │ 'BLOB'  │
-│  Transfer   │  '102.684.000.000.000'  │ 0.4107  │ 25884000000000 │      719       │       717       │     4     │      2       │        'range_check'         │       9       │  76800000000000  │ 'BLOB'  │
-│   Borrow    │  '146.900.000.000.000'  │ 0.5876  │ 18900000000000 │      525       │       523       │    13     │      2       │        'range_check'         │      16       │ 128000000000000  │ 'BLOB'  │
-│  Liquidate  │  '143.344.000.000.000'  │ 0.5733  │ 21744000000000 │      604       │       602       │    13     │      2       │        'range_check'         │      15       │ 121600000000000  │ 'BLOB'  │
+│ Create pool │ '1.914.464.000.000.000' │ 7.6578  │ 58464000000000 │      1624      │      1544       │    310    │      80      │        'range_check'         │      273      │ 1856000000000000 │ 'BLOB'  │
+│    Lend     │  '106.412.000.000.000'  │ 0.4256  │ 16812000000000 │      467       │       465       │    12     │      2       │        'range_check'         │      11       │  89600000000000  │ 'BLOB'  │
+│  Transfer   │  '102.900.000.000.000'  │ 0.4116  │ 26100000000000 │      725       │       723       │     4     │      2       │        'range_check'         │       9       │  76800000000000  │ 'BLOB'  │
+│   Borrow    │  '141.220.000.000.000'  │ 0.5648  │ 19620000000000 │      545       │       543       │    13     │      2       │        'range_check'         │      15       │ 121600000000000  │ 'BLOB'  │
+│  Liquidate  │  '143.668.000.000.000'  │ 0.5746  │ 22068000000000 │      613       │       611       │    13     │      2       │        'range_check'         │      15       │ 121600000000000  │ 'BLOB'  │
 └─────────────┴─────────────────────────┴─────────┴────────────────┴────────────────┴─────────────────┴───────────┴──────────────┴──────────────────────────────┴───────────────┴──────────────────┴─────────┘
 Resources:
 ┌─────────────┬─────────┬───────┬───────┬────────┬──────────┬──────────┬─────────────┬────────┐
 │   (index)   │ bitwise │ ec_op │ ecdsa │ keccak │ pedersen │ poseidon │ range_check │ steps  │
 ├─────────────┼─────────┼───────┼───────┼────────┼──────────┼──────────┼─────────────┼────────┤
-│ Create pool │   57    │   3   │   0   │   0    │   1019   │    1     │    14528    │ 251057 │
-│    Lend     │   26    │   3   │   0   │   0    │   134    │    0     │    10892    │ 93965  │
-│  Transfer   │   41    │   3   │   0   │   0    │   208    │    0     │    17924    │ 142928 │
-│   Borrow    │   33    │   3   │   0   │   0    │   146    │    0     │    13058    │ 107000 │
-│  Liquidate  │   33    │   3   │   0   │   0    │   175    │    0     │    15044    │ 117441 │
+│ Create pool │   138   │   3   │   0   │   0    │   1772   │    1     │    38582    │ 580349 │
+│    Lend     │   26    │   3   │   0   │   0    │   130    │    0     │    11619    │ 97475  │
+│  Transfer   │   41    │   3   │   0   │   0    │   208    │    0     │    18061    │ 143356 │
+│   Borrow    │   33    │   3   │   0   │   0    │   143    │    0     │    13568    │ 110481 │
+│  Liquidate  │   33    │   3   │   0   │   0    │   175    │    0     │    15268    │ 119184 │
 └─────────────┴─────────┴───────┴───────┴────────┴──────────┴──────────┴─────────────┴────────┘

lib/config.devnet.ts

@@ -1,3 +1,4 @@
+import { CairoCustomEnum } from "starknet";
 import CONFIG from "vesu_changelog/configurations/config_genesis_sn_main.json" assert { type: "json" };
 import { Config, EnvAssetParams, PERCENT, SCALE, toScale, toUtilizationScale } from ".";
 
@@ -27,7 +28,7 @@ const env = CONFIG.asset_parameters.map(
       asset.token.symbol,
       BigInt(asset.token.decimals),
       toScale(10000),
-      asset.oracle.pragma_key,
+      asset.pragma.pragma_key,
       price(asset.token.symbol),
       asset.token.is_legacy,
       BigInt(asset.fee_rate),
@@ -41,8 +42,12 @@ export const config: Config = {
   name: "devnet",
   protocol: {
     singleton: "0x0",
-    extension: "0x0",
-    oracle: "0x0",
+    extensionPO: "0x0",
+    extensionCL: "0x0",
+    pragma: {
+      oracle: "0x0",
+      summary_stats: "0x0",
+    },
   },
   env,
   pools: {
@@ -51,6 +56,7 @@ export const config: Config = {
       description: "",
       type: "",
       params: {
+        pool_name: "Genesis Pool",
         asset_params: CONFIG.asset_parameters.map((asset: any) => ({
           asset: "0x0",
           floor: toScale(asset.floor),
@@ -84,9 +90,12 @@ export const config: Config = {
           target_rate_percent: toScale(asset.target_rate_percent),
         })),
         pragma_oracle_params: CONFIG.asset_parameters.map((asset: any) => ({
-          pragma_key: asset.oracle.pragma_key,
+          pragma_key: asset.pragma.pragma_key,
           timeout: 0n,
           number_of_sources: 0n,
+          start_time_offset: 0n, // BigInt(asset.pragma.start_time_offset),
+          time_window: 0n, // BigInt(asset.pragma.time_window),
+          aggregation_mode: new CairoCustomEnum({ Median: {} }), // new CairoCustomEnum({ [(asset.pragma.aggregation_mode == 0) ? "Median" : "Error"]: {} })
         })),
         liquidation_params: CONFIG.pair_parameters.map((pair: any) => {
           const collateral_asset_index = CONFIG.asset_parameters.findIndex(
@@ -97,6 +106,15 @@ export const config: Config = {
           );
           return { collateral_asset_index, debt_asset_index, liquidation_factor: toScale(pair.liquidation_discount) };
         }),
+        debt_caps_params: CONFIG.pair_parameters.map((pair: any) => {
+          const collateral_asset_index = CONFIG.asset_parameters.findIndex(
+            (asset: any) => asset.asset_name === pair.collateral_asset_name,
+          );
+          const debt_asset_index = CONFIG.asset_parameters.findIndex(
+            (asset: any) => asset.asset_name === pair.debt_asset_name,
+          );
+          return { collateral_asset_index, debt_asset_index, debt_cap: toScale(pair.debt_cap) };
+        }),
         shutdown_params: {
           recovery_period: BigInt(CONFIG.pool_parameters.recovery_period),
           subscription_period: BigInt(CONFIG.pool_parameters.subscription_period),

lib/config.mainnet.ts

@@ -1,11 +1,11 @@
-import fs from "fs";
+import { CairoCustomEnum } from "starknet";
 import CONFIG from "vesu_changelog/configurations/config_genesis_sn_main.json" assert { type: "json" };
-import { Config, EnvAssetParams, PERCENT, SCALE, toScale, toUtilizationScale } from ".";
+// import CONFIG from "vesu_changelog/configurations/config_re7_usdc_sn_main.json" assert { type: "json" };
+// import CONFIG from "vesu_changelog/configurations/config_re7_xstrk_sn_main.json" assert { type: "json" };
+// import CONFIG from "vesu_changelog/configurations/config_re7_sstrk_sn_main.json" assert { type: "json" };
+import { Config, EnvAssetParams, SCALE, toScale, toUtilizationScale } from ".";
 
-let DEPLOYMENT: any = {};
-try {
-  DEPLOYMENT = JSON.parse(fs.readFileSync(`deployment-....json`, "utf-8"));
-} catch (error) {}
+import DEPLOYMENT from "vesu_changelog/deployments/deployment_sn_main.json" assert { type: "json" };
 
 const env = CONFIG.asset_parameters.map(
   (asset: any) =>
@@ -14,10 +14,10 @@ const env = CONFIG.asset_parameters.map(
       asset.token.symbol,
       BigInt(asset.token.decimals),
       0n,
-      asset.oracle.pragma_key,
+      asset.pragma.pragma_key,
       0n,
       asset.token.is_legacy,
-      BigInt(asset.fee_rate),
+      toScale(asset.fee_rate),
       asset.v_token.v_token_name,
       asset.v_token.v_token_symbol,
       asset.token.address,
@@ -28,16 +28,25 @@ export const config: Config = {
   name: "mainnet",
   protocol: {
     singleton: DEPLOYMENT.singleton || "0x0",
-    extension: DEPLOYMENT.extension || "0x0",
-    oracle: DEPLOYMENT.oracle || CONFIG.asset_parameters[0].oracle.address,
+    extensionPO: DEPLOYMENT.extensionPO || "0x0",
+    extensionCL: DEPLOYMENT.extensionCL || "0x0",
+    pragma: {
+      oracle: DEPLOYMENT.pragma.oracle || CONFIG.asset_parameters[0].pragma.oracle || "0x0",
+      summary_stats: DEPLOYMENT.pragma.summary_stats || CONFIG.asset_parameters[0].pragma.summary_stats || "0x0",
+    },
   },
   env,
   pools: {
     "genesis-pool": {
       id: 1n,
+      // id: 2198503327643286920898110335698706244522220458610657370981979460625005526824n, // Genesis Pool
+      // id: 3592370751539490711610556844458488648008775713878064059760995781404350938653n, // Re7 USDC
+      // id: 2345856225134458665876812536882617294246962319062565703131100435311373119841n, // Re7 xSTRK
+      // id: 1301140954640322725373945719229815062445705809076381949099585786202465661889n, // Re7 sSTRK
       description: "",
       type: "",
       params: {
+        pool_name: "Genesis Pool",
         asset_params: CONFIG.asset_parameters.map((asset: any) => ({
           asset: asset.token.address,
           floor: toScale(asset.floor),
@@ -71,9 +80,15 @@ export const config: Config = {
           target_rate_percent: toScale(asset.target_rate_percent),
         })),
         pragma_oracle_params: CONFIG.asset_parameters.map((asset: any) => ({
-          pragma_key: asset.oracle.pragma_key,
-          timeout: BigInt(asset.oracle.timeout),
-          number_of_sources: BigInt(asset.oracle.number_of_sources),
+          pragma_key: asset.pragma.pragma_key,
+          timeout: BigInt(asset.pragma.timeout),
+          number_of_sources: BigInt(asset.pragma.number_of_sources),
+          start_time_offset: BigInt(asset.pragma.start_time_offset),
+          time_window: BigInt(asset.pragma.time_window),
+          aggregation_mode:
+            asset.pragma.aggregation_mode == "median" || asset.pragma.aggregation_mode == "Median"
+              ? new CairoCustomEnum({ Median: {}, Mean: undefined, Error: undefined })
+              : new CairoCustomEnum({ Median: undefined, Mean: {}, Error: undefined }),
         })),
         liquidation_params: CONFIG.pair_parameters.map((pair: any) => {
           const collateral_asset_index = CONFIG.asset_parameters.findIndex(
@@ -84,6 +99,15 @@ export const config: Config = {
           );
           return { collateral_asset_index, debt_asset_index, liquidation_factor: toScale(pair.liquidation_discount) };
         }),
+        debt_caps_params: CONFIG.pair_parameters.map((pair: any) => {
+          const collateral_asset_index = CONFIG.asset_parameters.findIndex(
+            (asset: any) => asset.asset_name === pair.collateral_asset_name,
+          );
+          const debt_asset_index = CONFIG.asset_parameters.findIndex(
+            (asset: any) => asset.asset_name === pair.debt_asset_name,
+          );
+          return { collateral_asset_index, debt_asset_index, debt_cap: toScale(pair.debt_cap) };
+        }),
         shutdown_params: {
           recovery_period: BigInt(CONFIG.pool_parameters.recovery_period),
           subscription_period: BigInt(CONFIG.pool_parameters.subscription_period),
@@ -94,7 +118,7 @@ export const config: Config = {
             const debt_asset_index = CONFIG.asset_parameters.findIndex(
               (asset: any) => asset.asset_name === pair.debt_asset_name,
             );
-            return { collateral_asset_index, debt_asset_index, max_ltv: 90n * PERCENT };
+            return { collateral_asset_index, debt_asset_index, max_ltv: toScale(pair.shutdown_ltv) };
           }),
         },
         fee_params: { fee_recipient: CONFIG.pool_parameters.fee_recipient },