github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-01-10 23:27:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

drk: add freeze block height reference to deployoOor

Browse Source
This commit is contained in:
skoupidi
2025-06-07 13:27:11 +03:00
parent 37bee3e638
commit 7fa5b6a552
3 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/drk/deploy.sql
View File

@@ -4,5 +4,6 @@
CREATE TABLE IF NOT EXISTS EJs7oEjKkvCeEVCmpRsd6fEoTGCFJ7WKUBfmAjwaegN_deploy_auth (
id INTEGER PRIMARY KEY AUTOINCREMENT,
deploy_authority BLOB UNIQUE NOT NULL,
is_frozen INTEGER NOT NULL
is_frozen INTEGER NOT NULL,
freeze_height INTEGER
);

40
bin/drk/src/deploy.rs
View File

@@ -47,6 +47,7 @@ lazy_static! {
pub const DEPLOY_AUTH_COL_ID: &str = "id";
pub const DEPLOY_AUTH_COL_DEPLOY_AUTHORITY: &str = "deploy_authority";
pub const DEPLOY_AUTH_COL_IS_FROZEN: &str = "is_frozen";
pub const DEPLOY_AUTH_COL_FREEZE_HEIGHT: &str = "freeze_height";
impl Drk {
/// Initialize wallet with tables for the Deployooor contract.
@@ -63,12 +64,19 @@ impl Drk {
eprintln!("Generating a new keypair");
let keypair = Keypair::random(&mut OsRng);
let freeze_height: Option<u32> = None;
let query = format!(
"INSERT INTO {} ({}, {}) VALUES (?1, ?2);",
*DEPLOY_AUTH_TABLE, DEPLOY_AUTH_COL_DEPLOY_AUTHORITY, DEPLOY_AUTH_COL_IS_FROZEN,
"INSERT INTO {} ({}, {}, {}) VALUES (?1, ?2, ?3);",
*DEPLOY_AUTH_TABLE,
DEPLOY_AUTH_COL_DEPLOY_AUTHORITY,
DEPLOY_AUTH_COL_IS_FROZEN,
DEPLOY_AUTH_COL_FREEZE_HEIGHT,
);
self.wallet.exec_sql(&query, rusqlite::params![serialize_async(&keypair).await, 0])?;
self.wallet.exec_sql(
&query,
rusqlite::params![serialize_async(&keypair).await, 0, freeze_height],
)?;
eprintln!("Created new contract deploy authority");
println!("Contract ID: {}", ContractId::derive_public(keypair.public));
@@ -77,7 +85,7 @@ impl Drk {
}
/// List contract deploy authorities from the wallet
pub async fn list_deploy_auth(&self) -> Result<Vec<(i64, ContractId, bool)>> {
pub async fn list_deploy_auth(&self) -> Result<Vec<(i64, ContractId, bool, Option<u32>)>> {
let rows = match self.wallet.query_multiple(&DEPLOY_AUTH_TABLE, &[], &[]) {
Ok(r) => r,
Err(e) => {
@@ -102,7 +110,29 @@ impl Drk {
return Err(Error::ParseFailed("[list_deploy_auth] Failed to parse \"is_frozen\""))
};
ret.push((idx, ContractId::derive_public(deploy_auth.public), frozen != 0))
let freeze_height = match row[3] {
Value::Integer(freeze_height) => {
let Ok(freeze_height) = u32::try_from(freeze_height) else {
return Err(Error::ParseFailed(
"[list_deploy_auth] Freeze height parsing failed",
))
};
Some(freeze_height)
}
Value::Null => None,
_ => {
return Err(Error::ParseFailed(
"[list_deploy_auth] Freeze height parsing failed",
))
}
};
ret.push((
idx,
ContractId::derive_public(deploy_auth.public),
frozen != 0,
freeze_height,
))
}
Ok(ret)

8
bin/drk/src/main.rs
View File

@@ -2573,8 +2573,12 @@ async fn realmain(args: Args, ex: Arc<smol::Executor<'static>>) -> Result<()> {
table.set_format(*format::consts::FORMAT_NO_BORDER_LINE_SEPARATOR);
table.set_titles(row!["Index", "Contract ID", "Frozen"]);
for (idx, contract_id, frozen) in auths {
table.add_row(row![idx, contract_id, frozen]);
for (idx, contract_id, frozen, freeze_height) in auths {
let freeze_height = match freeze_height {
Some(freeze_height) => freeze_height.to_string(),
None => String::from("-"),
};
table.add_row(row![idx, contract_id, frozen, freeze_height]);
}
if table.is_empty() {