Merge pull request #298 from oasisprotocol/ml/backport/oasis-web3-gateway

Use Oasis Web3 gateway

Author: lubej

.changelog/298.bugfix.md

@@ -0,0 +1 @@
+Backport update Web3 gateway

home/src/constants/wagmi-config.ts

@@ -1,30 +1,5 @@
 import { getDefaultConfig } from '@rainbow-me/rainbowkit'
-import { defineChain } from 'viem'
-import { sapphireTestnet } from 'viem/chains'
-
-export const SAPPHIRE_1RPC_CHAIN_CONFIG = defineChain({
-  id: 23294,
-  name: 'Oasis Sapphire',
-  network: 'sapphire',
-  nativeCurrency: { name: 'Sapphire Rose', symbol: 'ROSE', decimals: 18 },
-  rpcUrls: {
-    default: {
-      http: ['https://1rpc.io/oasis/sapphire'],
-    },
-  },
-  blockExplorers: {
-    default: {
-      name: 'Oasis Explorer',
-      url: 'https://explorer.oasis.io/mainnet/sapphire',
-    },
-  },
-  contracts: {
-    multicall3: {
-      address: '0xcA11bde05977b3631167028862bE2a173976CA11',
-      blockCreated: 734531,
-    },
-  },
-})
+import { sapphire, sapphireTestnet } from 'viem/chains'
 
 const { VITE_WALLET_CONNECT_PROJECT_ID, PROD } = import.meta.env
 
@@ -37,7 +12,7 @@ declare module 'wagmi' {
 export const wagmiConfig: ReturnType<typeof getDefaultConfig> = getDefaultConfig({
   appName: 'ROSE Stake',
   projectId: VITE_WALLET_CONNECT_PROJECT_ID,
-  chains: [PROD ? SAPPHIRE_1RPC_CHAIN_CONFIG : sapphireTestnet],
+  chains: [PROD ? sapphire : sapphireTestnet],
   ssr: false,
   batch: {
     multicall: false,

stake/src/constants/config.ts

@@ -1,77 +1,9 @@
-import { Chain, defineChain } from 'viem'
-
-export const SAPPHIRE_CHAIN_CONFIG = defineChain({
-  id: 23294,
-  name: 'Oasis Sapphire',
-  network: 'sapphire',
-  nativeCurrency: { name: 'Sapphire Rose', symbol: 'ROSE', decimals: 18 },
-  rpcUrls: {
-    default: {
-      http: ['https://sapphire.oasis.io'],
-      webSocket: ['wss://sapphire.oasis.io/ws'],
-    },
-  },
-  blockExplorers: {
-    default: {
-      name: 'Oasis Explorer',
-      url: 'https://explorer.oasis.io/mainnet/sapphire',
-    },
-  },
-  contracts: {
-    multicall3: {
-      address: '0xcA11bde05977b3631167028862bE2a173976CA11',
-      blockCreated: 734531,
-    },
-  },
-})
-
-export const SAPPHIRE_1RPC_CHAIN_CONFIG = defineChain({
-  id: 23294,
-  name: 'Oasis Sapphire',
-  network: 'sapphire',
-  nativeCurrency: { name: 'Sapphire Rose', symbol: 'ROSE', decimals: 18 },
-  rpcUrls: {
-    default: {
-      http: ['https://1rpc.io/oasis/sapphire'],
-    },
-  },
-  blockExplorers: {
-    default: {
-      name: 'Oasis Explorer',
-      url: 'https://explorer.oasis.io/mainnet/sapphire',
-    },
-  },
-  contracts: {
-    multicall3: {
-      address: '0xcA11bde05977b3631167028862bE2a173976CA11',
-      blockCreated: 734531,
-    },
-  },
-})
-
-export const SAPPHIRE_TESTNET_CHAIN_CONFIG = defineChain({
-  id: 23295,
-  name: 'Oasis Sapphire Testnet',
-  network: 'sapphire-testnet',
-  nativeCurrency: { name: 'Sapphire Test Rose', symbol: 'TEST', decimals: 18 },
-  rpcUrls: {
-    default: {
-      http: ['https://testnet.sapphire.oasis.dev'],
-      webSocket: ['wss://testnet.sapphire.oasis.dev/ws'],
-    },
-  },
-  blockExplorers: {
-    default: {
-      name: 'Oasis Explorer',
-      url: 'https://explorer.oasis.io/testnet/sapphire',
-    },
-  },
-  testnet: true,
-})
+import { Chain } from 'viem'
+import { sapphire, sapphireTestnet } from 'viem/chains'
 
 export const SUPPORTED_CHAIN_IDS: Record<number, Chain> = {
-  [23294]: SAPPHIRE_1RPC_CHAIN_CONFIG,
-  [23295]: SAPPHIRE_TESTNET_CHAIN_CONFIG,
+  [23294]: sapphire,
+  [23295]: sapphireTestnet,
 }
 
 export const NEXUS_BASE_URL_CONFIG: Map<number, string> = new Map([

stake/src/providers/Web3Provider.tsx

@@ -1,27 +1,16 @@
 import { FC, PropsWithChildren, useEffect, useState } from 'react'
-import {
-  GAS_LIMIT_STAKE,
-  GAS_LIMIT_UNSTAKE,
-  SAPPHIRE_1RPC_CHAIN_CONFIG,
-  SAPPHIRE_CHAIN_CONFIG,
-  SAPPHIRE_TESTNET_CHAIN_CONFIG,
-  SUPPORTED_CHAIN_IDS,
-} from '../constants/config'
+import { GAS_LIMIT_STAKE, GAS_LIMIT_UNSTAKE, SUPPORTED_CHAIN_IDS } from '../constants/config'
 import { Web3Context, Web3ProviderContext, Web3ProviderState } from './Web3Context'
 import { consensusDelegate, consensusUndelegate } from '@oasisprotocol/rose-app-subcall'
 import { useAccount, usePublicClient } from 'wagmi'
 import { TransactionRequestLegacy, createPublicClient, http, PublicClient } from 'viem'
+import { sapphire, sapphireTestnet } from 'viem/chains'
 
 const { PROD } = import.meta.env
 
-/* eslint-disable indent */
 const clients: PublicClient[] = PROD
-  ? [
-      createPublicClient({ chain: SAPPHIRE_1RPC_CHAIN_CONFIG, transport: http() }),
-      createPublicClient({ chain: SAPPHIRE_CHAIN_CONFIG, transport: http() }),
-    ]
-  : [createPublicClient({ chain: SAPPHIRE_TESTNET_CHAIN_CONFIG, transport: http() })]
-/* eslint-enable indent */
+  ? [createPublicClient({ chain: sapphire, transport: http() })]
+  : [createPublicClient({ chain: sapphireTestnet, transport: http() })]
 
 const web3ProviderInitialState: Web3ProviderState = {
   explorerBaseUrl: null,