Merge remote-tracking branch 'upstream/develop' into feature/arcana-auth

blocknative · Aug 2, 2023 · c789e7e · c789e7e
2 parents 5fde9ac + 595b416
commit c789e7e
Show file tree

Hide file tree

Showing 19 changed files with 138 additions and 142 deletions.
diff --git a/.github/workflows/issue-to-notion.yml b/.github/workflows/issue-to-notion.yml
@@ -21,7 +21,7 @@ jobs:
           STATE: ${{ github.event.issue.state }}
           ISSUE_URL: ${{ github.event.issue.html_url }}
           TITLE: ${{ github.event.issue.title }}
-          FLAG: Next Sprint,Github
+          FLAG: Next Sprint
           DATABASE_NAME: Product
           STATUS: Backlog
           # Product Work Board

diff --git a/docs/src/routes/docs/[...4]wallets/[...11]injected/+page.md b/docs/src/routes/docs/[...4]wallets/[...11]injected/+page.md
@@ -336,6 +336,7 @@ const injected = injectedModule({
 - Talisman - _Desktop_
 - OneKey - _Desktop & Mobile_
 - Fordefi - _Desktop_
+- Ronin Wallet - _Desktop & Mobile_
 
 ## Build Environments
 

diff --git a/examples/with-ledger/yarn.lock b/examples/with-ledger/yarn.lock
@@ -3826,9 +3826,9 @@ which@^2.0.1:
     isexe "^2.0.0"
 
 word-wrap@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
+  integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
 
 wrap-ansi@^6.2.0:
   version "6.2.0"

diff --git a/examples/with-nextjs/yarn.lock b/examples/with-nextjs/yarn.lock
@@ -2880,9 +2880,9 @@ which@^2.0.1:
     isexe "^2.0.0"
 
 word-wrap@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
+  integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
 
 wrappy@1:
   version "1.0.2"

diff --git a/examples/with-sveltekit/yarn.lock b/examples/with-sveltekit/yarn.lock
@@ -4035,9 +4035,9 @@ which@^2.0.1:
     isexe "^2.0.0"
 
 word-wrap@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
+  integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
 
 wrap-ansi@^5.1.0:
   version "5.1.0"

diff --git a/examples/with-vuejs/yarn.lock b/examples/with-vuejs/yarn.lock
@@ -2234,9 +2234,9 @@ which@^2.0.1:
     isexe "^2.0.0"
 
 word-wrap@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
+  integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
 
 wrappy@1:
   version "1.0.2"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "web3-onboard-monorepo",
-  "version": "2.24.5",
+  "version": "2.24.6",
   "private": true,
   "workspaces": {
     "packages": [

diff --git a/packages/demo/package.json b/packages/demo/package.json
@@ -37,10 +37,10 @@
     "@web3-onboard/gas": "^2.1.7",
     "@web3-onboard/gnosis": "^2.1.9",
     "@web3-onboard/infinity-wallet": "^2.0.3",
-    "@web3-onboard/injected-wallets": "^2.10.2",
+    "@web3-onboard/injected-wallets": "^2.10.4",
     "@web3-onboard/keepkey": "^2.3.7",
     "@web3-onboard/keystone": "^2.3.7",
-    "@web3-onboard/ledger": "^2.5.1",
+    "@web3-onboard/ledger": "^2.5.2",
     "@web3-onboard/magic": "^2.1.6",
     "@web3-onboard/mew-wallet": "^2.0.3",
     "@web3-onboard/phantom": "^2.0.3",
@@ -51,9 +51,9 @@
     "@web3-onboard/transaction-preview": "^2.0.7",
     "@web3-onboard/trezor": "^2.4.2",
     "@web3-onboard/trust": "^2.0.3",
-    "@web3-onboard/uauth": "^2.1.1",
+    "@web3-onboard/uauth": "^2.1.2",
     "@web3-onboard/venly": "^2.0.0",
-    "@web3-onboard/walletconnect": "^2.4.3",
+    "@web3-onboard/walletconnect": "^2.4.4",
     "@web3-onboard/web3auth": "^2.2.2",
     "@web3-onboard/xdefi": "^2.0.3",
     "@web3-onboard/zeal": "^2.0.3",

diff --git a/packages/injected/package.json b/packages/injected/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/injected-wallets",
-  "version": "2.10.3",
+  "version": "2.10.4",
   "description": "Injected wallet module for connecting browser extension and mobile wallets to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
   "keywords": [
     "Ethereum",

diff --git a/packages/injected/src/constants.ts b/packages/injected/src/constants.ts
@@ -28,5 +28,6 @@ export const WALLET_NAMES: { [key: string]: string } = {
   safeheron: 'Safeheron',
   talismanEth: 'Talisman',
   onekey: 'OneKey',
-  fordefi: 'Fordefi'
+  fordefi: 'Fordefi',
+  roninWallet: 'Ronin Wallet'
 }
diff --git a/packages/injected/src/icons/roninwallet.ts b/packages/injected/src/icons/roninwallet.ts
@@ -0,0 +1,6 @@
+export default `
+<svg width="160" height="160" viewBox="0 0 160 160" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.9333 12.3081V111.019C22.9345 112.863 23.3498 114.683 24.1487 116.345C24.9476 118.006 26.1096 119.467 27.5489 120.62L74.089 157.975C75.7263 159.286 77.7611 160 79.8585 160C81.9558 160 83.9906 159.286 85.6279 157.975L132.168 120.62C133.607 119.467 134.769 118.006 135.568 116.345C136.367 114.683 136.782 112.863 136.784 111.019V12.3081C136.784 9.04382 135.487 5.91319 133.179 3.60497C130.87 1.29675 127.74 0 124.475 0H35.2415C31.9771 0 28.8465 1.29675 26.5383 3.60497C24.2301 5.91319 22.9333 9.04382 22.9333 12.3081V12.3081Z" fill="#1273EA"/>
+<path d="M118.321 55.3866V30.7703C118.321 27.506 117.025 24.3754 114.716 22.0672C112.408 19.759 109.278 18.4622 106.013 18.4622H53.7037C50.4393 18.4622 47.3087 19.759 45.0005 22.0672C42.6923 24.3754 41.3955 27.506 41.3955 30.7703V102.196C41.3967 104.04 41.812 105.86 42.6109 107.521C43.4098 109.183 44.5718 110.644 46.0111 111.796L65.0579 127.089C65.284 127.273 65.5575 127.388 65.8467 127.422C66.1358 127.456 66.4287 127.408 66.6913 127.282C66.9539 127.157 67.1755 126.959 67.3303 126.712C67.4851 126.466 67.5667 126.18 67.5657 125.889V75.3873C67.5657 74.9793 67.7278 74.588 68.0163 74.2994C68.3049 74.0109 68.6962 73.8488 69.1042 73.8488H82.9509C85.3991 73.8488 87.7471 74.8214 89.4783 76.5525C91.2094 78.2837 92.182 80.6317 92.182 83.0799V125.889C92.1822 126.179 92.2642 126.463 92.4186 126.708C92.573 126.953 92.7935 127.15 93.0547 127.275C93.316 127.401 93.6073 127.45 93.8952 127.417C94.1831 127.384 94.4559 127.27 94.6821 127.089L113.729 111.796C115.168 110.644 116.33 109.183 117.129 107.521C117.928 105.86 118.343 104.04 118.344 102.196V80.0029C118.344 76.7386 117.048 73.6079 114.739 71.2997C112.431 68.9915 109.301 67.6947 106.036 67.6947C109.297 67.6886 112.421 66.3892 114.725 64.0816C117.028 61.7741 118.321 58.6469 118.321 55.3866V55.3866ZM82.9355 61.5407H69.0888C68.6808 61.5407 68.2895 61.3786 68.0009 61.0901C67.7124 60.8015 67.5503 60.4102 67.5503 60.0022V32.3089C67.5503 31.9008 67.7124 31.5095 68.0009 31.221C68.2895 30.9324 68.6808 30.7703 69.0888 30.7703H90.6281C91.0361 30.7703 91.4274 30.9324 91.716 31.221C92.0045 31.5095 92.1666 31.9008 92.1666 32.3089V52.3096C92.1666 54.7578 91.194 57.1058 89.4629 58.837C87.7317 60.5681 85.3837 61.5407 82.9355 61.5407V61.5407Z" fill="white"/>
+</svg>
+`
diff --git a/packages/injected/src/types.ts b/packages/injected/src/types.ts
@@ -86,6 +86,7 @@ export enum ProviderExternalUrl {
   Talisman = 'https://www.talisman.xyz/',
   Trust = 'https://trustwallet.com/download/',
   OneKey = 'https://onekey.so/download/',
+  RoninWallet = 'https://wallet.skymavis.com/',
 }
 
 export enum ProviderLabel {
@@ -141,6 +142,7 @@ export enum ProviderLabel {
   Talisman = 'Talisman',
   OneKey = 'OneKey',
   Fordefi = 'Fordefi',
+  RoninWallet = 'Ronin Wallet'
 }
 
 export interface MeetOneProvider extends ExternalProvider {
@@ -173,7 +175,8 @@ export enum InjectedNameSpace {
   DeFiConnectProvider = 'deficonnectProvider',
   Safeheron = 'safeheron',
   Talisman = 'talismanEth',
-  OneKey = '$onekey'
+  OneKey = '$onekey',
+  RoninWallet = 'ronin'
 }
 
 export interface CustomWindow extends Window {
@@ -212,6 +215,9 @@ export interface CustomWindow extends Window {
   talismanEth: InjectedProvider
   $onekey: {
     ethereum: InjectedProvider
+  },
+  ronin: {
+    provider: InjectedProvider
   }
 }
 

diff --git a/packages/injected/src/wallets.ts b/packages/injected/src/wallets.ts
@@ -786,6 +786,18 @@ const talisman: InjectedWalletModule = {
   externalUrl: ProviderExternalUrl.Talisman
 }
 
+const ronin: InjectedWalletModule = {
+  label: ProviderLabel.RoninWallet,
+  injectedNamespace: InjectedNameSpace.RoninWallet,
+  checkProviderIdentity: ({ provider }) => !!provider,
+  getIcon: async () => (await import('./icons/roninwallet.js')).default,
+  getInterface: async () => ({
+    provider: createEIP1193Provider(window.ronin.provider)
+  }),
+  platforms: ['all'],
+  externalUrl: ProviderExternalUrl.RoninWallet
+}
+
 const onekey: InjectedWalletModule = {
   label: ProviderLabel.OneKey,
   injectedNamespace: InjectedNameSpace.OneKey,
@@ -863,7 +875,8 @@ const wallets = [
   safeheron,
   talisman,
   onekey,
-  fordefi
+  fordefi,
+  ronin
 ]
 
 export default wallets
diff --git a/packages/ledger/package.json b/packages/ledger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/ledger",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "Ledger hardware wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardized spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
   "keywords": [
     "Ethereum",
@@ -62,8 +62,8 @@
     "@ethersproject/providers": "5.5.0",
     "@ledgerhq/connect-kit-loader": "^1.1.0",
     "@walletconnect/client": "^1.8.0",
-    "@walletconnect/ethereum-provider": "2.9.0",
-    "@walletconnect/modal": "2.5.9",
+    "@walletconnect/ethereum-provider": "2.9.1",
+    "@walletconnect/modal": "2.6.1",
     "@web3-onboard/common": "^2.3.3",
     "rxjs": "^7.5.2"
   }

diff --git a/packages/uauth/package.json b/packages/uauth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/uauth",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "description": "Unstoppable Domains module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
   "keywords": [
     "Ethereum",
@@ -65,8 +65,8 @@
     "@uauth/js": "^2.4.0",
     "@ethersproject/providers": "^5.5.0",
     "@walletconnect/client": "^1.8.0",
-    "@walletconnect/ethereum-provider": "2.9.0",
-    "@walletconnect/modal": "2.5.9",
+    "@walletconnect/ethereum-provider": "2.9.1",
+    "@walletconnect/modal": "2.6.1",
     "@walletconnect/qrcode-modal": "^1.8.0",
     "@web3-onboard/common": "^2.3.3",
     "joi": "17.9.1",

diff --git a/packages/walletconnect/package.json b/packages/walletconnect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@web3-onboard/walletconnect",
-  "version": "2.4.3",
+  "version": "2.4.4",
   "description": "WalletConnect SDK module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.",
   "keywords": [
     "Ethereum",
@@ -61,8 +61,8 @@
   "dependencies": {
     "@ethersproject/providers": "5.5.0",
     "@walletconnect/client": "^1.8.0",
-    "@walletconnect/ethereum-provider": "2.9.0",
-    "@walletconnect/modal": "2.6.0",
+    "@walletconnect/ethereum-provider": "2.9.1",
+    "@walletconnect/modal": "2.6.1",
     "@walletconnect/qrcode-modal": "^1.8.0",
     "@web3-onboard/common": "^2.3.3",
     "joi": "17.9.1",

diff --git a/packages/walletconnect/src/v2.ts b/packages/walletconnect/src/v2.ts
@@ -93,7 +93,7 @@ function walletConnect(options: WalletConnectOptions): WalletInit {
             ? // @ts-ignore
               // Required as WC package does not support hex numbers
               requiredChains.map(chainID => parseInt(chainID))
-            : [1]
+            : []
 
         // Defaults to the chains provided within the web3-onboard init chain property
         const optionalChainsParsed: number[] =

diff --git a/test/yarn.lock b/test/yarn.lock
@@ -11655,9 +11655,9 @@ window-size@^0.2.0:
   integrity sha512-UD7d8HFA2+PZsbKyaOCEy8gMh1oDtHgJh1LfgjQ4zVXmYjAT/kvz3PueITKuqDiIXQe7yzpPnxX3lNc+AhQMyw==
 
 word-wrap@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
+  integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
 
 wrap-ansi@^2.0.0:
   version "2.1.0"