Merge branch 'Kudaraidee:dev' into dev

mamafunny · Oct 6, 2024 · 83126ca · 83126ca
2 parents 52cf17e + 1180263
commit 83126ca
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 4 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
     - name: Checkout

diff --git a/src/Miningcore/Blockchain/Bitcoin/BitcoinJob.cs b/src/Miningcore/Blockchain/Bitcoin/BitcoinJob.cs
@@ -243,7 +243,7 @@ protected virtual byte[] SerializeOutputTransaction(Transaction tx)
                 raw = BlockTemplate.DefaultWitnessCommitment.HexToByteArray();
                 rawLength = (uint) raw.Length;
 
-                if (coin.Symbol == "RVH")
+                if (coin.Symbol == "RVH" || coin.Symbol == "ANOK")
                 {
                     // Compute witness commitment
                     raw = BlockTemplate.DefaultWitnessCommitment.HexToByteArray();

diff --git a/src/Miningcore/Blockchain/Bitcoin/BitcoinPayoutHandler.cs b/src/Miningcore/Blockchain/Bitcoin/BitcoinPayoutHandler.cs
@@ -217,7 +217,7 @@ public virtual async Task PayoutAsync(IMiningPool pool, Balance[] balances, Canc
             {
                 var subtractFeesFrom = amounts.Keys.ToArray();
 
-                if(!poolConfig.Template.As<BitcoinTemplate>().HasMasterNodes)
+                if(!poolConfig.Template.As<BitcoinTemplate>().HasMasterNodes || coin.Symbol == "KIIRO")
                 {
                     args = new object[]
                     {

diff --git a/src/Miningcore/Blockchain/Cryptonote/CryptonoteConstants.cs b/src/Miningcore/Blockchain/Cryptonote/CryptonoteConstants.cs
@@ -42,6 +42,12 @@ public static class CryptonoteConstants
     public const decimal StaticTransactionFeeReserve = 0.03m; // in monero
 }
 
+public static class GntlConstants
+{
+    public const decimal GntlMiningRewardInitial = 0.99m; 
+    public const int GntlMinBlockConfirmations = 18; 
+}
+
 public static class MoreloConstants
 {
     public const decimal MoreloReserveRewardInitial = 5.555m; // MiningReward = BlockReward - ReserveReward 

diff --git a/src/Miningcore/Blockchain/Cryptonote/CryptonotePayoutHandler.cs b/src/Miningcore/Blockchain/Cryptonote/CryptonotePayoutHandler.cs
@@ -411,7 +411,7 @@ public async Task<Block[]> ClassifyBlocksAsync(IMiningPool pool, Block[] blocks,
                 var blockHeader = rpcResult.Response.BlockHeader;
 
                 // update progressint 
-                int PayoutMinBlockConfirmations = (coin.Symbol == "MRL") ? MoreloConstants.MoreloMinBlockConfirmations : CryptonoteConstants.PayoutMinBlockConfirmations;
+                int PayoutMinBlockConfirmations = (coin.Symbol == "GNTL") ? GntlConstants.GntlMinBlockConfirmations : (coin.Symbol == "MRL") ? MoreloConstants.MoreloMinBlockConfirmations : CryptonoteConstants.PayoutMinBlockConfirmations;
                 block.ConfirmationProgress = Math.Min(1.0d, (double) blockHeader.Depth / PayoutMinBlockConfirmations);
                 result.Add(block);
 
@@ -471,6 +471,12 @@ public async Task<Block[]> ClassifyBlocksAsync(IMiningPool pool, Block[] blocks,
                             block.Reward = (((blockHeader.Reward / coin.SmallestUnit)) - MoreloReserveReward) * coin.BlockrewardMultiplier;
                             break;
 
+                        case "GNTL":
+                            decimal GntlMiningReward = GntlConstants.GntlMiningRewardInitial;
+
+                            block.Reward = (((blockHeader.Reward / coin.SmallestUnit)) * GntlMiningReward) * coin.BlockrewardMultiplier;
+                            break;
+
                         default:
                             block.Reward = (blockHeader.Reward / coin.SmallestUnit) * coin.BlockrewardMultiplier;
                             break;

diff --git a/src/Miningcore/coins.json b/src/Miningcore/coins.json
@@ -2695,6 +2695,39 @@
         "explorerTxLink": "https://explorer.globalsocialpost.com/tx/{0}",
         "explorerAccountLink": "https://explorer.globalsocialpost.com/address/{0}"
     },
+    "anokas": {
+        "name": "Anokas",
+        "symbol": "ANOK",
+        "family": "progpow",
+        "progpower": "kawpow",
+        "website": "https://anokas.tech/",
+        "github": "https://github.com/anokastech/Anokas-mainnet",
+        "market": "https://www.coingecko.com/en/coins/anokas-network",
+        "twitter": "https://twitter.com/anokas_network",
+        "telegram": "https://t.me/anokas_tech",
+        "discord": "https://discord.com/invite/8B8pAtA2Y5",
+        "coinbaseHasher": {
+            "hash": "sha256d"
+        },
+        "headerHasher": {
+            "hash": "sha256d"
+        },
+        "blockHasher": {
+            "hash": "reverse",
+            "args": [
+                {
+                    "hash": "sha256d"
+                }
+            ]
+        },
+        "shareMultiplier": 1,
+        "hasFounderFee": true,
+        "hasMasterNodes": true,
+        "hasSmartNodes": true,
+        "explorerBlockLink": "https://explorer.anokas.tech/block/$hash$",
+        "explorerTxLink": "https://explorer.anokas.tech/tx/{0}",
+        "explorerAccountLink": "https://explorer.anokas.tech/address/{0}"
+    },
     "radiant": {
         "name": "Radiant",
         "symbol": "RXD",
@@ -5472,6 +5505,32 @@
         "explorerBlockLink": "https://explorer.equilibriacc.com/block/$hash$",
         "explorerTxLink": "https://explorer.equilibriacc.com/tx/{0}"
     },
+    "gntl": {
+        "name": "GNTL Coin",
+        "symbol": "GNTL",
+        "family": "cryptonote",
+        "website": "https://gntl.cash/",
+        "github": "https://github.com/The-GNTL-Project/gntl",
+        "market": "https://coinpaprika.com/coin/gntl-gntl",
+        "twitter": "https://twitter.com/GNTLCoin",
+        "telegram": "https://t.me/gntlcoin",
+        "discord": "https://discord.com/invite/4HyVA2A",
+        "hash": "randomarq",
+        "hashVariant": 2,
+        "blobType": 0,
+        "smallestUnit": 1000000000,
+        "addressPrefix": 504557,
+        "addressPrefixStagenet": 26605,
+        "addressPrefixTestnet":  15501,
+        "addressPrefixIntegrated": 1848045,
+        "addressPrefixIntegratedStagenet": 911341,
+        "addressPrefixIntegratedTestnet": 292644,
+        "subAddressPrefix": 2159341,
+        "subAddressPrefixTestnet": 3221357,
+        "subAddressPrefixStagenet": 616429,
+        "explorerBlockLink": "https://explorer.gntl.cash/block/$hash$",
+        "explorerTxLink": "https://explorer.gntl.cash/tx/{0}"
+    },
     "monero": {
         "name": "Monero",
         "canonicalName": "Monero",