gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jack May
2020-08-12 14:41:58 -07:00
committed by GitHub
parent 54137e3446
commit be03731379
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web3.js/module.flow.js
View File

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

10
web3.js/src/bpf-loader.js
View File

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