Use wagmi client and new web3Modal implementation

pull/3674/head
ioedeveloper 2 years ago committed by Aniket
parent 6e26aa732a
commit f4762b92df
  1. 10
      apps/wallet-connect/project.json
  2. BIN
      apps/wallet-connect/public/favicon.ico
  3. 42
      apps/wallet-connect/public/index.html
  4. BIN
      apps/wallet-connect/public/logo.png
  5. 20
      apps/wallet-connect/public/manifest.json
  6. 3
      apps/wallet-connect/public/robots.txt
  7. 34
      apps/wallet-connect/src/app/app.tsx
  8. 183
      apps/wallet-connect/src/services/RemixClient.js
  9. 103
      apps/wallet-connect/src/services/RemixClient.ts
  10. 1
      apps/wallet-connect/src/services/constant.ts
  11. 141
      apps/wallet-connect/src/services/serviceWorker.js
  12. 113
      apps/wallet-connect/webpack.config.js
  13. 5
      package.json
  14. 1723
      yarn.lock

@ -17,11 +17,8 @@
"main": "apps/wallet-connect/src/main.tsx", "main": "apps/wallet-connect/src/main.tsx",
"polyfills": "apps/wallet-connect/src/polyfills.ts", "polyfills": "apps/wallet-connect/src/polyfills.ts",
"tsConfig": "apps/wallet-connect/tsconfig.app.json", "tsConfig": "apps/wallet-connect/tsconfig.app.json",
"assets": [ "assets": [],
"apps/wallet-connect/src/favicon.ico", "styles": ["apps/wallet-connect/src/css/app.css", "apps/wallet-connect/src/css/index.css"],
"apps/wallet-connect/src/assets"
],
"styles": ["apps/wallet-connect/src/styles.css"],
"scripts": [], "scripts": [],
"webpackConfig": "apps/wallet-connect/webpack.config.js" "webpackConfig": "apps/wallet-connect/webpack.config.js"
}, },
@ -47,7 +44,8 @@
}, },
"configurations": { "configurations": {
"development": { "development": {
"buildTarget": "wallet-connect:build:development" "buildTarget": "wallet-connect:build:development",
"port": 2023
}, },
"production": { "production": {
"buildTarget": "wallet-connect:build:production" "buildTarget": "wallet-connect:build:production"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 108 KiB

@ -1,42 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta
name="description"
content="Remix"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>Remix</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

@ -1,20 +0,0 @@
{
"short_name": "React App",
"name": "Create React App Sample",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
},
{
"src": "logo.png",
"type": "image/png",
"sizes": "420x400"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
}

@ -1,3 +0,0 @@
# https://www.robotstxt.org/robotstxt.html
User-agent: *
Disallow:

@ -1,10 +1,16 @@
import React from 'react' import React from 'react'
import '../css/app'; import '../css/app.css'
import '@fortawesome/fontawesome-free/css/all.css' import '@fortawesome/fontawesome-free/css/all.css'
import { RemixClient, INFURA_ID_KEY } from '../services/RemixClient' import { PROJECT_ID } from '../services/constant'
import { EthereumClient } from '@web3modal/ethereum'
import { Web3Button, Web3Modal } from '@web3modal/react'
import { WagmiConfig } from 'wagmi'
import { RemixClient } from '../services/RemixClient'
const p = new RemixClient() const p = new RemixClient()
function App() { const ethereumClient = new EthereumClient(p.wagmiClient, p.chains)
function App() {
const openModal = () => { const openModal = () => {
p.onConnect() p.onConnect()
} }
@ -13,9 +19,9 @@ function App() {
p.onDisconnect() p.onDisconnect()
} }
const showButtons = (connected = true) =>{ const showButtons = (connected = true) => {
document.getElementById("disconnectbtn").style.display = document.getElementById("accounts-container").style.display = connected? 'block':'none'; document.getElementById("disconnectbtn").style.display = document.getElementById("accounts-container").style.display = connected? 'block':'none'
document.getElementById("connectbtn").style.display = connected? 'none':'block'; document.getElementById("connectbtn").style.display = connected? 'none':'block'
} }
p.internalEvents.on('accountsChanged', (accounts) => { p.internalEvents.on('accountsChanged', (accounts) => {
@ -35,12 +41,13 @@ function App() {
document.getElementById('chain').innerHTML = '' document.getElementById('chain').innerHTML = ''
showButtons(false) showButtons(false)
}) })
return ( return (
<div className="App"> <div className="App">
<div className="btn-group-vertical mt-5 w-25" role="group"> <div className="btn-group-vertical mt-5 w-25" role="group">
<div class="text-center w-100"> <div className="text-center w-100">
<i class="fas fa-info-circle mr-2 bg-light" title="Wallet connect reuire an infura id in order to make request to the network."/><a target="_blank" href="https://infura.io/dashboard/ethereum">infura settings</a> <i className="fas fa-info-circle mr-2 bg-light" title="Wallet connect reuire an infura id in order to make request to the network."/><a target="_blank" href="https://infura.io/dashboard/ethereum">Walletconnect cloud settings</a>
<input onChange={(e) => { localStorage.setItem(INFURA_ID_KEY, e.target.value)}} id="input-infura-id" placeholder="Infura Id" className="mt-2 mb-2 ml-2"></input> <input onChange={(e) => {}} id="walletconnect-project-id" placeholder="Project Id" className="mt-2 mb-2 ml-2"></input>
</div> </div>
<button id="connectbtn" type="button" onClick={openModal} className="btn btn-primary">Connect to a wallet</button> <button id="connectbtn" type="button" onClick={openModal} className="btn btn-primary">Connect to a wallet</button>
<button id="disconnectbtn" type="button" onClick={disconnect} className="btn btn-primary mt-2">Disconnect</button> <button id="disconnectbtn" type="button" onClick={disconnect} className="btn btn-primary mt-2">Disconnect</button>
@ -49,8 +56,15 @@ function App() {
<div><label><b>Accounts: </b></label><br></br><ul className="list-group list-group-flush" id="accounts"></ul></div> <div><label><b>Accounts: </b></label><br></br><ul className="list-group list-group-flush" id="accounts"></ul></div>
<div><label><b>Network: </b></label><label className="ml-1" id="chain"> - </label></div> <div><label><b>Network: </b></label><label className="ml-1" id="chain"> - </label></div>
</div> </div>
{ p.wagmiClient &&
<WagmiConfig client={p.wagmiClient}>
<Web3Button />
</WagmiConfig>
}
{ ethereumClient && <Web3Modal projectId={PROJECT_ID} ethereumClient={ethereumClient} /> }
</div> </div>
); )
} }
export default App export default App

@ -1,183 +0,0 @@
import {
PluginClient
} from '@remixproject/plugin';
import {
createClient
} from '@remixproject/plugin-webview';
import WalletConnectProvider from "@walletconnect/web3-provider";
import Torus from "@toruslabs/torus-embed";
import Authereum from "authereum";
import Web3Modal, { local } from "web3modal";
import BurnerConnectProvider from "@burner-wallet/burner-connect-provider";
import MewConnect from "@myetherwallet/mewconnect-web-client";
import EventManager from "events"
export const INFURA_ID_KEY = 'walletconnect-infura-id'
export class RemixClient extends PluginClient {
provider
constructor() {
super();
createClient(this);
this.methods = ["sendAsync"];
this.internalEvents = new EventManager()
this.onload()
}
/**
* Connect wallet button pressed.
*/
async onConnect() {
try {
this.web3Modal = new Web3Modal({
providerOptions: this.getProviderOptions() // required
})
this.provider = await this.web3Modal.connect();
} catch (e) {
console.error("Could not get a wallet connection", e);
return;
}
this.internalEvents.emit('accountsChanged', this.provider.accounts || [])
this.internalEvents.emit('chainChanged', await this.detectNetwork(this.provider.chainId))
// Subscribe to accounts change
this.provider.on("accountsChanged", (accounts) => {
this.internalEvents.emit('accountsChanged', accounts || [])
});
// Subscribe to chainId change
this.provider.on("chainChanged", async (chainId) => {
this.internalEvents.emit('chainChanged', await this.detectNetwork(chainId))
});
// Subscribe to networkId change
this.provider.on("networkChanged", (networkId) => {
this.internalEvents.emit('networkChanged', networkId)
});
// Subscribe to networkId change
this.provider.on("disconnect", () => {
this.internalEvents.emit('disconnect')
});
}
async detectNetwork(id) {
let networkName = null;
id = parseInt(id)
// https://github.com/ethereum/EIPs/blob/master/EIPS/eip-155.md
if (id === 1) networkName = "Main";
else if (id === 2) networkName = "Morden (deprecated)";
else if (id === 3) networkName = "Ropsten";
else if (id === 4) networkName = "Rinkeby";
else if (id === 5) networkName = "Goerli";
else if (id === 42) networkName = "Kovan";
else networkName = "Custom";
return networkName
}
getInfuraId () {
return localStorage.getItem(INFURA_ID_KEY)
}
/**
* Disconnect wallet button pressed.
*/
async onDisconnect() {
this.web3Modal = null
// TODO: Which providers have close method?
if (this.provider && this.provider.close) {
await this.provider.close();
// If the cached provider is not cleared,
// WalletConnect will default to the existing session
// and does not allow to re-scan the QR code with a new wallet.
// Depending on your use case you may want or want not his behavir.
await this.web3Modal.clearCachedProvider();
this.provider = null;
} else {
this.internalEvents.emit('disconnect')
}
}
getProviderOptions() {
const providerOptions = {
walletconnect: {
package: WalletConnectProvider,
options: {
infuraId: this.getInfuraId(),
bridge: 'https://wallet-connect-bridge.dyn.plugin.remixproject.org:8080/'
}
},
torus: {
package: Torus, // required
options: {}
},
authereum: {
package: Authereum
},
burnerconnect: {
package: BurnerConnectProvider, // required
options: {
defaultNetwork: "100"
}
},
mewconnect: {
package: MewConnect, // required
options: {
infuraId: this.getInfuraId() // required
}
}
/*,
fortmatic: {
package: Fortmatic,
options: {
key: process.env.REACT_APP_FORTMATIC_KEY
}
},
authereum: {
package: Authereum
},
portis: {
package: Portis, // required
options: {
id: "PORTIS_ID" // required
}
},
squarelink: {
package: Squarelink, // required
options: {
id: "SQUARELINK_ID" // required
}
},
arkane: {
package: Arkane, // required
options: {
clientId: "ARKANE_CLIENT_ID" // required
}
},
dcentwallet: {
package: DcentProvider, // required
options: {
rpcUrl: "INSERT_RPC_URL" // required
}
}*/
};
return providerOptions;
};
sendAsync = (data) => {
return new Promise((resolve, reject) => {
if (this.provider) {
this.provider.sendAsync(data, (error, message) => {
if (error) return reject(error)
resolve(message)
})
} else {
resolve({"jsonrpc": "2.0", "result": [], "id": data.id})
}
})
}
}

@ -0,0 +1,103 @@
import { PluginClient } from '@remixproject/plugin'
import { createClient } from '@remixproject/plugin-webview'
import { w3mConnectors, w3mProvider } from '@web3modal/ethereum'
import { configureChains, createClient as wagmiCreateClient } from 'wagmi'
import { arbitrum, mainnet, polygon, Chain } from 'wagmi/chains'
import EventManager from 'events'
import { PROJECT_ID } from './constant'
export class RemixClient extends PluginClient {
internalEvents: EventManager
wagmiClient
chains: Chain[]
constructor() {
super()
createClient(this)
this.methods = ["sendAsync"]
this.internalEvents = new EventManager()
this.onload()
}
/**
* Connect wallet button pressed.
*/
async onConnect() {
try {
this.chains = [arbitrum, mainnet, polygon]
const { provider } = configureChains(this.chains, [w3mProvider({ projectId: PROJECT_ID })])
this.wagmiClient = wagmiCreateClient({
autoConnect: true,
connectors: w3mConnectors({ projectId: PROJECT_ID, version: 1, chains: this.chains }),
provider
})
this.internalEvents.emit('accountsChanged', this.wagmiClient.provider.accounts || [])
this.internalEvents.emit('chainChanged', await this.detectNetwork(this.wagmiClient.provider.chainId))
// Subscribe to accounts change
this.wagmiClient.provider.on("accountsChanged", (accounts) => {
this.internalEvents.emit('accountsChanged', accounts || [])
})
// Subscribe to chainId change
this.wagmiClient.provider.on("chainChanged", async (chainId) => {
this.internalEvents.emit('chainChanged', await this.detectNetwork(chainId))
})
// Subscribe to networkId change
this.wagmiClient.provider.on("networkChanged", (networkId) => {
this.internalEvents.emit('networkChanged', networkId)
})
// Subscribe to networkId change
this.wagmiClient.provider.on("disconnect", () => {
this.internalEvents.emit('disconnect')
})
} catch (e) {
return console.error("Could not get a wallet connection", e)
}
}
async detectNetwork(id) {
let networkName = null
id = parseInt(id)
// https://github.com/ethereum/EIPs/blob/master/EIPS/eip-155.md
if (id === 1) networkName = "Main"
else if (id === 2) networkName = "Morden (deprecated)"
else if (id === 3) networkName = "Ropsten"
else if (id === 4) networkName = "Rinkeby"
else if (id === 5) networkName = "Goerli"
else if (id === 42) networkName = "Kovan"
else networkName = "Custom"
return networkName
}
/**
* Disconnect wallet button pressed.
*/
async onDisconnect() {
// TODO: Which providers have close method?
if (this.wagmiClient.provider && this.wagmiClient.provider.close) {
await this.wagmiClient.provider.close()
this.wagmiClient.provider = null
} else {
this.internalEvents.emit('disconnect')
}
}
sendAsync = (data) => {
return new Promise((resolve, reject) => {
if (this.wagmiClient.provider) {
this.wagmiClient.provider.sendAsync(data, (error, message) => {
if (error) return reject(error)
resolve(message)
})
} else {
resolve({"jsonrpc": "2.0", "result": [], "id": data.id})
}
})
}
}

@ -0,0 +1 @@
export const PROJECT_ID = 'a4ba105e642ae64cdb5b9a86debc0a66'

@ -1,141 +0,0 @@
// This optional code is used to register a service worker.
// register() is not called by default.
// This lets the app load faster on subsequent visits in production, and gives
// it offline capabilities. However, it also means that developers (and users)
// will only see deployed updates on subsequent visits to a page, after all the
// existing tabs open on the page have been closed, since previously cached
// resources are updated in the background.
// To learn more about the benefits of this model and instructions on how to
// opt-in, read https://bit.ly/CRA-PWA
const isLocalhost = Boolean(
window.location.hostname === 'localhost' ||
// [::1] is the IPv6 localhost address.
window.location.hostname === '[::1]' ||
// 127.0.0.0/8 are considered localhost for IPv4.
window.location.hostname.match(
/^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
)
);
export function register(config) {
if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
// The URL constructor is available in all browsers that support SW.
const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
if (publicUrl.origin !== window.location.origin) {
// Our service worker won't work if PUBLIC_URL is on a different origin
// from what our page is served on. This might happen if a CDN is used to
// serve assets; see https://github.com/facebook/create-react-app/issues/2374
return;
}
window.addEventListener('load', () => {
const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
if (isLocalhost) {
// This is running on localhost. Let's check if a service worker still exists or not.
checkValidServiceWorker(swUrl, config);
// Add some additional logging to localhost, pointing developers to the
// service worker/PWA documentation.
navigator.serviceWorker.ready.then(() => {
console.log(
'This web app is being served cache-first by a service ' +
'worker. To learn more, visit https://bit.ly/CRA-PWA'
);
});
} else {
// Is not localhost. Just register service worker
registerValidSW(swUrl, config);
}
});
}
}
function registerValidSW(swUrl, config) {
navigator.serviceWorker
.register(swUrl)
.then(registration => {
registration.onupdatefound = () => {
const installingWorker = registration.installing;
if (installingWorker == null) {
return;
}
installingWorker.onstatechange = () => {
if (installingWorker.state === 'installed') {
if (navigator.serviceWorker.controller) {
// At this point, the updated precached content has been fetched,
// but the previous service worker will still serve the older
// content until all client tabs are closed.
console.log(
'New content is available and will be used when all ' +
'tabs for this page are closed. See https://bit.ly/CRA-PWA.'
);
// Execute callback
if (config && config.onUpdate) {
config.onUpdate(registration);
}
} else {
// At this point, everything has been precached.
// It's the perfect time to display a
// "Content is cached for offline use." message.
console.log('Content is cached for offline use.');
// Execute callback
if (config && config.onSuccess) {
config.onSuccess(registration);
}
}
}
};
};
})
.catch(error => {
console.error('Error during service worker registration:', error);
});
}
function checkValidServiceWorker(swUrl, config) {
// Check if the service worker can be found. If it can't reload the page.
fetch(swUrl, {
headers: { 'Service-Worker': 'script' },
})
.then(response => {
// Ensure service worker exists, and that we really are getting a JS file.
const contentType = response.headers.get('content-type');
if (
response.status === 404 ||
(contentType != null && contentType.indexOf('javascript') === -1)
) {
// No service worker found. Probably a different app. Reload the page.
navigator.serviceWorker.ready.then(registration => {
registration.unregister().then(() => {
window.location.reload();
});
});
} else {
// Service worker found. Proceed as normal.
registerValidSW(swUrl, config);
}
})
.catch(() => {
console.log(
'No internet connection found. App is running in offline mode.'
);
});
}
export function unregister() {
if ('serviceWorker' in navigator) {
navigator.serviceWorker.ready
.then(registration => {
registration.unregister();
})
.catch(error => {
console.error(error.message);
});
}
}

@ -1,32 +1,87 @@
const nxWebpack = require('@nrwl/react/plugins/webpack') const { composePlugins, withNx } = require('@nrwl/webpack')
const webpack = require('webpack')
module.exports = config => { const TerserPlugin = require("terser-webpack-plugin")
const nxWebpackConfig = nxWebpack(config) const CssMinimizerPlugin = require("css-minimizer-webpack-plugin")
const webpackConfig = {
...nxWebpackConfig, // Nx plugins for webpack.
resolve : { module.exports = composePlugins(withNx(), (config) => {
...nxWebpackConfig.resolve, // Update the webpack config as needed here.
fallback: { // e.g. `config.plugins.push(new MyPlugin())`
...nxWebpackConfig.resolve.fallback,
"crypto": require.resolve("crypto-browserify"), // add fallback for node modules
"stream": require.resolve("stream-browserify"), config.resolve.fallback = {
"http" : require.resolve("stream-http"), ...config.resolve.fallback,
"https" : require.resolve("https-browserify"), "crypto": require.resolve("crypto-browserify"),
"path" : require.resolve("path-browserify"), "stream": require.resolve("stream-browserify"),
"module": false, "path": require.resolve("path-browserify"),
"fs" : false "http": require.resolve("stream-http"),
}, "https": require.resolve("https-browserify"),
} "constants": require.resolve("constants-browserify"),
"os": false, //require.resolve("os-browserify/browser"),
"timers": false, // require.resolve("timers-browserify"),
"zlib": require.resolve("browserify-zlib"),
"fs": false,
"module": false,
"tls": false,
"net": false,
"readline": false,
"child_process": false,
"buffer": require.resolve("buffer/"),
"vm": require.resolve('vm-browserify'),
} }
if (process.env.NODE_ENV === 'production') {
return { // add externals
...webpackConfig, config.externals = {
mode: 'production', ...config.externals,
devtool: 'source-map', solc: 'solc',
}
} else {
return webpackConfig
} }
}
// add public path
config.output.publicPath = '/'
// add copy & provide plugin
config.plugins.push(
new webpack.ProvidePlugin({
Buffer: ['buffer', 'Buffer'],
url: ['url', 'URL'],
process: 'process/browser',
})
)
// souce-map loader
config.module.rules.push({
test: /\.js$/,
use: ["source-map-loader"],
enforce: "pre"
})
config.ignoreWarnings = [/Failed to parse source map/] // ignore source-map-loader warnings
// set minimizer
config.optimization.minimizer = [
new TerserPlugin({
parallel: true,
terserOptions: {
ecma: 2015,
compress: false,
mangle: false,
format: {
comments: false,
},
},
extractComments: false,
}),
new CssMinimizerPlugin(),
];
config.watchOptions = {
ignored: /node_modules/
}
return config;
});

@ -138,6 +138,8 @@
"@remixproject/plugin-webview": "0.3.33", "@remixproject/plugin-webview": "0.3.33",
"@remixproject/plugin-ws": "0.3.33", "@remixproject/plugin-ws": "0.3.33",
"@types/nightwatch": "^2.3.1", "@types/nightwatch": "^2.3.1",
"@web3modal/ethereum": "^2.2.2",
"@web3modal/react": "^2.2.2",
"ansi-gray": "^0.1.1", "ansi-gray": "^0.1.1",
"async": "^2.6.2", "async": "^2.6.2",
"axios": "1.1.2", "axios": "1.1.2",
@ -152,7 +154,7 @@
"deep-equal": "^1.0.1", "deep-equal": "^1.0.1",
"document-register-element": "1.13.1", "document-register-element": "1.13.1",
"eslint-config-prettier": "^8.5.0", "eslint-config-prettier": "^8.5.0",
"ethers": "^5.4.2", "ethers": "^5",
"ethjs-util": "^0.1.6", "ethjs-util": "^0.1.6",
"express": "^4.18.2", "express": "^4.18.2",
"express-ws": "^5.0.2", "express-ws": "^5.0.2",
@ -203,6 +205,7 @@
"tree-kill": "^1.2.2", "tree-kill": "^1.2.2",
"ts-loader": "^9.2.6", "ts-loader": "^9.2.6",
"tslib": "^2.3.0", "tslib": "^2.3.0",
"wagmi": "^0.12.6",
"web3": "^1.8.0", "web3": "^1.8.0",
"winston": "^3.3.3", "winston": "^3.3.3",
"ws": "^7.3.0" "ws": "^7.3.0"

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save