project-serum
/
serum-dev-tools
mirror of https://github.com/project-serum/serum-dev-tools.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added absolute file paths for FileKeypair

This commit is contained in:
Sayantan Karmakar 2022-06-23 19:42:03 +05:30
parent c0dfc34055
commit 59f0624c52
5 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ts/examples/keys/owner.json
View File

@ -1 +1 @@
[63,119,147,199,137,61,136,169,123,210,247,207,78,58,122,92,55,60,132,202,209,139,39,68,2,30,223,35,162,46,222,138,74,163,230,64,70,155,29,186,90,31,150,80,228,105,44,190,124,110,139,226,110,161,225,203,65,63,155,88,252,125,157,33]
[57,148,214,188,143,219,211,199,225,245,55,202,253,17,223,236,32,230,237,163,195,6,34,129,37,135,148,101,4,186,199,99,43,62,254,163,2,193,37,219,162,74,188,92,115,219,111,88,223,149,203,13,71,113,6,83,106,63,228,63,102,198,107,225]

2
ts/examples/marketFilter.ts
View File

@ -11,7 +11,7 @@ import { Dex, DexMarket, FileKeypair } from "../src";
const main = async () => {
const connection = new Connection("http://localhost:8899", "confirmed");
const owner = FileKeypair.generate("./scripts/keys/owner.json");
const owner = FileKeypair.loadOrGenerate("./examples/keys/owner.json");
console.log("Owner: ", owner.keypair.publicKey.toString());
const airdropSig = await connection.requestAirdrop(

2
ts/examples/marketMaking.ts
View File

@ -7,7 +7,7 @@ const main = async () => {
console.log("Process: ", process.pid);
const connection = new Connection("http://localhost:8899", "confirmed");
const owner = FileKeypair.generate("./scripts/keys/owner.json");
const owner = FileKeypair.loadOrGenerate("./scripts/keys/owner.json");
console.log("Owner: ", owner.keypair.publicKey.toString());
const airdropSig = await connection.requestAirdrop(

4
ts/src/dex.ts
View File

@ -311,7 +311,7 @@ export class Dex {
marketAddress: market.address.toString(),
programID: this.address.toString(),
rpcEndpoint: this.connection.rpcEndpoint,
ownerFilePath: owner.filePath,
ownerFilePath: owner.absoluteFilePath,
duration: opts.durationInSecs * 1000,
orderCount: opts.orderCount,
initialBidSize: opts.initialBidSize,
@ -357,7 +357,7 @@ export class Dex {
marketAddress: market.address.toString(),
programID: this.address.toString(),
rpcEndpoint: this.connection.rpcEndpoint,
ownerFilePath: owner.filePath,
ownerFilePath: owner.absoluteFilePath,
duration: opts.durationInSecs * 1000,
verbose: opts.verbose ? "true" : "false",
},

35
ts/src/fileKeypair.ts
View File

@ -1,52 +1,59 @@
import { Keypair } from "@solana/web3.js";
import fs from "fs";
import path from "path";
/**
* A wrapper class around @solana/web3.js `Keypair` that allows persisting key-pairs in your local filesystem.
*/
export class FileKeypair {
public filePath: string;
public absoluteFilePath: string;
public keypair: Keypair;
private constructor(filePath: string, keypair: Keypair) {
this.filePath = filePath;
private constructor(absoluteFilePath: string, keypair: Keypair) {
this.absoluteFilePath = absoluteFilePath;
this.keypair = keypair;
}
static load(filePath: string): FileKeypair {
const fileBuffer = fs.readFileSync(filePath);
const absolutePath = path.resolve(filePath);
const fileBuffer = fs.readFileSync(absolutePath);
const secretKey: number[] = JSON.parse(fileBuffer.toString());
const keypair = Keypair.fromSecretKey(Uint8Array.from(secretKey));
return new FileKeypair(filePath, keypair);
return new FileKeypair(absolutePath, keypair);
}
static generate(filepath: string): FileKeypair {
static generate(filePath: string): FileKeypair {
const absolutePath = path.resolve(filePath);
const keypair = Keypair.generate();
const secretKey = Array.from(keypair.secretKey);
fs.writeFileSync(filepath, JSON.stringify(secretKey));
return new FileKeypair(filepath, keypair);
fs.writeFileSync(absolutePath, JSON.stringify(secretKey));
return new FileKeypair(absolutePath, keypair);
}
static loadOrGenerate(filePath: string): FileKeypair {
let keypair: Keypair;
let secretKey: number[];
const absolutePath = path.resolve(filePath);
try {
const fileBuffer = fs.readFileSync(filePath);
const fileBuffer = fs.readFileSync(absolutePath);
secretKey = JSON.parse(fileBuffer.toString());
keypair = Keypair.fromSecretKey(Uint8Array.from(secretKey));
} catch (e) {
keypair = Keypair.generate();
secretKey = Array.from(keypair.secretKey);
fs.writeFileSync(filePath, JSON.stringify(secretKey));
fs.writeFileSync(absolutePath, JSON.stringify(secretKey));
}
return new FileKeypair(filePath, keypair);
return new FileKeypair(absolutePath, keypair);
}
static withKeypair(filePath: string, keypair: Keypair): FileKeypair {
const secretKey = Array.from(keypair.secretKey);
fs.writeFileSync(filePath, JSON.stringify(secretKey));
const absolutePath = path.resolve(filePath);
return new FileKeypair(filePath, keypair);
const secretKey = Array.from(keypair.secretKey);
fs.writeFileSync(absolutePath, JSON.stringify(secretKey));
return new FileKeypair(absolutePath, keypair);
}
}