Bläddra i källkod

Update from template

Loris Leiva 11 månader sedan
förälder
incheckning
8ced3b69d8

+ 1 - 1
.github/actions/setup/action.yml

@@ -56,7 +56,7 @@ runs:
 
     - name: Install Solana
       if: ${{ inputs.solana == 'true' }}
-      uses: metaplex-foundation/actions/install-solana@v1
+      uses: solana-program/actions/install-solana@v1
       with:
         version: ${{ env.SOLANA_VERSION }}
         cache: true

+ 8 - 1
clients/js/package.json

@@ -33,6 +33,14 @@
     "registry": "https://registry.npmjs.org"
   },
   "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/solana-program/token.git"
+  },
+  "bugs": {
+    "url": "https://github.com/solana-program/token/issues"
+  },
+  "homepage": "https://github.com/solana-program/token#readme",
   "peerDependencies": {
     "@solana/web3.js": "2.0.0-rc.1"
   },
@@ -50,7 +58,6 @@
     "rimraf": "^5.0.5",
     "tsup": "^8.1.2",
     "typedoc": "^0.25.12",
-    "typedoc-plugin-missing-exports": "^2.2.0",
     "typescript": "^5.5.3"
   },
   "ava": {

+ 0 - 12
clients/js/pnpm-lock.yaml

@@ -47,9 +47,6 @@ importers:
       typedoc:
         specifier: ^0.25.12
         version: 0.25.13(typescript@5.5.3)
-      typedoc-plugin-missing-exports:
-        specifier: ^2.2.0
-        version: 2.2.0(typedoc@0.25.13(typescript@5.5.3))
       typescript:
         specifier: ^5.5.3
         version: 5.5.3
@@ -1871,11 +1868,6 @@ packages:
     resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
     engines: {node: '>=10'}
 
-  typedoc-plugin-missing-exports@2.2.0:
-    resolution: {integrity: sha512-2+XR1IcyQ5UwXZVJe9NE6HrLmNufT9i5OwoIuuj79VxuA3eYq+Y6itS9rnNV1D7UeQnUSH8kISYD73gHE5zw+w==}
-    peerDependencies:
-      typedoc: 0.24.x || 0.25.x
-
   typedoc@0.25.13:
     resolution: {integrity: sha512-pQqiwiJ+Z4pigfOnnysObszLiU3mVLWAExSPf+Mu06G/qsc3wzbuM56SZQvONhHLncLUhYzOVkjFFpFfL5AzhQ==}
     engines: {node: '>= 16'}
@@ -3882,10 +3874,6 @@ snapshots:
 
   type-fest@0.20.2: {}
 
-  typedoc-plugin-missing-exports@2.2.0(typedoc@0.25.13(typescript@5.5.3)):
-    dependencies:
-      typedoc: 0.25.13(typescript@5.5.3)
-
   typedoc@0.25.13(typescript@5.5.3):
     dependencies:
       lunr: 2.3.9

+ 4 - 1
package.json

@@ -19,12 +19,15 @@
     "template:upgrade": "zx ./scripts/upgrade-template.mjs"
   },
   "devDependencies": {
-    "@iarna/toml": "^2.2.5",
     "@codama/renderers-js": "^1.0.0",
     "@codama/renderers-rust": "^1.0.0",
+    "@iarna/toml": "^2.2.5",
     "codama": "^1.0.0",
     "typescript": "^5.5.2",
     "zx": "^7.2.3"
   },
+  "engines": {
+    "node": ">=v20.0.0"
+  },
   "packageManager": "pnpm@9.1.0"
 }

+ 1 - 1
scripts/client/lint-rust.mjs

@@ -12,7 +12,7 @@ import {
 const lintArgs = cliArguments();
 
 const fix = popArgument(lintArgs, '--fix');
-const toolchain = getToolchainArgument('format');
+const toolchain = getToolchainArgument('lint');
 const manifestPath = path.join(
   workingDirectory,
   'clients',

+ 3 - 2
scripts/client/test-rust.mjs

@@ -7,11 +7,12 @@ import { cliArguments, workingDirectory } from '../utils.mjs';
 const testArgs = cliArguments();
 
 const hasSolfmt = await which('solfmt', { nothrow: true });
+const sbfOutDir = path.join(workingDirectory, 'target', 'deploy');
 
 // Run the tests.
 cd(path.join(workingDirectory, 'clients', 'rust'));
 if (hasSolfmt) {
-  await $`cargo test-sbf ${testArgs} 2>&1 | solfmt`;
+  await $`SBF_OUT_DIR=${sbfOutDir} cargo test --features "test-sbf" ${testArgs} 2>&1 | solfmt`;
 } else {
-  await $`cargo test-sbf ${testArgs}`;
+  await $`SBF_OUT_DIR=${sbfOutDir} cargo test --features "test-sbf" ${testArgs}`;
 }