diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 7692155..a547a7b 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -29,7 +29,7 @@ runs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 cache: 'pnpm' - name: Install Dependencies @@ -63,7 +63,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 diff --git a/clients/js/package.json b/clients/js/package.json index cdaf9b0..8cc3e52 100644 --- a/clients/js/package.json +++ b/clients/js/package.json @@ -32,15 +32,22 @@ "access": "public", "registry": "https://registry.npmjs.org" }, + "repository": { + "type": "git", + "url": "git+https://github.com/solana-program/config.git" + }, + "bugs": { + "url": "https://github.com/solana-program/config/issues" + }, + "homepage": "https://github.com/solana-program/config#readme", "license": "MIT", "peerDependencies": { - "@solana/web3.js": "2.0.0-preview.4" + "@solana/web3.js": "2.0.0-rc.1" }, "devDependencies": { "@ava/typescript": "^4.1.0", "@solana/eslint-config-solana": "^3.0.3", - "@solana/web3.js": "2.0.0-preview.4", - "@solana/webcrypto-ed25519-polyfill": "2.0.0-preview.4", + "@solana/web3.js": "2.0.0-rc.1", "@types/node": "^20", "@typescript-eslint/eslint-plugin": "^7.16.1", "@typescript-eslint/parser": "^7.16.1", @@ -50,16 +57,12 @@ "rimraf": "^5.0.5", "tsup": "^8.1.2", "typedoc": "^0.25.12", - "typedoc-plugin-missing-exports": "^2.2.0", "typescript": "^5.5.3" }, "ava": { "nodeArguments": [ "--no-warnings" ], - "require": [ - "@solana/webcrypto-ed25519-polyfill" - ], "typescript": { "compile": false, "rewritePaths": { diff --git a/clients/js/pnpm-lock.yaml b/clients/js/pnpm-lock.yaml index 1ecca6a..df74f21 100644 --- a/clients/js/pnpm-lock.yaml +++ b/clients/js/pnpm-lock.yaml @@ -15,11 +15,8 @@ importers: specifier: ^3.0.3 version: 3.0.4(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.0))(eslint-plugin-simple-import-sort@12.1.1(eslint@8.57.0))(eslint-plugin-sort-keys-fix@1.1.2)(eslint-plugin-typescript-sort-keys@3.2.0(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4) '@solana/web3.js': - specifier: 2.0.0-preview.4 - version: 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)(ws@8.18.0) - '@solana/webcrypto-ed25519-polyfill': - specifier: 2.0.0-preview.4 - version: 2.0.0-preview.4(typescript@5.5.4) + specifier: 2.0.0-rc.1 + version: 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)(ws@8.18.0) '@types/node': specifier: ^20 version: 20.14.14 @@ -47,9 +44,6 @@ importers: typedoc: specifier: ^0.25.12 version: 0.25.13(typescript@5.5.4) - typedoc-plugin-missing-exports: - specifier: ^2.2.0 - version: 2.3.0(typedoc@0.25.13(typescript@5.5.4)) typescript: specifier: ^5.5.3 version: 5.5.4 @@ -261,9 +255,6 @@ packages: resolution: {integrity: sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==} hasBin: true - '@noble/ed25519@2.1.0': - resolution: {integrity: sha512-KM4qTyXPinyCgMzeYJH/UudpdL+paJXtY3CHtHYZQtBkS8MZoPr4rOikZllIutJe0d06QDQKisyn02gxZ8TcQA==} - '@nodelib/fs.scandir@2.1.5': resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} engines: {node: '>= 8'} @@ -368,49 +359,49 @@ packages: resolution: {integrity: sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==} engines: {node: '>=18'} - '@solana/accounts@2.0.0-preview.4': - resolution: {integrity: sha512-gPuYX8l7GBk/UeqvZytbrARDvuBoM9r6SgWpn+Y3WQnMhwnCQ79ldh8GV2w28Jf7jFpeg3nXKt1++8cfsmaUUw==} + '@solana/accounts@2.0.0-rc.1': + resolution: {integrity: sha512-au6grz6iIgepKIbN2HUHKatFhg7mvIvdjFMDYpuEx+AGwK7vHnN5PsJqSCGQydthC2nVQwSZC9IgA5MF5wUHdw==} peerDependencies: typescript: '>=5' - '@solana/addresses@2.0.0-preview.4': - resolution: {integrity: sha512-9UxkkAb4+2OpmXx9UguT3DiZIDnbWws6dZWXLp0zQmk4yDxN4vsei7mUkf0Gz/o/ujNhYkowuvmzkHYGHZu9QA==} + '@solana/addresses@2.0.0-rc.1': + resolution: {integrity: sha512-g31KrLZdECjAKceShlGoYxnWDmEVklpjPs8xOtnj/HWupEk+Mds4vtmTACTAeJkWZW/3x+z0aexMtO86MKA47g==} peerDependencies: typescript: '>=5' - '@solana/assertions@2.0.0-preview.4': - resolution: {integrity: sha512-Fd1LGdbH4fNMTYBXTvt+qlcEcaS7j+CnvPsUxboJmwiJz/qzkneLJ/Ao8SD/Fo6jt27bhYal2RBg3E9KOE0TkA==} + '@solana/assertions@2.0.0-rc.1': + resolution: {integrity: sha512-dvxYCUB7ftZa5lWcsyMYLsGm204H6yVN8Q3ngluMG0rhTtScMBRklVg7Vs39ISwJOkJWJPGToaZ7DjNJ83bm1Q==} peerDependencies: typescript: '>=5' - '@solana/codecs-core@2.0.0-preview.4': - resolution: {integrity: sha512-A0VVuDDA5kNKZUinOqHxJQK32aKTucaVbvn31YenGzHX1gPqq+SOnFwgaEY6pq4XEopSmaK16w938ZQS8IvCnw==} + '@solana/codecs-core@2.0.0-rc.1': + resolution: {integrity: sha512-bauxqMfSs8EHD0JKESaNmNuNvkvHSuN3bbWAF5RjOfDu2PugxHrvRebmYauvSumZ3cTfQ4HJJX6PG5rN852qyQ==} peerDependencies: typescript: '>=5' - '@solana/codecs-data-structures@2.0.0-preview.4': - resolution: {integrity: sha512-nt2k2eTeyzlI/ccutPcG36M/J8NAYfxBPI9h/nQjgJ+M+IgOKi31JV8StDDlG/1XvY0zyqugV3I0r3KAbZRJpA==} + '@solana/codecs-data-structures@2.0.0-rc.1': + resolution: {integrity: sha512-rinCv0RrAVJ9rE/rmaibWJQxMwC5lSaORSZuwjopSUE6T0nb/MVg6Z1siNCXhh/HFTOg0l8bNvZHgBcN/yvXog==} peerDependencies: typescript: '>=5' - '@solana/codecs-numbers@2.0.0-preview.4': - resolution: {integrity: sha512-Q061rLtMadsO7uxpguT+Z7G4UHnjQ6moVIxAQxR58nLxDPCC7MB1Pk106/Z7NDhDLHTcd18uO6DZ7ajHZEn2XQ==} + '@solana/codecs-numbers@2.0.0-rc.1': + resolution: {integrity: sha512-J5i5mOkvukXn8E3Z7sGIPxsThRCgSdgTWJDQeZvucQ9PT6Y3HiVXJ0pcWiOWAoQ3RX8e/f4I3IC+wE6pZiJzDQ==} peerDependencies: typescript: '>=5' - '@solana/codecs-strings@2.0.0-preview.4': - resolution: {integrity: sha512-YDbsQePRWm+xnrfS64losSGRg8Wb76cjK1K6qfR8LPmdwIC3787x9uW5/E4icl/k+9nwgbIRXZ65lpF+ucZUnw==} + '@solana/codecs-strings@2.0.0-rc.1': + resolution: {integrity: sha512-9/wPhw8TbGRTt6mHC4Zz1RqOnuPTqq1Nb4EyuvpZ39GW6O2t2Q7Q0XxiB3+BdoEjwA2XgPw6e2iRfvYgqty44g==} peerDependencies: fastestsmallesttextencoderdecoder: ^1.0.22 typescript: '>=5' - '@solana/codecs@2.0.0-preview.4': - resolution: {integrity: sha512-gLMupqI4i+G4uPi2SGF/Tc1aXcviZF2ybC81x7Q/fARamNSgNOCUUoSCg9nWu1Gid6+UhA7LH80sWI8XjKaRog==} + '@solana/codecs@2.0.0-rc.1': + resolution: {integrity: sha512-qxoR7VybNJixV51L0G1RD2boZTcxmwUWnKCaJJExQ5qNKwbpSyDdWfFJfM5JhGyKe9DnPVOZB+JHWXnpbZBqrQ==} peerDependencies: typescript: '>=5' - '@solana/errors@2.0.0-preview.4': - resolution: {integrity: sha512-kadtlbRv2LCWr8A9V22On15Us7Nn8BvqNaOB4hXsTB3O0fU40D1ru2l+cReqLcRPij4znqlRzW9Xi0m6J5DIhA==} + '@solana/errors@2.0.0-rc.1': + resolution: {integrity: sha512-ejNvQ2oJ7+bcFAYWj225lyRkHnixuAeb7RQCixm+5mH4n1IA4Qya/9Bmfy5RAAHQzxK43clu3kZmL5eF9VGtYQ==} hasBin: true peerDependencies: typescript: '>=5' @@ -428,129 +419,129 @@ packages: eslint-plugin-typescript-sort-keys: ^3.2.0 typescript: ^5.1.6 - '@solana/fast-stable-stringify@2.0.0-preview.4': - resolution: {integrity: sha512-WcJRbl+YoShyabRR0VuGciMEcIbZuX/zH0Pip40WqJRO95VVtvNG5tl80syVFX7OlYeXAQaAkYMhiDjactpEdA==} + '@solana/fast-stable-stringify@2.0.0-rc.1': + resolution: {integrity: sha512-TN8JY+Sbh5NNq4TqdWil8hXKx2d84bTHvY6jfBXNjM29S0fwpUpVRHUzOkuK1mjjWFNkMpfgJfozC0TjdUbkvA==} peerDependencies: typescript: '>=5' - '@solana/functional@2.0.0-preview.4': - resolution: {integrity: sha512-swdKwWTLdqyrFDfHFYG/RFKBDLlVLjyDcjParLatT1sFD6p4jEAlrde8YmWxb/O5wqqMQEsKSPZvG8c938YqLA==} + '@solana/functional@2.0.0-rc.1': + resolution: {integrity: sha512-BmedS5o8HTlU8/NA22I6urJqat9QYIw0oH6rKdMMBisDwX7MtgJhe38W8iLP7QCcxoJeS4526qaD8uD62+Pheg==} peerDependencies: typescript: '>=5' - '@solana/instructions@2.0.0-preview.4': - resolution: {integrity: sha512-sR0bfXixX4ffYH5jH+80Z9S6SwKaoKPMKLjLHZnticiQhAlJBl7CUVfKzYatfEDgFOTAzOqa65V49kIQ2W8EPA==} + '@solana/instructions@2.0.0-rc.1': + resolution: {integrity: sha512-zkfL4WBHPbkMrYsuGZc/sekPa/oALIVvVGUw/gwAervMeLZ34cWCUE6WC2uUUh+bq3OFq0/FSFhAg2YbHHDyUw==} peerDependencies: typescript: '>=5' - '@solana/keys@2.0.0-preview.4': - resolution: {integrity: sha512-LBcqecCxdbcQxVv1Ut/t03rDs2WOyBJLXu3KkgqCAXIENXDdSU026Hy+nFv5EvaKraAu98kyoMyFk8DtqhosLQ==} + '@solana/keys@2.0.0-rc.1': + resolution: {integrity: sha512-ls3B0KOvfdiBH3/fnEjHhicfXsLLb4zApJlSX4X8NZ+2TmTJ2Jqa+MakgAzrsxL1FJkTJ1RDboR9xx2CHQtKzw==} peerDependencies: typescript: '>=5' - '@solana/options@2.0.0-preview.4': - resolution: {integrity: sha512-tv2O/Frxql/wSe3jbzi5nVicIWIus/BftH+5ZR+r9r3FO0/htEllZS5Q9XdbmSboHu+St87584JXeDx3xm4jaA==} + '@solana/options@2.0.0-rc.1': + resolution: {integrity: sha512-mLUcR9mZ3qfHlmMnREdIFPf9dpMc/Bl66tLSOOWxw4ml5xMT2ohFn7WGqoKcu/UHkT9CrC6+amEdqCNvUqI7AA==} peerDependencies: typescript: '>=5' - '@solana/programs@2.0.0-preview.4': - resolution: {integrity: sha512-yNgsD03QasbHpIW9UFkkX6UNhuHbrUC7bMnhXVWK6Hbo1E7tel067EfMfD46DsjPB1zyABNVHbHuo/7SKrzNUQ==} + '@solana/programs@2.0.0-rc.1': + resolution: {integrity: sha512-wF49DychwSz3sVmTF51R6DTHBGMP7Uhe7EdmCNu+Ef9EgKBJZFfrViOD6M8Q0b3WH//TV63HNlX/2QmHtJjQHg==} peerDependencies: typescript: '>=5' - '@solana/rpc-api@2.0.0-preview.4': - resolution: {integrity: sha512-ZBAm6I44YsxPQO6WIfaLIKyX8dAfx09gzo+YCuespLkhrpVPQgYoESZQLaaeA3SRKwFbqjsNI5bj8T+ze0dZEA==} + '@solana/promises@2.0.0-rc.1': + resolution: {integrity: sha512-iIaC52Ka+omGabGn2LHOSgEm9N2gI7Iyik6LE3DDxZ4MuYmGcJ4E315XuE/UVXWnc9qOfOjgtSaaOYhde0vyrQ==} peerDependencies: typescript: '>=5' - '@solana/rpc-parsed-types@2.0.0-preview.4': - resolution: {integrity: sha512-qxZ6BqrmaOtn+CCTa0jiimYir7BBBVwQBTMM5onETeDa1Qz9rcisadjfK9ZBSBmJObpVdPZmV5Afd6YRjNPHkQ==} + '@solana/rpc-api@2.0.0-rc.1': + resolution: {integrity: sha512-pg/w+0pgj3msBCC/hkZa9/qZHRdqh7MLsHMJInXnenO+Rzj6IyE47Ig6rt6GuI4OxYy+1d714jcPXVMA8p2YWw==} peerDependencies: typescript: '>=5' - '@solana/rpc-spec-types@2.0.0-preview.4': - resolution: {integrity: sha512-xL+sHqT5j7yzcJurfMuBAgFZGvppvsvDE08q06Uack9MYQwPYsgfCu5YG0T4Ik/ez/+ey9eFhJEhW2rOQ8A6sw==} + '@solana/rpc-parsed-types@2.0.0-rc.1': + resolution: {integrity: sha512-5/AYNiZvR9do56VJgmTscRwnd9myt6x9uG7b0S3V+K5e0xzA9yJF68SzI4TQSNmLfWXCaVC90xGCWWkM19lLIQ==} peerDependencies: typescript: '>=5' - '@solana/rpc-spec@2.0.0-preview.4': - resolution: {integrity: sha512-EjtyV/OV3b4DMsD+Ks7YebrtVM6VprEn43LRwuzlM4lIhMjTzCHnNQiYDXdj2Zmlahx9+tfSQj73g8POOlStvA==} + '@solana/rpc-spec-types@2.0.0-rc.1': + resolution: {integrity: sha512-Z0gOrzasTYU+kNNnDDG2snZxBoBPMN8oFc0EE9HiDKN9JEsc+asexzKeq+Nea7JVqVFcN5V3bjqrpD86V5EOiQ==} peerDependencies: typescript: '>=5' - '@solana/rpc-subscriptions-api@2.0.0-preview.4': - resolution: {integrity: sha512-gxK58e95eEpBO5nNLQ0tNA6fJfA0FYIe3NzQqZySxdfqVLV60VqcynmXxZ2KnKi4HUi1tq5GhoV1jhCBUSjArQ==} + '@solana/rpc-spec@2.0.0-rc.1': + resolution: {integrity: sha512-E81IoNzLbp24T633klEqlRujd2i/rd8xVkJGt04DL/LGS4/cCWJEhkmOnfljxWafCPUundRXlPtNG3ZmHzEYqA==} peerDependencies: typescript: '>=5' - '@solana/rpc-subscriptions-spec@2.0.0-preview.4': - resolution: {integrity: sha512-NjvgipVGxgL9m1QHKMwuVQY+fNd6MDjHIYsHciqk6VDZwD4i+Zq5J7CcYnOsjxC/TtQ6lQutTJ1V9tnqOwf1WA==} + '@solana/rpc-subscriptions-api@2.0.0-rc.1': + resolution: {integrity: sha512-HmuJmB+RnpYzpiwDWncYFey0lrdFt8KbFvH0JvxEB7NX6V9NgGQIwRY1bfoaeSwX6t93p4nBWr2ckJWLNjXzCw==} peerDependencies: typescript: '>=5' - '@solana/rpc-subscriptions-transport-websocket@2.0.0-preview.4': - resolution: {integrity: sha512-YnLZuraCNTeNadOd/YmsZFzaUjwvi8Vtiy8/h7tVCUGa8e6Nzu9uZFSxXaWrkimi/gHzvvee5ACXLf7gHDzXng==} + '@solana/rpc-subscriptions-spec@2.0.0-rc.1': + resolution: {integrity: sha512-eXRVlMr9zw4JlBoJgVhFRxFs3Iaowhtt35ZIMD+OoTqgKniL62iGiZ3hXsuMDToMvQCBd0UfI+ZVdF2gLQdg9A==} peerDependencies: typescript: '>=5' - ws: ^8.14.0 - '@solana/rpc-subscriptions@2.0.0-preview.4': - resolution: {integrity: sha512-o03upZQxhqSljsQO7//I/gqJ3cWcDCLPJW7b4gjYs3ms3qrI/nAyeMLGfcR+Qw7TSB7aLPZZ45ANvzMwSZXDWw==} + '@solana/rpc-subscriptions-transport-websocket@2.0.0-rc.1': + resolution: {integrity: sha512-NxheQmG6Ku9gjF3TyGbM8Nxx6fOU3m89LdfH9SQNu6yME6VXKWuT1LaY24T707yDOoKZJsOWabRrQtNfJ+3HZA==} peerDependencies: typescript: '>=5' + ws: ^8.14.0 - '@solana/rpc-transformers@2.0.0-preview.4': - resolution: {integrity: sha512-R6Ob2m74FcTtPEOneenwKv305Gypk/yWpdKhGafPP/1yJKLY4lp8BsHzNdDwWMP6YZ9c/GZO5iJI5o1fc9COJg==} + '@solana/rpc-subscriptions@2.0.0-rc.1': + resolution: {integrity: sha512-gHrVNWEbMi8uDO8BzpJkuDiHMcfD4SrfLRohROnHx0SfSlEGxvIkBjPnwOYIoS7IkWk95e19s7hJoBNn2TX4kw==} peerDependencies: typescript: '>=5' - '@solana/rpc-transport-http@2.0.0-preview.4': - resolution: {integrity: sha512-NmezbvEnWICY+5Ftnoeb3/Fvq7eF7c4RYyGy/3lDPmYJlA9AWIrlA8BQak30q0h0b/NLLXa7cqb/oOOTzevguw==} + '@solana/rpc-transformers@2.0.0-rc.1': + resolution: {integrity: sha512-YM25X4Eeh39UR2AoSrCFn74W99bQk0/DLqyPgZpNBRbszzEifGHqu83NNFwBuPMVc9q7ilf5s6r6pqhWP+5JJw==} peerDependencies: typescript: '>=5' - '@solana/rpc-types@2.0.0-preview.4': - resolution: {integrity: sha512-bd68xA8R7qiHQbyJH2/TqhCLRRq6DIP9RQg5HShlenIeplkh46rDjwmtxdS+MWC/xJUGQ4buT1CxCCVNxoOMuw==} + '@solana/rpc-transport-http@2.0.0-rc.1': + resolution: {integrity: sha512-Byvn2LnaCgTnEyr78wcgh8SrVHo+L6/l1kXQW05cNAjjbS8d8z4meBUBrXDWHmCsWy7RdnrTcBixPPtE+pUebw==} peerDependencies: typescript: '>=5' - '@solana/rpc@2.0.0-preview.4': - resolution: {integrity: sha512-iTlxQZomNcDpYuNcNbHjfwn8dcxwWrzr4bh08n3p/3DrSQqqNRl4z459M2y5BpTEjZRhM7YjB2+RUptI60hBcA==} + '@solana/rpc-types@2.0.0-rc.1': + resolution: {integrity: sha512-EcGx9VXqA0+uYEdaa1lKTaGBVxLyNL8nkecE4GkqQ+ntRyYlNBPecd4b8siQGSleUQa+Tk/VSPUawSkHqNTLug==} peerDependencies: typescript: '>=5' - '@solana/signers@2.0.0-preview.4': - resolution: {integrity: sha512-NB5AaVnmjbfO2nXY8ubDOTfgCqoEai1HP/lPoK00y3EQ+R5k6kCxhKfKOJ4YG/sGy4osAvXdErfINjzg8oQnzQ==} + '@solana/rpc@2.0.0-rc.1': + resolution: {integrity: sha512-upqR/Ae5syzQDZkffTdU/09k1Vx073Gt4xkkpcWaTBmW0obVhrlvJvH2k5jrOQ13BZd2NVg1MWMEOBcy3+nJjQ==} peerDependencies: typescript: '>=5' - '@solana/sysvars@2.0.0-preview.4': - resolution: {integrity: sha512-IAd3KTsI0O5siOMoKn6cnHG+Ji+7VtTKS7hIltg6MkejTY3WStzzi3i65WUXb3kr00Xpi3ol6WpksQDCZSl5Rg==} + '@solana/signers@2.0.0-rc.1': + resolution: {integrity: sha512-dv3oKSF+AIaHKpnSkmzEf+jXVcA3nl015+Mp/WQZYzQJS01dlrmnd4N5DOSn2CaPRJ0TLujHkupxkOFXbe149A==} peerDependencies: typescript: '>=5' - '@solana/transaction-confirmation@2.0.0-preview.4': - resolution: {integrity: sha512-owRIvEQ/oXbmZL3n1SDRuyBNUYFnWEddz89SdNVnztwzQXZ/IaULv33So+0WT8gxONkKIcrYbv9pkULYU1om6w==} + '@solana/sysvars@2.0.0-rc.1': + resolution: {integrity: sha512-nLiuisgbRw7FkJrxPJOBzf0ro7ZCk0gWgMyLQexe9oPoTzdZnWbHI4ldYDmtfdy2dkPBsNTz6sZ6o75HwnGu0A==} peerDependencies: typescript: '>=5' - '@solana/transaction-messages@2.0.0-preview.4': - resolution: {integrity: sha512-1oTkS7wL1g9qTLNFNMzDQ82gMgyTh9NFl0Jm3qns8J7raaXAwtxUz8138zqg/+jte9MEQH7wZ53c/OMpB7k8Dw==} + '@solana/transaction-confirmation@2.0.0-rc.1': + resolution: {integrity: sha512-ES671CZUDLaXV46Vv3Kxd22coSQE4DlE7y0s9ChzQ7t4bLGv6DeHlHXU9kQBtou9koLR25wiDUWtvwNUyzUbHw==} peerDependencies: typescript: '>=5' - '@solana/transactions@2.0.0-preview.4': - resolution: {integrity: sha512-5zazsq6YwbN11ePyRXX60MaTHNTrC+83UjjTX2mf7OVUvIEZwdksnNSCVC8P2ZaBUHz1pljbqAi+1prC9RirSg==} + '@solana/transaction-messages@2.0.0-rc.1': + resolution: {integrity: sha512-pZTetOtRDwfuK/fyE8FKbtRsLQOTgEIQld3tskB85npUHaEgrnCYzp3nJtMhKOLel3w3f/27VtWLNSrRyyAiew==} peerDependencies: typescript: '>=5' - '@solana/web3.js@2.0.0-preview.4': - resolution: {integrity: sha512-XKp3bD/okjnxQfpY1Z1StKZ2StT3Bsard/3auh+JFVLybiURNURVXRbPO6UCFCuVxYjJLu9MqAjEkZ50GgYaIA==} + '@solana/transactions@2.0.0-rc.1': + resolution: {integrity: sha512-u9MH2Kk4P0E5rNxATdx/ljR2rp34S9VuC3Jzj9nCMKJ0XwvCD+ddTmIDop5Vs+96Ls9SGj0XaKAJtT+9S7SDpw==} peerDependencies: typescript: '>=5' - '@solana/webcrypto-ed25519-polyfill@2.0.0-preview.4': - resolution: {integrity: sha512-FLmO3XIz1vSNMSJLM3eyU79ukFrHDnx41iDv9GNP24rBq/rNkr2CG+fO86cHT+Tu7hwwcs0KaRUYyOcVtcdnhg==} + '@solana/web3.js@2.0.0-rc.1': + resolution: {integrity: sha512-0fE40ZsJuqSOYOWbt8haHBIbhSfGckxJbwWEK+xRQaWr1sY1+MPUDnBawsLf818g9KRSNnS2Y3+/Sve7A3yfBA==} peerDependencies: typescript: '>=5' @@ -1860,11 +1851,6 @@ packages: resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==} engines: {node: '>=10'} - typedoc-plugin-missing-exports@2.3.0: - resolution: {integrity: sha512-iI9ITNNLlbsLCBBeYDyu0Qqp3GN/9AGyWNKg8bctRXuZEPT7G1L+0+MNWG9MsHcf/BFmNbXL0nQ8mC/tXRicog==} - peerDependencies: - typedoc: 0.24.x || 0.25.x - typedoc@0.25.13: resolution: {integrity: sha512-pQqiwiJ+Z4pigfOnnysObszLiU3mVLWAExSPf+Mu06G/qsc3wzbuM56SZQvONhHLncLUhYzOVkjFFpFfL5AzhQ==} engines: {node: '>= 16'} @@ -2128,8 +2114,6 @@ snapshots: - encoding - supports-color - '@noble/ed25519@2.1.0': {} - '@nodelib/fs.scandir@2.1.5': dependencies: '@nodelib/fs.stat': 2.0.5 @@ -2200,71 +2184,71 @@ snapshots: '@sindresorhus/merge-streams@2.3.0': {} - '@solana/accounts@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': + '@solana/accounts@2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': dependencies: - '@solana/addresses': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/codecs-core': 2.0.0-preview.4(typescript@5.5.4) - '@solana/codecs-strings': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) - '@solana/rpc-spec': 2.0.0-preview.4(typescript@5.5.4) - '@solana/rpc-types': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/addresses': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/codecs-core': 2.0.0-rc.1(typescript@5.5.4) + '@solana/codecs-strings': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/errors': 2.0.0-rc.1(typescript@5.5.4) + '@solana/rpc-spec': 2.0.0-rc.1(typescript@5.5.4) + '@solana/rpc-types': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) typescript: 5.5.4 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/addresses@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': + '@solana/addresses@2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': dependencies: - '@solana/assertions': 2.0.0-preview.4(typescript@5.5.4) - '@solana/codecs-core': 2.0.0-preview.4(typescript@5.5.4) - '@solana/codecs-strings': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) + '@solana/assertions': 2.0.0-rc.1(typescript@5.5.4) + '@solana/codecs-core': 2.0.0-rc.1(typescript@5.5.4) + '@solana/codecs-strings': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/errors': 2.0.0-rc.1(typescript@5.5.4) typescript: 5.5.4 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/assertions@2.0.0-preview.4(typescript@5.5.4)': + '@solana/assertions@2.0.0-rc.1(typescript@5.5.4)': dependencies: - '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) + '@solana/errors': 2.0.0-rc.1(typescript@5.5.4) typescript: 5.5.4 - '@solana/codecs-core@2.0.0-preview.4(typescript@5.5.4)': + '@solana/codecs-core@2.0.0-rc.1(typescript@5.5.4)': dependencies: - '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) + '@solana/errors': 2.0.0-rc.1(typescript@5.5.4) typescript: 5.5.4 - '@solana/codecs-data-structures@2.0.0-preview.4(typescript@5.5.4)': + '@solana/codecs-data-structures@2.0.0-rc.1(typescript@5.5.4)': dependencies: - '@solana/codecs-core': 2.0.0-preview.4(typescript@5.5.4) - '@solana/codecs-numbers': 2.0.0-preview.4(typescript@5.5.4) - '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) + '@solana/codecs-core': 2.0.0-rc.1(typescript@5.5.4) + '@solana/codecs-numbers': 2.0.0-rc.1(typescript@5.5.4) + '@solana/errors': 2.0.0-rc.1(typescript@5.5.4) typescript: 5.5.4 - '@solana/codecs-numbers@2.0.0-preview.4(typescript@5.5.4)': + '@solana/codecs-numbers@2.0.0-rc.1(typescript@5.5.4)': dependencies: - '@solana/codecs-core': 2.0.0-preview.4(typescript@5.5.4) - '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) + '@solana/codecs-core': 2.0.0-rc.1(typescript@5.5.4) + '@solana/errors': 2.0.0-rc.1(typescript@5.5.4) typescript: 5.5.4 - '@solana/codecs-strings@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': + '@solana/codecs-strings@2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': dependencies: - '@solana/codecs-core': 2.0.0-preview.4(typescript@5.5.4) - '@solana/codecs-numbers': 2.0.0-preview.4(typescript@5.5.4) - '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) + '@solana/codecs-core': 2.0.0-rc.1(typescript@5.5.4) + '@solana/codecs-numbers': 2.0.0-rc.1(typescript@5.5.4) + '@solana/errors': 2.0.0-rc.1(typescript@5.5.4) fastestsmallesttextencoderdecoder: 1.0.22 typescript: 5.5.4 - '@solana/codecs@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': + '@solana/codecs@2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': dependencies: - '@solana/codecs-core': 2.0.0-preview.4(typescript@5.5.4) - '@solana/codecs-data-structures': 2.0.0-preview.4(typescript@5.5.4) - '@solana/codecs-numbers': 2.0.0-preview.4(typescript@5.5.4) - '@solana/codecs-strings': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/options': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/codecs-core': 2.0.0-rc.1(typescript@5.5.4) + '@solana/codecs-data-structures': 2.0.0-rc.1(typescript@5.5.4) + '@solana/codecs-numbers': 2.0.0-rc.1(typescript@5.5.4) + '@solana/codecs-strings': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/options': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) typescript: 5.5.4 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/errors@2.0.0-preview.4(typescript@5.5.4)': + '@solana/errors@2.0.0-rc.1(typescript@5.5.4)': dependencies: chalk: 5.3.0 commander: 12.1.0 @@ -2282,261 +2266,262 @@ snapshots: eslint-plugin-typescript-sort-keys: 3.2.0(@typescript-eslint/parser@7.18.0(eslint@8.57.0)(typescript@5.5.4))(eslint@8.57.0)(typescript@5.5.4) typescript: 5.5.4 - '@solana/fast-stable-stringify@2.0.0-preview.4(typescript@5.5.4)': + '@solana/fast-stable-stringify@2.0.0-rc.1(typescript@5.5.4)': dependencies: typescript: 5.5.4 - '@solana/functional@2.0.0-preview.4(typescript@5.5.4)': + '@solana/functional@2.0.0-rc.1(typescript@5.5.4)': dependencies: typescript: 5.5.4 - '@solana/instructions@2.0.0-preview.4(typescript@5.5.4)': + '@solana/instructions@2.0.0-rc.1(typescript@5.5.4)': dependencies: - '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) + '@solana/errors': 2.0.0-rc.1(typescript@5.5.4) typescript: 5.5.4 - '@solana/keys@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': + '@solana/keys@2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': dependencies: - '@solana/assertions': 2.0.0-preview.4(typescript@5.5.4) - '@solana/codecs-core': 2.0.0-preview.4(typescript@5.5.4) - '@solana/codecs-strings': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) + '@solana/assertions': 2.0.0-rc.1(typescript@5.5.4) + '@solana/codecs-core': 2.0.0-rc.1(typescript@5.5.4) + '@solana/codecs-strings': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/errors': 2.0.0-rc.1(typescript@5.5.4) typescript: 5.5.4 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/options@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': + '@solana/options@2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': dependencies: - '@solana/codecs-core': 2.0.0-preview.4(typescript@5.5.4) - '@solana/codecs-data-structures': 2.0.0-preview.4(typescript@5.5.4) - '@solana/codecs-numbers': 2.0.0-preview.4(typescript@5.5.4) - '@solana/codecs-strings': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) + '@solana/codecs-core': 2.0.0-rc.1(typescript@5.5.4) + '@solana/codecs-data-structures': 2.0.0-rc.1(typescript@5.5.4) + '@solana/codecs-numbers': 2.0.0-rc.1(typescript@5.5.4) + '@solana/codecs-strings': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/errors': 2.0.0-rc.1(typescript@5.5.4) typescript: 5.5.4 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/programs@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': + '@solana/programs@2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': dependencies: - '@solana/addresses': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) + '@solana/addresses': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/errors': 2.0.0-rc.1(typescript@5.5.4) typescript: 5.5.4 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/rpc-api@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': - dependencies: - '@solana/addresses': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/codecs-core': 2.0.0-preview.4(typescript@5.5.4) - '@solana/codecs-strings': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) - '@solana/keys': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/rpc-parsed-types': 2.0.0-preview.4(typescript@5.5.4) - '@solana/rpc-spec': 2.0.0-preview.4(typescript@5.5.4) - '@solana/rpc-transformers': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/rpc-types': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/transaction-messages': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/transactions': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/promises@2.0.0-rc.1(typescript@5.5.4)': + dependencies: + typescript: 5.5.4 + + '@solana/rpc-api@2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': + dependencies: + '@solana/addresses': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/codecs-core': 2.0.0-rc.1(typescript@5.5.4) + '@solana/codecs-strings': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/errors': 2.0.0-rc.1(typescript@5.5.4) + '@solana/keys': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/rpc-parsed-types': 2.0.0-rc.1(typescript@5.5.4) + '@solana/rpc-spec': 2.0.0-rc.1(typescript@5.5.4) + '@solana/rpc-transformers': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/rpc-types': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/transaction-messages': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/transactions': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) typescript: 5.5.4 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/rpc-parsed-types@2.0.0-preview.4(typescript@5.5.4)': + '@solana/rpc-parsed-types@2.0.0-rc.1(typescript@5.5.4)': dependencies: typescript: 5.5.4 - '@solana/rpc-spec-types@2.0.0-preview.4(typescript@5.5.4)': + '@solana/rpc-spec-types@2.0.0-rc.1(typescript@5.5.4)': dependencies: typescript: 5.5.4 - '@solana/rpc-spec@2.0.0-preview.4(typescript@5.5.4)': + '@solana/rpc-spec@2.0.0-rc.1(typescript@5.5.4)': dependencies: - '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) - '@solana/rpc-spec-types': 2.0.0-preview.4(typescript@5.5.4) + '@solana/rpc-spec-types': 2.0.0-rc.1(typescript@5.5.4) typescript: 5.5.4 - '@solana/rpc-subscriptions-api@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': + '@solana/rpc-subscriptions-api@2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': dependencies: - '@solana/addresses': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/keys': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/rpc-subscriptions-spec': 2.0.0-preview.4(typescript@5.5.4) - '@solana/rpc-transformers': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/rpc-types': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/transaction-messages': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/transactions': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/addresses': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/keys': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/rpc-subscriptions-spec': 2.0.0-rc.1(typescript@5.5.4) + '@solana/rpc-transformers': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/rpc-types': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/transaction-messages': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/transactions': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) typescript: 5.5.4 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/rpc-subscriptions-spec@2.0.0-preview.4(typescript@5.5.4)': + '@solana/rpc-subscriptions-spec@2.0.0-rc.1(typescript@5.5.4)': dependencies: - '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) - '@solana/rpc-spec-types': 2.0.0-preview.4(typescript@5.5.4) + '@solana/errors': 2.0.0-rc.1(typescript@5.5.4) + '@solana/rpc-spec-types': 2.0.0-rc.1(typescript@5.5.4) typescript: 5.5.4 - '@solana/rpc-subscriptions-transport-websocket@2.0.0-preview.4(typescript@5.5.4)(ws@8.18.0)': + '@solana/rpc-subscriptions-transport-websocket@2.0.0-rc.1(typescript@5.5.4)(ws@8.18.0)': dependencies: - '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) - '@solana/rpc-subscriptions-spec': 2.0.0-preview.4(typescript@5.5.4) + '@solana/errors': 2.0.0-rc.1(typescript@5.5.4) + '@solana/rpc-subscriptions-spec': 2.0.0-rc.1(typescript@5.5.4) typescript: 5.5.4 ws: 8.18.0 - '@solana/rpc-subscriptions@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)(ws@8.18.0)': - dependencies: - '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) - '@solana/fast-stable-stringify': 2.0.0-preview.4(typescript@5.5.4) - '@solana/functional': 2.0.0-preview.4(typescript@5.5.4) - '@solana/rpc-subscriptions-api': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/rpc-subscriptions-spec': 2.0.0-preview.4(typescript@5.5.4) - '@solana/rpc-subscriptions-transport-websocket': 2.0.0-preview.4(typescript@5.5.4)(ws@8.18.0) - '@solana/rpc-transformers': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/rpc-types': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/rpc-subscriptions@2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)(ws@8.18.0)': + dependencies: + '@solana/errors': 2.0.0-rc.1(typescript@5.5.4) + '@solana/fast-stable-stringify': 2.0.0-rc.1(typescript@5.5.4) + '@solana/functional': 2.0.0-rc.1(typescript@5.5.4) + '@solana/promises': 2.0.0-rc.1(typescript@5.5.4) + '@solana/rpc-subscriptions-api': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/rpc-subscriptions-spec': 2.0.0-rc.1(typescript@5.5.4) + '@solana/rpc-subscriptions-transport-websocket': 2.0.0-rc.1(typescript@5.5.4)(ws@8.18.0) + '@solana/rpc-transformers': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/rpc-types': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) typescript: 5.5.4 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - ws - '@solana/rpc-transformers@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': + '@solana/rpc-transformers@2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': dependencies: - '@solana/functional': 2.0.0-preview.4(typescript@5.5.4) - '@solana/rpc-spec': 2.0.0-preview.4(typescript@5.5.4) - '@solana/rpc-subscriptions-spec': 2.0.0-preview.4(typescript@5.5.4) - '@solana/rpc-types': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/errors': 2.0.0-rc.1(typescript@5.5.4) + '@solana/functional': 2.0.0-rc.1(typescript@5.5.4) + '@solana/rpc-spec': 2.0.0-rc.1(typescript@5.5.4) + '@solana/rpc-subscriptions-spec': 2.0.0-rc.1(typescript@5.5.4) + '@solana/rpc-types': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) typescript: 5.5.4 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/rpc-transport-http@2.0.0-preview.4(typescript@5.5.4)': + '@solana/rpc-transport-http@2.0.0-rc.1(typescript@5.5.4)': dependencies: - '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) - '@solana/rpc-spec': 2.0.0-preview.4(typescript@5.5.4) + '@solana/errors': 2.0.0-rc.1(typescript@5.5.4) + '@solana/rpc-spec': 2.0.0-rc.1(typescript@5.5.4) typescript: 5.5.4 undici-types: 6.19.5 - '@solana/rpc-types@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': + '@solana/rpc-types@2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': dependencies: - '@solana/addresses': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/codecs-core': 2.0.0-preview.4(typescript@5.5.4) - '@solana/codecs-numbers': 2.0.0-preview.4(typescript@5.5.4) - '@solana/codecs-strings': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) + '@solana/addresses': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/codecs-core': 2.0.0-rc.1(typescript@5.5.4) + '@solana/codecs-numbers': 2.0.0-rc.1(typescript@5.5.4) + '@solana/codecs-strings': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/errors': 2.0.0-rc.1(typescript@5.5.4) typescript: 5.5.4 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/rpc@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': + '@solana/rpc@2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': dependencies: - '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) - '@solana/fast-stable-stringify': 2.0.0-preview.4(typescript@5.5.4) - '@solana/functional': 2.0.0-preview.4(typescript@5.5.4) - '@solana/rpc-api': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/rpc-spec': 2.0.0-preview.4(typescript@5.5.4) - '@solana/rpc-transformers': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/rpc-transport-http': 2.0.0-preview.4(typescript@5.5.4) - '@solana/rpc-types': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/errors': 2.0.0-rc.1(typescript@5.5.4) + '@solana/fast-stable-stringify': 2.0.0-rc.1(typescript@5.5.4) + '@solana/functional': 2.0.0-rc.1(typescript@5.5.4) + '@solana/rpc-api': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/rpc-spec': 2.0.0-rc.1(typescript@5.5.4) + '@solana/rpc-transformers': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/rpc-transport-http': 2.0.0-rc.1(typescript@5.5.4) + '@solana/rpc-types': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) typescript: 5.5.4 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/signers@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': + '@solana/signers@2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': dependencies: - '@solana/addresses': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/codecs-core': 2.0.0-preview.4(typescript@5.5.4) - '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) - '@solana/instructions': 2.0.0-preview.4(typescript@5.5.4) - '@solana/keys': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/transaction-messages': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/transactions': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/addresses': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/codecs-core': 2.0.0-rc.1(typescript@5.5.4) + '@solana/errors': 2.0.0-rc.1(typescript@5.5.4) + '@solana/instructions': 2.0.0-rc.1(typescript@5.5.4) + '@solana/keys': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/transaction-messages': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/transactions': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) typescript: 5.5.4 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/sysvars@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': + '@solana/sysvars@2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': dependencies: - '@solana/accounts': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/codecs': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) - '@solana/rpc-types': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/accounts': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/codecs': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/errors': 2.0.0-rc.1(typescript@5.5.4) + '@solana/rpc-types': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) typescript: 5.5.4 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/transaction-confirmation@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)(ws@8.18.0)': - dependencies: - '@solana/addresses': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/codecs-strings': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) - '@solana/keys': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/rpc': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/rpc-subscriptions': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)(ws@8.18.0) - '@solana/rpc-types': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/transaction-messages': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/transactions': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/transaction-confirmation@2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)(ws@8.18.0)': + dependencies: + '@solana/addresses': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/codecs-strings': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/errors': 2.0.0-rc.1(typescript@5.5.4) + '@solana/keys': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/promises': 2.0.0-rc.1(typescript@5.5.4) + '@solana/rpc': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/rpc-subscriptions': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)(ws@8.18.0) + '@solana/rpc-types': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/transaction-messages': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/transactions': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) typescript: 5.5.4 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - ws - '@solana/transaction-messages@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': + '@solana/transaction-messages@2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': dependencies: - '@solana/addresses': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/codecs-core': 2.0.0-preview.4(typescript@5.5.4) - '@solana/codecs-data-structures': 2.0.0-preview.4(typescript@5.5.4) - '@solana/codecs-numbers': 2.0.0-preview.4(typescript@5.5.4) - '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) - '@solana/functional': 2.0.0-preview.4(typescript@5.5.4) - '@solana/instructions': 2.0.0-preview.4(typescript@5.5.4) - '@solana/rpc-types': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/addresses': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/codecs-core': 2.0.0-rc.1(typescript@5.5.4) + '@solana/codecs-data-structures': 2.0.0-rc.1(typescript@5.5.4) + '@solana/codecs-numbers': 2.0.0-rc.1(typescript@5.5.4) + '@solana/errors': 2.0.0-rc.1(typescript@5.5.4) + '@solana/functional': 2.0.0-rc.1(typescript@5.5.4) + '@solana/instructions': 2.0.0-rc.1(typescript@5.5.4) + '@solana/rpc-types': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) typescript: 5.5.4 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/transactions@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': - dependencies: - '@solana/addresses': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/codecs-core': 2.0.0-preview.4(typescript@5.5.4) - '@solana/codecs-data-structures': 2.0.0-preview.4(typescript@5.5.4) - '@solana/codecs-numbers': 2.0.0-preview.4(typescript@5.5.4) - '@solana/codecs-strings': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) - '@solana/functional': 2.0.0-preview.4(typescript@5.5.4) - '@solana/instructions': 2.0.0-preview.4(typescript@5.5.4) - '@solana/keys': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/rpc-types': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/transaction-messages': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/transactions@2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)': + dependencies: + '@solana/addresses': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/codecs-core': 2.0.0-rc.1(typescript@5.5.4) + '@solana/codecs-data-structures': 2.0.0-rc.1(typescript@5.5.4) + '@solana/codecs-numbers': 2.0.0-rc.1(typescript@5.5.4) + '@solana/codecs-strings': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/errors': 2.0.0-rc.1(typescript@5.5.4) + '@solana/functional': 2.0.0-rc.1(typescript@5.5.4) + '@solana/instructions': 2.0.0-rc.1(typescript@5.5.4) + '@solana/keys': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/rpc-types': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/transaction-messages': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) typescript: 5.5.4 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/web3.js@2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)(ws@8.18.0)': - dependencies: - '@solana/accounts': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/addresses': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/codecs': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/errors': 2.0.0-preview.4(typescript@5.5.4) - '@solana/functional': 2.0.0-preview.4(typescript@5.5.4) - '@solana/instructions': 2.0.0-preview.4(typescript@5.5.4) - '@solana/keys': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/programs': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/rpc': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/rpc-parsed-types': 2.0.0-preview.4(typescript@5.5.4) - '@solana/rpc-subscriptions': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)(ws@8.18.0) - '@solana/rpc-types': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/signers': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/sysvars': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/transaction-confirmation': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)(ws@8.18.0) - '@solana/transaction-messages': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) - '@solana/transactions': 2.0.0-preview.4(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/web3.js@2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)(ws@8.18.0)': + dependencies: + '@solana/accounts': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/addresses': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/codecs': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/errors': 2.0.0-rc.1(typescript@5.5.4) + '@solana/functional': 2.0.0-rc.1(typescript@5.5.4) + '@solana/instructions': 2.0.0-rc.1(typescript@5.5.4) + '@solana/keys': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/programs': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/rpc': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/rpc-parsed-types': 2.0.0-rc.1(typescript@5.5.4) + '@solana/rpc-subscriptions': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)(ws@8.18.0) + '@solana/rpc-types': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/signers': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/sysvars': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/transaction-confirmation': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4)(ws@8.18.0) + '@solana/transaction-messages': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) + '@solana/transactions': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.5.4) typescript: 5.5.4 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - ws - '@solana/webcrypto-ed25519-polyfill@2.0.0-preview.4(typescript@5.5.4)': - dependencies: - '@noble/ed25519': 2.1.0 - typescript: 5.5.4 - '@types/estree@1.0.5': {} '@types/json-schema@7.0.15': {} @@ -3856,10 +3841,6 @@ snapshots: type-fest@0.20.2: {} - typedoc-plugin-missing-exports@2.3.0(typedoc@0.25.13(typescript@5.5.4)): - dependencies: - typedoc: 0.25.13(typescript@5.5.4) - typedoc@0.25.13(typescript@5.5.4): dependencies: lunr: 2.3.9 diff --git a/package.json b/package.json index 3b97bd8..d88848f 100644 --- a/package.json +++ b/package.json @@ -25,12 +25,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.1", + "@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" } diff --git a/scripts/client/test-rust.mjs b/scripts/client/test-rust.mjs index 48e2a30..699acb1 100644 --- a/scripts/client/test-rust.mjs +++ b/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}`; } diff --git a/scripts/program/build.mjs b/scripts/program/build.mjs index 94e6854..17cd5ab 100644 --- a/scripts/program/build.mjs +++ b/scripts/program/build.mjs @@ -18,10 +18,8 @@ const buildArgs = [ ]; // Build the programs. -await Promise.all( - getProgramFolders().map(async (folder) => { - const manifestPath = path.join(workingDirectory, folder, 'Cargo.toml'); +for (const folder of getProgramFolders()) { + const manifestPath = path.join(workingDirectory, folder, 'Cargo.toml'); - await $`cargo-build-sbf --manifest-path ${manifestPath} ${buildArgs}`; - }) -); + await $`cargo-build-sbf --manifest-path ${manifestPath} ${buildArgs}`; +} diff --git a/scripts/program/format.mjs b/scripts/program/format.mjs index 9ff5a04..c73ddd4 100644 --- a/scripts/program/format.mjs +++ b/scripts/program/format.mjs @@ -18,14 +18,12 @@ const [cargoArgs, fmtArgs] = partitionArguments(formatArgs, '--'); const toolchain = getToolchainArgument('format'); // Format the programs. -await Promise.all( - getProgramFolders().map(async (folder) => { - const manifestPath = path.join(workingDirectory, folder, 'Cargo.toml'); +for (const folder of getProgramFolders()) { + const manifestPath = path.join(workingDirectory, folder, 'Cargo.toml'); - if (fix) { - await $`cargo ${toolchain} fmt --manifest-path ${manifestPath} ${cargoArgs} -- ${fmtArgs}`; - } else { - await $`cargo ${toolchain} fmt --manifest-path ${manifestPath} ${cargoArgs} -- --check ${fmtArgs}`; - } - }) -); + if (fix) { + await $`cargo ${toolchain} fmt --manifest-path ${manifestPath} ${cargoArgs} -- ${fmtArgs}`; + } else { + await $`cargo ${toolchain} fmt --manifest-path ${manifestPath} ${cargoArgs} -- --check ${fmtArgs}`; + } +} diff --git a/scripts/program/lint.mjs b/scripts/program/lint.mjs index c04053f..cf2d529 100644 --- a/scripts/program/lint.mjs +++ b/scripts/program/lint.mjs @@ -25,14 +25,12 @@ const fix = popArgument(lintArgs, '--fix'); const toolchain = getToolchainArgument('lint'); // Lint the programs using clippy. -await Promise.all( - getProgramFolders().map(async (folder) => { - const manifestPath = path.join(workingDirectory, folder, 'Cargo.toml'); +for (const folder of getProgramFolders()) { + const manifestPath = path.join(workingDirectory, folder, 'Cargo.toml'); - if (fix) { - await $`cargo ${toolchain} clippy --manifest-path ${manifestPath} --fix ${lintArgs}`; - } else { - await $`cargo ${toolchain} clippy --manifest-path ${manifestPath} ${lintArgs}`; - } - }) -); + if (fix) { + await $`cargo ${toolchain} clippy --manifest-path ${manifestPath} --fix ${lintArgs}`; + } else { + await $`cargo ${toolchain} clippy --manifest-path ${manifestPath} ${lintArgs}`; + } +} diff --git a/scripts/program/test.mjs b/scripts/program/test.mjs index 07288b1..5e99774 100644 --- a/scripts/program/test.mjs +++ b/scripts/program/test.mjs @@ -20,14 +20,12 @@ const testArgs = [ const hasSolfmt = await which('solfmt', { nothrow: true }); // Test the programs. -await Promise.all( - getProgramFolders().map(async (folder) => { - const manifestPath = path.join(workingDirectory, folder, 'Cargo.toml'); +for (const folder of getProgramFolders()) { + const manifestPath = path.join(workingDirectory, folder, 'Cargo.toml'); - if (hasSolfmt) { - await $`RUST_LOG=error cargo test-sbf --manifest-path ${manifestPath} ${testArgs} 2>&1 | solfmt`; - } else { - await $`RUST_LOG=error cargo test-sbf --manifest-path ${manifestPath} ${testArgs}`; - } - }) -); + if (hasSolfmt) { + await $`RUST_LOG=error cargo test-sbf --manifest-path ${manifestPath} ${testArgs} 2>&1 | solfmt`; + } else { + await $`RUST_LOG=error cargo test-sbf --manifest-path ${manifestPath} ${testArgs}`; + } +}