Merge pull request #31 from tronprotocol/release/v1.1.9

Release/v1.1.9
tronprotocol · Sep 19, 2023 · 739ce03 · 739ce03
2 parents eaaac80 + 55c97fe
commit 739ce03
Show file tree

Hide file tree

Showing 51 changed files with 4,230 additions and 259 deletions.
diff --git a/demos/dev-demo/.eslintrc b/demos/dev-demo/.eslintrc
@@ -1,7 +1,18 @@
 {
     // "extends": [],
     "parser": "@typescript-eslint/parser",
+    "env": {
+        "node": true
+    },
     "rules": {
         "require-extensions/require-extensions": "off"
-    }
+    },
+    "overrides": [
+        {
+            "files": "./scripts/*.cjs",
+            "rules": {
+                "@typescript-eslint/no-var-requires": "off"
+            }
+        }
+    ]
 }
diff --git a/demos/dev-demo/package.json b/demos/dev-demo/package.json
@@ -6,31 +6,37 @@
     "scripts": {
         "dev": "vite",
         "build": "tsc && vite build",
-        "preview": "vite preview"
+        "preview": "vite preview",
+        "ganache": "node scripts/ganache.cjs"
     },
     "dependencies": {
         "@emotion/react": "^11.10.4",
         "@emotion/styled": "^11.10.4",
+        "@metamask/eth-sig-util": "^6.0.0",
         "@mui/material": "^5.10.10",
+        "@tronweb3/abstract-adapter-evm": "^1.0.0",
         "@tronweb3/tronwallet-abstract-adapter": "^1.1.0",
         "@tronweb3/tronwallet-adapter-bitkeep": "^1.0.0",
         "@tronweb3/tronwallet-adapter-ledger": "^1.1.2",
+        "@tronweb3/tronwallet-adapter-metamask": "^1.0.0",
         "@tronweb3/tronwallet-adapter-okxwallet": "^1.0.0",
         "@tronweb3/tronwallet-adapter-react-hooks": "^1.0.0",
         "@tronweb3/tronwallet-adapter-react-ui": "^1.1.0",
         "@tronweb3/tronwallet-adapter-tokenpocket": "^1.0.0",
         "@tronweb3/tronwallet-adapters": "^1.1.2",
         "events": "^3.3.0",
+        "ganache": "^7.9.0",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
-        "tronweb": "5.1",
+        "tronweb": "~5.1.0",
         "vconsole": "^3.15.0"
     },
     "devDependencies": {
         "@types/react": "^18.0.26",
         "@types/react-dom": "^18.0.8",
         "@vitejs/plugin-legacy": "^2.3.0",
         "@vitejs/plugin-react": "^2.2.0",
+        "dotenv": "^16.3.1",
         "typescript": "^4.6.4",
         "vite": "3.2.3",
         "webpack-cli": "^5.0.2"

diff --git a/demos/dev-demo/scripts/ganache.cjs b/demos/dev-demo/scripts/ganache.cjs
@@ -0,0 +1,37 @@
+const ganache = require('ganache');
+
+require('dotenv').config({});
+
+const options = {
+  fork: process.env.INFURA_PROJECT_ID
+    ? { url: `https://mainnet.infura.io/v3/${process.env.INFURA_PROJECT_ID}` }
+    : 'mainnet',
+  chain: {
+    // hardfork: 'berlin',
+  },
+};
+options.wallet = {
+  mnemonic:
+    'shove comic where catch muscle impulse that fork plunge robust noise subject',
+};
+const server = ganache.server(options);
+const PORT = 8545;
+
+server.listen(PORT, async (err) => {
+  if (err) throw err;
+
+  console.log(`ganache listening on port ${PORT}...`);
+  console.log('accounts created');
+  const provider = server.provider;
+
+  if (process.env.MNEMONIC_PHRASE) {
+    const accounts = await provider.request({
+      method: 'eth_accounts',
+      params: [],
+    });
+    console.log(accounts);
+  } else {
+    console.log(`mnemonic used: ${provider.getOptions().wallet?.mnemonic}`);
+    console.log(provider.getInitialAccounts());
+  }
+});
diff --git a/demos/dev-demo/src/App.tsx b/demos/dev-demo/src/App.tsx
@@ -8,6 +8,7 @@ import { ReactHooksDemo } from './ReactHooksDemo.js';
 import { TokenPocketAdapterDemo } from './TokenPocketAdapterDemo.js';
 import { BitKeepAdapterDemo } from './BitKeepAdapterDemo.js';
 import { OkxWalletAdapterDemo } from './OkxWalletAdapterDemo.js';
+import { MetamaskAdapterDemo } from './Metamask.js';
 interface TabPanelProps {
     children?: React.ReactNode;
     index: number;
@@ -45,6 +46,7 @@ function App() {
                         <Tab label="TokenPocketAdapter Demo" />
                         <Tab label="BitKeepAdapter Demo" />
                         <Tab label="OkxWalletAdapter Demo" />
+                        <Tab label="MetaMaskWalletAdapter Demo" />
                     </Tabs>
                 </Box>
                 <TabPanel value={value} index={0}>
@@ -71,6 +73,9 @@ function App() {
                 <TabPanel value={value} index={7}>
                     <OkxWalletAdapterDemo></OkxWalletAdapterDemo>
                 </TabPanel>
+                <TabPanel value={value} index={8}>
+                    <MetamaskAdapterDemo></MetamaskAdapterDemo>
+                </TabPanel>
             </Box>
         </div>
     );

diff --git a/demos/dev-demo/src/BitKeepAdapterDemo.tsx b/demos/dev-demo/src/BitKeepAdapterDemo.tsx
@@ -136,11 +136,11 @@ export function BitKeepAdapterDemo() {
                 <Button variant="contained" disabled={adapter?.connected} onClick={handleConnect}>
                     Connect
                 </Button>
-                &nbsp;&nbsp;&nbsp;&nbsp;
+
                 <Button variant="contained" disabled={!adapter?.connected} onClick={() => adapter?.disconnect()}>
                     Disconnect
                 </Button>
-                &nbsp;&nbsp;&nbsp;&nbsp;
+
                 <Button variant="contained" disabled={!adapter?.connected} onClick={onSignTransaction}>
                     Transfer
                 </Button>
@@ -149,7 +149,7 @@ export function BitKeepAdapterDemo() {
                 <Button variant="contained" onClick={onSignMessage}>
                     Sign Message
                 </Button>
-                &nbsp;&nbsp;&nbsp;&nbsp;
+
                 <Button variant="contained" disabled={!signedMessage} onClick={onVerifyMessage}>
                     Verify Signed Message
                 </Button>

diff --git a/demos/dev-demo/src/LedgerAdapterDemo.tsx b/demos/dev-demo/src/LedgerAdapterDemo.tsx
@@ -116,11 +116,11 @@ export function LedgerAdapterDemo() {
                 <Button variant="contained" disabled={adapter?.connected} onClick={onConnect}>
                     Connect
                 </Button>
-                &nbsp;&nbsp;&nbsp;&nbsp;
+
                 <Button variant="contained" disabled={!adapter?.connected} onClick={() => adapter?.disconnect()}>
                     Disconnect
                 </Button>
-                &nbsp;&nbsp;&nbsp;&nbsp;
+
                 <Button variant="contained" disabled={!adapter?.connected} onClick={onSignTransaction}>
                     Transfer
                 </Button>
@@ -129,7 +129,7 @@ export function LedgerAdapterDemo() {
                 <Button variant="contained" onClick={onSignMessage}>
                     Sign Message
                 </Button>
-                &nbsp;&nbsp;&nbsp;&nbsp;
+
                 <Button variant="contained" disabled={!signedMessage} onClick={onVerifyMessage}>
                     Verify Signed Message
                 </Button>

diff --git a/demos/dev-demo/src/LedgerDemo/ConnectedSection.tsx b/demos/dev-demo/src/LedgerDemo/ConnectedSection.tsx
@@ -41,11 +41,11 @@ export function ConnectedSection(props: { adapter: LedgerAdapter }) {
                 <Button variant="contained" disabled={!props.adapter?.connected} onClick={onSignTransaction}>
                     Transfer
                 </Button>
-                &nbsp;&nbsp;&nbsp;&nbsp;
+
                 <Button variant="contained" onClick={onSignMessage}>
                     Sign Message
                 </Button>
-                &nbsp;&nbsp;&nbsp;&nbsp;
+
                 <Button variant="contained" disabled={!signedMessage} onClick={onVerifyMessage}>
                     Verify Signed Message
                 </Button>