fixing profiler + upgrade gas report

argentlabs · Jun 10, 2024 · dd4727e · dd4727e
1 parent 0859e8a
commit dd4727e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/gas-report.txt b/gas-report.txt
@@ -2,17 +2,17 @@ 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 │
 ├───────────────────────┼─────────────────────┼─────────┼────────────────┼────────────────┼─────────────────┼───────────┼──────────────┼──────────────────────────────┼───────────────┼────────┼─────────┤
-│ Deposit (txV3: false) │ '1.116.000.000.352' │ 0.0044  │ 1116000000000  │       31       │       30        │     4     │      1       │           'steps'            │       4       │  352   │ 'BLOB'  │
-│  Claim (txV3: false)  │ '1.260.000.000.192' │  0.005  │ 1260000000000  │       35       │       34        │     2     │      1       │           'steps'            │       3       │  192   │ 'BLOB'  │
-│ Deposit (txV3: true)  │ '1.116.000.000.480' │ 0.0044  │ 1116000000000  │       31       │       30        │     4     │      1       │           'steps'            │       5       │  480   │ 'BLOB'  │
-│  Claim (txV3: true)   │ '1.260.000.000.192' │    0    │ 1260000000000  │       35       │       34        │     2     │      1       │           'steps'            │       3       │  192   │ 'BLOB'  │
+│ Deposit (txV3: false) │ '1.152.000.000.352' │ 0.0046  │ 1152000000000  │       32       │       31        │     4     │      1       │           'steps'            │       4       │  352   │ 'BLOB'  │
+│  Claim (txV3: false)  │ '1.332.000.000.192' │ 0.0053  │ 1332000000000  │       37       │       35        │     2     │      2       │           'steps'            │       3       │  192   │ 'BLOB'  │
+│ Deposit (txV3: true)  │ '1.152.000.000.480' │ 0.0046  │ 1152000000000  │       32       │       31        │     4     │      1       │           'steps'            │       5       │  480   │ 'BLOB'  │
+│  Claim (txV3: true)   │ '1.332.000.000.192' │    0    │ 1332000000000  │       37       │       35        │     2     │      2       │           'steps'            │       3       │  192   │ 'BLOB'  │
 └───────────────────────┴─────────────────────┴─────────┴────────────────┴────────────────┴─────────────────┴───────────┴──────────────┴──────────────────────────────┴───────────────┴────────┴─────────┘
 Resources:
 ┌───────────────────────┬─────────┬───────┬───────┬────────┬──────────┬──────────┬─────────────┬───────┐
 │        (index)        │ bitwise │ ec_op │ ecdsa │ keccak │ pedersen │ poseidon │ range_check │ steps │
 ├───────────────────────┼─────────┼───────┼───────┼────────┼──────────┼──────────┼─────────────┼───────┤
-│ Deposit (txV3: false) │    0    │   3   │   0   │   0    │    38    │    0     │     273     │ 11991 │
-│  Claim (txV3: false)  │    0    │   3   │   0   │   0    │    71    │    0     │     456     │ 13228 │
-│ Deposit (txV3: true)  │    0    │   3   │   0   │   0    │    38    │    0     │     273     │ 11992 │
-│  Claim (txV3: true)   │    0    │   3   │   0   │   0    │    71    │    0     │     490     │ 13426 │
+│ Deposit (txV3: false) │    0    │   3   │   0   │   0    │    39    │    0     │     281     │ 12154 │
+│  Claim (txV3: false)  │    0    │   3   │   0   │   0    │    75    │    0     │     475     │ 13657 │
+│ Deposit (txV3: true)  │    0    │   3   │   0   │   0    │    39    │    0     │     281     │ 12155 │
+│  Claim (txV3: true)   │    0    │   3   │   0   │   0    │    75    │    0     │     509     │ 13855 │
 └───────────────────────┴─────────┴───────┴───────┴────────┴──────────┴──────────┴─────────────┴───────┘
diff --git a/scripts/profile.ts b/scripts/profile.ts
@@ -3,6 +3,7 @@ import { LegacyStarknetKeyPair, deployer, manager } from "../lib";
 import { newProfiler } from "../lib/gas";
 
 // TODO add this in CI, skipped atm to avoid false failing tests
+// TODO Add possibility to "mix" gift_token and fee_token 
 
 const profiler = newProfiler(manager);
 
@@ -29,26 +30,28 @@ for (const useTxV3 of [false, true]) {
   await tokenContract.approve(factory.address, amount + maxFee);
   await profiler.profile(
     `Deposit (txV3: ${useTxV3})`,
-    await factory.deposit(amount, maxFee, tokenContract.address, claimPubkey),
+    await factory.deposit(tokenContract.address, amount, tokenContract.address, maxFee, claimPubkey),
   );
 
   // Ensure there is a contract for the claim
   const claimAddress = await factory.get_claim_address(
     claimAccountClassHash,
     deployer.address,
+    tokenContract.address,
     amount,
-    maxFee,
     tokenContract.address,
+    maxFee,
     claimPubkey,
   );
 
   const claim = {
     factory: factory.address,
     class_hash: claimAccountClassHash,
     sender: deployer.address,
-    amount: uint256.bnToUint256(amount),
-    max_fee: maxFee,
-    token: tokenContract.address,
+    gift_token: tokenContract.address,
+    gift_amount: uint256.bnToUint256(amount),
+    fee_token: tokenContract.address,
+    fee_amount: maxFee,
     claim_pubkey: claimPubkey,
   };