Update anchor-lang to the latest version (solution branch)

Anchor.toml

@@ -5,7 +5,7 @@ resolution = true
 skip-lint = false
 
 [programs.localnet]
-duplicate_mutable_accounts = "Lo5sj2wWy4BHbe8kCSUvgdhzFbv9c6CEERfgAXusBj9"
+duplicate_mutable_accounts = "CSp7FzR2rCzq4AHQcU57wJ4gxmFp8Q7CFHNziTdmQAZC"
 
 [registry]
 url = "https://api.apr.dev"

Cargo.toml

@@ -1,7 +1,5 @@
 [workspace]
-members = [
-    "programs/*"
-]
+members = ["programs/*"]
 resolver = "2"
 
 [profile.release]

package.json

@@ -4,15 +4,15 @@
         "lint": "prettier */*.js \"*/**/*{.js,.ts}\" --check"
     },
     "dependencies": {
-        "@coral-xyz/anchor": "^0.30.1"
+        "@coral-xyz/anchor": "^0.30.1",
+        "@project-serum/anchor": "^0.25.0"
     },
     "devDependencies": {
         "@types/bn.js": "^5.1.0",
         "@types/chai": "^4.3.0",
-        "@types/mocha": "^9.1.1",
-        "@types/node": "^22.5.1",
+        "@types/mocha": "^9.0.0",
         "chai": "^4.3.4",
-        "mocha": "^9.2.2",
+        "mocha": "^9.0.3",
         "prettier": "^2.6.2",
         "ts-mocha": "^10.0.0",
         "typescript": "^4.3.5"

programs/duplicate-mutable-accounts/src/lib.rs

@@ -1,9 +1,8 @@
 use anchor_lang::prelude::*;
 
-mod constants;
-use constants::DISCRIMINATOR_SIZE;
+declare_id!("CSp7FzR2rCzq4AHQcU57wJ4gxmFp8Q7CFHNziTdmQAZC");
 
-declare_id!("Lo5sj2wWy4BHbe8kCSUvgdhzFbv9c6CEERfgAXusBj9");
+const DISCRIMINATOR_SIZE: usize = 8;
 
 #[program]
 pub mod duplicate_mutable_accounts {
@@ -21,6 +20,7 @@ pub mod duplicate_mutable_accounts {
         player_two_choice: RockPaperScissors,
     ) -> Result<()> {
         ctx.accounts.player_one.choice = Some(player_one_choice);
+
         ctx.accounts.player_two.choice = Some(player_two_choice);
         Ok(())
     }
@@ -31,6 +31,7 @@ pub mod duplicate_mutable_accounts {
         player_two_choice: RockPaperScissors,
     ) -> Result<()> {
         ctx.accounts.player_one.choice = Some(player_one_choice);
+
         ctx.accounts.player_two.choice = Some(player_two_choice);
         Ok(())
     }
@@ -69,13 +70,13 @@ pub struct RockPaperScissorsSecure<'info> {
 }
 
 #[account]
-#[derive(Default, InitSpace)]
+#[derive(InitSpace)]
 pub struct PlayerState {
-    pub player: Pubkey,
-    pub choice: Option<RockPaperScissors>,
+    player: Pubkey,
+    choice: Option<RockPaperScissors>,
 }
 
-#[derive(AnchorSerialize, AnchorDeserialize, Clone, Copy, PartialEq, Eq, InitSpace)]
+#[derive(Clone, Copy, AnchorDeserialize, AnchorSerialize, InitSpace)]
 pub enum RockPaperScissors {
     Rock,
     Paper,

tests/duplicate-mutable-accounts.ts

@@ -1,5 +1,5 @@
 import * as anchor from "@coral-xyz/anchor";
-import { Program } from "@coral-xyz/anchor";
+import { Program, Wallet } from "@coral-xyz/anchor";
 import { assert, expect } from "chai";
 import { DuplicateMutableAccounts } from "../target/types/duplicate_mutable_accounts";
 
@@ -14,7 +14,7 @@ describe("duplicate-mutable-accounts", () => {
   const playerOne = anchor.web3.Keypair.generate();
   const playerTwo = anchor.web3.Keypair.generate();
 
-  it("Initialized Player One", async () => {
+  it("Initialized Player One should be successful", async () => {
     await program.methods
       .initialize()
       .accounts({
@@ -25,7 +25,7 @@ describe("duplicate-mutable-accounts", () => {
       .rpc();
   });
 
-  it("Initialized Player Two", async () => {
+  it("Initialized Player Two should be successful", async () => {
     await program.methods
       .initialize()
       .accounts({
@@ -36,7 +36,7 @@ describe("duplicate-mutable-accounts", () => {
       .rpc();
   });
 
-  it("Invoke insecure instruction", async () => {
+  it("Invoke insecure instruction with the same player should be successful", async () => {
     await program.methods
       .rockPaperScissorsShootInsecure({ rock: {} }, { scissors: {} })
       .accounts({
@@ -50,7 +50,7 @@ describe("duplicate-mutable-accounts", () => {
     assert.notEqual(JSON.stringify(p1.choice), JSON.stringify({ rock: {} }));
   });
 
-  it("Invoke secure instruction", async () => {
+  it("Invoke secure instruction with different players should be successful", async () => {
     await program.methods
       .rockPaperScissorsShootSecure({ rock: {} }, { scissors: {} })
       .accounts({
@@ -65,7 +65,7 @@ describe("duplicate-mutable-accounts", () => {
     assert.equal(JSON.stringify(p2.choice), JSON.stringify({ scissors: {} }));
   });
 
-  it("Invoke secure instruction - expect error", async () => {
+  it("Invoke secure instruction with the same player should throw an expection", async () => {
     try {
       await program.methods
         .rockPaperScissorsShootSecure({ rock: {} }, { scissors: {} })
@@ -79,4 +79,4 @@ describe("duplicate-mutable-accounts", () => {
       console.log(err);
     }
   });
-});
+});