Skip to content

Commit 96393e2

Browse files
committed
Make signup/login input lowercase
1 parent 102cebf commit 96393e2

File tree

6 files changed

+21
-58
lines changed

6 files changed

+21
-58
lines changed

packages/account-wasm/pkg/account_wasm_bg.js

+17-17
Original file line numberDiff line numberDiff line change
@@ -443,11 +443,6 @@ export function __wbindgen_object_drop_ref(arg0) {
443443
takeObject(arg0);
444444
};
445445

446-
export function __wbindgen_string_new(arg0, arg1) {
447-
const ret = getStringFromWasm0(arg0, arg1);
448-
return addHeapObject(ret);
449-
};
450-
451446
export function __wbindgen_error_new(arg0, arg1) {
452447
const ret = new Error(getStringFromWasm0(arg0, arg1));
453448
return addHeapObject(ret);
@@ -482,16 +477,6 @@ export function __wbindgen_jsval_eq(arg0, arg1) {
482477
return ret;
483478
};
484479

485-
export function __wbindgen_cb_drop(arg0) {
486-
const obj = takeObject(arg0).original;
487-
if (obj.cnt-- == 1) {
488-
obj.a = 0;
489-
return true;
490-
}
491-
const ret = false;
492-
return ret;
493-
};
494-
495480
export function __wbindgen_boolean_get(arg0) {
496481
const v = getObject(arg0);
497482
const ret = typeof(v) === 'boolean' ? (v ? 1 : 0) : 2;
@@ -526,6 +511,16 @@ export function __wbindgen_is_undefined(arg0) {
526511
return ret;
527512
};
528513

514+
export function __wbindgen_cb_drop(arg0) {
515+
const obj = takeObject(arg0).original;
516+
if (obj.cnt-- == 1) {
517+
obj.a = 0;
518+
return true;
519+
}
520+
const ret = false;
521+
return ret;
522+
};
523+
529524
export function __wbindgen_jsval_loose_eq(arg0, arg1) {
530525
const ret = getObject(arg0) == getObject(arg1);
531526
return ret;
@@ -536,6 +531,11 @@ export function __wbindgen_number_new(arg0) {
536531
return addHeapObject(ret);
537532
};
538533

534+
export function __wbindgen_string_new(arg0, arg1) {
535+
const ret = getStringFromWasm0(arg0, arg1);
536+
return addHeapObject(ret);
537+
};
538+
539539
export function __wbg_getwithrefkey_edc2c8960f0f1191(arg0, arg1) {
540540
const ret = getObject(arg0)[getObject(arg1)];
541541
return addHeapObject(ret);
@@ -1002,8 +1002,8 @@ export function __wbindgen_memory() {
10021002
return addHeapObject(ret);
10031003
};
10041004

1005-
export function __wbindgen_closure_wrapper1521(arg0, arg1, arg2) {
1006-
const ret = makeMutClosure(arg0, arg1, 516, __wbg_adapter_48);
1005+
export function __wbindgen_closure_wrapper1519(arg0, arg1, arg2) {
1006+
const ret = makeMutClosure(arg0, arg1, 512, __wbg_adapter_48);
10071007
return addHeapObject(ret);
10081008
};
10091009

-5.09 KB
Binary file not shown.

packages/account-wasm/src/lib.rs

+1-13
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@ use types::invocation::JsInvocationsDetails;
4848
use types::outside_execution::JsOutsideExecution;
4949
use types::session::{JsCredentials, JsSession};
5050
use url::Url;
51-
use utils::{policies_match, set_panic_hook, calculate_contract_address};
51+
use utils::{policies_match, set_panic_hook};
5252
use wasm_bindgen::prelude::*;
53-
use web_sys::console;
5453

5554
use crate::types::TryFromJsValue;
5655

@@ -62,8 +61,6 @@ pub struct CartridgeAccount {
6261
device_signer: DeviceSigner,
6362
username: String,
6463
rpc_url: Url,
65-
rp_id: String,
66-
origin: String,
6764
}
6865

6966
#[wasm_bindgen]
@@ -121,8 +118,6 @@ impl CartridgeAccount {
121118
device_signer,
122119
username,
123120
rpc_url,
124-
rp_id,
125-
origin,
126121
})
127122
}
128123

@@ -320,13 +315,6 @@ impl CartridgeAccount {
320315
constructor_calldata[0] = Felt::TWO; // incorrect signer enum from serialization
321316
constructor_calldata.push(Felt::ONE); // no guardian
322317

323-
let address = calculate_contract_address(starknetutils::cairo_short_string_to_felt(&self.username)?, Felt::from_str(ACCOUNT_CLASS_HASH)?, &constructor_calldata);
324-
console::log_1(&format!("constructor {:#?}", constructor_calldata).into());
325-
console::log_1(&format!("deployment address: {:#x}", address).into());
326-
console::log_1(&format!("backend address: {:#x}", self.account.address()).into());
327-
console::log_1(&format!("rp_id: {}", self.rp_id).into());
328-
console::log_1(&format!("origin: {}", self.origin).into());
329-
330318
let factory = CartridgeAccountFactory::new(
331319
Felt::from_str(ACCOUNT_CLASS_HASH)?,
332320
self.account.chain_id(),

packages/account-wasm/src/utils.rs

+1-28
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,11 @@
11
use std::collections::HashMap;
22

33
use starknet::accounts::Call;
4-
use starknet::core::crypto::compute_hash_on_elements;
5-
use starknet::core::types::{Felt, NonZeroFelt};
4+
use starknet::core::types::Felt;
65
use starknet::core::utils::get_selector_from_name;
76

87
use crate::types::policy::JsPolicy;
98

10-
const PREFIX_CONTRACT_ADDRESS: Felt = Felt::from_raw([
11-
533439743893157637,
12-
8635008616843941496,
13-
17289941567720117366,
14-
3829237882463328880,
15-
]);
16-
17-
const ADDR_BOUND: NonZeroFelt = NonZeroFelt::from_raw([
18-
576459263475590224,
19-
18446744073709255680,
20-
160989183,
21-
18446743986131443745,
22-
]);
23-
24-
259
pub fn set_panic_hook() {
2610
// When the `console_error_panic_hook` feature is enabled, we can call the
2711
// `set_panic_hook` function at least once during initialization, and then
@@ -48,14 +32,3 @@ pub fn policies_match(calls: &[Call], policies: &[JsPolicy]) -> bool {
4832
.iter()
4933
.all(|call| policy_map.contains_key(&call.selector))
5034
}
51-
52-
pub fn calculate_contract_address(salt: Felt, class_hash: Felt, constructor_calldata: &[Felt]) -> Felt {
53-
compute_hash_on_elements(&[
54-
PREFIX_CONTRACT_ADDRESS,
55-
Felt::ZERO,
56-
salt,
57-
class_hash,
58-
compute_hash_on_elements(constructor_calldata),
59-
])
60-
.mod_floor(&ADDR_BOUND)
61-
}

packages/keychain/src/components/connect/Login.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ export function Login({
131131
}}
132132
autoFocus
133133
placeholder="Username"
134+
textTransform="lowercase"
134135
touched={meta.touched}
135136
error={meta.error}
136137
isLoading={props.isValidating}

packages/keychain/src/components/connect/Signup.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ function Form({ isSlot, onLogin, onSuccess }: SignupProps) {
168168
{...field}
169169
autoFocus
170170
placeholder="Username"
171+
textTransform="lowercase"
171172
touched={meta.touched}
172173
error={meta.error || errors?.username}
173174
onChange={(e) => {

0 commit comments

Comments
 (0)