Skip to content

Commit

Permalink
Use deprecated bpf loader (solana-labs#307)
Browse files Browse the repository at this point in the history
* Use deprecated bpf loader

* bump web3.js to pick up fixed flow defs
  • Loading branch information
jackcmay authored Aug 24, 2020
1 parent dc00c83 commit 65aeff5
Show file tree
Hide file tree
Showing 6 changed files with 63 additions and 44 deletions.
2 changes: 1 addition & 1 deletion token-swap/js/cli/token-swap-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ async function loadProgram(connection: Connection, path: string): Promise<Public
const from = await newAccountWithLamports(connection, balanceNeeded);
const program_account = new Account();
console.log('Loading program:', path);
await BpfLoader.load(connection, from, program_account, data);
await BpfLoader.load(connection, from, program_account, data, 1);
return program_account.publicKey;
}

Expand Down
51 changes: 32 additions & 19 deletions token-swap/js/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions token-swap/js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"type": "git",
"url": "https://github.com/solana-labs/solana-program-library"
},
"testnetDefaultChannel": "v1.3.2",
"testnetDefaultChannel": "v1.3.4",
"scripts": {
"start": "babel-node --ignore node_modules cli/main.js",
"lint": "npm run pretty && eslint .",
Expand All @@ -29,7 +29,7 @@
"license": "MIT",
"dependencies": {
"@babel/runtime": "^7.11.2",
"@solana/web3.js": "^0.71.1",
"@solana/web3.js": "^0.71.6",
"bn.js": "^5.0.0",
"buffer-layout": "^1.2.0",
"dotenv": "8.2.0",
Expand Down
2 changes: 1 addition & 1 deletion token/js/cli/token-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ async function loadProgram(
const from = await newAccountWithLamports(connection, balanceNeeded);
const program_account = new Account();
console.log('Loading program:', path);
await BpfLoader.load(connection, from, program_account, data);
await BpfLoader.load(connection, from, program_account, data, 1);
return program_account.publicKey;
}

Expand Down
44 changes: 25 additions & 19 deletions token/js/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions token/js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"/lib",
"/module.flow.js"
],
"testnetDefaultChannel": "v1.3.2",
"testnetDefaultChannel": "v1.3.4",
"scripts": {
"build": "rollup -c",
"start": "babel-node cli/main.js",
Expand All @@ -44,7 +44,7 @@
},
"dependencies": {
"@babel/runtime": "^7.10.5",
"@solana/web3.js": "^0.71.1",
"@solana/web3.js": "^0.71.6",
"bn.js": "^5.0.0",
"buffer-layout": "^1.2.0",
"dotenv": "8.2.0",
Expand Down

0 comments on commit 65aeff5

Please sign in to comment.