Skip to content

Commit ad49913

Browse files
dappboris-devdappboris-dev
committed
update: create poool
1 parent c6480c4 commit ad49913

File tree

28 files changed

+136
-133
lines changed

28 files changed

+136
-133
lines changed

‎Anchor.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ skip-lint = false
77

88

99
[programs.devnet]
10-
pump_science = "HAV7nVFUHfpJfm21fGKokxvDcJWPYyUzwfSm91zcvAc1"
10+
pump_science = "Fmktp2VXcDorWkAyzZAEG5X859mxKMV8XCcayKgZVwBo"
1111

1212
[registry]
1313
url = "https://api.apr.dev"
1414

1515
[provider]
1616
cluster = "Devnet"
17-
wallet = "./pump_key.json"
17+
wallet = "./pump_fun.json"
1818

1919
[scripts]
2020
test = "yarn run ts-mocha -p ./tsconfig.json -t 1000000 tests/**/*.ts"

‎cli/command.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,13 @@ programCommand('addWl')
4444
await setClusterConfig(env, keypair, rpc)
4545

4646
await addWl();
47-
48-
const txId = await createBondingCurve();
49-
console.log("Transaction ID: " ,txId);
5047
});
5148
function programCommand(name: string) {
5249
return program
5350
.command(name)
5451
.option('-e, --env <string>', 'Solana cluster env name', 'devnet')
55-
.option('-r, --rpc <string>', 'Solana cluster RPC name', 'rpc')
56-
.option('-k, --keypair <string>', 'Solana wallet Keypair Path', '/home/king/contract_test/pump_science/pump-science-contract//pump_key.json')
52+
.option('-r, --rpc <string>', 'Solana cluster RPC name', 'https://devnet.helius-rpc.com/?api-key=926da061-472b-438a-bbb1-f289333c4126')
53+
.option('-k, --keypair <string>', 'Solana wallet Keypair Path', '/home/king/contract_test/pump_science/pump-science-contract//pump_fun.json')
5754
}
5855

5956
program.parse(process.argv);

‎cli/constants.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
} from "@solana/web3.js";
55
import { BN } from "bn.js";
66

7-
export const PUMPSCIENCE = new PublicKey("HAV7nVFUHfpJfm21fGKokxvDcJWPYyUzwfSm91zcvAc1");
7+
export const PUMPSCIENCE = new PublicKey("Fmktp2VXcDorWkAyzZAEG5X859mxKMV8XCcayKgZVwBo");
88
export const PROGRAM_ID = 'Eo7WjKq67rjJQSZxS6z3YkapzY3eMj6Xy8X5EQVn5UaB';
99
export const VAULT_SEED = "vault-authority";
1010
export const GLOBAL_VAULT_SEED = "fee-vault";

‎cli/script.ts‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ let payer: NodeWallet = null;
2828
let umi: Umi;
2929

3030
const simpleMintKp = Web3JsKeypair.generate();
31-
const connection = new Connection("rpc");
31+
const connection = new Connection("https://devnet.helius-rpc.com/?api-key=926da061-472b-438a-bbb1-f289333c4126");
3232

3333
// Address of the deployed program.
3434
let programId = new anchor.web3.PublicKey(PUMPSCIENCE);
@@ -69,7 +69,7 @@ export const setClusterConfig = async (
6969
wallet,
7070
{ skipPreflight: true, commitment: 'confirmed' }
7171
)
72-
const rpcUrl = "rpc"
72+
const rpcUrl = "https://devnet.helius-rpc.com/?api-key=926da061-472b-438a-bbb1-f289333c4126"
7373
umi = createUmi(rpcUrl).use(web3JsRpc(provider.connection));
7474
// Generate the program client from IDL.
7575
program = new anchor.Program(IDL as anchor.Idl, programId);
@@ -117,7 +117,7 @@ export const migrate = async () => {
117117
const global = PublicKey.findProgramAddressSync([Buffer.from("global")], PUMPSCIENCE)[0];
118118

119119
const tokenAMint = NATIVE_MINT;
120-
const tokenBMint = new PublicKey("6RZXWLH175ki5wuG4wBGcgjpLcXwQm2jQyCFvpDijxp1");
120+
const tokenBMint = new PublicKey("EkxvReQjHy1LeMKnLP9vtAvC5hrLnFw8UEHvB7Sjs3tP");
121121

122122
const config = new PublicKey('21PjsfQVgrn56jSypUT5qXwwSjwKWvuoBCKbVZrgTLz4');
123123
const bondingCurve = PublicKey.findProgramAddressSync([Buffer.from("bonding-curve"), tokenBMint.toBuffer()], PUMPSCIENCE)[0];
@@ -214,7 +214,7 @@ export const migrate = async () => {
214214
const [lockEscrowPK] = deriveLockEscrowPda(poolPubkey, payer.publicKey, ammProgram.programId);
215215
const [escrowAta, createEscrowAtaIx] = await getOrCreateATAInstruction(lpMint, lockEscrowPK, connection, payer.publicKey);
216216
const [bondingCurveTokenAccount, bondingCurveTokenAccountIx] = await getOrCreateATAInstruction(tokenBMint, bondingCurve, connection, payer.publicKey);
217-
console.log("bonding curve:", bondingCurveTokenAccount.toBase58());
217+
console.log("bonding curve token account:", bondingCurveTokenAccount.toBase58());
218218
const migrationVault = MIGRATION_VAULT;
219219
const txLockPool = await program.methods
220220
.lockPool()
@@ -378,6 +378,7 @@ export const migrate = async () => {
378378

379379
const lockPoolVTx = new VersionedTransaction(lockPoolTxMsg);
380380
lockPoolVTx.sign([payer.payer])
381+
await sleep(2000);
381382

382383
const lockPoolSim = await provider.connection.simulateTransaction(lockPoolVTx, { sigVerify: true })
383384

@@ -392,7 +393,7 @@ export const migrate = async () => {
392393

393394
export const createBondingCurve = async () => {
394395

395-
const web3Keypair = Web3JsKeypair.fromSecretKey(Uint8Array.from(require("../pump_key.json")))
396+
const web3Keypair = Web3JsKeypair.fromSecretKey(Uint8Array.from(require("../pump_fun.json")))
396397
const masterKp = fromWeb3JsKeypair(
397398
web3Keypair
398399
);
@@ -414,7 +415,7 @@ export const createBondingCurve = async () => {
414415
}
415416

416417
export const addWl = async () => {
417-
const web3Keypair = Web3JsKeypair.fromSecretKey(Uint8Array.from(require("../pump_key.json")))
418+
const web3Keypair = Web3JsKeypair.fromSecretKey(Uint8Array.from(require("../pump_fun.json")))
418419
const masterKp = fromWeb3JsKeypair(
419420
web3Keypair
420421
);

‎clients/js/src/constants.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export const INIT_DEFAULTS = {
3333
}
3434

3535
export const PROGRAM_ID = 'Eo7WjKq67rjJQSZxS6z3YkapzY3eMj6Xy8X5EQVn5UaB';
36-
export const PUMPSCIENCE = new PublicKey("HAV7nVFUHfpJfm21fGKokxvDcJWPYyUzwfSm91zcvAc1");
36+
export const PUMPSCIENCE = new PublicKey("Fmktp2VXcDorWkAyzZAEG5X859mxKMV8XCcayKgZVwBo");
3737
export const METAPLEX_PROGRAM = 'metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s';
3838
export const VAULT_SEED = "fee-vault";
3939
export const GLOBAL_VAULT_SEED = "fee-vault"

‎clients/js/src/generated/accounts/bondingCurve.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export async function safeFetchAllBondingCurve(
7171
}
7272

7373
export function getBondingCurveGpaBuilder(context: Pick<Context, 'rpc' | 'programs'>) {
74-
const programId = context.programs.getPublicKey('pumpScience', '6YBhe9qr2WQN7JUxCgSPeX4puM6YihAKxdPQ5pZaSJ1h');
74+
const programId = context.programs.getPublicKey('pumpScience', 'Fmktp2VXcDorWkAyzZAEG5X859mxKMV8XCcayKgZVwBo');
7575
return gpaBuilder(context, programId)
7676
.registerFields<{ 'discriminator': Array<number>, 'mint': PublicKey, 'creator': PublicKey, 'initialVirtualTokenReserves': number | bigint, 'virtualSolReserves': number | bigint, 'virtualTokenReserves': number | bigint, 'realSolReserves': number | bigint, 'realTokenReserves': number | bigint, 'tokenTotalSupply': number | bigint, 'startTime': number | bigint, 'complete': boolean, 'bump': number }>({ 'discriminator': [0, array(u8(), { size: 8 })], 'mint': [8, publicKeySerializer()], 'creator': [40, publicKeySerializer()], 'initialVirtualTokenReserves': [72, u64()], 'virtualSolReserves': [80, u64()], 'virtualTokenReserves': [88, u64()], 'realSolReserves': [96, u64()], 'realTokenReserves': [104, u64()], 'tokenTotalSupply': [112, u64()], 'startTime': [120, i64()], 'complete': [128, bool()], 'bump': [129, u8()] })
7777
.deserializeUsing<BondingCurve>((account) => deserializeBondingCurve(account)) .whereField('discriminator', [23, 183, 248, 55, 96, 216, 172, 96])
@@ -89,7 +89,7 @@ export function findBondingCurvePda(
8989
mint: PublicKey;
9090
}
9191
): Pda {
92-
const programId = context.programs.getPublicKey('pumpScience', '6YBhe9qr2WQN7JUxCgSPeX4puM6YihAKxdPQ5pZaSJ1h');
92+
const programId = context.programs.getPublicKey('pumpScience', 'Fmktp2VXcDorWkAyzZAEG5X859mxKMV8XCcayKgZVwBo');
9393
return context.eddsa.findPda(programId, [
9494
string({ size: 'variable' }).serialize("bonding-curve"),
9595
publicKeySerializer().serialize(seeds.mint),

‎clients/js/src/generated/accounts/global.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export async function safeFetchAllGlobal(
7272
}
7373

7474
export function getGlobalGpaBuilder(context: Pick<Context, 'rpc' | 'programs'>) {
75-
const programId = context.programs.getPublicKey('pumpScience', '6YBhe9qr2WQN7JUxCgSPeX4puM6YihAKxdPQ5pZaSJ1h');
75+
const programId = context.programs.getPublicKey('pumpScience', 'Fmktp2VXcDorWkAyzZAEG5X859mxKMV8XCcayKgZVwBo');
7676
return gpaBuilder(context, programId)
7777
.registerFields<{ 'discriminator': Array<number>, 'status': ProgramStatusArgs, 'initialized': boolean, 'globalAuthority': PublicKey, 'migrationAuthority': PublicKey, 'migrateFeeAmount': number | bigint, 'feeReceiver': PublicKey, 'initialVirtualTokenReserves': number | bigint, 'initialVirtualSolReserves': number | bigint, 'initialRealTokenReserves': number | bigint, 'tokenTotalSupply': number | bigint, 'mintDecimals': number, 'meteoraConfig': PublicKey, 'whitelistEnabled': boolean }>({ 'discriminator': [0, array(u8(), { size: 8 })], 'status': [8, getProgramStatusSerializer()], 'initialized': [9, bool()], 'globalAuthority': [10, publicKeySerializer()], 'migrationAuthority': [42, publicKeySerializer()], 'migrateFeeAmount': [74, u64()], 'feeReceiver': [82, publicKeySerializer()], 'initialVirtualTokenReserves': [114, u64()], 'initialVirtualSolReserves': [122, u64()], 'initialRealTokenReserves': [130, u64()], 'tokenTotalSupply': [138, u64()], 'mintDecimals': [146, u8()], 'meteoraConfig': [147, publicKeySerializer()], 'whitelistEnabled': [179, bool()] })
7878
.deserializeUsing<Global>((account) => deserializeGlobal(account)) .whereField('discriminator', [167, 232, 232, 177, 200, 108, 114, 127])
@@ -86,7 +86,7 @@ export function getGlobalSize(): number {
8686
export function findGlobalPda(
8787
context: Pick<Context, 'eddsa' | 'programs'>,
8888
): Pda {
89-
const programId = context.programs.getPublicKey('pumpScience', '6YBhe9qr2WQN7JUxCgSPeX4puM6YihAKxdPQ5pZaSJ1h');
89+
const programId = context.programs.getPublicKey('pumpScience', 'Fmktp2VXcDorWkAyzZAEG5X859mxKMV8XCcayKgZVwBo');
9090
return context.eddsa.findPda(programId, [
9191
string({ size: 'variable' }).serialize("global"),
9292
]);

‎clients/js/src/generated/accounts/whitelist.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export async function safeFetchAllWhitelist(
7171
}
7272

7373
export function getWhitelistGpaBuilder(context: Pick<Context, 'rpc' | 'programs'>) {
74-
const programId = context.programs.getPublicKey('pumpScience', '6YBhe9qr2WQN7JUxCgSPeX4puM6YihAKxdPQ5pZaSJ1h');
74+
const programId = context.programs.getPublicKey('pumpScience', 'Fmktp2VXcDorWkAyzZAEG5X859mxKMV8XCcayKgZVwBo');
7575
return gpaBuilder(context, programId)
7676
.registerFields<{ 'discriminator': Array<number>, 'creator': PublicKey }>({ 'discriminator': [0, array(u8(), { size: 8 })], 'creator': [8, publicKeySerializer()] })
7777
.deserializeUsing<Whitelist>((account) => deserializeWhitelist(account)) .whereField('discriminator', [204, 176, 52, 79, 146, 121, 54, 247])

‎clients/js/src/generated/instructions/addWl.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export function addWl(
4141
input: AddWlInstructionAccounts & AddWlInstructionArgs,
4242
): TransactionBuilder {
4343
// Program ID.
44-
const programId = context.programs.getPublicKey('pumpScience', '6YBhe9qr2WQN7JUxCgSPeX4puM6YihAKxdPQ5pZaSJ1h');
44+
const programId = context.programs.getPublicKey('pumpScience', 'Fmktp2VXcDorWkAyzZAEG5X859mxKMV8XCcayKgZVwBo');
4545

4646
// Accounts.
4747
const resolvedAccounts = {

‎clients/js/src/generated/instructions/createBondingCurve.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export function createBondingCurve(
5151
input: CreateBondingCurveInstructionAccounts & CreateBondingCurveInstructionArgs,
5252
): TransactionBuilder {
5353
// Program ID.
54-
const programId = context.programs.getPublicKey('pumpScience', '6YBhe9qr2WQN7JUxCgSPeX4puM6YihAKxdPQ5pZaSJ1h');
54+
const programId = context.programs.getPublicKey('pumpScience', 'Fmktp2VXcDorWkAyzZAEG5X859mxKMV8XCcayKgZVwBo');
5555

5656
// Accounts.
5757
const resolvedAccounts = {

0 commit comments

Comments
 (0)