From 4df9a8c42a2e6fde7baf464a789d241fd8e4e496 Mon Sep 17 00:00:00 2001 From: Danilo Guanabara Date: Fri, 25 Apr 2025 18:32:44 -0300 Subject: [PATCH 1/3] :bookmark: Bolt v0.2.3 --- Cargo.lock | 42 +++++++++---------- Cargo.toml | 32 +++++++------- clients/typescript/package.json | 2 +- crates/bolt-cli/npm-package/package.json | 16 +++---- crates/bolt-cli/npm-package/package.json.tmpl | 2 +- docs/CHANGELOG.md | 4 +- 6 files changed, 50 insertions(+), 48 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3d7732f..3a924c5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -785,7 +785,7 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "bolt-attribute-bolt-arguments" -version = "0.2.2" +version = "0.2.3" dependencies = [ "proc-macro2", "quote", @@ -794,7 +794,7 @@ dependencies = [ [[package]] name = "bolt-attribute-bolt-component" -version = "0.2.2" +version = "0.2.3" dependencies = [ "bolt-utils", "ligen-ir", @@ -805,7 +805,7 @@ dependencies = [ [[package]] name = "bolt-attribute-bolt-component-deserialize" -version = "0.2.2" +version = "0.2.3" dependencies = [ "bolt-utils", "proc-macro2", @@ -815,7 +815,7 @@ dependencies = [ [[package]] name = "bolt-attribute-bolt-component-id" -version = "0.2.2" +version = "0.2.3" dependencies = [ "proc-macro2", "quote", @@ -824,7 +824,7 @@ dependencies = [ [[package]] name = "bolt-attribute-bolt-delegate" -version = "0.2.2" +version = "0.2.3" dependencies = [ "proc-macro2", "quote", @@ -833,7 +833,7 @@ dependencies = [ [[package]] name = "bolt-attribute-bolt-extra-accounts" -version = "0.2.2" +version = "0.2.3" dependencies = [ "proc-macro2", "quote", @@ -842,7 +842,7 @@ dependencies = [ [[package]] name = "bolt-attribute-bolt-program" -version = "0.2.2" +version = "0.2.3" dependencies = [ "proc-macro2", "quote", @@ -851,7 +851,7 @@ dependencies = [ [[package]] name = "bolt-attribute-bolt-system" -version = "0.2.2" +version = "0.2.3" dependencies = [ "proc-macro2", "quote", @@ -860,7 +860,7 @@ dependencies = [ [[package]] name = "bolt-attribute-bolt-system-input" -version = "0.2.2" +version = "0.2.3" dependencies = [ "proc-macro2", "quote", @@ -869,7 +869,7 @@ dependencies = [ [[package]] name = "bolt-cli" -version = "0.2.2" +version = "0.2.3" dependencies = [ "anchor-cli", "anchor-client", @@ -889,7 +889,7 @@ dependencies = [ [[package]] name = "bolt-component" -version = "0.2.2" +version = "0.2.3" dependencies = [ "anchor-lang", "bolt-system", @@ -897,7 +897,7 @@ dependencies = [ [[package]] name = "bolt-lang" -version = "0.2.2" +version = "0.2.3" dependencies = [ "ahash", "anchor-lang", @@ -922,21 +922,21 @@ dependencies = [ [[package]] name = "bolt-system" -version = "0.2.2" +version = "0.2.3" dependencies = [ "anchor-lang", ] [[package]] name = "bolt-types" -version = "0.2.2" +version = "0.2.3" dependencies = [ "bolt-lang", ] [[package]] name = "bolt-utils" -version = "0.2.2" +version = "0.2.3" dependencies = [ "proc-macro2", "quote", @@ -3261,7 +3261,7 @@ dependencies = [ [[package]] name = "position" -version = "0.2.2" +version = "0.2.3" dependencies = [ "bolt-lang", ] @@ -5283,7 +5283,7 @@ dependencies = [ [[package]] name = "system-apply-velocity" -version = "0.2.2" +version = "0.2.3" dependencies = [ "bolt-lang", "mpl-token-metadata", @@ -5314,7 +5314,7 @@ dependencies = [ [[package]] name = "system-fly" -version = "0.2.2" +version = "0.2.3" dependencies = [ "bolt-lang", "position", @@ -5322,7 +5322,7 @@ dependencies = [ [[package]] name = "system-simple-movement" -version = "0.2.2" +version = "0.2.3" dependencies = [ "bolt-lang", "bolt-types", @@ -5859,7 +5859,7 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "velocity" -version = "0.2.2" +version = "0.2.3" dependencies = [ "bolt-lang", ] @@ -6298,7 +6298,7 @@ checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" [[package]] name = "world" -version = "0.2.2" +version = "0.2.3" dependencies = [ "anchor-lang", "bolt-component", diff --git a/Cargo.toml b/Cargo.toml index 1912351..bb4511b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ members = [ ] [workspace.package] -version = "0.2.2" +version = "0.2.3" authors = ["Magicblock Labs "] repository = "https://github.com/magicblock-labs/bolt" homepage = "https://www.magicblock.gg/" @@ -19,21 +19,21 @@ license = "MIT" edition = "2021" [workspace.dependencies] -bolt-types = { path = "crates/types", version = "=0.2.2" } -bolt-lang = { path = "crates/bolt-lang", version = "=0.2.2" } -bolt-attribute-bolt-program = { path = "crates/bolt-lang/attribute/bolt-program", version = "=0.2.2" } -bolt-attribute-bolt-delegate = { path = "crates/bolt-lang/attribute/delegate", version = "=0.2.2" } -bolt-attribute-bolt-component = { path = "crates/bolt-lang/attribute/component", version = "=0.2.2" } -bolt-attribute-bolt-system = { path = "crates/bolt-lang/attribute/system", version = "=0.2.2"} -bolt-attribute-bolt-system-input = { path = "crates/bolt-lang/attribute/system-input", version = "=0.2.2" } -bolt-attribute-bolt-extra-accounts = { path = "crates/bolt-lang/attribute/extra-accounts", version = "=0.2.2" } -bolt-attribute-bolt-arguments = { path = "crates/bolt-lang/attribute/arguments", version = "=0.2.2" } -bolt-attribute-bolt-component-deserialize = { path = "crates/bolt-lang/attribute/component-deserialize", version = "=0.2.2" } -bolt-attribute-bolt-component-id = { path = "crates/bolt-lang/attribute/component-id", version = "=0.2.2" } -bolt-utils = { path = "crates/bolt-lang/utils", version = "=0.2.2" } -world = { path = "crates/programs/world", features = ["cpi"], version = "=0.2.2"} -bolt-system = { path = "crates/programs/bolt-system", features = ["cpi"], version = "=0.2.2"} -bolt-component = { path = "crates/programs/bolt-component", features = ["cpi"], version = "=0.2.2"} +bolt-types = { path = "crates/types", version = "=0.2.3" } +bolt-lang = { path = "crates/bolt-lang", version = "=0.2.3" } +bolt-attribute-bolt-program = { path = "crates/bolt-lang/attribute/bolt-program", version = "=0.2.3" } +bolt-attribute-bolt-delegate = { path = "crates/bolt-lang/attribute/delegate", version = "=0.2.3" } +bolt-attribute-bolt-component = { path = "crates/bolt-lang/attribute/component", version = "=0.2.3" } +bolt-attribute-bolt-system = { path = "crates/bolt-lang/attribute/system", version = "=0.2.3"} +bolt-attribute-bolt-system-input = { path = "crates/bolt-lang/attribute/system-input", version = "=0.2.3" } +bolt-attribute-bolt-extra-accounts = { path = "crates/bolt-lang/attribute/extra-accounts", version = "=0.2.3" } +bolt-attribute-bolt-arguments = { path = "crates/bolt-lang/attribute/arguments", version = "=0.2.3" } +bolt-attribute-bolt-component-deserialize = { path = "crates/bolt-lang/attribute/component-deserialize", version = "=0.2.3" } +bolt-attribute-bolt-component-id = { path = "crates/bolt-lang/attribute/component-id", version = "=0.2.3" } +bolt-utils = { path = "crates/bolt-lang/utils", version = "=0.2.3" } +world = { path = "crates/programs/world", features = ["cpi"], version = "=0.2.3"} +bolt-system = { path = "crates/programs/bolt-system", features = ["cpi"], version = "=0.2.3"} +bolt-component = { path = "crates/programs/bolt-component", features = ["cpi"], version = "=0.2.3"} ## External crates session-keys = { version = ">=2.0.7", features = ["no-entrypoint"] } diff --git a/clients/typescript/package.json b/clients/typescript/package.json index d7f8ac3..84a89e6 100644 --- a/clients/typescript/package.json +++ b/clients/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@magicblock-labs/bolt-sdk", - "version": "0.2.2", + "version": "0.2.3", "description": "Bolt typescript SDK", "author": "dev@magicblock.gg", "license": "MIT", diff --git a/crates/bolt-cli/npm-package/package.json b/crates/bolt-cli/npm-package/package.json index af19db6..5786775 100644 --- a/crates/bolt-cli/npm-package/package.json +++ b/crates/bolt-cli/npm-package/package.json @@ -1,6 +1,6 @@ { "name": "@magicblock-labs/bolt-cli", - "version": "0.2.2", + "version": "0.2.3", "description": "Bolt CLI tool", "homepage": "https://github.com/magicblock-labs/bolt#readme", "bugs": { @@ -27,13 +27,13 @@ "prettier": "^3.3.3" }, "optionalDependencies": { - "@magicblock-labs/bolt-cli-darwin-x64": "0.2.2", - "@magicblock-labs/bolt-cli-darwin-arm64": "0.2.2", - "@magicblock-labs/bolt-cli-linux-x86": "0.2.2", - "@magicblock-labs/bolt-cli-linux-x64": "0.2.2", - "@magicblock-labs/bolt-cli-linux-arm64": "0.2.2", - "@magicblock-labs/bolt-cli-windows-x86": "0.2.2", - "@magicblock-labs/bolt-cli-windows-x64": "0.2.2" + "@magicblock-labs/bolt-cli-darwin-x64": "0.2.3", + "@magicblock-labs/bolt-cli-darwin-arm64": "0.2.3", + "@magicblock-labs/bolt-cli-linux-x86": "0.2.3", + "@magicblock-labs/bolt-cli-linux-x64": "0.2.3", + "@magicblock-labs/bolt-cli-linux-arm64": "0.2.3", + "@magicblock-labs/bolt-cli-windows-x86": "0.2.3", + "@magicblock-labs/bolt-cli-windows-x64": "0.2.3" }, "publishConfig": { "access": "public" diff --git a/crates/bolt-cli/npm-package/package.json.tmpl b/crates/bolt-cli/npm-package/package.json.tmpl index adcf18b..442f824 100644 --- a/crates/bolt-cli/npm-package/package.json.tmpl +++ b/crates/bolt-cli/npm-package/package.json.tmpl @@ -1,7 +1,7 @@ { "name": "@magicblock-labs/${node_pkg}", "description": "Bolt CLI tool (${node_pkg})", - "version": "0.2.2", + "version": "0.2.3", "repository": { "type": "git", "url": "git+https://github.com/magicblock-labs/bolt.git" diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 7b95674..c9f7b16 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,12 +1,14 @@ -## [0.2.2] - 2025-02-24 +## [0.2.3] - 2025-04-25 ### ✨️ Features + - Updating Bolt client for C# (#129) - Adding DestroyComponent function (#143) - Separating apply and apply_with_session (#141) ### 🐛 Bug Fixes + - Fixing async cli commands (#159) ## [0.2.1] - 2025-02-17 From 64e6f43114ec98c81452444fa7167bee7a7d59f6 Mon Sep 17 00:00:00 2001 From: Danilo Guanabara Date: Mon, 28 Apr 2025 15:21:24 -0300 Subject: [PATCH 2/3] :bug: Fixing cargo publish --dry-run with unpublished dependencies --- .github/workflows/publish-bolt-crates.yml | 38 +++++++++++++---------- scripts/test-publish.sh | 26 ++++++++++++++++ 2 files changed, 47 insertions(+), 17 deletions(-) create mode 100755 scripts/test-publish.sh diff --git a/.github/workflows/publish-bolt-crates.yml b/.github/workflows/publish-bolt-crates.yml index e4fca03..f1de351 100644 --- a/.github/workflows/publish-bolt-crates.yml +++ b/.github/workflows/publish-bolt-crates.yml @@ -51,6 +51,11 @@ jobs: with: toolchain: stable + - name: Install Rust nightly + uses: dtolnay/rust-toolchain@nightly + with: + toolchain: nightly + - name: Cache rust uses: Swatinem/rust-cache@v2 @@ -170,23 +175,22 @@ jobs: NO_VERIFY_FLAG="--no-verify" fi - cargo publish $DRY_RUN_FLAG --manifest-path=crates/bolt-lang/utils/Cargo.toml --token $CRATES_TOKEN $NO_VERIFY_FLAG - cargo publish $DRY_RUN_FLAG --manifest-path=crates/bolt-lang/attribute/component/Cargo.toml --token $CRATES_TOKEN $NO_VERIFY_FLAG - cargo publish $DRY_RUN_FLAG --manifest-path=crates/bolt-lang/attribute/component-deserialize/Cargo.toml --token $CRATES_TOKEN $NO_VERIFY_FLAG - cargo publish $DRY_RUN_FLAG --manifest-path=crates/bolt-lang/attribute/component-id/Cargo.toml --token $CRATES_TOKEN $NO_VERIFY_FLAG - cargo publish $DRY_RUN_FLAG --manifest-path=crates/bolt-lang/attribute/system/Cargo.toml --token $CRATES_TOKEN $NO_VERIFY_FLAG - cargo publish $DRY_RUN_FLAG --manifest-path=crates/bolt-lang/attribute/system-input/Cargo.toml --token $CRATES_TOKEN $NO_VERIFY_FLAG - cargo publish $DRY_RUN_FLAG --manifest-path=crates/bolt-lang/attribute/extra-accounts/Cargo.toml --token $CRATES_TOKEN $NO_VERIFY_FLAG - cargo publish $DRY_RUN_FLAG --manifest-path=crates/bolt-lang/attribute/arguments/Cargo.toml --token $CRATES_TOKEN $NO_VERIFY_FLAG - cargo publish $DRY_RUN_FLAG --manifest-path=crates/bolt-lang/attribute/bolt-program/Cargo.toml --token $CRATES_TOKEN $NO_VERIFY_FLAG - cargo publish $DRY_RUN_FLAG --manifest-path=crates/bolt-lang/attribute/delegate/Cargo.toml --token $CRATES_TOKEN $NO_VERIFY_FLAG - cargo publish $DRY_RUN_FLAG --manifest-path=crates/programs/bolt-system/Cargo.toml --token $CRATES_TOKEN $NO_VERIFY_FLAG - cargo publish $DRY_RUN_FLAG --manifest-path=crates/programs/bolt-component/Cargo.toml --token $CRATES_TOKEN $NO_VERIFY_FLAG - cargo publish $DRY_RUN_FLAG --manifest-path=crates/programs/world/Cargo.toml --token $CRATES_TOKEN $NO_VERIFY_FLAG - cargo publish $DRY_RUN_FLAG --manifest-path=crates/bolt-lang/Cargo.toml --token $CRATES_TOKEN $NO_VERIFY_FLAG - if [ "${DRY_RUN}" != "true" ]; then - cargo publish --manifest-path=crates/bolt-cli/Cargo.toml --token $CRATES_TOKEN - fi + cargo +nightly publish -Zpackage-workspace $DRY_RUN_FLAG $NO_VERIFY_FLAG --token $CRATES_TOKEN \ + -p world \ + -p bolt-cli \ + -p bolt-lang \ + -p bolt-utils \ + -p bolt-system \ + -p bolt-component \ + -p bolt-attribute-bolt-arguments \ + -p bolt-attribute-bolt-component \ + -p bolt-attribute-bolt-component-deserialize \ + -p bolt-attribute-bolt-component-id \ + -p bolt-attribute-bolt-delegate \ + -p bolt-attribute-bolt-extra-accounts \ + -p bolt-attribute-bolt-program \ + -p bolt-attribute-bolt-system \ + -p bolt-attribute-bolt-system-input env: CRATES_TOKEN: ${{ secrets.CRATES_TOKEN }} DRY_RUN: ${{ env.DRY_RUN }} diff --git a/scripts/test-publish.sh b/scripts/test-publish.sh new file mode 100755 index 0000000..48ba158 --- /dev/null +++ b/scripts/test-publish.sh @@ -0,0 +1,26 @@ +DRY_RUN="true" +DRY_RUN_FLAG="" +if [ "${DRY_RUN}" = "true" ]; then +DRY_RUN_FLAG="--dry-run" +fi + +if [ "${DRY_RUN}" = "true" ]; then +NO_VERIFY_FLAG="--no-verify" +fi + +cargo +nightly publish -Zpackage-workspace $DRY_RUN_FLAG $NO_VERIFY_FLAG \ + -p world \ + -p bolt-cli \ + -p bolt-lang \ + -p bolt-utils \ + -p bolt-system \ + -p bolt-component \ + -p bolt-attribute-bolt-arguments \ + -p bolt-attribute-bolt-component \ + -p bolt-attribute-bolt-component-deserialize \ + -p bolt-attribute-bolt-component-id \ + -p bolt-attribute-bolt-delegate \ + -p bolt-attribute-bolt-extra-accounts \ + -p bolt-attribute-bolt-program \ + -p bolt-attribute-bolt-system \ + -p bolt-attribute-bolt-system-input \ No newline at end of file From 5b532f309d32ccb4d6cd1e57d40954508dba7c86 Mon Sep 17 00:00:00 2001 From: Danilo Guanabara Date: Mon, 28 Apr 2025 15:56:11 -0300 Subject: [PATCH 3/3] :wrench: Updating publish-packages.yml to use ubuntu-latest --- .github/workflows/publish-packages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml index 610a088..95942e6 100644 --- a/.github/workflows/publish-packages.yml +++ b/.github/workflows/publish-packages.yml @@ -183,7 +183,7 @@ jobs: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} publish-wrapper-npm-package: name: Publish wrapper NPM packages - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest needs: publish-npm-binaries steps: - name: Checkout