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

feat: remove uuid dependency in favor of crypto.randomUUID() #1608

Closed
wants to merge 14 commits into from
Closed

feat: remove uuid dependency in favor of crypto.randomUUID() #1608

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
94bb641
feat: replace uuid package with crypto
nedsalk Jan 4, 2024
cc964d6
chore: empty changeset
nedsalk Jan 4, 2024
2cb31dc
fix: use internal crypto library
nedsalk Jan 4, 2024
cbed7c4
chore: updated changeset
nedsalk Jan 4, 2024
6f6b856
feat: throw errors when parts of global `crypto` not supported
nedsalk Jan 5, 2024
df3c6d5
Merge branch 'rc/salamander' into ns/feat/remove-uuid-dependency
danielbate Jan 5, 2024
732d8f9
chore: update changeset
nedsalk Jan 5, 2024
ba11b8e
Merge branch 'rc/salamander' into ns/feat/remove-uuid-dependency
nedsalk Jan 5, 2024
1f47954
Merge branch 'rc/salamander' into ns/feat/remove-uuid-dependency
nedsalk Jan 5, 2024
7b18afc
test: add tests for missing crypto features
nedsalk Jan 8, 2024
cd963c7
Merge branch 'rc/salamander' into ns/feat/remove-uuid-dependency
nedsalk Jan 8, 2024
1b656be
fix: test files' wrong environment config
nedsalk Jan 8, 2024
3631cab
fix: failing btoa test
nedsalk Jan 8, 2024
7fdfbef
Merge branch 'rc/salamander' into ns/feat/remove-uuid-dependency
nedsalk Jan 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
2 changes: 2 additions & 0 deletions .changeset/new-rats-return.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe the changeset should not be empty since we are adding a new exportable helper on the crypto package and made changes on the wallet package.

Therefore we want to bump versions on these 2 packages.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cbed7c4

I put crypto into the changeset because of the new export, but didn't put wallet because this is an internal change that doesn't change its functionality at all.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These packages are published independently.

We can't consider things as "internal" in this way.

The usual is to bump everything that will get a new published version.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

732d8f9

6 changes: 1 addition & 5 deletions packages/wallet/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,6 @@
"@fuel-ts/errors": "workspace:*",
"ethers": "^6.7.1",
"portfinder": "^1.0.32",
"tree-kill": "^1.2.2",
"uuid": "^9.0.0"
},
"devDependencies": {
"@types/uuid": "^9.0.1"
"tree-kill": "^1.2.2"
}
}
3 changes: 1 addition & 2 deletions packages/wallet/src/keystore-wallet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import {
import { ErrorCode, FuelError } from '@fuel-ts/errors';
import type { AbstractAddress } from '@fuel-ts/interfaces';
import { hexlify } from 'ethers';
import { v4 as uuidv4 } from 'uuid';

export type KeystoreWallet = {
id: string;
Expand Down Expand Up @@ -90,7 +89,7 @@ export async function encryptKeystoreWallet(

// Construct keystore.
const keystore: KeystoreWallet = {
id: uuidv4(),
id: crypto.randomUUID(),
arboleya marked this conversation as resolved.
Show resolved Hide resolved
version: 3,
address: removeHexPrefix(ownerAddress.toHexString()),
crypto: {
Expand Down
16 changes: 0 additions & 16 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading