From 066eb7d5d0d4796d4d490fd1477cd09a872de475 Mon Sep 17 00:00:00 2001 From: Nhan Phan Date: Tue, 9 Apr 2024 13:34:07 -0700 Subject: [PATCH 01/10] correctly account for folder name difference --- .github/workflows/deploy-program.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-program.yml b/.github/workflows/deploy-program.yml index 3f97f616..6387f6d4 100644 --- a/.github/workflows/deploy-program.yml +++ b/.github/workflows/deploy-program.yml @@ -6,10 +6,10 @@ on: program: description: Program required: true - default: mpl-core + default: core type: choice options: - - mpl-core + - core cluster: description: Cluster environment required: true @@ -47,7 +47,7 @@ jobs: uses: ./.github/workflows/test-programs.yml secrets: inherit with: - program_matrix: '["${{ inputs.program }}"]' + program_matrix: '["mpl-${{ inputs.program }}"]' test_js: name: JS client From e79aa7022266f935e06c86a75f62b363ee0615f2 Mon Sep 17 00:00:00 2001 From: Nhan Phan Date: Tue, 9 Apr 2024 13:49:00 -0700 Subject: [PATCH 02/10] version name, idl name --- .github/workflows/deploy-program.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-program.yml b/.github/workflows/deploy-program.yml index 6387f6d4..2f7a2fb2 100644 --- a/.github/workflows/deploy-program.yml +++ b/.github/workflows/deploy-program.yml @@ -103,7 +103,7 @@ jobs: - name: Determine program version run: | - IDL_NAME="mpl_${{ inputs.program }}_program" + IDL_NAME="mpl_${{ inputs.program }}" VERSION=`jq '.version' ./idls/${IDL_NAME}.json | sed 's/"//g'` MAJOR=`echo ${VERSION} | cut -d. -f1` MINOR=`echo ${VERSION} | cut -d. -f2` @@ -149,7 +149,7 @@ jobs: rm ./program-id.json - name: Version program - working-directory: ./programs/${{ inputs.program }}/program + working-directory: ./programs/mpl-${{ inputs.program }}/program if: github.event.inputs.version_program == 'true' run: | git stash From d2471b1e3852b8663c5a5bcdc4e51a18c4acedff Mon Sep 17 00:00:00 2001 From: nhanphan Date: Tue, 9 Apr 2024 21:32:15 +0000 Subject: [PATCH 03/10] Deploy JS client v0.4.5 --- clients/js/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clients/js/package.json b/clients/js/package.json index 34a5e3e3..86e6dd8f 100644 --- a/clients/js/package.json +++ b/clients/js/package.json @@ -1,6 +1,6 @@ { "name": "@metaplex-foundation/mpl-core", - "version": "0.4.4", + "version": "0.4.5", "description": "Digital Assets", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", From 8f733c656cbe0e3bb4748607e963afa4471b0380 Mon Sep 17 00:00:00 2001 From: Nhan Phan Date: Tue, 9 Apr 2024 14:39:08 -0700 Subject: [PATCH 04/10] updgrade solana version --- .github/.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/.env b/.github/.env index 51329212..d0beaba0 100644 --- a/.github/.env +++ b/.github/.env @@ -1,5 +1,5 @@ CARGO_TERM_COLOR=always NODE_VERSION=16.x PROGRAMS=["mpl-core"] -RUST_VERSION=1.70.0 -SOLANA_VERSION=1.16.18 +RUST_VERSION=1.73.0 +SOLANA_VERSION=1.17.20 From e05de8897ddbedc35e9415da387d4183e67d5490 Mon Sep 17 00:00:00 2001 From: Nhan Phan Date: Tue, 9 Apr 2024 15:01:57 -0700 Subject: [PATCH 05/10] update rust version to 1.74 --- .github/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/.env b/.github/.env index d0beaba0..f91e20de 100644 --- a/.github/.env +++ b/.github/.env @@ -1,5 +1,5 @@ CARGO_TERM_COLOR=always NODE_VERSION=16.x PROGRAMS=["mpl-core"] -RUST_VERSION=1.73.0 +RUST_VERSION=1.74.0 SOLANA_VERSION=1.17.20 From bbd45dfab2e1956cc71ebcc6b153bb82e7febd73 Mon Sep 17 00:00:00 2001 From: Nhan Phan Date: Tue, 9 Apr 2024 16:21:48 -0700 Subject: [PATCH 06/10] logging more to fix --- .github/workflows/publish-rust-client.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/publish-rust-client.yml b/.github/workflows/publish-rust-client.yml index aba333a9..eb3a049e 100644 --- a/.github/workflows/publish-rust-client.yml +++ b/.github/workflows/publish-rust-client.yml @@ -85,7 +85,9 @@ jobs: git config user.email ${{ env.COMMIT_USER_EMAIL }} fi + echo "Cargo logging in" cargo login ${{ secrets.CRATES_TOKEN }} + echo "Cargo release" cargo release $BUMP $OPTIONS if [ "${{ inputs.dry_run }}" == "false" ]; then From 3203cfca8288e48fe6b0b8dffa0bc618bea79fa4 Mon Sep 17 00:00:00 2001 From: Nhan Phan Date: Tue, 9 Apr 2024 16:40:05 -0700 Subject: [PATCH 07/10] add commit user/email --- .github/.env | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/.env b/.github/.env index f91e20de..95c344ca 100644 --- a/.github/.env +++ b/.github/.env @@ -3,3 +3,5 @@ NODE_VERSION=16.x PROGRAMS=["mpl-core"] RUST_VERSION=1.74.0 SOLANA_VERSION=1.17.20 +COMMIT_USER_NAME=github-actions +COMMIT_USER_EMAIL=github-actions@github.com From 4bac8b22519798cc6c3423f049eb09bedf02eddc Mon Sep 17 00:00:00 2001 From: nhanphan Date: Tue, 9 Apr 2024 23:50:47 +0000 Subject: [PATCH 08/10] chore: Release mpl-core version 0.4.2 --- Cargo.lock | 2 +- clients/rust/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3f902503..1911d0f3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2080,7 +2080,7 @@ dependencies = [ [[package]] name = "mpl-core" -version = "0.4.1" +version = "0.4.2" dependencies = [ "assert_matches", "base64 0.22.0", diff --git a/clients/rust/Cargo.toml b/clients/rust/Cargo.toml index a00740e0..6d20f37d 100644 --- a/clients/rust/Cargo.toml +++ b/clients/rust/Cargo.toml @@ -2,7 +2,7 @@ name = "mpl-core" description = "A flexible digital asset standard for Solana" repository = "https://github.com/metaplex-foundation/mpl-core" -version = "0.4.1" +version = "0.4.2" edition = "2021" readme = "README.md" license-file = "../../LICENSE" From decc025a323a3148af960f2e91368d89b9c29248 Mon Sep 17 00:00:00 2001 From: Nhan Phan Date: Tue, 9 Apr 2024 19:50:22 -0700 Subject: [PATCH 09/10] minor edition fix (#60) --- clients/rust/src/hooked/mod.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/clients/rust/src/hooked/mod.rs b/clients/rust/src/hooked/mod.rs index 13a027fa..f76fa042 100644 --- a/clients/rust/src/hooked/mod.rs +++ b/clients/rust/src/hooked/mod.rs @@ -33,6 +33,7 @@ impl PluginType { 6 => Some(PluginType::Attributes), 7 => Some(PluginType::PermanentTransferDelegate), 8 => Some(PluginType::PermanentBurnDelegate), + 9 => Some(PluginType::Edition), _ => None, } } From ec08909b25b616381d8b195967e030a26c870ebb Mon Sep 17 00:00:00 2001 From: nhanphan Date: Wed, 10 Apr 2024 03:11:44 +0000 Subject: [PATCH 10/10] chore: Release mpl-core version 0.4.3 --- Cargo.lock | 2 +- clients/rust/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1911d0f3..a80eee17 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2080,7 +2080,7 @@ dependencies = [ [[package]] name = "mpl-core" -version = "0.4.2" +version = "0.4.3" dependencies = [ "assert_matches", "base64 0.22.0", diff --git a/clients/rust/Cargo.toml b/clients/rust/Cargo.toml index 6d20f37d..3b80ed3b 100644 --- a/clients/rust/Cargo.toml +++ b/clients/rust/Cargo.toml @@ -2,7 +2,7 @@ name = "mpl-core" description = "A flexible digital asset standard for Solana" repository = "https://github.com/metaplex-foundation/mpl-core" -version = "0.4.2" +version = "0.4.3" edition = "2021" readme = "README.md" license-file = "../../LICENSE"