edge-currency-monero 0.3.0 → 0.3.4

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # edge-currency-monero
 
+# 0.3.4 (2022-01-11)
+
+- Fix git urls
+
+# 0.3.3 (2021-09-28)
+
+- Reformat spendable balance error into 3 lines
+
+# 0.3.2 (2021-06-03)
+
+- Remove icon URLs
+
+# 0.3.1 (2021-05-25)
+
+- Fix float amount precision
+- Fix recorded native amount and fee
+
 # 0.3.0 (2021-05-24)
 
 - Import native code directly from react-native-mymonero-core. Before, this plugin relied on "magic" methods passed in via the global object.

package/lib/react-native/edge-currency-monero.js

@@ -20176,20 +20176,6 @@ module.exports = function (module) {
 
 /***/ }),
 
-/***/ "./src/constants.js":
-/*!**************************!*\
-  !*** ./src/constants.js ***!
-  \**************************/
-/*! exports provided: imageServerUrl */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "imageServerUrl", function() { return imageServerUrl; });
-var imageServerUrl = 'https://content.edge.app';
-
-/***/ }),
-
 /***/ "./src/utils.js":
 /*!**********************!*\
   !*** ./src/utils.js ***!
@@ -20700,11 +20686,9 @@ var MoneroEngine = /*#__PURE__*/function () {
   }, {
     key: "processMoneroTransaction",
     value: function processMoneroTransaction(tx) {
-      var ourReceiveAddresses = []; // const nativeNetworkFee:string = bns.mul(tx.gasPrice, tx.gasUsed)
-
-      var nativeNetworkFee = '0'; // Can't know the fee right now. Limitation of monero
-
-      var netNativeAmount = biggystring__WEBPACK_IMPORTED_MODULE_0__["bns"].sub(tx.total_received, tx.total_sent);
+      var ourReceiveAddresses = [];
+      var nativeNetworkFee = tx.fee != null ? tx.fee : '0';
+      var netNativeAmount = biggystring__WEBPACK_IMPORTED_MODULE_0__["bns"].add(biggystring__WEBPACK_IMPORTED_MODULE_0__["bns"].sub(tx.total_received, tx.total_sent), nativeNetworkFee);
 
       if (netNativeAmount.slice(0, 1) !== '-') {
         ourReceiveAddresses.push(this.walletLocalData.moneroAddress.toLowerCase());
@@ -21415,7 +21399,7 @@ var MoneroEngine = /*#__PURE__*/function () {
       var _makeSpendInner = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee19(edgeSpendInfo) {
         var _this3 = this;
 
-        var valid, currencyCode, publicAddress, nativeAmount, uniqueIdentifier, priority, result, sendParams, amountFloatString, amountFloat, date, edgeTransaction;
+        var valid, currencyCode, publicAddress, nativeAmount, uniqueIdentifier, priority, result, sendParams, amountFloatString, amountFloat, regex, subst, msgFormatted, date, edgeTransaction;
         return regeneratorRuntime.wrap(function _callee19$(_context19) {
           while (1) {
             switch (_context19.prev = _context19.next) {
@@ -21576,7 +21560,7 @@ var MoneroEngine = /*#__PURE__*/function () {
 
               case 45:
                 _context19.prev = 45;
-                amountFloatString = biggystring__WEBPACK_IMPORTED_MODULE_0__["bns"].div(nativeAmount, '1000000000000', 8); // Todo: Yikes. Why does mymonero-core-js take a float, not a string? -paulvp
+                amountFloatString = biggystring__WEBPACK_IMPORTED_MODULE_0__["bns"].div(nativeAmount, '1000000000000', 12); // Todo: Yikes. Why does mymonero-core-js take a float, not a string? -paulvp
 
                 amountFloat = parseFloat(amountFloatString);
                 sendParams = {
@@ -21604,16 +21588,20 @@ var MoneroEngine = /*#__PURE__*/function () {
 
               case 51:
                 result = _context19.sent;
-                _context19.next = 58;
+                _context19.next = 61;
                 break;
 
               case 54:
                 _context19.prev = 54;
                 _context19.t1 = _context19["catch"](45);
-                this.log.error("makeSpend error: ".concat(_context19.t1));
-                throw _context19.t1;
-
-              case 58:
+                // This error is specific to mymonero-core-js: github.com/mymonero/mymonero-core-cpp/blob/a53e57f2a376b05bb0f4d851713321c749e5d8d9/src/monero_transfer_utils.hpp#L112-L162
+                this.log.error(_context19.t1.message);
+                regex = / Have (\d*\.?\d+) XMR; need (\d*\.?\d+) XMR./gm;
+                subst = "\nHave: $1 XMR.\nNeed: $2 XMR.";
+                msgFormatted = _context19.t1.message.replace(regex, subst);
+                throw new Error(msgFormatted);
+
+              case 61:
                 date = Date.now() / 1000;
                 nativeAmount = '-' + nativeAmount;
                 edgeTransaction = {
@@ -21623,7 +21611,7 @@ var MoneroEngine = /*#__PURE__*/function () {
                   // currencyCode
                   blockHeight: 0,
                   // blockHeight
-                  nativeAmount: nativeAmount,
+                  nativeAmount: biggystring__WEBPACK_IMPORTED_MODULE_0__["bns"].sub(nativeAmount, result.networkFee),
                   // nativeAmount
                   networkFee: result.networkFee,
                   ourReceiveAddresses: [],
@@ -21638,7 +21626,7 @@ var MoneroEngine = /*#__PURE__*/function () {
                 this.log.warn("makeSpend result ".concat(Object(_utils_js__WEBPACK_IMPORTED_MODULE_2__["cleanResultLogs"])(result)));
                 return _context19.abrupt("return", edgeTransaction);
 
-              case 64:
+              case 67:
               case "end":
                 return _context19.stop();
             }
@@ -21850,8 +21838,6 @@ if (typeof window !== 'undefined' && typeof window.addEdgeCorePlugins === 'funct
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "currencyInfo", function() { return currencyInfo; });
-/* harmony import */ var _constants_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./constants.js */ "./src/constants.js");
-
 var otherSettings = {
   mymoneroApiServers: ['https://edge.mymonero.com:8443']
 };
@@ -21874,10 +21860,6 @@ var currencyInfo = {
     multiplier: '1000000000000',
     symbol: '‎ɱ'
   }],
-  symbolImage: "".concat(_constants_js__WEBPACK_IMPORTED_MODULE_0__["imageServerUrl"], "/monero-logo-solo-64.png"),
-  // Base64 encoded png image of the currency symbol (optional)
-  symbolImageDarkMono: "".concat(_constants_js__WEBPACK_IMPORTED_MODULE_0__["imageServerUrl"], "/monero-logo-solo-64.png"),
-  // Base64 encoded png image of the currency symbol (optional)
   metaTokens: []
 };