Skip to content

fix(rs-dpp): fetch latest core chain locked height misuse #789

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.

Sign up for GitHub

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

Merged
markin-io merged 4 commits into from
Feb 22, 2023
Merged

fix(rs-dpp): fetch latest core chain locked height misuse #789

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5b64b81
fix(rs-dpp): use fetch_latest_platform_block_height in feature_flags_…
markin-io Feb 17, 2023
7232765
fix(rs-dpp): use fetch_latest_platform_block_height in feature_flags_…
markin-io Feb 20, 2023
f6d20fc
refactor(wasm-dpp): make fetch_latest_platform_block_height return u3…
markin-io Feb 20, 2023
4d3fb94
fix(wasm-dpp): fetch_latest_platform_block_height return u64 instead …
markin-io Feb 21, 2023
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
9 changes: 4 additions & 5 deletions packages/rs-dpp/src/data_trigger/feature_flags_data_triggers/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,14 @@ where
)
})?;

let core_chain_locked_height = context
let block_height = context
.state_repository
.fetch_latest_platform_core_chain_locked_height()
.await?
.unwrap_or_default() as i64;
.fetch_latest_platform_block_height()
.await? as i64;

let enable_at_height = data.get_i64(PROPERTY_ENABLE_AT_HEIGHT)?;

if enable_at_height < core_chain_locked_height {
if enable_at_height < block_height {
let err = create_error(
context,
dt_create,
Expand Down
3 changes: 3 additions & 0 deletions packages/rs-dpp/src/state_repository.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,4 +213,7 @@ pub trait StateRepositoryLike: Sync {

// Get latest (in a queue) withdrawal transaction index
async fn fetch_latest_platform_core_chain_locked_height(&self) -> AnyResult<Option<u32>>;

// Get latest platform block height
async fn fetch_latest_platform_block_height(&self) -> AnyResult<u32>;
}
18 changes: 18 additions & 0 deletions packages/wasm-dpp/src/state_repository.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,11 @@ extern "C" {
this: &ExternalStateRepositoryLike,
) -> Result<JsValue, JsValue>;

#[wasm_bindgen(catch, structural, method, js_name=fetchLatestPlatformBlockHeight)]
pub async fn fetch_latest_platform_block_height(
this: &ExternalStateRepositoryLike,
) -> Result<JsValue, JsValue>;

#[wasm_bindgen(catch, structural, method, js_name=fetchTransaction)]
pub async fn fetch_transaction(
this: &ExternalStateRepositoryLike,
Expand Down Expand Up @@ -529,6 +534,19 @@ impl StateRepositoryLike for ExternalStateRepositoryLikeWrapper {
Ok(Some(height as u32))
}

async fn fetch_latest_platform_block_height(&self) -> Result<u32> {
let height = self
.0
.fetch_latest_platform_block_height()
.await
.map_err(from_js_error)?;

let height = height
.as_f64()
.ok_or_else(|| anyhow!("Value is not a number"))?;
Ok(height as u32)
Comment thread
shumkov marked this conversation as resolved.
Outdated
}

async fn verify_instant_lock(
&self,
instant_lock: &InstantLock,
Expand Down