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.

Sign up for GitHub

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

Jump to bottom

Dust off dependencies, update to anchor 0.29, solana 1.17 #588

Draft
wants to merge 18 commits into
base: develop
Choose a base branch
from
Draft

Dust off dependencies, update to anchor 0.29, solana 1.17 #588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 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
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/contract-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
runs-on: ubuntu-latest
needs: [get_projectserum_version]
container:
image: projectserum/build:${{ needs.get_projectserum_version.outputs.projectserum_version }}
image: backpackapp/build:${{ needs.get_projectserum_version.outputs.projectserum_version }}
env:
RUSTUP_HOME: "/root/.rustup"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e_custom_cl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
runs-on: ubuntu20.04-32cores-128GB
needs: [get_projectserum_version]
container:
image: projectserum/build:${{ needs.get_projectserum_version.outputs.projectserum_version }}
image: backpackapp/build:${{ needs.get_projectserum_version.outputs.projectserum_version }}
env:
RUSTUP_HOME: "/root/.rustup"
FORCE_COLOR: 1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e_testnet_daily.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ jobs:
get_solana_sha,
]
container:
image: projectserum/build:${{ needs.get_projectserum_version.outputs.projectserum_version }}
image: backpackapp/build:${{ needs.get_projectserum_version.outputs.projectserum_version }}
env:
RUSTUP_HOME: "/root/.rustup"
FORCE_COLOR: 1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-latest
needs: [get-projectserum-version]
container:
image: projectserum/build:${{ needs.get-projectserum-version.outputs.projectserum_version }}
image: backpackapp/build:${{ needs.get-projectserum-version.outputs.projectserum_version }}
env:
RUSTUP_HOME: "/root/.rustup"
FORCE_COLOR: 1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
runs-on: ubuntu-latest
needs: [get_projectserum_version]
container:
image: projectserum/build:${{ needs.get_projectserum_version.outputs.projectserum_version }}
image: backpackapp/build:${{ needs.get_projectserum_version.outputs.projectserum_version }}
env:
RUSTUP_HOME: "/root/.rustup"
FORCE_COLOR: 1
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
runs-on: ubuntu-latest
needs: [get_projectserum_version]
container:
image: projectserum/build:${{ needs.get_projectserum_version.outputs.projectserum_version }}
image: backpackapp/build:${{ needs.get_projectserum_version.outputs.projectserum_version }}
env:
RUSTUP_HOME: "/root/.rustup"
FORCE_COLOR: 1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/soak.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
runs-on: ubuntu-latest
needs: [get_projectserum_version, test-image-exists]
container:
image: projectserum/build:${{ needs.get_projectserum_version.outputs.projectserum_version }}
image: backpackapp/build:${{ needs.get_projectserum_version.outputs.projectserum_version }}
env:
RUSTUP_HOME: "/root/.rustup"
FORCE_COLOR: 1
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
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
View file
Open in desktop
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"