react-native-rgb 0.2.1 → 0.2.3

package/android/src/main/java/com/rgb/RgbModule.kt

@@ -340,6 +340,37 @@ class RgbModule(reactContext: ReactApplicationContext) :
     return Recipient(recipientId, witnessData, assignment, transportEndpoints)
   }
 
+  private fun assignmentToMap(assignment: Assignment): WritableMap {
+    val map = Arguments.createMap()
+    when (assignment) {
+      is Assignment.Fungible -> {
+        map.putString("type", "FUNGIBLE")
+        map.putDouble("amount", assignment.amount.toDouble())
+      }
+      is Assignment.NonFungible -> {
+        map.putString("type", "NON_FUNGIBLE")
+      }
+      is Assignment.InflationRight -> {
+        map.putString("type", "INFLATION_RIGHT")
+        map.putDouble("amount", assignment.amount.toDouble())
+      }
+      is Assignment.ReplaceRight -> {
+        map.putString("type", "REPLACE_RIGHT")
+      }
+      is Assignment.Any -> {
+        map.putString("type", "ANY")
+      }
+    }
+    return map
+  }
+
+  private fun outpointToMap(outpoint: org.rgbtools.Outpoint): WritableMap {
+    val map = Arguments.createMap()
+    map.putString("txid", outpoint.txid)
+    map.putDouble("vout", outpoint.vout.toDouble())
+    return map
+  }
+
   private fun balanceToMap(balance: org.rgbtools.Balance): WritableMap {
     val map = Arguments.createMap()
     map.putDouble("settled", balance.settled.toDouble())
@@ -397,6 +428,7 @@ class RgbModule(reactContext: ReactApplicationContext) :
     map.putString("assetId", asset.assetId)
     map.putString("ticker", asset.ticker)
     map.putString("name", asset.name)
+    asset.details?.let { map.putString("details", it) }
     map.putInt("precision", asset.precision.toInt())
     map.putDouble("issuedSupply", asset.issuedSupply.toDouble())
     map.putDouble("timestamp", asset.timestamp.toDouble())
@@ -1458,7 +1490,7 @@ class RgbModule(reactContext: ReactApplicationContext) :
 
         transfers.forEach { transfer ->
           val transferMap = Arguments.createMap()
-          transferMap.putInt("transferIdx", transfer.idx)
+          transferMap.putInt("idx", transfer.idx)
           transferMap.putInt("batchTransferIdx", transfer.batchTransferIdx)
           transferMap.putDouble("createdAt", transfer.createdAt.toDouble())
           transferMap.putDouble("updatedAt", transfer.updatedAt.toDouble())
@@ -1482,24 +1514,39 @@ class RgbModule(reactContext: ReactApplicationContext) :
 
           transfer.txid?.let { transferMap.putString("txid", it) }
           transfer.recipientId?.let { transferMap.putString("recipientId", it) }
+          transfer.expiration?.let { transferMap.putDouble("expiration", it.toDouble()) }
+
+          transfer.requestedAssignment?.let {
+            transferMap.putMap("requestedAssignment", assignmentToMap(it))
+          }
+
+          val assignmentsArray = Arguments.createArray()
+          transfer.assignments.forEach { assignment ->
+            assignmentsArray.pushMap(assignmentToMap(assignment))
+          }
+          transferMap.putArray("assignments", assignmentsArray)
+
           transfer.receiveUtxo?.let {
-            transferMap.putString("receiveUtxoTxid", it.txid)
-            transferMap.putDouble("receiveUtxoVout", it.vout.toDouble())
+            transferMap.putMap("receiveUtxo", outpointToMap(it))
           }
+
           transfer.changeUtxo?.let {
-            transferMap.putString("changeUtxoTxid", it.txid)
-            transferMap.putDouble("changeUtxoVout", it.vout.toDouble())
+            transferMap.putMap("changeUtxo", outpointToMap(it))
           }
-          transfer.expiration?.let { transferMap.putDouble("expiration", it.toDouble()) }
 
-          val transportEndpointsStrings = transfer.transportEndpoints.map { it.endpoint }
-          transferMap.putString("transportEndpoints", transportEndpointsStrings.joinToString(","))
+          val transportEndpointsMap = Arguments.createArray()
+          transfer.transportEndpoints.forEach {
+            val endpoint = Arguments.createMap()
+            endpoint.putString("endpoint", it.endpoint)
+            endpoint.putBoolean("used", it.used)
+            endpoint.putString("transportType", it.transportType.toString())
+            transportEndpointsMap.pushMap(endpoint)
+          }
+          transferMap.putArray("transportEndpoints", transportEndpointsMap)
 
           transfer.invoiceString?.let { transferMap.putString("invoiceString", it) }
           transfer.consignmentPath?.let { transferMap.putString("consignmentPath", it) }
 
-          transferMap.putInt("assignmentsCount", transfer.assignments.size)
-
           transfersArray.pushMap(transferMap)
         }
 
@@ -1534,14 +1581,26 @@ class RgbModule(reactContext: ReactApplicationContext) :
         unspents.forEach { unspent ->
           val unspentMap = Arguments.createMap()
           val utxoMap = Arguments.createMap()
-          utxoMap.putString("txid", unspent.utxo.outpoint.txid)
-          utxoMap.putDouble("vout", unspent.utxo.outpoint.vout.toDouble())
+          val outpointMap = Arguments.createMap()
+          outpointMap.putString("txid", unspent.utxo.outpoint.txid)
+          outpointMap.putDouble("vout", unspent.utxo.outpoint.vout.toDouble())
+          utxoMap.putMap("outpoint", outpointMap)
           utxoMap.putDouble("btcAmount", unspent.utxo.btcAmount.toDouble())
           utxoMap.putBoolean("colorable", unspent.utxo.colorable)
           utxoMap.putBoolean("exists", unspent.utxo.exists)
           unspentMap.putMap("utxo", utxoMap)
           unspentMap.putDouble("pendingBlinded", unspent.pendingBlinded.toDouble())
-          unspentMap.putDouble("rgbAllocationsCount", unspent.rgbAllocations.size.toDouble())
+
+          val rgbAllocationsArray = Arguments.createArray()
+          unspent.rgbAllocations.forEach { allocation ->
+            val allocationMap = Arguments.createMap()
+            allocation.assetId?.let { allocationMap.putString("assetId", it) }
+            allocationMap.putMap("assignment", assignmentToMap(allocation.assignment))
+            allocationMap.putBoolean("settled", allocation.settled)
+            rgbAllocationsArray.pushMap(allocationMap)
+          }
+          unspentMap.putArray("rgbAllocations", rgbAllocationsArray)
+
           unspentsArray.pushMap(unspentMap)
         }
 
@@ -1870,7 +1929,28 @@ class RgbModule(reactContext: ReactApplicationContext) :
           ?: throw IllegalStateException("Wallet is not online")
 
         session.wallet.sync(online)
-
+        val refresh = session.wallet.refresh(online, null, emptyList(), false)
+        val failed = session.wallet.failTransfers(online, null, false, false)
+        val delete = session.wallet.deleteTransfers(null, false)
+        val assets = session.wallet.listAssets(listOf())
+        val rgb25Assets = assets.cfa
+        val rgb20Assets = assets.nia
+        val udaAssets = assets.uda
+        if (rgb20Assets != null) {
+          for (rgb20Asset in rgb20Assets) {
+            val assetRefresh = session.wallet.refresh(online, rgb20Asset.assetId, listOf(), false)
+          }
+        }
+        if (rgb25Assets != null) {
+          for (rgb25Asset in rgb25Assets) {
+            val assetRefresh = session.wallet.refresh(online, rgb25Asset.assetId, listOf(), false)
+          }
+        }
+        if (udaAssets != null) {
+          for (udaAsset in udaAssets) {
+            val assetRefresh = session.wallet.refresh(online, udaAsset.assetId, listOf(), false)
+          }
+        }
         withContext(Dispatchers.Main) {
           promise.resolve(null)
         }
@@ -1930,13 +2010,24 @@ class RgbModule(reactContext: ReactApplicationContext) :
         val map = Arguments.createMap()
         map.putString("invoice", invoice)
         map.putString("recipientId", invoiceData.recipientId)
-        map.putString("assetSchema", invoiceData.assetSchema?.toString())
+        invoiceData.assetSchema?.let { schema ->
+          val assetSchemaString = when (schema) {
+            AssetSchema.NIA -> "NIA"
+            AssetSchema.UDA -> "UDA"
+            AssetSchema.CFA -> "CFA"
+            AssetSchema.IFA -> "IFA"
+          }
+          map.putString("assetSchema", assetSchemaString)
+        }
         map.putString("assetId", invoiceData.assetId)
-        map.putString("assignment", invoiceData.assignment.toString())
+        map.putMap("assignment", assignmentToMap(invoiceData.assignment))
         map.putString("assignmentName", invoiceData.assignmentName)
         map.putString("network", invoiceData.network.toString())
-        val transportEndpointsStrings = invoiceData.transportEndpoints.map { it }
-        map.putString("transportEndpoints", transportEndpointsStrings.joinToString(","))
+        val transportEndpointsArray = Arguments.createArray()
+        invoiceData.transportEndpoints.forEach {
+          transportEndpointsArray.pushString(it)
+        }
+        map.putArray("transportEndpoints", transportEndpointsArray)
 
         invoiceData.expirationTimestamp?.let {
           map.putDouble("expirationTimestamp", it.toDouble())

package/ios/AppConstants.swift

@@ -5,67 +5,53 @@ import Foundation
 public class AppConstants: NSObject {
   @objc public static let shared = AppConstants()
   
-  let rgbDirName = ""
-  var appContext: Any? = nil
-  var rgbDir: URL? = nil
-  let backupName = "%s.rgb_backup"
-  
-  let testnetElectrumURL = "ssl://electrum.iriswallet.com:50013"
-  let testnet4ElectrumURL = "ssl://electrum.iriswallet.com:50053"
-  
-  let regtestElectrumURL = "electrum.rgbtools.org:50041"
-  let mainnetElectrumUrl = "ssl://electrum.iriswallet.com:50003"
-  
-  let proxyConsignmentEndpoint = "rpcs://proxy.iriswallet.com/0.2/json-rpc"
-  let rgbDefaultPrecision: UInt8 = 0
-  let defaultFeeRate: Float = 50.0
-  
-  private let mainnetUrls = [
-    "ssl://electrum.iriswallet.com:50003",
-    "https://blockstream.info/api"
-  ]
-  private var callCount = 0
+  private let rgbDirName = ""
+  private var _rgbDir: URL? = nil
+  private let queue = DispatchQueue(label: "com.rgb.appconstants")
+  
+  var rgbDir: URL? {
+    get {
+      return queue.sync {
+        return _rgbDir
+      }
+    }
+    set {
+      queue.sync {
+        self._rgbDir = newValue
+      }
+    }
+  }
   
   private override init() {
     super.init()
   }
   
   @objc public func initContext() {
-    let fileManager = FileManager.default
-    let documentsPath = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0]
-    rgbDir = documentsPath.appendingPathComponent(rgbDirName)
-    
-    // Create directory if it doesn't exist
-    if let rgbDir = rgbDir {
-      try? fileManager.createDirectory(at: rgbDir, withIntermediateDirectories: true, attributes: nil)
+    queue.sync {
+      let fileManager = FileManager.default
+      let documentsPath = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0]
+      _rgbDir = documentsPath.appendingPathComponent(rgbDirName)
+      
+      // Create directory if it doesn't exist
+      if let rgbDir = _rgbDir {
+        try? fileManager.createDirectory(at: rgbDir, withIntermediateDirectories: true, attributes: nil)
+      }
     }
   }
   
   @objc public func ensureInitialized() {
-    if rgbDir == nil {
-      initContext()
-    }
-  }
-  
-  @objc public func getElectrumUrl(network: String) -> String {
-    switch network.uppercased() {
-    case "TESTNET":
-      return testnetElectrumURL
-    case "TESTNET4":
-      return testnet4ElectrumURL
-    case "REGTEST":
-      return regtestElectrumURL
-    case "MAINNET":
-      return getNextMainnetUrl()
-    default:
-      return testnetElectrumURL
+    queue.sync {
+      if _rgbDir == nil {
+        let fileManager = FileManager.default
+        let documentsPath = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0]
+        _rgbDir = documentsPath.appendingPathComponent(rgbDirName)
+        
+        // Create directory if it doesn't exist
+        if let rgbDir = _rgbDir {
+          try? fileManager.createDirectory(at: rgbDir, withIntermediateDirectories: true, attributes: nil)
+        }
+      }
     }
   }
-  
-  private func getNextMainnetUrl() -> String {
-    let url = mainnetUrls[callCount % mainnetUrls.count]
-    callCount += 1
-    return url
-  }
 }