Merge branch 'main' into feat/add-from-primitive

.github/.env

@@ -1,5 +1,7 @@
 CARGO_TERM_COLOR=always
 NODE_VERSION=16.x
 PROGRAMS=["mpl-core"]
-RUST_VERSION=1.70.0
-SOLANA_VERSION=1.16.18
+RUST_VERSION=1.74.0
+SOLANA_VERSION=1.17.20
+COMMIT_USER_NAME=github-actions
+COMMIT_USER_EMAIL=[email protected]

.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
@@ -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

.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

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",

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.3"
 edition = "2021"
 readme = "README.md"
 license-file = "../../LICENSE"