HKUST/MSBD5017-Depin-WebClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed from iv to nonce

Browse Source
This commit is contained in:
Jincheng Lu 2025-12-05 19:17:24 +08:00
parent 5a14b8efce
commit 9e3e303dc0
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Components/Contracts/Connections.tsx
View File

@ -85,3 +85,8 @@ export async function getPaymentChannelInfo(provider: any,account: string) : Pro
isActive: channelInfo.isActive, isActive: channelInfo.isActive,
}; };
} }
export async function getNextNonce(provider: any,account: string) : Promise<BigInt> {
const channelInfo = await getPaymentChannelInfo(provider, account);
return channelInfo.nonce.valueOf() + BigInt(1);
}

18
app/Components/ServerList.tsx
View File

@ -29,7 +29,7 @@ import type { AccountInfo } from '~/context/AuthProvider';
import { signMessage } from './Metamask/Connections'; import { signMessage } from './Metamask/Connections';
import { generateWireguardKeyPair, downloadWireguardConfig } from './WireguardConfig'; import { generateWireguardKeyPair, downloadWireguardConfig } from './WireguardConfig';
import type { Node } from './Util'; import type { Node } from './Util';
import { getActiveNodes } from './Contracts/Connections'; import { getActiveNodes, getNextNonce } from './Contracts/Connections';
import axios from 'axios'; import axios from 'axios';
import { useEffect } from 'react'; import { useEffect } from 'react';
@ -41,13 +41,11 @@ function NodeItem({node, auth}: {node: Node, auth: AccountInfo}) {
const [submittingRating, setSubmittingRating] = React.useState(false); const [submittingRating, setSubmittingRating] = React.useState(false);
const getUrl = () => `http://${node.ip}:${node.port}`; const getUrl = () => `http://${node.ip}:${node.port}`;
const connect = async () => { const connect = async () => {
// const publicKey = await getPublicKey(auth.providerWithInfo.provider, auth.accounts[0]);
try { try {
const iv = await axios.get(getUrl() + "/connect");
const { privatekey: clientPrivateKey, publicKey: clientPublicKey } = generateWireguardKeyPair(); const { privatekey: clientPrivateKey, publicKey: clientPublicKey } = generateWireguardKeyPair();
const nonce: BigInt = await getNextNonce(auth.providerWithInfo.provider, auth.accounts[0]);
const sig = await signMessage(iv.data + clientPublicKey,auth.providerWithInfo.provider, auth.accounts[0]); const sig = await signMessage(nonce + clientPublicKey,auth.providerWithInfo.provider, auth.accounts[0]);
const res_string = iv.data + '\n' + clientPublicKey + '\n' + sig; const res_string = nonce + '\n' + clientPublicKey + '\n' + sig;
let response = await axios.post(getUrl() + "/connect", res_string); let response = await axios.post(getUrl() + "/connect", res_string);
const clientCIDR = response.data.WireguardClientCIDR; const clientCIDR = response.data.WireguardClientCIDR;
const serverPublicKey = response.data.WireguardServerPublicKey; const serverPublicKey = response.data.WireguardServerPublicKey;
@ -62,11 +60,9 @@ function NodeItem({node, auth}: {node: Node, auth: AccountInfo}) {
const disconnect = async () => { const disconnect = async () => {
try{ try{
const iv = await axios.get(getUrl() + "/disconnect"); const nonce: BigInt = await getNextNonce(auth.providerWithInfo.provider, auth.accounts[0]);
console.log(iv.data); const sig = await signMessage(String(nonce),auth.providerWithInfo.provider, auth.accounts[0]);
const res_string = String(nonce) + '\n' + sig;
const sig = await signMessage(iv.data,auth.providerWithInfo.provider, auth.accounts[0]);
const res_string = iv.data + '\n' + sig;
let response = await axios.post(getUrl() + "/disconnect", res_string); let response = await axios.post(getUrl() + "/disconnect", res_string);
console.log(response.data); console.log(response.data);
} catch (error) { } catch (error) {