Skip to content

Commit

Permalink
Merge pull request #102 from metaplex-foundation/feat/prune-canopy
Browse files Browse the repository at this point in the history
Prunes the proof for pubkeys stored in the canopy.
  • Loading branch information
blockiosaurus authored Jul 30, 2024
2 parents 4863ca1 + 7f0c044 commit 61c5f3f
Show file tree
Hide file tree
Showing 8 changed files with 1,013 additions and 43 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-programs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
PROGRAMS: ${{ env.PROGRAMS }}

- name: Upload program builds
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: program-builds
# First wildcard ensures exported paths are consistently under the programs folder.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-rust-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
run: cargo build --all-features --release

- name: Upload Rust client builds
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: rust-client-builds
# First wildcard ensures exported paths are consistently under the clients folder.
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/deploy-program.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,13 @@ jobs:
with:
version: ${{ env.ANCHOR_VERSION }}
cache: ${{ env.CACHE }}



- name: Install cargo-release
uses: metaplex-foundation/actions/install-cargo-release@v1
if: github.event.inputs.publish_crate == 'true'
with:
cache: ${{ env.CACHE }}


- name: Install cargo-release
uses: metaplex-foundation/actions/install-cargo-release@v1
if: github.event.inputs.publish_crate == 'true'
Expand Down Expand Up @@ -124,7 +122,7 @@ jobs:
MAJOR=`echo ${VERSION} | cut -d. -f1`
MINOR=`echo ${VERSION} | cut -d. -f2`
PATCH=`echo ${VERSION} | cut -d. -f3`
if [ "${{ inputs.bump }}" == "major" ]; then
MAJOR=$((MAJOR + 1))
MINOR=0
Expand All @@ -135,7 +133,7 @@ jobs:
else
PATCH=$((PATCH + 1))
fi
PROGRAM_VERSION="${MAJOR}.${MINOR}.${PATCH}"
cp ./idls/${IDL_NAME}.json ./idls/${IDL_NAME}-previous.json
Expand All @@ -145,7 +143,7 @@ jobs:
echo PROGRAM_VERSION="${PROGRAM_VERSION}" >> $GITHUB_ENV
- name: Download program builds
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: program-builds

Expand Down Expand Up @@ -181,13 +179,13 @@ jobs:
git stash
git config user.name "${{ env.COMMIT_USER_NAME }}"
git config user.email "${{ env.COMMIT_USER_EMAIL }}"
cargo login ${{ secrets.CRATES_TOKEN }}
cargo release ${{ inputs.bump }} --no-confirm --no-push --no-tag --no-publish --execute
git reset --soft HEAD~1
git stash pop
- name: Commit and tag new version
uses: stefanzweifel/git-auto-commit-action@v4
if: github.event.inputs.publish_crate == 'true' && github.event.inputs.cluster == 'mainnet-beta'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-rust-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
cache: ${{ env.CACHE }}

- name: Download program builds
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: program-builds

Expand Down
4 changes: 2 additions & 2 deletions clients/js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"license": "Apache-2.0",
"dependencies": {
"@metaplex-foundation/mpl-token-metadata": "3.0.0-alpha.27",
"@metaplex-foundation/digital-asset-standard-api": "^1.0.0-alpha.0",
"@metaplex-foundation/digital-asset-standard-api": "^1.0.4",
"@metaplex-foundation/mpl-toolbox": "^0.9.0",
"@noble/hashes": "^1.3.1",
"merkletreejs": "^0.3.9"
Expand Down Expand Up @@ -69,4 +69,4 @@
]
},
"packageManager": "[email protected]"
}
}
Loading

0 comments on commit 61c5f3f

Please sign in to comment.