From a10bc53ee07e060be8c4ef2ef32b63fcf68864a4 Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Wed, 14 May 2025 11:48:26 +0200 Subject: fix(ledger): fix binds, make functions static --- impls/monero.dart/lib/monero.dart | 37 +++++++++++++------------- impls/monero.dart/lib/src/monero.dart | 47 ++++++++++++++-------------------- impls/monero.dart/lib/src/wallet2.dart | 9 ------- 3 files changed, 37 insertions(+), 56 deletions(-) (limited to 'impls') diff --git a/impls/monero.dart/lib/monero.dart b/impls/monero.dart/lib/monero.dart index 17f0a13..ff77b16 100644 --- a/impls/monero.dart/lib/monero.dart +++ b/impls/monero.dart/lib/monero.dart @@ -3515,83 +3515,82 @@ int MONERO_Wallet_getBytesSent(wallet ptr) { } @Deprecated("TODO") -bool Wallet_getStateIsConnected(wallet ptr) { +bool Wallet_getStateIsConnected() { debugStart?.call('MONERO_Wallet_getStateIsConnected'); lib ??= MoneroC(DynamicLibrary.open(libPath)); - final ret = lib!.MONERO_Wallet_getStateIsConnected(ptr); + final ret = lib!.MONERO_Wallet_getStateIsConnected(); debugEnd?.call('MONERO_Wallet_getStateIsConnected'); return ret; } @Deprecated("TODO") -Pointer Wallet_getSendToDevice(wallet ptr) { +Pointer Wallet_getSendToDevice() { debugStart?.call('MONERO_Wallet_getSendToDevice'); lib ??= MoneroC(DynamicLibrary.open(libPath)); - final ret = lib!.MONERO_Wallet_getSendToDevice(ptr); + final ret = lib!.MONERO_Wallet_getSendToDevice(); debugEnd?.call('MONERO_Wallet_getSendToDevice'); return ret; } @Deprecated("TODO") -int Wallet_getSendToDeviceLength(wallet ptr) { +int Wallet_getSendToDeviceLength() { debugStart?.call('MONERO_Wallet_getSendToDeviceLength'); lib ??= MoneroC(DynamicLibrary.open(libPath)); - final ret = lib!.MONERO_Wallet_getSendToDeviceLength(ptr); + final ret = lib!.MONERO_Wallet_getSendToDeviceLength(); debugEnd?.call('MONERO_Wallet_getSendToDeviceLength'); return ret; } @Deprecated("TODO") -Pointer Wallet_getReceivedFromDevice(wallet ptr) { +Pointer Wallet_getReceivedFromDevice() { debugStart?.call('MONERO_Wallet_getReceivedFromDevice'); lib ??= MoneroC(DynamicLibrary.open(libPath)); - final ret = lib!.MONERO_Wallet_getReceivedFromDevice(ptr); + final ret = lib!.MONERO_Wallet_getReceivedFromDevice(); debugEnd?.call('MONERO_Wallet_getReceivedFromDevice'); return ret; } @Deprecated("TODO") -int Wallet_getReceivedFromDeviceLength(wallet ptr) { +int Wallet_getReceivedFromDeviceLength() { debugStart?.call('MONERO_Wallet_getReceivedFromDeviceLength'); lib ??= MoneroC(DynamicLibrary.open(libPath)); - final ret = lib!.MONERO_Wallet_getReceivedFromDeviceLength(ptr); + final ret = lib!.MONERO_Wallet_getReceivedFromDeviceLength(); debugEnd?.call('MONERO_Wallet_getReceivedFromDeviceLength'); return ret; } @Deprecated("TODO") -bool Wallet_getWaitsForDeviceSend(wallet ptr) { +bool Wallet_getWaitsForDeviceSend() { debugStart?.call('MONERO_Wallet_getWaitsForDeviceSend'); lib ??= MoneroC(DynamicLibrary.open(libPath)); - final ret = lib!.MONERO_Wallet_getWaitsForDeviceSend(ptr); + final ret = lib!.MONERO_Wallet_getWaitsForDeviceSend(); debugEnd?.call('MONERO_Wallet_getWaitsForDeviceSend'); return ret; } @Deprecated("TODO") -bool Wallet_getWaitsForDeviceReceive(wallet ptr) { +bool Wallet_getWaitsForDeviceReceive() { debugStart?.call('MONERO_Wallet_getWaitsForDeviceReceive'); lib ??= MoneroC(DynamicLibrary.open(libPath)); - final ret = lib!.MONERO_Wallet_getWaitsForDeviceReceive(ptr); + final ret = lib!.MONERO_Wallet_getWaitsForDeviceReceive(); debugEnd?.call('MONERO_Wallet_getWaitsForDeviceReceive'); return ret; } @Deprecated("TODO") -void Wallet_setDeviceReceivedData( - wallet ptr, Pointer data, int len) { +void Wallet_setDeviceReceivedData(Pointer data, int len) { debugStart?.call('MONERO_Wallet_setDeviceReceivedData'); lib ??= MoneroC(DynamicLibrary.open(libPath)); - final ret = lib!.MONERO_Wallet_setDeviceReceivedData(ptr, data, len); + final ret = lib!.MONERO_Wallet_setDeviceReceivedData(data, len); debugEnd?.call('MONERO_Wallet_setDeviceReceivedData'); return ret; } @Deprecated("TODO") -void Wallet_setDeviceSendData(wallet ptr, Pointer data, int len) { +void Wallet_setDeviceSendData(Pointer data, int len) { debugStart?.call('MONERO_Wallet_setDeviceSendData'); lib ??= MoneroC(DynamicLibrary.open(libPath)); - final ret = lib!.MONERO_Wallet_setDeviceSendData(ptr, data, len); + final ret = lib!.MONERO_Wallet_setDeviceSendData(data, len); debugEnd?.call('MONERO_Wallet_setDeviceSendData'); return ret; } diff --git a/impls/monero.dart/lib/src/monero.dart b/impls/monero.dart/lib/src/monero.dart index b2eb8c7..4353841 100644 --- a/impls/monero.dart/lib/src/monero.dart +++ b/impls/monero.dart/lib/src/monero.dart @@ -1033,14 +1033,12 @@ class MoneroWallet implements Wallet2Wallet { return monero.Wallet_getPolyseed(walletPtr, passphrase: passphrase); } - @override - Pointer getReceivedFromDevice() { - return monero.Wallet_getReceivedFromDevice(walletPtr); + static Pointer getReceivedFromDevice() { + return monero.Wallet_getReceivedFromDevice(); } - @override - int getReceivedFromDeviceLength() { - return monero.Wallet_getReceivedFromDeviceLength(walletPtr); + static int getReceivedFromDeviceLength() { + return monero.Wallet_getReceivedFromDeviceLength(); } @override @@ -1052,20 +1050,17 @@ class MoneroWallet implements Wallet2Wallet { String getSeedLanguage() { return monero.Wallet_getSeedLanguage(walletPtr); } - - @override - Pointer getSendToDevice() { - return monero.Wallet_getSendToDevice(walletPtr); + + static Pointer getSendToDevice() { + return monero.Wallet_getSendToDevice(); } - @override - int getSendToDeviceLength() { - return monero.Wallet_getSendToDeviceLength(walletPtr); + static int getSendToDeviceLength() { + return monero.Wallet_getSendToDeviceLength(); } - @override - bool getStateIsConnected() { - return monero.Wallet_getStateIsConnected(walletPtr); + static bool getStateIsConnected() { + return monero.Wallet_getStateIsConnected(); } @override @@ -1083,14 +1078,12 @@ class MoneroWallet implements Wallet2Wallet { return monero.Wallet_getUserNote(walletPtr, txid: txid); } - @override - bool getWaitsForDeviceReceive() { - return monero.Wallet_getWaitsForDeviceReceive(walletPtr); + static bool getWaitsForDeviceReceive() { + return monero.Wallet_getWaitsForDeviceReceive(); } - @override - bool getWaitsForDeviceSend() { - return monero.Wallet_getWaitsForDeviceSend(walletPtr); + static bool getWaitsForDeviceSend() { + return monero.Wallet_getWaitsForDeviceSend(); } @override @@ -1357,14 +1350,12 @@ class MoneroWallet implements Wallet2Wallet { return monero.Wallet_setDevicePin(walletPtr, passphrase: passphrase); } - @override - void setDeviceReceivedData(Pointer data, int len) { - monero.Wallet_setDeviceReceivedData(walletPtr, data, len); + static void setDeviceReceivedData(Pointer data, int len) { + monero.Wallet_setDeviceReceivedData(data, len); } - @override - void setDeviceSendData(Pointer data, int len) { - monero.Wallet_setDeviceSendData(walletPtr, data, len); + static void setDeviceSendData(Pointer data, int len) { + monero.Wallet_setDeviceSendData(data, len); } @override diff --git a/impls/monero.dart/lib/src/wallet2.dart b/impls/monero.dart/lib/src/wallet2.dart index 2c07548..8c41ffa 100644 --- a/impls/monero.dart/lib/src/wallet2.dart +++ b/impls/monero.dart/lib/src/wallet2.dart @@ -364,15 +364,6 @@ abstract class Wallet2Wallet { String deviceShowAddress({required int accountIndex, required int addressIndex}); bool reconnectDevice(); int getBytesReceived(); - bool getStateIsConnected(); - Pointer getSendToDevice(); - int getSendToDeviceLength(); - Pointer getReceivedFromDevice(); - int getReceivedFromDeviceLength(); - bool getWaitsForDeviceSend(); - bool getWaitsForDeviceReceive(); - void setDeviceReceivedData(Pointer data, int len); - void setDeviceSendData(Pointer data, int len); int getBytesSent(); Wallet2WalletListener getWalletListener(); } -- cgit v1.2.3