react-native-rgb 0.2.2 → 0.2.3

package/ios/Rgb.mm

@@ -1,19 +1,15 @@
 #import "Rgb.h"
 
-// Forward declaration for Swift class
 @class RgbSwiftHelper;
 
-// Import Swift bridging header - CocoaPods will generate this automatically
-// The header name follows the pattern: <PodName>-Swift.h
+
 #if __has_include(<Rgb/Rgb-Swift.h>)
 #import <Rgb/Rgb-Swift.h>
 #elif __has_include("Rgb-Swift.h")
 #import "Rgb-Swift.h"
 #else
-// If bridging header is not found, we'll use runtime class lookup
 #endif
 
-// Macro to execute work on a background thread and catch Objective-C exceptions
 #define EXEC_ASYNC(methodBlock) \
   dispatch_async(dispatch_get_global_queue(QOS_CLASS_USER_INITIATED, 0), ^{ \
     @try { methodBlock } \
@@ -24,7 +20,6 @@
 
 @implementation Rgb
 
-// Helpers to ensure promise resolution/rejection happen on the main thread
 - (void)resolvePromise:(RCTPromiseResolveBlock)resolve withResult:(id)result {
   dispatch_async(dispatch_get_main_queue(), ^{
     if (resolve) {
@@ -101,13 +96,12 @@
                 mnemonic:(NSString *)mnemonic
        masterFingerprint:(NSString *)masterFingerprint
         supportedSchemas:(NSArray<NSString *> *)supportedSchemas
-   maxAllocationsPerUtxo:(NSNumber *)maxAllocationsPerUtxo
-         vanillaKeychain:(NSNumber *)vanillaKeychain
+   maxAllocationsPerUtxo:(double)maxAllocationsPerUtxo
+         vanillaKeychain:(double)vanillaKeychain
                   resolve:(RCTPromiseResolveBlock)resolve
                    reject:(RCTPromiseRejectBlock)reject
 {
-    // Validate required parameters
-    if (!network || !accountXpubVanilla || !accountXpubColored || !mnemonic || !masterFingerprint || !supportedSchemas || !maxAllocationsPerUtxo || !vanillaKeychain) {
+    if (!network || !accountXpubVanilla || !accountXpubColored || !mnemonic || !masterFingerprint || !supportedSchemas) {
         if (reject) {
             reject(@"INITIALIZE_WALLET_ERROR", @"Missing required parameters", nil);
         }
@@ -118,20 +112,18 @@
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
     
-    // Capture parameters strongly to ensure they're retained
     NSString *strongNetwork = [network copy];
     NSString *strongAccountXpubVanilla = [accountXpubVanilla copy];
     NSString *strongAccountXpubColored = [accountXpubColored copy];
     NSString *strongMnemonic = [mnemonic copy];
     NSString *strongMasterFingerprint = [masterFingerprint copy];
     NSArray<NSString *> *strongSupportedSchemas = [supportedSchemas copy];
-    NSNumber *strongMaxAllocationsPerUtxo = [maxAllocationsPerUtxo copy];
-    NSNumber *strongVanillaKeychain = [vanillaKeychain copy];
     
-    // Ensure all parameters are non-nil before dispatching
-    if (!strongNetwork || !strongAccountXpubVanilla || !strongAccountXpubColored || 
-        !strongMnemonic || !strongMasterFingerprint || !strongSupportedSchemas || 
-        !strongMaxAllocationsPerUtxo || !strongVanillaKeychain) {
+    NSNumber *strongMaxAllocationsPerUtxo = @(maxAllocationsPerUtxo);
+    NSNumber *strongVanillaKeychain = @(vanillaKeychain);
+    
+    if (!strongNetwork || !strongAccountXpubVanilla || !strongAccountXpubColored ||
+        !strongMnemonic || !strongMasterFingerprint || !strongSupportedSchemas) {
         if (strongReject) {
             strongReject(@"INITIALIZE_WALLET_ERROR", @"One or more parameters became nil", nil);
         }
@@ -183,8 +175,8 @@
     });
 }
 
-- (void)goOnline:(NSNumber *)walletId
-skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
+- (void)goOnline:(double)walletId
+skipConsistencyCheck:(BOOL)skipConsistencyCheck
        indexerUrl:(NSString *)indexerUrl
           resolve:(RCTPromiseResolveBlock)resolve
            reject:(RCTPromiseRejectBlock)reject
@@ -192,13 +184,12 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
-    NSNumber *strongSkipConsistencyCheck = [skipConsistencyCheck copy];
+    NSNumber *strongWalletId = @(walletId);
     NSString *strongIndexerUrl = [indexerUrl copy];
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _goOnline:strongWalletId
-                                      skipConsistencyCheck:[strongSkipConsistencyCheck boolValue]
+                                      skipConsistencyCheck:skipConsistencyCheck
                                                 indexerUrl:strongIndexerUrl];
         NSString *errorMessage = result[@"error"];
         if (errorMessage != nil) {
@@ -217,20 +208,19 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)getBtcBalance:(NSNumber *)walletId
-          skipSync:(NSNumber *)skipSync
+- (void)getBtcBalance:(double)walletId
+          skipSync:(BOOL)skipSync
            resolve:(RCTPromiseResolveBlock)resolve
             reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
-    NSNumber *strongSkipSync = [skipSync copy];
+    NSNumber *strongWalletId = @(walletId);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _getBtcBalance:strongWalletId
-                                                  skipSync:[strongSkipSync boolValue]];
+                                                  skipSync:skipSync];
         NSString *errorMessage = result[@"error"];
         if (errorMessage != nil) {
             NSString *errorCode = result[@"errorCode"] ?: @"GET_BTC_BALANCE_ERROR";
@@ -248,14 +238,14 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)walletClose:(NSNumber *)walletId
+- (void)walletClose:(double)walletId
             resolve:(RCTPromiseResolveBlock)resolve
              reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _walletClose:strongWalletId];
@@ -276,17 +266,16 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-// All wallet methods bridge implementations
-- (void)backup:(NSNumber *)walletId
-    backupPath:(NSString *)backupPath
-       password:(NSString *)password
+- (void)backup:(double)walletId
+    backupPath:(NSString * _Nonnull)backupPath
+       password:(NSString * _Nonnull)password
         resolve:(RCTPromiseResolveBlock)resolve
          reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSString *strongBackupPath = [backupPath copy];
     NSString *strongPassword = [password copy];
     
@@ -309,14 +298,14 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)backupInfo:(NSNumber *)walletId
+- (void)backupInfo:(double)walletId
             resolve:(RCTPromiseResolveBlock)resolve
              reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _backupInfo:strongWalletId];
@@ -337,24 +326,29 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)blindReceive:(NSNumber *)walletId
-              assetId:(NSString *)assetId
-           assignment:(NSDictionary *)assignment
+- (void)blindReceive:(double)walletId
+              assetId:(NSString * _Nullable)assetId
+           assignment:(JS::NativeRgb::SpecBlindReceiveAssignment &)assignment
       durationSeconds:(NSNumber *)durationSeconds
    transportEndpoints:(NSArray<NSString *> *)transportEndpoints
-     minConfirmations:(NSNumber *)minConfirmations
+     minConfirmations:(double)minConfirmations
               resolve:(RCTPromiseResolveBlock)resolve
                reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSString *strongAssetId = assetId ? [assetId copy] : nil;
-    NSDictionary *strongAssignment = [assignment copy];
+    NSMutableDictionary *strongAssignment = [NSMutableDictionary dictionary];
+    strongAssignment[@"type"] = assignment.type();
+    auto amountOpt = assignment.amount();
+    if (amountOpt.has_value()) {
+        strongAssignment[@"amount"] = @(amountOpt.value());
+    }
     NSNumber *strongDurationSeconds = durationSeconds ? [durationSeconds copy] : nil;
     NSArray *strongTransportEndpoints = [transportEndpoints copy];
-    NSNumber *strongMinConfirmations = [minConfirmations copy];
+    NSNumber *strongMinConfirmations = @(minConfirmations);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _blindReceive:strongWalletId
@@ -380,24 +374,24 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)createUtxos:(NSNumber *)walletId
-                upTo:(NSNumber *)upTo
+- (void)createUtxos:(double)walletId
+                upTo:(BOOL)upTo
                  num:(NSNumber *)num
                 size:(NSNumber *)size
-             feeRate:(NSNumber *)feeRate
-            skipSync:(NSNumber *)skipSync
+             feeRate:(double)feeRate
+            skipSync:(BOOL)skipSync
              resolve:(RCTPromiseResolveBlock)resolve
               reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
-    NSNumber *strongUpTo = [upTo copy];
+    NSNumber *strongWalletId = @(walletId);
+    NSNumber *strongUpTo = @(upTo);
     NSNumber *strongNum = num ? [num copy] : nil;
     NSNumber *strongSize = size ? [size copy] : nil;
-    NSNumber *strongFeeRate = [feeRate copy];
-    NSNumber *strongSkipSync = [skipSync copy];
+    NSNumber *strongFeeRate = @(feeRate);
+    NSNumber *strongSkipSync = @(skipSync);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _createUtxos:strongWalletId
@@ -423,24 +417,24 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)createUtxosBegin:(NSNumber *)walletId
-                     upTo:(NSNumber *)upTo
+- (void)createUtxosBegin:(double)walletId
+                     upTo:(BOOL)upTo
                       num:(NSNumber *)num
                      size:(NSNumber *)size
-                  feeRate:(NSNumber *)feeRate
-                 skipSync:(NSNumber *)skipSync
+                  feeRate:(double)feeRate
+                 skipSync:(BOOL)skipSync
                   resolve:(RCTPromiseResolveBlock)resolve
                    reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
-    NSNumber *strongUpTo = [upTo copy];
+    NSNumber *strongWalletId = @(walletId);
+    NSNumber *strongUpTo = @(upTo);
     NSNumber *strongNum = num ? [num copy] : nil;
     NSNumber *strongSize = size ? [size copy] : nil;
-    NSNumber *strongFeeRate = [feeRate copy];
-    NSNumber *strongSkipSync = [skipSync copy];
+    NSNumber *strongFeeRate = @(feeRate);
+    NSNumber *strongSkipSync = @(skipSync);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _createUtxosBegin:strongWalletId
@@ -466,18 +460,18 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)createUtxosEnd:(NSNumber *)walletId
+- (void)createUtxosEnd:(double)walletId
             signedPsbt:(NSString *)signedPsbt
-              skipSync:(NSNumber *)skipSync
+              skipSync:(BOOL)skipSync
                resolve:(RCTPromiseResolveBlock)resolve
                 reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSString *strongSignedPsbt = [signedPsbt copy];
-    NSNumber *strongSkipSync = [skipSync copy];
+    NSNumber *strongSkipSync = @(skipSync);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _createUtxosEnd:strongWalletId
@@ -500,18 +494,18 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)deleteTransfers:(NSNumber *)walletId
+- (void)deleteTransfers:(double)walletId
        batchTransferIdx:(NSNumber *)batchTransferIdx
-            noAssetOnly:(NSNumber *)noAssetOnly
+            noAssetOnly:(BOOL)noAssetOnly
                 resolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSNumber *strongBatchTransferIdx = batchTransferIdx ? [batchTransferIdx copy] : nil;
-    NSNumber *strongNoAssetOnly = [noAssetOnly copy];
+    NSNumber *strongNoAssetOnly = @(noAssetOnly);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _deleteTransfers:strongWalletId
@@ -534,20 +528,20 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)drainTo:(NSNumber *)walletId
+- (void)drainTo:(double)walletId
         address:(NSString *)address
-   destroyAssets:(NSNumber *)destroyAssets
-         feeRate:(NSNumber *)feeRate
+   destroyAssets:(BOOL)destroyAssets
+         feeRate:(double)feeRate
          resolve:(RCTPromiseResolveBlock)resolve
           reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSString *strongAddress = [address copy];
-    NSNumber *strongDestroyAssets = [destroyAssets copy];
-    NSNumber *strongFeeRate = [feeRate copy];
+    NSNumber *strongDestroyAssets = @(destroyAssets);
+    NSNumber *strongFeeRate = @(feeRate);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _drainTo:strongWalletId
@@ -571,20 +565,20 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)drainToBegin:(NSNumber *)walletId
+- (void)drainToBegin:(double)walletId
              address:(NSString *)address
-        destroyAssets:(NSNumber *)destroyAssets
-             feeRate:(NSNumber *)feeRate
+        destroyAssets:(BOOL)destroyAssets
+             feeRate:(double)feeRate
              resolve:(RCTPromiseResolveBlock)resolve
               reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSString *strongAddress = [address copy];
-    NSNumber *strongDestroyAssets = [destroyAssets copy];
-    NSNumber *strongFeeRate = [feeRate copy];
+    NSNumber *strongDestroyAssets = @(destroyAssets);
+    NSNumber *strongFeeRate = @(feeRate);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _drainToBegin:strongWalletId
@@ -608,15 +602,15 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)drainToEnd:(NSNumber *)walletId
-        signedPsbt:(NSString *)signedPsbt
+- (void)drainToEnd:(double)walletId
+        signedPsbt:(NSString * _Nonnull)signedPsbt
            resolve:(RCTPromiseResolveBlock)resolve
             reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSString *strongSignedPsbt = [signedPsbt copy];
     
     EXEC_ASYNC({
@@ -638,20 +632,20 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)failTransfers:(NSNumber *)walletId
+- (void)failTransfers:(double)walletId
      batchTransferIdx:(NSNumber *)batchTransferIdx
-          noAssetOnly:(NSNumber *)noAssetOnly
-             skipSync:(NSNumber *)skipSync
+          noAssetOnly:(BOOL)noAssetOnly
+             skipSync:(BOOL)skipSync
               resolve:(RCTPromiseResolveBlock)resolve
                reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSNumber *strongBatchTransferIdx = batchTransferIdx ? [batchTransferIdx copy] : nil;
-    NSNumber *strongNoAssetOnly = [noAssetOnly copy];
-    NSNumber *strongSkipSync = [skipSync copy];
+    NSNumber *strongNoAssetOnly = @(noAssetOnly);
+    NSNumber *strongSkipSync = @(skipSync);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _failTransfers:strongWalletId
@@ -675,15 +669,15 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)finalizePsbt:(NSNumber *)walletId
-          signedPsbt:(NSString *)signedPsbt
+- (void)finalizePsbt:(double)walletId
+          signedPsbt:(NSString * _Nonnull)signedPsbt
              resolve:(RCTPromiseResolveBlock)resolve
               reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSString *strongSignedPsbt = [signedPsbt copy];
     
     EXEC_ASYNC({
@@ -705,14 +699,14 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)getAddress:(NSNumber *)walletId
+- (void)getAddress:(double)walletId
            resolve:(RCTPromiseResolveBlock)resolve
             reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _getAddress:strongWalletId];
@@ -733,15 +727,15 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)getAssetBalance:(NSNumber *)walletId
-                assetId:(NSString *)assetId
+- (void)getAssetBalance:(double)walletId
+                assetId:(NSString * _Nonnull)assetId
                 resolve:(RCTPromiseResolveBlock)resolve
                  reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSString *strongAssetId = [assetId copy];
     
     EXEC_ASYNC({
@@ -763,15 +757,15 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)getAssetMetadata:(NSNumber *)walletId
-                 assetId:(NSString *)assetId
+- (void)getAssetMetadata:(double)walletId
+                 assetId:(NSString * _Nonnull)assetId
                  resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSString *strongAssetId = [assetId copy];
     
     EXEC_ASYNC({
@@ -793,16 +787,16 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)getFeeEstimation:(NSNumber *)walletId
-                  blocks:(NSNumber *)blocks
+- (void)getFeeEstimation:(double)walletId
+                  blocks:(double)blocks
                  resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
-    NSNumber *strongBlocks = [blocks copy];
+    NSNumber *strongWalletId = @(walletId);
+    NSNumber *strongBlocks = @(blocks);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _getFeeEstimation:strongWalletId blocks:strongBlocks];
@@ -823,14 +817,14 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)getMediaDir:(NSNumber *)walletId
+- (void)getMediaDir:(double)walletId
            resolve:(RCTPromiseResolveBlock)resolve
             reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _getMediaDir:strongWalletId];
@@ -851,14 +845,14 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)getWalletData:(NSNumber *)walletId
+- (void)getWalletData:(double)walletId
               resolve:(RCTPromiseResolveBlock)resolve
                reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _getWalletData:strongWalletId];
@@ -879,14 +873,14 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)getWalletDir:(NSNumber *)walletId
+- (void)getWalletDir:(double)walletId
              resolve:(RCTPromiseResolveBlock)resolve
               reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _getWalletDir:strongWalletId];
@@ -907,22 +901,22 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)inflate:(NSNumber *)walletId
+- (void)inflate:(double)walletId
          assetId:(NSString *)assetId
  inflationAmounts:(NSArray<NSNumber *> *)inflationAmounts
-         feeRate:(NSNumber *)feeRate
- minConfirmations:(NSNumber *)minConfirmations
+         feeRate:(double)feeRate
+ minConfirmations:(double)minConfirmations
          resolve:(RCTPromiseResolveBlock)resolve
           reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSString *strongAssetId = [assetId copy];
     NSArray *strongInflationAmounts = [inflationAmounts copy];
-    NSNumber *strongFeeRate = [feeRate copy];
-    NSNumber *strongMinConfirmations = [minConfirmations copy];
+    NSNumber *strongFeeRate = @(feeRate);
+    NSNumber *strongMinConfirmations = @(minConfirmations);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _inflate:strongWalletId
@@ -947,22 +941,22 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)inflateBegin:(NSNumber *)walletId
+- (void)inflateBegin:(double)walletId
              assetId:(NSString *)assetId
     inflationAmounts:(NSArray<NSNumber *> *)inflationAmounts
-             feeRate:(NSNumber *)feeRate
-    minConfirmations:(NSNumber *)minConfirmations
+             feeRate:(double)feeRate
+    minConfirmations:(double)minConfirmations
              resolve:(RCTPromiseResolveBlock)resolve
               reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSString *strongAssetId = [assetId copy];
     NSArray *strongInflationAmounts = [inflationAmounts copy];
-    NSNumber *strongFeeRate = [feeRate copy];
-    NSNumber *strongMinConfirmations = [minConfirmations copy];
+    NSNumber *strongFeeRate = @(feeRate);
+    NSNumber *strongMinConfirmations = @(minConfirmations);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _inflateBegin:strongWalletId
@@ -987,15 +981,15 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)inflateEnd:(NSNumber *)walletId
-        signedPsbt:(NSString *)signedPsbt
+- (void)inflateEnd:(double)walletId
+        signedPsbt:(NSString * _Nonnull)signedPsbt
            resolve:(RCTPromiseResolveBlock)resolve
             reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSString *strongSignedPsbt = [signedPsbt copy];
     
     EXEC_ASYNC({
@@ -1017,22 +1011,22 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)issueAssetCfa:(NSNumber *)walletId
+- (void)issueAssetCfa:(double)walletId
                  name:(NSString *)name
-              details:(NSString *)details
-            precision:(NSNumber *)precision
+              details:(NSString * _Nullable)details
+            precision:(double)precision
               amounts:(NSArray<NSNumber *> *)amounts
-             filePath:(NSString *)filePath
+             filePath:(NSString * _Nullable)filePath
               resolve:(RCTPromiseResolveBlock)resolve
                reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSString *strongName = [name copy];
     NSString *strongDetails = details ? [details copy] : nil;
-    NSNumber *strongPrecision = [precision copy];
+    NSNumber *strongPrecision = @(precision);
     NSArray *strongAmounts = [amounts copy];
     NSString *strongFilePath = filePath ? [filePath copy] : nil;
     
@@ -1060,27 +1054,27 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)issueAssetIfa:(NSNumber *)walletId
+- (void)issueAssetIfa:(double)walletId
                ticker:(NSString *)ticker
                  name:(NSString *)name
-            precision:(NSNumber *)precision
+            precision:(double)precision
               amounts:(NSArray<NSNumber *> *)amounts
      inflationAmounts:(NSArray<NSNumber *> *)inflationAmounts
-     replaceRightsNum:(NSNumber *)replaceRightsNum
-       rejectListUrl:(NSString *)rejectListUrl
+     replaceRightsNum:(double)replaceRightsNum
+       rejectListUrl:(NSString * _Nullable)rejectListUrl
               resolve:(RCTPromiseResolveBlock)resolve
                reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSString *strongTicker = [ticker copy];
     NSString *strongName = [name copy];
-    NSNumber *strongPrecision = [precision copy];
+    NSNumber *strongPrecision = @(precision);
     NSArray *strongAmounts = [amounts copy];
     NSArray *strongInflationAmounts = [inflationAmounts copy];
-    NSNumber *strongReplaceRightsNum = [replaceRightsNum copy];
+    NSNumber *strongReplaceRightsNum = @(replaceRightsNum);
     NSString *strongRejectListUrl = rejectListUrl ? [rejectListUrl copy] : nil;
     
     EXEC_ASYNC({
@@ -1109,10 +1103,10 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)issueAssetNia:(NSNumber *)walletId
+- (void)issueAssetNia:(double)walletId
                ticker:(NSString *)ticker
                  name:(NSString *)name
-            precision:(NSNumber *)precision
+            precision:(double)precision
               amounts:(NSArray<NSNumber *> *)amounts
               resolve:(RCTPromiseResolveBlock)resolve
                reject:(RCTPromiseRejectBlock)reject
@@ -1120,10 +1114,10 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSString *strongTicker = [ticker copy];
     NSString *strongName = [name copy];
-    NSNumber *strongPrecision = [precision copy];
+    NSNumber *strongPrecision = @(precision);
     NSArray *strongAmounts = [amounts copy];
     
     EXEC_ASYNC({
@@ -1149,12 +1143,12 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)issueAssetUda:(NSNumber *)walletId
+- (void)issueAssetUda:(double)walletId
                ticker:(NSString *)ticker
                  name:(NSString *)name
-              details:(NSString *)details
-            precision:(NSNumber *)precision
-         mediaFilePath:(NSString *)mediaFilePath
+              details:(NSString * _Nullable)details
+            precision:(double)precision
+         mediaFilePath:(NSString * _Nullable)mediaFilePath
   attachmentsFilePaths:(NSArray<NSString *> *)attachmentsFilePaths
               resolve:(RCTPromiseResolveBlock)resolve
                reject:(RCTPromiseRejectBlock)reject
@@ -1162,11 +1156,11 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSString *strongTicker = [ticker copy];
     NSString *strongName = [name copy];
     NSString *strongDetails = details ? [details copy] : nil;
-    NSNumber *strongPrecision = [precision copy];
+    NSNumber *strongPrecision = @(precision);
     NSString *strongMediaFilePath = mediaFilePath ? [mediaFilePath copy] : nil;
     NSArray *strongAttachmentsFilePaths = [attachmentsFilePaths copy];
     
@@ -1195,7 +1189,7 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)listAssets:(NSNumber *)walletId
+- (void)listAssets:(double)walletId
   filterAssetSchemas:(NSArray<NSString *> *)filterAssetSchemas
             resolve:(RCTPromiseResolveBlock)resolve
              reject:(RCTPromiseRejectBlock)reject
@@ -1203,7 +1197,7 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSArray *strongFilterAssetSchemas = [filterAssetSchemas copy];
     
     EXEC_ASYNC({
@@ -1225,16 +1219,16 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)listTransactions:(NSNumber *)walletId
-                skipSync:(NSNumber *)skipSync
+- (void)listTransactions:(double)walletId
+                skipSync:(BOOL)skipSync
                  resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
-    NSNumber *strongSkipSync = [skipSync copy];
+    NSNumber *strongWalletId = @(walletId);
+    NSNumber *strongSkipSync = @(skipSync);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _listTransactions:strongWalletId skipSync:strongSkipSync];
@@ -1255,15 +1249,15 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)listTransfers:(NSNumber *)walletId
-              assetId:(NSString *)assetId
+- (void)listTransfers:(double)walletId
+              assetId:(NSString * _Nullable)assetId
               resolve:(RCTPromiseResolveBlock)resolve
                reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSString *strongAssetId = assetId ? [assetId copy] : nil;
     
     EXEC_ASYNC({
@@ -1285,18 +1279,18 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)listUnspents:(NSNumber *)walletId
-          settledOnly:(NSNumber *)settledOnly
-            skipSync:(NSNumber *)skipSync
+- (void)listUnspents:(double)walletId
+          settledOnly:(BOOL)settledOnly
+            skipSync:(BOOL)skipSync
              resolve:(RCTPromiseResolveBlock)resolve
               reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
-    NSNumber *strongSettledOnly = [settledOnly copy];
-    NSNumber *strongSkipSync = [skipSync copy];
+    NSNumber *strongWalletId = @(walletId);
+    NSNumber *strongSettledOnly = @(settledOnly);
+    NSNumber *strongSkipSync = @(skipSync);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _listUnspents:strongWalletId
@@ -1319,20 +1313,20 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)refresh:(NSNumber *)walletId
-        assetId:(NSString *)assetId
+- (void)refresh:(double)walletId
+        assetId:(NSString * _Nullable)assetId
          filter:(NSArray<NSDictionary *> *)filter
-       skipSync:(NSNumber *)skipSync
+       skipSync:(BOOL)skipSync
         resolve:(RCTPromiseResolveBlock)resolve
          reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSString *strongAssetId = assetId ? [assetId copy] : nil;
     NSArray *strongFilter = [filter copy];
-    NSNumber *strongSkipSync = [skipSync copy];
+    NSNumber *strongSkipSync = @(skipSync);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _refresh:strongWalletId
@@ -1356,24 +1350,24 @@ skipConsistencyCheck:(NSNumber *)skipConsistencyCheck
     });
 }
 
-- (void)send:(NSNumber *)walletId
+- (void)send:(double)walletId
  recipientMap:(NSDictionary *)recipientMap
-     donation:(NSNumber *)donation
-      feeRate:(NSNumber *)feeRate
-minConfirmations:(NSNumber *)minConfirmations
-     skipSync:(NSNumber *)skipSync
+     donation:(BOOL)donation
+      feeRate:(double)feeRate
+minConfirmations:(double)minConfirmations
+     skipSync:(BOOL)skipSync
      resolve:(RCTPromiseResolveBlock)resolve
       reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSDictionary *strongRecipientMap = [recipientMap copy];
-    NSNumber *strongDonation = [donation copy];
-    NSNumber *strongFeeRate = [feeRate copy];
-    NSNumber *strongMinConfirmations = [minConfirmations copy];
-    NSNumber *strongSkipSync = [skipSync copy];
+    NSNumber *strongDonation = @(donation);
+    NSNumber *strongFeeRate = @(feeRate);
+    NSNumber *strongMinConfirmations = @(minConfirmations);
+    NSNumber *strongSkipSync = @(skipSync);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _send:strongWalletId
@@ -1399,22 +1393,22 @@ minConfirmations:(NSNumber *)minConfirmations
     });
 }
 
-- (void)sendBegin:(NSNumber *)walletId
+- (void)sendBegin:(double)walletId
      recipientMap:(NSDictionary *)recipientMap
-          donation:(NSNumber *)donation
-           feeRate:(NSNumber *)feeRate
-  minConfirmations:(NSNumber *)minConfirmations
+          donation:(BOOL)donation
+           feeRate:(double)feeRate
+  minConfirmations:(double)minConfirmations
           resolve:(RCTPromiseResolveBlock)resolve
            reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSDictionary *strongRecipientMap = [recipientMap copy];
-    NSNumber *strongDonation = [donation copy];
-    NSNumber *strongFeeRate = [feeRate copy];
-    NSNumber *strongMinConfirmations = [minConfirmations copy];
+    NSNumber *strongDonation = @(donation);
+    NSNumber *strongFeeRate = @(feeRate);
+    NSNumber *strongMinConfirmations = @(minConfirmations);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _sendBegin:strongWalletId
@@ -1439,22 +1433,22 @@ minConfirmations:(NSNumber *)minConfirmations
     });
 }
 
-- (void)sendBtc:(NSNumber *)walletId
+- (void)sendBtc:(double)walletId
         address:(NSString *)address
-         amount:(NSNumber *)amount
-        feeRate:(NSNumber *)feeRate
-       skipSync:(NSNumber *)skipSync
+         amount:(double)amount
+        feeRate:(double)feeRate
+       skipSync:(BOOL)skipSync
         resolve:(RCTPromiseResolveBlock)resolve
          reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSString *strongAddress = [address copy];
-    NSNumber *strongAmount = [amount copy];
-    NSNumber *strongFeeRate = [feeRate copy];
-    NSNumber *strongSkipSync = [skipSync copy];
+    NSNumber *strongAmount = @(amount);
+    NSNumber *strongFeeRate = @(feeRate);
+    NSNumber *strongSkipSync = @(skipSync);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _sendBtc:strongWalletId
@@ -1479,22 +1473,22 @@ minConfirmations:(NSNumber *)minConfirmations
     });
 }
 
-- (void)sendBtcBegin:(NSNumber *)walletId
+- (void)sendBtcBegin:(double)walletId
              address:(NSString *)address
-              amount:(NSNumber *)amount
-             feeRate:(NSNumber *)feeRate
-            skipSync:(NSNumber *)skipSync
+              amount:(double)amount
+             feeRate:(double)feeRate
+            skipSync:(BOOL)skipSync
              resolve:(RCTPromiseResolveBlock)resolve
               reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSString *strongAddress = [address copy];
-    NSNumber *strongAmount = [amount copy];
-    NSNumber *strongFeeRate = [feeRate copy];
-    NSNumber *strongSkipSync = [skipSync copy];
+    NSNumber *strongAmount = @(amount);
+    NSNumber *strongFeeRate = @(feeRate);
+    NSNumber *strongSkipSync = @(skipSync);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _sendBtcBegin:strongWalletId
@@ -1519,18 +1513,18 @@ minConfirmations:(NSNumber *)minConfirmations
     });
 }
 
-- (void)sendBtcEnd:(NSNumber *)walletId
+- (void)sendBtcEnd:(double)walletId
        signedPsbt:(NSString *)signedPsbt
-          skipSync:(NSNumber *)skipSync
+          skipSync:(BOOL)skipSync
           resolve:(RCTPromiseResolveBlock)resolve
            reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSString *strongSignedPsbt = [signedPsbt copy];
-    NSNumber *strongSkipSync = [skipSync copy];
+    NSNumber *strongSkipSync = @(skipSync);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _sendBtcEnd:strongWalletId signedPsbt:strongSignedPsbt skipSync:strongSkipSync];
@@ -1551,18 +1545,18 @@ minConfirmations:(NSNumber *)minConfirmations
     });
 }
 
-- (void)sendEnd:(NSNumber *)walletId
+- (void)sendEnd:(double)walletId
     signedPsbt:(NSString *)signedPsbt
-       skipSync:(NSNumber *)skipSync
+       skipSync:(BOOL)skipSync
        resolve:(RCTPromiseResolveBlock)resolve
         reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSString *strongSignedPsbt = [signedPsbt copy];
-    NSNumber *strongSkipSync = [skipSync copy];
+    NSNumber *strongSkipSync = @(skipSync);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _sendEnd:strongWalletId signedPsbt:strongSignedPsbt skipSync:strongSkipSync];
@@ -1583,7 +1577,7 @@ minConfirmations:(NSNumber *)minConfirmations
     });
 }
 
-- (void)signPsbt:(NSNumber *)walletId
+- (void)signPsbt:(double)walletId
       unsignedPsbt:(NSString *)unsignedPsbt
          resolve:(RCTPromiseResolveBlock)resolve
           reject:(RCTPromiseRejectBlock)reject
@@ -1591,7 +1585,7 @@ minConfirmations:(NSNumber *)minConfirmations
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSString *strongUnsignedPsbt = [unsignedPsbt copy];
     
     EXEC_ASYNC({
@@ -1613,14 +1607,14 @@ minConfirmations:(NSNumber *)minConfirmations
     });
 }
 
-- (void)sync:(NSNumber *)walletId
+- (void)sync:(double)walletId
      resolve:(RCTPromiseResolveBlock)resolve
       reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _sync:strongWalletId];
@@ -1641,24 +1635,29 @@ minConfirmations:(NSNumber *)minConfirmations
     });
 }
 
-- (void)witnessReceive:(NSNumber *)walletId
-               assetId:(NSString *)assetId
-            assignment:(NSDictionary *)assignment
+- (void)witnessReceive:(double)walletId
+               assetId:(NSString * _Nullable)assetId
+            assignment:(JS::NativeRgb::SpecWitnessReceiveAssignment &)assignment
        durationSeconds:(NSNumber *)durationSeconds
    transportEndpoints:(NSArray<NSString *> *)transportEndpoints
-     minConfirmations:(NSNumber *)minConfirmations
+     minConfirmations:(double)minConfirmations
               resolve:(RCTPromiseResolveBlock)resolve
                reject:(RCTPromiseRejectBlock)reject
 {
     __weak Rgb *weakSelf = self;
     RCTPromiseResolveBlock strongResolve = resolve;
     RCTPromiseRejectBlock strongReject = reject;
-    NSNumber *strongWalletId = [walletId copy];
+    NSNumber *strongWalletId = @(walletId);
     NSString *strongAssetId = assetId ? [assetId copy] : nil;
-    NSDictionary *strongAssignment = [assignment copy];
+    NSMutableDictionary *strongAssignment = [NSMutableDictionary dictionary];
+    strongAssignment[@"type"] = assignment.type();
+    auto amountOpt = assignment.amount();
+    if (amountOpt.has_value()) {
+        strongAssignment[@"amount"] = @(amountOpt.value());
+    }
     NSNumber *strongDurationSeconds = durationSeconds ? [durationSeconds copy] : nil;
     NSArray *strongTransportEndpoints = [transportEndpoints copy];
-    NSNumber *strongMinConfirmations = [minConfirmations copy];
+    NSNumber *strongMinConfirmations = @(minConfirmations);
     
     EXEC_ASYNC({
         NSDictionary *result = [RgbSwiftHelper _witnessReceive:strongWalletId