rename env vars (#154)

Signed-off-by: microwavedcola1 <microwavedcola@gmail.com>
This commit is contained in:
microwavedcola1 2022-08-09 13:50:37 +02:00 committed by GitHub
parent 9fd4817da8
commit 970187af41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 24 additions and 40 deletions

View File

@ -43,7 +43,9 @@ async function main() {
// delegate // delegate
const delegate = Keypair.fromSecretKey( const delegate = Keypair.fromSecretKey(
Buffer.from(JSON.parse(fs.readFileSync(process.env.DELEGATE!, 'utf-8'))), Buffer.from(
JSON.parse(fs.readFileSync(process.env.USER3_KEYPAIR!, 'utf-8')),
),
); );
const delegateWallet = new Wallet(delegate); const delegateWallet = new Wallet(delegate);
const delegateProvider = new AnchorProvider( const delegateProvider = new AnchorProvider(

View File

@ -25,7 +25,7 @@ async function main() {
// build client and fetch group for admin // build client and fetch group for admin
const options = AnchorProvider.defaultOptions(); const options = AnchorProvider.defaultOptions();
const connection = new Connection(process.env.CLUSTER_URL, options); const connection = new Connection(process.env.MB_CLUSTER_URL, options);
const user = Keypair.fromSecretKey( const user = Keypair.fromSecretKey(
Buffer.from( Buffer.from(
JSON.parse(fs.readFileSync(process.env.USER_KEYPAIR!, 'utf-8')), JSON.parse(fs.readFileSync(process.env.USER_KEYPAIR!, 'utf-8')),
@ -40,9 +40,7 @@ async function main() {
); );
const admin = Keypair.fromSecretKey( const admin = Keypair.fromSecretKey(
Buffer.from( Buffer.from(
JSON.parse( JSON.parse(fs.readFileSync(process.env.MB_PAYER_KEYPAIR!, 'utf-8')),
fs.readFileSync(process.env.MANGO_MAINNET_PAYER_KEYPAIR!, 'utf-8'),
),
), ),
); );
console.log(`Admin ${admin.publicKey.toBase58()}`); console.log(`Admin ${admin.publicKey.toBase58()}`);

View File

@ -16,13 +16,11 @@ const MAINNET_MINTS = new Map([
async function main() { async function main() {
const options = AnchorProvider.defaultOptions(); const options = AnchorProvider.defaultOptions();
const connection = new Connection(process.env.CLUSTER_URL, options); const connection = new Connection(process.env.MB_CLUSTER_URL, options);
const admin = Keypair.fromSecretKey( const admin = Keypair.fromSecretKey(
Buffer.from( Buffer.from(
JSON.parse( JSON.parse(fs.readFileSync(process.env.MB_PAYER_KEYPAIR!, 'utf-8')),
fs.readFileSync(process.env.MANGO_MAINNET_PAYER_KEYPAIR!, 'utf-8'),
),
), ),
); );
const adminWallet = new Wallet(admin); const adminWallet = new Wallet(admin);

View File

@ -20,13 +20,11 @@ const MAINNET_ORACLES = new Map([
async function main() { async function main() {
const options = AnchorProvider.defaultOptions(); const options = AnchorProvider.defaultOptions();
const connection = new Connection(process.env.CLUSTER_URL, options); const connection = new Connection(process.env.MB_CLUSTER_URL, options);
const admin = Keypair.fromSecretKey( const admin = Keypair.fromSecretKey(
Buffer.from( Buffer.from(
JSON.parse( JSON.parse(fs.readFileSync(process.env.MB_PAYER_KEYPAIR!, 'utf-8')),
fs.readFileSync(process.env.MANGO_MAINNET_PAYER_KEYPAIR!, 'utf-8'),
),
), ),
); );
const adminWallet = new Wallet(admin); const adminWallet = new Wallet(admin);

View File

@ -9,14 +9,12 @@ import { MangoClient } from '../client';
// //
async function main() { async function main() {
const options = AnchorProvider.defaultOptions(); const options = AnchorProvider.defaultOptions();
const connection = new Connection(process.env.CLUSTER_URL!, options); const connection = new Connection(process.env.MB_CLUSTER_URL!, options);
// user // user
const user = Keypair.fromSecretKey( const user = Keypair.fromSecretKey(
Buffer.from( Buffer.from(
JSON.parse( JSON.parse(fs.readFileSync(process.env.MB_PAYER_KEYPAIR!, 'utf-8')),
fs.readFileSync(process.env.MANGO_MAINNET_PAYER_KEYPAIR!, 'utf-8'),
),
), ),
); );
const userWallet = new Wallet(user); const userWallet = new Wallet(user);
@ -30,9 +28,7 @@ async function main() {
// admin // admin
const admin = Keypair.fromSecretKey( const admin = Keypair.fromSecretKey(
Buffer.from( Buffer.from(
JSON.parse( JSON.parse(fs.readFileSync(process.env.MB_PAYER_KEYPAIR!, 'utf-8')),
fs.readFileSync(process.env.MANGO_MAINNET_PAYER_KEYPAIR!, 'utf-8'),
),
), ),
); );
console.log(`Admin ${admin.publicKey.toBase58()}`); console.log(`Admin ${admin.publicKey.toBase58()}`);

View File

@ -2,7 +2,7 @@ import { AnchorProvider, Wallet } from '@project-serum/anchor';
import { Connection, Keypair } from '@solana/web3.js'; import { Connection, Keypair } from '@solana/web3.js';
import fs from 'fs'; import fs from 'fs';
import { HealthType } from '../accounts/mangoAccount'; import { HealthType } from '../accounts/mangoAccount';
import { AccountSize, MangoClient } from '../index'; import { MangoClient } from '../index';
import { toUiDecimals } from '../utils'; import { toUiDecimals } from '../utils';
// //
@ -11,13 +11,11 @@ import { toUiDecimals } from '../utils';
async function main() { async function main() {
const options = AnchorProvider.defaultOptions(); const options = AnchorProvider.defaultOptions();
const connection = new Connection(process.env.CLUSTER_URL!, options); const connection = new Connection(process.env.MB_CLUSTER_URL!, options);
const user = Keypair.fromSecretKey( const user = Keypair.fromSecretKey(
Buffer.from( Buffer.from(
JSON.parse( JSON.parse(fs.readFileSync(process.env.MB_PAYER_KEYPAIR!, 'utf-8')),
fs.readFileSync(process.env.MANGO_MAINNET_PAYER_KEYPAIR!, 'utf-8'),
),
), ),
); );
const userWallet = new Wallet(user); const userWallet = new Wallet(user);
@ -30,9 +28,7 @@ async function main() {
const admin = Keypair.fromSecretKey( const admin = Keypair.fromSecretKey(
Buffer.from( Buffer.from(
JSON.parse( JSON.parse(fs.readFileSync(process.env.MB_PAYER_KEYPAIR!, 'utf-8')),
fs.readFileSync(process.env.MANGO_MAINNET_PAYER_KEYPAIR!, 'utf-8'),
),
), ),
); );
console.log(`Admin ${admin.publicKey.toBase58()}`); console.log(`Admin ${admin.publicKey.toBase58()}`);

View File

@ -10,14 +10,14 @@ import {
import BN from 'bn.js'; import BN from 'bn.js';
import fs from 'fs'; import fs from 'fs';
import { QUOTE_DECIMALS } from '../accounts/bank'; import { QUOTE_DECIMALS } from '../accounts/bank';
import { AccountSize, MangoClient } from '../index'; import { MangoClient } from '../index';
import { getAssociatedTokenAddress } from '../utils'; import { getAssociatedTokenAddress } from '../utils';
const CLUSTER_URL = const MB_CLUSTER_URL =
process.env.CLUSTER_URL || process.env.MB_CLUSTER_URL ||
'https://mango.rpcpool.com/946ef7337da3f5b8d3e4a34e7f88'; 'https://mango.rpcpool.com/946ef7337da3f5b8d3e4a34e7f88';
const MANGO_MAINNET_PAYER_KEYPAIR = const MB_PAYER_KEYPAIR =
process.env.MANGO_MAINNET_PAYER_KEYPAIR || process.env.MB_PAYER_KEYPAIR ||
'/Users/tylershipe/.config/solana/deploy.json'; '/Users/tylershipe/.config/solana/deploy.json';
// //
@ -26,13 +26,11 @@ const MANGO_MAINNET_PAYER_KEYPAIR =
// NOTE: we assume that ATA for source and target already exist for wallet // NOTE: we assume that ATA for source and target already exist for wallet
async function main() { async function main() {
const options = AnchorProvider.defaultOptions(); const options = AnchorProvider.defaultOptions();
const connection = new Connection(CLUSTER_URL, options); const connection = new Connection(MB_CLUSTER_URL, options);
// load user key // load user key
const user = Keypair.fromSecretKey( const user = Keypair.fromSecretKey(
Buffer.from( Buffer.from(JSON.parse(fs.readFileSync(MB_PAYER_KEYPAIR!, 'utf-8'))),
JSON.parse(fs.readFileSync(MANGO_MAINNET_PAYER_KEYPAIR!, 'utf-8')),
),
); );
const userWallet = new Wallet(user); const userWallet = new Wallet(user);
const userProvider = new AnchorProvider(connection, userWallet, options); const userProvider = new AnchorProvider(connection, userWallet, options);
@ -44,9 +42,7 @@ async function main() {
// load admin key // load admin key
const admin = Keypair.fromSecretKey( const admin = Keypair.fromSecretKey(
Buffer.from( Buffer.from(JSON.parse(fs.readFileSync(MB_PAYER_KEYPAIR!, 'utf-8'))),
JSON.parse(fs.readFileSync(MANGO_MAINNET_PAYER_KEYPAIR!, 'utf-8')),
),
); );
console.log(`Admin ${admin.publicKey.toBase58()}`); console.log(`Admin ${admin.publicKey.toBase58()}`);