@ledgerhq/live-common 34.53.0-nightly.20251119110540 → 34.53.0-nightly.20251120135143

package/lib-es/e2e/families/cardano.js

@@ -1,11 +1,10 @@
 import expect from "expect";
 import { pressUntilTextFound, containsSubstringInEvent, waitFor } from "../speculos";
-import { getSpeculosModel } from "../speculosAppVersion";
-import { pressBoth, pressRightButton } from "../deviceInteraction/ButtonDeviceSimulator";
+import { getSpeculosModel, isTouchDevice } from "../speculosAppVersion";
 import { pressAndRelease, longPressAndRelease, swipeRight, } from "../deviceInteraction/TouchDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { DeviceModelId } from "@ledgerhq/types-devices";
-import { isTouchDevice } from "../speculosAppVersion";
+import { withDeviceController } from "../deviceInteraction/DeviceController";
 function validateTransactionData(tx, events) {
     const isAddressCorrect = containsSubstringInEvent(tx.accountToCredit.address, events);
     expect(isAddressCorrect).toBeTruthy();
@@ -22,31 +21,33 @@ async function sendCardanoTouchDevices(tx) {
     await waitFor(DeviceLabels.SIGN_TRANSACTION);
     await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
 }
-async function sendCardanoNanoS(_tx) {
+export const sendCardanoNanoS = withDeviceController(({ getButtonsController }) => async (_tx) => {
+    const buttons = getButtonsController();
     await waitFor(DeviceLabels.NEW_ORDINARY);
-    await pressRightButton();
+    await buttons.right();
     await waitFor(DeviceLabels.SEND_TO_ADDRESS);
-    await pressBoth();
+    await buttons.both();
     await pressUntilTextFound(DeviceLabels.SEND);
-    await pressBoth();
+    await buttons.both();
     await waitFor(DeviceLabels.TRANSACTION_FEE);
-    await pressBoth();
+    await buttons.both();
     await waitFor(DeviceLabels.CONFIRM);
-    await pressRightButton();
-}
-async function sendCardanoButtonDevice(tx) {
+    await buttons.right();
+});
+export const sendCardanoButtonDevice = withDeviceController(({ getButtonsController }) => async (tx) => {
+    const buttons = getButtonsController();
     await waitFor(DeviceLabels.NEW_ORDINARY);
-    await pressBoth();
+    await buttons.both();
     await pressUntilTextFound(DeviceLabels.SEND_TO_ADDRESS_2);
-    await pressBoth();
+    await buttons.both();
     const events = await pressUntilTextFound(DeviceLabels.SEND);
     validateTransactionData(tx, events);
-    await pressBoth();
+    await buttons.both();
     await waitFor(DeviceLabels.TRANSACTION_FEE);
-    await pressBoth();
+    await buttons.both();
     await waitFor(DeviceLabels.CONFIRM);
-    await pressBoth();
-}
+    await buttons.both();
+});
 export async function sendCardano(tx) {
     const speculosModel = getSpeculosModel();
     if (isTouchDevice()) {
@@ -112,15 +113,16 @@ async function delegateTouchDevicesAction(label) {
             break;
     }
 }
-async function delegateNanoAction(label, action) {
+export const delegateNanoAction = withDeviceController(({ getButtonsController }) => async (label, action) => {
+    const buttons = getButtonsController();
     await waitFor(label);
     if (action === "both") {
-        await pressBoth();
+        await buttons.both();
     }
     else {
-        await pressRightButton();
+        await buttons.right();
     }
-}
+});
 async function executeDelegateStep(label, action) {
     try {
         if (isTouchDevice()) {

package/lib-es/e2e/families/cardano.js.map

@@ -1 +1 @@
-{"version":3,"file":"cardano.js","sourceRoot":"","sources":["../../../src/e2e/families/cardano.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cardano.js","sourceRoot":"","sources":["../../../src/e2e/families/cardano.ts"],"names":[],"mappings":"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"}

package/lib-es/e2e/families/celo.d.ts

@@ -1,3 +1,3 @@
 import { Delegate } from "../models/Delegate";
-export declare function delegateCelo(delegatingAccount: Delegate): Promise<void>;
+export declare const delegateCelo: (delegatingAccount: Delegate) => void | Promise<void>;
 //# sourceMappingURL=celo.d.ts.map

package/lib-es/e2e/families/celo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"celo.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/celo.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAM9C,wBAAsB,YAAY,CAAC,iBAAiB,EAAE,QAAQ,iBAU7D"}
+{"version":3,"file":"celo.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/celo.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAM9C,eAAO,MAAM,YAAY,uDAgBxB,CAAC"}

package/lib-es/e2e/families/celo.js

@@ -1,10 +1,11 @@
 import { containsSubstringInEvent, getDelegateEvents, pressUntilTextFound } from "../speculos";
 import { isTouchDevice } from "../speculosAppVersion";
 import expect from "expect";
-import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
 import { longPressAndRelease } from "../deviceInteraction/TouchDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
-export async function delegateCelo(delegatingAccount) {
+import { withDeviceController } from "../deviceInteraction/DeviceController";
+export const delegateCelo = withDeviceController(({ getButtonsController }) => async (delegatingAccount) => {
+    const buttons = getButtonsController();
     const events = await getDelegateEvents(delegatingAccount);
     const isAmountCorrect = containsSubstringInEvent(delegatingAccount.amount, events);
     expect(isAmountCorrect).toBeTruthy();
@@ -13,7 +14,7 @@ export async function delegateCelo(delegatingAccount) {
         await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
     }
     else {
-        await pressBoth();
+        await buttons.both();
     }
-}
+});
 //# sourceMappingURL=celo.js.map

package/lib-es/e2e/families/celo.js.map

@@ -1 +1 @@
-{"version":3,"file":"celo.js","sourceRoot":"","sources":["../../../src/e2e/families/celo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAC/F,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,4CAA4C,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,iBAA2B;IAC5D,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IAC1D,MAAM,eAAe,GAAG,wBAAwB,CAAC,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnF,MAAM,CAAC,eAAe,CAAC,CAAC,UAAU,EAAE,CAAC;IACrC,IAAI,aAAa,EAAE,EAAE;QACnB,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;KACzD;SAAM;QACL,MAAM,SAAS,EAAE,CAAC;KACnB;AACH,CAAC"}
+{"version":3,"file":"celo.js","sourceRoot":"","sources":["../../../src/e2e/families/celo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAC/F,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAE7E,MAAM,CAAC,MAAM,YAAY,GAAG,oBAAoB,CAC9C,CAAC,EAAE,oBAAoB,EAAE,EAAE,EAAE,CAC3B,KAAK,EAAE,iBAA2B,EAAE,EAAE;IACpC,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IAEvC,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IAC1D,MAAM,eAAe,GAAG,wBAAwB,CAAC,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnF,MAAM,CAAC,eAAe,CAAC,CAAC,UAAU,EAAE,CAAC;IAErC,IAAI,aAAa,EAAE,EAAE;QACnB,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;KACzD;SAAM;QACL,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;KACtB;AACH,CAAC,CACJ,CAAC"}

package/lib-es/e2e/families/cosmos.d.ts

@@ -1,5 +1,5 @@
 import { Delegate } from "../models/Delegate";
 import { Transaction } from "../models/Transaction";
-export declare function delegateCosmos(delegatingAccount: Delegate): Promise<void>;
-export declare function sendCosmos(tx: Transaction): Promise<void>;
+export declare const delegateCosmos: (delegatingAccount: Delegate) => void | Promise<void>;
+export declare const sendCosmos: (tx: Transaction) => void | Promise<void>;
 //# sourceMappingURL=cosmos.d.ts.map

package/lib-es/e2e/families/cosmos.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cosmos.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/cosmos.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAOpD,wBAAsB,cAAc,CAAC,iBAAiB,EAAE,QAAQ,iBAS/D;AAED,wBAAsB,UAAU,CAAC,EAAE,EAAE,WAAW,iBAY/C"}
+{"version":3,"file":"cosmos.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/cosmos.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAOpD,eAAO,MAAM,cAAc,uDAe1B,CAAC;AAEF,eAAO,MAAM,UAAU,2CAkBtB,CAAC"}

package/lib-es/e2e/families/cosmos.js

@@ -1,10 +1,11 @@
 import expect from "expect";
 import { containsSubstringInEvent, getDelegateEvents, getSendEvents } from "../speculos";
-import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { isTouchDevice } from "../speculosAppVersion";
 import { longPressAndRelease } from "../deviceInteraction/TouchDeviceSimulator";
-export async function delegateCosmos(delegatingAccount) {
+import { withDeviceController } from "../deviceInteraction/DeviceController";
+export const delegateCosmos = withDeviceController(({ getButtonsController }) => async (delegatingAccount) => {
+    const buttons = getButtonsController();
     const events = await getDelegateEvents(delegatingAccount);
     const isAmountCorrect = containsSubstringInEvent(delegatingAccount.amount, events);
     expect(isAmountCorrect).toBeTruthy();
@@ -12,10 +13,11 @@ export async function delegateCosmos(delegatingAccount) {
         await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
     }
     else {
-        await pressBoth();
+        await buttons.both();
     }
-}
-export async function sendCosmos(tx) {
+});
+export const sendCosmos = withDeviceController(({ getButtonsController }) => async (tx) => {
+    const buttons = getButtonsController();
     const events = await getSendEvents(tx);
     const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
     expect(isAmountCorrect).toBeTruthy();
@@ -25,7 +27,7 @@ export async function sendCosmos(tx) {
         await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
     }
     else {
-        await pressBoth();
+        await buttons.both();
     }
-}
+});
 //# sourceMappingURL=cosmos.js.map

package/lib-es/e2e/families/cosmos.js.map

@@ -1 +1 @@
-{"version":3,"file":"cosmos.js","sourceRoot":"","sources":["../../../src/e2e/families/cosmos.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAG5B,OAAO,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACzF,OAAO,EAAE,SAAS,EAAE,MAAM,4CAA4C,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAEhF,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,iBAA2B;IAC9D,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IAC1D,MAAM,eAAe,GAAG,wBAAwB,CAAC,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnF,MAAM,CAAC,eAAe,CAAC,CAAC,UAAU,EAAE,CAAC;IACrC,IAAI,aAAa,EAAE,EAAE;QACnB,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;KACzD;SAAM;QACL,MAAM,SAAS,EAAE,CAAC;KACnB;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,EAAe;IAC9C,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,EAAE,CAAC,CAAC;IACvC,MAAM,eAAe,GAAG,wBAAwB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpE,MAAM,CAAC,eAAe,CAAC,CAAC,UAAU,EAAE,CAAC;IACrC,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACtF,MAAM,CAAC,gBAAgB,CAAC,CAAC,UAAU,EAAE,CAAC;IAEtC,IAAI,aAAa,EAAE,EAAE;QACnB,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;KACzD;SAAM;QACL,MAAM,SAAS,EAAE,CAAC;KACnB;AACH,CAAC"}
+{"version":3,"file":"cosmos.js","sourceRoot":"","sources":["../../../src/e2e/families/cosmos.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAG5B,OAAO,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACzF,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAE7E,MAAM,CAAC,MAAM,cAAc,GAAG,oBAAoB,CAChD,CAAC,EAAE,oBAAoB,EAAE,EAAE,EAAE,CAC3B,KAAK,EAAE,iBAA2B,EAAE,EAAE;IACpC,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IAEvC,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IAC1D,MAAM,eAAe,GAAG,wBAAwB,CAAC,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnF,MAAM,CAAC,eAAe,CAAC,CAAC,UAAU,EAAE,CAAC;IAErC,IAAI,aAAa,EAAE,EAAE;QACnB,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;KACzD;SAAM;QACL,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;KACtB;AACH,CAAC,CACJ,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,oBAAoB,CAC5C,CAAC,EAAE,oBAAoB,EAAE,EAAE,EAAE,CAC3B,KAAK,EAAE,EAAe,EAAE,EAAE;IACxB,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IAEvC,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,EAAE,CAAC,CAAC;IACvC,MAAM,eAAe,GAAG,wBAAwB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpE,MAAM,CAAC,eAAe,CAAC,CAAC,UAAU,EAAE,CAAC;IAErC,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACtF,MAAM,CAAC,gBAAgB,CAAC,CAAC,UAAU,EAAE,CAAC;IAEtC,IAAI,aAAa,EAAE,EAAE;QACnB,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;KACzD;SAAM;QACL,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;KACtB;AACH,CAAC,CACJ,CAAC"}

package/lib-es/e2e/families/evm.d.ts

@@ -1,3 +1,5 @@
 import { Transaction } from "../models/Transaction";
+export declare const sendEvmButtonDevice: (tx: Transaction) => void | Promise<void>;
+export declare const sendEvmNanoS: (tx: Transaction) => void | Promise<void>;
 export declare function sendEVM(tx: Transaction): Promise<void>;
 //# sourceMappingURL=evm.d.ts.map

package/lib-es/e2e/families/evm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"evm.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/evm.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAwCpD,wBAAsB,OAAO,CAAC,EAAE,EAAE,WAAW,iBAS5C"}
+{"version":3,"file":"evm.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/evm.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AA4BpD,eAAO,MAAM,mBAAmB,2CAS/B,CAAC;AAEF,eAAO,MAAM,YAAY,2CASxB,CAAC;AAEF,wBAAsB,OAAO,CAAC,EAAE,EAAE,WAAW,iBAU5C"}

package/lib-es/e2e/families/evm.js

@@ -1,12 +1,11 @@
 import expect from "expect";
 import { containsSubstringInEvent, pressUntilTextFound } from "../speculos";
-import { getSpeculosModel } from "../speculosAppVersion";
-import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
+import { getSpeculosModel, isTouchDevice } from "../speculosAppVersion";
 import { longPressAndRelease } from "../deviceInteraction/TouchDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { Device } from "../enum/Device";
 import { DeviceModelId } from "@ledgerhq/types-devices";
-import { isTouchDevice } from "../speculosAppVersion";
+import { withDeviceController } from "../deviceInteraction/DeviceController";
 function validateTransactionData(tx, events) {
     const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
     expect(isAmountCorrect).toBeTruthy();
@@ -24,16 +23,18 @@ async function sendEvmTouchDevices(tx) {
     validateTransactionData(tx, events);
     await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
 }
-async function sendEvmButtonDevice(tx) {
+export const sendEvmButtonDevice = withDeviceController(({ getButtonsController }) => async (tx) => {
+    const buttons = getButtonsController();
     const events = await pressUntilTextFound(DeviceLabels.SIGN_TRANSACTION);
     validateTransactionData(tx, events);
-    await pressBoth();
-}
-async function sendEvmNanoS(tx) {
+    await buttons.both();
+});
+export const sendEvmNanoS = withDeviceController(({ getButtonsController }) => async (tx) => {
+    const buttons = getButtonsController();
     const events = await pressUntilTextFound(DeviceLabels.ACCEPT);
     validateTransactionData(tx, events);
-    await pressBoth();
-}
+    await buttons.both();
+});
 export async function sendEVM(tx) {
     const speculosModel = getSpeculosModel();
     if (isTouchDevice()) {

package/lib-es/e2e/families/evm.js.map

@@ -1 +1 @@
-{"version":3,"file":"evm.js","sourceRoot":"","sources":["../../../src/e2e/families/evm.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,4CAA4C,CAAC;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,SAAS,uBAAuB,CAAC,EAAe,EAAE,MAAgB;IAChE,MAAM,eAAe,GAAG,wBAAwB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpE,MAAM,CAAC,eAAe,CAAC,CAAC,UAAU,EAAE,CAAC;IACrC,IAAI,EAAE,CAAC,eAAe,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,KAAK,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE;QACjF,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACtF,MAAM,CAAC,gBAAgB,CAAC,CAAC,UAAU,EAAE,CAAC;KACvC;SAAM;QACL,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACtF,MAAM,CAAC,gBAAgB,CAAC,CAAC,UAAU,EAAE,CAAC;KACvC;AACH,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,EAAe;IAChD,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;IACpE,uBAAuB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACpC,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;AAC1D,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,EAAe;IAChD,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;IACxE,uBAAuB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACpC,MAAM,SAAS,EAAE,CAAC;AACpB,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,EAAe;IACzC,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAC9D,uBAAuB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACpC,MAAM,SAAS,EAAE,CAAC;AACpB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,EAAe;IAC3C,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAC;IACzC,IAAI,aAAa,EAAE,EAAE;QACnB,OAAO,mBAAmB,CAAC,EAAE,CAAC,CAAC;KAChC;IACD,IAAI,aAAa,KAAK,aAAa,CAAC,KAAK,EAAE;QACzC,OAAO,YAAY,CAAC,EAAE,CAAC,CAAC;KACzB;IACD,OAAO,mBAAmB,CAAC,EAAE,CAAC,CAAC;AACjC,CAAC"}
+{"version":3,"file":"evm.js","sourceRoot":"","sources":["../../../src/e2e/families/evm.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAE7E,SAAS,uBAAuB,CAAC,EAAe,EAAE,MAAgB;IAChE,MAAM,eAAe,GAAG,wBAAwB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpE,MAAM,CAAC,eAAe,CAAC,CAAC,UAAU,EAAE,CAAC;IAErC,IAAI,EAAE,CAAC,eAAe,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,KAAK,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE;QACjF,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACtF,MAAM,CAAC,gBAAgB,CAAC,CAAC,UAAU,EAAE,CAAC;KACvC;SAAM;QACL,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACtF,MAAM,CAAC,gBAAgB,CAAC,CAAC,UAAU,EAAE,CAAC;KACvC;AACH,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,EAAe;IAChD,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;IACpE,uBAAuB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACpC,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAG,oBAAoB,CACrD,CAAC,EAAE,oBAAoB,EAAE,EAAE,EAAE,CAC3B,KAAK,EAAE,EAAe,EAAE,EAAE;IACxB,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IAEvC,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;IACxE,uBAAuB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACpC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;AACvB,CAAC,CACJ,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,oBAAoB,CAC9C,CAAC,EAAE,oBAAoB,EAAE,EAAE,EAAE,CAC3B,KAAK,EAAE,EAAe,EAAE,EAAE;IACxB,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IAEvC,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAC9D,uBAAuB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACpC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;AACvB,CAAC,CACJ,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,EAAe;IAC3C,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAC;IAEzC,IAAI,aAAa,EAAE,EAAE;QACnB,OAAO,mBAAmB,CAAC,EAAE,CAAC,CAAC;KAChC;IACD,IAAI,aAAa,KAAK,aAAa,CAAC,KAAK,EAAE;QACzC,OAAO,YAAY,CAAC,EAAE,CAAC,CAAC;KACzB;IACD,OAAO,mBAAmB,CAAC,EAAE,CAAC,CAAC;AACjC,CAAC"}

package/lib-es/e2e/families/hedera.d.ts

@@ -1,2 +1,2 @@
-export declare function sendHedera(): Promise<void>;
+export declare const sendHedera: () => void | Promise<void>;
 //# sourceMappingURL=hedera.d.ts.map

package/lib-es/e2e/families/hedera.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hedera.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/hedera.ts"],"names":[],"mappings":"AAIA,wBAAsB,UAAU,kBAG/B"}
+{"version":3,"file":"hedera.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/hedera.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,UAAU,4BAKrB,CAAC"}

package/lib-es/e2e/families/hedera.js

@@ -1,8 +1,9 @@
-import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { pressUntilTextFound } from "../speculos";
-export async function sendHedera() {
+import { withDeviceController } from "../deviceInteraction/DeviceController";
+export const sendHedera = withDeviceController(({ getButtonsController }) => async () => {
+    const buttons = getButtonsController();
     await pressUntilTextFound(DeviceLabels.APPROVE);
-    await pressBoth();
-}
+    await buttons.both();
+});
 //# sourceMappingURL=hedera.js.map

package/lib-es/e2e/families/hedera.js.map

@@ -1 +1 @@
-{"version":3,"file":"hedera.js","sourceRoot":"","sources":["../../../src/e2e/families/hedera.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,4CAA4C,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD,MAAM,CAAC,KAAK,UAAU,UAAU;IAC9B,MAAM,mBAAmB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,SAAS,EAAE,CAAC;AACpB,CAAC"}
+{"version":3,"file":"hedera.js","sourceRoot":"","sources":["../../../src/e2e/families/hedera.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAE7E,MAAM,CAAC,MAAM,UAAU,GAAG,oBAAoB,CAAC,CAAC,EAAE,oBAAoB,EAAE,EAAE,EAAE,CAAC,KAAK,IAAI,EAAE;IACtF,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IAEvC,MAAM,mBAAmB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;AACvB,CAAC,CAAC,CAAC"}

package/lib-es/e2e/families/kaspa.d.ts

@@ -1,5 +1,5 @@
 import { Delegate } from "../models/Delegate";
 import { Transaction } from "../models/Transaction";
-export declare function sendKaspa(tx: Transaction): Promise<void>;
-export declare function delegateKaspa(delegatingAccount: Delegate): Promise<void>;
+export declare const sendKaspa: (tx: Transaction) => void | Promise<void>;
+export declare const delegateKaspa: (delegatingAccount: Delegate) => void | Promise<void>;
 //# sourceMappingURL=kaspa.d.ts.map

package/lib-es/e2e/families/kaspa.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kaspa.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/kaspa.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,wBAAsB,SAAS,CAAC,EAAE,EAAE,WAAW,iBAO9C;AAED,wBAAsB,aAAa,CAAC,iBAAiB,EAAE,QAAQ,iBAM9D"}
+{"version":3,"file":"kaspa.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/kaspa.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD,eAAO,MAAM,SAAS,2CAarB,CAAC;AAEF,eAAO,MAAM,aAAa,uDAYzB,CAAC"}

package/lib-es/e2e/families/kaspa.js

@@ -1,23 +1,25 @@
 import expect from "expect";
 import { waitFor, containsSubstringInEvent, pressUntilTextFound, getSendEvents } from "../speculos";
 import { isTouchDevice } from "../speculosAppVersion";
-import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { longPressAndRelease } from "../deviceInteraction/TouchDeviceSimulator";
-export async function sendKaspa(tx) {
+import { withDeviceController } from "../deviceInteraction/DeviceController";
+export const sendKaspa = withDeviceController(({ getButtonsController }) => async (tx) => {
+    const buttons = getButtonsController();
     await getSendEvents(tx);
     if (isTouchDevice()) {
         await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
     }
     else {
-        await pressBoth();
+        await buttons.both();
     }
-}
-export async function delegateKaspa(delegatingAccount) {
+});
+export const delegateKaspa = withDeviceController(({ getButtonsController }) => async (delegatingAccount) => {
+    const buttons = getButtonsController();
     await waitFor(DeviceLabels.REVIEW_OPERATION);
     const events = await pressUntilTextFound(DeviceLabels.APPROVE);
     const isAmountCorrect = containsSubstringInEvent(delegatingAccount.amount, events);
     expect(isAmountCorrect).toBeTruthy();
-    await pressBoth();
-}
+    await buttons.both();
+});
 //# sourceMappingURL=kaspa.js.map

package/lib-es/e2e/families/kaspa.js.map

@@ -1 +1 @@
-{"version":3,"file":"kaspa.js","sourceRoot":"","sources":["../../../src/e2e/families/kaspa.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACpG,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,4CAA4C,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAGhF,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,EAAe;IAC7C,MAAM,aAAa,CAAC,EAAE,CAAC,CAAC;IACxB,IAAI,aAAa,EAAE,EAAE;QACnB,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;KACzD;SAAM;QACL,MAAM,SAAS,EAAE,CAAC;KACnB;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,iBAA2B;IAC7D,MAAM,OAAO,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IAC/D,MAAM,eAAe,GAAG,wBAAwB,CAAC,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnF,MAAM,CAAC,eAAe,CAAC,CAAC,UAAU,EAAE,CAAC;IACrC,MAAM,SAAS,EAAE,CAAC;AACpB,CAAC"}
+{"version":3,"file":"kaspa.js","sourceRoot":"","sources":["../../../src/e2e/families/kaspa.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACpG,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAEhF,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAE7E,MAAM,CAAC,MAAM,SAAS,GAAG,oBAAoB,CAC3C,CAAC,EAAE,oBAAoB,EAAE,EAAE,EAAE,CAC3B,KAAK,EAAE,EAAe,EAAE,EAAE;IACxB,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IAEvC,MAAM,aAAa,CAAC,EAAE,CAAC,CAAC;IAExB,IAAI,aAAa,EAAE,EAAE;QACnB,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;KACzD;SAAM;QACL,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;KACtB;AACH,CAAC,CACJ,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,oBAAoB,CAC/C,CAAC,EAAE,oBAAoB,EAAE,EAAE,EAAE,CAC3B,KAAK,EAAE,iBAA2B,EAAE,EAAE;IACpC,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IAEvC,MAAM,OAAO,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IAC/D,MAAM,eAAe,GAAG,wBAAwB,CAAC,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnF,MAAM,CAAC,eAAe,CAAC,CAAC,UAAU,EAAE,CAAC;IAErC,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;AACvB,CAAC,CACJ,CAAC"}

package/lib-es/e2e/families/multiversX.d.ts

@@ -1,3 +1,3 @@
 import { Delegate } from "../models/Delegate";
-export declare function delegateMultiversX(delegatingAccount: Delegate): Promise<void>;
+export declare const delegateMultiversX: (delegatingAccount: Delegate) => void | Promise<void>;
 //# sourceMappingURL=multiversX.d.ts.map

package/lib-es/e2e/families/multiversX.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"multiversX.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/multiversX.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAM9C,wBAAsB,kBAAkB,CAAC,iBAAiB,EAAE,QAAQ,iBAQnE"}
+{"version":3,"file":"multiversX.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/multiversX.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAM9C,eAAO,MAAM,kBAAkB,uDAc9B,CAAC"}

package/lib-es/e2e/families/multiversX.js

@@ -1,16 +1,17 @@
 import { getDelegateEvents, pressUntilTextFound } from "../speculos";
-import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { isTouchDevice } from "../speculosAppVersion";
 import { longPressAndRelease } from "../deviceInteraction/TouchDeviceSimulator";
-export async function delegateMultiversX(delegatingAccount) {
+import { withDeviceController } from "../deviceInteraction/DeviceController";
+export const delegateMultiversX = withDeviceController(({ getButtonsController }) => async (delegatingAccount) => {
+    const buttons = getButtonsController();
     await getDelegateEvents(delegatingAccount);
     if (isTouchDevice()) {
         await pressUntilTextFound(DeviceLabels.HOLD_TO_SIGN);
         await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
     }
     else {
-        await pressBoth();
+        await buttons.both();
     }
-}
+});
 //# sourceMappingURL=multiversX.js.map

package/lib-es/e2e/families/multiversX.js.map

@@ -1 +1 @@
-{"version":3,"file":"multiversX.js","sourceRoot":"","sources":["../../../src/e2e/families/multiversX.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAErE,OAAO,EAAE,SAAS,EAAE,MAAM,4CAA4C,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAEhF,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,iBAA2B;IAClE,MAAM,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IAC3C,IAAI,aAAa,EAAE,EAAE;QACnB,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;KACzD;SAAM;QACL,MAAM,SAAS,EAAE,CAAC;KACnB;AACH,CAAC"}
+{"version":3,"file":"multiversX.js","sourceRoot":"","sources":["../../../src/e2e/families/multiversX.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAErE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAE7E,MAAM,CAAC,MAAM,kBAAkB,GAAG,oBAAoB,CACpD,CAAC,EAAE,oBAAoB,EAAE,EAAE,EAAE,CAC3B,KAAK,EAAE,iBAA2B,EAAE,EAAE;IACpC,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IAEvC,MAAM,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IAE3C,IAAI,aAAa,EAAE,EAAE;QACnB,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;KACzD;SAAM;QACL,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;KACtB;AACH,CAAC,CACJ,CAAC"}

package/lib-es/e2e/families/near.d.ts

@@ -1,3 +1,3 @@
 import { Delegate } from "../models/Delegate";
-export declare function delegateNear(delegatingAccount: Delegate): Promise<void>;
+export declare const delegateNear: (delegatingAccount: Delegate) => void | Promise<void>;
 //# sourceMappingURL=near.d.ts.map

package/lib-es/e2e/families/near.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"near.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/near.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAY9C,wBAAsB,YAAY,CAAC,iBAAiB,EAAE,QAAQ,iBAe7D"}
+{"version":3,"file":"near.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/near.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAY9C,eAAO,MAAM,YAAY,uDAqBxB,CAAC"}

package/lib-es/e2e/families/near.js

@@ -1,10 +1,11 @@
 import expect from "expect";
 import { waitFor, containsSubstringInEvent, getDelegateEvents, pressUntilTextFound, } from "../speculos";
 import { isTouchDevice } from "../speculosAppVersion";
-import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { longPressAndRelease, pressAndRelease } from "../deviceInteraction/TouchDeviceSimulator";
-export async function delegateNear(delegatingAccount) {
+import { withDeviceController } from "../deviceInteraction/DeviceController";
+export const delegateNear = withDeviceController(({ getButtonsController }) => async (delegatingAccount) => {
+    const buttons = getButtonsController();
     const events = await getDelegateEvents(delegatingAccount);
     const isProviderCorrect = containsSubstringInEvent(delegatingAccount.provider, events);
     expect(isProviderCorrect).toBeTruthy();
@@ -15,10 +16,10 @@ export async function delegateNear(delegatingAccount) {
         await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
     }
     else {
-        await pressBoth();
+        await buttons.both();
         await waitFor(DeviceLabels.VIEW_ACTION);
         await pressUntilTextFound(DeviceLabels.SIGN);
-        await pressBoth();
+        await buttons.both();
     }
-}
+});
 //# sourceMappingURL=near.js.map

package/lib-es/e2e/families/near.js.map

@@ -1 +1 @@
-{"version":3,"file":"near.js","sourceRoot":"","sources":["../../../src/e2e/families/near.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EACL,OAAO,EACP,wBAAwB,EACxB,iBAAiB,EACjB,mBAAmB,GACpB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,4CAA4C,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAEjG,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,iBAA2B;IAC5D,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IAC1D,MAAM,iBAAiB,GAAG,wBAAwB,CAAC,iBAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACvF,MAAM,CAAC,iBAAiB,CAAC,CAAC,UAAU,EAAE,CAAC;IACvC,IAAI,aAAa,EAAE,EAAE;QACnB,MAAM,eAAe,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;QACnD,MAAM,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QACxC,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;KACzD;SAAM;QACL,MAAM,SAAS,EAAE,CAAC;QAClB,MAAM,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QACxC,MAAM,mBAAmB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,SAAS,EAAE,CAAC;KACnB;AACH,CAAC"}
+{"version":3,"file":"near.js","sourceRoot":"","sources":["../../../src/e2e/families/near.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EACL,OAAO,EACP,wBAAwB,EACxB,iBAAiB,EACjB,mBAAmB,GACpB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AACjG,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAE7E,MAAM,CAAC,MAAM,YAAY,GAAG,oBAAoB,CAC9C,CAAC,EAAE,oBAAoB,EAAE,EAAE,EAAE,CAC3B,KAAK,EAAE,iBAA2B,EAAE,EAAE;IACpC,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IAEvC,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IAC1D,MAAM,iBAAiB,GAAG,wBAAwB,CAAC,iBAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACvF,MAAM,CAAC,iBAAiB,CAAC,CAAC,UAAU,EAAE,CAAC;IAEvC,IAAI,aAAa,EAAE,EAAE;QACnB,MAAM,eAAe,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;QACnD,MAAM,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QACxC,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;KACzD;SAAM;QACL,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,MAAM,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QACxC,MAAM,mBAAmB,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAC7C,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;KACtB;AACH,CAAC,CACJ,CAAC"}

package/lib-es/e2e/families/osmosis.d.ts

@@ -1,3 +1,3 @@
 import { Delegate } from "../models/Delegate";
-export declare function delegateOsmosis(delegatingAccount: Delegate): Promise<void>;
+export declare const delegateOsmosis: (delegatingAccount: Delegate) => void | Promise<void>;
 //# sourceMappingURL=osmosis.d.ts.map

package/lib-es/e2e/families/osmosis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"osmosis.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/osmosis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAQ9C,wBAAsB,eAAe,CAAC,iBAAiB,EAAE,QAAQ,iBAWhE"}
+{"version":3,"file":"osmosis.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/osmosis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAQ9C,eAAO,MAAM,eAAe,uDAiB3B,CAAC"}

package/lib-es/e2e/families/osmosis.js

@@ -1,10 +1,11 @@
 import { pressUntilTextFound, containsSubstringInEvent, getDelegateEvents } from "../speculos";
 import { isTouchDevice } from "../speculosAppVersion";
 import expect from "expect";
-import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { longPressAndRelease } from "../deviceInteraction/TouchDeviceSimulator";
-export async function delegateOsmosis(delegatingAccount) {
+import { withDeviceController } from "../deviceInteraction/DeviceController";
+export const delegateOsmosis = withDeviceController(({ getButtonsController }) => async (delegatingAccount) => {
+    const buttons = getButtonsController();
     const events = await getDelegateEvents(delegatingAccount);
     const amountInUosmo = (Number(delegatingAccount.amount) * 1_000_000).toString();
     const isAmountCorrect = containsSubstringInEvent(amountInUosmo, events);
@@ -14,7 +15,7 @@ export async function delegateOsmosis(delegatingAccount) {
         await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
     }
     else {
-        await pressBoth();
+        await buttons.both();
     }
-}
+});
 //# sourceMappingURL=osmosis.js.map

package/lib-es/e2e/families/osmosis.js.map

@@ -1 +1 @@
-{"version":3,"file":"osmosis.js","sourceRoot":"","sources":["../../../src/e2e/families/osmosis.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAC/F,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,4CAA4C,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAEhF,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,iBAA2B;IAC/D,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IAC1D,MAAM,aAAa,GAAG,CAAC,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC;IAChF,MAAM,eAAe,GAAG,wBAAwB,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACxE,MAAM,CAAC,eAAe,CAAC,CAAC,UAAU,EAAE,CAAC;IACrC,IAAI,aAAa,EAAE,EAAE;QACnB,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;KACzD;SAAM;QACL,MAAM,SAAS,EAAE,CAAC;KACnB;AACH,CAAC"}
+{"version":3,"file":"osmosis.js","sourceRoot":"","sources":["../../../src/e2e/families/osmosis.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAC/F,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAE7E,MAAM,CAAC,MAAM,eAAe,GAAG,oBAAoB,CACjD,CAAC,EAAE,oBAAoB,EAAE,EAAE,EAAE,CAC3B,KAAK,EAAE,iBAA2B,EAAE,EAAE;IACpC,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IAEvC,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IAC1D,MAAM,aAAa,GAAG,CAAC,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC;IAChF,MAAM,eAAe,GAAG,wBAAwB,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACxE,MAAM,CAAC,eAAe,CAAC,CAAC,UAAU,EAAE,CAAC;IAErC,IAAI,aAAa,EAAE,EAAE;QACnB,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;QACrD,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;KACzD;SAAM;QACL,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;KACtB;AACH,CAAC,CACJ,CAAC"}

package/lib-es/e2e/families/polkadot.d.ts

@@ -1,3 +1,3 @@
 import { Transaction } from "../models/Transaction";
-export declare function sendPolkadot(tx: Transaction): Promise<void>;
+export declare const sendPolkadot: (tx: Transaction) => void | Promise<void>;
 //# sourceMappingURL=polkadot.d.ts.map

package/lib-es/e2e/families/polkadot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"polkadot.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/polkadot.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAOpD,wBAAsB,YAAY,CAAC,EAAE,EAAE,WAAW,iBAYjD"}
+{"version":3,"file":"polkadot.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/polkadot.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAOpD,eAAO,MAAM,YAAY,2CAkBxB,CAAC"}

package/lib-es/e2e/families/polkadot.js

@@ -1,10 +1,11 @@
 import expect from "expect";
 import { containsSubstringInEvent, getSendEvents } from "../speculos";
 import { isTouchDevice } from "../speculosAppVersion";
-import { pressBoth } from "../deviceInteraction/ButtonDeviceSimulator";
 import { DeviceLabels } from "../enum/DeviceLabels";
 import { longPressAndRelease } from "../deviceInteraction/TouchDeviceSimulator";
-export async function sendPolkadot(tx) {
+import { withDeviceController } from "../deviceInteraction/DeviceController";
+export const sendPolkadot = withDeviceController(({ getButtonsController }) => async (tx) => {
+    const buttons = getButtonsController();
     const events = await getSendEvents(tx);
     const isAmountCorrect = containsSubstringInEvent(tx.amount, events);
     expect(isAmountCorrect).toBeTruthy();
@@ -14,7 +15,7 @@ export async function sendPolkadot(tx) {
         await longPressAndRelease(DeviceLabels.HOLD_TO_SIGN, 3);
     }
     else {
-        await pressBoth();
+        await buttons.both();
     }
-}
+});
 //# sourceMappingURL=polkadot.js.map

package/lib-es/e2e/families/polkadot.js.map

@@ -1 +1 @@
-{"version":3,"file":"polkadot.js","sourceRoot":"","sources":["../../../src/e2e/families/polkadot.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAE,wBAAwB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,4CAA4C,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAEhF,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,EAAe;IAChD,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,EAAE,CAAC,CAAC;IACvC,MAAM,eAAe,GAAG,wBAAwB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpE,MAAM,CAAC,eAAe,CAAC,CAAC,UAAU,EAAE,CAAC;IACrC,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACtF,MAAM,CAAC,gBAAgB,CAAC,CAAC,UAAU,EAAE,CAAC;IAEtC,IAAI,aAAa,EAAE,EAAE;QACnB,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;KACzD;SAAM;QACL,MAAM,SAAS,EAAE,CAAC;KACnB;AACH,CAAC"}
+{"version":3,"file":"polkadot.js","sourceRoot":"","sources":["../../../src/e2e/families/polkadot.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,OAAO,EAAE,wBAAwB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAE7E,MAAM,CAAC,MAAM,YAAY,GAAG,oBAAoB,CAC9C,CAAC,EAAE,oBAAoB,EAAE,EAAE,EAAE,CAC3B,KAAK,EAAE,EAAe,EAAE,EAAE;IACxB,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IAEvC,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,EAAE,CAAC,CAAC;IACvC,MAAM,eAAe,GAAG,wBAAwB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpE,MAAM,CAAC,eAAe,CAAC,CAAC,UAAU,EAAE,CAAC;IAErC,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACtF,MAAM,CAAC,gBAAgB,CAAC,CAAC,UAAU,EAAE,CAAC;IAEtC,IAAI,aAAa,EAAE,EAAE;QACnB,MAAM,mBAAmB,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;KACzD;SAAM;QACL,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;KACtB;AACH,CAAC,CACJ,CAAC"}

package/lib-es/e2e/families/solana.d.ts

@@ -1,5 +1,5 @@
 import { Transaction } from "../models/Transaction";
 import { Delegate } from "../models/Delegate";
-export declare function delegateSolana(delegatingAccount: Delegate): Promise<void>;
-export declare function sendSolana(tx: Transaction): Promise<void>;
+export declare const delegateSolana: (delegatingAccount: Delegate) => void | Promise<void>;
+export declare const sendSolana: (tx: Transaction) => void | Promise<void>;
 //# sourceMappingURL=solana.d.ts.map

package/lib-es/e2e/families/solana.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solana.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/solana.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,wBAAsB,cAAc,CAAC,iBAAiB,EAAE,QAAQ,iBAO/D;AAED,wBAAsB,UAAU,CAAC,EAAE,EAAE,WAAW,iBAc/C"}
+{"version":3,"file":"solana.d.ts","sourceRoot":"","sources":["../../../src/e2e/families/solana.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAG9C,eAAO,MAAM,cAAc,uDAa1B,CAAC;AAEF,eAAO,MAAM,UAAU,2CAoBtB,CAAC"}