github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-01-08 22:28:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

darkfid: use base64 encoding | drk: minor fixes

Browse Source
This commit is contained in:
skoupidi
2024-02-14 14:31:40 +02:00
parent 847e4749eb
commit 44103f0359
14 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
script/research/gg/Cargo.toml
View File

@@ -21,7 +21,6 @@ darkfi-serial = {path = "../../../src/serial"}
# Misc
anyhow = "1.0.79"
async-std = {version = "1.12.0", features = ["attributes"]}
bs58 = "0.5.0"
clap = {version = "4.4.14", features = ["derive"]}
sled = "0.34.7"

8
script/research/gg/src/main.rs
View File

@@ -27,7 +27,7 @@ use darkfi::{
blockchain::{BlockInfo, Blockchain, BlockchainOverlay},
cli_desc,
tx::Transaction,
util::{path::expand_path, time::Timestamp},
util::{encoding::base64, path::expand_path, time::Timestamp},
validator::verification::verify_genesis_block,
};
use darkfi_contract_test_harness::vks;
@@ -65,7 +65,7 @@ fn read_block() -> Result<BlockInfo> {
eprintln!("Reading genesis block from stdin...");
let mut buf = String::new();
stdin().read_to_string(&mut buf)?;
let bytes = bs58::decode(&buf.trim()).into_vec()?;
let bytes = base64::decode(buf.trim()).unwrap();
let block = deserialize(&bytes)?;
Ok(block)
}
@@ -88,7 +88,7 @@ async fn main() -> Result<()> {
let txs_folder = expand_path(&txs_folder).unwrap();
let mut genesis_txs: Vec<Transaction> = vec![];
for file in read_dir(txs_folder)? {
let bytes = bs58::decode(&read_to_string(file?.path())?.trim()).into_vec()?;
let bytes = base64::decode(read_to_string(file?.path())?.trim()).unwrap();
let tx = deserialize(&bytes)?;
genesis_txs.push(tx);
}
@@ -111,7 +111,7 @@ async fn main() -> Result<()> {
genesis_block.append_txs(vec![producer_tx])?;
// Write generated genesis block to stdin
let encoded = bs58::encode(&serialize(&genesis_block)).into_string();
let encoded = base64::encode(&serialize(&genesis_block));
println!("{encoded}");
Ok(())