-
Notifications
You must be signed in to change notification settings - Fork 60
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into hive_testing
- Loading branch information
Showing
26 changed files
with
3,608 additions
and
3,161 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "name": "cli", | ||
| "version": "1.0.1-alpha", | ||
| "version": "1.0.2-alpha", | ||
| "description": "> TODO: description", | ||
| "author": "zincoshine <[email protected]>", | ||
| "homepage": "https://https://github.com/etherspot/skandha#readme", | ||
|
|
@@ -31,14 +31,21 @@ | |
| "url": "https://https://github.com/etherspot/skandha/issues" | ||
| }, | ||
| "dependencies": { | ||
| "api": "^1.0.1-alpha", | ||
| "db": "^1.0.1-alpha", | ||
| "executor": "^1.0.1-alpha", | ||
| "@chainsafe/discv5": "3.0.0", | ||
| "@libp2p/interface-connection": "3.0.2", | ||
| "@libp2p/interface-connection-manager": "1.3.8", | ||
| "@libp2p/interface-peer-id": "2.0.1", | ||
| "@libp2p/peer-id-factory": "2.0.1", | ||
| "@libp2p/prometheus-metrics": "1.1.3", | ||
| "@multiformats/multiaddr": "12.1.3", | ||
| "api": "1.0.2-alpha", | ||
| "db": "1.0.2-alpha", | ||
| "executor": "1.0.2-alpha", | ||
| "find-up": "5.0.0", | ||
| "got": "12.5.3", | ||
| "js-yaml": "4.1.0", | ||
| "node": "^1.0.1-alpha", | ||
| "types": "^1.0.1-alpha", | ||
| "node": "1.0.2-alpha", | ||
| "types": "1.0.2-alpha", | ||
| "yargs": "17.6.2" | ||
| }, | ||
| "devDependencies": { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| import fs from "node:fs"; | ||
| import path from "node:path"; | ||
| import { SignableENR, createKeypairFromPeerId } from "@chainsafe/discv5"; | ||
| import { createSecp256k1PeerId } from "@libp2p/peer-id-factory"; | ||
| import { PeerId } from "@libp2p/interface-peer-id"; | ||
| import { defaultP2POptions } from "types/lib/options"; | ||
| import { Logger } from "api/lib/logger"; | ||
| import { fromString as uint8ArrayFromString } from "uint8arrays/from-string"; | ||
| import { toString as uint8ArrayToString } from "uint8arrays/to-string"; | ||
| import { peerIdFromBytes } from "@libp2p/peer-id"; | ||
| import { createFromPrivKey, createFromPubKey } from "@libp2p/peer-id-factory"; | ||
| import { unmarshalPrivateKey, unmarshalPublicKey } from "@libp2p/crypto/keys"; | ||
| import { readFile, writeFile600Perm } from "../../util"; | ||
| import { IGlobalArgs } from "../../options"; | ||
|
|
||
| export type PeerIdJSON = { id: string; pubKey?: string; privKey?: string }; | ||
|
|
||
| export function overwriteEnrWithCliArgs( | ||
| enr: SignableENR, | ||
| args: IGlobalArgs | ||
| ): void { | ||
| const [host, enrPort] = [args["p2p.enrHost"], args["p2p.enrPort"]]; | ||
| enr.ip = host ?? defaultP2POptions.enrHost; | ||
| enr.tcp = enrPort ?? defaultP2POptions.enrPort; | ||
| enr.udp = enrPort ?? defaultP2POptions.enrPort; | ||
| } | ||
|
|
||
| export async function initPeerIdAndEnr( | ||
| args: IGlobalArgs, | ||
| logger: Logger | ||
| ): Promise<{ peerId: PeerId; enr: SignableENR }> { | ||
| const { dataDir } = args; | ||
| const retainPeerId = args["p2p.retainPeerId"]; | ||
|
|
||
| const newPeerIdAndENR = async (): Promise<{ | ||
| peerId: PeerId; | ||
| enr: SignableENR; | ||
| }> => { | ||
| const peerId = await createSecp256k1PeerId(); | ||
| const enr = SignableENR.createV4(createKeypairFromPeerId(peerId)); | ||
| return { peerId, enr }; | ||
| }; | ||
|
|
||
| const readPersistedPeerIdAndENR = async ( | ||
| peerIdFile: string, | ||
| enrFile: string | ||
| ): Promise<{ peerId: PeerId; enr: SignableENR }> => { | ||
| let peerId: PeerId; | ||
| let enr: SignableENR; | ||
|
|
||
| // attempt to read stored peer id | ||
| try { | ||
| peerId = await readPeerId(peerIdFile); | ||
| } catch (e) { | ||
| logger.warn("Unable to read peerIdFile, creating a new peer id"); | ||
| return newPeerIdAndENR(); | ||
| } | ||
| // attempt to read stored enr | ||
| try { | ||
| enr = SignableENR.decodeTxt( | ||
| fs.readFileSync(enrFile, "utf-8"), | ||
| createKeypairFromPeerId(peerId) | ||
| ); | ||
| } catch (e) { | ||
| logger.warn("Unable to decode stored local ENR, creating a new ENR"); | ||
| enr = SignableENR.createV4(createKeypairFromPeerId(peerId)); | ||
| return { peerId, enr }; | ||
| } | ||
| // check stored peer id against stored enr | ||
| if (!peerId.equals(await enr.peerId())) { | ||
| logger.warn( | ||
| "Stored local ENR doesn't match peerIdFile, creating a new ENR" | ||
| ); | ||
| enr = SignableENR.createV4(createKeypairFromPeerId(peerId)); | ||
| return { peerId, enr }; | ||
| } | ||
| return { peerId, enr }; | ||
| }; | ||
|
|
||
| if (retainPeerId) { | ||
| const enrFile = path.join(dataDir, "enr"); | ||
| const peerIdFile = path.join(dataDir, "peer-id.json"); | ||
| const { peerId, enr } = await readPersistedPeerIdAndENR( | ||
| peerIdFile, | ||
| enrFile | ||
| ); | ||
| overwriteEnrWithCliArgs(enr, args); | ||
| writeFile600Perm(peerIdFile, exportToJSON(peerId)); | ||
| writeFile600Perm(enrFile, enr.encodeTxt()); | ||
| return { peerId, enr }; | ||
| } else { | ||
| const { peerId, enr } = await newPeerIdAndENR(); | ||
| overwriteEnrWithCliArgs(enr, args); | ||
| return { peerId, enr }; | ||
| } | ||
| } | ||
|
|
||
| async function createFromParts( | ||
| multihash: Uint8Array, | ||
| privKey?: Uint8Array, | ||
| pubKey?: Uint8Array | ||
| ): Promise<PeerId> { | ||
| if (privKey != null) { | ||
| const key = await unmarshalPrivateKey(privKey); | ||
|
|
||
| return createFromPrivKey(key); | ||
| } else if (pubKey != null) { | ||
| const key = unmarshalPublicKey(pubKey); | ||
|
|
||
| return createFromPubKey(key); | ||
| } | ||
|
|
||
| return peerIdFromBytes(multihash); | ||
| } | ||
|
|
||
| export function exportToJSON( | ||
| peerId: PeerId, | ||
| excludePrivateKey?: boolean | ||
| ): PeerIdJSON { | ||
| return { | ||
| id: uint8ArrayToString(peerId.toBytes(), "base58btc"), | ||
| pubKey: | ||
| peerId.publicKey != null | ||
| ? uint8ArrayToString(peerId.publicKey, "base64pad") | ||
| : undefined, | ||
| privKey: | ||
| excludePrivateKey === true || peerId.privateKey == null | ||
| ? undefined | ||
| : uint8ArrayToString(peerId.privateKey, "base64pad"), | ||
| }; | ||
| } | ||
|
|
||
| async function createFromJSON(obj: PeerIdJSON): Promise<PeerId> { | ||
| return createFromParts( | ||
| uint8ArrayFromString(obj.id, "base58btc"), | ||
| obj.privKey != null | ||
| ? uint8ArrayFromString(obj.privKey, "base64pad") | ||
| : undefined, | ||
| obj.pubKey != null | ||
| ? uint8ArrayFromString(obj.pubKey, "base64pad") | ||
| : undefined | ||
| ); | ||
| } | ||
|
|
||
| async function readPeerId(filepath: string): Promise<PeerId> { | ||
| return createFromJSON(readFile(filepath)); | ||
| } |
Oops, something went wrong.