Specify --tools-version v1.43 in cargo build/test sbf

Author: joncinque

.github/workflows/pull-request-single-pool.yml

@@ -105,7 +105,7 @@ jobs:
 
       - name: Build dependent programs
         run: |
-          cargo build-sbf --manifest-path=single-pool/program/Cargo.toml
+          cargo build-sbf --tools-version v1.43 --manifest-path=single-pool/program/Cargo.toml
 
       - name: Build and test
         run: |

.github/workflows/pull-request-token-swap.yml

@@ -69,7 +69,7 @@ jobs:
 
       - name: Build production version
         run: |
-          cargo +"$RUST_STABLE" build-sbf \
+          cargo +"$RUST_STABLE" build-sbf --tools-version v1.43 \
             --manifest-path=token-swap/program/Cargo.toml \
             --features production \
             --sbf-out-dir target/deploy-production

.github/workflows/pull-request-token-upgrade.yml

@@ -101,7 +101,7 @@ jobs:
 
       - name: Build dependent programs
         run: |
-          cargo build-sbf --manifest-path ./token-upgrade/program/Cargo.toml
+          cargo build-sbf --tools-version v1.43 --manifest-path ./token-upgrade/program/Cargo.toml
 
       - name: Run CLI tests
         run: |

.github/workflows/pull-request-token.yml

@@ -230,8 +230,8 @@ jobs:
 
       - name: Build and test token-2022
         run: |
-          cargo build-sbf --manifest-path token/program-2022/Cargo.toml
-          cargo build-sbf --manifest-path instruction-padding/program/Cargo.toml
+          cargo build-sbf --tools-version v1.43 --manifest-path token/program-2022/Cargo.toml
+          cargo build-sbf --tools-version v1.43 --manifest-path instruction-padding/program/Cargo.toml
           ./ci/cargo-test-sbf.sh token/program-2022-test
 
   js-test:

account-compression/sdk/package.json

@@ -34,7 +34,7 @@
   },
   "scripts": {
     "build": "rm -rf dist/ && tsc -p tsconfig.json",
-    "build:program": "cargo build-sbf --manifest-path=../programs/account-compression/Cargo.toml && cargo build-sbf --manifest-path=../programs/noop/Cargo.toml",
+    "build:program": "cargo build-sbf --tools-version v1.43 --manifest-path=../programs/account-compression/Cargo.toml && cargo build-sbf --manifest-path=../programs/noop/Cargo.toml",
     "lint": "set -ex; eslint . --ext .js,.ts",
     "lint:fix": "eslint . --fix --ext .js,.ts",
     "docs": "rm -rf docs/ && typedoc --out docs",

ci/cargo-test-sbf.sh

@@ -31,7 +31,8 @@ if [[ -r $run_dir/Cargo.toml ]]; then
     # Build/test just one BPF program
     set -x
     cd $run_dir
-    cargo +"$rust_stable" test-sbf -- --nocapture
+    # Remove tools version specification once v2.1 cargo-build-sbf is available
+    cargo +"$rust_stable" test-sbf --tools-version v1.43 -- --nocapture
     exit 0
 fi
 
@@ -43,7 +44,8 @@ for program in $run_dir/program{,-*}; do
     (
       set -x
       cd $program
-      cargo +"$rust_stable" test-sbf -- --nocapture
+      # Remove tools version specification once v2.1 cargo-build-sbf is available
+      cargo +"$rust_stable" test-sbf --tools-version v1.43 -- --nocapture
     )
   fi
 done
@@ -53,6 +55,7 @@ if [[ -n $run_all ]]; then
   set -x
   for directory in $(ls -d $run_dir/*/); do
     cd $directory
-    cargo +"$rust_stable" test-sbf -- --nocapture
+    # Remove tools version specification once v2.1 cargo-build-sbf is available
+    cargo +"$rust_stable" test-sbf --tools-version v1.43 -- --nocapture
   done
 fi

name-service/js/package.json

@@ -32,7 +32,7 @@
   },
   "scripts": {
     "build": "tsc --build --verbose tsconfig.all.json",
-    "build:program": "cargo build-sbf --manifest-path=../program/Cargo.toml",
+    "build:program": "cargo build-sbf --tools-version v1.43 --manifest-path=../program/Cargo.toml",
     "prepublish": "tsc",
     "lint": "eslint --max-warnings 0 'src/*.ts'",
     "lint:fix": "eslint 'src/*.ts' --fix",

single-pool/js/packages/classic/package.json

@@ -12,7 +12,7 @@
   "scripts": {
     "clean": "rm -rf dist/*",
     "build": "tsc -p tsconfig.json && tsc -p tsconfig-cjs.json && ./ts-fixup.sh",
-    "build:program": "cargo build-sbf --manifest-path=../../../program/Cargo.toml",
+    "build:program": "cargo build-sbf --tools-version v1.43 --manifest-path=../../../program/Cargo.toml",
     "lint": "eslint --max-warnings 0 .",
     "lint:fix": "eslint . --fix",
     "test": "sed -i '1s/.*/{ \"type\": \"module\",/' package.json && NODE_OPTIONS='--loader=tsx' ava ; ret=$?; sed -i '1s/.*/{/' package.json && exit $ret"

stake-pool/js/package.json

@@ -4,7 +4,7 @@
   "description": "SPL Stake Pool Program JS API",
   "scripts": {
     "build": "tsc && cross-env NODE_ENV=production rollup -c",
-    "build:program": "cargo build-sbf --manifest-path=../program/Cargo.toml",
+    "build:program": "cargo build-sbf --tools-version v1.43 --manifest-path=../program/Cargo.toml",
     "lint": "eslint --max-warnings 0 .",
     "lint:fix": "eslint . --fix",
     "test": "jest",

token-swap/js/package.json

@@ -34,7 +34,7 @@
     "clean": "rm -rf lib/*",
     "build": "tsc --build --verbose tsconfig.all.json",
     "postbuild": "echo '{\"type\":\"commonjs\"}' > lib/cjs/package.json && echo '{\"type\":\"module\"}' > lib/esm/package.json",
-    "build:program": "cargo build-sbf --manifest-path=../program/Cargo.toml",
+    "build:program": "cargo build-sbf --tools-version v1.43 --manifest-path=../program/Cargo.toml",
     "test:js": "mocha test",
     "test": "start-server-and-test 'solana-test-validator --bpf-program SwapsVeCiPHMUAtzQWZw7RjsKjgCjhwU55QGu4U1Szw ../../target/deploy/spl_token_swap.so --reset --quiet' http://127.0.0.1:8899/health test:js",
     "lint": "eslint --max-warnings 0 .",