Skip to content

Commit 0ebefb5

Browse files
authored
Merge branch 'main' into switch-to-added-network
2 parents af041d6 + 1e2ecce commit 0ebefb5

File tree

148 files changed

+6853
-2866
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+6853
-2866
lines changed

.env.defaults

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ SUPPORT_SWAP_QUOTE_REFRESH=false
3232
SUPPORT_ACHIEVEMENTS_BANNER=false
3333
SUPPORT_NFT_SEND=false
3434
USE_MAINNET_FORK=false
35-
ENABLE_UPDATED_DAPP_CONNECTIONS=false
35+
ENABLE_UPDATED_DAPP_CONNECTIONS=true

.eslintrc.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,13 @@ module.exports = {
9292
],
9393
},
9494
],
95-
"@typescript-eslint/no-unused-vars": "error",
95+
"@typescript-eslint/no-unused-vars": [
96+
"error",
97+
{
98+
argsIgnorePattern: "^_",
99+
varsIgnorePattern: "^_",
100+
},
101+
],
96102
"no-unused-vars": "off",
97103
},
98104
ignorePatterns: [

.github/CODEOWNERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Any changes to keyring code deserve extra scrutiny to prevent key
1+
# Any changes to internal-signer service code deserve extra scrutiny to prevent key
22
# exfiltration and general "roll your own crypto" mistakes. Newer
3-
# contributions to keyring code should be assumed insecure, requiring
3+
# contributions to internal-signer code should be assumed insecure, requiring
44
# agreement across the team to merge.
5-
/background/services/keyring/* @tahowallet/extension-security-auditors
5+
/background/services/internal-signer/* @tahowallet/extension-security-auditors
66
# Any changes to dependencies deserve extra scrutiny to help prevent supply
77
# chain attacks
88
yarn.lock @tahowallet/extension-dependency-auditors

.github/ISSUE_TEMPLATE/BUG.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ body:
5151
label: Version
5252
description: What version of the extension are you running?
5353
options:
54+
- v0.41.0
55+
- v0.40.2
56+
- v0.40.1
5457
- v0.40.0
5558
- v0.39.0
5659
- v0.38.1

.github/workflows/sync-pledge.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
schedule:
55
- cron: "0 0 */3 * *"
66
workflow_dispatch:
7-
pull_request: {}
87

98
jobs:
109
cron:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ services (in the API package) and the interface and browser notifications:
243243
│ │ - On-chain prices ┃ │ └─────────────────┘
244244
│ │ ┃ │
245245
│ │ ┃ │ ┌────────────────┐
246-
│ │ Keyring ┃ │ │ │
246+
│ │ Internal Signer ┃ │ │ │
247247
│ ├──────list accounts, sign tx, sign message───────▶ - Native ────────────────╋─────┼──────▶ Extension │
248248
│ │ - Remote ┃ │ │ Storage API │
249249
│ ┌──────────┴──────────┐ ┃ │ │ │

background/lib/posthog.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ export enum AnalyticsEvent {
1212
NEW_ACCOUNT_TO_TRACK = "Address added to tracking on network",
1313
CUSTOM_CHAIN_ADDED = "Custom chain added",
1414
DAPP_CONNECTED = "Dapp Connected",
15+
VAULT_MIGRATION = "Migrate to newer vault version",
16+
VAULT_MIGRATION_FAILED = "Vault version migration failed",
1517
}
1618

1719
export enum OneTimeAnalyticsEvent {

background/lib/token-lists.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { DeepWriteable } from "../types"
2222
const cleanTokenListResponse = (json: any, url: string) => {
2323
if (url.includes("api-polygon-tokens.polygon.technology")) {
2424
if (typeof json === "object" && json !== null && "tags" in json) {
25-
const { tags, ...cleanedJson } = json
25+
const { tags: _, ...cleanedJson } = json
2626
return cleanedJson
2727
}
2828
}

background/lib/utils/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,14 @@ export function gweiToWei(value: number | bigint): bigint {
108108
return BigInt(utils.parseUnits(value.toString(), "gwei").toString())
109109
}
110110

111-
export function convertToEth(value: string | number | bigint): string {
111+
export function convertToEth(value: bigint): string {
112112
if (value && value >= 1) {
113113
return utils.formatUnits(BigInt(value))
114114
}
115115
return ""
116116
}
117117

118-
export function weiToGwei(value: string | number | bigint): string {
118+
export function weiToGwei(value: bigint): string {
119119
if (value && value >= 1) {
120120
return truncateDecimalAmount(utils.formatUnits(BigInt(value), "gwei"), 2)
121121
}

background/lib/validate/prices.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export const coingeckoPriceSchema: JSONSchemaType<CoingeckoPriceData> = {
2727
additionalProperties: { type: "number", nullable: true },
2828
nullable: true,
2929
},
30-
}
30+
} as const
3131

3232
export type CoingeckoPriceData = {
3333
[coinId: string]:

0 commit comments

Comments
 (0)