Merge branch 'SAPP-develop' of https://github.com/decenomy/DSW

decenomy · Nov 27, 2024 · 50aceed · 50aceed
2 parents 4c0ec88 + 8b5ff30
commit 50aceed
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -356,3 +356,7 @@ __decenomy__d-new-gui.*
 
 .vscode/*
 null.d
+
+# Include specific files
+!build.yml
+!build.sh
diff --git a/build.sh b/build.sh
@@ -28,8 +28,8 @@ fi
 
 # Sets variables needed for the build
 TICKER=${TICKER:-"${GITHUB_REPO}"}
-UI_NAME=${UI_NAME:-"__Decenomy__"}
-BASE_NAME=${BASE_NAME:-"__decenomy__"}
+UI_NAME=${UI_NAME:-"Sapphire"}
+BASE_NAME=${BASE_NAME:-"sapphire"}
 
 # Sets the build environment variable
 #   0: The build will use the builder image available on docker hub

diff --git a/src/spork.cpp b/src/spork.cpp
@@ -20,12 +20,12 @@ std::vector<CSporkDef> sporkDefs = {
 
     MAKE_SPORK_DEF(SPORK_101_SERVICES_ENFORCEMENT,              4070908800ULL), // OFF
     MAKE_SPORK_DEF(SPORK_102_FORCE_ENABLED_MASTERNODE ,         4070908800ULL), // OFF
-    MAKE_SPORK_DEF(SPORK_103_PING_MESSAGE_SALT,                 0),             // OFF
+    MAKE_SPORK_DEF(SPORK_103_PING_MESSAGE_SALT,                          0ULL), // OFF
     MAKE_SPORK_DEF(SPORK_104_MAX_BLOCK_TIME,                    4070908800ULL), // OFF
     MAKE_SPORK_DEF(SPORK_105_MAX_BLOCK_SIZE,                    4070908800ULL), // OFF
     MAKE_SPORK_DEF(SPORK_106_STAKING_SKIP_MN_SYNC,              4070908800ULL), // OFF
     MAKE_SPORK_DEF(SPORK_107_IGNORE_COLLATERAL_CONFIRMATIONS,   4070908800ULL), // OFF
-    MAKE_SPORK_DEF(SPORK_108_FORCE_MASTERNODE_MIN_AGE,          0),             // ON
+    MAKE_SPORK_DEF(SPORK_108_FORCE_MASTERNODE_MIN_AGE,                   0ULL), // ON
     MAKE_SPORK_DEF(SPORK_109_FORCE_ENABLED_VOTED_MASTERNODE,    4070908800ULL), // OFF
     MAKE_SPORK_DEF(SPORK_110_FORCE_ENABLED_MASTERNODE_PAYMENT,  4070908800ULL), // OFF
     MAKE_SPORK_DEF(SPORK_111_ALLOW_DUPLICATE_MN_IPS,            4070908800ULL), // OFF