From c75b1d464bd65a00f02c3e937f860d545f0d3dd2 Mon Sep 17 00:00:00 2001 From: MoneroOcean Date: Sat, 20 Jul 2024 04:49:22 +0300 Subject: [PATCH] Added SAL support --- binding.gyp | 2 +- package.json | 2 +- src/{cryptonote_core => cryptonote_basic}/account.h | 2 +- src/{cryptonote_core => cryptonote_basic}/cryptonote_basic.h | 0 .../cryptonote_basic_impl.h | 0 .../cryptonote_format_utils.cpp | 0 .../cryptonote_format_utils.h | 4 ++-- src/{cryptonote_core => cryptonote_basic}/difficulty.h | 0 src/{cryptonote_core => cryptonote_basic}/miner.h | 0 src/{cryptonote_core => cryptonote_basic}/tx_extra.h | 0 src/cryptonote_protocol/cryptonote_protocol_defs.h | 2 +- src/main.cc | 4 ++-- tests/sal.js | 2 +- 13 files changed, 9 insertions(+), 9 deletions(-) rename src/{cryptonote_core => cryptonote_basic}/account.h (97%) rename src/{cryptonote_core => cryptonote_basic}/cryptonote_basic.h (100%) rename src/{cryptonote_core => cryptonote_basic}/cryptonote_basic_impl.h (100%) rename src/{cryptonote_core => cryptonote_basic}/cryptonote_format_utils.cpp (100%) rename src/{cryptonote_core => cryptonote_basic}/cryptonote_format_utils.h (98%) rename src/{cryptonote_core => cryptonote_basic}/difficulty.h (100%) rename src/{cryptonote_core => cryptonote_basic}/miner.h (100%) rename src/{cryptonote_core => cryptonote_basic}/tx_extra.h (100%) diff --git a/binding.gyp b/binding.gyp index 2d6fe0e..91188da 100644 --- a/binding.gyp +++ b/binding.gyp @@ -4,7 +4,7 @@ "target_name": "cryptoforknote", "sources": [ "src/main.cc", - "src/cryptonote_core/cryptonote_format_utils.cpp", + "src/cryptonote_basic/cryptonote_format_utils.cpp", "src/offshore/pricing_record.cpp", "src/zephyr_oracle/pricing_record.cpp", "src/salvium_oracle/pricing_record.cpp", diff --git a/package.json b/package.json index 4cf40ed..fa73904 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cryptoforknote-util", - "version": "15.5.11", + "version": "15.5.12", "author": { "name": "LucasJones", "email": "lucasjonesdev@hotmail.co.uk" diff --git a/src/cryptonote_core/account.h b/src/cryptonote_basic/account.h similarity index 97% rename from src/cryptonote_core/account.h rename to src/cryptonote_basic/account.h index 8b525da..e677ab8 100644 --- a/src/cryptonote_core/account.h +++ b/src/cryptonote_basic/account.h @@ -4,7 +4,7 @@ #pragma once -#include "cryptonote_core/cryptonote_basic.h" +#include "cryptonote_basic.h" #include "crypto/crypto.h" #include "serialization/keyvalue_serialization.h" diff --git a/src/cryptonote_core/cryptonote_basic.h b/src/cryptonote_basic/cryptonote_basic.h similarity index 100% rename from src/cryptonote_core/cryptonote_basic.h rename to src/cryptonote_basic/cryptonote_basic.h diff --git a/src/cryptonote_core/cryptonote_basic_impl.h b/src/cryptonote_basic/cryptonote_basic_impl.h similarity index 100% rename from src/cryptonote_core/cryptonote_basic_impl.h rename to src/cryptonote_basic/cryptonote_basic_impl.h diff --git a/src/cryptonote_core/cryptonote_format_utils.cpp b/src/cryptonote_basic/cryptonote_format_utils.cpp similarity index 100% rename from src/cryptonote_core/cryptonote_format_utils.cpp rename to src/cryptonote_basic/cryptonote_format_utils.cpp diff --git a/src/cryptonote_core/cryptonote_format_utils.h b/src/cryptonote_basic/cryptonote_format_utils.h similarity index 98% rename from src/cryptonote_core/cryptonote_format_utils.h rename to src/cryptonote_basic/cryptonote_format_utils.h index 098025b..a6ca5ab 100644 --- a/src/cryptonote_core/cryptonote_format_utils.h +++ b/src/cryptonote_basic/cryptonote_format_utils.h @@ -4,8 +4,8 @@ #pragma once #include "cryptonote_protocol/cryptonote_protocol_defs.h" -#include "cryptonote_core/cryptonote_basic_impl.h" -#include "cryptonote_core/difficulty.h" +#include "cryptonote_basic_impl.h" +#include "difficulty.h" #include "account.h" #include "include_base_utils.h" #include "crypto/crypto.h" diff --git a/src/cryptonote_core/difficulty.h b/src/cryptonote_basic/difficulty.h similarity index 100% rename from src/cryptonote_core/difficulty.h rename to src/cryptonote_basic/difficulty.h diff --git a/src/cryptonote_core/miner.h b/src/cryptonote_basic/miner.h similarity index 100% rename from src/cryptonote_core/miner.h rename to src/cryptonote_basic/miner.h diff --git a/src/cryptonote_core/tx_extra.h b/src/cryptonote_basic/tx_extra.h similarity index 100% rename from src/cryptonote_core/tx_extra.h rename to src/cryptonote_basic/tx_extra.h diff --git a/src/cryptonote_protocol/cryptonote_protocol_defs.h b/src/cryptonote_protocol/cryptonote_protocol_defs.h index d646a7f..af53c6f 100644 --- a/src/cryptonote_protocol/cryptonote_protocol_defs.h +++ b/src/cryptonote_protocol/cryptonote_protocol_defs.h @@ -6,7 +6,7 @@ #include #include "serialization/keyvalue_serialization.h" -#include "cryptonote_core/cryptonote_basic.h" +#include "cryptonote_basic/cryptonote_basic.h" #include "cryptonote_protocol/blobdatatype.h" namespace cryptonote { diff --git a/src/main.cc b/src/main.cc index cc17650..24a621e 100644 --- a/src/main.cc +++ b/src/main.cc @@ -5,8 +5,8 @@ #include #include #include -#include "cryptonote_core/cryptonote_basic.h" -#include "cryptonote_core/cryptonote_format_utils.h" +#include "cryptonote_basic/cryptonote_basic.h" +#include "cryptonote_basic/cryptonote_format_utils.h" #include "common/base58.h" #include "serialization/binary_utils.h" #include diff --git a/tests/sal.js b/tests/sal.js index 9eae71c..fb7765d 100644 --- a/tests/sal.js +++ b/tests/sal.js @@ -8,7 +8,7 @@ const b2 = u.convert_blob(b, 15); if (b2.toString('hex') === '010194a5ebb406f613c4e7514facf3e5b9923c885357b53f2b02f8e17f9721371296b99113035f00000000ac81ca3e7bc9369e63563923187d2cfdb42eac839c7fe24e6d5d0080c96d758f02') { console.log('PASSED'); -else { +} else { console.log('FAILED: ' + b2); process.exit(1); }