Switch to BPFLoader2 and latest Solana (solana-labs#83)

Author: jackcmay

package-lock.json

@@ -9,7 +9,7 @@
   "keywords": [],
   "author": "",
   "license": "MIT",
-  "testnetDefaultChannel": "v1.3.15",
+  "testnetDefaultChannel": "v1.3.17",
   "scripts": {
     "start": "babel-node src/client/main.js",
     "lint": "npm run pretty && eslint .",
@@ -40,7 +40,7 @@
     "prettier": "^2.0.2"
   },
   "dependencies": {
-    "@solana/web3.js": "^0.78.2",
+    "@solana/web3.js": "^0.80.2",
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.3",
     "babel-eslint": "^10.0.1",

package.json

@@ -4,7 +4,7 @@ import {
   Account,
   Connection,
   BpfLoader,
-  BPF_LOADER_DEPRECATED_PROGRAM_ID,
+  BPF_LOADER_PROGRAM_ID,
   PublicKey,
   LAMPORTS_PER_SOL,
   SystemProgram,
@@ -122,7 +122,7 @@ export async function loadProgram(): Promise<void> {
     payerAccount,
     programAccount,
     data,
-    BPF_LOADER_DEPRECATED_PROGRAM_ID,
+    BPF_LOADER_PROGRAM_ID,
   );
   programId = programAccount.publicKey;
   console.log('Program loaded to account', programId.toBase58());

src/client/hello_world.js

@@ -2,7 +2,6 @@
  * @brief C-based Helloworld BPF program
  */
 #include <solana_sdk.h>
-#include <deserialize_deprecated.h>
 
 uint64_t helloworld(SolParameters *params) {
 
@@ -41,7 +40,7 @@ extern uint64_t entrypoint(const uint8_t *input) {
   SolAccountInfo accounts[1];
   SolParameters params = (SolParameters){.ka = accounts};
 
-  if (!sol_deserialize_deprecated(input, &params, SOL_ARRAY_SIZE(accounts))) {
+  if (!sol_deserialize(input, &params, SOL_ARRAY_SIZE(accounts))) {
     return ERROR_INVALID_ARGUMENT;
   }