remove payer
Signed-off-by: microwavedcola1 <microwavedcola@gmail.com>
This commit is contained in:
parent
c7c2c548e9
commit
8835191f1f
|
@ -1,5 +1,4 @@
|
||||||
import {
|
import {
|
||||||
Keypair,
|
|
||||||
PublicKey,
|
PublicKey,
|
||||||
SYSVAR_RENT_PUBKEY,
|
SYSVAR_RENT_PUBKEY,
|
||||||
Transaction,
|
Transaction,
|
||||||
|
@ -88,22 +87,19 @@ export async function registerToken(
|
||||||
adminPk: PublicKey,
|
adminPk: PublicKey,
|
||||||
mintPk: PublicKey,
|
mintPk: PublicKey,
|
||||||
oraclePk: PublicKey,
|
oraclePk: PublicKey,
|
||||||
payer: Keypair,
|
|
||||||
tokenIndex: number,
|
tokenIndex: number,
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const tx = new Transaction();
|
const tx = new Transaction();
|
||||||
const signers = [payer];
|
|
||||||
const ix = await registerTokenIx(
|
const ix = await registerTokenIx(
|
||||||
client,
|
client,
|
||||||
groupPk,
|
groupPk,
|
||||||
adminPk,
|
adminPk,
|
||||||
mintPk,
|
mintPk,
|
||||||
oraclePk,
|
oraclePk,
|
||||||
payer,
|
|
||||||
tokenIndex,
|
tokenIndex,
|
||||||
);
|
);
|
||||||
tx.add(ix);
|
tx.add(ix);
|
||||||
await client.program.provider.send(tx, signers);
|
await client.program.provider.send(tx);
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function registerTokenIx(
|
export async function registerTokenIx(
|
||||||
|
@ -112,7 +108,6 @@ export async function registerTokenIx(
|
||||||
adminPk: PublicKey,
|
adminPk: PublicKey,
|
||||||
mintPk: PublicKey,
|
mintPk: PublicKey,
|
||||||
oraclePk: PublicKey,
|
oraclePk: PublicKey,
|
||||||
payer: Keypair,
|
|
||||||
tokenIndex: number,
|
tokenIndex: number,
|
||||||
): Promise<TransactionInstruction> {
|
): Promise<TransactionInstruction> {
|
||||||
return await client.program.methods
|
return await client.program.methods
|
||||||
|
@ -122,10 +117,9 @@ export async function registerTokenIx(
|
||||||
admin: adminPk,
|
admin: adminPk,
|
||||||
mint: mintPk,
|
mint: mintPk,
|
||||||
oracle: oraclePk,
|
oracle: oraclePk,
|
||||||
payer: payer.publicKey,
|
payer: adminPk,
|
||||||
rent: SYSVAR_RENT_PUBKEY,
|
rent: SYSVAR_RENT_PUBKEY,
|
||||||
})
|
})
|
||||||
.signers([payer])
|
|
||||||
.instruction();
|
.instruction();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
import {
|
import {
|
||||||
Keypair,
|
|
||||||
PublicKey,
|
PublicKey,
|
||||||
Transaction,
|
Transaction,
|
||||||
TransactionInstruction,
|
TransactionInstruction,
|
||||||
|
@ -17,27 +16,23 @@ export class Group {
|
||||||
export async function createGroup(
|
export async function createGroup(
|
||||||
client: MangoClient,
|
client: MangoClient,
|
||||||
adminPk: PublicKey,
|
adminPk: PublicKey,
|
||||||
payer: Keypair,
|
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const tx = new Transaction();
|
const tx = new Transaction();
|
||||||
const signers = [payer];
|
const ix = await createGroupIx(client, adminPk);
|
||||||
const ix = await createGroupIx(client, adminPk, payer);
|
|
||||||
tx.add(ix);
|
tx.add(ix);
|
||||||
await client.program.provider.send(tx, signers);
|
await client.program.provider.send(tx);
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function createGroupIx(
|
export async function createGroupIx(
|
||||||
client: MangoClient,
|
client: MangoClient,
|
||||||
adminPk: PublicKey,
|
adminPk: PublicKey,
|
||||||
payer: Keypair,
|
|
||||||
): Promise<TransactionInstruction> {
|
): Promise<TransactionInstruction> {
|
||||||
return await client.program.methods
|
return await client.program.methods
|
||||||
.createGroup()
|
.createGroup()
|
||||||
.accounts({
|
.accounts({
|
||||||
admin: adminPk,
|
admin: adminPk,
|
||||||
payer: payer.publicKey,
|
payer: adminPk,
|
||||||
})
|
})
|
||||||
.signers([payer])
|
|
||||||
.instruction();
|
.instruction();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -137,29 +137,26 @@ export async function createMangoAccount(
|
||||||
client: MangoClient,
|
client: MangoClient,
|
||||||
groupPk: PublicKey,
|
groupPk: PublicKey,
|
||||||
ownerPk: PublicKey,
|
ownerPk: PublicKey,
|
||||||
payer: Keypair,
|
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const tx = new Transaction();
|
const tx = new Transaction();
|
||||||
const signers = [payer];
|
const ix = await createMangoAccountIx(client, groupPk, ownerPk);
|
||||||
const ix = await createMangoAccountIx(client, groupPk, ownerPk, payer);
|
|
||||||
tx.add(ix);
|
tx.add(ix);
|
||||||
await client.program.provider.send(tx, signers);
|
await client.program.provider.send(tx);
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function createMangoAccountIx(
|
export async function createMangoAccountIx(
|
||||||
client: MangoClient,
|
client: MangoClient,
|
||||||
groupPk: PublicKey,
|
groupPk: PublicKey,
|
||||||
ownerPk: PublicKey,
|
ownerPk: PublicKey,
|
||||||
payer: Keypair,
|
|
||||||
): Promise<TransactionInstruction> {
|
): Promise<TransactionInstruction> {
|
||||||
return await client.program.methods
|
return await client.program.methods
|
||||||
.createAccount(11)
|
.createAccount(11)
|
||||||
.accounts({
|
.accounts({
|
||||||
group: groupPk,
|
group: groupPk,
|
||||||
owner: ownerPk,
|
owner: ownerPk,
|
||||||
payer: payer.publicKey,
|
payer: ownerPk
|
||||||
})
|
})
|
||||||
.signers([payer])
|
.signers()
|
||||||
.instruction();
|
.instruction();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,6 @@ export async function createStubOracle(
|
||||||
groupPk: PublicKey,
|
groupPk: PublicKey,
|
||||||
adminPk: PublicKey,
|
adminPk: PublicKey,
|
||||||
tokenMintPk: PublicKey,
|
tokenMintPk: PublicKey,
|
||||||
payer: Keypair,
|
|
||||||
staticPrice: number,
|
staticPrice: number,
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
return await client.program.methods
|
return await client.program.methods
|
||||||
|
@ -52,9 +51,8 @@ export async function createStubOracle(
|
||||||
group: groupPk,
|
group: groupPk,
|
||||||
admin: adminPk,
|
admin: adminPk,
|
||||||
tokenMint: tokenMintPk,
|
tokenMint: tokenMintPk,
|
||||||
payer: payer.publicKey,
|
payer: adminPk
|
||||||
})
|
})
|
||||||
.signers([payer])
|
|
||||||
.rpc();
|
.rpc();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -63,7 +61,6 @@ export async function setStubOracle(
|
||||||
groupPk: PublicKey,
|
groupPk: PublicKey,
|
||||||
adminPk: PublicKey,
|
adminPk: PublicKey,
|
||||||
tokenMintPk: PublicKey,
|
tokenMintPk: PublicKey,
|
||||||
payer: Keypair,
|
|
||||||
staticPrice: number,
|
staticPrice: number,
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
return await client.program.methods
|
return await client.program.methods
|
||||||
|
@ -72,9 +69,8 @@ export async function setStubOracle(
|
||||||
group: groupPk,
|
group: groupPk,
|
||||||
admin: adminPk,
|
admin: adminPk,
|
||||||
tokenMint: tokenMintPk,
|
tokenMint: tokenMintPk,
|
||||||
payer: payer.publicKey,
|
payer: adminPk
|
||||||
})
|
})
|
||||||
.signers([payer])
|
|
||||||
.rpc();
|
.rpc();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
import {
|
import {
|
||||||
AccountMeta,
|
AccountMeta,
|
||||||
Keypair,
|
|
||||||
PublicKey,
|
PublicKey,
|
||||||
Transaction,
|
Transaction,
|
||||||
TransactionInstruction,
|
TransactionInstruction,
|
||||||
|
@ -53,7 +52,6 @@ export async function serum3RegisterMarket(
|
||||||
serumMarketExternalPk: PublicKey,
|
serumMarketExternalPk: PublicKey,
|
||||||
quoteBankPk: PublicKey,
|
quoteBankPk: PublicKey,
|
||||||
baseBankPk: PublicKey,
|
baseBankPk: PublicKey,
|
||||||
payer: Keypair,
|
|
||||||
marketIndex: number,
|
marketIndex: number,
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const tx = new Transaction();
|
const tx = new Transaction();
|
||||||
|
@ -65,11 +63,10 @@ export async function serum3RegisterMarket(
|
||||||
serumMarketExternalPk,
|
serumMarketExternalPk,
|
||||||
quoteBankPk,
|
quoteBankPk,
|
||||||
baseBankPk,
|
baseBankPk,
|
||||||
payer,
|
|
||||||
marketIndex,
|
marketIndex,
|
||||||
);
|
);
|
||||||
tx.add(ix);
|
tx.add(ix);
|
||||||
await client.program.provider.send(tx, [payer]);
|
await client.program.provider.send(tx);
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function serum3RegisterMarketIx(
|
export async function serum3RegisterMarketIx(
|
||||||
|
@ -80,7 +77,6 @@ export async function serum3RegisterMarketIx(
|
||||||
serumMarketExternalPk: PublicKey,
|
serumMarketExternalPk: PublicKey,
|
||||||
quoteBankPk: PublicKey,
|
quoteBankPk: PublicKey,
|
||||||
baseBankPk: PublicKey,
|
baseBankPk: PublicKey,
|
||||||
payer: Keypair,
|
|
||||||
marketIndex: number,
|
marketIndex: number,
|
||||||
): Promise<TransactionInstruction> {
|
): Promise<TransactionInstruction> {
|
||||||
return await client.program.methods
|
return await client.program.methods
|
||||||
|
@ -92,7 +88,7 @@ export async function serum3RegisterMarketIx(
|
||||||
serumMarketExternal: serumMarketExternalPk,
|
serumMarketExternal: serumMarketExternalPk,
|
||||||
quoteBank: quoteBankPk,
|
quoteBank: quoteBankPk,
|
||||||
baseBank: baseBankPk,
|
baseBank: baseBankPk,
|
||||||
payer: payer.publicKey,
|
payer: adminPk,
|
||||||
})
|
})
|
||||||
.instruction();
|
.instruction();
|
||||||
}
|
}
|
||||||
|
@ -144,7 +140,6 @@ export async function serum3CreateOpenOrders(
|
||||||
serumProgramPk: PublicKey,
|
serumProgramPk: PublicKey,
|
||||||
serumMarketExternalPk: PublicKey,
|
serumMarketExternalPk: PublicKey,
|
||||||
ownerPk: PublicKey,
|
ownerPk: PublicKey,
|
||||||
payer: Keypair,
|
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
return await client.program.methods
|
return await client.program.methods
|
||||||
.serum3CreateOpenOrders()
|
.serum3CreateOpenOrders()
|
||||||
|
@ -155,9 +150,8 @@ export async function serum3CreateOpenOrders(
|
||||||
serumProgram: serumProgramPk,
|
serumProgram: serumProgramPk,
|
||||||
serumMarketExternal: serumMarketExternalPk,
|
serumMarketExternal: serumMarketExternalPk,
|
||||||
owner: ownerPk,
|
owner: ownerPk,
|
||||||
payer: payer.publicKey,
|
payer: ownerPk,
|
||||||
})
|
})
|
||||||
.signers([payer])
|
|
||||||
.rpc();
|
.rpc();
|
||||||
}
|
}
|
||||||
export class Serum3SelfTradeBehavior {
|
export class Serum3SelfTradeBehavior {
|
||||||
|
|
|
@ -57,12 +57,12 @@ async function main() {
|
||||||
const adminProvider = new Provider(connection, adminWallet, options);
|
const adminProvider = new Provider(connection, adminWallet, options);
|
||||||
const adminClient = await MangoClient.connect(adminProvider, true);
|
const adminClient = await MangoClient.connect(adminProvider, true);
|
||||||
|
|
||||||
const payer = Keypair.fromSecretKey(
|
// const payer = Keypair.fromSecretKey(
|
||||||
Buffer.from(
|
// Buffer.from(
|
||||||
JSON.parse(fs.readFileSync(process.env.PAYER_KEYPAIR!, 'utf-8')),
|
// JSON.parse(fs.readFileSync(process.env.PAYER_KEYPAIR!, 'utf-8')),
|
||||||
),
|
// ),
|
||||||
);
|
// );
|
||||||
console.log(`Payer ${payer.publicKey.toBase58()}`);
|
// console.log(`Payer ${payer.publicKey.toBase58()}`);
|
||||||
//
|
//
|
||||||
// Find existing or create a new group
|
// Find existing or create a new group
|
||||||
//
|
//
|
||||||
|
@ -71,7 +71,7 @@ async function main() {
|
||||||
getGroupForAdmin,
|
getGroupForAdmin,
|
||||||
[adminClient, admin.publicKey],
|
[adminClient, admin.publicKey],
|
||||||
createGroup,
|
createGroup,
|
||||||
[adminClient, admin.publicKey, payer],
|
[adminClient, admin.publicKey],
|
||||||
);
|
);
|
||||||
console.log(`Group ${group.publicKey}`);
|
console.log(`Group ${group.publicKey}`);
|
||||||
|
|
||||||
|
@ -86,7 +86,7 @@ async function main() {
|
||||||
getStubOracleForGroupAndMint,
|
getStubOracleForGroupAndMint,
|
||||||
[adminClient, group.publicKey, usdcDevnetMint],
|
[adminClient, group.publicKey, usdcDevnetMint],
|
||||||
createStubOracle,
|
createStubOracle,
|
||||||
[adminClient, group.publicKey, admin.publicKey, usdcDevnetMint, payer, 1],
|
[adminClient, group.publicKey, admin.publicKey, usdcDevnetMint, 1],
|
||||||
);
|
);
|
||||||
console.log(
|
console.log(
|
||||||
`usdcDevnetStubOracle ${usdcDevnetStubOracle.publicKey.toBase58()}`,
|
`usdcDevnetStubOracle ${usdcDevnetStubOracle.publicKey.toBase58()}`,
|
||||||
|
@ -114,7 +114,7 @@ async function main() {
|
||||||
admin.publicKey,
|
admin.publicKey,
|
||||||
btcDevnetMint,
|
btcDevnetMint,
|
||||||
btcDevnetOracle,
|
btcDevnetOracle,
|
||||||
payer,
|
|
||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
@ -130,7 +130,7 @@ async function main() {
|
||||||
admin.publicKey,
|
admin.publicKey,
|
||||||
usdcDevnetMint,
|
usdcDevnetMint,
|
||||||
usdcDevnetStubOracle.publicKey,
|
usdcDevnetStubOracle.publicKey,
|
||||||
payer,
|
|
||||||
1,
|
1,
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
@ -158,7 +158,7 @@ async function main() {
|
||||||
getMangoAccountsForGroupAndOwner,
|
getMangoAccountsForGroupAndOwner,
|
||||||
[userClient, group.publicKey, user.publicKey],
|
[userClient, group.publicKey, user.publicKey],
|
||||||
createMangoAccount,
|
createMangoAccount,
|
||||||
[userClient, group.publicKey, user.publicKey, payer],
|
[userClient, group.publicKey, user.publicKey],
|
||||||
);
|
);
|
||||||
console.log(`MangoAccount ${mangoAccount.publicKey}`);
|
console.log(`MangoAccount ${mangoAccount.publicKey}`);
|
||||||
|
|
||||||
|
@ -196,7 +196,6 @@ async function main() {
|
||||||
serumMarketExternalPk,
|
serumMarketExternalPk,
|
||||||
usdcBank.publicKey,
|
usdcBank.publicKey,
|
||||||
btcBank.publicKey,
|
btcBank.publicKey,
|
||||||
payer,
|
|
||||||
0,
|
0,
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
@ -215,7 +214,6 @@ async function main() {
|
||||||
serumProgramId,
|
serumProgramId,
|
||||||
serumMarketExternalPk,
|
serumMarketExternalPk,
|
||||||
user.publicKey,
|
user.publicKey,
|
||||||
payer,
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue