forked from visoftsolutions/noir_rs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: Top level init bb.js, but better scoped imports to not incur cos…
…t too early (AztecProtocol#3629) Related to this issue: AztecProtocol#3618 Gets `aztec-cli help` down to 0.01s!!!!
- Loading branch information
1 parent
c7f1878
commit cea862d
Showing
20 changed files
with
300 additions
and
273 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,10 @@ | ||
| export { init as initAztecJs } from '@aztec/foundation/crypto'; | ||
| import { init } from '@aztec/foundation/crypto'; | ||
|
|
||
| /** | ||
| * This should only be needed to be called in CJS environments that don't have top level await. | ||
| * Initializes any asynchronous subsystems required to use the library. | ||
| * At time of writing, this is just our foundation crypto lib. | ||
| */ | ||
| export async function initAztecJs() { | ||
| await init(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 1 addition & 4 deletions
5
yarn-project/circuits.js/src/barretenberg/crypto/aes128/index.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,248 @@ | ||
| import { FunctionSelector } from '@aztec/aztec.js/abi'; | ||
| import { AztecAddress } from '@aztec/aztec.js/aztec_address'; | ||
| import { EthAddress } from '@aztec/aztec.js/eth_address'; | ||
| import { Fr, GrumpkinScalar, Point } from '@aztec/aztec.js/fields'; | ||
| import { LogId } from '@aztec/aztec.js/log_id'; | ||
| import { TxHash } from '@aztec/aztec.js/tx_hash'; | ||
|
|
||
| import { InvalidArgumentError } from 'commander'; | ||
|
|
||
| /** | ||
| * Removes the leading 0x from a hex string. If no leading 0x is found the string is returned unchanged. | ||
| * @param hex - A hex string | ||
| * @returns A new string with leading 0x removed | ||
| */ | ||
| const stripLeadingHex = (hex: string) => { | ||
| if (hex.length > 2 && hex.startsWith('0x')) { | ||
| return hex.substring(2); | ||
| } | ||
| return hex; | ||
| }; | ||
|
|
||
| /** | ||
| * Parses a hex encoded string to an Fr integer to be used as salt | ||
| * @param str - Hex encoded string | ||
| * @returns A integer to be used as salt | ||
| */ | ||
| export function parseSaltFromHexString(str: string): Fr { | ||
| const hex = stripLeadingHex(str); | ||
|
|
||
| // ensure it's a hex string | ||
| if (!hex.match(/^[0-9a-f]+$/i)) { | ||
| throw new InvalidArgumentError('Invalid hex string'); | ||
| } | ||
|
|
||
| // pad it so that we may read it as a buffer. | ||
| // Buffer needs _exactly_ two hex characters per byte | ||
| const padded = hex.length % 2 === 1 ? '0' + hex : hex; | ||
|
|
||
| // finally, turn it into an integer | ||
| return Fr.fromBuffer(Buffer.from(padded, 'hex')); | ||
| } | ||
|
|
||
| /** | ||
| * Parses an AztecAddress from a string. | ||
| * @param address - A serialized Aztec address | ||
| * @returns An Aztec address | ||
| * @throws InvalidArgumentError if the input string is not valid. | ||
| */ | ||
| export function parseAztecAddress(address: string): AztecAddress { | ||
| try { | ||
| return AztecAddress.fromString(address); | ||
| } catch { | ||
| throw new InvalidArgumentError(`Invalid address: ${address}`); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Parses an Ethereum address from a string. | ||
| * @param address - A serialized Ethereum address | ||
| * @returns An Ethereum address | ||
| * @throws InvalidArgumentError if the input string is not valid. | ||
| */ | ||
| export function parseEthereumAddress(address: string): EthAddress { | ||
| try { | ||
| return EthAddress.fromString(address); | ||
| } catch { | ||
| throw new InvalidArgumentError(`Invalid address: ${address}`); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Parses an AztecAddress from a string. | ||
| * @param address - A serialized Aztec address | ||
| * @returns An Aztec address | ||
| * @throws InvalidArgumentError if the input string is not valid. | ||
| */ | ||
| export function parseOptionalAztecAddress(address: string): AztecAddress | undefined { | ||
| if (!address) { | ||
| return undefined; | ||
| } | ||
| return parseAztecAddress(address); | ||
| } | ||
|
|
||
| /** | ||
| * Parses an optional log ID string into a LogId object. | ||
| * | ||
| * @param logId - The log ID string to parse. | ||
| * @returns The parsed LogId object, or undefined if the log ID is missing or empty. | ||
| */ | ||
| export function parseOptionalLogId(logId: string): LogId | undefined { | ||
| if (!logId) { | ||
| return undefined; | ||
| } | ||
| return LogId.fromString(logId); | ||
| } | ||
|
|
||
| /** | ||
| * Parses a selector from a string. | ||
| * @param selector - A serialized selector. | ||
| * @returns A selector. | ||
| * @throws InvalidArgumentError if the input string is not valid. | ||
| */ | ||
| export function parseOptionalSelector(selector: string): FunctionSelector | undefined { | ||
| if (!selector) { | ||
| return undefined; | ||
| } | ||
| try { | ||
| return FunctionSelector.fromString(selector); | ||
| } catch { | ||
| throw new InvalidArgumentError(`Invalid selector: ${selector}`); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Parses a string into an integer or returns undefined if the input is falsy. | ||
| * | ||
| * @param value - The string to parse into an integer. | ||
| * @returns The parsed integer, or undefined if the input string is falsy. | ||
| * @throws If the input is not a valid integer. | ||
| */ | ||
| export function parseOptionalInteger(value: string): number | undefined { | ||
| if (!value) { | ||
| return undefined; | ||
| } | ||
| const parsed = Number(value); | ||
| if (!Number.isInteger(parsed)) { | ||
| throw new InvalidArgumentError('Invalid integer.'); | ||
| } | ||
| return parsed; | ||
| } | ||
|
|
||
| /** | ||
| * Parses a TxHash from a string. | ||
| * @param txHash - A transaction hash | ||
| * @returns A TxHash instance | ||
| * @throws InvalidArgumentError if the input string is not valid. | ||
| */ | ||
| export function parseTxHash(txHash: string): TxHash { | ||
| try { | ||
| return TxHash.fromString(txHash); | ||
| } catch { | ||
| throw new InvalidArgumentError(`Invalid transaction hash: ${txHash}`); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Parses an optional TxHash from a string. | ||
| * Calls parseTxHash internally. | ||
| * @param txHash - A transaction hash | ||
| * @returns A TxHash instance, or undefined if the input string is falsy. | ||
| * @throws InvalidArgumentError if the input string is not valid. | ||
| */ | ||
| export function parseOptionalTxHash(txHash: string): TxHash | undefined { | ||
| if (!txHash) { | ||
| return undefined; | ||
| } | ||
| return parseTxHash(txHash); | ||
| } | ||
|
|
||
| /** | ||
| * Parses a public key from a string. | ||
| * @param publicKey - A public key | ||
| * @returns A Point instance | ||
| * @throws InvalidArgumentError if the input string is not valid. | ||
| */ | ||
| export function parsePublicKey(publicKey: string): Point { | ||
| try { | ||
| return Point.fromString(publicKey); | ||
| } catch (err) { | ||
| throw new InvalidArgumentError(`Invalid public key: ${publicKey}`); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Parses a partial address from a string. | ||
| * @param address - A partial address | ||
| * @returns A Fr instance | ||
| * @throws InvalidArgumentError if the input string is not valid. | ||
| */ | ||
| export function parsePartialAddress(address: string): Fr { | ||
| try { | ||
| return Fr.fromString(address); | ||
| } catch (err) { | ||
| throw new InvalidArgumentError(`Invalid partial address: ${address}`); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Parses a private key from a string. | ||
| * @param privateKey - A string | ||
| * @returns A private key | ||
| * @throws InvalidArgumentError if the input string is not valid. | ||
| */ | ||
| export function parsePrivateKey(privateKey: string): GrumpkinScalar { | ||
| try { | ||
| const value = GrumpkinScalar.fromString(privateKey); | ||
| // most likely a badly formatted key was passed | ||
| if (value.isZero()) { | ||
| throw new Error('Private key must not be zero'); | ||
| } | ||
|
|
||
| return value; | ||
| } catch (err) { | ||
| throw new InvalidArgumentError(`Invalid private key: ${privateKey}`); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Parses a field from a string. | ||
| * @param field - A string representing the field. | ||
| * @returns A field. | ||
| * @throws InvalidArgumentError if the input string is not valid. | ||
| */ | ||
| export function parseField(field: string): Fr { | ||
| try { | ||
| const isHex = field.startsWith('0x') || field.match(new RegExp(`^[0-9a-f]{${Fr.SIZE_IN_BYTES * 2}}$`, 'i')); | ||
| if (isHex) { | ||
| return Fr.fromString(field); | ||
| } | ||
|
|
||
| if (['true', 'false'].includes(field)) { | ||
| return new Fr(field === 'true'); | ||
| } | ||
|
|
||
| const isNumber = +field || field === '0'; | ||
| if (isNumber) { | ||
| return new Fr(BigInt(field)); | ||
| } | ||
|
|
||
| const isBigInt = field.endsWith('n'); | ||
| if (isBigInt) { | ||
| return new Fr(BigInt(field.replace(/n$/, ''))); | ||
| } | ||
|
|
||
| return new Fr(BigInt(field)); | ||
| } catch (err) { | ||
| throw new InvalidArgumentError(`Invalid field: ${field}`); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Parses an array of strings to Frs. | ||
| * @param fields - An array of strings representing the fields. | ||
| * @returns An array of Frs. | ||
| */ | ||
| export function parseFields(fields: string[]): Fr[] { | ||
| return fields.map(parseField); | ||
| } |
Oops, something went wrong.