orbis1-sdk-rn 0.0.2 → 0.0.4

package/android/build.gradle

@@ -37,6 +37,12 @@ android {
 
   compileSdkVersion getExtOrDefault("compileSdkVersion")
 
+  sourceSets {
+    main {
+      java.srcDirs += "$projectDir/build/generated/source/codegen"
+    }
+  }
+
   defaultConfig {
     minSdkVersion getExtOrDefault("minSdkVersion")
     targetSdkVersion getExtOrDefault("targetSdkVersion")
@@ -67,12 +73,41 @@ repositories {
   google()
 }
 
+// Run codegen before compile so NativeRgbSpec is generated (aligns with iOS Orbis1SdkSpec/NativeRgbSpec)
+def libraryRoot = file("${projectDir}/..")
+def codegenOutDir = file("${projectDir}/build/generated/source/codegen")
+task runCodegen(type: Exec) {
+  workingDir libraryRoot
+  commandLine "npm", "run", "codegen"
+  onlyIf { !file("${codegenOutDir}/java/com/rgb/NativeRgbSpec.java").exists() }
+  doLast {
+    removeCodegenTestFiles()
+  }
+}
+def removeCodegenTestFiles() {
+  [ "Orbis1SdkSpec", "RgbSpec" ].each { spec ->
+    def f = file("${codegenOutDir}/jni/react/renderer/components/${spec}/Tests.cpp")
+    if (f.exists()) f.delete()
+  }
+}
+task removeCodegenTests {
+  doLast { removeCodegenTestFiles() }
+}
+tasks.whenTaskAdded { task ->
+  if (task.name == "compileDebugKotlin" || task.name == "compileReleaseKotlin") {
+    task.dependsOn runCodegen
+  }
+  if (task.name == "generateCodegenArtifactsFromSchema") {
+    task.finalizedBy removeCodegenTests
+  }
+}
+
 def kotlin_version = getExtOrDefault("kotlinVersion")
 
 dependencies {
   implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation("io.github.orbis-1:rgb-lib-android:0.3.0-beta.4")
+  implementation("io.github.orbis-1:rgb-lib-android:0.3.0-beta.5")
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1"
 }

package/android/src/main/java/com/orbis1sdk/Orbis1SdkPackage.kt

@@ -9,8 +9,8 @@ import java.util.HashMap
 
 class Orbis1SdkPackage : BaseReactPackage() {
   override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
-    return if (name == Orbis1SdkModule.NAME) {
-      Orbis1SdkModule(reactContext)
+    return if (name == RgbModule.NAME) {
+      RgbModule(reactContext)
     } else {
       null
     }
@@ -19,9 +19,9 @@ class Orbis1SdkPackage : BaseReactPackage() {
   override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
     return ReactModuleInfoProvider {
       val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
-      moduleInfos[Orbis1SdkModule.NAME] = ReactModuleInfo(
-        Orbis1SdkModule.NAME,
-        Orbis1SdkModule.NAME,
+      moduleInfos[RgbModule.NAME] = ReactModuleInfo(
+        RgbModule.NAME,
+        RgbModule.NAME,
         false,  // canOverrideExistingModule
         false,  // needsEagerInit
         false,  // isCxxModule

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

@@ -30,6 +30,8 @@ import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.ReadableType
 import org.rgbtools.Token
 import org.rgbtools.Invoice
+import com.rgb.AppConstants
+import com.rgb.NativeRgbSpec
 
 @ReactModule(name = RgbModule.NAME)
 class RgbModule(reactContext: ReactApplicationContext) :
@@ -46,7 +48,7 @@ class RgbModule(reactContext: ReactApplicationContext) :
   }
 
   companion object {
-    const val NAME = "Rgb"
+    const val NAME = "Orbis1Sdk"
   }
 
   private suspend fun resolvePromise(promise: Promise, result: String) {
@@ -1117,9 +1119,6 @@ class RgbModule(reactContext: ReactApplicationContext) :
           BitcoinNetwork.TESTNET4 -> "TESTNET4"
           BitcoinNetwork.REGTEST -> "REGTEST"
           BitcoinNetwork.SIGNET -> "SIGNET"
-          else -> {
-            throw Exception("Unknown bitcoin network")
-          }
         }
         map.putString("bitcoinNetwork", networkString)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orbis1-sdk-rn",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Orbis1 SDK for React Native with RGB core, Watch Tower, and Gas-Free transfers.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/android/src/main/java/com/orbis1sdk/Orbis1SdkModule.kt

@@ -1,15 +0,0 @@
-package com.orbis1sdk
-
-import com.facebook.react.bridge.ReactApplicationContext
-
-class Orbis1SdkModule(reactContext: ReactApplicationContext) :
-  NativeOrbis1SdkSpec(reactContext) {
-
-  override fun multiply(a: Double, b: Double): Double {
-    return a * b
-  }
-
-  companion object {
-    const val NAME = NativeOrbis1SdkSpec.NAME
-  }
-}

package/android/src/main/java/com/orbis1sdk/RgbPackage.kt

@@ -1,33 +0,0 @@
-package com.orbis1sdk
-
-import com.facebook.react.BaseReactPackage
-import com.facebook.react.bridge.NativeModule
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.module.model.ReactModuleInfo
-import com.facebook.react.module.model.ReactModuleInfoProvider
-import java.util.HashMap
-
-class RgbPackage : BaseReactPackage() {
-  override fun getModule(name: String, reactContext: ReactApplicationContext): NativeModule? {
-    return if (name == RgbModule.NAME) {
-      RgbModule(reactContext)
-    } else {
-      null
-    }
-  }
-
-  override fun getReactModuleInfoProvider(): ReactModuleInfoProvider {
-    return ReactModuleInfoProvider {
-      val moduleInfos: MutableMap<String, ReactModuleInfo> = HashMap()
-      moduleInfos[RgbModule.NAME] = ReactModuleInfo(
-        RgbModule.NAME,
-        RgbModule.NAME,
-        false,  // canOverrideExistingModule
-        false,  // needsEagerInit
-        false,  // isCxxModule
-        true // isTurboModule
-      )
-      moduleInfos
-    }
-  }
-}