finish test

This commit is contained in:
cppppppp7
2023-12-11 14:15:35 +08:00
parent 6d97884aba
commit ab247d77a0
21 changed files with 457 additions and 19 deletions

View File

@@ -4,7 +4,8 @@
"description": "session key aspect client that provides session key management functionality",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
"test": "echo \"Error: no test specified\" && exit 1",
"build": "webpack --mode production"
},
"repository": {
"type": "git",
@@ -23,6 +24,12 @@
},
"homepage": "https://github.com/artela-network/session-key-aspect#readme",
"dependencies": {
"@artela/web3": "^1.9.18"
"@artela/web3": "^1.9.18",
"buffer": "^6.0.3",
"web3": "^4.3.0"
},
"devDependencies": {
"webpack": "^5.89.0",
"webpack-cli": "^5.1.4"
}
}

View File

@@ -1,3 +1,5 @@
const { Buffer } = require('buffer');
class SessionKeyAspectClient {
constructor(web3client, aspectAddress) {
@@ -8,7 +10,7 @@ class SessionKeyAspectClient {
this.aspect.options.address = aspectAddress;
}
async registerSessionKeyByAccount(account, sessionKeyAddress, bindingContractAddress, bindingMethodSigSet, expireBlockNumber = 1000) {
async registerSessionKey(account, sessionKeyAddress, bindingContractAddress, bindingMethodSigSet, expireBlockNumber = 1000) {
let tx = await this.registerSessionKeyUnsignTx(account.address, sessionKeyAddress, bindingContractAddress, bindingMethodSigSet, expireBlockNumber);
@@ -25,7 +27,16 @@ class SessionKeyAspectClient {
let tx = await this.registerSessionKeyUnsignTx(walletAddress, sessionKeyAddress, bindingContractAddress, bindingMethodSigSet, expireBlockNumber);
let txHash = await this.web3.eth.sendSignedTransaction(tx);
let metamaskTx = {
from: tx.from,
to: tx.to,
value: "0x00",
gas: "0x" + tx.gas.toString(16),
data: tx.data
}
console.log("metamaskTx:", metamaskTx);
let txHash = await this.web3.eth.sendTransaction(metamaskTx);
return txHash;
}
@@ -46,15 +57,8 @@ class SessionKeyAspectClient {
+ methodSetSize + this.processAndConcatStrings(bindingMethodSigSet)
+ this.rmPrefix(this.web3.eth.abi.encodeParameter('uint256', expireBlockHeight)).slice(48, 64);
console.log("op: ", op);
console.log("params: ", params);
let calldata = this.aspect.operation(op + params).encodeABI();
// let nonce = await this.web3.eth.getTransactionCount(walletAddress);
// let gasPrice = await this.web3.eth.getGasPrice();
// let chainId = await this.web3.eth.getChainId();
let tx = {
from: walletAddress,
to: this.aspectCore.options.address,
@@ -76,17 +80,11 @@ class SessionKeyAspectClient {
let params = this.rmPrefix(queryKey);
let calldata = this.aspect.operation(op + params).encodeABI();
console.log("op: ", op);
console.log("params: ", params);
let ret = await this.web3.eth.call({
to: this.aspectCore.options.address, // contract address
data: calldata
});
console.log("ret ", ret);
console.log("ret ", this.web3.eth.abi.decodeParameter('string', ret));
let encodeKey = this.web3.eth.abi.decodeParameter('string', ret);
return this.decodeSessionKey(encodeKey);
@@ -112,6 +110,16 @@ class SessionKeyAspectClient {
// * 20 bytes: main key
// * eg. 388C818CA8B9251b393131C08a736A67ccB19297
if (encodeKey.length == 0) {
return {
walletAddress: "",
sessionKeyAddress: "",
bindingContractAddress: "",
bindingMethodSet: [],
expireBlockHeight: 0
}
}
if (encodeKey.length < 84) {
throw new Error('illegal encode session key, length is :' + encodeKey.length);
}

View File

@@ -0,0 +1,23 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
# dependencies
/node_modules
/.pnp
.pnp.js
# testing
/coverage
# production
/build
# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local
npm-debug.log*
yarn-debug.log*
yarn-error.log*

View File

@@ -0,0 +1,70 @@
# Getting Started with Create React App
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
## Available Scripts
In the project directory, you can run:
### `npm start`
Runs the app in the development mode.\
Open [http://localhost:3000](http://localhost:3000) to view it in your browser.
The page will reload when you make changes.\
You may also see any lint errors in the console.
### `npm test`
Launches the test runner in the interactive watch mode.\
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
### `npm run build`
Builds the app for production to the `build` folder.\
It correctly bundles React in production mode and optimizes the build for the best performance.
The build is minified and the filenames include the hashes.\
Your app is ready to be deployed!
See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
### `npm run eject`
**Note: this is a one-way operation. Once you `eject`, you can't go back!**
If you aren't satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you're on your own.
You don't have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn't feel obligated to use this feature. However we understand that this tool wouldn't be useful if you couldn't customize it when you are ready for it.
## Learn More
You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
To learn React, check out the [React documentation](https://reactjs.org/).
### Code Splitting
This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting)
### Analyzing the Bundle Size
This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size)
### Making a Progressive Web App
This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app)
### Advanced Configuration
This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration)
### Deployment
This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment)
### `npm run build` fails to minify
This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)

View File

@@ -0,0 +1,41 @@
{
"name": "client",
"version": "0.1.0",
"private": true,
"dependencies": {
"@artela/web3": "^1.9.18",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"buffer": "^6.0.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-scripts": "5.0.1",
"web-vitals": "^2.1.4",
"sessioin-key-aspect-client": "/Users/cppppppp/project/github/session-key-aspect/js_client/session_key_aspect_client"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"eslintConfig": {
"extends": [
"react-app",
"react-app/jest"
]
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

View File

@@ -0,0 +1,43 @@
<!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="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.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>React App</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.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

View File

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

View File

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

View File

@@ -0,0 +1,37 @@
.center-container {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
height: 100vh;
}
.input-container {
margin-bottom: 20px; /* 增加输入框底部的外边距 */
}
.button-container {
margin-top: 20px; /* 增加按钮顶部的外边距 */
}
.session-key-input {
padding: 8px;
border: 1px solid #ccc;
border-radius: 4px;
width: 300px; /* 可以调整输入框的宽度 */
}
.register-button {
padding: 10px 20px;
font-size: 20px;
cursor: pointer;
background-color: #4CAF50;
color: white;
border: none;
border-radius: 5px;
}
.title {
font-weight: bold;
font-size: 20px;
}

View File

@@ -0,0 +1,112 @@
import React, { useState, useEffect } from 'react';
import Web3 from '@artela/web3';
import './App.css';
const SessionKeyAspectClient = require('sessioin-key-aspect-client');
const App = () => {
const [walletAddress, setWalletAddress] = useState('');
const testContract = "0330032b4a11478969dc4caaa11ecc2ea98cfcFF";
const testMethods = ["0A0A0A0A", "0B0B0B0B"];
const testAspectAddress = "0x06786bB59719d7DDD9D42457a16BbCD6953A7cab";
const web3 = new Web3(window.ethereum);
const aspectClient = new SessionKeyAspectClient(web3, testAspectAddress);
const [sessionKey, setSessionKey] = useState(generateRandomEthereumAddress());
const [syncData, setSyncData] = useState({
walletAddress: '',
sessionKeyAddress: '',
bindingContractAddress: '',
bindingMethodSet: [],
expireBlockHeight: ''
});
useEffect(() => {
const getAccount = async () => {
if (window.ethereum) {
try {
const accounts = await window.ethereum.request({ method: 'eth_requestAccounts' });
if (accounts.length > 0) {
setWalletAddress(accounts[0]);
} else {
console.error('No accounts found');
}
} catch (error) {
console.error('Error connecting to MetaMask:', error);
}
} else {
console.error('MetaMask not available');
}
};
getAccount();
const syncUp = async () => {
console.log("syncUp " + sessionKey);
const data = await aspectClient.getSessionKey(walletAddress, sessionKey, testContract);
setSyncData(data);
};
const intervalId = setInterval(() => {
syncUp();
}, 1000);
return () => clearInterval(intervalId);
}, [sessionKey, walletAddress]);
function generateRandomEthereumAddress() {
let address = '0x';
const characters = '0123456789abcdef';
for (let i = 0; i < 40; i++) {
address += characters.charAt(Math.floor(Math.random() * characters.length));
}
return address;
}
const handleRegister = async () => {
try {
await window.ethereum.enable();
await aspectClient.registerSessionKeyByMetamask(walletAddress, sessionKey, testContract, testMethods, 20);
} catch (error) {
console.error('registerSessionKeyByMetamask fail', error);
}
};
return (
<div className="center-container">
<p className="title">Connected Wallet</p>
<p>{walletAddress}</p>
<p className="title">Random session key</p>
<div className="input-container">
<input
type="text"
value={sessionKey}
onChange={(e) => {
console.log("e.target.value", e.target.value);
setSessionKey(e.target.value)
}}
className="session-key-input"
/>
</div>
<p className="title">Binding contract and methods</p>
<p>{"0x" + testContract}</p>
<p> {"[" + testMethods[0] + "," + testMethods[1] + "]"} </p>
<div className="button-container">
<button className="register-button" onClick={handleRegister}>register</button>
</div>
<p className="title">Query this session key from blockchain</p>
<div className="info-box">
<pre>{JSON.stringify(syncData, null, 2)}</pre>
</div>
</div>
);
}
export default App;

View File

@@ -0,0 +1,8 @@
import { render, screen } from '@testing-library/react';
import App from './App';
test('renders learn react link', () => {
render(<App />);
const linkElement = screen.getByText(/learn react/i);
expect(linkElement).toBeInTheDocument();
});

View File

@@ -0,0 +1,13 @@
body {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
code {
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
monospace;
}

View File

@@ -0,0 +1,17 @@
import React from 'react';
import ReactDOM from 'react-dom/client';
import './index.css';
import App from './App';
import reportWebVitals from './reportWebVitals';
const root = ReactDOM.createRoot(document.getElementById('root'));
root.render(
<React.StrictMode>
<App />
</React.StrictMode>
);
// If you want to start measuring performance in your app, pass a function
// to log results (for example: reportWebVitals(console.log))
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
reportWebVitals();

View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@@ -0,0 +1,13 @@
const reportWebVitals = onPerfEntry => {
if (onPerfEntry && onPerfEntry instanceof Function) {
import('web-vitals').then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
getCLS(onPerfEntry);
getFID(onPerfEntry);
getFCP(onPerfEntry);
getLCP(onPerfEntry);
getTTFB(onPerfEntry);
});
}
};
export default reportWebVitals;

View File

@@ -0,0 +1,5 @@
// jest-dom adds custom jest matchers for asserting on DOM nodes.
// allows you to do things like:
// expect(element).toHaveTextContent(/react/i)
// learn more: https://github.com/testing-library/jest-dom
import '@testing-library/jest-dom';

View File

@@ -13,7 +13,6 @@ let sk = fs.readFileSync("./test/privateKey.txt", 'utf-8');
const account = web3.eth.accounts.privateKeyToAccount(sk.trim());
web3.eth.accounts.wallet.add(account.privateKey);
const testAspectAddress = "0x06786bB59719d7DDD9D42457a16BbCD6953A7cab";
const testSessionKeyAddress = "0x0250032b4a11478969dc4caaa11ecc2ea98cfc12";
const testContract = "0330032b4a11478969dc4caaa11ecc2ea98cfcFF";
@@ -24,7 +23,7 @@ async function f() {
// usage 1
console.log("// usage 1")
const aspectClient = new SessionKeyAspectClient(web3, testAspectAddress);
let ret = await aspectClient.registerSessionKeyByAccount(account, testSessionKeyAddress, testContract, testMethods, 20);
let ret = await aspectClient.registerSessionKey(account, testSessionKeyAddress, testContract, testMethods, 20);
console.log(ret);
let sessionKey = await aspectClient.getSessionKey(account.address, testSessionKeyAddress, testContract);

View File

@@ -0,0 +1,13 @@
const path = require('path');
module.exports = {
entry: './index.js',
output: {
path: path.resolve("./", 'dist'),
filename: 'sessioin-key-aspect-client.bundle.js',
library: 'sessioin-key-aspect-client',
libraryTarget: 'umd',
globalObject: 'this'
},
// 其他配置...
};