feat: update createTx

Author: nikashitsa

.github/workflows/ci.yml

@@ -5,12 +5,12 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Download Boost
         run: |
-          wget --progress=dot:mega https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.gz
+          wget --progress=dot:mega https://archives.boost.io/release/1.76.0/source/boost_1_76_0.tar.gz
           mkdir -p ./contrib/boost-sdk
           tar zxf 'boost_1_76_0.tar.gz' -C './contrib/boost-sdk' --strip-components=1
       - name: Build Boost
@@ -32,7 +32,7 @@ jobs:
             --env BUILD=production \
             --env WASM=0 \
             -v $(pwd):/src emscripten/emsdk:2.0.20 ./bin/build-emcpp.sh
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: wasm
           path: |
@@ -42,32 +42,32 @@ jobs:
 
   test:
     needs: build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/download-artifact@v2
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v5
         with:
           name: wasm
           path: build
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
       - run: npm ci
       - run: npm test
 
   publish:
     needs: test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: startsWith(github.ref, 'refs/tags/v')
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/download-artifact@v2
+      - uses: actions/checkout@v4
+      - uses: actions/download-artifact@v5
         with:
           name: wasm
           path: build
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
           registry-url: https://npm.pkg.github.com/
       - run: npm publish --access public
         env:

.nvmrc

@@ -1 +1 @@
-16.15.0
+20.11.1

Dockerfile

@@ -1,6 +1,6 @@
 FROM emscripten/emsdk:2.0.20
 
-RUN wget --progress=dot:mega https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.gz && \
+RUN wget --progress=dot:mega https://archives.boost.io/release/1.76.0/source/boost_1_76_0.tar.gz && \
   mkdir -p ./contrib/boost-sdk && \
   tar zxf 'boost_1_76_0.tar.gz' -C './contrib/boost-sdk' --strip-components=1 && \
   rm -f boost_1_76_0.tar.gz

README.md

@@ -11,8 +11,8 @@ JS library for creating Monero transactions.
 ```
 docker-compose build
 docker-compose up -d
-docker exec -it monero-core-js-emscripten-1 cp -r /src/build /app
-docker exec -it monero-core-js-emscripten-1 ./bin/build-emcpp.sh
+docker exec -it monero-core-js_emscripten_1 cp -r /src/build /app
+docker exec -it monero-core-js_emscripten_1 ./bin/build-emcpp.sh
 
 npm install
 npm test
@@ -22,13 +22,11 @@ npm test
 
 Install https://goo.gle/wasm-debugging-extension and set Path substitutions in extension options:
 ```
-Module: MyMoneroCoreCpp_WASM.wasm
+Module: MoneroCoreJS.wasm
 /app
 [path_to_monero_core_js]
 ```
 
-Open Chrome DevTools, click the gear (⚙) icon in the top right corner of DevTools pane, go to the Experiments panel and tick WebAssembly Debugging: Enable DWARF support.
-
 ```
 npm run serve
 npm run serve:wasm

docker-compose.yml

@@ -9,12 +9,4 @@ services:
       BUILD: debug
     working_dir: /app
     volumes:
-      - code:/app
-
-volumes:
-  code: # https://github.com/docker/for-mac/issues/3677#issuecomment-620040545
-    driver: local
-    driver_opts:
-      type: nfs
-      o: addr=host.docker.internal,rw,nolock,hard,nointr
-      device: ":${PWD}"
+      - ./:/app

package-lock.json

@@ -1,12 +1,16 @@
 #include <stdio.h>
 #include <emscripten/bind.h>
+#include <emscripten/val.h>
 #include "monero_core.hpp"
 
 using namespace std;
 
-string createTx(const string& args_string) {
-  string result = monero_core::createTx(args_string);
-  return result.c_str();
+emscripten::val createTx(const string& args_string) {
+  monero_core::CreateTxResult result = monero_core::createTx(args_string);
+  emscripten::val obj = emscripten::val::object();
+  obj.set("rawTx", result.raw_tx);
+  obj.set("txKey", result.tx_key);
+  return obj;
 }
 
 string getExceptionMessage(intptr_t exceptionPtr) {

src/index.cpp

@@ -173,7 +173,7 @@ rct::RCTConfig get_rct_config() {
   return rct_config;
 }
 
-string monero_core::createTx(const string &args_string) {
+CreateTxResult monero_core::createTx(const string &args_string) {
 
   boost::property_tree::ptree json_root;
   istringstream ss(args_string);
@@ -229,6 +229,8 @@ string monero_core::createTx(const string &args_string) {
   if (!r) throw std::runtime_error("Error from construct_tx_and_get_tx_key");
   // string tx_hash_string = epee::string_tools::pod_to_hex(cryptonote::get_transaction_hash(tx));
   // printf("tx_hash_string: %s\n", tx_hash_string.c_str());
-	string signed_serialized_tx_string = epee::string_tools::buff_to_hex_nodelimer(cryptonote::tx_to_blob(tx));
-  return signed_serialized_tx_string;
+  CreateTxResult result;
+  result.raw_tx = epee::string_tools::buff_to_hex_nodelimer(cryptonote::tx_to_blob(tx));
+  result.tx_key = epee::string_tools::pod_to_hex(unwrap(unwrap(tx_key)));
+  return result;
 }

src/monero_core.cpp

@@ -33,7 +33,12 @@ namespace monero_core {
     std::vector<RandomAmountOutput> outputs;
   };
 
-  std::string createTx(const std::string &args_string);
+  struct CreateTxResult {
+    std::string raw_tx;
+    std::string tx_key;
+  };
+
+  CreateTxResult createTx(const std::string &args_string);
 }
 
 #endif /* monero_core_hpp */

src/monero_core.hpp

@@ -3,68 +3,62 @@
 const assert = require('assert');
 const initMoneroCoreJs = require('../index.js');
 const [standard, subaddress, integrated] = require('./fixtures/data.json');
+WebAssembly.instantiateStreaming = false;
 
 describe('index', () => {
 
   describe('createTx (wasm)', () => {
     it('should work (standard address)', async () => {
       const moneroCoreJs = await initMoneroCoreJs();
-      const rawTx = moneroCoreJs.createTx(standard);
+      const { rawTx, txKey } = moneroCoreJs.createTx(standard);
       assert.strictEqual(typeof rawTx, 'string');
       assert.ok(rawTx.length > 0);
+      assert.strictEqual(typeof txKey, 'string');
+      assert.ok(txKey.length > 0);
     });
     it('should work wasm (subaddress address)', async () => {
       const moneroCoreJs = await initMoneroCoreJs();
-      const rawTx = moneroCoreJs.createTx(subaddress);
+      const { rawTx, txKey } = moneroCoreJs.createTx(subaddress);
       assert.strictEqual(typeof rawTx, 'string');
       assert.ok(rawTx.length > 0);
+      assert.strictEqual(typeof txKey, 'string');
+      assert.ok(txKey.length > 0);
     });
     it('should work wasm (integrated address)', async () => {
       const moneroCoreJs = await initMoneroCoreJs();
-      const rawTx = moneroCoreJs.createTx(integrated);
+      const { rawTx, txKey } = moneroCoreJs.createTx(integrated);
       assert.strictEqual(typeof rawTx, 'string');
       assert.ok(rawTx.length > 0);
+      assert.strictEqual(typeof txKey, 'string');
+      assert.ok(txKey.length > 0);
     });
   });
 
   describe('createTx (asm)', () => {
     it('should work asm (standard address)', async () => {
       const moneroCoreJs = await initMoneroCoreJs(false, true);
-      const rawTx = moneroCoreJs.createTx(standard);
+      const { rawTx, txKey } = moneroCoreJs.createTx(standard);
       assert.strictEqual(typeof rawTx, 'string');
       assert.ok(rawTx.length > 0);
+      assert.strictEqual(typeof txKey, 'string');
+      assert.ok(txKey.length > 0);
     });
     it('should work asm (subaddress address)', async () => {
       const moneroCoreJs = await initMoneroCoreJs(false, true);
-      const rawTx = moneroCoreJs.createTx(subaddress);
+      const { rawTx, txKey } = moneroCoreJs.createTx(subaddress);
       assert.strictEqual(typeof rawTx, 'string');
       assert.ok(rawTx.length > 0);
+      assert.strictEqual(typeof txKey, 'string');
+      assert.ok(txKey.length > 0);
     });
     it('should work asm (integrated address)', async () => {
       const moneroCoreJs = await initMoneroCoreJs(false, true);
-      const rawTx = moneroCoreJs.createTx(integrated);
+      const { rawTx, txKey } = moneroCoreJs.createTx(integrated);
       assert.strictEqual(typeof rawTx, 'string');
       assert.ok(rawTx.length > 0);
+      assert.strictEqual(typeof txKey, 'string');
+      assert.ok(txKey.length > 0);
     });
   });
 
-  // describe('createTx (BulletproofPlus)', () => {
-  //   it('should work wasm', async () => {
-  //     const moneroCoreJs = await initMoneroCoreJs();
-  //     CLSAG.forEach((fixture) => {
-  //       const rawTx = moneroCoreJs.createTx(fixture);
-  //       assert.strictEqual(typeof rawTx, 'string');
-  //       assert.ok(rawTx.length > 0);
-  //     });
-  //   });
-  //   it('should work asm', async () => {
-  //     const moneroCoreJs = await initMoneroCoreJs(false, true);
-  //     CLSAG.forEach((fixture) => {
-  //       const rawTx = moneroCoreJs.createTx(fixture);
-  //       assert.strictEqual(typeof rawTx, 'string');
-  //       assert.ok(rawTx.length > 0);
-  //     });
-  //   });
-  // });
-
 });