Skip to content

Commit 46c5b03

Browse files
authored
Merge branch 'main' into rustopian/slot-hashes-sysvar
2 parents 1c18180 + 3fecb3e commit 46c5b03

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+722
-362
lines changed

.github/actions/setup/action.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,12 @@ runs:
9898
toolchain: ${{ env.TOOLCHAIN_LINT }}
9999
components: miri
100100

101+
- name: Install 'cargo-spellcheck'
102+
if: ${{ contains(inputs.components, 'spellcheck') }}
103+
uses: taiki-e/install-action@v2
104+
with:
105+
tool: cargo-spellcheck
106+
101107
- name: Cache Cargo Dependencies
102108
if: ${{ inputs.cargo-cache-key }}
103109
uses: actions/cache@v4

.github/workflows/main.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,22 @@ jobs:
3535
id: filter
3636
run: pnpm tsx ./scripts/setup/members.mts
3737

38+
spellcheck:
39+
name: Spellcheck
40+
runs-on: ubuntu-latest
41+
steps:
42+
- name: Git Checkout
43+
uses: actions/checkout@v4
44+
45+
- name: Setup Environment
46+
uses: ./.github/actions/setup
47+
with:
48+
cargo-cache-key: cargo-spellcheck
49+
components: spellcheck
50+
51+
- name: cargo-spellcheck
52+
run: pnpm spellcheck
53+
3854
process:
3955
name: Check
4056
needs: sanity

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ jobs:
144144
145145
- name: Generate a changelog
146146
if: github.event.inputs.dry_run != 'true' && github.event.inputs.create_release == 'true'
147-
uses: orhun/git-cliff-action@v3
147+
uses: orhun/git-cliff-action@v4
148148
with:
149149
config: ".github/cliff.toml"
150150
args: |

Cargo.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,6 @@ test = "1.84.1"
3939
pre-release-commit-message = "Publish {{crate_name}} v{{version}}"
4040
tag-message = "Publish {{crate_name}} v{{version}}"
4141
consolidate-commits = false
42+
43+
[workspace.metadata.spellcheck]
44+
config = "scripts/setup/spellcheck.toml"

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"lint": "tsx ./scripts/lint.mts",
1111
"miri": "tsx ./scripts/miri.mts",
1212
"semver": "tsx ./scripts/semver.mts",
13+
"spellcheck": "cargo spellcheck -j1 --code 1",
1314
"test": "tsx ./scripts/test.mts"
1415
},
1516
"devDependencies": {

programs/associated-token-account/src/instructions/create.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ impl Create<'_> {
3636
self.invoke_signed(&[])
3737
}
3838

39+
#[inline(always)]
3940
pub fn invoke_signed(&self, signers: &[Signer]) -> ProgramResult {
4041
// account metadata
4142
let account_metas: [AccountMeta; 6] = [

programs/associated-token-account/src/instructions/create_idempotent.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ impl CreateIdempotent<'_> {
3737
self.invoke_signed(&[])
3838
}
3939

40+
#[inline(always)]
4041
pub fn invoke_signed(&self, signers: &[Signer]) -> ProgramResult {
4142
// account metadata
4243
let account_metas: [AccountMeta; 6] = [

programs/associated-token-account/src/instructions/recover_nested.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ impl RecoverNested<'_> {
4747
self.invoke_signed(&[])
4848
}
4949

50+
#[inline(always)]
5051
pub fn invoke_signed(&self, signers: &[Signer]) -> ProgramResult {
5152
// account metadata
5253
let account_metas: [AccountMeta; 7] = [

programs/memo/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ rust-version = { workspace = true }
1212
crate-type = ["rlib"]
1313

1414
[dependencies]
15-
pinocchio = { version = "0.8.4", path = "../../sdk/pinocchio" }
15+
pinocchio = { workspace = true }
1616
pinocchio-pubkey = { workspace = true }

0 commit comments

Comments
 (0)