Skip to content
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

signup argent #639

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

signup argent #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0e2eb53
signup argent
notV4l Aug 29, 2024
2ea4378
use provider instead of wallet provider
notV4l Aug 29, 2024
6aabb29
update account class_hash
notV4l Aug 30, 2024
8c632c9
rebase & fixes
notV4l Aug 30, 2024
4e5a376
Merge branch 'main' into signup_argentx
broody Sep 4, 2024
0a03e90
Remove argent context
broody Sep 4, 2024
a6b3948
Signe message with argent
broody Sep 4, 2024
d142c73
Signature validation working
broody Sep 5, 2024
75b3e63
Pass chain id in message
broody Sep 6, 2024
e3bdd4e
reactivate deploy screen
notV4l Sep 6, 2024
0a28af1
Remove debug
broody Sep 6, 2024
019736e
Refactor session registration / deployment
broody Sep 9, 2024
12961e4
make more modular
broody Sep 9, 2024
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
20 changes: 10 additions & 10 deletions examples/starknet-react-next/src/components/providers/StarknetProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,16 @@ const cartridge = new CartridgeConnector({
},
// theme: "dope-wars",
// colorMode: "light"
// prefunds: [
// {
// address: ETH_TOKEN_ADDRESS,
// min: "300000000000000",
// },
// {
// address: PAPER_TOKEN_ADDRESS,
// min: "100",
// },
// ],
prefunds: [
{
address: ETH_TOKEN_ADDRESS,
min: "300000000000000",
},
// {
// address: PAPER_TOKEN_ADDRESS,
// min: "100",
// },
],
});

function provider(chain: Chain) {
Expand Down
35 changes: 22 additions & 13 deletions packages/account-wasm/pkg/account_wasm.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,6 @@ export interface JsEstimateFeeDetails {
nonce: Felt;
}

export interface JsOutsideExecution {
caller: Felt;
executeBefore: number;
executeAfter: number;
calls: JsCall[];
nonce: Felt;
}

export interface JsInvocationsDetails {
nonce: Felt;
maxFee: Felt;
}

export type Felts = JsFelt[];

export type JsFelt = Felt;
Expand All @@ -31,6 +18,19 @@ export interface JsCredentials {
privateKey: Felt;
}

export interface JsInvocationsDetails {
nonce: Felt;
maxFee: Felt;
}

export interface JsOutsideExecution {
caller: Felt;
executeBefore: number;
executeAfter: number;
calls: JsCall[];
nonce: Felt;
}

export interface JsCall {
contractAddress: Felt;
entrypoint: string;
Expand Down Expand Up @@ -131,6 +131,15 @@ export class CartridgeAccount {
* @returns {Promise<JsFelt>}
*/
delegateAccount(): Promise<JsFelt>;
/**
* @param {any} owner
* @param {any} username
* @param {(JsPolicy)[]} policies
* @param {bigint} expires_at
* @param {bigint} initial_deposit
* @returns {any}
*/
static externalDeploymentCalls(owner: any, username: any, policies: (JsPolicy)[], expires_at: bigint, initial_deposit: bigint): any;
}
/**
*/
Expand Down
93 changes: 59 additions & 34 deletions packages/account-wasm/pkg/account_wasm_bg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,6 @@ function getObject(idx) { return heap[idx]; }

let heap_next = heap.length;

function addHeapObject(obj) {
if (heap_next === heap.length) heap.push(heap.length + 1);
const idx = heap_next;
heap_next = heap[idx];

heap[idx] = obj;
return idx;
}

function dropObject(idx) {
if (idx < 132) return;
heap[idx] = heap_next;
Expand All @@ -33,7 +24,20 @@ function takeObject(idx) {
return ret;
}

let WASM_VECTOR_LEN = 0;
function addHeapObject(obj) {
if (heap_next === heap.length) heap.push(heap.length + 1);
const idx = heap_next;
heap_next = heap[idx];

heap[idx] = obj;
return idx;
}

const lTextDecoder = typeof TextDecoder === 'undefined' ? (0, module.require)('util').TextDecoder : TextDecoder;

let cachedTextDecoder = new lTextDecoder('utf-8', { ignoreBOM: true, fatal: true });

cachedTextDecoder.decode();

let cachedUint8ArrayMemory0 = null;

Expand All @@ -44,6 +48,13 @@ function getUint8ArrayMemory0() {
return cachedUint8ArrayMemory0;
}

function getStringFromWasm0(ptr, len) {
ptr = ptr >>> 0;
return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len));
}

let WASM_VECTOR_LEN = 0;

const lTextEncoder = typeof TextEncoder === 'undefined' ? (0, module.require)('util').TextEncoder : TextEncoder;

let cachedTextEncoder = new lTextEncoder('utf-8');
Expand Down Expand Up @@ -113,17 +124,6 @@ function getDataViewMemory0() {
return cachedDataViewMemory0;
}

const lTextDecoder = typeof TextDecoder === 'undefined' ? (0, module.require)('util').TextDecoder : TextDecoder;

let cachedTextDecoder = new lTextDecoder('utf-8', { ignoreBOM: true, fatal: true });

cachedTextDecoder.decode();

function getStringFromWasm0(ptr, len) {
ptr = ptr >>> 0;
return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len));
}

function debugString(val) {
// primitive types
const type = typeof val;
Expand Down Expand Up @@ -220,7 +220,7 @@ function makeMutClosure(arg0, arg1, dtor, f) {
return real;
}
function __wbg_adapter_44(arg0, arg1, arg2) {
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hab75a3c637f96005(arg0, arg1, addHeapObject(arg2));
wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__ha5780fd1342283cf(arg0, arg1, addHeapObject(arg2));
}

function passArrayJsValueToWasm0(array, malloc) {
Expand All @@ -240,8 +240,8 @@ function handleError(f, args) {
wasm.__wbindgen_exn_store(addHeapObject(e));
}
}
function __wbg_adapter_185(arg0, arg1, arg2, arg3) {
wasm.wasm_bindgen__convert__closures__invoke2_mut__h47b629288504f118(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
function __wbg_adapter_186(arg0, arg1, arg2, arg3) {
wasm.wasm_bindgen__convert__closures__invoke2_mut__h11630e69f33a5871(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
}

const CartridgeAccountFinalization = (typeof FinalizationRegistry === 'undefined')
Expand Down Expand Up @@ -462,6 +462,31 @@ export class CartridgeAccount {
const ret = wasm.cartridgeaccount_delegateAccount(this.__wbg_ptr);
return takeObject(ret);
}
/**
* @param {any} owner
* @param {any} username
* @param {(JsPolicy)[]} policies
* @param {bigint} expires_at
* @param {bigint} initial_deposit
* @returns {any}
*/
static externalDeploymentCalls(owner, username, policies, expires_at, initial_deposit) {
try {
const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
const ptr0 = passArrayJsValueToWasm0(policies, wasm.__wbindgen_malloc);
const len0 = WASM_VECTOR_LEN;
wasm.cartridgeaccount_externalDeploymentCalls(retptr, addHeapObject(owner), addHeapObject(username), ptr0, len0, expires_at, initial_deposit);
var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
if (r2) {
throw takeObject(r1);
}
return takeObject(r0);
} finally {
wasm.__wbindgen_add_to_stack_pointer(16);
}
}
}

const CartridgeSessionAccountFinalization = (typeof FinalizationRegistry === 'undefined')
Expand Down Expand Up @@ -577,13 +602,18 @@ export class CartridgeSessionAccount {
}
}

export function __wbindgen_object_drop_ref(arg0) {
takeObject(arg0);
};

export function __wbindgen_object_clone_ref(arg0) {
const ret = getObject(arg0);
return addHeapObject(ret);
};

export function __wbindgen_object_drop_ref(arg0) {
takeObject(arg0);
export function __wbindgen_error_new(arg0, arg1) {
const ret = new Error(getStringFromWasm0(arg0, arg1));
return addHeapObject(ret);
};

export function __wbindgen_string_get(arg0, arg1) {
Expand All @@ -595,11 +625,6 @@ export function __wbindgen_string_get(arg0, arg1) {
getDataViewMemory0().setInt32(arg0 + 4 * 0, ptr1, true);
};

export function __wbindgen_error_new(arg0, arg1) {
const ret = new Error(getStringFromWasm0(arg0, arg1));
return addHeapObject(ret);
};

export function __wbindgen_string_new(arg0, arg1) {
const ret = getStringFromWasm0(arg0, arg1);
return addHeapObject(ret);
Expand Down Expand Up @@ -1033,7 +1058,7 @@ export function __wbg_new_b85e72ed1bfd57f9(arg0, arg1) {
const a = state0.a;
state0.a = 0;
try {
return __wbg_adapter_185(a, state0.b, arg0, arg1);
return __wbg_adapter_186(a, state0.b, arg0, arg1);
} finally {
state0.a = a;
}
Expand Down Expand Up @@ -1137,8 +1162,8 @@ export function __wbindgen_memory() {
return addHeapObject(ret);
};

export function __wbindgen_closure_wrapper2417(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 474, __wbg_adapter_44);
export function __wbindgen_closure_wrapper2435(arg0, arg1, arg2) {
const ret = makeMutClosure(arg0, arg1, 471, __wbg_adapter_44);
return addHeapObject(ret);
};

Binary file modified packages/account-wasm/pkg/account_wasm_bg.wasm
View file
Open in desktop
Binary file not shown.
5 changes: 3 additions & 2 deletions packages/account-wasm/pkg/account_wasm_bg.wasm.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export function cartridgeaccount_revokeSession(a: number, b: number): void;
export function cartridgeaccount_signMessage(a: number, b: number, c: number): number;
export function cartridgeaccount_deploySelf(a: number, b: number): number;
export function cartridgeaccount_delegateAccount(a: number): number;
export function cartridgeaccount_externalDeploymentCalls(a: number, b: number, c: number, d: number, e: number, f: number, g: number): void;
export function __wbg_cartridgesessionaccount_free(a: number, b: number): void;
export function cartridgesessionaccount_new(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number): void;
export function cartridgesessionaccount_new_as_registered(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number): void;
Expand All @@ -24,7 +25,7 @@ export function cartridgesessionaccount_execute_from_outside(a: number, b: numbe
export function __wbindgen_malloc(a: number, b: number): number;
export function __wbindgen_realloc(a: number, b: number, c: number, d: number): number;
export const __wbindgen_export_2: WebAssembly.Table;
export function _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hab75a3c637f96005(a: number, b: number, c: number): void;
export function _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__ha5780fd1342283cf(a: number, b: number, c: number): void;
export function __wbindgen_add_to_stack_pointer(a: number): number;
export function __wbindgen_exn_store(a: number): void;
export function wasm_bindgen__convert__closures__invoke2_mut__h47b629288504f118(a: number, b: number, c: number, d: number): void;
export function wasm_bindgen__convert__closures__invoke2_mut__h11630e69f33a5871(a: number, b: number, c: number, d: number): void;
Loading