Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update: Anchor Contract Dependencies #769

Merged
merged 34 commits into from
Jul 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
0198278
Dust off dependencies, start updating to latest anchor
archseer Feb 13, 2024
f0f20c9
ci: Update to point to the latest backpackapp/build image
archseer Feb 28, 2024
e393a98
fix edition config
archseer Mar 4, 2024
ce3caf2
Work around lifetime issues from latest anchor
archseer Mar 12, 2024
ec57567
Fix compilation of all programs
archseer Mar 12, 2024
a44e5ad
Pin ahash so it doesn't require rustc that's too new
archseer Mar 12, 2024
f134d6f
Pin toml_edit the same way
archseer Mar 12, 2024
35f7c51
Address clippy lint
archseer Mar 12, 2024
fb46685
Pin solana to 1.17
archseer Mar 12, 2024
ab03ef8
Bump anchor js dep under contract tests
archseer Mar 12, 2024
50625c3
gauntlet: Update to anchor 0.29
archseer Mar 12, 2024
b8e8c1a
Fix close() feed computation limits
archseer Mar 14, 2024
6ba0a9a
Update yarn.lock
archseer Mar 14, 2024
d4d1371
Update more serum references
archseer Mar 14, 2024
91ef04e
Update the ts library
archseer Mar 14, 2024
fd562ff
Fix anchor ocr2 case naming issue
archseer Mar 14, 2024
168b7d6
Update lockfiles, maybe this fixes the config load issue
archseer Mar 18, 2024
8b3f6fe
Update the generated bindings folder location too
archseer Mar 18, 2024
a59944c
Merge branch 'develop' into anchor-dep-update-aaron
aalu1418 Jun 28, 2024
8b95b5f
Merge branch 'develop' into anchor-dep-update-aaron
aalu1418 Jul 1, 2024
f826b81
bump ts-mocha in examples
aalu1418 Jul 5, 2024
cf9944f
Merge branch 'develop' into anchor-dep-update-aaron
aalu1418 Jul 5, 2024
ac480c1
fix folder path in script
aalu1418 Jul 5, 2024
4ce13a6
fix localnet deployment keys
aalu1418 Jul 5, 2024
f257420
fix ocr2 -> ocr_2 naming for filepaths
aalu1418 Jul 5, 2024
b1d8c01
ts syntax fix
aalu1418 Jul 5, 2024
dce5ba1
bump generated deps
aalu1418 Jul 8, 2024
81b1f0b
build artifacts
aalu1418 Jul 8, 2024
3e4e5cf
bump example deps
aalu1418 Jul 8, 2024
b802335
update gauntlet
aalu1418 Jul 9, 2024
1a31666
Merge branch 'develop' into anchor-dep-update-aaron
aalu1418 Jul 10, 2024
b601e7c
Merge branch 'develop' into anchor-dep-update-aaron
aalu1418 Jul 25, 2024
e81d24d
Merge branch 'develop' into anchor-dep-update-aaron
aalu1418 Jul 31, 2024
f6d75e4
Merge branch 'develop' into anchor-dep-update-aaron
aalu1418 Jul 31, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .github/workflows/contract-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,13 @@ jobs:
name: Release Artifacts
runs-on: ubuntu-latest
needs: [get_projectserum_version]
# container:
# image: projectserum/build:${{ needs.get_projectserum_version.outputs.projectserum_version }}
# env:
# RUSTUP_HOME: "/root/.rustup"
steps:
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
- name: Build Artifacts
env:
psversion: ${{ needs.get_projectserum_version.outputs.projectserum_version }}
run: |
docker run -v "$(pwd)":/repo projectserum/build:"${psversion}" bash -c "\
docker run -v "$(pwd)":/repo backpackapp/build:"${psversion}" bash -c "\
anchor build &&\
chown -R $(id -u):$(id -g) /repo"
- name: Generate archive
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e_custom_cl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
- name: Build contracts
uses: ./.github/actions/build_contract_artifacts
with:
image: projectserum/build
image: backpackapp/build
image-version: ${{ needs.get_projectserum_version.outputs.projectserum_version }}

e2e_custom_build_custom_chainlink_image:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e_testnet_daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
- name: Build contracts
uses: ./.github/actions/build_contract_artifacts
with:
image: projectserum/build
image: backpackapp/build
image-version: ${{ needs.get_projectserum_version.outputs.projectserum_version }}

e2e_custom_build_custom_chainlink_image:
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/integration-tests-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,13 @@ jobs:
contents: read
runs-on: ubuntu-latest
needs: [get-projectserum-version]
# container:
# image: projectserum/build:${{ needs.get-projectserum-version.outputs.projectserum_version }}
# env:
# RUSTUP_HOME: "/root/.rustup"
# FORCE_COLOR: 1
steps:
- name: Checkout the repo
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
- name: Build contracts
uses: ./.github/actions/build_contract_artifacts
with:
image: projectserum/build
image: backpackapp/build
image-version: ${{ needs.get-projectserum-version.outputs.projectserum_version }}

publish-integration-test-image:
Expand Down
16 changes: 2 additions & 14 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,6 @@ jobs:
name: Rust Run Anchor Tests
runs-on: ubuntu-latest
needs: [get_projectserum_version]
# container:
# image: projectserum/build:${{ needs.get_projectserum_version.outputs.projectserum_version }}
# env:
# RUSTUP_HOME: "/root/.rustup"
# FORCE_COLOR: 1

steps:
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
- name: Cache cargo registry
Expand All @@ -56,7 +50,7 @@ jobs:
env:
psversion: ${{ needs.get_projectserum_version.outputs.projectserum_version }}
run: |
docker run -v "$(pwd)/../":/repo projectserum/build:"${psversion}" bash -c "\
docker run -v "$(pwd)/../":/repo backpackapp/build:"${psversion}" bash -c "\
set -eoux pipefail &&\
RUSTUP_HOME=\"/root/.rustup\" &&\
FORCE_COLOR=1 &&\
Expand Down Expand Up @@ -92,12 +86,6 @@ jobs:
name: Rust Lint
runs-on: ubuntu-latest
needs: [get_projectserum_version]
# container:
# image: projectserum/build:${{ needs.get_projectserum_version.outputs.projectserum_version }}
# env:
# RUSTUP_HOME: "/root/.rustup"
# FORCE_COLOR: 1

steps:
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
- name: Cache cargo registry
Expand All @@ -122,7 +110,7 @@ jobs:
env:
psversion: ${{ needs.get_projectserum_version.outputs.projectserum_version }}
run: |
docker run -v "$(pwd)/../":/repo projectserum/build:"${psversion}" bash -c "\
docker run -v "$(pwd)/../":/repo backpackapp/build:"${psversion}" bash -c "\
set -eoux pipefail &&\
RUSTUP_HOME=\"/root/.rustup\" &&\
FORCE_COLOR=1 &&\
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/soak.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,13 @@ jobs:
permissions:
id-token: write
contents: read
runs-on: ubuntu-latest-32cores-128GB
needs: [get_projectserum_version]
steps:
- name: Checkout the repo
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
- name: Build contracts
uses: ./.github/actions/build_contract_artifacts
with:
image: projectserum/build
image: backpackapp/build
image-version: ${{ needs.get_projectserum_version.outputs.projectserum_version }}

e2e_custom_run_smoke_tests:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
BIN_DIR = bin
export GOPATH ?= $(shell go env GOPATH)
export GO111MODULE ?= on
export PROJECT_SERUM_VERSION ?=v0.25.0
export PROJECT_SERUM_IMAGE ?= projectserum/build:$(PROJECT_SERUM_VERSION)
export PROJECT_SERUM_VERSION ?=v0.29.0
export PROJECT_SERUM_IMAGE ?= backpackapp/build:$(PROJECT_SERUM_VERSION)

LINUX=LINUX
OSX=OSX
Expand Down
4 changes: 2 additions & 2 deletions contracts/Anchor.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
anchor_version = "0.25.0"
anchor_version = "0.29.0"

[registry]
url = "https://anchor.projectserum.com"
Expand All @@ -21,6 +21,6 @@ test = "yarn run test"
# TODO: add pubkeys

[programs.localnet]
ocr2 = "cjg3oHmg9uuPsP8D6g29NWvhySJkdYdAo9D25PRbKXJ"
ocr_2 = "cjg3oHmg9uuPsP8D6g29NWvhySJkdYdAo9D25PRbKXJ" # need to rename the idl to satisfy anchor.js...
store = "HEvSKofvBgfaexv23kMabbYqxasxU3mQ4ibBMEmJWHny"
access_controller = "9xi644bRR8birboDGdTiwBq3C7VEeR7VuamRYYXCubUW"
Loading
Loading