:arrow_up: Upgrading Anchor, Solana and Rust (#172)

.github/workflows/publish-bolt-crates.yml

@@ -49,7 +49,7 @@ jobs:
       - name: install rust
         uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.81.0
+          toolchain: stable
 
       - name: Cache rust
         uses: Swatinem/rust-cache@v2
@@ -72,7 +72,7 @@ jobs:
       - name: Run fmt
         run: cargo fmt -- --check --verbose
       - name: Run clippy
-        run: cargo clippy -- --deny=warnings
+        run: cargo clippy -- --deny=warnings --allow=unexpected_cfgs
 
   test-and-publish:
     needs: [clippy-lint]
@@ -82,7 +82,7 @@ jobs:
       - name: install rust
         uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.81.0
+          toolchain: stable
 
       - name: Cache rust
         uses: Swatinem/rust-cache@v2

.github/workflows/publish-bolt-sdk.yml

@@ -49,7 +49,7 @@ jobs:
       - name: install rust
         uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.81.0
+          toolchain: stable
 
       - name: Cache rust
         uses: Swatinem/rust-cache@v2
@@ -92,7 +92,7 @@ jobs:
       - name: install rust
         uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.81.0
+          toolchain: stable
 
       - name: Cache rust
         uses: Swatinem/rust-cache@v2

.github/workflows/publish-packages.yml

@@ -23,43 +23,43 @@ jobs:
           - {
             NAME: linux-x64-glibc,
             OS: ubuntu-latest,
-            TOOLCHAIN: 1.81.0,
+            TOOLCHAIN: stable,
             TARGET: x86_64-unknown-linux-gnu,
           }
           - {
             NAME: linux-x86-glibc,
             OS: ubuntu-latest,
-            TOOLCHAIN: 1.81.0,
+            TOOLCHAIN: stable,
             TARGET: i686-unknown-linux-gnu,
           }
           - {
             NAME: linux-arm64-glibc,
             OS: ubuntu-latest,
-            TOOLCHAIN: 1.81.0,
+            TOOLCHAIN: stable,
             TARGET: aarch64-unknown-linux-gnu,
           }
           - {
             NAME: win32-x64-msvc,
             OS: windows-latest,
-            TOOLCHAIN: 1.81.0,
+            TOOLCHAIN: stable,
             TARGET: x86_64-pc-windows-msvc,
           }
           - {
             NAME: win32-x86-msvc,
             OS: windows-latest,
-            TOOLCHAIN: 1.81.0,
+            TOOLCHAIN: stable,
             TARGET: i686-pc-windows-msvc,
           }
           - {
             NAME: darwin-x64,
             OS: macos-latest,
-            TOOLCHAIN: 1.81.0,
+            TOOLCHAIN: stable,
             TARGET: x86_64-apple-darwin,
           }
           - {
             NAME: darwin-arm64,
             OS: macos-latest,
-            TOOLCHAIN: 1.81.0,
+            TOOLCHAIN: stable,
             TARGET: aarch64-apple-darwin,
           }
     steps:
@@ -85,7 +85,7 @@ jobs:
           fi
 
       - name: Install Rust toolchain
-        uses: actions-rs/toFolchain@v1
+        uses: actions-rs/toolchain@v1
         with:
           toolchain: ${{ matrix.build.TOOLCHAIN }}
           target: ${{ matrix.build.TARGET }}

.github/workflows/run-lint.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.81.0
+          toolchain: stable
 
       - name: Cache Rust
         uses: Swatinem/rust-cache@v2
@@ -64,7 +64,7 @@ jobs:
         run: |
           if [ "${{ matrix.task }}" == "clippy" ]; then
             cargo fmt -- --check --verbose
-            cargo clippy -- --deny=warnings
+            cargo clippy -- --deny=warnings --allow=unexpected_cfgs
           else
             yarn lint
           fi

.github/workflows/run-tests.yml

@@ -3,7 +3,7 @@ on:
   push:
     branches:
       - main
-  pull_request_target:
+  pull_request:
     branches:
       - main
 
@@ -35,7 +35,7 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.81.0
+          toolchain: stable
 
       - name: Cache Rust
         uses: Swatinem/rust-cache@v2
@@ -56,7 +56,7 @@ jobs:
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.81.0
+          toolchain: stable
 
       - name: Cache Rust
         uses: Swatinem/rust-cache@v2

Cargo.toml

@@ -36,28 +36,28 @@ bolt-system = { path = "crates/programs/bolt-system", features = ["cpi"], versio
 bolt-component = { path = "crates/programs/bolt-component", features = ["cpi"], version = "=0.2.2"}
 
 ## External crates
-session-keys       = { version = "=2.0.6", features = ["no-entrypoint"] }
-anchor-lang        = { version = "=0.30.1", features = ["init-if-needed"] }
-anchor-cli         = { version = "=0.30.1" }
-anchor-client      = { version = "=0.30.1", features = ["async"] }
-anchor-syn         = { version = "=0.30.1" }
-anchor-lang-idl = { version = "=0.1.1" }
-solana-program  = { version = "=1.18.26" }
-solana-client   = { version = "=1.18.26" }
-mpl-token-metadata = { version = "=4.1.2" }
-solana-security-txt = "1.1.1"
+session-keys       = { version = ">=2.0.7", features = ["no-entrypoint"] }
+anchor-lang        = { version = ">=0.31.1", features = ["init-if-needed"] }
+anchor-cli         = { version = ">=0.31.1" }
+anchor-client      = { version = ">=0.31.1", features = ["async"] }
+anchor-syn         = { version = ">=0.31.1" }
+anchor-lang-idl = { version = ">=0.1.2" }
+solana-program  = { version = ">=2.0.25" }
+solana-client   = { version = ">=2.0.25" }
+mpl-token-metadata = { version = ">=5.1.0" }
+solana-security-txt = ">=1.1.1"
 tuple-conv = "1.0.1"
 syn = { version = "1.0.60", features = ["full"] }
-ligen-ir = { version = "=0.1.18" }
+ligen-ir = "=0.1.18"
 quote = "1.0"
-proc-macro2 = "1.0"
+proc-macro2 = "=1.0.95"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 anyhow = "1.0.32"
 heck = "0.5.0"
 clap = { version = "4.2.4", features = ["derive"] }
 ahash = "=0.8.11"
-ephemeral-rollups-sdk = "=0.2.1"
+ephemeral-rollups-sdk = "0.2.5"
 bincode = "=1.3.3"
 which = "7.0.2"
 tokio = { version = "1", features = ["full"] }

clients/csharp/Solana.Unity.Bolt.Test/AccelerationTest.cs

@@ -21,9 +21,10 @@ namespace AccelerationTest {
             await Profiler.Run("DelegateComponent", async () => {
                 await DelegateComponent(framework);
             });
-            await Profiler.Run("ApplySimpleMovementSystemOnAccelerator 10", async () => {
-                await ApplySimpleMovementSystemOnAccelerator(framework);
-            });
+            // TODO: Re-enable this test when ephemeral-validator is properly installed on the CI.
+            // await Profiler.Run("ApplySimpleMovementSystemOnAccelerator 10", async () => {
+            //     await ApplySimpleMovementSystemOnAccelerator(framework);
+            // });
         }
 
         public static async Task AddAccelerationEntity(Framework framework) {
@@ -43,20 +44,19 @@ namespace AccelerationTest {
             await framework.SendAndConfirmInstruction(delegateComponent.Instruction);
         }
 
-        // TODO: Re-enable this test when ephemeral-validator is properly installed on the CI.
-        // public static async Task ApplySimpleMovementSystemOnAccelerator(Framework framework) {
-        //     for (int i = 0; i < 10; i++) {
-        //         var apply = new ApplyAccounts() {
-        //             Authority = framework.Wallet.Account.PublicKey,
-        //             BoltSystem = framework.SystemSimpleMovement,
-        //             World = framework.WorldPda,
-        //         };
-        //         var instruction = WorldProgram.Apply(apply, Bolt.World.SerializeArgs(new { direction = "Up" }));
-        //         instruction.Keys.Add(AccountMeta.ReadOnly(framework.ExampleComponentPosition, false));
-        //         instruction.Keys.Add(AccountMeta.Writable(framework.AccelerationComponentPositionPda, false));
-        //         await framework.SendAndConfirmInstruction(framework.AcceleratorClient, instruction);
-        //         await Task.Delay(50);
-        //     }
-        // }
+        public static async Task ApplySimpleMovementSystemOnAccelerator(Framework framework) {
+            for (int i = 0; i < 10; i++) {
+                var apply = new ApplyAccounts() {
+                    Authority = framework.Wallet.Account.PublicKey,
+                    BoltSystem = framework.SystemSimpleMovement,
+                    World = framework.WorldPda,
+                };
+                var instruction = WorldProgram.Apply(apply, Bolt.World.SerializeArgs(new { direction = "Up" }));
+                instruction.Keys.Add(AccountMeta.ReadOnly(framework.ExampleComponentPosition, false));
+                instruction.Keys.Add(AccountMeta.Writable(framework.AccelerationComponentPositionPda, false));
+                await framework.SendAndConfirmInstruction(framework.AcceleratorClient, instruction);
+                await Task.Delay(50);
+            }
+        }
    }
 }

crates/bolt-cli/src/instructions.rs

@@ -48,7 +48,7 @@ pub async fn create_registry(cfg_override: &ConfigOverride) -> Result<()> {
             system_program: system_program::ID,
         })
         .args(instruction::InitializeRegistry {})
-        .signer(&payer)
+        .signer(payer)
         .send()
         .await?;
 
@@ -81,7 +81,7 @@ pub async fn create_world(cfg_override: &ConfigOverride) -> Result<()> {
             system_program: system_program::ID,
         })
         .args(instruction::InitializeNewWorld {})
-        .signer(&payer)
+        .signer(payer)
         .send()
         .await?;
 
@@ -115,7 +115,7 @@ pub async fn authorize(
             world: world_pubkey,
         })
         .args(instruction::AddAuthority { world_id })
-        .signer(&payer)
+        .signer(payer)
         .send()
         .await?;
 
@@ -150,7 +150,7 @@ pub async fn deauthorize(
             world: world_pubkey,
         })
         .args(instruction::RemoveAuthority { world_id })
-        .signer(&payer)
+        .signer(payer)
         .send_with_spinner_and_config(RpcSendTransactionConfig {
             skip_preflight: true,
             ..RpcSendTransactionConfig::default()
@@ -185,7 +185,7 @@ pub async fn approve_system(
             system_program: system_program::ID,
         })
         .args(instruction::ApproveSystem {})
-        .signer(&payer)
+        .signer(payer)
         .send()
         .await?;
 
@@ -217,7 +217,7 @@ pub async fn remove_system(
             system_program: system_program::ID,
         })
         .args(instruction::RemoveSystem {})
-        .signer(&payer)
+        .signer(payer)
         .send()
         .await?;
 

crates/bolt-cli/src/lib.rs

@@ -128,6 +128,7 @@ pub async fn entry(opts: Opts) -> Result<()> {
                 template,
                 test_template,
                 force,
+                ..
             } => init(
                 &opts.cfg_override,
                 name,

crates/bolt-cli/src/templates/component/mod.rs

@@ -21,13 +21,12 @@ pub fn create_component_template_simple(name: &str, program_path: &Path) -> File
 }
 
 /// Automatic generation of crates from the components idl
-
 pub fn component_type(idl: &Idl, component_id: &str) -> Result<String> {
     let component_account = idl
         .accounts
         .iter()
         .filter(|a| a.name.to_lowercase() != "Entity")
-        .last();
+        .next_back();
     let component_account =
         component_account.ok_or_else(|| anyhow::anyhow!("Component account not found in IDL"))?;
 

crates/bolt-lang/attribute/component-deserialize/src/lib.rs

@@ -70,7 +70,7 @@ pub fn component_deserialize(_attr: TokenStream, item: TokenStream) -> TokenStre
 
         #[automatically_derived]
         impl anchor_lang::Discriminator for #name {
-            const DISCRIMINATOR: [u8; 8] = [0; 8];
+            const DISCRIMINATOR: &'static [u8] = &[1, 1, 1, 1, 1, 1, 1, 1];
         }
 
         #owner_definition

crates/programs/world/src/lib.rs

@@ -507,7 +507,7 @@ pub struct AddEntity<'info> {
     pub payer: Signer<'info>,
     #[account(init, payer = payer, space = World::size(), seeds = [Entity::seed(), &world.id.to_be_bytes(),
     &match extra_seed {
-        Some(ref seed) => [0; 8],
+        Some(ref _seed) => [0; 8],
         None => world.entities.to_be_bytes()
     },
     match extra_seed {

examples/system-simple-movement/Cargo.toml

@@ -26,4 +26,4 @@ custom-panic = []
 [dependencies]
 serde.workspace = true
 bolt-lang.workspace = true
-bolt-types = { version = "0.2.1", path = "../../crates/types" }
+bolt-types = { version = "0.2.2", path = "../../crates/types" }

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.81.0"
+channel = "1.86.0"
 components = ["rustfmt"]

scripts/lint.sh

@@ -6,7 +6,7 @@ echo "### Checking formatting..."
 cargo fmt -- --verbose
 
 echo "### Checking clippy..."
-cargo clippy --fix -- --deny=warnings
+cargo clippy --fix -- --deny=warnings --allow=unexpected_cfgs
 
 echo "### Checking yarn lint..."
 yarn lint --write