From 29ab8d9b21bfa2638fd7b634fd0bb5ef786cb877 Mon Sep 17 00:00:00 2001 From: Taylor Dawson Date: Tue, 28 Jun 2022 10:08:19 -0500 Subject: [PATCH] Fixes ledger transaction on polygon (#1101) * Fixes ledger transaction on polygon * version bumps * formating + prettier ignore --- .prettierignore | 1 + packages/coinbase/package.json | 4 ++-- packages/common/package.json | 2 +- packages/common/src/hdwallets.ts | 18 +++++++++++++----- packages/common/src/index.ts | 6 +++++- packages/common/src/types.ts | 6 +++--- packages/core/package.json | 2 +- packages/core/src/types.ts | 4 +--- packages/dcent/package.json | 4 ++-- packages/demo/src/App.svelte | 6 ++++++ packages/fortmatic/package.json | 4 ++-- packages/gnosis/package.json | 4 ++-- packages/injected/package.json | 4 ++-- packages/keepkey/package.json | 4 ++-- packages/keystone/package.json | 4 ++-- packages/ledger/package.json | 4 ++-- packages/ledger/src/index.ts | 2 +- packages/magic/package.json | 4 ++-- packages/mew/package.json | 4 ++-- packages/portis/package.json | 4 ++-- packages/react/package.json | 2 +- packages/torus/package.json | 4 ++-- packages/trezor/package.json | 4 ++-- packages/vue/package.json | 2 +- packages/walletconnect/package.json | 2 +- packages/walletlink/package.json | 4 ++-- packages/web3auth/package.json | 4 ++-- 27 files changed, 65 insertions(+), 48 deletions(-) create mode 100644 .prettierignore diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 000000000..aaf420460 --- /dev/null +++ b/.prettierignore @@ -0,0 +1 @@ +packages/**/dist \ No newline at end of file diff --git a/packages/coinbase/package.json b/packages/coinbase/package.json index 7128ce044..4171f0483 100644 --- a/packages/coinbase/package.json +++ b/packages/coinbase/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/coinbase", - "version": "2.0.6-alpha.1", + "version": "2.0.6-alpha.2", "description": "Coinbase Wallet module for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -21,6 +21,6 @@ }, "dependencies": { "@coinbase/wallet-sdk": "^3.0.5", - "@web3-onboard/common": "2.1.3-alpha.1" + "@web3-onboard/common": "^2.1.3-alpha.2" } } diff --git a/packages/common/package.json b/packages/common/package.json index a70c20c16..dae2bb704 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/common", - "version": "2.1.3-alpha.1", + "version": "2.1.3-alpha.2", "scripts": { "build": "rollup -c", "dev": "rollup -c -w", diff --git a/packages/common/src/hdwallets.ts b/packages/common/src/hdwallets.ts index 4f42024cb..30656536b 100644 --- a/packages/common/src/hdwallets.ts +++ b/packages/common/src/hdwallets.ts @@ -19,18 +19,22 @@ export const getCommon = async ({ // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore const CommonConstructor: typeof Common = Common.default || Common + + const commonOptions = { + // Berlin is the minimum hardfork that will allow for EIP1559 + hardfork: Hardfork.Berlin, + // List of supported EIPS + eips: [1559] + } let common: Common try { common = new CommonConstructor({ chain: customNetwork || chainId, - // Berlin is the minimum hardfork that will allow for EIP1559 - hardfork: Hardfork.Berlin, - // List of supported EIPS - eips: [1559] + ...commonOptions }) } catch (e: any) { if (e.message && /Chain.*not supported/.test(e.message)) { - common = CommonConstructor.custom({ chainId }) + common = CommonConstructor.custom({ chainId }, commonOptions) } else { throw e } @@ -91,7 +95,11 @@ export const getHardwareWalletProvider = ( request: ({ method, params }) => fetch(getRpcUrl(), { method: 'POST', + headers: { + 'Content-Type': 'application/json' + }, body: JSON.stringify({ + jsonrpc: '2.0', id: '42', method, params diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts index 2ee0924ad..4a024f5c2 100644 --- a/packages/common/src/index.ts +++ b/packages/common/src/index.ts @@ -63,7 +63,11 @@ export { createEIP1193Provider } from './eip-1193' export { default as accountSelect } from './account-select' export { entryModal } from './entry-modal' export { SofiaProLight, SofiaProRegular, SofiaProSemiBold } from './fonts' -export { getCommon, bigNumberFieldsToStrings, getHardwareWalletProvider } from './hdwallets' +export { + getCommon, + bigNumberFieldsToStrings, + getHardwareWalletProvider +} from './hdwallets' export type { RequestPatch, diff --git a/packages/common/src/types.ts b/packages/common/src/types.ts index b6796de1b..c54fc3ddf 100644 --- a/packages/common/src/types.ts +++ b/packages/common/src/types.ts @@ -468,8 +468,8 @@ export interface BootstrapNode { } export interface RPCResponse { - id: number, + id: number jsonrpc: string - error?: { code: number, message: string} + error?: { code: number; message: string } result?: any -} \ No newline at end of file +} diff --git a/packages/core/package.json b/packages/core/package.json index 61e9ed797..813b33aba 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -41,7 +41,7 @@ "typescript": "^4.5.5" }, "dependencies": { - "@web3-onboard/common": "^2.1.3-alpha.1", + "@web3-onboard/common": "^2.1.3-alpha.2", "bignumber.js": "^9.0.0", "bnc-sdk": "^4.4.1", "bowser": "^2.11.0", diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts index 14724a3dd..f93df5820 100644 --- a/packages/core/src/types.ts +++ b/packages/core/src/types.ts @@ -71,9 +71,7 @@ interface ExposedActions { update: UpdateNotification } updateBalances: (addresses?: string[]) => Promise - updateAccountCenter: ( - update: AccountCenter | Partial - ) => void + updateAccountCenter: (update: AccountCenter | Partial) => void } export interface ConnectOptions { diff --git a/packages/dcent/package.json b/packages/dcent/package.json index f625f683c..6d296f879 100644 --- a/packages/dcent/package.json +++ b/packages/dcent/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/dcent", - "version": "2.0.3-alpha.1", + "version": "2.0.3-alpha.2", "description": "D'CENT module for web3-onboard", "module": "dist/index.js", "typings": "dist/index.d.ts", @@ -18,7 +18,7 @@ "typescript": "^4.5.5" }, "dependencies": { - "@web3-onboard/common": "^2.1.3-alpha.1", + "@web3-onboard/common": "^2.1.3-alpha.2", "@ethereumjs/common": "^2.6.1", "@ethereumjs/tx": "^3.4.0", "@ethersproject/providers": "^5.5.0", diff --git a/packages/demo/src/App.svelte b/packages/demo/src/App.svelte index 43ada5350..786d6d28c 100644 --- a/packages/demo/src/App.svelte +++ b/packages/demo/src/App.svelte @@ -139,6 +139,12 @@ label: 'Polygon', rpcUrl: 'https://matic-mainnet.chainstacklabs.com' }, + { + id: '0x13881', + token: 'MATIC', + label: 'Polygon - Mumbai', + rpcUrl: 'https://matic-mumbai.chainstacklabs.com ' + }, { id: '0xa', token: 'OETH', diff --git a/packages/fortmatic/package.json b/packages/fortmatic/package.json index a71eb142d..8b7cf1d5a 100644 --- a/packages/fortmatic/package.json +++ b/packages/fortmatic/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/fortmatic", - "version": "2.0.5-alpha.1", + "version": "2.0.5-alpha.2", "description": "Fortmatic module for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -20,7 +20,7 @@ "typescript": "^4.5.5" }, "dependencies": { - "@web3-onboard/common": "^2.1.3-alpha.1", + "@web3-onboard/common": "^2.1.3-alpha.2", "fortmatic": "^2.2.1" } } diff --git a/packages/gnosis/package.json b/packages/gnosis/package.json index 1051c88f2..58f3b8e10 100644 --- a/packages/gnosis/package.json +++ b/packages/gnosis/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/gnosis", - "version": "2.0.4-alpha.1", + "version": "2.0.4-alpha.2", "description": "Gnosis module for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -23,6 +23,6 @@ "dependencies": { "@gnosis.pm/safe-apps-provider": "^0.9.2", "@gnosis.pm/safe-apps-sdk": "^6.1.1", - "@web3-onboard/common": "^2.1.3-alpha.1" + "@web3-onboard/common": "^2.1.3-alpha.2" } } diff --git a/packages/injected/package.json b/packages/injected/package.json index 91cc9664a..170e9f0ed 100644 --- a/packages/injected/package.json +++ b/packages/injected/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/injected-wallets", - "version": "2.0.11-alpha.1", + "version": "2.0.11-alpha.2", "description": "Injected wallets module for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -25,7 +25,7 @@ "window": "^4.2.7" }, "dependencies": { - "@web3-onboard/common": "^2.1.3-alpha.1", + "@web3-onboard/common": "^2.1.3-alpha.2", "joi": "^17.4.2", "lodash.uniqby": "^4.7.0" } diff --git a/packages/keepkey/package.json b/packages/keepkey/package.json index 72e62f739..cc59bb966 100644 --- a/packages/keepkey/package.json +++ b/packages/keepkey/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/keepkey", - "version": "2.1.3-alpha.1", + "version": "2.1.3-alpha.2", "description": "KeepKey module for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -27,7 +27,7 @@ "@ethersproject/providers": "^5.5.0", "@shapeshiftoss/hdwallet-core": "^1.15.2", "@shapeshiftoss/hdwallet-keepkey-webusb": "^1.15.2", - "@web3-onboard/common": "^2.1.3-alpha.1", + "@web3-onboard/common": "^2.1.3-alpha.2", "ethereumjs-util": "^7.1.3" } } diff --git a/packages/keystone/package.json b/packages/keystone/package.json index 6b3ac789c..9f288d353 100644 --- a/packages/keystone/package.json +++ b/packages/keystone/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/keystone", - "version": "2.1.4-alpha.1", + "version": "2.1.4-alpha.2", "description": "Keystone module for web3-onboard", "module": "dist/index.js", "typings": "dist/index.d.ts", @@ -21,6 +21,6 @@ "@ethereumjs/tx": "^3.4.0", "@ethersproject/providers": "^5.5.0", "@keystonehq/eth-keyring": "^0.14.0-alpha.10.3", - "@web3-onboard/common": "^2.1.3-alpha.1" + "@web3-onboard/common": "^2.1.3-alpha.2" } } diff --git a/packages/ledger/package.json b/packages/ledger/package.json index 4dbe1db5e..fc38cb020 100644 --- a/packages/ledger/package.json +++ b/packages/ledger/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/ledger", - "version": "2.1.3-alpha.1", + "version": "2.1.3-alpha.2", "description": "Ledger module for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -27,7 +27,7 @@ "@ledgerhq/hw-transport-u2f": "^5.36.0-deprecated", "@ledgerhq/hw-transport-webusb": "^6.19.0", "@metamask/eth-sig-util": "^4.0.0", - "@web3-onboard/common": "^2.1.3-alpha.1", + "@web3-onboard/common": "^2.1.3-alpha.2", "buffer": "^6.0.3", "ethereumjs-util": "^7.1.3" } diff --git a/packages/ledger/src/index.ts b/packages/ledger/src/index.ts index fe08b23e4..31620eadf 100644 --- a/packages/ledger/src/index.ts +++ b/packages/ledger/src/index.ts @@ -222,7 +222,7 @@ function ledger({ return `0x${result['r']}${result['s']}${v}` }) } - + const ledgerProvider = getHardwareWalletProvider( () => currentChain?.rpcUrl ) diff --git a/packages/magic/package.json b/packages/magic/package.json index 3c1f216e0..466dfb797 100644 --- a/packages/magic/package.json +++ b/packages/magic/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/magic", - "version": "2.0.6-alpha.1", + "version": "2.0.6-alpha.2", "description": "Magic module for Onboard.js", "scripts": { "build": "rollup -c", @@ -42,7 +42,7 @@ "typescript": "^4.5.5" }, "dependencies": { - "@web3-onboard/common": "^2.1.3-alpha.1", + "@web3-onboard/common": "^2.1.3-alpha.2", "joi": "^17.4.2", "magic-sdk": "^8.1.0", "rxjs": "^7.5.2" diff --git a/packages/mew/package.json b/packages/mew/package.json index c517f3b86..3052d7402 100644 --- a/packages/mew/package.json +++ b/packages/mew/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/mew", - "version": "2.0.3-alpha.1", + "version": "2.0.3-alpha.2", "description": "MEW module for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -23,7 +23,7 @@ "@myetherwallet/mewconnect-web-client": "^2.2.0-beta.14" }, "dependencies": { - "@web3-onboard/common": "^2.1.3-alpha.1", + "@web3-onboard/common": "^2.1.3-alpha.2", "rxjs": "^7.5.2" } } diff --git a/packages/portis/package.json b/packages/portis/package.json index 695851b4b..1777d50bb 100644 --- a/packages/portis/package.json +++ b/packages/portis/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/portis", - "version": "2.0.3-alpha.1", + "version": "2.0.3-alpha.2", "description": "Portis module for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -21,6 +21,6 @@ }, "dependencies": { "@portis/web3": "^4.0.6", - "@web3-onboard/common": "^2.1.3-alpha.1" + "@web3-onboard/common": "^2.1.3-alpha.2" } } diff --git a/packages/react/package.json b/packages/react/package.json index aa7c4c805..51f2c94e8 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -24,7 +24,7 @@ }, "dependencies": { "@web3-onboard/core": "^2.3.1-alpha.4", - "@web3-onboard/common": "^2.1.3-alpha.1", + "@web3-onboard/common": "^2.1.3-alpha.2", "use-sync-external-store": "1.0.0" }, "peerDependencies": { diff --git a/packages/torus/package.json b/packages/torus/package.json index 64f0de25d..c33fa335f 100644 --- a/packages/torus/package.json +++ b/packages/torus/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/torus", - "version": "2.0.4-alpha.1", + "version": "2.0.4-alpha.2", "description": "Torus module for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -21,6 +21,6 @@ }, "dependencies": { "@toruslabs/torus-embed": "^1.18.3", - "@web3-onboard/common": "^2.1.3-alpha.1" + "@web3-onboard/common": "^2.1.3-alpha.2" } } diff --git a/packages/trezor/package.json b/packages/trezor/package.json index 8e4abdc79..1a17c1a4d 100644 --- a/packages/trezor/package.json +++ b/packages/trezor/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/trezor", - "version": "2.1.3-alpha.1", + "version": "2.1.3-alpha.2", "description": "Trezor module for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -22,7 +22,7 @@ "dependencies": { "@ethereumjs/tx": "^3.4.0", "@ethersproject/providers": "^5.5.0", - "@web3-onboard/common": "^2.1.3-alpha.1", + "@web3-onboard/common": "^2.1.3-alpha.2", "buffer": "^6.0.3", "eth-crypto": "^2.1.0", "ethereumjs-util": "^7.1.3", diff --git a/packages/vue/package.json b/packages/vue/package.json index 393951a16..a9468bd63 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -23,7 +23,7 @@ "dependencies": { "@vueuse/core": "^8.4.2", "@vueuse/rxjs": "^8.2.0", - "@web3-onboard/common": "^2.1.3-alpha.1", + "@web3-onboard/common": "^2.1.3-alpha.2", "@web3-onboard/core": "^2.3.1-alpha.4", "vue-demi": "^0.12.4" }, diff --git a/packages/walletconnect/package.json b/packages/walletconnect/package.json index a423622b3..b9d018d25 100644 --- a/packages/walletconnect/package.json +++ b/packages/walletconnect/package.json @@ -23,7 +23,7 @@ "@ethersproject/providers": "^5.5.0", "@walletconnect/client": "^1.7.1", "@walletconnect/qrcode-modal": "^1.7.1", - "@web3-onboard/common": "^2.1.3-alpha.1", + "@web3-onboard/common": "^2.1.3-alpha.2", "rxjs": "^7.5.2" } } diff --git a/packages/walletlink/package.json b/packages/walletlink/package.json index d89af33bb..35c492188 100644 --- a/packages/walletlink/package.json +++ b/packages/walletlink/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/walletlink", - "version": "2.0.3-alpha.1", + "version": "2.0.3-alpha.2", "description": "WalletLink module for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -20,7 +20,7 @@ "typescript": "^4.5.5" }, "dependencies": { - "@web3-onboard/common": "^2.1.3-alpha.1", + "@web3-onboard/common": "^2.1.3-alpha.2", "walletlink": "^2.5.0" } } diff --git a/packages/web3auth/package.json b/packages/web3auth/package.json index 89c54848b..b90ae344b 100644 --- a/packages/web3auth/package.json +++ b/packages/web3auth/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/web3auth", - "version": "2.0.2-alpha.1", + "version": "2.0.2-alpha.2", "description": "Web3Auth module for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -20,7 +20,7 @@ "typescript": "^4.5.5" }, "dependencies": { - "@web3-onboard/common": "^2.1.3-alpha.1", + "@web3-onboard/common": "^2.1.3-alpha.2", "@web3auth/web3auth": "^1.0.0" } }