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: turn off eip1559 support for keepkey #665

Merged
merged 2 commits into from
Feb 19, 2024
Merged

feat: turn off eip1559 support for keepkey #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
810754d
feat: turn off eip1559 support for keepkey
kaladinlight Feb 19, 2024
a02c280
chore(release): publish 1.53.4
kaladinlight Feb 19, 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
32 changes: 16 additions & 16 deletions examples/sandbox/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-sandbox",
"version": "1.53.3",
"version": "1.53.4",
"license": "MIT",
"private": true,
"browserslist": "> 0.5%, last 2 versions, not dead",
Expand All @@ -11,21 +11,21 @@
},
"dependencies": {
"@metamask/eth-sig-util": "^7.0.0",
"@shapeshiftoss/hdwallet-core": "1.53.3",
"@shapeshiftoss/hdwallet-keepkey-tcp": "1.53.3",
"@shapeshiftoss/hdwallet-keepkey-webusb": "1.53.3",
"@shapeshiftoss/hdwallet-keplr": "1.53.3",
"@shapeshiftoss/hdwallet-ledger": "1.53.3",
"@shapeshiftoss/hdwallet-ledger-webhid": "1.53.3",
"@shapeshiftoss/hdwallet-ledger-webusb": "1.53.3",
"@shapeshiftoss/hdwallet-metamask": "1.53.3",
"@shapeshiftoss/hdwallet-native": "1.53.3",
"@shapeshiftoss/hdwallet-portis": "1.53.3",
"@shapeshiftoss/hdwallet-tallyho": "1.53.3",
"@shapeshiftoss/hdwallet-trezor": "1.53.3",
"@shapeshiftoss/hdwallet-trezor-connect": "1.53.3",
"@shapeshiftoss/hdwallet-walletconnect": "1.53.3",
"@shapeshiftoss/hdwallet-xdefi": "1.53.3",
"@shapeshiftoss/hdwallet-core": "1.53.4",
"@shapeshiftoss/hdwallet-keepkey-tcp": "1.53.4",
"@shapeshiftoss/hdwallet-keepkey-webusb": "1.53.4",
"@shapeshiftoss/hdwallet-keplr": "1.53.4",
"@shapeshiftoss/hdwallet-ledger": "1.53.4",
"@shapeshiftoss/hdwallet-ledger-webhid": "1.53.4",
"@shapeshiftoss/hdwallet-ledger-webusb": "1.53.4",
"@shapeshiftoss/hdwallet-metamask": "1.53.4",
"@shapeshiftoss/hdwallet-native": "1.53.4",
"@shapeshiftoss/hdwallet-portis": "1.53.4",
"@shapeshiftoss/hdwallet-tallyho": "1.53.4",
"@shapeshiftoss/hdwallet-trezor": "1.53.4",
"@shapeshiftoss/hdwallet-trezor-connect": "1.53.4",
"@shapeshiftoss/hdwallet-walletconnect": "1.53.4",
"@shapeshiftoss/hdwallet-xdefi": "1.53.4",
"bip32": "^2.0.4",
"eip-712": "^1.0.0",
"jquery": "^3.7.1",
Expand Down
20 changes: 10 additions & 10 deletions integration/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/integration",
"version": "1.53.3",
"version": "1.53.4",
"main": "index.js",
"license": "MIT",
"private": true,
Expand All @@ -10,15 +10,15 @@
"dev": "lerna run test --scope integration --parallel --include-filtered-dependencies"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.53.3",
"@shapeshiftoss/hdwallet-keepkey": "1.53.3",
"@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.53.3",
"@shapeshiftoss/hdwallet-keepkey-tcp": "1.53.3",
"@shapeshiftoss/hdwallet-ledger": "1.53.3",
"@shapeshiftoss/hdwallet-native": "1.53.3",
"@shapeshiftoss/hdwallet-portis": "1.53.3",
"@shapeshiftoss/hdwallet-trezor": "1.53.3",
"@shapeshiftoss/hdwallet-xdefi": "1.53.3",
"@shapeshiftoss/hdwallet-core": "1.53.4",
"@shapeshiftoss/hdwallet-keepkey": "1.53.4",
"@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.53.4",
"@shapeshiftoss/hdwallet-keepkey-tcp": "1.53.4",
"@shapeshiftoss/hdwallet-ledger": "1.53.4",
"@shapeshiftoss/hdwallet-native": "1.53.4",
"@shapeshiftoss/hdwallet-portis": "1.53.4",
"@shapeshiftoss/hdwallet-trezor": "1.53.4",
"@shapeshiftoss/hdwallet-xdefi": "1.53.4",
"fast-json-stable-stringify": "^2.1.0",
"msw": "^0.27.1",
"whatwg-fetch": "^3.6.2"
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"lerna": "5.2.0",
"version": "1.53.3",
"version": "1.53.4",
"npmClient": "yarn",
"useWorkspaces": true,
"command": {
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-coinbase/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-coinbase",
"version": "1.53.3",
"version": "1.53.4",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -15,7 +15,7 @@
},
"dependencies": {
"@coinbase/wallet-sdk": "^3.6.6",
"@shapeshiftoss/hdwallet-core": "1.53.3",
"@shapeshiftoss/hdwallet-core": "1.53.4",
"eth-rpc-errors": "^4.0.3",
"lodash": "^4.17.21"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/hdwallet-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-core",
"version": "1.53.3",
"version": "1.53.4",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-keepkey-chromeusb/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-chromeusb",
"version": "1.53.3",
"version": "1.53.4",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,7 +14,7 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.53.3",
"@shapeshiftoss/hdwallet-keepkey": "1.53.3"
"@shapeshiftoss/hdwallet-core": "1.53.4",
"@shapeshiftoss/hdwallet-keepkey": "1.53.4"
}
}
4 changes: 2 additions & 2 deletions packages/hdwallet-keepkey-electron/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-electron",
"version": "1.53.3",
"version": "1.53.4",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,7 +14,7 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-keepkey": "1.53.3",
"@shapeshiftoss/hdwallet-keepkey": "1.53.4",
"uuid": "^8.3.2"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-keepkey-nodehid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-nodehid",
"version": "1.53.3",
"version": "1.53.4",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,7 +14,7 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-keepkey": "1.53.3"
"@shapeshiftoss/hdwallet-keepkey": "1.53.4"
},
"peerDependencies": {
"node-hid": "^2.1.1"
Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-keepkey-nodewebusb/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-nodewebusb",
"version": "1.53.3",
"version": "1.53.4",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,8 +14,8 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.53.3",
"@shapeshiftoss/hdwallet-keepkey": "1.53.3"
"@shapeshiftoss/hdwallet-core": "1.53.4",
"@shapeshiftoss/hdwallet-keepkey": "1.53.4"
},
"peerDependencies": {
"usb": "^2.3.1"
Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-keepkey-tcp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-tcp",
"version": "1.53.3",
"version": "1.53.4",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,8 +14,8 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.53.3",
"@shapeshiftoss/hdwallet-keepkey": "1.53.3",
"@shapeshiftoss/hdwallet-core": "1.53.4",
"@shapeshiftoss/hdwallet-keepkey": "1.53.4",
"axios": "^0.21.1"
}
}
6 changes: 3 additions & 3 deletions packages/hdwallet-keepkey-webusb/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-webusb",
"version": "1.53.3",
"version": "1.53.4",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,8 +14,8 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.53.3",
"@shapeshiftoss/hdwallet-keepkey": "1.53.3"
"@shapeshiftoss/hdwallet-core": "1.53.4",
"@shapeshiftoss/hdwallet-keepkey": "1.53.4"
},
"devDependencies": {
"@types/w3c-web-usb": "^1.0.4"
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-keepkey/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey",
"version": "1.53.3",
"version": "1.53.4",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -20,7 +20,7 @@
"@keepkey/device-protocol": "^7.12.2",
"@metamask/eth-sig-util": "^7.0.0",
"@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2",
"@shapeshiftoss/hdwallet-core": "1.53.3",
"@shapeshiftoss/hdwallet-core": "1.53.4",
"@shapeshiftoss/proto-tx-builder": "^0.8.0",
"bignumber.js": "^9.0.1",
"bnb-javascript-sdk-nobroadcast": "^2.16.14",
Expand Down
8 changes: 6 additions & 2 deletions packages/hdwallet-keepkey/src/keepkey.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,8 @@ export class KeepKeyHDWalletInfo
}

public async ethSupportsEIP1559(): Promise<boolean> {
return true;
// disable EIP1559 support until edge case fail states are fixed across all evm chains
return false;
}

public ethGetAccountPaths(msg: core.ETHGetAccountPath): Array<core.ETHAccountPath> {
Expand Down Expand Up @@ -1205,7 +1206,10 @@ export class KeepKeyHDWallet implements core.HDWallet, core.BTCWallet, core.ETHW

public async ethSupportsEIP1559(): Promise<boolean> {
// EIP1559 support starts in v7.2.1
return semver.gte(await this.getFirmwareVersion(), "v7.2.1");
// return semver.gte(await this.getFirmwareVersion(), "v7.2.1");

// disable EIP1559 support until edge case fail states are fixed across all evm chains
return false;
}

public async btcSignMessage(msg: core.BTCSignMessage): Promise<core.BTCSignedMessage> {
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-keplr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keplr",
"version": "1.53.3",
"version": "1.53.4",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -15,7 +15,7 @@
},
"dependencies": {
"@shapeshiftoss/caip": "8.15.0",
"@shapeshiftoss/hdwallet-core": "1.53.3",
"@shapeshiftoss/hdwallet-core": "1.53.4",
"@shapeshiftoss/proto-tx-builder": "^0.8.0",
"@shapeshiftoss/types": "3.1.3",
"base64-js": "^1.5.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-ledger-webhid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-ledger-webhid",
"version": "1.53.3",
"version": "1.53.4",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -19,8 +19,8 @@
"@ledgerhq/hw-transport": "^6.7.0",
"@ledgerhq/hw-transport-webhid": "^6.7.0",
"@ledgerhq/live-common": "^21.8.2",
"@shapeshiftoss/hdwallet-core": "1.53.3",
"@shapeshiftoss/hdwallet-ledger": "1.53.3",
"@shapeshiftoss/hdwallet-core": "1.53.4",
"@shapeshiftoss/hdwallet-ledger": "1.53.4",
"@types/w3c-web-hid": "^1.0.2"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-ledger-webusb/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-ledger-webusb",
"version": "1.53.3",
"version": "1.53.4",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -20,8 +20,8 @@
"@ledgerhq/hw-transport-webusb": "^6.7.0",
"@ledgerhq/live-common": "^21.8.2",
"@ledgerhq/logs": "^6.10.1",
"@shapeshiftoss/hdwallet-core": "1.53.3",
"@shapeshiftoss/hdwallet-ledger": "1.53.3",
"@shapeshiftoss/hdwallet-core": "1.53.4",
"@shapeshiftoss/hdwallet-ledger": "1.53.4",
"@types/w3c-web-usb": "^1.0.4",
"p-queue": "^7.4.1"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-ledger/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-ledger",
"version": "1.53.3",
"version": "1.53.4",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -19,7 +19,7 @@
"@ethereumjs/tx": "^3.3.0",
"@ledgerhq/hw-app-cosmos": "^6.29.1",
"@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2",
"@shapeshiftoss/hdwallet-core": "1.53.3",
"@shapeshiftoss/hdwallet-core": "1.53.4",
"base64-js": "^1.5.1",
"bchaddrjs": "^0.4.4",
"bitcoinjs-message": "^2.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-metamask-shapeshift-multichain/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-shapeshift-multichain",
"version": "1.53.3",
"version": "1.53.4",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -17,7 +17,7 @@
"@metamask/detect-provider": "^1.2.0",
"@metamask/onboarding": "^1.0.1",
"@shapeshiftoss/common-api": "^9.3.0",
"@shapeshiftoss/hdwallet-core": "1.53.3",
"@shapeshiftoss/hdwallet-core": "1.53.4",
"@shapeshiftoss/metamask-snaps-adapter": "^1.0.8",
"@shapeshiftoss/metamask-snaps-types": "^1.0.8",
"eth-rpc-errors": "^4.0.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-metamask/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-metamask",
"version": "1.53.3",
"version": "1.53.4",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -16,7 +16,7 @@
"dependencies": {
"@metamask/detect-provider": "^1.2.0",
"@metamask/onboarding": "^1.0.1",
"@shapeshiftoss/hdwallet-core": "1.53.3",
"@shapeshiftoss/hdwallet-core": "1.53.4",
"eth-rpc-errors": "^4.0.3",
"lodash": "^4.17.21"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-native-vault/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-native-vault",
"version": "1.53.3",
"version": "1.53.4",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,7 +14,7 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-native": "1.53.3",
"@shapeshiftoss/hdwallet-native": "1.53.4",
"bip39": "^3.0.4",
"hash-wasm": "^4.9.0",
"idb-keyval": "^6.0.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-native/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-native",
"version": "1.53.3",
"version": "1.53.4",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -16,7 +16,7 @@
"dependencies": {
"@shapeshiftoss/bitcoinjs-lib": "5.2.0-shapeshift.2",
"@shapeshiftoss/fiosdk": "1.2.1-shapeshift.6",
"@shapeshiftoss/hdwallet-core": "1.53.3",
"@shapeshiftoss/hdwallet-core": "1.53.4",
"@shapeshiftoss/proto-tx-builder": "^0.8.0",
"@zxing/text-encoding": "^0.9.0",
"bchaddrjs": "^0.4.9",
Expand Down
Loading
Loading