Update to @solana/web3.js 0.12.1

package.json

@@ -32,7 +32,7 @@
     "prettier": "^1.14.3"
   },
   "dependencies": {
-    "@solana/web3.js": "0.11.10",
+    "@solana/web3.js": "0.12.1",
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.3",
     "babel-eslint": "^8.2.6",

program-bpf/src/tictactoe.c

@@ -227,10 +227,11 @@ extern bool entrypoint(const uint8_t *input) {
   uint64_t ka_len;
   const uint8_t *instruction_data;
   uint64_t instruction_data_len;
+  SolClusterInfo info;
 
   sol_log("tic-tac-toe program entrypoint");
 
-  if (!sol_deserialize(input, ka, SOL_ARRAY_SIZE(ka), &ka_len, &instruction_data, &instruction_data_len)) {
+  if (!sol_deserialize(input, ka, SOL_ARRAY_SIZE(ka), &ka_len, &instruction_data, &instruction_data_len, &info)) {
     sol_log("Error: deserialize failed");
     return false;
   }
@@ -333,6 +334,7 @@ extern bool entrypoint(const uint8_t *input) {
       sol_log("Error: 3rd key is not a game account");
       return false;
     }
+    if (ka[2].owner
     sol_log("Command_UpdateDashboard");
     return dashboard_update(&state_data->dashboard, ka[2].key, &game_state_data->game);
 

src/program/tic-tac-toe-dashboard.js

@@ -79,8 +79,8 @@ export class TicTacToeDashboard {
       await sendAndConfirmTransaction(
         'initDashboard',
         connection,
-        dashboardAccount,
         transaction,
+        dashboardAccount,
       );
     }
 
@@ -101,12 +101,12 @@ export class TicTacToeDashboard {
     dashboardPublicKey: PublicKey,
   ): Promise<TicTacToeDashboard> {
     const accountInfo = await connection.getAccountInfo(dashboardPublicKey);
-    const {programId} = accountInfo;
+    const {owner} = accountInfo;
 
     const tempAccount = await newSystemAccountWithAirdrop(connection, 123);
     const dashboard = new TicTacToeDashboard(
       connection,
-      programId,
+      owner,
       dashboardPublicKey,
       tempAccount,
     );
@@ -126,8 +126,8 @@ export class TicTacToeDashboard {
     await sendAndConfirmTransaction(
       'updateDashboard',
       this.connection,
-      this.clientAccount,
       transaction,
+      this.clientAccount,
     );
   }
 

src/program/tic-tac-toe.js

@@ -142,8 +142,8 @@ export class TicTacToe {
       await sendAndConfirmTransaction(
         'initGame',
         connection,
-        gameAccount,
         transaction,
+        gameAccount,
       );
     }
 
@@ -183,8 +183,8 @@ export class TicTacToe {
       await sendAndConfirmTransaction(
         'joinGame',
         connection,
-        playerOAccount,
         transaction,
+        playerOAccount,
       );
     }
 
@@ -205,9 +205,8 @@ export class TicTacToe {
     await sendAndConfirmTransaction(
       'keepAlive',
       this.connection,
-      this.playerAccount,
       transaction,
-      true,
+      this.playerAccount,
     );
   }
 
@@ -231,9 +230,8 @@ export class TicTacToe {
     await sendAndConfirmTransaction(
       `move(${x + 1},${y + 1})`,
       this.connection,
-      this.playerAccount,
       transaction,
-      true,
+      this.playerAccount,
     );
   }
 

src/util/new-program-account.js

@@ -33,8 +33,8 @@ export async function newProgramAccount(
   await sendAndConfirmTransaction(
     'SystemProgram.createAccount',
     connection,
-    from,
     transaction,
+    from,
   );
   return stateAccount;
 }

src/util/send-and-confirm-transaction.js

@@ -15,22 +15,20 @@ export function onTransaction(callback: TransactionNotification) {
 export async function sendAndConfirmTransaction(
   title: string,
   connection: Connection,
-  from: Account,
   transaction: Transaction,
-  runtimeErrorOk: boolean = false,
+  ...signers: Array<Account>
 ): Promise<void> {
   const when = Date.now();
 
   const signature = await realSendAndConfirmTransaction(
     connection,
-    from,
     transaction,
-    runtimeErrorOk,
+    ...signers,
   );
 
   const body = {
     time: new Date(when).toString(),
-    from: from.publicKey.toBase58(),
+    from: signers[0].publicKey.toBase58(),
     signature,
     instructions: transaction.instructions.map(i => {
       return {