Merge pull request #12 from zoedberg/c_bindings_rework

C bindings rework
RGB-WG · Oct 29, 2020 · 1114995 · 1114995
2 parents 4e8ec34 + 118246e
commit 1114995
Show file tree

Hide file tree

Showing 6 changed files with 197 additions and 99 deletions.
diff --git a/demo/android/app/src/main/java/org/lnpbp/demoapp/MainActivity.java b/demo/android/app/src/main/java/org/lnpbp/demoapp/MainActivity.java
@@ -39,7 +39,13 @@ public void onClick(View view) {
 
                     final String consignment_file = getCacheDir().toString() + "/" + UUID.randomUUID().toString();
                     final String transaction_file = getCacheDir().toString() + "/" + UUID.randomUUID().toString();
-                    runtime.transfer(Arrays.asList("0313ba7cfcaa66029a1a63918ebc426259f00953016c461663315d1bf6b83ab4:0"), Arrays.asList(allocation), "rgb20:outpoint1mzu8vz3jly3rzzkdpph583yahv9wktljtfcln6pe2le6n7ehqulstu967t?amount=5&asset=rgb:id1yqqqxya60n725eszngdx8yvwh3pxyk0sp9fszmzxze3nzhgm76ur4dqf2f7gy", "cHNidP8BAFICAAAAAZ38ZijCbFiZ/hvT3DOGZb/VXXraEPYiCXPfLTht7BJ2AQAAAAD/////AfA9zR0AAAAAFgAUezoAv9wU0neVwrdJAdCdpu8TNXkAAAAATwEENYfPAto/0AiAAAAAlwSLGtBEWx7IJ1UXcnyHtOTrwYogP/oPlMAVZr046QADUbdDiH7h1A3DKmBDck8tZFmztaTXPa7I+64EcvO8Q+IM2QxqT64AAIAAAACATwEENYfPAto/0AiAAAABuQRSQnE5zXjCz/JES+NTzVhgXj5RMoXlKLQH+uP2FzUD0wpel8itvFV9rCrZp+OcFyLrrGnmaLbyZnzB1nHIPKsM2QxqT64AAIABAACAAAEBKwBlzR0AAAAAIgAgLFSGEmxJeAeagU4TcV1l82RZ5NbMre0mbQUIZFuvpjIBBUdSIQKdoSzbWyNWkrkVNq/v5ckcOrlHPY5DtTODarRWKZyIcSEDNys0I07Xz5wf6l0F1EFVeSe+lUKxYusC4ass6AIkwAtSriIGAp2hLNtbI1aSuRU2r+/lyRw6uUc9jkO1M4NqtFYpnIhxENkMak+uAACAAAAAgAAAAAAiBgM3KzQjTtfPnB/qXQXUQVV5J76VQrFi6wLhqyzoAiTACxDZDGpPrgAAgAEAAIAAAAAAACICA57/H1R6HV+S36K6evaslxpL0DukpzSwMVaiVritOh75EO3kXMUAAACAAAAAgAEAAIAA", 465, "0313ba7cfcaa66029a1a63918ebc426259f00953016c461663315d1bf6b83ab4:2", consignment_file, transaction_file);
+                    runtime.transfer(
+                            Arrays.asList("0313ba7cfcaa66029a1a63918ebc426259f00953016c461663315d1bf6b83ab4:0"),
+                            Arrays.asList(allocation),
+                            "rgb20:outpoint1mzu8vz3jly3rzzkdpph583yahv9wktljtfcln6pe2le6n7ehqulstu967t?amount=5&asset=rgb:id1yqqqxya60n725eszngdx8yvwh3pxyk0sp9fszmzxze3nzhgm76ur4dqf2f7gy",
+                            "cHNidP8BAFICAAAAAZ38ZijCbFiZ/hvT3DOGZb/VXXraEPYiCXPfLTht7BJ2AQAAAAD/////AfA9zR0AAAAAFgAUezoAv9wU0neVwrdJAdCdpu8TNXkAAAAATwEENYfPAto/0AiAAAAAlwSLGtBEWx7IJ1UXcnyHtOTrwYogP/oPlMAVZr046QADUbdDiH7h1A3DKmBDck8tZFmztaTXPa7I+64EcvO8Q+IM2QxqT64AAIAAAACATwEENYfPAto/0AiAAAABuQRSQnE5zXjCz/JES+NTzVhgXj5RMoXlKLQH+uP2FzUD0wpel8itvFV9rCrZp+OcFyLrrGnmaLbyZnzB1nHIPKsM2QxqT64AAIABAACAAAEBKwBlzR0AAAAAIgAgLFSGEmxJeAeagU4TcV1l82RZ5NbMre0mbQUIZFuvpjIBBUdSIQKdoSzbWyNWkrkVNq/v5ckcOrlHPY5DtTODarRWKZyIcSEDNys0I07Xz5wf6l0F1EFVeSe+lUKxYusC4ass6AIkwAtSriIGAp2hLNtbI1aSuRU2r+/lyRw6uUc9jkO1M4NqtFYpnIhxENkMak+uAACAAAAAgAAAAAAiBgM3KzQjTtfPnB/qXQXUQVV5J76VQrFi6wLhqyzoAiTACxDZDGpPrgAAgAEAAIAAAAAAACICA57/H1R6HV+S36K6evaslxpL0DukpzSwMVaiVritOh75EO3kXMUAAACAAAAAgAEAAIAA",
+                            consignment_file,
+                            transaction_file);
                 } catch (RuntimeException e) {
                     Log.e("RGB_NODE", e.getMessage());
                 }

diff --git a/demo/nodejs/example.js b/demo/nodejs/example.js
@@ -1,4 +1,4 @@
-const ex = require('../../ffi/nodejs/build/Release/rgb_node');
+const ex = require('../../ffi/nodejs/build/Release/rgb_node')
 
 const config = {
     network: "testnet",
@@ -8,9 +8,21 @@ const config = {
     },
     threaded: false,
     datadir: "/tmp/rgb-node/"
-};
+}
 
-ex.start_rgb(JSON.stringify(config))
+const transferData = {
+    inputs: ["0313ba7cfcaa66029a1a63918ebc426259f00953016c461663315d1bf6b83ab4:0"],
+    allocate: [
+        { coins: 100, vout:1, txid: "0313ba7cfcaa66029a1a63918ebc426259f00953016c461663315d1bf6b83ab4" }
+    ],
+    invoice: "rgb20:outpoint1mzu8vz3jly3rzzkdpph583yahv9wktljtfcln6pe2le6n7ehqulstu967t?amount=5&asset=rgb:id1yqqqxya60n725eszngdx8yvwh3pxyk0sp9fszmzxze3nzhgm76ur4dqf2f7gy",
+    prototype_psbt: "cHNidP8BAFICAAAAAZ38ZijCbFiZ/hvT3DOGZb/VXXraEPYiCXPfLTht7BJ2AQAAAAD/////AfA9zR0AAAAAFgAUezoAv9wU0neVwrdJAdCdpu8TNXkAAAAATwEENYfPAto/0AiAAAAAlwSLGtBEWx7IJ1UXcnyHtOTrwYogP/oPlMAVZr046QADUbdDiH7h1A3DKmBDck8tZFmztaTXPa7I+64EcvO8Q+IM2QxqT64AAIAAAACATwEENYfPAto/0AiAAAABuQRSQnE5zXjCz/JES+NTzVhgXj5RMoXlKLQH+uP2FzUD0wpel8itvFV9rCrZp+OcFyLrrGnmaLbyZnzB1nHIPKsM2QxqT64AAIABAACAAAEBKwBlzR0AAAAAIgAgLFSGEmxJeAeagU4TcV1l82RZ5NbMre0mbQUIZFuvpjIBBUdSIQKdoSzbWyNWkrkVNq/v5ckcOrlHPY5DtTODarRWKZyIcSEDNys0I07Xz5wf6l0F1EFVeSe+lUKxYusC4ass6AIkwAtSriIGAp2hLNtbI1aSuRU2r+/lyRw6uUc9jkO1M4NqtFYpnIhxENkMak+uAACAAAAAgAAAAAAiBgM3KzQjTtfPnB/qXQXUQVV5J76VQrFi6wLhqyzoAiTACxDZDGpPrgAAgAEAAIAAAAAAACICA57/H1R6HV+S36K6evaslxpL0DukpzSwMVaiVritOh75EO3kXMUAAACAAAAAgAEAAIAA",
+    consignment_file: "/tmp/rgb-node/output/consignment",
+    transaction_file: "/tmp/rgb-node/output/transaction"
+}
+
+ex.start_rgb(config.network, config.stash_endpoint, JSON.stringify(config.contract_endpoints), config.threaded,
+             config.datadir)
     /*.then(r => ex.issue(r, JSON.stringify({
         network: "testnet",
         ticker: "USDT",
@@ -19,14 +31,7 @@ ex.start_rgb(JSON.stringify(config))
         allocations: [{ coins: 100, vout:0, txid: "0313ba7cfcaa66029a1a63918ebc426259f00953016c461663315d1bf6b83ab4" }],
         precision: 0,
     })))*/
-    .then(r => ex.transfer(r, JSON.stringify({
-        inputs: ["0313ba7cfcaa66029a1a63918ebc426259f00953016c461663315d1bf6b83ab4:0"],
-        allocate: [
-            { coins: 100, vout:1, txid: "0313ba7cfcaa66029a1a63918ebc426259f00953016c461663315d1bf6b83ab4" }
-        ],
-        invoice: "rgb20:outpoint1mzu8vz3jly3rzzkdpph583yahv9wktljtfcln6pe2le6n7ehqulstu967t?amount=5&asset=rgb:id1yqqqxya60n725eszngdx8yvwh3pxyk0sp9fszmzxze3nzhgm76ur4dqf2f7gy",
-        prototype_psbt: "cHNidP8BAFICAAAAAZ38ZijCbFiZ/hvT3DOGZb/VXXraEPYiCXPfLTht7BJ2AQAAAAD/////AfA9zR0AAAAAFgAUezoAv9wU0neVwrdJAdCdpu8TNXkAAAAATwEENYfPAto/0AiAAAAAlwSLGtBEWx7IJ1UXcnyHtOTrwYogP/oPlMAVZr046QADUbdDiH7h1A3DKmBDck8tZFmztaTXPa7I+64EcvO8Q+IM2QxqT64AAIAAAACATwEENYfPAto/0AiAAAABuQRSQnE5zXjCz/JES+NTzVhgXj5RMoXlKLQH+uP2FzUD0wpel8itvFV9rCrZp+OcFyLrrGnmaLbyZnzB1nHIPKsM2QxqT64AAIABAACAAAEBKwBlzR0AAAAAIgAgLFSGEmxJeAeagU4TcV1l82RZ5NbMre0mbQUIZFuvpjIBBUdSIQKdoSzbWyNWkrkVNq/v5ckcOrlHPY5DtTODarRWKZyIcSEDNys0I07Xz5wf6l0F1EFVeSe+lUKxYusC4ass6AIkwAtSriIGAp2hLNtbI1aSuRU2r+/lyRw6uUc9jkO1M4NqtFYpnIhxENkMak+uAACAAAAAgAAAAAAiBgM3KzQjTtfPnB/qXQXUQVV5J76VQrFi6wLhqyzoAiTACxDZDGpPrgAAgAEAAIAAAAAAACICA57/H1R6HV+S36K6evaslxpL0DukpzSwMVaiVritOh75EO3kXMUAAACAAAAAgAEAAIAA",
-        consignment_file: "/tmp/rgb-node/output/consignment",
-        transaction_file: "/tmp/rgb-node/output/transaction"
-    })))
-    .catch(e => console.log(e));
+    .then(r => ex.transfer(r, JSON.stringify(transferData.inputs), JSON.stringify(transferData.allocate),
+                           transferData.invoice, transferData.prototype_psbt, transferData.consignment_file,
+                           transferData.transaction_file))
+    .catch(e => console.log(e))
diff --git a/ffi/android/library/src/main/java/org/lnpbp/rgbnode/Runtime.java b/ffi/android/library/src/main/java/org/lnpbp/rgbnode/Runtime.java
@@ -21,8 +21,8 @@ public Runtime(final String network, final String stashEndpoint, final HashMap<S
 
         final StartRgbArgs args = new StartRgbArgs(network, stashEndpoint, contractEndpoints, threaded, datadir);
         try {
-            final String jsonArgs = mapper.writeValueAsString(args);
-            this.runtime = rgb_node.start_rgb(jsonArgs);
+            final String contractEndpointsStr = mapper.writeValueAsString(contractEndpoints);
+            this.runtime = rgb_node.start_rgb(network, stashEndpoint, contractEndpointsStr, threaded, datadir);
         } catch (JsonProcessingException e) {
             throw new RuntimeException(e);
         }
@@ -41,8 +41,9 @@ public void issue(final String network, final String ticker, final String name,
     public void transfer(List<String> inputs, List<IssueArgs.CoinAllocation> allocate, String invoice, String prototype_psbt, String consignment_file, String transaction_file) throws RuntimeException {
         final TransferArgs args = new TransferArgs(inputs, allocate, invoice, prototype_psbt, consignment_file, transaction_file);
         try {
-            final String jsonArgs = mapper.writeValueAsString(args);
-            rgb_node.transfer(this.runtime, jsonArgs);
+            final String inputsStr = mapper.writeValueAsString(inputs);
+            final String allocateStr = mapper.writeValueAsString(allocate);
+            rgb_node.transfer(this.runtime, inputsStr, allocateStr, invoice, prototype_psbt, consignment_file, transaction_file);
         } catch (JsonProcessingException e) {
             throw new RuntimeException(e);
         }

diff --git a/rust-lib/Cargo.lock b/rust-lib/Cargo.lock
diff --git a/rust-lib/Cargo.toml b/rust-lib/Cargo.toml
@@ -15,8 +15,9 @@ cbindgen = "^0.14"
 openssl = { version = "^0.10", features = ["vendored"] }
 
 [dependencies]
+amplify_derive = "~2.0.6"
 log = "0.4"
-rgb_node = "~0.1.0"
+rgb_node = "~0.1.1"
 serde = { version = "~1.0.111", features = ["derive"] }
 serde_with = "~1.5.0"
 serde_json = "~1.0.55"