fix(lr): remove withdrawer uncomplete clear signing

README.md

@@ -138,11 +138,11 @@ The flow processed in [GitHub Actions](https://github.com/features/actions) is t
 
 ### Queue Withdrawals
 
-![](/tests/snapshots/nanos_lrQueueWithdrawals_1_2_dimension/00000.png) ![](/tests/snapshots/nanos_lrQueueWithdrawals_1_2_dimension/00001.png) ![](/tests/snapshots/nanos_lrQueueWithdrawals_1_2_dimension/00002.png) ![](/tests/snapshots/nanos_lrQueueWithdrawals_1_2_dimension/00003.png) ![](/tests/snapshots/nanos_lrQueueWithdrawals_1_2_dimension/00004.png) ![](/tests/snapshots/nanos_lrQueueWithdrawals_1_2_dimension/00005.png) ![](/tests/snapshots/nanos_lrQueueWithdrawals_1_2_dimension/00006.png) ![](/tests/snapshots/nanos_lrQueueWithdrawals_1_2_dimension/00007.png) ![](/tests/snapshots/nanos_lrQueueWithdrawals_1_2_dimension/00008.png) ![](/tests/snapshots/nanos_lrQueueWithdrawals_1_2_dimension/00009.png) ![](/tests/snapshots/nanos_lrQueueWithdrawals_1_2_dimension/00010.png)
+![](/tests/snapshots/nanos_lrQueueWithdrawals_1_2_dimension/00000.png) ![](/tests/snapshots/nanos_lrQueueWithdrawals_1_2_dimension/00001.png) ![](/tests/snapshots/nanos_lrQueueWithdrawals_1_2_dimension/00002.png) ![](/tests/snapshots/nanos_lrQueueWithdrawals_1_2_dimension/00003.png) ![](/tests/snapshots/nanos_lrQueueWithdrawals_1_2_dimension/00004.png) ![](/tests/snapshots/nanos_lrQueueWithdrawals_1_2_dimension/00005.png) ![](/tests/snapshots/nanos_lrQueueWithdrawals_1_2_dimension/00006.png) ![](/tests/snapshots/nanos_lrQueueWithdrawals_1_2_dimension/00007.png)
 
 ### LR Complete Queued Withdrawals
 
-![](/tests/snapshots/nanos_lrCompleteQueuedWithdrawals/00000.png) ![](/tests/snapshots/nanos_lrCompleteQueuedWithdrawals/00001.png) ![](/tests/snapshots/nanos_lrCompleteQueuedWithdrawals/00002.png) ![](/tests/snapshots/nanos_lrCompleteQueuedWithdrawals/00003.png) ![](/tests/snapshots/nanos_lrCompleteQueuedWithdrawals/00004.png) ![](/tests/snapshots/nanos_lrCompleteQueuedWithdrawals/00005.png) ![](/tests/snapshots/nanos_lrCompleteQueuedWithdrawals/00006.png) ![](/tests/snapshots/nanos_lrCompleteQueuedWithdrawals/00007.png) ![](/tests/snapshots/nanos_lrCompleteQueuedWithdrawals/00008.png) ![](/tests/snapshots/nanos_lrCompleteQueuedWithdrawals/00009.png) ![](/tests/snapshots/nanos_lrCompleteQueuedWithdrawals/000010.png) ![](/tests/snapshots/nanos_lrCompleteQueuedWithdrawals/000011.png) ![](/tests/snapshots/nanos_lrCompleteQueuedWithdrawals/000012.png) ![](/tests/snapshots/nanos_lrCompleteQueuedWithdrawals/000013.png)
+![](/tests/snapshots/nanos_lrCompleteQueuedWithdrawals/00000.png) ![](/tests/snapshots/nanos_lrCompleteQueuedWithdrawals/00001.png) ![](/tests/snapshots/nanos_lrCompleteQueuedWithdrawals/00002.png) ![](/tests/snapshots/nanos_lrCompleteQueuedWithdrawals/00003.png) ![](/tests/snapshots/nanos_lrCompleteQueuedWithdrawals/00004.png) ![](/tests/snapshots/nanos_lrCompleteQueuedWithdrawals/00005.png) ![](/tests/snapshots/nanos_lrCompleteQueuedWithdrawals/00006.png) ![](/tests/snapshots/nanos_lrCompleteQueuedWithdrawals/00007.png) ![](/tests/snapshots/nanos_lrCompleteQueuedWithdrawals/00008.png) ![](/tests/snapshots/nanos_lrCompleteQueuedWithdrawals/00009.png) ![](/tests/snapshots/nanos_lrCompleteQueuedWithdrawals/000010.png)
 
 ## NANO X
 
@@ -210,8 +210,8 @@ The flow processed in [GitHub Actions](https://github.com/features/actions) is t
 
 ### Queue Withdrawals
 
-![](/tests/snapshots/nanox_lrQueueWithdrawals_1_2_dimension/00000.png) ![](/tests/snapshots/nanox_lrQueueWithdrawals_1_2_dimension/00001.png) ![](/tests/snapshots/nanox_lrQueueWithdrawals_1_2_dimension/00002.png) ![](/tests/snapshots/nanox_lrQueueWithdrawals_1_2_dimension/00003.png) ![](/tests/snapshots/nanox_lrQueueWithdrawals_1_2_dimension/00004.png) ![](/tests/snapshots/nanox_lrQueueWithdrawals_1_2_dimension/00005.png) ![](/tests/snapshots/nanox_lrQueueWithdrawals_1_2_dimension/00006.png) ![](/tests/snapshots/nanox_lrQueueWithdrawals_1_2_dimension/00007.png) ![](/tests/snapshots/nanox_lrQueueWithdrawals_1_2_dimension/00008.png)
+![](/tests/snapshots/nanox_lrQueueWithdrawals_1_2_dimension/00000.png) ![](/tests/snapshots/nanox_lrQueueWithdrawals_1_2_dimension/00001.png) ![](/tests/snapshots/nanox_lrQueueWithdrawals_1_2_dimension/00002.png) ![](/tests/snapshots/nanox_lrQueueWithdrawals_1_2_dimension/00003.png) ![](/tests/snapshots/nanox_lrQueueWithdrawals_1_2_dimension/00004.png) ![](/tests/snapshots/nanox_lrQueueWithdrawals_1_2_dimension/00005.png) ![](/tests/snapshots/nanox_lrQueueWithdrawals_1_2_dimension/00006.png) ![](/tests/snapshots/nanox_lrQueueWithdrawals_1_2_dimension/00007.png)
 
 ### LR Complete Queued Withdrawals
 
-![](/tests/snapshots/nanox_lrCompleteQueuedWithdrawals/00000.png) ![](/tests/snapshots/nanox_lrCompleteQueuedWithdrawals/00001.png) ![](/tests/snapshots/nanox_lrCompleteQueuedWithdrawals/00002.png) ![](/tests/snapshots/nanox_lrCompleteQueuedWithdrawals/00003.png) ![](/tests/snapshots/nanox_lrCompleteQueuedWithdrawals/00004.png) ![](/tests/snapshots/nanox_lrCompleteQueuedWithdrawals/00005.png) ![](/tests/snapshots/nanox_lrCompleteQueuedWithdrawals/00006.png) ![](/tests/snapshots/nanox_lrCompleteQueuedWithdrawals/00007.png) ![](/tests/snapshots/nanox_lrCompleteQueuedWithdrawals/00008.png) ![](/tests/snapshots/nanox_lrCompleteQueuedWithdrawals/00009.png) ![](/tests/snapshots/nanox_lrCompleteQueuedWithdrawals/000010.png)
+![](/tests/snapshots/nanox_lrCompleteQueuedWithdrawals/00000.png) ![](/tests/snapshots/nanox_lrCompleteQueuedWithdrawals/00001.png) ![](/tests/snapshots/nanox_lrCompleteQueuedWithdrawals/00002.png) ![](/tests/snapshots/nanox_lrCompleteQueuedWithdrawals/00003.png) ![](/tests/snapshots/nanox_lrCompleteQueuedWithdrawals/00004.png) ![](/tests/snapshots/nanox_lrCompleteQueuedWithdrawals/00005.png) ![](/tests/snapshots/nanox_lrCompleteQueuedWithdrawals/00006.png) ![](/tests/snapshots/nanox_lrCompleteQueuedWithdrawals/00007.png) ![](/tests/snapshots/nanox_lrCompleteQueuedWithdrawals/00008.png) ![](/tests/snapshots/nanox_lrCompleteQueuedWithdrawals/00009.png)

src/handle_finalize.c

@@ -48,8 +48,8 @@ void handle_finalize(ethPluginFinalize_t *msg) {
         case KILN_LR_QUEUE_WITHDRAWALS: {
             {
                 lr_queue_withdrawals_t *params = &context->param_data.lr_queue_withdrawals;
-                // function + withdrawer screens
-                msg->numScreens = 2;
+                // function screen
+                msg->numScreens = 1;
                 // one screen per withdrawal
                 msg->numScreens += params->strategies_count;
                 PRINTF("NUMBER OF STRATEGIES TO DISPLAY: %d\n", params->strategies_count);
@@ -61,8 +61,8 @@ void handle_finalize(ethPluginFinalize_t *msg) {
             {
                 lr_complete_queued_withdrawals_t *params =
                     &context->param_data.lr_complete_queued_withdrawals;
-                // function + withdrawer screens
-                msg->numScreens = 2;
+                // function screen
+                msg->numScreens = 1;
                 // one screen per strategy
                 msg->numScreens += params->strategies_count;
                 PRINTF("NUMBER OF STRATEGIES TO DISPLAY: %d\n", params->strategies_count);

src/kiln_plugin.h

@@ -192,7 +192,6 @@ typedef struct {
 
     // -- display
     uint8_t strategies_count;
-    char withdrawer[ADDRESS_STR_LEN];
     // list of strategies indexes **INCREMENTED BY 1** to display in the UI
     // 0 is reserved for end of array
     // UNKNOW_LR_STRATEGY is used to display the "unknown" strategy
@@ -214,7 +213,6 @@ typedef struct {
     uint16_t strategies_count;
 
     // -- display
-    char withdrawer[ADDRESS_STR_LEN];
     // list of strategies indexes **INCREMENTED BY 1** to display in the UI
     // 0 is reserved for end of array
     // UNKNOW_LR_STRATEGY is used to display the "unknown" strategy

src/provide_parameter/eigenlayer.c

@@ -213,16 +213,6 @@ void handle_lr_queue_withdrawals(ethPluginProvideParameter_t *msg, context_t *co
             context->next_param = LR_QUEUE_WITHDRAWALS__QWITHDRAWALS_WITHDRAWER;
             break;
         case LR_QUEUE_WITHDRAWALS__QWITHDRAWALS_WITHDRAWER:
-            // EigenLayer contract does not allow withdrawer to be different than msg.sender
-            // https://github.com/Layr-Labs/eigenlayer-contracts/blob/7229f2b426b6f2a24c7795
-            // b1a4687a010eac8ef2/src/contracts/core/DelegationManager.sol#L275
-            // so we can only copy it once
-            if (params->withdrawer[0] == '\0') {
-                uint8_t buffer[ADDRESS_LENGTH];
-                copy_address(buffer, msg->parameter, sizeof(buffer));
-                getEthDisplayableAddress(buffer, params->withdrawer, sizeof(params->withdrawer), 0);
-            }
-            PRINTF("WITHDRAWER: %s\n", params->withdrawer);
             context->next_param = LR_QUEUE_WITHDRAWALS__QWITHDRAWALS_STRATEGIES_LENGTH;
             break;
         case LR_QUEUE_WITHDRAWALS__QWITHDRAWALS_STRATEGIES_LENGTH:
@@ -434,15 +424,6 @@ void handle_lr_complete_queued_withdrawals(ethPluginProvideParameter_t *msg, con
             context->next_param = LRCQW_WITHDRAWALS__ITEM__WITHDRAWER;
             break;
         case LRCQW_WITHDRAWALS__ITEM__WITHDRAWER:
-            // withdrawer is the same for all queuedWithdrawals
-            // so we only copy it once
-            if (params->withdrawer[0] == '\0') {
-                uint8_t buffer[ADDRESS_LENGTH];
-                copy_address(buffer, msg->parameter, sizeof(buffer));
-                getEthDisplayableAddress(buffer, params->withdrawer, sizeof(params->withdrawer), 0);
-            }
-            PRINTF("WITHDRAWER: %s\n", params->withdrawer);
-
             context->next_param = LRCQW_WITHDRAWALS__ITEM__NONCE;
             break;
         case LRCQW_WITHDRAWALS__ITEM__NONCE:

src/query_contract_ui/eigenlayer.c

@@ -80,17 +80,11 @@ bool queue_withdrawals_ui(ethQueryContractUI_t *msg, context_t *context) {
             ret = true;
             break;
 
-        case 1:
-            strlcpy(msg->title, "Withdrawer", msg->titleLength);
-            strlcpy(msg->msg, params->withdrawer, msg->msgLength);
-            ret = true;
-            break;
-
         default: {
             {
                 // removing the first screen to current screen index
                 // to get the index of the withdrawal
-                uint8_t withdrawal_index = msg->screenIndex - 2;
+                uint8_t withdrawal_index = msg->screenIndex - 1;
 
                 if (withdrawal_index < params->strategies_count) {
                     strlcpy(msg->title, "Strategy", msg->titleLength);
@@ -131,17 +125,11 @@ bool complete_queued_withdrawals_ui(ethQueryContractUI_t *msg, context_t *contex
             ret = true;
             break;
 
-        case 1:
-            strlcpy(msg->title, "Withdrawer", msg->titleLength);
-            strlcpy(msg->msg, params->withdrawer, msg->msgLength);
-            ret = true;
-            break;
-
         default: {
             {
                 // removing the first screen to current screen index
                 // to get the index of the withdrawal
-                uint8_t strategy_index = msg->screenIndex - 2;
+                uint8_t strategy_index = msg->screenIndex - 1;
                 uint8_t withdrawal_index = params->withdrawals[strategy_index];
                 PRINTF("strat: %d || withdrawal_index: %d\n", strategy_index, withdrawal_index);
 

tests/src/lrCompleteQueuedWithdrawals.test.js

@@ -92,7 +92,7 @@ nano_models.forEach(function (model) {
         }
       );
       const tx = eth.signTransaction("44'/60'/0'/0", serializedTx, resolution);
-      const right_clicks = model.letter === 'S' ? 12 : 9;
+      const right_clicks = model.letter === 'S' ? 9 : 8;
 
       await waitForAppScreen(sim);
       await sim.navigateAndCompareSnapshots(
@@ -168,7 +168,7 @@ nano_models.forEach(function (model) {
         }
       );
       const tx = eth.signTransaction("44'/60'/0'/0", serializedTx, resolution);
-      const right_clicks = model.letter === 'S' ? 9 : 6;
+      const right_clicks = model.letter === 'S' ? 6 : 5;
 
       await waitForAppScreen(sim);
       await sim.navigateAndCompareSnapshots(
@@ -244,7 +244,7 @@ nano_models.forEach(function (model) {
         }
       );
       const tx = eth.signTransaction("44'/60'/0'/0", serializedTx, resolution);
-      const right_clicks = model.letter === 'S' ? 9 : 6;
+      const right_clicks = model.letter === 'S' ? 6 : 5;
 
       await waitForAppScreen(sim);
       await sim.navigateAndCompareSnapshots(
@@ -363,7 +363,7 @@ nano_models.forEach(function (model) {
         }
       );
       const tx = eth.signTransaction("44'/60'/0'/0", serializedTx, resolution);
-      const right_clicks = model.letter === 'S' ? 16 : 13;
+      const right_clicks = model.letter === 'S' ? 13 : 12;
 
       await waitForAppScreen(sim);
       await sim.navigateAndCompareSnapshots(

tests/src/lrQueueWithdrawals.test.js

@@ -44,7 +44,7 @@ nano_models.forEach(function (model) {
         }
       );
       const tx = eth.signTransaction("44'/60'/0'/0", serializedTx, resolution);
-      const right_clicks = model.letter === 'S' ? 9 : 7;
+      const right_clicks = model.letter === 'S' ? 6 : 6;
 
       await waitForAppScreen(sim);
       await sim.navigateAndCompareSnapshots(
@@ -100,7 +100,7 @@ nano_models.forEach(function (model) {
         }
       );
       const tx = eth.signTransaction("44'/60'/0'/0", serializedTx, resolution);
-      const right_clicks = model.letter === 'S' ? 13 : 11;
+      const right_clicks = model.letter === 'S' ? 10 : 10;
 
       await waitForAppScreen(sim);
       await sim.navigateAndCompareSnapshots(
@@ -156,7 +156,7 @@ nano_models.forEach(function (model) {
         }
       );
       const tx = eth.signTransaction("44'/60'/0'/0", serializedTx, resolution);
-      const right_clicks = model.letter === 'S' ? 13 : 11;
+      const right_clicks = model.letter === 'S' ? 10 : 10;
 
       await waitForAppScreen(sim);
       await sim.navigateAndCompareSnapshots(