feat: use bpf_loader2 as the default loader (#11457)

This commit is contained in:
Jack May 2020-08-12 14:41:58 -07:00 committed by GitHub
parent 54137e3446
commit be03731379
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions

View File

@ -944,7 +944,7 @@ declare module '@solana/web3.js' {
// === src/bpf-loader.js ===
declare export class BpfLoader {
static programId: PublicKey;
static programId(version: ?number): PublicKey;
static getMinNumSignatures(dataLength: number): number;
static load(
connection: Connection,

View File

@ -12,8 +12,12 @@ export class BpfLoader {
/**
* Public key that identifies the BpfLoader
*/
static get programId(): PublicKey {
return new PublicKey('BPFLoader1111111111111111111111111111111111');
static programId(version: number = 2): PublicKey {
if (version === 1) {
return new PublicKey('BPFLoader1111111111111111111111111111111111');
} else {
return new PublicKey('BPFLoader2111111111111111111111111111111111');
}
}
/**
@ -40,6 +44,6 @@ export class BpfLoader {
program: Account,
elf: Buffer | Uint8Array | Array<number>,
): Promise<void> {
return Loader.load(connection, payer, program, BpfLoader.programId, elf);
return Loader.load(connection, payer, program, BpfLoader.programId(), elf);
}
}