Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

patch; update auth keys #122

Merged
merged 1 commit into from
Apr 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Discreet/DB/ValidationCache.cs
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ private Exception validate(bool many = false)

/* reject if duplicate or in main branch */
if (txs.Contains(tx.TxID.ToKey())) return new VerifyException("Block", $"Transaction {tx.TxID.ToHexShort()} already present in block");
if (blockBuffer.ContainsTransaction(tx.TxID)) return new VerifyException("Block", $"Transaction {tx.TxID.ToHexShort()} already present in main branch");
if (blockBuffer.ContainsTransaction(tx.TxID)) return new VerifyException("Block", $"Transaction {tx.TxID.ToHex()} already present in main branch");

/* transparent checks */
TTXOutput[] tinVals = new TTXOutput[tx.NumTInputs];
Expand Down
32 changes: 16 additions & 16 deletions Discreet/Daemon/BlockAuth/AuthKeys.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ public class AuthKeys

public static List<Key> Defaults = new List<Key>
{
Key.FromHex("c994ef3c17998f9ed3790947ee0f138485f6f26afa7f35abc57a5150cfbba1db"),
Key.FromHex("bc871325d7d90147da84879e19bc5311f01af59da10919c071cc6372adde145f"),
Key.FromHex("8b59acbf61731e063b4c44e6192e5f7091f881a5fc32f7e0e25fc1ed40be1d97"),
Key.FromHex("2531a37ed03085acda521899e201bdbe023907097788210a45229847fa25dc2b"),
Key.FromHex("db05003556a2874482bb84dde724d4c2674b5e7d817d20c36410299ead106695"),
Key.FromHex("ef441d6d3faf83c89a8cf5417b1cafe41a6efdfa449240ab77fabbbf3a89813e"),
Key.FromHex("969843a3de18f9395f68d163cc4250ee191fca995f4b99cccb535b716e8c8996"),
Key.FromHex("41212dc902a1704796a264650b4026c4a04b1e4683b92d171cdc2f1ecabc2b36"),
Key.FromHex("95cbe85e6739828e963aa35983eeecaa4d8a7d8da4e4791682d4774bd2a9b7cd"),
Key.FromHex("697ba8e5aa035914f7941db5de1b4e048ad77db6ad5de10493df2cff1b51f0b7"),
Key.FromHex("1241be44ddec0d253716777c46c44b1d7a04f6e5954bd90f556e4fae1b1db682"),
Key.FromHex("09d2a4bfa98035747a9e6e0ce90affbbd2af6473faec8c749910554871917536"),
Key.FromHex("13ded8880ed38664cb98e0644e080e0ab894ac76679ad54a0363dbf0863e186b"),
Key.FromHex("e3062bc48a845c05e40e98c675b83df6a1e552f058b8048a902f608136659c9f"),
Key.FromHex("7812eb4d5b7b0fc8f5ad1bd45f78cfa8a1023feb3efc89cda514df97e065b036"),
Key.FromHex("f7cfc2e27cd6a4617cb5565832027a39314bf11fa800bf7fa91d519c87ddc62a")
Key.FromHex("dd38abf712037d9b20215cf3659dbcdd8291c5ab2c8175e8c95294cdca158f65"),
Key.FromHex("26007b9ed0eee9f49512efcf3b412900f245643a7a387349fe8b0b9a99f9ba1e"),
Key.FromHex("ee011d6217eafd061f10beaeb52d4b736e9cb608e7989ec221a0ab3d4cd386c2"),
Key.FromHex("864d1d1b611b080d604b2d0d4736098f15d13955b8f8aece1253a83c805cd7cf"),
Key.FromHex("c699c76cdc6c309fd2f0a3ca18a327e1e5ca6d82662ca2b6edd292b1b2ef7a3f"),
Key.FromHex("09624336633b6be330341a3c76651680da9b606bc91df62b070faadb90eed5c2"),
Key.FromHex("6089d5ca4a6437f42bbee575fb7502fdc4ed2a01a1e83aa1bdf29b2dcda9d8c6"),
Key.FromHex("e752637cab10fc777a48a842122692027497daa79da7a70d86f480146a1fd576"),
Key.FromHex("c88abcf82ba4daf9ae6484210046aab9160673983239eacf6e45a1ff64070623"),
Key.FromHex("0e5bdfe1c84a3f8a0a21e43dfdd66107b4a3e102e1e44ff311421c4d4bceb1b4"),
Key.FromHex("b61847ef5537d4cddac35f4ffc2dee5d4c8b4eac699a46742938a75ccace2a9f"),
Key.FromHex("744939f653a7495af63cc7f43be4a8c7eeb7e546100486c1bcd8167c508ca2db"),
Key.FromHex("12984797588e05eb8b3adc877e4fa21580b56b804e46d12d21313f28495a7d99"),
Key.FromHex("25cd70e765e73f54fc2b1c9da3c0d9cfc375112805cf278ebf5923a880c6a024"),
Key.FromHex("977b1dfa9d255384a69e6cef8e174e803bcc5742e3a00571386945cdb507fa73"),
Key.FromHex("468e7297de8693e569850afc03dbd361767d3ba8d83bd3c2549edecbf08cbc6b")
};

public AuthKeys(DaemonConfig conf)
Expand Down
2 changes: 2 additions & 0 deletions Discreet/Daemon/Daemon.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1018,6 +1018,8 @@ public async Task MintTestnetBlock(HashSet<long> debugProduced = null)
if (vErr != null)
{
Logger.Error($"Discreet.Mint: validating minted block resulted in error: {vErr.Message}", vErr);
ProcessBlock(blk, true);
return;
}
await vCache.Flush();
}
Expand Down
Loading