Skip to content
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
8 changes: 8 additions & 0 deletions dojo.h
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,14 @@ struct Resultc_char bytearray_deserialize(const struct FieldElement *felts, uint

struct FieldElement poseidon_hash(const struct FieldElement *felts, uintptr_t felts_len);

struct ResultFieldElement get_selector_from_name(const char *name);

struct FieldElement starknet_keccak(const uint8_t *bytes, uintptr_t bytes_len);

struct ResultFieldElement cairo_short_string_to_felt(const char *str);

struct Resultc_char parse_cairo_short_string(struct FieldElement felt);

struct ResultFieldElement typed_data_encode(const char *typed_data, struct FieldElement address);

struct FieldElement signing_key_new(void);
Expand Down
8 changes: 8 additions & 0 deletions dojo.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -962,6 +962,14 @@ Result<const char*> bytearray_deserialize(const FieldElement *felts, uintptr_t f

FieldElement poseidon_hash(const FieldElement *felts, uintptr_t felts_len);

Result<FieldElement> get_selector_from_name(const char *name);

FieldElement starknet_keccak(const uint8_t *bytes, uintptr_t bytes_len);

Result<FieldElement> cairo_short_string_to_felt(const char *str);

Result<const char*> parse_cairo_short_string(FieldElement felt);

Result<FieldElement> typed_data_encode(const char *typed_data, FieldElement address);

FieldElement signing_key_new();
Expand Down
58 changes: 56 additions & 2 deletions src/c/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use std::sync::Arc;
use cainome::cairo_serde::{self, ByteArray, CairoSerde};
use starknet::accounts::{Account as StarknetAccount, ExecutionEncoding, SingleOwnerAccount};
use starknet::core::types::FunctionCall;
use starknet::core::utils::{get_contract_address, get_selector_from_name};
use starknet::core::utils::get_contract_address;
use starknet::providers::jsonrpc::HttpTransport;
use starknet::providers::{JsonRpcClient, Provider as _};
use starknet::signers::{LocalWallet, SigningKey, VerifyingKey};
Expand Down Expand Up @@ -307,6 +307,60 @@ pub unsafe extern "C" fn poseidon_hash(
(&poseidon_hash_many(&felts)).into()
}

#[no_mangle]
#[allow(clippy::missing_safety_doc)]
pub unsafe extern "C" fn get_selector_from_name(
name: *const c_char,
) -> Result<types::FieldElement> {
let name = unsafe { CStr::from_ptr(name).to_string_lossy().into_owned() };
let selector = match starknet::core::utils::get_selector_from_name(name.as_str()) {
Ok(selector) => selector,
Err(e) => return Result::Err(e.into()),
};

Result::Ok((&selector).into())
}

#[no_mangle]
#[allow(clippy::missing_safety_doc)]
pub unsafe extern "C" fn starknet_keccak(
bytes: *const u8,
bytes_len: usize,
) -> types::FieldElement {
let bytes = unsafe { std::slice::from_raw_parts(bytes, bytes_len) };
let hash = starknet::core::utils::starknet_keccak(bytes);

(&hash).into()
}

#[no_mangle]
#[allow(clippy::missing_safety_doc)]
pub unsafe extern "C" fn cairo_short_string_to_felt(
str: *const c_char,
) -> Result<types::FieldElement> {
let str = unsafe { CStr::from_ptr(str).to_string_lossy().into_owned() };
let felt = match starknet::core::utils::cairo_short_string_to_felt(str.as_str()) {
Ok(felt) => felt,
Err(e) => return Result::Err(e.into()),
};

Result::Ok((&felt).into())
}

#[no_mangle]
#[allow(clippy::missing_safety_doc)]
pub unsafe extern "C" fn parse_cairo_short_string(
felt: types::FieldElement,
) -> Result<*const c_char> {
let felt = (&felt).into();
let str = match starknet::core::utils::parse_cairo_short_string(&felt) {
Ok(str) => str,
Err(e) => return Result::Err(e.into()),
};

Result::Ok(CString::new(str).unwrap().into_raw())
}

#[no_mangle]
#[allow(clippy::missing_safety_doc)]
pub unsafe extern "C" fn typed_data_encode(
Expand Down Expand Up @@ -491,7 +545,7 @@ pub unsafe extern "C" fn account_deploy_burner(
Felt::ONE, // constructor calldata length (1)
verifying_key.scalar(), // constructor calldata
],
selector: get_selector_from_name("deployContract").unwrap(),
selector: starknet::core::utils::get_selector_from_name("deployContract").unwrap(),
}]);

let runtime = match tokio::runtime::Runtime::new() {
Expand Down
37 changes: 35 additions & 2 deletions src/wasm/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use starknet::accounts::{
};
use starknet::core::crypto::Signature;
use starknet::core::types::{Felt, FunctionCall};
use starknet::core::utils::{get_contract_address, get_selector_from_name};
use starknet::core::utils::get_contract_address;
use starknet::providers::jsonrpc::HttpTransport;
use starknet::providers::{JsonRpcClient, Provider as _};
use starknet::signers::{LocalWallet, SigningKey, VerifyingKey};
Expand Down Expand Up @@ -658,7 +658,7 @@ impl Account {
Felt::ONE, // constructor calldata length (1)
verifying_key.scalar(), // constructor calldata
],
selector: get_selector_from_name("deployContract").unwrap(),
selector: starknet::core::utils::get_selector_from_name("deployContract").unwrap(),
}]);

let result = exec.send().await;
Expand Down Expand Up @@ -746,6 +746,39 @@ pub fn poseidon_hash(inputs: Vec<String>) -> Result<String, JsValue> {
Ok(format!("{:#x}", poseidon_hash_many(&inputs)))
}

#[wasm_bindgen(js_name = getSelectorFromName)]
pub fn get_selector_from_name(name: &str) -> Result<String, JsValue> {
let selector = starknet::core::utils::get_selector_from_name(name)
.map_err(|e| JsValue::from(e.to_string()))?;
Ok(format!("{:#x}", selector))
}

#[wasm_bindgen(js_name = starknetKeccak)]
pub fn starknet_keccak(inputs: js_sys::Uint8Array) -> Result<String, JsValue> {
let inputs = inputs.to_vec();

let hash = starknet::core::utils::starknet_keccak(&inputs);
Ok(format!("{:#x}", hash))
}

#[wasm_bindgen(js_name = cairoShortStringToFelt)]
pub fn cairo_short_string_to_felt(str: &str) -> Result<String, JsValue> {
let felt = starknet::core::utils::cairo_short_string_to_felt(str)
.map_err(|e| JsValue::from(e.to_string()))?;

Ok(format!("{:#x}", felt))
}

#[wasm_bindgen(js_name = parseCairoShortString)]
pub fn parse_cairo_short_string(str: &str) -> Result<String, JsValue> {
let felt =
Felt::from_str(str).map_err(|e| JsValue::from(format!("failed to parse felt: {e}")))?;
let string = starknet::core::utils::parse_cairo_short_string(&felt)
.map_err(|e| JsValue::from(format!("failed to parse cairo short string: {e}")))?;

Ok(string)
}

#[wasm_bindgen]
impl Client {
#[wasm_bindgen(js_name = getEntities)]
Expand Down