From f65f3eca3bd1a870de4a1d4aa52e95faec814f75 Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Thu, 2 Oct 2025 11:30:40 +0100 Subject: [PATCH 01/10] Update Codama and client dependencies --- clients/js/package.json | 23 +- clients/js/pnpm-lock.yaml | 1745 ++++++++++------- clients/js/src/generated/index.ts | 6 +- .../js/src/generated/instructions/close.ts | 79 +- .../instructions/deployWithMaxDataLen.ts | 89 +- .../generated/instructions/extendProgram.ts | 79 +- .../js/src/generated/instructions/index.ts | 6 +- .../instructions/initializeBuffer.ts | 71 +- .../generated/instructions/setAuthority.ts | 77 +- .../instructions/setAuthorityChecked.ts | 79 +- .../js/src/generated/instructions/upgrade.ts | 85 +- .../js/src/generated/instructions/write.ts | 62 +- clients/js/src/generated/programs/index.ts | 6 +- clients/js/src/generated/programs/loaderV3.ts | 8 +- clients/js/src/generated/shared/index.ts | 24 +- clients/rust/Cargo.toml | 17 +- clients/rust/src/generated/errors/mod.rs | 6 +- .../rust/src/generated/instructions/close.rs | 187 +- .../instructions/deploy_with_max_data_len.rs | 263 ++- .../generated/instructions/extend_program.rs | 198 +- .../instructions/initialize_buffer.rs | 140 +- .../rust/src/generated/instructions/mod.rs | 6 +- .../generated/instructions/set_authority.rs | 165 +- .../instructions/set_authority_checked.rs | 158 +- .../src/generated/instructions/upgrade.rs | 237 +-- .../rust/src/generated/instructions/write.rs | 149 +- clients/rust/src/generated/mod.rs | 6 +- clients/rust/src/generated/programs.rs | 8 +- codama.mjs | 41 + package.json | 13 +- pnpm-lock.yaml | 497 +++-- program/idl.json | 2 +- 32 files changed, 2463 insertions(+), 2069 deletions(-) create mode 100644 codama.mjs diff --git a/clients/js/package.json b/clients/js/package.json index f54c443..f1823a6 100644 --- a/clients/js/package.json +++ b/clients/js/package.json @@ -34,38 +34,33 @@ }, "license": "MIT", "peerDependencies": { - "@solana/web3.js": "2.0.0-preview.3" + "@solana/kit": "^3.0.0" }, "devDependencies": { "@ava/typescript": "^4.1.0", "@solana/eslint-config-solana": "^3.0.0", - "@solana/web3.js": "2.0.0-preview.3", - "@solana/webcrypto-ed25519-polyfill": "2.0.0-preview.3", - "@types/node": "^20", + "@solana/kit": "^3.0.0", + "@types/node": "^24", "@typescript-eslint/eslint-plugin": "^7.3.1", "@typescript-eslint/parser": "^7.3.1", "ava": "^6.1.2", "eslint": "^8.57.0", - "prettier": "^3.2.5", + "prettier": "^3.6.2", "rimraf": "^5.0.5", - "tsup": "^8.0.2", - "typedoc": "^0.25.12", - "typedoc-plugin-missing-exports": "^2.2.0", - "typescript": "^5.4.2" + "tsup": "^8.5.0", + "typedoc": "^0.28.13", + "typedoc-plugin-missing-exports": "^4.1.0", + "typescript": "^5.9.3" }, "ava": { "nodeArguments": [ "--no-warnings" ], - "require": [ - "@solana/webcrypto-ed25519-polyfill" - ], "typescript": { "compile": false, "rewritePaths": { "test/": "dist/test/" } } - }, - "packageManager": "pnpm@9.1.0" + } } diff --git a/clients/js/pnpm-lock.yaml b/clients/js/pnpm-lock.yaml index 92640ff..a5955ff 100644 --- a/clients/js/pnpm-lock.yaml +++ b/clients/js/pnpm-lock.yaml @@ -13,22 +13,19 @@ importers: version: 4.1.0 '@solana/eslint-config-solana': specifier: ^3.0.0 - version: 3.0.4(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-simple-import-sort@12.1.1(eslint@8.57.1))(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.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2) - '@solana/web3.js': - specifier: 2.0.0-preview.3 - version: 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)(ws@8.18.0) - '@solana/webcrypto-ed25519-polyfill': - specifier: 2.0.0-preview.3 - version: 2.0.0-preview.3 + version: 3.0.4(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3))(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-simple-import-sort@12.1.1(eslint@8.57.1))(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.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3) + '@solana/kit': + specifier: ^3.0.0 + version: 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)(ws@8.18.0) '@types/node': - specifier: ^20 - version: 20.16.10 + specifier: ^24 + version: 24.6.2 '@typescript-eslint/eslint-plugin': specifier: ^7.3.1 - version: 7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2) + version: 7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3) '@typescript-eslint/parser': specifier: ^7.3.1 - version: 7.18.0(eslint@8.57.1)(typescript@5.6.2) + version: 7.18.0(eslint@8.57.1)(typescript@5.9.3) ava: specifier: ^6.1.2 version: 6.1.3(@ava/typescript@4.1.0) @@ -36,23 +33,23 @@ importers: specifier: ^8.57.0 version: 8.57.1 prettier: - specifier: ^3.2.5 - version: 3.3.3 + specifier: ^3.6.2 + version: 3.6.2 rimraf: specifier: ^5.0.5 version: 5.0.10 tsup: - specifier: ^8.0.2 - version: 8.3.0(typescript@5.6.2) + specifier: ^8.5.0 + version: 8.5.0(typescript@5.9.3)(yaml@2.8.1) typedoc: - specifier: ^0.25.12 - version: 0.25.13(typescript@5.6.2) + specifier: ^0.28.13 + version: 0.28.13(typescript@5.9.3) typedoc-plugin-missing-exports: - specifier: ^2.2.0 - version: 2.3.0(typedoc@0.25.13(typescript@5.6.2)) + specifier: ^4.1.0 + version: 4.1.0(typedoc@0.28.13(typescript@5.9.3)) typescript: - specifier: ^5.4.2 - version: 5.6.2 + specifier: ^5.9.3 + version: 5.9.3 packages: @@ -60,146 +57,158 @@ packages: resolution: {integrity: sha512-1iWZQ/nr9iflhLK9VN8H+1oDZqe93qxNnyYUz+jTzkYPAHc5fdZXBrqmNIgIfFhWYXK5OaQ5YtC7OmLeTNhVEg==} engines: {node: ^14.19 || ^16.15 || ^18 || ^20} - '@esbuild/aix-ppc64@0.23.1': - resolution: {integrity: sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==} + '@esbuild/aix-ppc64@0.25.10': + resolution: {integrity: sha512-0NFWnA+7l41irNuaSVlLfgNT12caWJVLzp5eAVhZ0z1qpxbockccEt3s+149rE64VUI3Ml2zt8Nv5JVc4QXTsw==} engines: {node: '>=18'} cpu: [ppc64] os: [aix] - '@esbuild/android-arm64@0.23.1': - resolution: {integrity: sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==} + '@esbuild/android-arm64@0.25.10': + resolution: {integrity: sha512-LSQa7eDahypv/VO6WKohZGPSJDq5OVOo3UoFR1E4t4Gj1W7zEQMUhI+lo81H+DtB+kP+tDgBp+M4oNCwp6kffg==} engines: {node: '>=18'} cpu: [arm64] os: [android] - '@esbuild/android-arm@0.23.1': - resolution: {integrity: sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==} + '@esbuild/android-arm@0.25.10': + resolution: {integrity: sha512-dQAxF1dW1C3zpeCDc5KqIYuZ1tgAdRXNoZP7vkBIRtKZPYe2xVr/d3SkirklCHudW1B45tGiUlz2pUWDfbDD4w==} engines: {node: '>=18'} cpu: [arm] os: [android] - '@esbuild/android-x64@0.23.1': - resolution: {integrity: sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==} + '@esbuild/android-x64@0.25.10': + resolution: {integrity: sha512-MiC9CWdPrfhibcXwr39p9ha1x0lZJ9KaVfvzA0Wxwz9ETX4v5CHfF09bx935nHlhi+MxhA63dKRRQLiVgSUtEg==} engines: {node: '>=18'} cpu: [x64] os: [android] - '@esbuild/darwin-arm64@0.23.1': - resolution: {integrity: sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==} + '@esbuild/darwin-arm64@0.25.10': + resolution: {integrity: sha512-JC74bdXcQEpW9KkV326WpZZjLguSZ3DfS8wrrvPMHgQOIEIG/sPXEN/V8IssoJhbefLRcRqw6RQH2NnpdprtMA==} engines: {node: '>=18'} cpu: [arm64] os: [darwin] - '@esbuild/darwin-x64@0.23.1': - resolution: {integrity: sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==} + '@esbuild/darwin-x64@0.25.10': + resolution: {integrity: sha512-tguWg1olF6DGqzws97pKZ8G2L7Ig1vjDmGTwcTuYHbuU6TTjJe5FXbgs5C1BBzHbJ2bo1m3WkQDbWO2PvamRcg==} engines: {node: '>=18'} cpu: [x64] os: [darwin] - '@esbuild/freebsd-arm64@0.23.1': - resolution: {integrity: sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==} + '@esbuild/freebsd-arm64@0.25.10': + resolution: {integrity: sha512-3ZioSQSg1HT2N05YxeJWYR+Libe3bREVSdWhEEgExWaDtyFbbXWb49QgPvFH8u03vUPX10JhJPcz7s9t9+boWg==} engines: {node: '>=18'} cpu: [arm64] os: [freebsd] - '@esbuild/freebsd-x64@0.23.1': - resolution: {integrity: sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==} + '@esbuild/freebsd-x64@0.25.10': + resolution: {integrity: sha512-LLgJfHJk014Aa4anGDbh8bmI5Lk+QidDmGzuC2D+vP7mv/GeSN+H39zOf7pN5N8p059FcOfs2bVlrRr4SK9WxA==} engines: {node: '>=18'} cpu: [x64] os: [freebsd] - '@esbuild/linux-arm64@0.23.1': - resolution: {integrity: sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==} + '@esbuild/linux-arm64@0.25.10': + resolution: {integrity: sha512-5luJWN6YKBsawd5f9i4+c+geYiVEw20FVW5x0v1kEMWNq8UctFjDiMATBxLvmmHA4bf7F6hTRaJgtghFr9iziQ==} engines: {node: '>=18'} cpu: [arm64] os: [linux] - '@esbuild/linux-arm@0.23.1': - resolution: {integrity: sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==} + '@esbuild/linux-arm@0.25.10': + resolution: {integrity: sha512-oR31GtBTFYCqEBALI9r6WxoU/ZofZl962pouZRTEYECvNF/dtXKku8YXcJkhgK/beU+zedXfIzHijSRapJY3vg==} engines: {node: '>=18'} cpu: [arm] os: [linux] - '@esbuild/linux-ia32@0.23.1': - resolution: {integrity: sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==} + '@esbuild/linux-ia32@0.25.10': + resolution: {integrity: sha512-NrSCx2Kim3EnnWgS4Txn0QGt0Xipoumb6z6sUtl5bOEZIVKhzfyp/Lyw4C1DIYvzeW/5mWYPBFJU3a/8Yr75DQ==} engines: {node: '>=18'} cpu: [ia32] os: [linux] - '@esbuild/linux-loong64@0.23.1': - resolution: {integrity: sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==} + '@esbuild/linux-loong64@0.25.10': + resolution: {integrity: sha512-xoSphrd4AZda8+rUDDfD9J6FUMjrkTz8itpTITM4/xgerAZZcFW7Dv+sun7333IfKxGG8gAq+3NbfEMJfiY+Eg==} engines: {node: '>=18'} cpu: [loong64] os: [linux] - '@esbuild/linux-mips64el@0.23.1': - resolution: {integrity: sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==} + '@esbuild/linux-mips64el@0.25.10': + resolution: {integrity: sha512-ab6eiuCwoMmYDyTnyptoKkVS3k8fy/1Uvq7Dj5czXI6DF2GqD2ToInBI0SHOp5/X1BdZ26RKc5+qjQNGRBelRA==} engines: {node: '>=18'} cpu: [mips64el] os: [linux] - '@esbuild/linux-ppc64@0.23.1': - resolution: {integrity: sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==} + '@esbuild/linux-ppc64@0.25.10': + resolution: {integrity: sha512-NLinzzOgZQsGpsTkEbdJTCanwA5/wozN9dSgEl12haXJBzMTpssebuXR42bthOF3z7zXFWH1AmvWunUCkBE4EA==} engines: {node: '>=18'} cpu: [ppc64] os: [linux] - '@esbuild/linux-riscv64@0.23.1': - resolution: {integrity: sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==} + '@esbuild/linux-riscv64@0.25.10': + resolution: {integrity: sha512-FE557XdZDrtX8NMIeA8LBJX3dC2M8VGXwfrQWU7LB5SLOajfJIxmSdyL/gU1m64Zs9CBKvm4UAuBp5aJ8OgnrA==} engines: {node: '>=18'} cpu: [riscv64] os: [linux] - '@esbuild/linux-s390x@0.23.1': - resolution: {integrity: sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==} + '@esbuild/linux-s390x@0.25.10': + resolution: {integrity: sha512-3BBSbgzuB9ajLoVZk0mGu+EHlBwkusRmeNYdqmznmMc9zGASFjSsxgkNsqmXugpPk00gJ0JNKh/97nxmjctdew==} engines: {node: '>=18'} cpu: [s390x] os: [linux] - '@esbuild/linux-x64@0.23.1': - resolution: {integrity: sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==} + '@esbuild/linux-x64@0.25.10': + resolution: {integrity: sha512-QSX81KhFoZGwenVyPoberggdW1nrQZSvfVDAIUXr3WqLRZGZqWk/P4T8p2SP+de2Sr5HPcvjhcJzEiulKgnxtA==} engines: {node: '>=18'} cpu: [x64] os: [linux] - '@esbuild/netbsd-x64@0.23.1': - resolution: {integrity: sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==} + '@esbuild/netbsd-arm64@0.25.10': + resolution: {integrity: sha512-AKQM3gfYfSW8XRk8DdMCzaLUFB15dTrZfnX8WXQoOUpUBQ+NaAFCP1kPS/ykbbGYz7rxn0WS48/81l9hFl3u4A==} + engines: {node: '>=18'} + cpu: [arm64] + os: [netbsd] + + '@esbuild/netbsd-x64@0.25.10': + resolution: {integrity: sha512-7RTytDPGU6fek/hWuN9qQpeGPBZFfB4zZgcz2VK2Z5VpdUxEI8JKYsg3JfO0n/Z1E/6l05n0unDCNc4HnhQGig==} engines: {node: '>=18'} cpu: [x64] os: [netbsd] - '@esbuild/openbsd-arm64@0.23.1': - resolution: {integrity: sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==} + '@esbuild/openbsd-arm64@0.25.10': + resolution: {integrity: sha512-5Se0VM9Wtq797YFn+dLimf2Zx6McttsH2olUBsDml+lm0GOCRVebRWUvDtkY4BWYv/3NgzS8b/UM3jQNh5hYyw==} engines: {node: '>=18'} cpu: [arm64] os: [openbsd] - '@esbuild/openbsd-x64@0.23.1': - resolution: {integrity: sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==} + '@esbuild/openbsd-x64@0.25.10': + resolution: {integrity: sha512-XkA4frq1TLj4bEMB+2HnI0+4RnjbuGZfet2gs/LNs5Hc7D89ZQBHQ0gL2ND6Lzu1+QVkjp3x1gIcPKzRNP8bXw==} engines: {node: '>=18'} cpu: [x64] os: [openbsd] - '@esbuild/sunos-x64@0.23.1': - resolution: {integrity: sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==} + '@esbuild/openharmony-arm64@0.25.10': + resolution: {integrity: sha512-AVTSBhTX8Y/Fz6OmIVBip9tJzZEUcY8WLh7I59+upa5/GPhh2/aM6bvOMQySspnCCHvFi79kMtdJS1w0DXAeag==} + engines: {node: '>=18'} + cpu: [arm64] + os: [openharmony] + + '@esbuild/sunos-x64@0.25.10': + resolution: {integrity: sha512-fswk3XT0Uf2pGJmOpDB7yknqhVkJQkAQOcW/ccVOtfx05LkbWOaRAtn5SaqXypeKQra1QaEa841PgrSL9ubSPQ==} engines: {node: '>=18'} cpu: [x64] os: [sunos] - '@esbuild/win32-arm64@0.23.1': - resolution: {integrity: sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==} + '@esbuild/win32-arm64@0.25.10': + resolution: {integrity: sha512-ah+9b59KDTSfpaCg6VdJoOQvKjI33nTaQr4UluQwW7aEwZQsbMCfTmfEO4VyewOxx4RaDT/xCy9ra2GPWmO7Kw==} engines: {node: '>=18'} cpu: [arm64] os: [win32] - '@esbuild/win32-ia32@0.23.1': - resolution: {integrity: sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==} + '@esbuild/win32-ia32@0.25.10': + resolution: {integrity: sha512-QHPDbKkrGO8/cz9LKVnJU22HOi4pxZnZhhA2HYHez5Pz4JeffhDjf85E57Oyco163GnzNCVkZK0b/n4Y0UHcSw==} engines: {node: '>=18'} cpu: [ia32] os: [win32] - '@esbuild/win32-x64@0.23.1': - resolution: {integrity: sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==} + '@esbuild/win32-x64@0.25.10': + resolution: {integrity: sha512-9KpxSVFCu0iK1owoez6aC/s/EdUQLDN3adTxGCqxMVhrPDj6bt5dbrHDXUuq+Bs2vATFBBrQS5vdQ/Ed2P+nbw==} engines: {node: '>=18'} cpu: [x64] os: [win32] @@ -222,6 +231,9 @@ packages: resolution: {integrity: sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + '@gerrit0/mini-shiki@3.13.0': + resolution: {integrity: sha512-mCrNvZNYNrwKer5PWLF6cOc0OEe2eKzgy976x+IT2tynwJYl+7UpHTSeXQJGijgTcoOf+f359L946unWlYRnsg==} + '@humanwhocodes/config-array@0.13.0': resolution: {integrity: sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==} engines: {node: '>=10.10.0'} @@ -254,6 +266,9 @@ packages: '@jridgewell/sourcemap-codec@1.5.0': resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==} + '@jridgewell/sourcemap-codec@1.5.5': + resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==} + '@jridgewell/trace-mapping@0.3.25': resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} @@ -261,9 +276,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'} @@ -284,119 +296,190 @@ packages: resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==} engines: {node: '>= 8.0.0'} - '@rollup/rollup-android-arm-eabi@4.22.5': - resolution: {integrity: sha512-SU5cvamg0Eyu/F+kLeMXS7GoahL+OoizlclVFX3l5Ql6yNlywJJ0OuqTzUx0v+aHhPHEB/56CT06GQrRrGNYww==} + '@rollup/rollup-android-arm-eabi@4.52.3': + resolution: {integrity: sha512-h6cqHGZ6VdnwliFG1NXvMPTy/9PS3h8oLh7ImwR+kl+oYnQizgjxsONmmPSb2C66RksfkfIxEVtDSEcJiO0tqw==} cpu: [arm] os: [android] - '@rollup/rollup-android-arm64@4.22.5': - resolution: {integrity: sha512-S4pit5BP6E5R5C8S6tgU/drvgjtYW76FBuG6+ibG3tMvlD1h9LHVF9KmlmaUBQ8Obou7hEyS+0w+IR/VtxwNMQ==} + '@rollup/rollup-android-arm64@4.52.3': + resolution: {integrity: sha512-wd+u7SLT/u6knklV/ifG7gr5Qy4GUbH2hMWcDauPFJzmCZUAJ8L2bTkVXC2niOIxp8lk3iH/QX8kSrUxVZrOVw==} cpu: [arm64] os: [android] - '@rollup/rollup-darwin-arm64@4.22.5': - resolution: {integrity: sha512-250ZGg4ipTL0TGvLlfACkIxS9+KLtIbn7BCZjsZj88zSg2Lvu3Xdw6dhAhfe/FjjXPVNCtcSp+WZjVsD3a/Zlw==} + '@rollup/rollup-darwin-arm64@4.52.3': + resolution: {integrity: sha512-lj9ViATR1SsqycwFkJCtYfQTheBdvlWJqzqxwc9f2qrcVrQaF/gCuBRTiTolkRWS6KvNxSk4KHZWG7tDktLgjg==} cpu: [arm64] os: [darwin] - '@rollup/rollup-darwin-x64@4.22.5': - resolution: {integrity: sha512-D8brJEFg5D+QxFcW6jYANu+Rr9SlKtTenmsX5hOSzNYVrK5oLAEMTUgKWYJP+wdKyCdeSwnapLsn+OVRFycuQg==} + '@rollup/rollup-darwin-x64@4.52.3': + resolution: {integrity: sha512-+Dyo7O1KUmIsbzx1l+4V4tvEVnVQqMOIYtrxK7ncLSknl1xnMHLgn7gddJVrYPNZfEB8CIi3hK8gq8bDhb3h5A==} cpu: [x64] os: [darwin] - '@rollup/rollup-linux-arm-gnueabihf@4.22.5': - resolution: {integrity: sha512-PNqXYmdNFyWNg0ma5LdY8wP+eQfdvyaBAojAXgO7/gs0Q/6TQJVXAXe8gwW9URjbS0YAammur0fynYGiWsKlXw==} + '@rollup/rollup-freebsd-arm64@4.52.3': + resolution: {integrity: sha512-u9Xg2FavYbD30g3DSfNhxgNrxhi6xVG4Y6i9Ur1C7xUuGDW3banRbXj+qgnIrwRN4KeJ396jchwy9bCIzbyBEQ==} + cpu: [arm64] + os: [freebsd] + + '@rollup/rollup-freebsd-x64@4.52.3': + resolution: {integrity: sha512-5M8kyi/OX96wtD5qJR89a/3x5x8x5inXBZO04JWhkQb2JWavOWfjgkdvUqibGJeNNaz1/Z1PPza5/tAPXICI6A==} + cpu: [x64] + os: [freebsd] + + '@rollup/rollup-linux-arm-gnueabihf@4.52.3': + resolution: {integrity: sha512-IoerZJ4l1wRMopEHRKOO16e04iXRDyZFZnNZKrWeNquh5d6bucjezgd+OxG03mOMTnS1x7hilzb3uURPkJ0OfA==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm-musleabihf@4.22.5': - resolution: {integrity: sha512-kSSCZOKz3HqlrEuwKd9TYv7vxPYD77vHSUvM2y0YaTGnFc8AdI5TTQRrM1yIp3tXCKrSL9A7JLoILjtad5t8pQ==} + '@rollup/rollup-linux-arm-musleabihf@4.52.3': + resolution: {integrity: sha512-ZYdtqgHTDfvrJHSh3W22TvjWxwOgc3ThK/XjgcNGP2DIwFIPeAPNsQxrJO5XqleSlgDux2VAoWQ5iJrtaC1TbA==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.22.5': - resolution: {integrity: sha512-oTXQeJHRbOnwRnRffb6bmqmUugz0glXaPyspp4gbQOPVApdpRrY/j7KP3lr7M8kTfQTyrBUzFjj5EuHAhqH4/w==} + '@rollup/rollup-linux-arm64-gnu@4.52.3': + resolution: {integrity: sha512-NcViG7A0YtuFDA6xWSgmFb6iPFzHlf5vcqb2p0lGEbT+gjrEEz8nC/EeDHvx6mnGXnGCC1SeVV+8u+smj0CeGQ==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-musl@4.22.5': - resolution: {integrity: sha512-qnOTIIs6tIGFKCHdhYitgC2XQ2X25InIbZFor5wh+mALH84qnFHvc+vmWUpyX97B0hNvwNUL4B+MB8vJvH65Fw==} + '@rollup/rollup-linux-arm64-musl@4.52.3': + resolution: {integrity: sha512-d3pY7LWno6SYNXRm6Ebsq0DJGoiLXTb83AIPCXl9fmtIQs/rXoS8SJxxUNtFbJ5MiOvs+7y34np77+9l4nfFMw==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-powerpc64le-gnu@4.22.5': - resolution: {integrity: sha512-TMYu+DUdNlgBXING13rHSfUc3Ky5nLPbWs4bFnT+R6Vu3OvXkTkixvvBKk8uO4MT5Ab6lC3U7x8S8El2q5o56w==} + '@rollup/rollup-linux-loong64-gnu@4.52.3': + resolution: {integrity: sha512-3y5GA0JkBuirLqmjwAKwB0keDlI6JfGYduMlJD/Rl7fvb4Ni8iKdQs1eiunMZJhwDWdCvrcqXRY++VEBbvk6Eg==} + cpu: [loong64] + os: [linux] + + '@rollup/rollup-linux-ppc64-gnu@4.52.3': + resolution: {integrity: sha512-AUUH65a0p3Q0Yfm5oD2KVgzTKgwPyp9DSXc3UA7DtxhEb/WSPfbG4wqXeSN62OG5gSo18em4xv6dbfcUGXcagw==} cpu: [ppc64] os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.22.5': - resolution: {integrity: sha512-PTQq1Kz22ZRvuhr3uURH+U/Q/a0pbxJoICGSprNLAoBEkyD3Sh9qP5I0Asn0y0wejXQBbsVMRZRxlbGFD9OK4A==} + '@rollup/rollup-linux-riscv64-gnu@4.52.3': + resolution: {integrity: sha512-1makPhFFVBqZE+XFg3Dkq+IkQ7JvmUrwwqaYBL2CE+ZpxPaqkGaiWFEWVGyvTwZace6WLJHwjVh/+CXbKDGPmg==} cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-s390x-gnu@4.22.5': - resolution: {integrity: sha512-bR5nCojtpuMss6TDEmf/jnBnzlo+6n1UhgwqUvRoe4VIotC7FG1IKkyJbwsT7JDsF2jxR+NTnuOwiGv0hLyDoQ==} + '@rollup/rollup-linux-riscv64-musl@4.52.3': + resolution: {integrity: sha512-OOFJa28dxfl8kLOPMUOQBCO6z3X2SAfzIE276fwT52uXDWUS178KWq0pL7d6p1kz7pkzA0yQwtqL0dEPoVcRWg==} + cpu: [riscv64] + os: [linux] + + '@rollup/rollup-linux-s390x-gnu@4.52.3': + resolution: {integrity: sha512-jMdsML2VI5l+V7cKfZx3ak+SLlJ8fKvLJ0Eoa4b9/vCUrzXKgoKxvHqvJ/mkWhFiyp88nCkM5S2v6nIwRtPcgg==} cpu: [s390x] os: [linux] - '@rollup/rollup-linux-x64-gnu@4.22.5': - resolution: {integrity: sha512-N0jPPhHjGShcB9/XXZQWuWBKZQnC1F36Ce3sDqWpujsGjDz/CQtOL9LgTrJ+rJC8MJeesMWrMWVLKKNR/tMOCA==} + '@rollup/rollup-linux-x64-gnu@4.52.3': + resolution: {integrity: sha512-tPgGd6bY2M2LJTA1uGq8fkSPK8ZLYjDjY+ZLK9WHncCnfIz29LIXIqUgzCR0hIefzy6Hpbe8Th5WOSwTM8E7LA==} cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-musl@4.22.5': - resolution: {integrity: sha512-uBa2e28ohzNNwjr6Uxm4XyaA1M/8aTgfF2T7UIlElLaeXkgpmIJ2EitVNQxjO9xLLLy60YqAgKn/AqSpCUkE9g==} + '@rollup/rollup-linux-x64-musl@4.52.3': + resolution: {integrity: sha512-BCFkJjgk+WFzP+tcSMXq77ymAPIxsX9lFJWs+2JzuZTLtksJ2o5hvgTdIcZ5+oKzUDMwI0PfWzRBYAydAHF2Mw==} cpu: [x64] os: [linux] - '@rollup/rollup-win32-arm64-msvc@4.22.5': - resolution: {integrity: sha512-RXT8S1HP8AFN/Kr3tg4fuYrNxZ/pZf1HemC5Tsddc6HzgGnJm0+Lh5rAHJkDuW3StI0ynNXukidROMXYl6ew8w==} + '@rollup/rollup-openharmony-arm64@4.52.3': + resolution: {integrity: sha512-KTD/EqjZF3yvRaWUJdD1cW+IQBk4fbQaHYJUmP8N4XoKFZilVL8cobFSTDnjTtxWJQ3JYaMgF4nObY/+nYkumA==} + cpu: [arm64] + os: [openharmony] + + '@rollup/rollup-win32-arm64-msvc@4.52.3': + resolution: {integrity: sha512-+zteHZdoUYLkyYKObGHieibUFLbttX2r+58l27XZauq0tcWYYuKUwY2wjeCN9oK1Um2YgH2ibd6cnX/wFD7DuA==} cpu: [arm64] os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.22.5': - resolution: {integrity: sha512-ElTYOh50InL8kzyUD6XsnPit7jYCKrphmddKAe1/Ytt74apOxDq5YEcbsiKs0fR3vff3jEneMM+3I7jbqaMyBg==} + '@rollup/rollup-win32-ia32-msvc@4.52.3': + resolution: {integrity: sha512-of1iHkTQSo3kr6dTIRX6t81uj/c/b15HXVsPcEElN5sS859qHrOepM5p9G41Hah+CTqSh2r8Bm56dL2z9UQQ7g==} cpu: [ia32] os: [win32] - '@rollup/rollup-win32-x64-msvc@4.22.5': - resolution: {integrity: sha512-+lvL/4mQxSV8MukpkKyyvfwhH266COcWlXE/1qxwN08ajovta3459zrjLghYMgDerlzNwLAcFpvU+WWE5y6nAQ==} + '@rollup/rollup-win32-x64-gnu@4.52.3': + resolution: {integrity: sha512-s0hybmlHb56mWVZQj8ra9048/WZTPLILKxcvcq+8awSZmyiSUZjjem1AhU3Tf4ZKpYhK4mg36HtHDOe8QJS5PQ==} + cpu: [x64] + os: [win32] + + '@rollup/rollup-win32-x64-msvc@4.52.3': + resolution: {integrity: sha512-zGIbEVVXVtauFgl3MRwGWEN36P5ZGenHRMgNw88X5wEhEBpq0XrMEZwOn07+ICrwM17XO5xfMZqh0OldCH5VTA==} cpu: [x64] os: [win32] + '@shikijs/engine-oniguruma@3.13.0': + resolution: {integrity: sha512-O42rBGr4UDSlhT2ZFMxqM7QzIU+IcpoTMzb3W7AlziI1ZF7R8eS2M0yt5Ry35nnnTX/LTLXFPUjRFCIW+Operg==} + + '@shikijs/langs@3.13.0': + resolution: {integrity: sha512-672c3WAETDYHwrRP0yLy3W1QYB89Hbpj+pO4KhxK6FzIrDI2FoEXNiNCut6BQmEApYLfuYfpgOZaqbY+E9b8wQ==} + + '@shikijs/themes@3.13.0': + resolution: {integrity: sha512-Vxw1Nm1/Od8jyA7QuAenaV78BG2nSr3/gCGdBkLpfLscddCkzkL36Q5b67SrLLfvAJTOUzW39x4FHVCFriPVgg==} + + '@shikijs/types@3.13.0': + resolution: {integrity: sha512-oM9P+NCFri/mmQ8LoFGVfVyemm5Hi27330zuOBp0annwJdKH1kOLndw3zCtAVDehPLg9fKqoEx3Ht/wNZxolfw==} + + '@shikijs/vscode-textmate@10.0.2': + resolution: {integrity: sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==} + '@sindresorhus/merge-streams@2.3.0': resolution: {integrity: sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==} engines: {node: '>=18'} - '@solana/accounts@2.0.0-preview.3': - resolution: {integrity: sha512-30GCO7SF3VRYqsumfCTW4bJ1fK67KwX62ZSi6nlU3+6ni4ZmmCT4jPYcqoBgO1kUzDJ4UORNeh/PbdFfbCA0FA==} + '@solana/accounts@3.0.3': + resolution: {integrity: sha512-KqlePrlZaHXfu8YQTCxN204ZuVm9o68CCcUr6l27MG2cuRUtEM1Ta0iR8JFkRUAEfZJC4Cu0ZDjK/v49loXjZQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/addresses@2.0.0-preview.3': - resolution: {integrity: sha512-JjiPOsVddQibd9EdzYEOiZtMSeveNHI7R6s9UADWVMvlIAqN9+uACficM0/XAdZmycZnvqKzS+Io0CNJClofUA==} + '@solana/addresses@3.0.3': + resolution: {integrity: sha512-AuMwKhJI89ANqiuJ/fawcwxNKkSeHH9CApZd2xelQQLS7X8uxAOovpcmEgiObQuiVP944s9ScGUT62Bdul9qYg==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/assertions@2.0.0-preview.3': - resolution: {integrity: sha512-K8ZwlDwuVJKeKOggejy524UoaTDGk6sthW1KvEQXOkIPqJdtST3I9Rco4Xh4hL2w/RnhKXqsQUa3bg+if2ifEg==} + '@solana/assertions@3.0.3': + resolution: {integrity: sha512-2qspxdbWp2y62dfCIlqeWQr4g+hE8FYSSwcaP6itwMwGRb8393yDGCJfI/znuzJh6m/XVWhMHIgFgsBwnevCmg==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/codecs-core@2.0.0-preview.3': - resolution: {integrity: sha512-xQz6USSBs82lUNoVa/wwnm6wa2y2eWtGwPLUwF/NOGGpR+QH9EODijXvJ8wuC9llyqerqdC+5mrmx9C8VSMNYg==} + '@solana/codecs-core@3.0.3': + resolution: {integrity: sha512-emKykJ3h1DmnDOY29Uv9eJXP8E/FHzvlUBJ6te+5EbKdFjj7vdlKYPfDxOI6iGdXTY+YC/ELtbNBh6QwF2uEDQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/codecs-data-structures@2.0.0-preview.3': - resolution: {integrity: sha512-PfXvZCf9qDF+Dv4WG6cb4xZoY9tj117bmZWS17iKimuNSsvuFSHpzERy0mmX2hwYEAM4CnQBd/9dgx+eAeMAsg==} + '@solana/codecs-data-structures@3.0.3': + resolution: {integrity: sha512-R15cLp8riJvToXziW8lP6AMSwsztGhEnwgyGmll32Mo0Yjq+hduW2/fJrA/TJs6tA/OgTzMQjlxgk009EqZHCw==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/codecs-numbers@2.0.0-preview.3': - resolution: {integrity: sha512-cjsHexVAj4GveDtG0+WjW121TKMbWN7AkOvGlf1qauOJgzJvX3V7KXHWuEg8wGGfRiLiXKEgh7KieQiB17EI3Q==} + '@solana/codecs-numbers@3.0.3': + resolution: {integrity: sha512-pfXkH9J0glrM8qj6389GAn30+cJOxzXLR2FsPOHCUMXrqLhGjMMZAWhsQkpOQ37SGc/7EiQsT/gmyGC7gxHqJQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/codecs-strings@2.0.0-preview.3': - resolution: {integrity: sha512-CUij3XgdoqbrEYncyy+kHCIXRHjqkcjiyJhf4hWVjMXM5nu2jreehhBiLFHFjlFw2U3vp1gig5QNxji8SjpQzw==} + '@solana/codecs-strings@3.0.3': + resolution: {integrity: sha512-VHBXnnTVtcQ1j+7Vrz+qSYo38no+jiHRdGnhFspRXEHNJbllzwKqgBE7YN3qoIXH+MKxgJUcwO5KHmdzf8Wn2A==} + engines: {node: '>=20.18.0'} peerDependencies: fastestsmallesttextencoderdecoder: ^1.0.22 + typescript: '>=5.3.3' - '@solana/codecs@2.0.0-preview.3': - resolution: {integrity: sha512-uB0GMAY1VrNoJxZ9S4F1RBL57gI+8YwxnV9DD5EP5rU8iD7Wq4wbaB2IPcENyJi7rmzytIjKJg0MI6i2bBr+0w==} + '@solana/codecs@3.0.3': + resolution: {integrity: sha512-GOHwTlIQsCoJx9Ryr6cEf0FHKAQ7pY4aO4xgncAftrv0lveTQ1rPP2inQ1QT0gJllsIa8nwbfXAADs9nNJxQDA==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/errors@2.0.0-preview.3': - resolution: {integrity: sha512-IZAUMcKaV3Hn0QTfzlGmVsDaH1mVUq0uURJi+tm8K3n37cKrvXyS2GQsHtIMRaLdOVp1IbTtIc5YF3+qATlpyw==} + '@solana/errors@3.0.3': + resolution: {integrity: sha512-1l84xJlHNva6io62PcYfUamwWlc0eM95nHgCrKX0g0cLoC6D6QHYPCEbEVkR+C5UtP9JDgyQM8MFiv+Ei5tO9Q==} + engines: {node: '>=20.18.0'} hasBin: true + peerDependencies: + typescript: '>=5.3.3' '@solana/eslint-config-solana@3.0.4': resolution: {integrity: sha512-G8n9zIz3MOwkj0+l0G6UZqvIM8ifJuNI0vvkhbOPDcif/T42hK0phgb+Lvo8RhQetusCWIUj+4lWUBJWk76O2w==} @@ -411,92 +494,193 @@ packages: eslint-plugin-typescript-sort-keys: ^3.2.0 typescript: ^5.1.6 - '@solana/fast-stable-stringify@2.0.0-preview.3': - resolution: {integrity: sha512-JBx++3mFJ6WwvMtn6sZihtSicbD2pIP95tJ4hP2go18p6e2gFWRDpAmicKHhg0AT3qSkD6HdpfXtth+OQNnI2A==} + '@solana/fast-stable-stringify@3.0.3': + resolution: {integrity: sha512-ED0pxB6lSEYvg+vOd5hcuQrgzEDnOrURFgp1ZOY+lQhJkQU6xo+P829NcJZQVP1rdU2/YQPAKJKEseyfe9VMIw==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' + + '@solana/functional@3.0.3': + resolution: {integrity: sha512-2qX1kKANn8995vOOh5S9AmF4ItGZcfbny0w28Eqy8AFh+GMnSDN4gqpmV2LvxBI9HibXZptGH3RVOMk82h1Mpw==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' + + '@solana/instruction-plans@3.0.3': + resolution: {integrity: sha512-eqoaPtWtmLTTpdvbt4BZF5H6FIlJtXi9H7qLOM1dLYonkOX2Ncezx5NDCZ9tMb2qxVMF4IocYsQnNSnMfjQF1w==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' + + '@solana/instructions@3.0.3': + resolution: {integrity: sha512-4csIi8YUDb5j/J+gDzmYtOvq7ZWLbCxj4t0xKn+fPrBk/FD2pK29KVT3Fu7j4Lh1/ojunQUP9X4NHwUexY3PnA==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' + + '@solana/keys@3.0.3': + resolution: {integrity: sha512-tp8oK9tMadtSIc4vF4aXXWkPd4oU5XPW8nf28NgrGDWGt25fUHIydKjkf2hPtMt9i1WfRyQZ33B5P3dnsNqcPQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' + + '@solana/kit@3.0.3': + resolution: {integrity: sha512-CEEhCDmkvztd1zbgADsEQhmj9GyWOOGeW1hZD+gtwbBSF5YN1uofS/pex5MIh/VIqKRj+A2UnYWI1V+9+q/lyQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/functional@2.0.0-preview.3': - resolution: {integrity: sha512-Zf305CAzEPRcaGLQdXq9SilxBnPcbUQk46jztOpkNzNMqL4Ipw7sIYHdbn/O+RhM2d7mDnthz2IGcYVyMaseKg==} + '@solana/nominal-types@3.0.3': + resolution: {integrity: sha512-aZavCiexeUAoMHRQg4s1AHkH3wscbOb70diyfjhwZVgFz1uUsFez7csPp9tNFkNolnadVb2gky7yBk3IImQJ6A==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/instructions@2.0.0-preview.3': - resolution: {integrity: sha512-P6Nkt++I/Ph7DFluVDAlgEYtFLtcvGFhRnqEa/BkkzRjbl28+HyDKRXcUPkP3o00+zuAqPjJ08qRxjywBOHPxg==} + '@solana/options@3.0.3': + resolution: {integrity: sha512-jarsmnQ63RN0JPC5j9sgUat07NrL9PC71XU7pUItd6LOHtu4+wJMio3l5mT0DHVfkfbFLL6iI6+QmXSVhTNF3g==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/keys@2.0.0-preview.3': - resolution: {integrity: sha512-TwQ0MQCafbKy277tDl4Q0CbIVuGAcd7NnlnrGXakhgNgO47N+vkEBhP+Zdw6YHWZwnuc30kdcXlaXSXPAMP2jQ==} + '@solana/programs@3.0.3': + resolution: {integrity: sha512-JZlVE3/AeSNDuH3aEzCZoDu8GTXkMpGXxf93zXLzbxfxhiQ/kHrReN4XE/JWZ/uGWbaFZGR5B3UtdN2QsoZL7w==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/options@2.0.0-preview.3': - resolution: {integrity: sha512-tT5O1CCJVE+rzo4VeeivYLNUL4L/2BjIeiy0MRh04lPxieiR346vUOPC1uCWGD6WqyTOOVUL0tsY4saYLmCTtA==} + '@solana/promises@3.0.3': + resolution: {integrity: sha512-K+UflGBVxj30XQMHTylHHZJdKH5QG3oj5k2s42GrZ/Wbu72oapVJySMBgpK45+p90t8/LEqV6rRPyTXlet9J+Q==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/programs@2.0.0-preview.3': - resolution: {integrity: sha512-lGbXyAdoSu9a6GjMK34fUvm2id8dFY++ktOnOfJ9hiJ6JS9nK1CKzJUDNRESdF8B/y9t8Es4YzxF0VlDFy9QnQ==} + '@solana/rpc-api@3.0.3': + resolution: {integrity: sha512-Yym9/Ama62OY69rAZgbOCAy1QlqaWAyb0VlqFuwSaZV1pkFCCFSwWEJEsiN1n8pb2ZP+RtwNvmYixvWizx9yvA==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/rpc-api@2.0.0-preview.3': - resolution: {integrity: sha512-L6AQBPzR1n45tk2t0ROp4XPSUFQTPv2jjb6LwIkn/+ocrmzLgfvMA4EfYG3TqdLkDQqouN7Z5H/k3u7g0Tt6Fg==} + '@solana/rpc-parsed-types@3.0.3': + resolution: {integrity: sha512-/koM05IM2fU91kYDQxXil3VBNlOfcP+gXE0js1sdGz8KonGuLsF61CiKB5xt6u1KEXhRyDdXYLjf63JarL4Ozg==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/rpc-parsed-types@2.0.0-preview.3': - resolution: {integrity: sha512-FCGDUUM4rNTwoXGVNZ1m94f5piKY0xuTEFevUsrzHV+gdNQT57JoA6riz0tcdWJQ8vkYdh5oZSrnngxRfhrevg==} + '@solana/rpc-spec-types@3.0.3': + resolution: {integrity: sha512-A6Jt8SRRetnN3CeGAvGJxigA9zYRslGgWcSjueAZGvPX+MesFxEUjSWZCfl+FogVFvwkqfkgQZQbPAGZQFJQ6Q==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/rpc-spec-types@2.0.0-preview.3': - resolution: {integrity: sha512-u56NbeoYpBc1ingOT6Fu5nIDYoNfF0wbzCXA7X2iCv6qOTf2gI6yP18OZHDbxB1QWTrd+cgeCC79ZZGuN1oXng==} + '@solana/rpc-spec@3.0.3': + resolution: {integrity: sha512-MZn5/8BebB6MQ4Gstw6zyfWsFAZYAyLzMK+AUf/rSfT8tPmWiJ/mcxnxqOXvFup/l6D67U8pyGpIoFqwCeZqqA==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/rpc-spec@2.0.0-preview.3': - resolution: {integrity: sha512-WA7L3v5CPNuhtyaQSQWJ9DI6VRLIxm7uyKbiaFQLSd6XGRq/4aJTICwklftqyKgKRnLoXfbFth0y1ddlboCnrg==} + '@solana/rpc-subscriptions-api@3.0.3': + resolution: {integrity: sha512-MGgVK3PUS15qsjuhimpzGZrKD/CTTvS0mAlQ0Jw84zsr1RJVdQJK/F0igu07BVd172eTZL8d90NoAQ3dahW5pA==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/rpc-subscriptions-api@2.0.0-preview.3': - resolution: {integrity: sha512-DVc17PVRTtrq2Y4B/KoOq5MpvQsmD4qijfv6rauZS9j/1Zp/ifNv3wlQT1ZPR5D7O3iG7YrZ9pPr8G/xUvhR7w==} + '@solana/rpc-subscriptions-channel-websocket@3.0.3': + resolution: {integrity: sha512-zUzUlb8Cwnw+SHlsLrSqyBRtOJKGc+FvSNJo/vWAkLShoV0wUDMPv7VvhTngJx3B/3ANfrOZ4i08i9QfYPAvpQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' + ws: ^8.18.0 - '@solana/rpc-subscriptions-spec@2.0.0-preview.3': - resolution: {integrity: sha512-hdZJzcJe6qWW1lOP2scmsByh0D6D88PUI8MHbvJPvJcN2YtH05NTkA4zZERpn71YC8kLmEz7yYRncb1YgGeLCg==} + '@solana/rpc-subscriptions-spec@3.0.3': + resolution: {integrity: sha512-9KpQ32OBJWS85mn6q3gkM0AjQe1LKYlMU7gpJRrla/lvXxNLhI95tz5K6StctpUreVmRWTVkNamHE69uUQyY8A==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/rpc-subscriptions-transport-websocket@2.0.0-preview.3': - resolution: {integrity: sha512-lDdS8tZRssobOsWNlB46hTqP755ddIRwI9l6B3b16pORxKhWbKav5+9VMs81hJi8NIE8Yidy90NqrIgXnkavAw==} + '@solana/rpc-subscriptions@3.0.3': + resolution: {integrity: sha512-LRvz6NaqvtsYFd32KwZ+rwYQ9XCs+DWjV8BvBLsJpt9/NWSuHf/7Sy/vvP6qtKxut692H/TMvHnC4iulg0WmiQ==} + engines: {node: '>=20.18.0'} peerDependencies: - ws: ^8.14.0 + typescript: '>=5.3.3' - '@solana/rpc-subscriptions@2.0.0-preview.3': - resolution: {integrity: sha512-TDMrA1io0ch2OlhM6ZU1hDPYl8v4uXdiqb1oC2YsRkP8Ee6hFSroYk21WEbM0ozlTmJslr4pEEM2eFKB8kPR7A==} + '@solana/rpc-transformers@3.0.3': + resolution: {integrity: sha512-lzdaZM/dG3s19Tsk4mkJA5JBoS1eX9DnD7z62gkDwrwJDkDBzkAJT9aLcsYFfTmwTfIp6uU2UPgGYc97i1wezw==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/rpc-transformers@2.0.0-preview.3': - resolution: {integrity: sha512-6JdtzomieglDGrktDywCc5C+jjnailrrlEiS8+6aoysVkvFFBWBS+er/jr0U7MI3v3khcAXokkzHePc+yC2jOg==} + '@solana/rpc-transport-http@3.0.3': + resolution: {integrity: sha512-bIXFwr2LR5A97Z46dI661MJPbHnPfcShBjFzOS/8Rnr8P4ho3j/9EUtjDrsqoxGJT3SLWj5OlyXAlaDAvVTOUQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/rpc-transport-http@2.0.0-preview.3': - resolution: {integrity: sha512-mv6aK9aQ85lE0bMH+V9nU0HU5S7vCn3P805sEl+UPEVzZ/P74VWYZSx13hf/+0uirXG84Qx6GGpmY1nMAKn8DA==} + '@solana/rpc-types@3.0.3': + resolution: {integrity: sha512-petWQ5xSny9UfmC3Qp2owyhNU0w9SyBww4+v7tSVyXMcCC9v6j/XsqTeimH1S0qQUllnv0/FY83ohFaxofmZ6Q==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/rpc-types@2.0.0-preview.3': - resolution: {integrity: sha512-c58YHqG92BqElH0ISXnh1nKDEr1fg0K4g6Z+HjadbvBp45P3iPwCrS4nbGMzNrKgk6YoGWixSQYzw1Tg7vQs6A==} + '@solana/rpc@3.0.3': + resolution: {integrity: sha512-3oukAaLK78GegkKcm6iNmRnO4mFeNz+BMvA8T56oizoBNKiRVEq/6DFzVX/LkmZ+wvD601pAB3uCdrTPcC0YKQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/rpc@2.0.0-preview.3': - resolution: {integrity: sha512-cMqaILF1R/L71f1WVWKMP8mhkZKuHTo0wSbya2BZwK+6Kw4PngHNyjEzshej5NO0E72RhaXFdFzs3L7ezNiG2g==} + '@solana/signers@3.0.3': + resolution: {integrity: sha512-UwCd/uPYTZiwd283JKVyOWLLN5sIgMBqGDyUmNU3vo9hcmXKv5ZGm/9TvwMY2z35sXWuIOcj7etxJ8OoWc/ObQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/signers@2.0.0-preview.3': - resolution: {integrity: sha512-j9k8KrivoFMxuNk9+vgDxRLXQzC+ZwDzUntfqaNhg6T6TqIiT9NITrQO5SqDfv1/Rj1nw+JLrtl8S1nrYR9w/A==} + '@solana/subscribable@3.0.3': + resolution: {integrity: sha512-FJ27LKGHLQ5GGttPvTOLQDLrrOZEgvaJhB7yYaHAhPk25+p+erBaQpjePhfkMyUbL1FQbxn1SUJmS6jUuaPjlQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/transaction-confirmation@2.0.0-preview.3': - resolution: {integrity: sha512-QCd1NutYo1kL7rUBxEQK1tM4OfdeOH6SzMY4luANduGzrPDOEnK1taatzNybZrrDt1VBz21N7ke2/WdQlKvMVg==} + '@solana/sysvars@3.0.3': + resolution: {integrity: sha512-GnHew+QeKCs2f9ow+20swEJMH4mDfJA/QhtPgOPTYQx/z69J4IieYJ7fZenSHnA//lJ45fVdNdmy1trypvPLBQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/transaction-messages@2.0.0-preview.3': - resolution: {integrity: sha512-8nfSMUe9L3CmD7D5iNVe4A9lu7d20OG5w1LhkkJNXpvenmK4IQ9WlwjWjD7gR+MzVgywICgPbw+e8FwTUFCKog==} + '@solana/transaction-confirmation@3.0.3': + resolution: {integrity: sha512-dXx0OLtR95LMuARgi2dDQlL1QYmk56DOou5q9wKymmeV3JTvfDExeWXnOgjRBBq/dEfj4ugN1aZuTaS18UirFw==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/transactions@2.0.0-preview.3': - resolution: {integrity: sha512-OJ7GDzWb/eA9iFNh1hYOn9tuiZqzIr1NDLQktOdR1DeiCAGrnuweEWLLYHCA1QyZ5J/X50lX8lasMFXYtzt6zA==} + '@solana/transaction-messages@3.0.3': + resolution: {integrity: sha512-s+6NWRnBhnnjFWV4x2tzBzoWa6e5LiIxIvJlWwVQBFkc8fMGY04w7jkFh0PM08t/QFKeXBEWkyBDa/TFYdkWug==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/web3.js@2.0.0-preview.3': - resolution: {integrity: sha512-BivbEWn49waNJV3FLlyd9mYsm960snRZbj+i8PVKbYTVOejLeKyI7KEfUnz+BwbFQl+35PEO3CUp/xpdca3KOA==} + '@solana/transactions@3.0.3': + resolution: {integrity: sha512-iMX+n9j4ON7H1nKlWEbMqMOpKYC6yVGxKKmWHT1KdLRG7v+03I4DnDeFoI+Zmw56FA+7Bbne8jwwX60Q1vk/MQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/webcrypto-ed25519-polyfill@2.0.0-preview.3': - resolution: {integrity: sha512-MaV4swf8QJr+H7BVr9hJiZxn/nWedvCMSJB53GtHse5/EC+STdBMzfELICKXiQtycWC5V4vC9LKTOHIjx2zXhg==} + '@types/estree@1.0.8': + resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==} - '@types/estree@1.0.6': - resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==} + '@types/hast@3.0.4': + resolution: {integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==} '@types/json-schema@7.0.15': resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} - '@types/node@20.16.10': - resolution: {integrity: sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA==} + '@types/node@24.6.2': + resolution: {integrity: sha512-d2L25Y4j+W3ZlNAeMKcy7yDsK425ibcAOO2t7aPTz6gNMH0z2GThtwENCDc0d/Pw9wgyRqE5Px1wkV7naz8ang==} '@types/semver@7.5.8': resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==} + '@types/unist@3.0.3': + resolution: {integrity: sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==} + '@typescript-eslint/eslint-plugin@7.18.0': resolution: {integrity: sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==} engines: {node: ^18.18.0 || >=20.0.0} @@ -623,6 +807,11 @@ packages: engines: {node: '>=0.4.0'} hasBin: true + acorn@8.15.0: + resolution: {integrity: sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==} + engines: {node: '>=0.4.0'} + hasBin: true + agent-base@6.0.2: resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} engines: {node: '>= 6.0.0'} @@ -638,9 +827,6 @@ packages: resolution: {integrity: sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==} engines: {node: '>=12'} - ansi-sequence-parser@1.1.1: - resolution: {integrity: sha512-vJXt3yiaUL4UU546s3rPXlsry/RnM730G1+HkpKE012AN0sx1eOrxSu95oKDIonskeLTijMgqWZ3uDEe3NFvyg==} - ansi-styles@4.3.0: resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} engines: {node: '>=8'} @@ -652,10 +838,6 @@ packages: any-promise@1.3.0: resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==} - anymatch@3.1.3: - resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==} - engines: {node: '>= 8'} - aproba@2.0.0: resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==} @@ -702,10 +884,6 @@ packages: balanced-match@1.0.2: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} - binary-extensions@2.3.0: - resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==} - engines: {node: '>=8'} - bindings@1.5.0: resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==} @@ -722,8 +900,8 @@ packages: resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} engines: {node: '>=8'} - bundle-require@5.0.0: - resolution: {integrity: sha512-GuziW3fSSmopcx4KRymQEJVbZUfqlCqcq7dvs6TYwKRZiegK/2buMxQTPs6MGlNv50wms1699qYO54R8XfRX4w==} + bundle-require@5.1.0: + resolution: {integrity: sha512-3WrrOuZiyaaZPWiEt4G3+IffISVC9HYlWueJEBWED4ZH4aIAC2PnkdnuRrR94M+w6yGWn4AglWtJtBI8YqvgoA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} peerDependencies: esbuild: '>=0.18' @@ -752,9 +930,13 @@ packages: resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==} engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} - chokidar@3.6.0: - resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} - engines: {node: '>= 8.10.0'} + chalk@5.6.2: + resolution: {integrity: sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==} + engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} + + chokidar@4.0.3: + resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==} + engines: {node: '>= 14.16.0'} chownr@2.0.0: resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} @@ -793,9 +975,9 @@ packages: resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==} hasBin: true - commander@12.1.0: - resolution: {integrity: sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==} - engines: {node: '>=18'} + commander@14.0.0: + resolution: {integrity: sha512-2uM9rYjPvyq39NwLRqaiLtWHyDC1FvryJDa2ATTVims5YAS4PupsEQsDvP14FqhFr0P49CYDugi59xaxJlTXRA==} + engines: {node: '>=20'} commander@4.1.1: resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==} @@ -811,8 +993,11 @@ packages: resolution: {integrity: sha512-OAcsnTEYu1ARJqWVGwf4zh4JDfHZEaSNlNccFmt8YjB2l/n19/PF2viLINHc57vO4FKIAFl2FWASIGZZWZ2Kxw==} engines: {node: '>=10.18.0 <11 || >=12.14.0 <13 || >=14'} - consola@3.2.3: - resolution: {integrity: sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==} + confbox@0.1.8: + resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==} + + consola@3.4.2: + resolution: {integrity: sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA==} engines: {node: ^14.18.0 || >=16.10.0} console-control-strings@1.1.0: @@ -843,6 +1028,15 @@ packages: supports-color: optional: true + debug@4.4.3: + resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + deep-is@0.1.4: resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} @@ -877,8 +1071,12 @@ packages: emoji-regex@9.2.2: resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} - esbuild@0.23.1: - resolution: {integrity: sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==} + entities@4.5.0: + resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} + engines: {node: '>=0.12'} + + esbuild@0.25.10: + resolution: {integrity: sha512-9RiGKvCwaqxO2owP61uQ4BgNborAQskMR6QusfWzQqv7AZOg5oGehdY2pRJMTKuwxd1IDBP4rSbI5lHzU7SMsQ==} engines: {node: '>=18'} hasBin: true @@ -991,10 +1189,6 @@ packages: resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==} engines: {node: '>=0.10.0'} - execa@5.1.1: - resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==} - engines: {node: '>=10'} - execa@7.2.0: resolution: {integrity: sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==} engines: {node: ^14.18.0 || ^16.14.0 || >=18.0.0} @@ -1021,8 +1215,9 @@ packages: fastq@1.17.1: resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==} - fdir@6.4.0: - resolution: {integrity: sha512-3oB133prH1o4j/L5lLW7uOCF1PlD+/It2L0eL/iAqWMB91RBbqTewABqxhj0ibBd90EEmWZq7ntIWzVaWcXTGQ==} + fdir@6.5.0: + resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==} + engines: {node: '>=12.0.0'} peerDependencies: picomatch: ^3 || ^4 peerDependenciesMeta: @@ -1052,6 +1247,9 @@ packages: resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==} engines: {node: '>=10'} + fix-dts-default-cjs-exports@1.0.1: + resolution: {integrity: sha512-pVIECanWFC61Hzl2+oOCtoJ3F17kglZC/6N94eRWycFgBH35hHx0Li604ZIzhseh97mf2p0cv7vVrOZGoqhlEg==} + flat-cache@3.2.0: resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==} engines: {node: ^10.12.0 || >=12.0.0} @@ -1137,10 +1335,6 @@ packages: resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==} engines: {node: '>= 6'} - human-signals@2.1.0: - resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} - engines: {node: '>=10.17.0'} - human-signals@4.3.1: resolution: {integrity: sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==} engines: {node: '>=14.18.0'} @@ -1176,10 +1370,6 @@ packages: resolution: {integrity: sha512-1ANGLZ+Nkv1ptFb2pa8oG8Lem4krflKuX/gINiHJHjJUKaJHk/SXk5x6K3J+39/p0h1RQ2saROclJJ+QLvETCQ==} engines: {node: '>=8'} - is-binary-path@2.1.0: - resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} - engines: {node: '>=8'} - is-extglob@2.1.1: resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} engines: {node: '>=0.10.0'} @@ -1211,10 +1401,6 @@ packages: is-promise@4.0.0: resolution: {integrity: sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==} - is-stream@2.0.1: - resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==} - engines: {node: '>=8'} - is-stream@3.0.0: resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -1257,9 +1443,6 @@ packages: json-stable-stringify-without-jsonify@1.0.1: resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==} - jsonc-parser@3.3.1: - resolution: {integrity: sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==} - keyv@4.5.4: resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==} @@ -1274,6 +1457,9 @@ packages: lines-and-columns@1.2.4: resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} + linkify-it@5.0.0: + resolution: {integrity: sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==} + load-json-file@7.0.1: resolution: {integrity: sha512-Gnxj3ev3mB5TkVBGad0JM6dmLiQL+o0t23JPBZ9sd+yvSLk05mFoqKBw5N8gbbkU4TNXyqCgIrl/VM17OgUIgQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -1301,13 +1487,15 @@ packages: lunr@2.3.9: resolution: {integrity: sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==} + magic-string@0.30.19: + resolution: {integrity: sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw==} + make-dir@3.1.0: resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} engines: {node: '>=8'} - marked@4.3.0: - resolution: {integrity: sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==} - engines: {node: '>= 12'} + markdown-it@14.1.0: + resolution: {integrity: sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==} hasBin: true matcher@5.0.0: @@ -1318,6 +1506,9 @@ packages: resolution: {integrity: sha512-BUiRtTtV39LIJwinWBjqVsU9xhdnz7/i889V859IBFpuqGAj6LuOvHv5XLbgZ2R7ptJoJaEcxkv88/h25T7Ciw==} engines: {node: '>=8'} + mdurl@2.0.0: + resolution: {integrity: sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==} + memoize@10.0.0: resolution: {integrity: sha512-H6cBLgsi6vMWOcCpvVCdFFnl3kerEXbrYh9q+lY6VXvQSmM6CkmV08VOwT+WE2tzIEqRPFfAq3fm4v/UIW6mSA==} engines: {node: '>=18'} @@ -1333,10 +1524,6 @@ packages: resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==} engines: {node: '>=8.6'} - mimic-fn@2.1.0: - resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==} - engines: {node: '>=6'} - mimic-fn@4.0.0: resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==} engines: {node: '>=12'} @@ -1373,6 +1560,9 @@ packages: engines: {node: '>=10'} hasBin: true + mlly@1.8.0: + resolution: {integrity: sha512-l8D9ODSRWLe2KHJSifWGwBqpTZXIXTeo8mlKjY+E2HAakaTeNpqAyBZ8GSqLzHgw4XmHmC8whvpjJNMbFZN7/g==} + ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} @@ -1407,14 +1597,6 @@ packages: engines: {node: '>=6'} hasBin: true - normalize-path@3.0.0: - resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} - engines: {node: '>=0.10.0'} - - npm-run-path@4.0.1: - resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==} - engines: {node: '>=8'} - npm-run-path@5.3.0: resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -1430,10 +1612,6 @@ packages: once@1.4.0: resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} - onetime@5.1.2: - resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==} - engines: {node: '>=6'} - onetime@6.0.0: resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==} engines: {node: '>=12'} @@ -1497,8 +1675,11 @@ packages: resolution: {integrity: sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==} engines: {node: '>=12'} - picocolors@1.1.0: - resolution: {integrity: sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==} + pathe@2.0.3: + resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==} + + picocolors@1.1.1: + resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==} picomatch@2.3.1: resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} @@ -1508,14 +1689,17 @@ packages: resolution: {integrity: sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==} engines: {node: '>=10'} - picomatch@4.0.2: - resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==} + picomatch@4.0.3: + resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==} engines: {node: '>=12'} pirates@4.0.6: resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==} engines: {node: '>= 6'} + pkg-types@1.3.1: + resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==} + plur@5.1.0: resolution: {integrity: sha512-VP/72JeXqak2KiOzjgKtQen5y3IZHn+9GOuLDafPv0eXa47xq0At93XahYBs26MsifCQ4enGKwbjBTKgb9QJXg==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -1542,8 +1726,8 @@ packages: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} - prettier@3.3.3: - resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==} + prettier@3.6.2: + resolution: {integrity: sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==} engines: {node: '>=14'} hasBin: true @@ -1551,6 +1735,10 @@ packages: resolution: {integrity: sha512-o1piW0n3tgKIKCwk2vpM/vOV13zjJzvP37Ioze54YlTHE06m4tjEbzg9WsKkvTuyYln2DHjo5pY4qrZGI0otpw==} engines: {node: '>=18'} + punycode.js@2.3.1: + resolution: {integrity: sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==} + engines: {node: '>=6'} + punycode@2.3.1: resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} engines: {node: '>=6'} @@ -1562,9 +1750,9 @@ packages: resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==} engines: {node: '>= 6'} - readdirp@3.6.0: - resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} - engines: {node: '>=8.10.0'} + readdirp@4.1.2: + resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==} + engines: {node: '>= 14.18.0'} require-directory@2.1.1: resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==} @@ -1599,8 +1787,8 @@ packages: resolution: {integrity: sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==} hasBin: true - rollup@4.22.5: - resolution: {integrity: sha512-WoinX7GeQOFMGznEcWA1WrTQCd/tpEbMkc3nuMs9BT0CPjMdSjPMTVClwWd4pgSQwJdP65SK9mTCNvItlr5o7w==} + rollup@4.52.3: + resolution: {integrity: sha512-RIDh866U8agLgiIcdpB+COKnlCreHJLfIhWC3LVflku5YHfpnsIKigRZeFfMfCc4dVcqNVfQQ5gO/afOck064A==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true @@ -1634,9 +1822,6 @@ packages: resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} engines: {node: '>=8'} - shiki@0.14.7: - resolution: {integrity: sha512-dNPAPrxSc87ua2sKJ3H5dQ/6ZaY8RNnaAqK+t0eG7p0Soi2ydiqbGOTaZCqaYvA/uZYfS1LJnemt3Q+mSfcPCg==} - signal-exit@3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} @@ -1659,6 +1844,7 @@ packages: source-map@0.8.0-beta.0: resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==} engines: {node: '>= 8'} + deprecated: The work that was done in this beta branch won't be included in future versions sprintf-js@1.0.3: resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==} @@ -1690,10 +1876,6 @@ packages: resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==} engines: {node: '>=12'} - strip-final-newline@2.0.0: - resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==} - engines: {node: '>=6'} - strip-final-newline@3.0.0: resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==} engines: {node: '>=12'} @@ -1737,8 +1919,11 @@ packages: resolution: {integrity: sha512-TIsDdtKo6+XrPtiTm1ssmMngN1sAhyKnTO2kunQWqNPWIVvCm15Wmw4SWInwTVgJ5u/Tr04+8Ei9TNcw4x4ONA==} engines: {node: '>=4'} - tinyglobby@0.2.8: - resolution: {integrity: sha512-AMLZywN0vbhiZi2neFEaj9VIIxC+PjDMsp0nAK6tpR86LJavZgHqGz0S/FOONwBygC+mu7R0/TyAQw0gx0Mu9Q==} + tinyexec@0.3.2: + resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==} + + tinyglobby@0.2.15: + resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==} engines: {node: '>=12.0.0'} to-regex-range@5.0.1: @@ -1767,8 +1952,8 @@ packages: tslib@1.14.1: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} - tsup@8.3.0: - resolution: {integrity: sha512-ALscEeyS03IomcuNdFdc0YWGVIkwH1Ws7nfTbAPuoILvEV2hpGQAY72LIOjglGo4ShWpZfpBqP/jpQVCzqYQag==} + tsup@8.5.0: + resolution: {integrity: sha512-VmBp77lWNQq6PfuMqCHD3xWl22vEoWsKajkF8t+yMBawlUS8JzEI+vOVMeuNZIuMML8qXRizFKi9oD5glKQVcQ==} engines: {node: '>=18'} hasBin: true peerDependencies: @@ -1804,25 +1989,34 @@ 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==} + typedoc-plugin-missing-exports@4.1.0: + resolution: {integrity: sha512-p1M5jXnEbQ4qqy0erJz41BBZEDb8XDrbLjndlH4RhYEcymbdQr0xLF6yUw1GWBrhSIfkU98m3BELMAiQh+R1zA==} peerDependencies: - typedoc: 0.24.x || 0.25.x + typedoc: ^0.28.1 - typedoc@0.25.13: - resolution: {integrity: sha512-pQqiwiJ+Z4pigfOnnysObszLiU3mVLWAExSPf+Mu06G/qsc3wzbuM56SZQvONhHLncLUhYzOVkjFFpFfL5AzhQ==} - engines: {node: '>= 16'} + typedoc@0.28.13: + resolution: {integrity: sha512-dNWY8msnYB2a+7Audha+aTF1Pu3euiE7ySp53w8kEsXoYw7dMouV5A1UsTUY345aB152RHnmRMDiovuBi7BD+w==} + engines: {node: '>= 18', pnpm: '>= 10'} hasBin: true peerDependencies: - typescript: 4.6.x || 4.7.x || 4.8.x || 4.9.x || 5.0.x || 5.1.x || 5.2.x || 5.3.x || 5.4.x + typescript: 5.0.x || 5.1.x || 5.2.x || 5.3.x || 5.4.x || 5.5.x || 5.6.x || 5.7.x || 5.8.x || 5.9.x - typescript@5.6.2: - resolution: {integrity: sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==} + typescript@5.9.3: + resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==} engines: {node: '>=14.17'} hasBin: true - undici-types@6.19.8: - resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} + uc.micro@2.1.0: + resolution: {integrity: sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==} + + ufo@1.6.1: + resolution: {integrity: sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==} + + undici-types@7.13.0: + resolution: {integrity: sha512-Ov2Rr9Sx+fRgagJ5AX0qvItZG/JKKoBRAVITs1zk7IqZGTJUwgUr7qoYBpWwakpWilTZFM98rG/AFRocu10iIQ==} + + undici-types@7.16.0: + resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==} unicorn-magic@0.1.0: resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==} @@ -1834,12 +2028,6 @@ packages: util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} - vscode-oniguruma@1.7.0: - resolution: {integrity: sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==} - - vscode-textmate@8.0.0: - resolution: {integrity: sha512-AFbieoL7a5LMqcnOF04ji+rpXadgOXnZsxQr//r83kLPr7biP7am3g9zbaZIaBGwBRWeSvoMD4mgPdX3e4NWBg==} - webidl-conversions@3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} @@ -1902,6 +2090,11 @@ packages: yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} + yaml@2.8.1: + resolution: {integrity: sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==} + engines: {node: '>= 14.6'} + hasBin: true + yargs-parser@21.1.1: resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} engines: {node: '>=12'} @@ -1921,76 +2114,82 @@ snapshots: escape-string-regexp: 5.0.0 execa: 7.2.0 - '@esbuild/aix-ppc64@0.23.1': + '@esbuild/aix-ppc64@0.25.10': + optional: true + + '@esbuild/android-arm64@0.25.10': optional: true - '@esbuild/android-arm64@0.23.1': + '@esbuild/android-arm@0.25.10': optional: true - '@esbuild/android-arm@0.23.1': + '@esbuild/android-x64@0.25.10': optional: true - '@esbuild/android-x64@0.23.1': + '@esbuild/darwin-arm64@0.25.10': optional: true - '@esbuild/darwin-arm64@0.23.1': + '@esbuild/darwin-x64@0.25.10': optional: true - '@esbuild/darwin-x64@0.23.1': + '@esbuild/freebsd-arm64@0.25.10': optional: true - '@esbuild/freebsd-arm64@0.23.1': + '@esbuild/freebsd-x64@0.25.10': optional: true - '@esbuild/freebsd-x64@0.23.1': + '@esbuild/linux-arm64@0.25.10': optional: true - '@esbuild/linux-arm64@0.23.1': + '@esbuild/linux-arm@0.25.10': optional: true - '@esbuild/linux-arm@0.23.1': + '@esbuild/linux-ia32@0.25.10': optional: true - '@esbuild/linux-ia32@0.23.1': + '@esbuild/linux-loong64@0.25.10': optional: true - '@esbuild/linux-loong64@0.23.1': + '@esbuild/linux-mips64el@0.25.10': optional: true - '@esbuild/linux-mips64el@0.23.1': + '@esbuild/linux-ppc64@0.25.10': optional: true - '@esbuild/linux-ppc64@0.23.1': + '@esbuild/linux-riscv64@0.25.10': optional: true - '@esbuild/linux-riscv64@0.23.1': + '@esbuild/linux-s390x@0.25.10': optional: true - '@esbuild/linux-s390x@0.23.1': + '@esbuild/linux-x64@0.25.10': optional: true - '@esbuild/linux-x64@0.23.1': + '@esbuild/netbsd-arm64@0.25.10': optional: true - '@esbuild/netbsd-x64@0.23.1': + '@esbuild/netbsd-x64@0.25.10': optional: true - '@esbuild/openbsd-arm64@0.23.1': + '@esbuild/openbsd-arm64@0.25.10': optional: true - '@esbuild/openbsd-x64@0.23.1': + '@esbuild/openbsd-x64@0.25.10': optional: true - '@esbuild/sunos-x64@0.23.1': + '@esbuild/openharmony-arm64@0.25.10': optional: true - '@esbuild/win32-arm64@0.23.1': + '@esbuild/sunos-x64@0.25.10': optional: true - '@esbuild/win32-ia32@0.23.1': + '@esbuild/win32-arm64@0.25.10': optional: true - '@esbuild/win32-x64@0.23.1': + '@esbuild/win32-ia32@0.25.10': + optional: true + + '@esbuild/win32-x64@0.25.10': optional: true '@eslint-community/eslint-utils@4.4.0(eslint@8.57.1)': @@ -2016,6 +2215,14 @@ snapshots: '@eslint/js@8.57.1': {} + '@gerrit0/mini-shiki@3.13.0': + dependencies: + '@shikijs/engine-oniguruma': 3.13.0 + '@shikijs/langs': 3.13.0 + '@shikijs/themes': 3.13.0 + '@shikijs/types': 3.13.0 + '@shikijs/vscode-textmate': 10.0.2 + '@humanwhocodes/config-array@0.13.0': dependencies: '@humanwhocodes/object-schema': 2.0.3 @@ -2049,6 +2256,8 @@ snapshots: '@jridgewell/sourcemap-codec@1.5.0': {} + '@jridgewell/sourcemap-codec@1.5.5': {} + '@jridgewell/trace-mapping@0.3.25': dependencies: '@jridgewell/resolve-uri': 3.1.2 @@ -2069,8 +2278,6 @@ snapshots: - encoding - supports-color - '@noble/ed25519@2.1.0': {} - '@nodelib/fs.scandir@2.1.5': dependencies: '@nodelib/fs.stat': 2.0.5 @@ -2091,390 +2298,522 @@ snapshots: estree-walker: 2.0.2 picomatch: 2.3.1 - '@rollup/rollup-android-arm-eabi@4.22.5': + '@rollup/rollup-android-arm-eabi@4.52.3': + optional: true + + '@rollup/rollup-android-arm64@4.52.3': + optional: true + + '@rollup/rollup-darwin-arm64@4.52.3': + optional: true + + '@rollup/rollup-darwin-x64@4.52.3': optional: true - '@rollup/rollup-android-arm64@4.22.5': + '@rollup/rollup-freebsd-arm64@4.52.3': optional: true - '@rollup/rollup-darwin-arm64@4.22.5': + '@rollup/rollup-freebsd-x64@4.52.3': optional: true - '@rollup/rollup-darwin-x64@4.22.5': + '@rollup/rollup-linux-arm-gnueabihf@4.52.3': optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.22.5': + '@rollup/rollup-linux-arm-musleabihf@4.52.3': optional: true - '@rollup/rollup-linux-arm-musleabihf@4.22.5': + '@rollup/rollup-linux-arm64-gnu@4.52.3': optional: true - '@rollup/rollup-linux-arm64-gnu@4.22.5': + '@rollup/rollup-linux-arm64-musl@4.52.3': optional: true - '@rollup/rollup-linux-arm64-musl@4.22.5': + '@rollup/rollup-linux-loong64-gnu@4.52.3': optional: true - '@rollup/rollup-linux-powerpc64le-gnu@4.22.5': + '@rollup/rollup-linux-ppc64-gnu@4.52.3': optional: true - '@rollup/rollup-linux-riscv64-gnu@4.22.5': + '@rollup/rollup-linux-riscv64-gnu@4.52.3': optional: true - '@rollup/rollup-linux-s390x-gnu@4.22.5': + '@rollup/rollup-linux-riscv64-musl@4.52.3': optional: true - '@rollup/rollup-linux-x64-gnu@4.22.5': + '@rollup/rollup-linux-s390x-gnu@4.52.3': optional: true - '@rollup/rollup-linux-x64-musl@4.22.5': + '@rollup/rollup-linux-x64-gnu@4.52.3': optional: true - '@rollup/rollup-win32-arm64-msvc@4.22.5': + '@rollup/rollup-linux-x64-musl@4.52.3': optional: true - '@rollup/rollup-win32-ia32-msvc@4.22.5': + '@rollup/rollup-openharmony-arm64@4.52.3': optional: true - '@rollup/rollup-win32-x64-msvc@4.22.5': + '@rollup/rollup-win32-arm64-msvc@4.52.3': optional: true + '@rollup/rollup-win32-ia32-msvc@4.52.3': + optional: true + + '@rollup/rollup-win32-x64-gnu@4.52.3': + optional: true + + '@rollup/rollup-win32-x64-msvc@4.52.3': + optional: true + + '@shikijs/engine-oniguruma@3.13.0': + dependencies: + '@shikijs/types': 3.13.0 + '@shikijs/vscode-textmate': 10.0.2 + + '@shikijs/langs@3.13.0': + dependencies: + '@shikijs/types': 3.13.0 + + '@shikijs/themes@3.13.0': + dependencies: + '@shikijs/types': 3.13.0 + + '@shikijs/types@3.13.0': + dependencies: + '@shikijs/vscode-textmate': 10.0.2 + '@types/hast': 3.0.4 + + '@shikijs/vscode-textmate@10.0.2': {} + '@sindresorhus/merge-streams@2.3.0': {} - '@solana/accounts@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': + '@solana/accounts@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': dependencies: - '@solana/addresses': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/codecs-core': 2.0.0-preview.3 - '@solana/codecs-strings': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/errors': 2.0.0-preview.3 - '@solana/rpc-spec': 2.0.0-preview.3 - '@solana/rpc-types': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) + '@solana/addresses': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/rpc-spec': 3.0.3(typescript@5.9.3) + '@solana/rpc-types': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/addresses@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': + '@solana/addresses@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': dependencies: - '@solana/assertions': 2.0.0-preview.3 - '@solana/codecs-core': 2.0.0-preview.3 - '@solana/codecs-strings': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/errors': 2.0.0-preview.3 + '@solana/assertions': 3.0.3(typescript@5.9.3) + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/nominal-types': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/assertions@2.0.0-preview.3': + '@solana/assertions@3.0.3(typescript@5.9.3)': dependencies: - '@solana/errors': 2.0.0-preview.3 + '@solana/errors': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 - '@solana/codecs-core@2.0.0-preview.3': + '@solana/codecs-core@3.0.3(typescript@5.9.3)': dependencies: - '@solana/errors': 2.0.0-preview.3 + '@solana/errors': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 - '@solana/codecs-data-structures@2.0.0-preview.3': + '@solana/codecs-data-structures@3.0.3(typescript@5.9.3)': dependencies: - '@solana/codecs-core': 2.0.0-preview.3 - '@solana/codecs-numbers': 2.0.0-preview.3 - '@solana/errors': 2.0.0-preview.3 + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/codecs-numbers': 3.0.3(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 - '@solana/codecs-numbers@2.0.0-preview.3': + '@solana/codecs-numbers@3.0.3(typescript@5.9.3)': dependencies: - '@solana/codecs-core': 2.0.0-preview.3 - '@solana/errors': 2.0.0-preview.3 + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 - '@solana/codecs-strings@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': + '@solana/codecs-strings@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': dependencies: - '@solana/codecs-core': 2.0.0-preview.3 - '@solana/codecs-numbers': 2.0.0-preview.3 - '@solana/errors': 2.0.0-preview.3 + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/codecs-numbers': 3.0.3(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) fastestsmallesttextencoderdecoder: 1.0.22 + typescript: 5.9.3 - '@solana/codecs@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': + '@solana/codecs@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': dependencies: - '@solana/codecs-core': 2.0.0-preview.3 - '@solana/codecs-data-structures': 2.0.0-preview.3 - '@solana/codecs-numbers': 2.0.0-preview.3 - '@solana/codecs-strings': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/options': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/codecs-data-structures': 3.0.3(typescript@5.9.3) + '@solana/codecs-numbers': 3.0.3(typescript@5.9.3) + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/options': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/errors@2.0.0-preview.3': + '@solana/errors@3.0.3(typescript@5.9.3)': dependencies: - chalk: 5.3.0 - commander: 12.1.0 + chalk: 5.6.2 + commander: 14.0.0 + typescript: 5.9.3 - '@solana/eslint-config-solana@3.0.4(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-simple-import-sort@12.1.1(eslint@8.57.1))(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.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2)': + '@solana/eslint-config-solana@3.0.4(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3))(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-simple-import-sort@12.1.1(eslint@8.57.1))(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.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3)': dependencies: - '@typescript-eslint/eslint-plugin': 7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2) - '@typescript-eslint/parser': 7.18.0(eslint@8.57.1)(typescript@5.6.2) + '@typescript-eslint/eslint-plugin': 7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3) + '@typescript-eslint/parser': 7.18.0(eslint@8.57.1)(typescript@5.9.3) eslint: 8.57.1 - eslint-plugin-jest: 27.9.0(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2) + eslint-plugin-jest: 27.9.0(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3) eslint-plugin-react-hooks: 4.6.2(eslint@8.57.1) eslint-plugin-simple-import-sort: 12.1.1(eslint@8.57.1) 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.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2) - typescript: 5.6.2 + eslint-plugin-typescript-sort-keys: 3.2.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3) + typescript: 5.9.3 - '@solana/fast-stable-stringify@2.0.0-preview.3': {} + '@solana/fast-stable-stringify@3.0.3(typescript@5.9.3)': + dependencies: + typescript: 5.9.3 + + '@solana/functional@3.0.3(typescript@5.9.3)': + dependencies: + typescript: 5.9.3 - '@solana/functional@2.0.0-preview.3': {} + '@solana/instruction-plans@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': + dependencies: + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/instructions': 3.0.3(typescript@5.9.3) + '@solana/promises': 3.0.3(typescript@5.9.3) + '@solana/transaction-messages': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/transactions': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 + transitivePeerDependencies: + - fastestsmallesttextencoderdecoder - '@solana/instructions@2.0.0-preview.3': + '@solana/instructions@3.0.3(typescript@5.9.3)': dependencies: - '@solana/errors': 2.0.0-preview.3 + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 - '@solana/keys@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': + '@solana/keys@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': dependencies: - '@solana/assertions': 2.0.0-preview.3 - '@solana/codecs-core': 2.0.0-preview.3 - '@solana/codecs-strings': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/errors': 2.0.0-preview.3 + '@solana/assertions': 3.0.3(typescript@5.9.3) + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/nominal-types': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 + transitivePeerDependencies: + - fastestsmallesttextencoderdecoder + + '@solana/kit@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)(ws@8.18.0)': + dependencies: + '@solana/accounts': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/addresses': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/codecs': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/functional': 3.0.3(typescript@5.9.3) + '@solana/instruction-plans': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/instructions': 3.0.3(typescript@5.9.3) + '@solana/keys': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/programs': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/rpc': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/rpc-parsed-types': 3.0.3(typescript@5.9.3) + '@solana/rpc-spec-types': 3.0.3(typescript@5.9.3) + '@solana/rpc-subscriptions': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)(ws@8.18.0) + '@solana/rpc-types': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/signers': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/sysvars': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/transaction-confirmation': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)(ws@8.18.0) + '@solana/transaction-messages': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/transactions': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder + - ws + + '@solana/nominal-types@3.0.3(typescript@5.9.3)': + dependencies: + typescript: 5.9.3 - '@solana/options@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': + '@solana/options@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': dependencies: - '@solana/codecs-core': 2.0.0-preview.3 - '@solana/codecs-data-structures': 2.0.0-preview.3 - '@solana/codecs-numbers': 2.0.0-preview.3 - '@solana/codecs-strings': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/errors': 2.0.0-preview.3 + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/codecs-data-structures': 3.0.3(typescript@5.9.3) + '@solana/codecs-numbers': 3.0.3(typescript@5.9.3) + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/programs@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': + '@solana/programs@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': dependencies: - '@solana/addresses': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/errors': 2.0.0-preview.3 + '@solana/addresses': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/rpc-api@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': - dependencies: - '@solana/addresses': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/codecs-core': 2.0.0-preview.3 - '@solana/codecs-strings': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/errors': 2.0.0-preview.3 - '@solana/keys': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc-parsed-types': 2.0.0-preview.3 - '@solana/rpc-spec': 2.0.0-preview.3 - '@solana/rpc-transformers': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc-types': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/transaction-messages': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/transactions': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) + '@solana/promises@3.0.3(typescript@5.9.3)': + dependencies: + typescript: 5.9.3 + + '@solana/rpc-api@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': + dependencies: + '@solana/addresses': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/keys': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/rpc-parsed-types': 3.0.3(typescript@5.9.3) + '@solana/rpc-spec': 3.0.3(typescript@5.9.3) + '@solana/rpc-transformers': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/rpc-types': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/transaction-messages': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/transactions': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/rpc-parsed-types@2.0.0-preview.3': {} + '@solana/rpc-parsed-types@3.0.3(typescript@5.9.3)': + dependencies: + typescript: 5.9.3 - '@solana/rpc-spec-types@2.0.0-preview.3': {} + '@solana/rpc-spec-types@3.0.3(typescript@5.9.3)': + dependencies: + typescript: 5.9.3 - '@solana/rpc-spec@2.0.0-preview.3': + '@solana/rpc-spec@3.0.3(typescript@5.9.3)': dependencies: - '@solana/errors': 2.0.0-preview.3 - '@solana/rpc-spec-types': 2.0.0-preview.3 + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/rpc-spec-types': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 - '@solana/rpc-subscriptions-api@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': + '@solana/rpc-subscriptions-api@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': dependencies: - '@solana/addresses': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/keys': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc-subscriptions-spec': 2.0.0-preview.3 - '@solana/rpc-transformers': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc-types': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/transaction-messages': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/transactions': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) + '@solana/addresses': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/keys': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/rpc-subscriptions-spec': 3.0.3(typescript@5.9.3) + '@solana/rpc-transformers': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/rpc-types': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/transaction-messages': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/transactions': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/rpc-subscriptions-spec@2.0.0-preview.3': - dependencies: - '@solana/errors': 2.0.0-preview.3 - '@solana/rpc-spec-types': 2.0.0-preview.3 - - '@solana/rpc-subscriptions-transport-websocket@2.0.0-preview.3(ws@8.18.0)': + '@solana/rpc-subscriptions-channel-websocket@3.0.3(typescript@5.9.3)(ws@8.18.0)': dependencies: - '@solana/errors': 2.0.0-preview.3 - '@solana/rpc-subscriptions-spec': 2.0.0-preview.3 + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/functional': 3.0.3(typescript@5.9.3) + '@solana/rpc-subscriptions-spec': 3.0.3(typescript@5.9.3) + '@solana/subscribable': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 ws: 8.18.0 - '@solana/rpc-subscriptions@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)(ws@8.18.0)': - dependencies: - '@solana/errors': 2.0.0-preview.3 - '@solana/fast-stable-stringify': 2.0.0-preview.3 - '@solana/functional': 2.0.0-preview.3 - '@solana/rpc-subscriptions-api': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc-subscriptions-spec': 2.0.0-preview.3 - '@solana/rpc-subscriptions-transport-websocket': 2.0.0-preview.3(ws@8.18.0) - '@solana/rpc-transformers': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc-types': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) + '@solana/rpc-subscriptions-spec@3.0.3(typescript@5.9.3)': + dependencies: + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/promises': 3.0.3(typescript@5.9.3) + '@solana/rpc-spec-types': 3.0.3(typescript@5.9.3) + '@solana/subscribable': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 + + '@solana/rpc-subscriptions@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)(ws@8.18.0)': + dependencies: + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/fast-stable-stringify': 3.0.3(typescript@5.9.3) + '@solana/functional': 3.0.3(typescript@5.9.3) + '@solana/promises': 3.0.3(typescript@5.9.3) + '@solana/rpc-spec-types': 3.0.3(typescript@5.9.3) + '@solana/rpc-subscriptions-api': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/rpc-subscriptions-channel-websocket': 3.0.3(typescript@5.9.3)(ws@8.18.0) + '@solana/rpc-subscriptions-spec': 3.0.3(typescript@5.9.3) + '@solana/rpc-transformers': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/rpc-types': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/subscribable': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - ws - '@solana/rpc-transformers@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': + '@solana/rpc-transformers@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': dependencies: - '@solana/functional': 2.0.0-preview.3 - '@solana/rpc-spec': 2.0.0-preview.3 - '@solana/rpc-subscriptions-spec': 2.0.0-preview.3 - '@solana/rpc-types': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/functional': 3.0.3(typescript@5.9.3) + '@solana/nominal-types': 3.0.3(typescript@5.9.3) + '@solana/rpc-spec-types': 3.0.3(typescript@5.9.3) + '@solana/rpc-types': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/rpc-transport-http@2.0.0-preview.3': + '@solana/rpc-transport-http@3.0.3(typescript@5.9.3)': dependencies: - '@solana/errors': 2.0.0-preview.3 - '@solana/rpc-spec': 2.0.0-preview.3 - undici-types: 6.19.8 + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/rpc-spec': 3.0.3(typescript@5.9.3) + '@solana/rpc-spec-types': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 + undici-types: 7.16.0 - '@solana/rpc-types@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': + '@solana/rpc-types@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': dependencies: - '@solana/addresses': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/codecs-core': 2.0.0-preview.3 - '@solana/codecs-numbers': 2.0.0-preview.3 - '@solana/codecs-strings': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/errors': 2.0.0-preview.3 + '@solana/addresses': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/codecs-numbers': 3.0.3(typescript@5.9.3) + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/nominal-types': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/rpc@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': - dependencies: - '@solana/errors': 2.0.0-preview.3 - '@solana/fast-stable-stringify': 2.0.0-preview.3 - '@solana/functional': 2.0.0-preview.3 - '@solana/rpc-api': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc-spec': 2.0.0-preview.3 - '@solana/rpc-transformers': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc-transport-http': 2.0.0-preview.3 - '@solana/rpc-types': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) + '@solana/rpc@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': + dependencies: + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/fast-stable-stringify': 3.0.3(typescript@5.9.3) + '@solana/functional': 3.0.3(typescript@5.9.3) + '@solana/rpc-api': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/rpc-spec': 3.0.3(typescript@5.9.3) + '@solana/rpc-spec-types': 3.0.3(typescript@5.9.3) + '@solana/rpc-transformers': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/rpc-transport-http': 3.0.3(typescript@5.9.3) + '@solana/rpc-types': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/signers@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': - dependencies: - '@solana/addresses': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/errors': 2.0.0-preview.3 - '@solana/instructions': 2.0.0-preview.3 - '@solana/keys': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/transaction-messages': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/transactions': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) + '@solana/signers@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': + dependencies: + '@solana/addresses': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/instructions': 3.0.3(typescript@5.9.3) + '@solana/keys': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/nominal-types': 3.0.3(typescript@5.9.3) + '@solana/transaction-messages': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/transactions': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/transaction-confirmation@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)(ws@8.18.0)': - dependencies: - '@solana/addresses': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/codecs-strings': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/errors': 2.0.0-preview.3 - '@solana/keys': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc-subscriptions': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)(ws@8.18.0) - '@solana/rpc-types': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/transaction-messages': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/transactions': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) + '@solana/subscribable@3.0.3(typescript@5.9.3)': + dependencies: + '@solana/errors': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 + + '@solana/sysvars@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': + dependencies: + '@solana/accounts': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/codecs': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/rpc-types': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - - ws - '@solana/transaction-messages@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': - dependencies: - '@solana/addresses': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/codecs-core': 2.0.0-preview.3 - '@solana/codecs-data-structures': 2.0.0-preview.3 - '@solana/codecs-numbers': 2.0.0-preview.3 - '@solana/errors': 2.0.0-preview.3 - '@solana/functional': 2.0.0-preview.3 - '@solana/instructions': 2.0.0-preview.3 - '@solana/rpc-types': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) + '@solana/transaction-confirmation@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)(ws@8.18.0)': + dependencies: + '@solana/addresses': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/keys': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/promises': 3.0.3(typescript@5.9.3) + '@solana/rpc': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/rpc-subscriptions': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)(ws@8.18.0) + '@solana/rpc-types': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/transaction-messages': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/transactions': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder + - ws - '@solana/transactions@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': - dependencies: - '@solana/addresses': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/codecs-core': 2.0.0-preview.3 - '@solana/codecs-data-structures': 2.0.0-preview.3 - '@solana/codecs-numbers': 2.0.0-preview.3 - '@solana/codecs-strings': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/errors': 2.0.0-preview.3 - '@solana/functional': 2.0.0-preview.3 - '@solana/instructions': 2.0.0-preview.3 - '@solana/keys': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc-types': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/transaction-messages': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) + '@solana/transaction-messages@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': + dependencies: + '@solana/addresses': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/codecs-data-structures': 3.0.3(typescript@5.9.3) + '@solana/codecs-numbers': 3.0.3(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/functional': 3.0.3(typescript@5.9.3) + '@solana/instructions': 3.0.3(typescript@5.9.3) + '@solana/nominal-types': 3.0.3(typescript@5.9.3) + '@solana/rpc-types': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/web3.js@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)(ws@8.18.0)': - dependencies: - '@solana/accounts': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/addresses': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/codecs': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/errors': 2.0.0-preview.3 - '@solana/functional': 2.0.0-preview.3 - '@solana/instructions': 2.0.0-preview.3 - '@solana/keys': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/programs': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc-parsed-types': 2.0.0-preview.3 - '@solana/rpc-subscriptions': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)(ws@8.18.0) - '@solana/rpc-types': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/signers': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/transaction-confirmation': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)(ws@8.18.0) - '@solana/transaction-messages': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/transactions': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) + '@solana/transactions@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': + dependencies: + '@solana/addresses': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/codecs-data-structures': 3.0.3(typescript@5.9.3) + '@solana/codecs-numbers': 3.0.3(typescript@5.9.3) + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/functional': 3.0.3(typescript@5.9.3) + '@solana/instructions': 3.0.3(typescript@5.9.3) + '@solana/keys': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/nominal-types': 3.0.3(typescript@5.9.3) + '@solana/rpc-types': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/transaction-messages': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - - ws - '@solana/webcrypto-ed25519-polyfill@2.0.0-preview.3': - dependencies: - '@noble/ed25519': 2.1.0 + '@types/estree@1.0.8': {} - '@types/estree@1.0.6': {} + '@types/hast@3.0.4': + dependencies: + '@types/unist': 3.0.3 '@types/json-schema@7.0.15': {} - '@types/node@20.16.10': + '@types/node@24.6.2': dependencies: - undici-types: 6.19.8 + undici-types: 7.13.0 '@types/semver@7.5.8': {} - '@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2)': + '@types/unist@3.0.3': {} + + '@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3)': dependencies: '@eslint-community/regexpp': 4.11.1 - '@typescript-eslint/parser': 7.18.0(eslint@8.57.1)(typescript@5.6.2) + '@typescript-eslint/parser': 7.18.0(eslint@8.57.1)(typescript@5.9.3) '@typescript-eslint/scope-manager': 7.18.0 - '@typescript-eslint/type-utils': 7.18.0(eslint@8.57.1)(typescript@5.6.2) - '@typescript-eslint/utils': 7.18.0(eslint@8.57.1)(typescript@5.6.2) + '@typescript-eslint/type-utils': 7.18.0(eslint@8.57.1)(typescript@5.9.3) + '@typescript-eslint/utils': 7.18.0(eslint@8.57.1)(typescript@5.9.3) '@typescript-eslint/visitor-keys': 7.18.0 eslint: 8.57.1 graphemer: 1.4.0 ignore: 5.3.2 natural-compare: 1.4.0 - ts-api-utils: 1.3.0(typescript@5.6.2) + ts-api-utils: 1.3.0(typescript@5.9.3) optionalDependencies: - typescript: 5.6.2 + typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/experimental-utils@5.62.0(eslint@8.57.1)(typescript@5.6.2)': + '@typescript-eslint/experimental-utils@5.62.0(eslint@8.57.1)(typescript@5.9.3)': dependencies: - '@typescript-eslint/utils': 5.62.0(eslint@8.57.1)(typescript@5.6.2) + '@typescript-eslint/utils': 5.62.0(eslint@8.57.1)(typescript@5.9.3) eslint: 8.57.1 transitivePeerDependencies: - supports-color - typescript - '@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2)': + '@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3)': dependencies: '@typescript-eslint/scope-manager': 7.18.0 '@typescript-eslint/types': 7.18.0 - '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.6.2) + '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.9.3) '@typescript-eslint/visitor-keys': 7.18.0 debug: 4.3.7 eslint: 8.57.1 optionalDependencies: - typescript: 5.6.2 + typescript: 5.9.3 transitivePeerDependencies: - supports-color @@ -2488,15 +2827,15 @@ snapshots: '@typescript-eslint/types': 7.18.0 '@typescript-eslint/visitor-keys': 7.18.0 - '@typescript-eslint/type-utils@7.18.0(eslint@8.57.1)(typescript@5.6.2)': + '@typescript-eslint/type-utils@7.18.0(eslint@8.57.1)(typescript@5.9.3)': dependencies: - '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.6.2) - '@typescript-eslint/utils': 7.18.0(eslint@8.57.1)(typescript@5.6.2) + '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.9.3) + '@typescript-eslint/utils': 7.18.0(eslint@8.57.1)(typescript@5.9.3) debug: 4.3.7 eslint: 8.57.1 - ts-api-utils: 1.3.0(typescript@5.6.2) + ts-api-utils: 1.3.0(typescript@5.9.3) optionalDependencies: - typescript: 5.6.2 + typescript: 5.9.3 transitivePeerDependencies: - supports-color @@ -2504,7 +2843,7 @@ snapshots: '@typescript-eslint/types@7.18.0': {} - '@typescript-eslint/typescript-estree@5.62.0(typescript@5.6.2)': + '@typescript-eslint/typescript-estree@5.62.0(typescript@5.9.3)': dependencies: '@typescript-eslint/types': 5.62.0 '@typescript-eslint/visitor-keys': 5.62.0 @@ -2512,13 +2851,13 @@ snapshots: globby: 11.1.0 is-glob: 4.0.3 semver: 7.6.3 - tsutils: 3.21.0(typescript@5.6.2) + tsutils: 3.21.0(typescript@5.9.3) optionalDependencies: - typescript: 5.6.2 + typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/typescript-estree@7.18.0(typescript@5.6.2)': + '@typescript-eslint/typescript-estree@7.18.0(typescript@5.9.3)': dependencies: '@typescript-eslint/types': 7.18.0 '@typescript-eslint/visitor-keys': 7.18.0 @@ -2527,20 +2866,20 @@ snapshots: is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.6.3 - ts-api-utils: 1.3.0(typescript@5.6.2) + ts-api-utils: 1.3.0(typescript@5.9.3) optionalDependencies: - typescript: 5.6.2 + typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@5.62.0(eslint@8.57.1)(typescript@5.6.2)': + '@typescript-eslint/utils@5.62.0(eslint@8.57.1)(typescript@5.9.3)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.1) '@types/json-schema': 7.0.15 '@types/semver': 7.5.8 '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.6.2) + '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.9.3) eslint: 8.57.1 eslint-scope: 5.1.1 semver: 7.6.3 @@ -2548,12 +2887,12 @@ snapshots: - supports-color - typescript - '@typescript-eslint/utils@7.18.0(eslint@8.57.1)(typescript@5.6.2)': + '@typescript-eslint/utils@7.18.0(eslint@8.57.1)(typescript@5.9.3)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.1) '@typescript-eslint/scope-manager': 7.18.0 '@typescript-eslint/types': 7.18.0 - '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.6.2) + '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.9.3) eslint: 8.57.1 transitivePeerDependencies: - supports-color @@ -2611,6 +2950,8 @@ snapshots: acorn@8.12.1: {} + acorn@8.15.0: {} + agent-base@6.0.2: dependencies: debug: 4.3.7 @@ -2628,8 +2969,6 @@ snapshots: ansi-regex@6.1.0: {} - ansi-sequence-parser@1.1.1: {} - ansi-styles@4.3.0: dependencies: color-convert: 2.0.1 @@ -2638,11 +2977,6 @@ snapshots: any-promise@1.3.0: {} - anymatch@3.1.3: - dependencies: - normalize-path: 3.0.0 - picomatch: 2.3.1 - aproba@2.0.0: {} are-we-there-yet@2.0.0: @@ -2716,8 +3050,6 @@ snapshots: balanced-match@1.0.2: {} - binary-extensions@2.3.0: {} - bindings@1.5.0: dependencies: file-uri-to-path: 1.0.0 @@ -2737,9 +3069,9 @@ snapshots: dependencies: fill-range: 7.1.1 - bundle-require@5.0.0(esbuild@0.23.1): + bundle-require@5.1.0(esbuild@0.25.10): dependencies: - esbuild: 0.23.1 + esbuild: 0.25.10 load-tsconfig: 0.2.5 cac@6.7.14: {} @@ -2759,17 +3091,11 @@ snapshots: chalk@5.3.0: {} - chokidar@3.6.0: + chalk@5.6.2: {} + + chokidar@4.0.3: dependencies: - anymatch: 3.1.3 - braces: 3.0.3 - glob-parent: 5.1.2 - is-binary-path: 2.1.0 - is-glob: 4.0.3 - normalize-path: 3.0.0 - readdirp: 3.6.0 - optionalDependencies: - fsevents: 2.3.3 + readdirp: 4.1.2 chownr@2.0.0: {} @@ -2802,7 +3128,7 @@ snapshots: color-support@1.1.3: {} - commander@12.1.0: {} + commander@14.0.0: {} commander@4.1.1: {} @@ -2821,7 +3147,9 @@ snapshots: semver: 7.6.3 well-known-symbols: 2.0.0 - consola@3.2.3: {} + confbox@0.1.8: {} + + consola@3.4.2: {} console-control-strings@1.1.0: {} @@ -2845,6 +3173,10 @@ snapshots: dependencies: ms: 2.1.3 + debug@4.4.3: + dependencies: + ms: 2.1.3 + deep-is@0.1.4: {} delegates@1.0.0: {} @@ -2869,32 +3201,36 @@ snapshots: emoji-regex@9.2.2: {} - esbuild@0.23.1: + entities@4.5.0: {} + + esbuild@0.25.10: optionalDependencies: - '@esbuild/aix-ppc64': 0.23.1 - '@esbuild/android-arm': 0.23.1 - '@esbuild/android-arm64': 0.23.1 - '@esbuild/android-x64': 0.23.1 - '@esbuild/darwin-arm64': 0.23.1 - '@esbuild/darwin-x64': 0.23.1 - '@esbuild/freebsd-arm64': 0.23.1 - '@esbuild/freebsd-x64': 0.23.1 - '@esbuild/linux-arm': 0.23.1 - '@esbuild/linux-arm64': 0.23.1 - '@esbuild/linux-ia32': 0.23.1 - '@esbuild/linux-loong64': 0.23.1 - '@esbuild/linux-mips64el': 0.23.1 - '@esbuild/linux-ppc64': 0.23.1 - '@esbuild/linux-riscv64': 0.23.1 - '@esbuild/linux-s390x': 0.23.1 - '@esbuild/linux-x64': 0.23.1 - '@esbuild/netbsd-x64': 0.23.1 - '@esbuild/openbsd-arm64': 0.23.1 - '@esbuild/openbsd-x64': 0.23.1 - '@esbuild/sunos-x64': 0.23.1 - '@esbuild/win32-arm64': 0.23.1 - '@esbuild/win32-ia32': 0.23.1 - '@esbuild/win32-x64': 0.23.1 + '@esbuild/aix-ppc64': 0.25.10 + '@esbuild/android-arm': 0.25.10 + '@esbuild/android-arm64': 0.25.10 + '@esbuild/android-x64': 0.25.10 + '@esbuild/darwin-arm64': 0.25.10 + '@esbuild/darwin-x64': 0.25.10 + '@esbuild/freebsd-arm64': 0.25.10 + '@esbuild/freebsd-x64': 0.25.10 + '@esbuild/linux-arm': 0.25.10 + '@esbuild/linux-arm64': 0.25.10 + '@esbuild/linux-ia32': 0.25.10 + '@esbuild/linux-loong64': 0.25.10 + '@esbuild/linux-mips64el': 0.25.10 + '@esbuild/linux-ppc64': 0.25.10 + '@esbuild/linux-riscv64': 0.25.10 + '@esbuild/linux-s390x': 0.25.10 + '@esbuild/linux-x64': 0.25.10 + '@esbuild/netbsd-arm64': 0.25.10 + '@esbuild/netbsd-x64': 0.25.10 + '@esbuild/openbsd-arm64': 0.25.10 + '@esbuild/openbsd-x64': 0.25.10 + '@esbuild/openharmony-arm64': 0.25.10 + '@esbuild/sunos-x64': 0.25.10 + '@esbuild/win32-arm64': 0.25.10 + '@esbuild/win32-ia32': 0.25.10 + '@esbuild/win32-x64': 0.25.10 escalade@3.2.0: {} @@ -2904,12 +3240,12 @@ snapshots: escape-string-regexp@5.0.0: {} - eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2): + eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3): dependencies: - '@typescript-eslint/utils': 5.62.0(eslint@8.57.1)(typescript@5.6.2) + '@typescript-eslint/utils': 5.62.0(eslint@8.57.1)(typescript@5.9.3) eslint: 8.57.1 optionalDependencies: - '@typescript-eslint/eslint-plugin': 7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2) + '@typescript-eslint/eslint-plugin': 7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3) transitivePeerDependencies: - supports-color - typescript @@ -2929,14 +3265,14 @@ snapshots: natural-compare: 1.4.0 requireindex: 1.2.0 - eslint-plugin-typescript-sort-keys@3.2.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2): + eslint-plugin-typescript-sort-keys@3.2.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3): dependencies: - '@typescript-eslint/experimental-utils': 5.62.0(eslint@8.57.1)(typescript@5.6.2) - '@typescript-eslint/parser': 7.18.0(eslint@8.57.1)(typescript@5.6.2) + '@typescript-eslint/experimental-utils': 5.62.0(eslint@8.57.1)(typescript@5.9.3) + '@typescript-eslint/parser': 7.18.0(eslint@8.57.1)(typescript@5.9.3) eslint: 8.57.1 json-schema: 0.4.0 natural-compare-lite: 1.4.0 - typescript: 5.6.2 + typescript: 5.9.3 transitivePeerDependencies: - supports-color @@ -3027,18 +3363,6 @@ snapshots: esutils@2.0.3: {} - execa@5.1.1: - dependencies: - cross-spawn: 7.0.3 - get-stream: 6.0.1 - human-signals: 2.1.0 - is-stream: 2.0.1 - merge-stream: 2.0.0 - npm-run-path: 4.0.1 - onetime: 5.1.2 - signal-exit: 3.0.7 - strip-final-newline: 2.0.0 - execa@7.2.0: dependencies: cross-spawn: 7.0.3 @@ -3073,9 +3397,9 @@ snapshots: dependencies: reusify: 1.0.4 - fdir@6.4.0(picomatch@4.0.2): + fdir@6.5.0(picomatch@4.0.3): optionalDependencies: - picomatch: 4.0.2 + picomatch: 4.0.3 figures@6.1.0: dependencies: @@ -3098,6 +3422,12 @@ snapshots: locate-path: 6.0.0 path-exists: 4.0.0 + fix-dts-default-cjs-exports@1.0.1: + dependencies: + magic-string: 0.30.19 + mlly: 1.8.0 + rollup: 4.52.3 + flat-cache@3.2.0: dependencies: flatted: 3.3.1 @@ -3201,8 +3531,6 @@ snapshots: transitivePeerDependencies: - supports-color - human-signals@2.1.0: {} - human-signals@4.3.1: {} ignore-by-default@2.1.0: {} @@ -3227,10 +3555,6 @@ snapshots: irregular-plurals@3.5.0: {} - is-binary-path@2.1.0: - dependencies: - binary-extensions: 2.3.0 - is-extglob@2.1.1: {} is-fullwidth-code-point@3.0.0: {} @@ -3249,8 +3573,6 @@ snapshots: is-promise@4.0.0: {} - is-stream@2.0.1: {} - is-stream@3.0.0: {} is-unicode-supported@2.1.0: {} @@ -3284,8 +3606,6 @@ snapshots: json-stable-stringify-without-jsonify@1.0.1: {} - jsonc-parser@3.3.1: {} - keyv@4.5.4: dependencies: json-buffer: 3.0.1 @@ -3299,6 +3619,10 @@ snapshots: lines-and-columns@1.2.4: {} + linkify-it@5.0.0: + dependencies: + uc.micro: 2.1.0 + load-json-file@7.0.1: {} load-tsconfig@0.2.5: {} @@ -3317,11 +3641,22 @@ snapshots: lunr@2.3.9: {} + magic-string@0.30.19: + dependencies: + '@jridgewell/sourcemap-codec': 1.5.5 + make-dir@3.1.0: dependencies: semver: 6.3.1 - marked@4.3.0: {} + markdown-it@14.1.0: + dependencies: + argparse: 2.0.1 + entities: 4.5.0 + linkify-it: 5.0.0 + mdurl: 2.0.0 + punycode.js: 2.3.1 + uc.micro: 2.1.0 matcher@5.0.0: dependencies: @@ -3331,6 +3666,8 @@ snapshots: dependencies: blueimp-md5: 2.19.0 + mdurl@2.0.0: {} + memoize@10.0.0: dependencies: mimic-function: 5.0.1 @@ -3344,8 +3681,6 @@ snapshots: braces: 3.0.3 picomatch: 2.3.1 - mimic-fn@2.1.0: {} - mimic-fn@4.0.0: {} mimic-function@5.0.1: {} @@ -3373,6 +3708,13 @@ snapshots: mkdirp@1.0.4: {} + mlly@1.8.0: + dependencies: + acorn: 8.15.0 + pathe: 2.0.3 + pkg-types: 1.3.1 + ufo: 1.6.1 + ms@2.1.3: {} mz@2.7.0: @@ -3397,12 +3739,6 @@ snapshots: dependencies: abbrev: 1.1.1 - normalize-path@3.0.0: {} - - npm-run-path@4.0.1: - dependencies: - path-key: 3.1.1 - npm-run-path@5.3.0: dependencies: path-key: 4.0.0 @@ -3420,10 +3756,6 @@ snapshots: dependencies: wrappy: 1.0.2 - onetime@5.1.2: - dependencies: - mimic-fn: 2.1.0 - onetime@6.0.0: dependencies: mimic-fn: 4.0.0 @@ -3477,32 +3809,44 @@ snapshots: path-type@5.0.0: {} - picocolors@1.1.0: {} + pathe@2.0.3: {} + + picocolors@1.1.1: {} picomatch@2.3.1: {} picomatch@3.0.1: {} - picomatch@4.0.2: {} + picomatch@4.0.3: {} pirates@4.0.6: {} + pkg-types@1.3.1: + dependencies: + confbox: 0.1.8 + mlly: 1.8.0 + pathe: 2.0.3 + plur@5.1.0: dependencies: irregular-plurals: 3.5.0 - postcss-load-config@6.0.1: + postcss-load-config@6.0.1(yaml@2.8.1): dependencies: lilconfig: 3.1.2 + optionalDependencies: + yaml: 2.8.1 prelude-ls@1.2.1: {} - prettier@3.3.3: {} + prettier@3.6.2: {} pretty-ms@9.1.0: dependencies: parse-ms: 4.0.0 + punycode.js@2.3.1: {} + punycode@2.3.1: {} queue-microtask@1.2.3: {} @@ -3513,9 +3857,7 @@ snapshots: string_decoder: 1.3.0 util-deprecate: 1.0.2 - readdirp@3.6.0: - dependencies: - picomatch: 2.3.1 + readdirp@4.1.2: {} require-directory@2.1.1: {} @@ -3539,26 +3881,32 @@ snapshots: dependencies: glob: 10.4.5 - rollup@4.22.5: + rollup@4.52.3: dependencies: - '@types/estree': 1.0.6 + '@types/estree': 1.0.8 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.22.5 - '@rollup/rollup-android-arm64': 4.22.5 - '@rollup/rollup-darwin-arm64': 4.22.5 - '@rollup/rollup-darwin-x64': 4.22.5 - '@rollup/rollup-linux-arm-gnueabihf': 4.22.5 - '@rollup/rollup-linux-arm-musleabihf': 4.22.5 - '@rollup/rollup-linux-arm64-gnu': 4.22.5 - '@rollup/rollup-linux-arm64-musl': 4.22.5 - '@rollup/rollup-linux-powerpc64le-gnu': 4.22.5 - '@rollup/rollup-linux-riscv64-gnu': 4.22.5 - '@rollup/rollup-linux-s390x-gnu': 4.22.5 - '@rollup/rollup-linux-x64-gnu': 4.22.5 - '@rollup/rollup-linux-x64-musl': 4.22.5 - '@rollup/rollup-win32-arm64-msvc': 4.22.5 - '@rollup/rollup-win32-ia32-msvc': 4.22.5 - '@rollup/rollup-win32-x64-msvc': 4.22.5 + '@rollup/rollup-android-arm-eabi': 4.52.3 + '@rollup/rollup-android-arm64': 4.52.3 + '@rollup/rollup-darwin-arm64': 4.52.3 + '@rollup/rollup-darwin-x64': 4.52.3 + '@rollup/rollup-freebsd-arm64': 4.52.3 + '@rollup/rollup-freebsd-x64': 4.52.3 + '@rollup/rollup-linux-arm-gnueabihf': 4.52.3 + '@rollup/rollup-linux-arm-musleabihf': 4.52.3 + '@rollup/rollup-linux-arm64-gnu': 4.52.3 + '@rollup/rollup-linux-arm64-musl': 4.52.3 + '@rollup/rollup-linux-loong64-gnu': 4.52.3 + '@rollup/rollup-linux-ppc64-gnu': 4.52.3 + '@rollup/rollup-linux-riscv64-gnu': 4.52.3 + '@rollup/rollup-linux-riscv64-musl': 4.52.3 + '@rollup/rollup-linux-s390x-gnu': 4.52.3 + '@rollup/rollup-linux-x64-gnu': 4.52.3 + '@rollup/rollup-linux-x64-musl': 4.52.3 + '@rollup/rollup-openharmony-arm64': 4.52.3 + '@rollup/rollup-win32-arm64-msvc': 4.52.3 + '@rollup/rollup-win32-ia32-msvc': 4.52.3 + '@rollup/rollup-win32-x64-gnu': 4.52.3 + '@rollup/rollup-win32-x64-msvc': 4.52.3 fsevents: 2.3.3 run-parallel@1.2.0: @@ -3583,13 +3931,6 @@ snapshots: shebang-regex@3.0.0: {} - shiki@0.14.7: - dependencies: - ansi-sequence-parser: 1.1.1 - jsonc-parser: 3.3.1 - vscode-oniguruma: 1.7.0 - vscode-textmate: 8.0.0 - signal-exit@3.0.7: {} signal-exit@4.1.0: {} @@ -3643,8 +3984,6 @@ snapshots: dependencies: ansi-regex: 6.1.0 - strip-final-newline@2.0.0: {} - strip-final-newline@3.0.0: {} strip-json-comments@3.1.1: {} @@ -3693,10 +4032,12 @@ snapshots: time-zone@1.0.0: {} - tinyglobby@0.2.8: + tinyexec@0.3.2: {} + + tinyglobby@0.2.15: dependencies: - fdir: 6.4.0(picomatch@4.0.2) - picomatch: 4.0.2 + fdir: 6.5.0(picomatch@4.0.3) + picomatch: 4.0.3 to-regex-range@5.0.1: dependencies: @@ -3710,44 +4051,45 @@ snapshots: tree-kill@1.2.2: {} - ts-api-utils@1.3.0(typescript@5.6.2): + ts-api-utils@1.3.0(typescript@5.9.3): dependencies: - typescript: 5.6.2 + typescript: 5.9.3 ts-interface-checker@0.1.13: {} tslib@1.14.1: {} - tsup@8.3.0(typescript@5.6.2): + tsup@8.5.0(typescript@5.9.3)(yaml@2.8.1): dependencies: - bundle-require: 5.0.0(esbuild@0.23.1) + bundle-require: 5.1.0(esbuild@0.25.10) cac: 6.7.14 - chokidar: 3.6.0 - consola: 3.2.3 - debug: 4.3.7 - esbuild: 0.23.1 - execa: 5.1.1 + chokidar: 4.0.3 + consola: 3.4.2 + debug: 4.4.3 + esbuild: 0.25.10 + fix-dts-default-cjs-exports: 1.0.1 joycon: 3.1.1 - picocolors: 1.1.0 - postcss-load-config: 6.0.1 + picocolors: 1.1.1 + postcss-load-config: 6.0.1(yaml@2.8.1) resolve-from: 5.0.0 - rollup: 4.22.5 + rollup: 4.52.3 source-map: 0.8.0-beta.0 sucrase: 3.35.0 - tinyglobby: 0.2.8 + tinyexec: 0.3.2 + tinyglobby: 0.2.15 tree-kill: 1.2.2 optionalDependencies: - typescript: 5.6.2 + typescript: 5.9.3 transitivePeerDependencies: - jiti - supports-color - tsx - yaml - tsutils@3.21.0(typescript@5.6.2): + tsutils@3.21.0(typescript@5.9.3): dependencies: tslib: 1.14.1 - typescript: 5.6.2 + typescript: 5.9.3 type-check@0.4.0: dependencies: @@ -3757,21 +4099,28 @@ snapshots: type-fest@0.20.2: {} - typedoc-plugin-missing-exports@2.3.0(typedoc@0.25.13(typescript@5.6.2)): + typedoc-plugin-missing-exports@4.1.0(typedoc@0.28.13(typescript@5.9.3)): dependencies: - typedoc: 0.25.13(typescript@5.6.2) + typedoc: 0.28.13(typescript@5.9.3) - typedoc@0.25.13(typescript@5.6.2): + typedoc@0.28.13(typescript@5.9.3): dependencies: + '@gerrit0/mini-shiki': 3.13.0 lunr: 2.3.9 - marked: 4.3.0 + markdown-it: 14.1.0 minimatch: 9.0.5 - shiki: 0.14.7 - typescript: 5.6.2 + typescript: 5.9.3 + yaml: 2.8.1 + + typescript@5.9.3: {} + + uc.micro@2.1.0: {} - typescript@5.6.2: {} + ufo@1.6.1: {} - undici-types@6.19.8: {} + undici-types@7.13.0: {} + + undici-types@7.16.0: {} unicorn-magic@0.1.0: {} @@ -3781,10 +4130,6 @@ snapshots: util-deprecate@1.0.2: {} - vscode-oniguruma@1.7.0: {} - - vscode-textmate@8.0.0: {} - webidl-conversions@3.0.1: {} webidl-conversions@4.0.2: {} @@ -3837,6 +4182,8 @@ snapshots: yallist@4.0.0: {} + yaml@2.8.1: {} + yargs-parser@21.1.1: {} yargs@17.7.2: diff --git a/clients/js/src/generated/index.ts b/clients/js/src/generated/index.ts index d5f8838..b1631cf 100644 --- a/clients/js/src/generated/index.ts +++ b/clients/js/src/generated/index.ts @@ -1,9 +1,9 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ export * from './instructions'; diff --git a/clients/js/src/generated/instructions/close.ts b/clients/js/src/generated/instructions/close.ts index fe5da03..38187e5 100644 --- a/clients/js/src/generated/instructions/close.ts +++ b/clients/js/src/generated/instructions/close.ts @@ -1,9 +1,9 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ import { @@ -13,20 +13,21 @@ import { getU32Decoder, getU32Encoder, transformEncoder, + type AccountMeta, + type AccountSignerMeta, type Address, - type Codec, - type Decoder, - type Encoder, - type IAccountMeta, - type IAccountSignerMeta, - type IInstruction, - type IInstructionWithAccounts, - type IInstructionWithData, + type FixedSizeCodec, + type FixedSizeDecoder, + type FixedSizeEncoder, + type Instruction, + type InstructionWithAccounts, + type InstructionWithData, type ReadonlyAccount, type ReadonlySignerAccount, + type ReadonlyUint8Array, type TransactionSigner, type WritableAccount, -} from '@solana/web3.js'; +} from '@solana/kit'; import { LOADER_V3_PROGRAM_ADDRESS } from '../programs'; import { getAccountMetaFactory, type ResolvedAccount } from '../shared'; @@ -40,14 +41,14 @@ export type CloseInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, TAccountBufferOrProgramDataAccount extends | string - | IAccountMeta = string, - TAccountDestinationAccount extends string | IAccountMeta = string, - TAccountAuthority extends string | IAccountMeta = string, - TAccountProgramAccount extends string | IAccountMeta = string, - TRemainingAccounts extends readonly IAccountMeta[] = [], -> = IInstruction & - IInstructionWithData & - IInstructionWithAccounts< + | AccountMeta = string, + TAccountDestinationAccount extends string | AccountMeta = string, + TAccountAuthority extends string | AccountMeta = string, + TAccountProgramAccount extends string | AccountMeta = string, + TRemainingAccounts extends readonly AccountMeta[] = [], +> = Instruction & + InstructionWithData & + InstructionWithAccounts< [ TAccountBufferOrProgramDataAccount extends string ? WritableAccount @@ -57,7 +58,7 @@ export type CloseInstruction< : TAccountDestinationAccount, TAccountAuthority extends string ? ReadonlySignerAccount & - IAccountSignerMeta + AccountSignerMeta : TAccountAuthority, TAccountProgramAccount extends string ? ReadonlyAccount @@ -70,18 +71,18 @@ export type CloseInstructionData = { discriminator: number }; export type CloseInstructionDataArgs = {}; -export function getCloseInstructionDataEncoder(): Encoder { +export function getCloseInstructionDataEncoder(): FixedSizeEncoder { return transformEncoder( getStructEncoder([['discriminator', getU32Encoder()]]), (value) => ({ ...value, discriminator: CLOSE_DISCRIMINATOR }) ); } -export function getCloseInstructionDataDecoder(): Decoder { +export function getCloseInstructionDataDecoder(): FixedSizeDecoder { return getStructDecoder([['discriminator', getU32Decoder()]]); } -export function getCloseInstructionDataCodec(): Codec< +export function getCloseInstructionDataCodec(): FixedSizeCodec< CloseInstructionDataArgs, CloseInstructionData > { @@ -112,22 +113,24 @@ export function getCloseInstruction< TAccountDestinationAccount extends string, TAccountAuthority extends string, TAccountProgramAccount extends string, + TProgramAddress extends Address = typeof LOADER_V3_PROGRAM_ADDRESS, >( input: CloseInput< TAccountBufferOrProgramDataAccount, TAccountDestinationAccount, TAccountAuthority, TAccountProgramAccount - > + >, + config?: { programAddress?: TProgramAddress } ): CloseInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountBufferOrProgramDataAccount, TAccountDestinationAccount, TAccountAuthority, TAccountProgramAccount > { // Program address. - const programAddress = LOADER_V3_PROGRAM_ADDRESS; + const programAddress = config?.programAddress ?? LOADER_V3_PROGRAM_ADDRESS; // Original accounts. const originalAccounts = { @@ -148,29 +151,27 @@ export function getCloseInstruction< >; const getAccountMeta = getAccountMetaFactory(programAddress, 'programId'); - const instruction = { + return Object.freeze({ accounts: [ getAccountMeta(accounts.bufferOrProgramDataAccount), getAccountMeta(accounts.destinationAccount), getAccountMeta(accounts.authority), getAccountMeta(accounts.programAccount), ], - programAddress, data: getCloseInstructionDataEncoder().encode({}), + programAddress, } as CloseInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountBufferOrProgramDataAccount, TAccountDestinationAccount, TAccountAuthority, TAccountProgramAccount - >; - - return instruction; + >); } export type ParsedCloseInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[], > = { programAddress: Address; accounts: { @@ -188,11 +189,11 @@ export type ParsedCloseInstruction< export function parseCloseInstruction< TProgram extends string, - TAccountMetas extends readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[], >( - instruction: IInstruction & - IInstructionWithAccounts & - IInstructionWithData + instruction: Instruction & + InstructionWithAccounts & + InstructionWithData ): ParsedCloseInstruction { if (instruction.accounts.length < 4) { // TODO: Coded error. @@ -200,7 +201,7 @@ export function parseCloseInstruction< } let accountIndex = 0; const getNextAccount = () => { - const accountMeta = instruction.accounts![accountIndex]!; + const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!; accountIndex += 1; return accountMeta; }; diff --git a/clients/js/src/generated/instructions/deployWithMaxDataLen.ts b/clients/js/src/generated/instructions/deployWithMaxDataLen.ts index 186d5f5..0e16b20 100644 --- a/clients/js/src/generated/instructions/deployWithMaxDataLen.ts +++ b/clients/js/src/generated/instructions/deployWithMaxDataLen.ts @@ -1,9 +1,9 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ import { @@ -15,21 +15,22 @@ import { getU64Decoder, getU64Encoder, transformEncoder, + type AccountMeta, + type AccountSignerMeta, type Address, - type Codec, - type Decoder, - type Encoder, - type IAccountMeta, - type IAccountSignerMeta, - type IInstruction, - type IInstructionWithAccounts, - type IInstructionWithData, + type FixedSizeCodec, + type FixedSizeDecoder, + type FixedSizeEncoder, + type Instruction, + type InstructionWithAccounts, + type InstructionWithData, type ReadonlyAccount, type ReadonlySignerAccount, + type ReadonlyUint8Array, type TransactionSigner, type WritableAccount, type WritableSignerAccount, -} from '@solana/web3.js'; +} from '@solana/kit'; import { LOADER_V3_PROGRAM_ADDRESS } from '../programs'; import { getAccountMetaFactory, type ResolvedAccount } from '../shared'; @@ -41,28 +42,28 @@ export function getDeployWithMaxDataLenDiscriminatorBytes() { export type DeployWithMaxDataLenInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountPayerAccount extends string | IAccountMeta = string, - TAccountProgramDataAccount extends string | IAccountMeta = string, - TAccountProgramAccount extends string | IAccountMeta = string, - TAccountBufferAccount extends string | IAccountMeta = string, + TAccountPayerAccount extends string | AccountMeta = string, + TAccountProgramDataAccount extends string | AccountMeta = string, + TAccountProgramAccount extends string | AccountMeta = string, + TAccountBufferAccount extends string | AccountMeta = string, TAccountRentSysvar extends | string - | IAccountMeta = 'SysvarRent111111111111111111111111111111111', + | AccountMeta = 'SysvarRent111111111111111111111111111111111', TAccountClockSysvar extends | string - | IAccountMeta = 'SysvarC1ock11111111111111111111111111111111', + | AccountMeta = 'SysvarC1ock11111111111111111111111111111111', TAccountSystemProgram extends | string - | IAccountMeta = '11111111111111111111111111111111', - TAccountAuthority extends string | IAccountMeta = string, - TRemainingAccounts extends readonly IAccountMeta[] = [], -> = IInstruction & - IInstructionWithData & - IInstructionWithAccounts< + | AccountMeta = '11111111111111111111111111111111', + TAccountAuthority extends string | AccountMeta = string, + TRemainingAccounts extends readonly AccountMeta[] = [], +> = Instruction & + InstructionWithData & + InstructionWithAccounts< [ TAccountPayerAccount extends string ? WritableSignerAccount & - IAccountSignerMeta + AccountSignerMeta : TAccountPayerAccount, TAccountProgramDataAccount extends string ? WritableAccount @@ -84,7 +85,7 @@ export type DeployWithMaxDataLenInstruction< : TAccountSystemProgram, TAccountAuthority extends string ? ReadonlySignerAccount & - IAccountSignerMeta + AccountSignerMeta : TAccountAuthority, ...TRemainingAccounts, ] @@ -99,7 +100,7 @@ export type DeployWithMaxDataLenInstructionDataArgs = { maxDataLen: number | bigint; }; -export function getDeployWithMaxDataLenInstructionDataEncoder(): Encoder { +export function getDeployWithMaxDataLenInstructionDataEncoder(): FixedSizeEncoder { return transformEncoder( getStructEncoder([ ['discriminator', getU32Encoder()], @@ -112,14 +113,14 @@ export function getDeployWithMaxDataLenInstructionDataEncoder(): Encoder { +export function getDeployWithMaxDataLenInstructionDataDecoder(): FixedSizeDecoder { return getStructDecoder([ ['discriminator', getU32Decoder()], ['maxDataLen', getU64Decoder()], ]); } -export function getDeployWithMaxDataLenInstructionDataCodec(): Codec< +export function getDeployWithMaxDataLenInstructionDataCodec(): FixedSizeCodec< DeployWithMaxDataLenInstructionDataArgs, DeployWithMaxDataLenInstructionData > { @@ -167,6 +168,7 @@ export function getDeployWithMaxDataLenInstruction< TAccountClockSysvar extends string, TAccountSystemProgram extends string, TAccountAuthority extends string, + TProgramAddress extends Address = typeof LOADER_V3_PROGRAM_ADDRESS, >( input: DeployWithMaxDataLenInput< TAccountPayerAccount, @@ -177,9 +179,10 @@ export function getDeployWithMaxDataLenInstruction< TAccountClockSysvar, TAccountSystemProgram, TAccountAuthority - > + >, + config?: { programAddress?: TProgramAddress } ): DeployWithMaxDataLenInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountPayerAccount, TAccountProgramDataAccount, TAccountProgramAccount, @@ -190,7 +193,7 @@ export function getDeployWithMaxDataLenInstruction< TAccountAuthority > { // Program address. - const programAddress = LOADER_V3_PROGRAM_ADDRESS; + const programAddress = config?.programAddress ?? LOADER_V3_PROGRAM_ADDRESS; // Original accounts. const originalAccounts = { @@ -229,7 +232,7 @@ export function getDeployWithMaxDataLenInstruction< } const getAccountMeta = getAccountMetaFactory(programAddress, 'programId'); - const instruction = { + return Object.freeze({ accounts: [ getAccountMeta(accounts.payerAccount), getAccountMeta(accounts.programDataAccount), @@ -240,12 +243,12 @@ export function getDeployWithMaxDataLenInstruction< getAccountMeta(accounts.systemProgram), getAccountMeta(accounts.authority), ], - programAddress, data: getDeployWithMaxDataLenInstructionDataEncoder().encode( args as DeployWithMaxDataLenInstructionDataArgs ), + programAddress, } as DeployWithMaxDataLenInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountPayerAccount, TAccountProgramDataAccount, TAccountProgramAccount, @@ -254,14 +257,12 @@ export function getDeployWithMaxDataLenInstruction< TAccountClockSysvar, TAccountSystemProgram, TAccountAuthority - >; - - return instruction; + >); } export type ParsedDeployWithMaxDataLenInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[], > = { programAddress: Address; accounts: { @@ -287,11 +288,11 @@ export type ParsedDeployWithMaxDataLenInstruction< export function parseDeployWithMaxDataLenInstruction< TProgram extends string, - TAccountMetas extends readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[], >( - instruction: IInstruction & - IInstructionWithAccounts & - IInstructionWithData + instruction: Instruction & + InstructionWithAccounts & + InstructionWithData ): ParsedDeployWithMaxDataLenInstruction { if (instruction.accounts.length < 8) { // TODO: Coded error. @@ -299,7 +300,7 @@ export function parseDeployWithMaxDataLenInstruction< } let accountIndex = 0; const getNextAccount = () => { - const accountMeta = instruction.accounts![accountIndex]!; + const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!; accountIndex += 1; return accountMeta; }; diff --git a/clients/js/src/generated/instructions/extendProgram.ts b/clients/js/src/generated/instructions/extendProgram.ts index a0e1888..c514bbd 100644 --- a/clients/js/src/generated/instructions/extendProgram.ts +++ b/clients/js/src/generated/instructions/extendProgram.ts @@ -1,9 +1,9 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ import { @@ -13,20 +13,21 @@ import { getU32Decoder, getU32Encoder, transformEncoder, + type AccountMeta, + type AccountSignerMeta, type Address, - type Codec, - type Decoder, - type Encoder, - type IAccountMeta, - type IAccountSignerMeta, - type IInstruction, - type IInstructionWithAccounts, - type IInstructionWithData, + type FixedSizeCodec, + type FixedSizeDecoder, + type FixedSizeEncoder, + type Instruction, + type InstructionWithAccounts, + type InstructionWithData, type ReadonlyAccount, + type ReadonlyUint8Array, type TransactionSigner, type WritableAccount, type WritableSignerAccount, -} from '@solana/web3.js'; +} from '@solana/kit'; import { LOADER_V3_PROGRAM_ADDRESS } from '../programs'; import { getAccountMetaFactory, type ResolvedAccount } from '../shared'; @@ -38,14 +39,14 @@ export function getExtendProgramDiscriminatorBytes() { export type ExtendProgramInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountProgramDataAccount extends string | IAccountMeta = string, - TAccountProgramAccount extends string | IAccountMeta = string, - TAccountSystemProgram extends string | IAccountMeta = string, - TAccountPayer extends string | IAccountMeta = string, - TRemainingAccounts extends readonly IAccountMeta[] = [], -> = IInstruction & - IInstructionWithData & - IInstructionWithAccounts< + TAccountProgramDataAccount extends string | AccountMeta = string, + TAccountProgramAccount extends string | AccountMeta = string, + TAccountSystemProgram extends string | AccountMeta = string, + TAccountPayer extends string | AccountMeta = string, + TRemainingAccounts extends readonly AccountMeta[] = [], +> = Instruction & + InstructionWithData & + InstructionWithAccounts< [ TAccountProgramDataAccount extends string ? WritableAccount @@ -58,7 +59,7 @@ export type ExtendProgramInstruction< : TAccountSystemProgram, TAccountPayer extends string ? WritableSignerAccount & - IAccountSignerMeta + AccountSignerMeta : TAccountPayer, ...TRemainingAccounts, ] @@ -71,7 +72,7 @@ export type ExtendProgramInstructionData = { export type ExtendProgramInstructionDataArgs = { additionalBytes: number }; -export function getExtendProgramInstructionDataEncoder(): Encoder { +export function getExtendProgramInstructionDataEncoder(): FixedSizeEncoder { return transformEncoder( getStructEncoder([ ['discriminator', getU32Encoder()], @@ -81,14 +82,14 @@ export function getExtendProgramInstructionDataEncoder(): Encoder { +export function getExtendProgramInstructionDataDecoder(): FixedSizeDecoder { return getStructDecoder([ ['discriminator', getU32Decoder()], ['additionalBytes', getU32Decoder()], ]); } -export function getExtendProgramInstructionDataCodec(): Codec< +export function getExtendProgramInstructionDataCodec(): FixedSizeCodec< ExtendProgramInstructionDataArgs, ExtendProgramInstructionData > { @@ -120,22 +121,24 @@ export function getExtendProgramInstruction< TAccountProgramAccount extends string, TAccountSystemProgram extends string, TAccountPayer extends string, + TProgramAddress extends Address = typeof LOADER_V3_PROGRAM_ADDRESS, >( input: ExtendProgramInput< TAccountProgramDataAccount, TAccountProgramAccount, TAccountSystemProgram, TAccountPayer - > + >, + config?: { programAddress?: TProgramAddress } ): ExtendProgramInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountProgramDataAccount, TAccountProgramAccount, TAccountSystemProgram, TAccountPayer > { // Program address. - const programAddress = LOADER_V3_PROGRAM_ADDRESS; + const programAddress = config?.programAddress ?? LOADER_V3_PROGRAM_ADDRESS; // Original accounts. const originalAccounts = { @@ -156,31 +159,29 @@ export function getExtendProgramInstruction< const args = { ...input }; const getAccountMeta = getAccountMetaFactory(programAddress, 'programId'); - const instruction = { + return Object.freeze({ accounts: [ getAccountMeta(accounts.programDataAccount), getAccountMeta(accounts.programAccount), getAccountMeta(accounts.systemProgram), getAccountMeta(accounts.payer), ], - programAddress, data: getExtendProgramInstructionDataEncoder().encode( args as ExtendProgramInstructionDataArgs ), + programAddress, } as ExtendProgramInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountProgramDataAccount, TAccountProgramAccount, TAccountSystemProgram, TAccountPayer - >; - - return instruction; + >); } export type ParsedExtendProgramInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[], > = { programAddress: Address; accounts: { @@ -198,11 +199,11 @@ export type ParsedExtendProgramInstruction< export function parseExtendProgramInstruction< TProgram extends string, - TAccountMetas extends readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[], >( - instruction: IInstruction & - IInstructionWithAccounts & - IInstructionWithData + instruction: Instruction & + InstructionWithAccounts & + InstructionWithData ): ParsedExtendProgramInstruction { if (instruction.accounts.length < 4) { // TODO: Coded error. @@ -210,7 +211,7 @@ export function parseExtendProgramInstruction< } let accountIndex = 0; const getNextAccount = () => { - const accountMeta = instruction.accounts![accountIndex]!; + const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!; accountIndex += 1; return accountMeta; }; diff --git a/clients/js/src/generated/instructions/index.ts b/clients/js/src/generated/instructions/index.ts index 08f0400..7b60b36 100644 --- a/clients/js/src/generated/instructions/index.ts +++ b/clients/js/src/generated/instructions/index.ts @@ -1,9 +1,9 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ export * from './close'; diff --git a/clients/js/src/generated/instructions/initializeBuffer.ts b/clients/js/src/generated/instructions/initializeBuffer.ts index 03fadc9..9329deb 100644 --- a/clients/js/src/generated/instructions/initializeBuffer.ts +++ b/clients/js/src/generated/instructions/initializeBuffer.ts @@ -1,9 +1,9 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ import { @@ -13,17 +13,18 @@ import { getU32Decoder, getU32Encoder, transformEncoder, + type AccountMeta, type Address, - type Codec, - type Decoder, - type Encoder, - type IAccountMeta, - type IInstruction, - type IInstructionWithAccounts, - type IInstructionWithData, + type FixedSizeCodec, + type FixedSizeDecoder, + type FixedSizeEncoder, + type Instruction, + type InstructionWithAccounts, + type InstructionWithData, type ReadonlyAccount, + type ReadonlyUint8Array, type WritableAccount, -} from '@solana/web3.js'; +} from '@solana/kit'; import { LOADER_V3_PROGRAM_ADDRESS } from '../programs'; import { getAccountMetaFactory, type ResolvedAccount } from '../shared'; @@ -35,12 +36,12 @@ export function getInitializeBufferDiscriminatorBytes() { export type InitializeBufferInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountSourceAccount extends string | IAccountMeta = string, - TAccountBufferAuthority extends string | IAccountMeta = string, - TRemainingAccounts extends readonly IAccountMeta[] = [], -> = IInstruction & - IInstructionWithData & - IInstructionWithAccounts< + TAccountSourceAccount extends string | AccountMeta = string, + TAccountBufferAuthority extends string | AccountMeta = string, + TRemainingAccounts extends readonly AccountMeta[] = [], +> = Instruction & + InstructionWithData & + InstructionWithAccounts< [ TAccountSourceAccount extends string ? WritableAccount @@ -56,18 +57,18 @@ export type InitializeBufferInstructionData = { discriminator: number }; export type InitializeBufferInstructionDataArgs = {}; -export function getInitializeBufferInstructionDataEncoder(): Encoder { +export function getInitializeBufferInstructionDataEncoder(): FixedSizeEncoder { return transformEncoder( getStructEncoder([['discriminator', getU32Encoder()]]), (value) => ({ ...value, discriminator: INITIALIZE_BUFFER_DISCRIMINATOR }) ); } -export function getInitializeBufferInstructionDataDecoder(): Decoder { +export function getInitializeBufferInstructionDataDecoder(): FixedSizeDecoder { return getStructDecoder([['discriminator', getU32Decoder()]]); } -export function getInitializeBufferInstructionDataCodec(): Codec< +export function getInitializeBufferInstructionDataCodec(): FixedSizeCodec< InitializeBufferInstructionDataArgs, InitializeBufferInstructionData > { @@ -90,15 +91,17 @@ export type InitializeBufferInput< export function getInitializeBufferInstruction< TAccountSourceAccount extends string, TAccountBufferAuthority extends string, + TProgramAddress extends Address = typeof LOADER_V3_PROGRAM_ADDRESS, >( - input: InitializeBufferInput + input: InitializeBufferInput, + config?: { programAddress?: TProgramAddress } ): InitializeBufferInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountSourceAccount, TAccountBufferAuthority > { // Program address. - const programAddress = LOADER_V3_PROGRAM_ADDRESS; + const programAddress = config?.programAddress ?? LOADER_V3_PROGRAM_ADDRESS; // Original accounts. const originalAccounts = { @@ -114,25 +117,23 @@ export function getInitializeBufferInstruction< >; const getAccountMeta = getAccountMetaFactory(programAddress, 'programId'); - const instruction = { + return Object.freeze({ accounts: [ getAccountMeta(accounts.sourceAccount), getAccountMeta(accounts.bufferAuthority), ], - programAddress, data: getInitializeBufferInstructionDataEncoder().encode({}), + programAddress, } as InitializeBufferInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountSourceAccount, TAccountBufferAuthority - >; - - return instruction; + >); } export type ParsedInitializeBufferInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[], > = { programAddress: Address; accounts: { @@ -146,11 +147,11 @@ export type ParsedInitializeBufferInstruction< export function parseInitializeBufferInstruction< TProgram extends string, - TAccountMetas extends readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[], >( - instruction: IInstruction & - IInstructionWithAccounts & - IInstructionWithData + instruction: Instruction & + InstructionWithAccounts & + InstructionWithData ): ParsedInitializeBufferInstruction { if (instruction.accounts.length < 2) { // TODO: Coded error. @@ -158,7 +159,7 @@ export function parseInitializeBufferInstruction< } let accountIndex = 0; const getNextAccount = () => { - const accountMeta = instruction.accounts![accountIndex]!; + const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!; accountIndex += 1; return accountMeta; }; diff --git a/clients/js/src/generated/instructions/setAuthority.ts b/clients/js/src/generated/instructions/setAuthority.ts index e06f343..8a45a35 100644 --- a/clients/js/src/generated/instructions/setAuthority.ts +++ b/clients/js/src/generated/instructions/setAuthority.ts @@ -1,9 +1,9 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ import { @@ -13,20 +13,21 @@ import { getU32Decoder, getU32Encoder, transformEncoder, + type AccountMeta, + type AccountSignerMeta, type Address, - type Codec, - type Decoder, - type Encoder, - type IAccountMeta, - type IAccountSignerMeta, - type IInstruction, - type IInstructionWithAccounts, - type IInstructionWithData, + type FixedSizeCodec, + type FixedSizeDecoder, + type FixedSizeEncoder, + type Instruction, + type InstructionWithAccounts, + type InstructionWithData, type ReadonlyAccount, type ReadonlySignerAccount, + type ReadonlyUint8Array, type TransactionSigner, type WritableAccount, -} from '@solana/web3.js'; +} from '@solana/kit'; import { LOADER_V3_PROGRAM_ADDRESS } from '../programs'; import { getAccountMetaFactory, type ResolvedAccount } from '../shared'; @@ -40,20 +41,20 @@ export type SetAuthorityInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, TAccountBufferOrProgramDataAccount extends | string - | IAccountMeta = string, - TAccountCurrentAuthority extends string | IAccountMeta = string, - TAccountNewAuthority extends string | IAccountMeta = string, - TRemainingAccounts extends readonly IAccountMeta[] = [], -> = IInstruction & - IInstructionWithData & - IInstructionWithAccounts< + | AccountMeta = string, + TAccountCurrentAuthority extends string | AccountMeta = string, + TAccountNewAuthority extends string | AccountMeta = string, + TRemainingAccounts extends readonly AccountMeta[] = [], +> = Instruction & + InstructionWithData & + InstructionWithAccounts< [ TAccountBufferOrProgramDataAccount extends string ? WritableAccount : TAccountBufferOrProgramDataAccount, TAccountCurrentAuthority extends string ? ReadonlySignerAccount & - IAccountSignerMeta + AccountSignerMeta : TAccountCurrentAuthority, TAccountNewAuthority extends string ? ReadonlyAccount @@ -66,18 +67,18 @@ export type SetAuthorityInstructionData = { discriminator: number }; export type SetAuthorityInstructionDataArgs = {}; -export function getSetAuthorityInstructionDataEncoder(): Encoder { +export function getSetAuthorityInstructionDataEncoder(): FixedSizeEncoder { return transformEncoder( getStructEncoder([['discriminator', getU32Encoder()]]), (value) => ({ ...value, discriminator: SET_AUTHORITY_DISCRIMINATOR }) ); } -export function getSetAuthorityInstructionDataDecoder(): Decoder { +export function getSetAuthorityInstructionDataDecoder(): FixedSizeDecoder { return getStructDecoder([['discriminator', getU32Decoder()]]); } -export function getSetAuthorityInstructionDataCodec(): Codec< +export function getSetAuthorityInstructionDataCodec(): FixedSizeCodec< SetAuthorityInstructionDataArgs, SetAuthorityInstructionData > { @@ -104,20 +105,22 @@ export function getSetAuthorityInstruction< TAccountBufferOrProgramDataAccount extends string, TAccountCurrentAuthority extends string, TAccountNewAuthority extends string, + TProgramAddress extends Address = typeof LOADER_V3_PROGRAM_ADDRESS, >( input: SetAuthorityInput< TAccountBufferOrProgramDataAccount, TAccountCurrentAuthority, TAccountNewAuthority - > + >, + config?: { programAddress?: TProgramAddress } ): SetAuthorityInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountBufferOrProgramDataAccount, TAccountCurrentAuthority, TAccountNewAuthority > { // Program address. - const programAddress = LOADER_V3_PROGRAM_ADDRESS; + const programAddress = config?.programAddress ?? LOADER_V3_PROGRAM_ADDRESS; // Original accounts. const originalAccounts = { @@ -137,27 +140,25 @@ export function getSetAuthorityInstruction< >; const getAccountMeta = getAccountMetaFactory(programAddress, 'programId'); - const instruction = { + return Object.freeze({ accounts: [ getAccountMeta(accounts.bufferOrProgramDataAccount), getAccountMeta(accounts.currentAuthority), getAccountMeta(accounts.newAuthority), ], - programAddress, data: getSetAuthorityInstructionDataEncoder().encode({}), + programAddress, } as SetAuthorityInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountBufferOrProgramDataAccount, TAccountCurrentAuthority, TAccountNewAuthority - >; - - return instruction; + >); } export type ParsedSetAuthorityInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[], > = { programAddress: Address; accounts: { @@ -173,11 +174,11 @@ export type ParsedSetAuthorityInstruction< export function parseSetAuthorityInstruction< TProgram extends string, - TAccountMetas extends readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[], >( - instruction: IInstruction & - IInstructionWithAccounts & - IInstructionWithData + instruction: Instruction & + InstructionWithAccounts & + InstructionWithData ): ParsedSetAuthorityInstruction { if (instruction.accounts.length < 3) { // TODO: Coded error. @@ -185,7 +186,7 @@ export function parseSetAuthorityInstruction< } let accountIndex = 0; const getNextAccount = () => { - const accountMeta = instruction.accounts![accountIndex]!; + const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!; accountIndex += 1; return accountMeta; }; diff --git a/clients/js/src/generated/instructions/setAuthorityChecked.ts b/clients/js/src/generated/instructions/setAuthorityChecked.ts index ab84ae8..58a33a0 100644 --- a/clients/js/src/generated/instructions/setAuthorityChecked.ts +++ b/clients/js/src/generated/instructions/setAuthorityChecked.ts @@ -1,9 +1,9 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ import { @@ -13,19 +13,20 @@ import { getU32Decoder, getU32Encoder, transformEncoder, + type AccountMeta, + type AccountSignerMeta, type Address, - type Codec, - type Decoder, - type Encoder, - type IAccountMeta, - type IAccountSignerMeta, - type IInstruction, - type IInstructionWithAccounts, - type IInstructionWithData, + type FixedSizeCodec, + type FixedSizeDecoder, + type FixedSizeEncoder, + type Instruction, + type InstructionWithAccounts, + type InstructionWithData, type ReadonlySignerAccount, + type ReadonlyUint8Array, type TransactionSigner, type WritableAccount, -} from '@solana/web3.js'; +} from '@solana/kit'; import { LOADER_V3_PROGRAM_ADDRESS } from '../programs'; import { getAccountMetaFactory, type ResolvedAccount } from '../shared'; @@ -39,24 +40,24 @@ export type SetAuthorityCheckedInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, TAccountBufferOrProgramDataAccount extends | string - | IAccountMeta = string, - TAccountCurrentAuthority extends string | IAccountMeta = string, - TAccountNewAuthority extends string | IAccountMeta = string, - TRemainingAccounts extends readonly IAccountMeta[] = [], -> = IInstruction & - IInstructionWithData & - IInstructionWithAccounts< + | AccountMeta = string, + TAccountCurrentAuthority extends string | AccountMeta = string, + TAccountNewAuthority extends string | AccountMeta = string, + TRemainingAccounts extends readonly AccountMeta[] = [], +> = Instruction & + InstructionWithData & + InstructionWithAccounts< [ TAccountBufferOrProgramDataAccount extends string ? WritableAccount : TAccountBufferOrProgramDataAccount, TAccountCurrentAuthority extends string ? ReadonlySignerAccount & - IAccountSignerMeta + AccountSignerMeta : TAccountCurrentAuthority, TAccountNewAuthority extends string ? ReadonlySignerAccount & - IAccountSignerMeta + AccountSignerMeta : TAccountNewAuthority, ...TRemainingAccounts, ] @@ -66,7 +67,7 @@ export type SetAuthorityCheckedInstructionData = { discriminator: number }; export type SetAuthorityCheckedInstructionDataArgs = {}; -export function getSetAuthorityCheckedInstructionDataEncoder(): Encoder { +export function getSetAuthorityCheckedInstructionDataEncoder(): FixedSizeEncoder { return transformEncoder( getStructEncoder([['discriminator', getU32Encoder()]]), (value) => ({ @@ -76,11 +77,11 @@ export function getSetAuthorityCheckedInstructionDataEncoder(): Encoder { +export function getSetAuthorityCheckedInstructionDataDecoder(): FixedSizeDecoder { return getStructDecoder([['discriminator', getU32Decoder()]]); } -export function getSetAuthorityCheckedInstructionDataCodec(): Codec< +export function getSetAuthorityCheckedInstructionDataCodec(): FixedSizeCodec< SetAuthorityCheckedInstructionDataArgs, SetAuthorityCheckedInstructionData > { @@ -107,20 +108,22 @@ export function getSetAuthorityCheckedInstruction< TAccountBufferOrProgramDataAccount extends string, TAccountCurrentAuthority extends string, TAccountNewAuthority extends string, + TProgramAddress extends Address = typeof LOADER_V3_PROGRAM_ADDRESS, >( input: SetAuthorityCheckedInput< TAccountBufferOrProgramDataAccount, TAccountCurrentAuthority, TAccountNewAuthority - > + >, + config?: { programAddress?: TProgramAddress } ): SetAuthorityCheckedInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountBufferOrProgramDataAccount, TAccountCurrentAuthority, TAccountNewAuthority > { // Program address. - const programAddress = LOADER_V3_PROGRAM_ADDRESS; + const programAddress = config?.programAddress ?? LOADER_V3_PROGRAM_ADDRESS; // Original accounts. const originalAccounts = { @@ -140,27 +143,25 @@ export function getSetAuthorityCheckedInstruction< >; const getAccountMeta = getAccountMetaFactory(programAddress, 'programId'); - const instruction = { + return Object.freeze({ accounts: [ getAccountMeta(accounts.bufferOrProgramDataAccount), getAccountMeta(accounts.currentAuthority), getAccountMeta(accounts.newAuthority), ], - programAddress, data: getSetAuthorityCheckedInstructionDataEncoder().encode({}), + programAddress, } as SetAuthorityCheckedInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountBufferOrProgramDataAccount, TAccountCurrentAuthority, TAccountNewAuthority - >; - - return instruction; + >); } export type ParsedSetAuthorityCheckedInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[], > = { programAddress: Address; accounts: { @@ -176,11 +177,11 @@ export type ParsedSetAuthorityCheckedInstruction< export function parseSetAuthorityCheckedInstruction< TProgram extends string, - TAccountMetas extends readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[], >( - instruction: IInstruction & - IInstructionWithAccounts & - IInstructionWithData + instruction: Instruction & + InstructionWithAccounts & + InstructionWithData ): ParsedSetAuthorityCheckedInstruction { if (instruction.accounts.length < 3) { // TODO: Coded error. @@ -188,7 +189,7 @@ export function parseSetAuthorityCheckedInstruction< } let accountIndex = 0; const getNextAccount = () => { - const accountMeta = instruction.accounts![accountIndex]!; + const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!; accountIndex += 1; return accountMeta; }; diff --git a/clients/js/src/generated/instructions/upgrade.ts b/clients/js/src/generated/instructions/upgrade.ts index c21780c..de05183 100644 --- a/clients/js/src/generated/instructions/upgrade.ts +++ b/clients/js/src/generated/instructions/upgrade.ts @@ -1,9 +1,9 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ import { @@ -13,20 +13,21 @@ import { getU32Decoder, getU32Encoder, transformEncoder, + type AccountMeta, + type AccountSignerMeta, type Address, - type Codec, - type Decoder, - type Encoder, - type IAccountMeta, - type IAccountSignerMeta, - type IInstruction, - type IInstructionWithAccounts, - type IInstructionWithData, + type FixedSizeCodec, + type FixedSizeDecoder, + type FixedSizeEncoder, + type Instruction, + type InstructionWithAccounts, + type InstructionWithData, type ReadonlyAccount, type ReadonlySignerAccount, + type ReadonlyUint8Array, type TransactionSigner, type WritableAccount, -} from '@solana/web3.js'; +} from '@solana/kit'; import { LOADER_V3_PROGRAM_ADDRESS } from '../programs'; import { getAccountMetaFactory, type ResolvedAccount } from '../shared'; @@ -38,21 +39,21 @@ export function getUpgradeDiscriminatorBytes() { export type UpgradeInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountProgramDataAccount extends string | IAccountMeta = string, - TAccountProgramAccount extends string | IAccountMeta = string, - TAccountBufferAccount extends string | IAccountMeta = string, - TAccountSpillAccount extends string | IAccountMeta = string, + TAccountProgramDataAccount extends string | AccountMeta = string, + TAccountProgramAccount extends string | AccountMeta = string, + TAccountBufferAccount extends string | AccountMeta = string, + TAccountSpillAccount extends string | AccountMeta = string, TAccountRentSysvar extends | string - | IAccountMeta = 'SysvarRent111111111111111111111111111111111', + | AccountMeta = 'SysvarRent111111111111111111111111111111111', TAccountClockSysvar extends | string - | IAccountMeta = 'SysvarC1ock11111111111111111111111111111111', - TAccountAuthority extends string | IAccountMeta = string, - TRemainingAccounts extends readonly IAccountMeta[] = [], -> = IInstruction & - IInstructionWithData & - IInstructionWithAccounts< + | AccountMeta = 'SysvarC1ock11111111111111111111111111111111', + TAccountAuthority extends string | AccountMeta = string, + TRemainingAccounts extends readonly AccountMeta[] = [], +> = Instruction & + InstructionWithData & + InstructionWithAccounts< [ TAccountProgramDataAccount extends string ? WritableAccount @@ -74,7 +75,7 @@ export type UpgradeInstruction< : TAccountClockSysvar, TAccountAuthority extends string ? ReadonlySignerAccount & - IAccountSignerMeta + AccountSignerMeta : TAccountAuthority, ...TRemainingAccounts, ] @@ -84,18 +85,18 @@ export type UpgradeInstructionData = { discriminator: number }; export type UpgradeInstructionDataArgs = {}; -export function getUpgradeInstructionDataEncoder(): Encoder { +export function getUpgradeInstructionDataEncoder(): FixedSizeEncoder { return transformEncoder( getStructEncoder([['discriminator', getU32Encoder()]]), (value) => ({ ...value, discriminator: UPGRADE_DISCRIMINATOR }) ); } -export function getUpgradeInstructionDataDecoder(): Decoder { +export function getUpgradeInstructionDataDecoder(): FixedSizeDecoder { return getStructDecoder([['discriminator', getU32Decoder()]]); } -export function getUpgradeInstructionDataCodec(): Codec< +export function getUpgradeInstructionDataCodec(): FixedSizeCodec< UpgradeInstructionDataArgs, UpgradeInstructionData > { @@ -138,6 +139,7 @@ export function getUpgradeInstruction< TAccountRentSysvar extends string, TAccountClockSysvar extends string, TAccountAuthority extends string, + TProgramAddress extends Address = typeof LOADER_V3_PROGRAM_ADDRESS, >( input: UpgradeInput< TAccountProgramDataAccount, @@ -147,9 +149,10 @@ export function getUpgradeInstruction< TAccountRentSysvar, TAccountClockSysvar, TAccountAuthority - > + >, + config?: { programAddress?: TProgramAddress } ): UpgradeInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountProgramDataAccount, TAccountProgramAccount, TAccountBufferAccount, @@ -159,7 +162,7 @@ export function getUpgradeInstruction< TAccountAuthority > { // Program address. - const programAddress = LOADER_V3_PROGRAM_ADDRESS; + const programAddress = config?.programAddress ?? LOADER_V3_PROGRAM_ADDRESS; // Original accounts. const originalAccounts = { @@ -190,7 +193,7 @@ export function getUpgradeInstruction< } const getAccountMeta = getAccountMetaFactory(programAddress, 'programId'); - const instruction = { + return Object.freeze({ accounts: [ getAccountMeta(accounts.programDataAccount), getAccountMeta(accounts.programAccount), @@ -200,10 +203,10 @@ export function getUpgradeInstruction< getAccountMeta(accounts.clockSysvar), getAccountMeta(accounts.authority), ], - programAddress, data: getUpgradeInstructionDataEncoder().encode({}), + programAddress, } as UpgradeInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountProgramDataAccount, TAccountProgramAccount, TAccountBufferAccount, @@ -211,14 +214,12 @@ export function getUpgradeInstruction< TAccountRentSysvar, TAccountClockSysvar, TAccountAuthority - >; - - return instruction; + >); } export type ParsedUpgradeInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[], > = { programAddress: Address; accounts: { @@ -242,11 +243,11 @@ export type ParsedUpgradeInstruction< export function parseUpgradeInstruction< TProgram extends string, - TAccountMetas extends readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[], >( - instruction: IInstruction & - IInstructionWithAccounts & - IInstructionWithData + instruction: Instruction & + InstructionWithAccounts & + InstructionWithData ): ParsedUpgradeInstruction { if (instruction.accounts.length < 7) { // TODO: Coded error. @@ -254,7 +255,7 @@ export function parseUpgradeInstruction< } let accountIndex = 0; const getNextAccount = () => { - const accountMeta = instruction.accounts![accountIndex]!; + const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!; accountIndex += 1; return accountMeta; }; diff --git a/clients/js/src/generated/instructions/write.ts b/clients/js/src/generated/instructions/write.ts index bc5c77f..50b1559 100644 --- a/clients/js/src/generated/instructions/write.ts +++ b/clients/js/src/generated/instructions/write.ts @@ -1,9 +1,9 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ import { @@ -17,20 +17,20 @@ import { getU32Decoder, getU32Encoder, transformEncoder, + type AccountMeta, + type AccountSignerMeta, type Address, type Codec, type Decoder, type Encoder, - type IAccountMeta, - type IAccountSignerMeta, - type IInstruction, - type IInstructionWithAccounts, - type IInstructionWithData, + type Instruction, + type InstructionWithAccounts, + type InstructionWithData, type ReadonlySignerAccount, type ReadonlyUint8Array, type TransactionSigner, type WritableAccount, -} from '@solana/web3.js'; +} from '@solana/kit'; import { LOADER_V3_PROGRAM_ADDRESS } from '../programs'; import { getAccountMetaFactory, type ResolvedAccount } from '../shared'; @@ -42,19 +42,19 @@ export function getWriteDiscriminatorBytes() { export type WriteInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountBufferAccount extends string | IAccountMeta = string, - TAccountBufferAuthority extends string | IAccountMeta = string, - TRemainingAccounts extends readonly IAccountMeta[] = [], -> = IInstruction & - IInstructionWithData & - IInstructionWithAccounts< + TAccountBufferAccount extends string | AccountMeta = string, + TAccountBufferAuthority extends string | AccountMeta = string, + TRemainingAccounts extends readonly AccountMeta[] = [], +> = Instruction & + InstructionWithData & + InstructionWithAccounts< [ TAccountBufferAccount extends string ? WritableAccount : TAccountBufferAccount, TAccountBufferAuthority extends string ? ReadonlySignerAccount & - IAccountSignerMeta + AccountSignerMeta : TAccountBufferAuthority, ...TRemainingAccounts, ] @@ -115,15 +115,17 @@ export type WriteInput< export function getWriteInstruction< TAccountBufferAccount extends string, TAccountBufferAuthority extends string, + TProgramAddress extends Address = typeof LOADER_V3_PROGRAM_ADDRESS, >( - input: WriteInput + input: WriteInput, + config?: { programAddress?: TProgramAddress } ): WriteInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountBufferAccount, TAccountBufferAuthority > { // Program address. - const programAddress = LOADER_V3_PROGRAM_ADDRESS; + const programAddress = config?.programAddress ?? LOADER_V3_PROGRAM_ADDRESS; // Original accounts. const originalAccounts = { @@ -142,27 +144,25 @@ export function getWriteInstruction< const args = { ...input }; const getAccountMeta = getAccountMetaFactory(programAddress, 'programId'); - const instruction = { + return Object.freeze({ accounts: [ getAccountMeta(accounts.bufferAccount), getAccountMeta(accounts.bufferAuthority), ], - programAddress, data: getWriteInstructionDataEncoder().encode( args as WriteInstructionDataArgs ), + programAddress, } as WriteInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountBufferAccount, TAccountBufferAuthority - >; - - return instruction; + >); } export type ParsedWriteInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[], > = { programAddress: Address; accounts: { @@ -176,11 +176,11 @@ export type ParsedWriteInstruction< export function parseWriteInstruction< TProgram extends string, - TAccountMetas extends readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[], >( - instruction: IInstruction & - IInstructionWithAccounts & - IInstructionWithData + instruction: Instruction & + InstructionWithAccounts & + InstructionWithData ): ParsedWriteInstruction { if (instruction.accounts.length < 2) { // TODO: Coded error. @@ -188,7 +188,7 @@ export function parseWriteInstruction< } let accountIndex = 0; const getNextAccount = () => { - const accountMeta = instruction.accounts![accountIndex]!; + const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!; accountIndex += 1; return accountMeta; }; diff --git a/clients/js/src/generated/programs/index.ts b/clients/js/src/generated/programs/index.ts index edc53db..970bf79 100644 --- a/clients/js/src/generated/programs/index.ts +++ b/clients/js/src/generated/programs/index.ts @@ -1,9 +1,9 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ export * from './loaderV3'; diff --git a/clients/js/src/generated/programs/loaderV3.ts b/clients/js/src/generated/programs/loaderV3.ts index c0be619..14728ee 100644 --- a/clients/js/src/generated/programs/loaderV3.ts +++ b/clients/js/src/generated/programs/loaderV3.ts @@ -1,9 +1,9 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ import { @@ -11,7 +11,7 @@ import { getU32Encoder, type Address, type ReadonlyUint8Array, -} from '@solana/web3.js'; +} from '@solana/kit'; import { type ParsedCloseInstruction, type ParsedDeployWithMaxDataLenInstruction, diff --git a/clients/js/src/generated/shared/index.ts b/clients/js/src/generated/shared/index.ts index 278bf59..83a3183 100644 --- a/clients/js/src/generated/shared/index.ts +++ b/clients/js/src/generated/shared/index.ts @@ -1,29 +1,29 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ import { AccountRole, isProgramDerivedAddress, - isTransactionSigner as web3JsIsTransactionSigner, + isTransactionSigner as kitIsTransactionSigner, + type AccountMeta, + type AccountSignerMeta, type Address, - type IAccountMeta, - type IAccountSignerMeta, type ProgramDerivedAddress, type TransactionSigner, upgradeRoleToSigner, -} from '@solana/web3.js'; +} from '@solana/kit'; /** * Asserts that the given value is not null or undefined. * @internal */ export function expectSome(value: T | null | undefined): T { - if (value == null) { + if (value === null || value === undefined) { throw new Error('Expected a value but received null or undefined.'); } return value; @@ -48,7 +48,7 @@ export function expectAddress( return value.address; } if (Array.isArray(value)) { - return value[0]; + return value[0] as Address; } return value as Address; } @@ -113,7 +113,7 @@ export type ResolvedAccount< * Defines an instruction that stores additional bytes on-chain. * @internal */ -export type IInstructionWithByteDelta = { +export type InstructionWithByteDelta = { byteDelta: number; }; @@ -127,7 +127,7 @@ export function getAccountMetaFactory( ) { return ( account: ResolvedAccount - ): IAccountMeta | IAccountSignerMeta | undefined => { + ): AccountMeta | AccountSignerMeta | undefined => { if (!account.value) { if (optionalAccountStrategy === 'omitted') return; return Object.freeze({ @@ -159,6 +159,6 @@ export function isTransactionSigner( !!value && typeof value === 'object' && 'address' in value && - web3JsIsTransactionSigner(value) + kitIsTransactionSigner(value) ); } diff --git a/clients/rust/Cargo.toml b/clients/rust/Cargo.toml index 18fdc23..78c6764 100644 --- a/clients/rust/Cargo.toml +++ b/clients/rust/Cargo.toml @@ -8,17 +8,26 @@ license-file = "../../LICENSE" [features] test-sbf = [] serde = ["dep:serde", "dep:serde_with"] +fetch = ["dep:solana-client", "dep:solana-sdk"] [dependencies] borsh = "^0.10" -num-derive = "^0.3" +num-derive = "^0.4" num-traits = "^0.2" serde = { version = "^1.0", features = ["derive"], optional = true } serde_with = { version = "^3.0", optional = true } -solana-program = "~2.0" +solana-account = "~2.2" +solana-account-info = "~2.3" +solana-client = { version = "~2.3", optional = true } +solana-cpi = "~2.2" +solana-decode-error = "~2.3" +solana-instruction = "~2.3" +solana-program-error = "~2.2" +solana-pubkey = { version = "~2.4", features = ["curve25519", "borsh"] } +solana-sdk = { version = "^2.3", optional = true } thiserror = "^1.0" [dev-dependencies] assert_matches = "1.5.0" -solana-program-test = "~2.0" -solana-sdk = "~2.0" +solana-program-test = "~2.3" +solana-sdk = "~2.3" diff --git a/clients/rust/src/generated/errors/mod.rs b/clients/rust/src/generated/errors/mod.rs index 05ea2cd..d698264 100644 --- a/clients/rust/src/generated/errors/mod.rs +++ b/clients/rust/src/generated/errors/mod.rs @@ -1,5 +1,5 @@ -//! This code was AUTOGENERATED using the kinobi library. +//! This code was AUTOGENERATED using the codama library. //! Please DO NOT EDIT THIS FILE, instead use visitors -//! to add features, then rerun kinobi to update it. +//! to add features, then rerun codama to update it. //! -//! +//! diff --git a/clients/rust/src/generated/instructions/close.rs b/clients/rust/src/generated/instructions/close.rs index c78a575..3d782a0 100644 --- a/clients/rust/src/generated/instructions/close.rs +++ b/clients/rust/src/generated/instructions/close.rs @@ -1,58 +1,62 @@ -//! This code was AUTOGENERATED using the kinobi library. +//! This code was AUTOGENERATED using the codama library. //! Please DO NOT EDIT THIS FILE, instead use visitors -//! to add features, then rerun kinobi to update it. +//! to add features, then rerun codama to update it. //! -//! +//! use borsh::{BorshDeserialize, BorshSerialize}; +pub const CLOSE_DISCRIMINATOR: u32 = 5; + /// Accounts. +#[derive(Debug)] pub struct Close { /// Buffer or ProgramData account to close. - pub buffer_or_program_data_account: solana_program::pubkey::Pubkey, + pub buffer_or_program_data_account: solana_pubkey::Pubkey, /// Destination account for reclaimed lamports. - pub destination_account: solana_program::pubkey::Pubkey, + pub destination_account: solana_pubkey::Pubkey, /// Authority (optional). - pub authority: Option, + pub authority: Option, /// Program account (optional). - pub program_account: Option, + pub program_account: Option, } impl Close { - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { self.instruction_with_remaining_accounts(&[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::vec_init_then_push)] pub fn instruction_with_remaining_accounts( &self, - remaining_accounts: &[solana_program::instruction::AccountMeta], - ) -> solana_program::instruction::Instruction { + remaining_accounts: &[solana_instruction::AccountMeta], + ) -> solana_instruction::Instruction { let mut accounts = Vec::with_capacity(4 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.buffer_or_program_data_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.destination_account, false, )); if let Some(authority) = self.authority { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( authority, true, )); } else { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( crate::LOADER_V3_ID, false, )); } if let Some(program_account) = self.program_account { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( program_account, false, )); } else { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( crate::LOADER_V3_ID, false, )); @@ -60,7 +64,7 @@ impl Close { accounts.extend_from_slice(remaining_accounts); let data = CloseInstructionData::new().try_to_vec().unwrap(); - solana_program::instruction::Instruction { + solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, @@ -68,7 +72,8 @@ impl Close { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct CloseInstructionData { discriminator: u32, } @@ -77,6 +82,10 @@ impl CloseInstructionData { pub fn new() -> Self { Self { discriminator: 5 } } + + pub(crate) fn try_to_vec(&self) -> Result, std::io::Error> { + borsh::to_vec(self) + } } impl Default for CloseInstructionData { @@ -95,11 +104,11 @@ impl Default for CloseInstructionData { /// 3. `[optional]` program_account #[derive(Clone, Debug, Default)] pub struct CloseBuilder { - buffer_or_program_data_account: Option, - destination_account: Option, - authority: Option, - program_account: Option, - __remaining_accounts: Vec, + buffer_or_program_data_account: Option, + destination_account: Option, + authority: Option, + program_account: Option, + __remaining_accounts: Vec, } impl CloseBuilder { @@ -110,43 +119,34 @@ impl CloseBuilder { #[inline(always)] pub fn buffer_or_program_data_account( &mut self, - buffer_or_program_data_account: solana_program::pubkey::Pubkey, + buffer_or_program_data_account: solana_pubkey::Pubkey, ) -> &mut Self { self.buffer_or_program_data_account = Some(buffer_or_program_data_account); self } /// Destination account for reclaimed lamports. #[inline(always)] - pub fn destination_account( - &mut self, - destination_account: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn destination_account(&mut self, destination_account: solana_pubkey::Pubkey) -> &mut Self { self.destination_account = Some(destination_account); self } /// `[optional account]` /// Authority (optional). #[inline(always)] - pub fn authority(&mut self, authority: Option) -> &mut Self { + pub fn authority(&mut self, authority: Option) -> &mut Self { self.authority = authority; self } /// `[optional account]` /// Program account (optional). #[inline(always)] - pub fn program_account( - &mut self, - program_account: Option, - ) -> &mut Self { + pub fn program_account(&mut self, program_account: Option) -> &mut Self { self.program_account = program_account; self } - /// Add an aditional account to the instruction. + /// Add an additional account to the instruction. #[inline(always)] - pub fn add_remaining_account( - &mut self, - account: solana_program::instruction::AccountMeta, - ) -> &mut Self { + pub fn add_remaining_account(&mut self, account: solana_instruction::AccountMeta) -> &mut Self { self.__remaining_accounts.push(account); self } @@ -154,13 +154,13 @@ impl CloseBuilder { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[solana_program::instruction::AccountMeta], + accounts: &[solana_instruction::AccountMeta], ) -> &mut Self { self.__remaining_accounts.extend_from_slice(accounts); self } #[allow(clippy::clone_on_copy)] - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { let accounts = Close { buffer_or_program_data_account: self .buffer_or_program_data_account @@ -179,32 +179,32 @@ impl CloseBuilder { /// `close` CPI accounts. pub struct CloseCpiAccounts<'a, 'b> { /// Buffer or ProgramData account to close. - pub buffer_or_program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_or_program_data_account: &'b solana_account_info::AccountInfo<'a>, /// Destination account for reclaimed lamports. - pub destination_account: &'b solana_program::account_info::AccountInfo<'a>, + pub destination_account: &'b solana_account_info::AccountInfo<'a>, /// Authority (optional). - pub authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, + pub authority: Option<&'b solana_account_info::AccountInfo<'a>>, /// Program account (optional). - pub program_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, + pub program_account: Option<&'b solana_account_info::AccountInfo<'a>>, } /// `close` CPI instruction. pub struct CloseCpi<'a, 'b> { /// The program to invoke. - pub __program: &'b solana_program::account_info::AccountInfo<'a>, + pub __program: &'b solana_account_info::AccountInfo<'a>, /// Buffer or ProgramData account to close. - pub buffer_or_program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_or_program_data_account: &'b solana_account_info::AccountInfo<'a>, /// Destination account for reclaimed lamports. - pub destination_account: &'b solana_program::account_info::AccountInfo<'a>, + pub destination_account: &'b solana_account_info::AccountInfo<'a>, /// Authority (optional). - pub authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, + pub authority: Option<&'b solana_account_info::AccountInfo<'a>>, /// Program account (optional). - pub program_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, + pub program_account: Option<&'b solana_account_info::AccountInfo<'a>>, } impl<'a, 'b> CloseCpi<'a, 'b> { pub fn new( - program: &'b solana_program::account_info::AccountInfo<'a>, + program: &'b solana_account_info::AccountInfo<'a>, accounts: CloseCpiAccounts<'a, 'b>, ) -> Self { Self { @@ -216,71 +216,61 @@ impl<'a, 'b> CloseCpi<'a, 'b> { } } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], &[]) } #[inline(always)] pub fn invoke_with_remaining_accounts( &self, - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], remaining_accounts) } #[inline(always)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(signers_seeds, &[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] pub fn invoke_signed_with_remaining_accounts( &self, signers_seeds: &[&[&[u8]]], - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { let mut accounts = Vec::with_capacity(4 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.buffer_or_program_data_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.destination_account.key, false, )); if let Some(authority) = self.authority { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *authority.key, true, )); } else { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( crate::LOADER_V3_ID, false, )); } if let Some(program_account) = self.program_account { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *program_account.key, false, )); } else { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( crate::LOADER_V3_ID, false, )); } remaining_accounts.iter().for_each(|remaining_account| { - accounts.push(solana_program::instruction::AccountMeta { + accounts.push(solana_instruction::AccountMeta { pubkey: *remaining_account.0.key, is_signer: remaining_account.1, is_writable: remaining_account.2, @@ -288,12 +278,12 @@ impl<'a, 'b> CloseCpi<'a, 'b> { }); let data = CloseInstructionData::new().try_to_vec().unwrap(); - let instruction = solana_program::instruction::Instruction { + let instruction = solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, }; - let mut account_infos = Vec::with_capacity(4 + 1 + remaining_accounts.len()); + let mut account_infos = Vec::with_capacity(5 + remaining_accounts.len()); account_infos.push(self.__program.clone()); account_infos.push(self.buffer_or_program_data_account.clone()); account_infos.push(self.destination_account.clone()); @@ -308,9 +298,9 @@ impl<'a, 'b> CloseCpi<'a, 'b> { .for_each(|remaining_account| account_infos.push(remaining_account.0.clone())); if signers_seeds.is_empty() { - solana_program::program::invoke(&instruction, &account_infos) + solana_cpi::invoke(&instruction, &account_infos) } else { - solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds) + solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds) } } } @@ -329,7 +319,7 @@ pub struct CloseCpiBuilder<'a, 'b> { } impl<'a, 'b> CloseCpiBuilder<'a, 'b> { - pub fn new(program: &'b solana_program::account_info::AccountInfo<'a>) -> Self { + pub fn new(program: &'b solana_account_info::AccountInfo<'a>) -> Self { let instruction = Box::new(CloseCpiBuilderInstruction { __program: program, buffer_or_program_data_account: None, @@ -344,7 +334,7 @@ impl<'a, 'b> CloseCpiBuilder<'a, 'b> { #[inline(always)] pub fn buffer_or_program_data_account( &mut self, - buffer_or_program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + buffer_or_program_data_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.buffer_or_program_data_account = Some(buffer_or_program_data_account); self @@ -353,7 +343,7 @@ impl<'a, 'b> CloseCpiBuilder<'a, 'b> { #[inline(always)] pub fn destination_account( &mut self, - destination_account: &'b solana_program::account_info::AccountInfo<'a>, + destination_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.destination_account = Some(destination_account); self @@ -363,7 +353,7 @@ impl<'a, 'b> CloseCpiBuilder<'a, 'b> { #[inline(always)] pub fn authority( &mut self, - authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, + authority: Option<&'b solana_account_info::AccountInfo<'a>>, ) -> &mut Self { self.instruction.authority = authority; self @@ -373,7 +363,7 @@ impl<'a, 'b> CloseCpiBuilder<'a, 'b> { #[inline(always)] pub fn program_account( &mut self, - program_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, + program_account: Option<&'b solana_account_info::AccountInfo<'a>>, ) -> &mut Self { self.instruction.program_account = program_account; self @@ -382,7 +372,7 @@ impl<'a, 'b> CloseCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_account( &mut self, - account: &'b solana_program::account_info::AccountInfo<'a>, + account: &'b solana_account_info::AccountInfo<'a>, is_writable: bool, is_signer: bool, ) -> &mut Self { @@ -399,11 +389,7 @@ impl<'a, 'b> CloseCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], + accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], ) -> &mut Self { self.instruction .__remaining_accounts @@ -411,15 +397,12 @@ impl<'a, 'b> CloseCpiBuilder<'a, 'b> { self } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed(&[]) } #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { let instruction = CloseCpi { __program: self.instruction.__program, @@ -446,15 +429,11 @@ impl<'a, 'b> CloseCpiBuilder<'a, 'b> { #[derive(Clone, Debug)] struct CloseCpiBuilderInstruction<'a, 'b> { - __program: &'b solana_program::account_info::AccountInfo<'a>, - buffer_or_program_data_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - destination_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, - program_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, + __program: &'b solana_account_info::AccountInfo<'a>, + buffer_or_program_data_account: Option<&'b solana_account_info::AccountInfo<'a>>, + destination_account: Option<&'b solana_account_info::AccountInfo<'a>>, + authority: Option<&'b solana_account_info::AccountInfo<'a>>, + program_account: Option<&'b solana_account_info::AccountInfo<'a>>, /// Additional instruction accounts `(AccountInfo, is_writable, is_signer)`. - __remaining_accounts: Vec<( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )>, + __remaining_accounts: Vec<(&'b solana_account_info::AccountInfo<'a>, bool, bool)>, } diff --git a/clients/rust/src/generated/instructions/deploy_with_max_data_len.rs b/clients/rust/src/generated/instructions/deploy_with_max_data_len.rs index 0da3d6c..f2e7631 100644 --- a/clients/rust/src/generated/instructions/deploy_with_max_data_len.rs +++ b/clients/rust/src/generated/instructions/deploy_with_max_data_len.rs @@ -1,74 +1,78 @@ -//! This code was AUTOGENERATED using the kinobi library. +//! This code was AUTOGENERATED using the codama library. //! Please DO NOT EDIT THIS FILE, instead use visitors -//! to add features, then rerun kinobi to update it. +//! to add features, then rerun codama to update it. //! -//! +//! use borsh::{BorshDeserialize, BorshSerialize}; +pub const DEPLOY_WITH_MAX_DATA_LEN_DISCRIMINATOR: u32 = 2; + /// Accounts. +#[derive(Debug)] pub struct DeployWithMaxDataLen { /// Payer account that will pay to create the ProgramData account. - pub payer_account: solana_program::pubkey::Pubkey, + pub payer_account: solana_pubkey::Pubkey, /// ProgramData account (uninitialized). - pub program_data_account: solana_program::pubkey::Pubkey, + pub program_data_account: solana_pubkey::Pubkey, /// Program account (uninitialized). - pub program_account: solana_program::pubkey::Pubkey, + pub program_account: solana_pubkey::Pubkey, /// Buffer account where the program data has been written. - pub buffer_account: solana_program::pubkey::Pubkey, + pub buffer_account: solana_pubkey::Pubkey, /// Rent sysvar. - pub rent_sysvar: solana_program::pubkey::Pubkey, + pub rent_sysvar: solana_pubkey::Pubkey, /// Clock sysvar. - pub clock_sysvar: solana_program::pubkey::Pubkey, + pub clock_sysvar: solana_pubkey::Pubkey, /// System program. - pub system_program: solana_program::pubkey::Pubkey, + pub system_program: solana_pubkey::Pubkey, /// Authority. - pub authority: solana_program::pubkey::Pubkey, + pub authority: solana_pubkey::Pubkey, } impl DeployWithMaxDataLen { pub fn instruction( &self, args: DeployWithMaxDataLenInstructionArgs, - ) -> solana_program::instruction::Instruction { + ) -> solana_instruction::Instruction { self.instruction_with_remaining_accounts(args, &[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::vec_init_then_push)] pub fn instruction_with_remaining_accounts( &self, args: DeployWithMaxDataLenInstructionArgs, - remaining_accounts: &[solana_program::instruction::AccountMeta], - ) -> solana_program::instruction::Instruction { + remaining_accounts: &[solana_instruction::AccountMeta], + ) -> solana_instruction::Instruction { let mut accounts = Vec::with_capacity(8 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.payer_account, true, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.program_data_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.program_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.buffer_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( self.rent_sysvar, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( self.clock_sysvar, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( self.system_program, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( self.authority, true, )); @@ -79,7 +83,7 @@ impl DeployWithMaxDataLen { let mut args = args.try_to_vec().unwrap(); data.append(&mut args); - solana_program::instruction::Instruction { + solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, @@ -87,7 +91,8 @@ impl DeployWithMaxDataLen { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct DeployWithMaxDataLenInstructionData { discriminator: u32, } @@ -96,6 +101,10 @@ impl DeployWithMaxDataLenInstructionData { pub fn new() -> Self { Self { discriminator: 2 } } + + pub(crate) fn try_to_vec(&self) -> Result, std::io::Error> { + borsh::to_vec(self) + } } impl Default for DeployWithMaxDataLenInstructionData { @@ -110,6 +119,12 @@ pub struct DeployWithMaxDataLenInstructionArgs { pub max_data_len: u64, } +impl DeployWithMaxDataLenInstructionArgs { + pub(crate) fn try_to_vec(&self) -> Result, std::io::Error> { + borsh::to_vec(self) + } +} + /// Instruction builder for `DeployWithMaxDataLen`. /// /// ### Accounts: @@ -127,16 +142,16 @@ pub struct DeployWithMaxDataLenInstructionArgs { /// 7. `[signer]` authority #[derive(Clone, Debug, Default)] pub struct DeployWithMaxDataLenBuilder { - payer_account: Option, - program_data_account: Option, - program_account: Option, - buffer_account: Option, - rent_sysvar: Option, - clock_sysvar: Option, - system_program: Option, - authority: Option, + payer_account: Option, + program_data_account: Option, + program_account: Option, + buffer_account: Option, + rent_sysvar: Option, + clock_sysvar: Option, + system_program: Option, + authority: Option, max_data_len: Option, - __remaining_accounts: Vec, + __remaining_accounts: Vec, } impl DeployWithMaxDataLenBuilder { @@ -145,7 +160,7 @@ impl DeployWithMaxDataLenBuilder { } /// Payer account that will pay to create the ProgramData account. #[inline(always)] - pub fn payer_account(&mut self, payer_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn payer_account(&mut self, payer_account: solana_pubkey::Pubkey) -> &mut Self { self.payer_account = Some(payer_account); self } @@ -153,50 +168,47 @@ impl DeployWithMaxDataLenBuilder { #[inline(always)] pub fn program_data_account( &mut self, - program_data_account: solana_program::pubkey::Pubkey, + program_data_account: solana_pubkey::Pubkey, ) -> &mut Self { self.program_data_account = Some(program_data_account); self } /// Program account (uninitialized). #[inline(always)] - pub fn program_account( - &mut self, - program_account: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn program_account(&mut self, program_account: solana_pubkey::Pubkey) -> &mut Self { self.program_account = Some(program_account); self } /// Buffer account where the program data has been written. #[inline(always)] - pub fn buffer_account(&mut self, buffer_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn buffer_account(&mut self, buffer_account: solana_pubkey::Pubkey) -> &mut Self { self.buffer_account = Some(buffer_account); self } /// `[optional account, default to /// 'SysvarRent111111111111111111111111111111111']` Rent sysvar. #[inline(always)] - pub fn rent_sysvar(&mut self, rent_sysvar: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn rent_sysvar(&mut self, rent_sysvar: solana_pubkey::Pubkey) -> &mut Self { self.rent_sysvar = Some(rent_sysvar); self } /// `[optional account, default to /// 'SysvarC1ock11111111111111111111111111111111']` Clock sysvar. #[inline(always)] - pub fn clock_sysvar(&mut self, clock_sysvar: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn clock_sysvar(&mut self, clock_sysvar: solana_pubkey::Pubkey) -> &mut Self { self.clock_sysvar = Some(clock_sysvar); self } /// `[optional account, default to '11111111111111111111111111111111']` /// System program. #[inline(always)] - pub fn system_program(&mut self, system_program: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn system_program(&mut self, system_program: solana_pubkey::Pubkey) -> &mut Self { self.system_program = Some(system_program); self } /// Authority. #[inline(always)] - pub fn authority(&mut self, authority: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn authority(&mut self, authority: solana_pubkey::Pubkey) -> &mut Self { self.authority = Some(authority); self } @@ -205,12 +217,9 @@ impl DeployWithMaxDataLenBuilder { self.max_data_len = Some(max_data_len); self } - /// Add an aditional account to the instruction. + /// Add an additional account to the instruction. #[inline(always)] - pub fn add_remaining_account( - &mut self, - account: solana_program::instruction::AccountMeta, - ) -> &mut Self { + pub fn add_remaining_account(&mut self, account: solana_instruction::AccountMeta) -> &mut Self { self.__remaining_accounts.push(account); self } @@ -218,13 +227,13 @@ impl DeployWithMaxDataLenBuilder { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[solana_program::instruction::AccountMeta], + accounts: &[solana_instruction::AccountMeta], ) -> &mut Self { self.__remaining_accounts.extend_from_slice(accounts); self } #[allow(clippy::clone_on_copy)] - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { let accounts = DeployWithMaxDataLen { payer_account: self.payer_account.expect("payer_account is not set"), program_data_account: self @@ -232,15 +241,15 @@ impl DeployWithMaxDataLenBuilder { .expect("program_data_account is not set"), program_account: self.program_account.expect("program_account is not set"), buffer_account: self.buffer_account.expect("buffer_account is not set"), - rent_sysvar: self.rent_sysvar.unwrap_or(solana_program::pubkey!( + rent_sysvar: self.rent_sysvar.unwrap_or(solana_pubkey::pubkey!( "SysvarRent111111111111111111111111111111111" )), - clock_sysvar: self.clock_sysvar.unwrap_or(solana_program::pubkey!( + clock_sysvar: self.clock_sysvar.unwrap_or(solana_pubkey::pubkey!( "SysvarC1ock11111111111111111111111111111111" )), system_program: self .system_program - .unwrap_or(solana_program::pubkey!("11111111111111111111111111111111")), + .unwrap_or(solana_pubkey::pubkey!("11111111111111111111111111111111")), authority: self.authority.expect("authority is not set"), }; let args = DeployWithMaxDataLenInstructionArgs { @@ -254,50 +263,50 @@ impl DeployWithMaxDataLenBuilder { /// `deploy_with_max_data_len` CPI accounts. pub struct DeployWithMaxDataLenCpiAccounts<'a, 'b> { /// Payer account that will pay to create the ProgramData account. - pub payer_account: &'b solana_program::account_info::AccountInfo<'a>, + pub payer_account: &'b solana_account_info::AccountInfo<'a>, /// ProgramData account (uninitialized). - pub program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + pub program_data_account: &'b solana_account_info::AccountInfo<'a>, /// Program account (uninitialized). - pub program_account: &'b solana_program::account_info::AccountInfo<'a>, + pub program_account: &'b solana_account_info::AccountInfo<'a>, /// Buffer account where the program data has been written. - pub buffer_account: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_account: &'b solana_account_info::AccountInfo<'a>, /// Rent sysvar. - pub rent_sysvar: &'b solana_program::account_info::AccountInfo<'a>, + pub rent_sysvar: &'b solana_account_info::AccountInfo<'a>, /// Clock sysvar. - pub clock_sysvar: &'b solana_program::account_info::AccountInfo<'a>, + pub clock_sysvar: &'b solana_account_info::AccountInfo<'a>, /// System program. - pub system_program: &'b solana_program::account_info::AccountInfo<'a>, + pub system_program: &'b solana_account_info::AccountInfo<'a>, /// Authority. - pub authority: &'b solana_program::account_info::AccountInfo<'a>, + pub authority: &'b solana_account_info::AccountInfo<'a>, } /// `deploy_with_max_data_len` CPI instruction. pub struct DeployWithMaxDataLenCpi<'a, 'b> { /// The program to invoke. - pub __program: &'b solana_program::account_info::AccountInfo<'a>, + pub __program: &'b solana_account_info::AccountInfo<'a>, /// Payer account that will pay to create the ProgramData account. - pub payer_account: &'b solana_program::account_info::AccountInfo<'a>, + pub payer_account: &'b solana_account_info::AccountInfo<'a>, /// ProgramData account (uninitialized). - pub program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + pub program_data_account: &'b solana_account_info::AccountInfo<'a>, /// Program account (uninitialized). - pub program_account: &'b solana_program::account_info::AccountInfo<'a>, + pub program_account: &'b solana_account_info::AccountInfo<'a>, /// Buffer account where the program data has been written. - pub buffer_account: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_account: &'b solana_account_info::AccountInfo<'a>, /// Rent sysvar. - pub rent_sysvar: &'b solana_program::account_info::AccountInfo<'a>, + pub rent_sysvar: &'b solana_account_info::AccountInfo<'a>, /// Clock sysvar. - pub clock_sysvar: &'b solana_program::account_info::AccountInfo<'a>, + pub clock_sysvar: &'b solana_account_info::AccountInfo<'a>, /// System program. - pub system_program: &'b solana_program::account_info::AccountInfo<'a>, + pub system_program: &'b solana_account_info::AccountInfo<'a>, /// Authority. - pub authority: &'b solana_program::account_info::AccountInfo<'a>, + pub authority: &'b solana_account_info::AccountInfo<'a>, /// The arguments for the instruction. pub __args: DeployWithMaxDataLenInstructionArgs, } impl<'a, 'b> DeployWithMaxDataLenCpi<'a, 'b> { pub fn new( - program: &'b solana_program::account_info::AccountInfo<'a>, + program: &'b solana_account_info::AccountInfo<'a>, accounts: DeployWithMaxDataLenCpiAccounts<'a, 'b>, args: DeployWithMaxDataLenInstructionArgs, ) -> Self { @@ -315,73 +324,63 @@ impl<'a, 'b> DeployWithMaxDataLenCpi<'a, 'b> { } } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], &[]) } #[inline(always)] pub fn invoke_with_remaining_accounts( &self, - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], remaining_accounts) } #[inline(always)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(signers_seeds, &[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] pub fn invoke_signed_with_remaining_accounts( &self, signers_seeds: &[&[&[u8]]], - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { let mut accounts = Vec::with_capacity(8 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.payer_account.key, true, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.program_data_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.program_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.buffer_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *self.rent_sysvar.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *self.clock_sysvar.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *self.system_program.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *self.authority.key, true, )); remaining_accounts.iter().for_each(|remaining_account| { - accounts.push(solana_program::instruction::AccountMeta { + accounts.push(solana_instruction::AccountMeta { pubkey: *remaining_account.0.key, is_signer: remaining_account.1, is_writable: remaining_account.2, @@ -393,12 +392,12 @@ impl<'a, 'b> DeployWithMaxDataLenCpi<'a, 'b> { let mut args = self.__args.try_to_vec().unwrap(); data.append(&mut args); - let instruction = solana_program::instruction::Instruction { + let instruction = solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, }; - let mut account_infos = Vec::with_capacity(8 + 1 + remaining_accounts.len()); + let mut account_infos = Vec::with_capacity(9 + remaining_accounts.len()); account_infos.push(self.__program.clone()); account_infos.push(self.payer_account.clone()); account_infos.push(self.program_data_account.clone()); @@ -413,9 +412,9 @@ impl<'a, 'b> DeployWithMaxDataLenCpi<'a, 'b> { .for_each(|remaining_account| account_infos.push(remaining_account.0.clone())); if signers_seeds.is_empty() { - solana_program::program::invoke(&instruction, &account_infos) + solana_cpi::invoke(&instruction, &account_infos) } else { - solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds) + solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds) } } } @@ -438,7 +437,7 @@ pub struct DeployWithMaxDataLenCpiBuilder<'a, 'b> { } impl<'a, 'b> DeployWithMaxDataLenCpiBuilder<'a, 'b> { - pub fn new(program: &'b solana_program::account_info::AccountInfo<'a>) -> Self { + pub fn new(program: &'b solana_account_info::AccountInfo<'a>) -> Self { let instruction = Box::new(DeployWithMaxDataLenCpiBuilderInstruction { __program: program, payer_account: None, @@ -458,7 +457,7 @@ impl<'a, 'b> DeployWithMaxDataLenCpiBuilder<'a, 'b> { #[inline(always)] pub fn payer_account( &mut self, - payer_account: &'b solana_program::account_info::AccountInfo<'a>, + payer_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.payer_account = Some(payer_account); self @@ -467,7 +466,7 @@ impl<'a, 'b> DeployWithMaxDataLenCpiBuilder<'a, 'b> { #[inline(always)] pub fn program_data_account( &mut self, - program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + program_data_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.program_data_account = Some(program_data_account); self @@ -476,7 +475,7 @@ impl<'a, 'b> DeployWithMaxDataLenCpiBuilder<'a, 'b> { #[inline(always)] pub fn program_account( &mut self, - program_account: &'b solana_program::account_info::AccountInfo<'a>, + program_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.program_account = Some(program_account); self @@ -485,7 +484,7 @@ impl<'a, 'b> DeployWithMaxDataLenCpiBuilder<'a, 'b> { #[inline(always)] pub fn buffer_account( &mut self, - buffer_account: &'b solana_program::account_info::AccountInfo<'a>, + buffer_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.buffer_account = Some(buffer_account); self @@ -494,7 +493,7 @@ impl<'a, 'b> DeployWithMaxDataLenCpiBuilder<'a, 'b> { #[inline(always)] pub fn rent_sysvar( &mut self, - rent_sysvar: &'b solana_program::account_info::AccountInfo<'a>, + rent_sysvar: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.rent_sysvar = Some(rent_sysvar); self @@ -503,7 +502,7 @@ impl<'a, 'b> DeployWithMaxDataLenCpiBuilder<'a, 'b> { #[inline(always)] pub fn clock_sysvar( &mut self, - clock_sysvar: &'b solana_program::account_info::AccountInfo<'a>, + clock_sysvar: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.clock_sysvar = Some(clock_sysvar); self @@ -512,17 +511,14 @@ impl<'a, 'b> DeployWithMaxDataLenCpiBuilder<'a, 'b> { #[inline(always)] pub fn system_program( &mut self, - system_program: &'b solana_program::account_info::AccountInfo<'a>, + system_program: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.system_program = Some(system_program); self } /// Authority. #[inline(always)] - pub fn authority( - &mut self, - authority: &'b solana_program::account_info::AccountInfo<'a>, - ) -> &mut Self { + pub fn authority(&mut self, authority: &'b solana_account_info::AccountInfo<'a>) -> &mut Self { self.instruction.authority = Some(authority); self } @@ -535,7 +531,7 @@ impl<'a, 'b> DeployWithMaxDataLenCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_account( &mut self, - account: &'b solana_program::account_info::AccountInfo<'a>, + account: &'b solana_account_info::AccountInfo<'a>, is_writable: bool, is_signer: bool, ) -> &mut Self { @@ -552,11 +548,7 @@ impl<'a, 'b> DeployWithMaxDataLenCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], + accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], ) -> &mut Self { self.instruction .__remaining_accounts @@ -564,15 +556,12 @@ impl<'a, 'b> DeployWithMaxDataLenCpiBuilder<'a, 'b> { self } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed(&[]) } #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { let args = DeployWithMaxDataLenInstructionArgs { max_data_len: self .instruction @@ -630,20 +619,16 @@ impl<'a, 'b> DeployWithMaxDataLenCpiBuilder<'a, 'b> { #[derive(Clone, Debug)] struct DeployWithMaxDataLenCpiBuilderInstruction<'a, 'b> { - __program: &'b solana_program::account_info::AccountInfo<'a>, - payer_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - program_data_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - program_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - buffer_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - rent_sysvar: Option<&'b solana_program::account_info::AccountInfo<'a>>, - clock_sysvar: Option<&'b solana_program::account_info::AccountInfo<'a>>, - system_program: Option<&'b solana_program::account_info::AccountInfo<'a>>, - authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, + __program: &'b solana_account_info::AccountInfo<'a>, + payer_account: Option<&'b solana_account_info::AccountInfo<'a>>, + program_data_account: Option<&'b solana_account_info::AccountInfo<'a>>, + program_account: Option<&'b solana_account_info::AccountInfo<'a>>, + buffer_account: Option<&'b solana_account_info::AccountInfo<'a>>, + rent_sysvar: Option<&'b solana_account_info::AccountInfo<'a>>, + clock_sysvar: Option<&'b solana_account_info::AccountInfo<'a>>, + system_program: Option<&'b solana_account_info::AccountInfo<'a>>, + authority: Option<&'b solana_account_info::AccountInfo<'a>>, max_data_len: Option, /// Additional instruction accounts `(AccountInfo, is_writable, is_signer)`. - __remaining_accounts: Vec<( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )>, + __remaining_accounts: Vec<(&'b solana_account_info::AccountInfo<'a>, bool, bool)>, } diff --git a/clients/rust/src/generated/instructions/extend_program.rs b/clients/rust/src/generated/instructions/extend_program.rs index cd01b14..1061b20 100644 --- a/clients/rust/src/generated/instructions/extend_program.rs +++ b/clients/rust/src/generated/instructions/extend_program.rs @@ -1,60 +1,64 @@ -//! This code was AUTOGENERATED using the kinobi library. +//! This code was AUTOGENERATED using the codama library. //! Please DO NOT EDIT THIS FILE, instead use visitors -//! to add features, then rerun kinobi to update it. +//! to add features, then rerun codama to update it. //! -//! +//! use borsh::{BorshDeserialize, BorshSerialize}; +pub const EXTEND_PROGRAM_DISCRIMINATOR: u32 = 6; + /// Accounts. +#[derive(Debug)] pub struct ExtendProgram { /// ProgramData account. - pub program_data_account: solana_program::pubkey::Pubkey, + pub program_data_account: solana_pubkey::Pubkey, /// Program account. - pub program_account: solana_program::pubkey::Pubkey, + pub program_account: solana_pubkey::Pubkey, /// System program (optional). - pub system_program: Option, + pub system_program: Option, /// Payer. - pub payer: Option, + pub payer: Option, } impl ExtendProgram { pub fn instruction( &self, args: ExtendProgramInstructionArgs, - ) -> solana_program::instruction::Instruction { + ) -> solana_instruction::Instruction { self.instruction_with_remaining_accounts(args, &[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::vec_init_then_push)] pub fn instruction_with_remaining_accounts( &self, args: ExtendProgramInstructionArgs, - remaining_accounts: &[solana_program::instruction::AccountMeta], - ) -> solana_program::instruction::Instruction { + remaining_accounts: &[solana_instruction::AccountMeta], + ) -> solana_instruction::Instruction { let mut accounts = Vec::with_capacity(4 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.program_data_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.program_account, false, )); if let Some(system_program) = self.system_program { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( system_program, false, )); } else { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( crate::LOADER_V3_ID, false, )); } if let Some(payer) = self.payer { - accounts.push(solana_program::instruction::AccountMeta::new(payer, true)); + accounts.push(solana_instruction::AccountMeta::new(payer, true)); } else { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( crate::LOADER_V3_ID, false, )); @@ -64,7 +68,7 @@ impl ExtendProgram { let mut args = args.try_to_vec().unwrap(); data.append(&mut args); - solana_program::instruction::Instruction { + solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, @@ -72,7 +76,8 @@ impl ExtendProgram { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct ExtendProgramInstructionData { discriminator: u32, } @@ -81,6 +86,10 @@ impl ExtendProgramInstructionData { pub fn new() -> Self { Self { discriminator: 6 } } + + pub(crate) fn try_to_vec(&self) -> Result, std::io::Error> { + borsh::to_vec(self) + } } impl Default for ExtendProgramInstructionData { @@ -95,6 +104,12 @@ pub struct ExtendProgramInstructionArgs { pub additional_bytes: u32, } +impl ExtendProgramInstructionArgs { + pub(crate) fn try_to_vec(&self) -> Result, std::io::Error> { + borsh::to_vec(self) + } +} + /// Instruction builder for `ExtendProgram`. /// /// ### Accounts: @@ -105,12 +120,12 @@ pub struct ExtendProgramInstructionArgs { /// 3. `[writable, signer, optional]` payer #[derive(Clone, Debug, Default)] pub struct ExtendProgramBuilder { - program_data_account: Option, - program_account: Option, - system_program: Option, - payer: Option, + program_data_account: Option, + program_account: Option, + system_program: Option, + payer: Option, additional_bytes: Option, - __remaining_accounts: Vec, + __remaining_accounts: Vec, } impl ExtendProgramBuilder { @@ -121,34 +136,28 @@ impl ExtendProgramBuilder { #[inline(always)] pub fn program_data_account( &mut self, - program_data_account: solana_program::pubkey::Pubkey, + program_data_account: solana_pubkey::Pubkey, ) -> &mut Self { self.program_data_account = Some(program_data_account); self } /// Program account. #[inline(always)] - pub fn program_account( - &mut self, - program_account: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn program_account(&mut self, program_account: solana_pubkey::Pubkey) -> &mut Self { self.program_account = Some(program_account); self } /// `[optional account]` /// System program (optional). #[inline(always)] - pub fn system_program( - &mut self, - system_program: Option, - ) -> &mut Self { + pub fn system_program(&mut self, system_program: Option) -> &mut Self { self.system_program = system_program; self } /// `[optional account]` /// Payer. #[inline(always)] - pub fn payer(&mut self, payer: Option) -> &mut Self { + pub fn payer(&mut self, payer: Option) -> &mut Self { self.payer = payer; self } @@ -157,12 +166,9 @@ impl ExtendProgramBuilder { self.additional_bytes = Some(additional_bytes); self } - /// Add an aditional account to the instruction. + /// Add an additional account to the instruction. #[inline(always)] - pub fn add_remaining_account( - &mut self, - account: solana_program::instruction::AccountMeta, - ) -> &mut Self { + pub fn add_remaining_account(&mut self, account: solana_instruction::AccountMeta) -> &mut Self { self.__remaining_accounts.push(account); self } @@ -170,13 +176,13 @@ impl ExtendProgramBuilder { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[solana_program::instruction::AccountMeta], + accounts: &[solana_instruction::AccountMeta], ) -> &mut Self { self.__remaining_accounts.extend_from_slice(accounts); self } #[allow(clippy::clone_on_copy)] - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { let accounts = ExtendProgram { program_data_account: self .program_data_account @@ -199,34 +205,34 @@ impl ExtendProgramBuilder { /// `extend_program` CPI accounts. pub struct ExtendProgramCpiAccounts<'a, 'b> { /// ProgramData account. - pub program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + pub program_data_account: &'b solana_account_info::AccountInfo<'a>, /// Program account. - pub program_account: &'b solana_program::account_info::AccountInfo<'a>, + pub program_account: &'b solana_account_info::AccountInfo<'a>, /// System program (optional). - pub system_program: Option<&'b solana_program::account_info::AccountInfo<'a>>, + pub system_program: Option<&'b solana_account_info::AccountInfo<'a>>, /// Payer. - pub payer: Option<&'b solana_program::account_info::AccountInfo<'a>>, + pub payer: Option<&'b solana_account_info::AccountInfo<'a>>, } /// `extend_program` CPI instruction. pub struct ExtendProgramCpi<'a, 'b> { /// The program to invoke. - pub __program: &'b solana_program::account_info::AccountInfo<'a>, + pub __program: &'b solana_account_info::AccountInfo<'a>, /// ProgramData account. - pub program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + pub program_data_account: &'b solana_account_info::AccountInfo<'a>, /// Program account. - pub program_account: &'b solana_program::account_info::AccountInfo<'a>, + pub program_account: &'b solana_account_info::AccountInfo<'a>, /// System program (optional). - pub system_program: Option<&'b solana_program::account_info::AccountInfo<'a>>, + pub system_program: Option<&'b solana_account_info::AccountInfo<'a>>, /// Payer. - pub payer: Option<&'b solana_program::account_info::AccountInfo<'a>>, + pub payer: Option<&'b solana_account_info::AccountInfo<'a>>, /// The arguments for the instruction. pub __args: ExtendProgramInstructionArgs, } impl<'a, 'b> ExtendProgramCpi<'a, 'b> { pub fn new( - program: &'b solana_program::account_info::AccountInfo<'a>, + program: &'b solana_account_info::AccountInfo<'a>, accounts: ExtendProgramCpiAccounts<'a, 'b>, args: ExtendProgramInstructionArgs, ) -> Self { @@ -240,70 +246,58 @@ impl<'a, 'b> ExtendProgramCpi<'a, 'b> { } } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], &[]) } #[inline(always)] pub fn invoke_with_remaining_accounts( &self, - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], remaining_accounts) } #[inline(always)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(signers_seeds, &[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] pub fn invoke_signed_with_remaining_accounts( &self, signers_seeds: &[&[&[u8]]], - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { let mut accounts = Vec::with_capacity(4 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.program_data_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.program_account.key, false, )); if let Some(system_program) = self.system_program { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *system_program.key, false, )); } else { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( crate::LOADER_V3_ID, false, )); } if let Some(payer) = self.payer { - accounts.push(solana_program::instruction::AccountMeta::new( - *payer.key, true, - )); + accounts.push(solana_instruction::AccountMeta::new(*payer.key, true)); } else { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( crate::LOADER_V3_ID, false, )); } remaining_accounts.iter().for_each(|remaining_account| { - accounts.push(solana_program::instruction::AccountMeta { + accounts.push(solana_instruction::AccountMeta { pubkey: *remaining_account.0.key, is_signer: remaining_account.1, is_writable: remaining_account.2, @@ -313,12 +307,12 @@ impl<'a, 'b> ExtendProgramCpi<'a, 'b> { let mut args = self.__args.try_to_vec().unwrap(); data.append(&mut args); - let instruction = solana_program::instruction::Instruction { + let instruction = solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, }; - let mut account_infos = Vec::with_capacity(4 + 1 + remaining_accounts.len()); + let mut account_infos = Vec::with_capacity(5 + remaining_accounts.len()); account_infos.push(self.__program.clone()); account_infos.push(self.program_data_account.clone()); account_infos.push(self.program_account.clone()); @@ -333,9 +327,9 @@ impl<'a, 'b> ExtendProgramCpi<'a, 'b> { .for_each(|remaining_account| account_infos.push(remaining_account.0.clone())); if signers_seeds.is_empty() { - solana_program::program::invoke(&instruction, &account_infos) + solana_cpi::invoke(&instruction, &account_infos) } else { - solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds) + solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds) } } } @@ -354,7 +348,7 @@ pub struct ExtendProgramCpiBuilder<'a, 'b> { } impl<'a, 'b> ExtendProgramCpiBuilder<'a, 'b> { - pub fn new(program: &'b solana_program::account_info::AccountInfo<'a>) -> Self { + pub fn new(program: &'b solana_account_info::AccountInfo<'a>) -> Self { let instruction = Box::new(ExtendProgramCpiBuilderInstruction { __program: program, program_data_account: None, @@ -370,7 +364,7 @@ impl<'a, 'b> ExtendProgramCpiBuilder<'a, 'b> { #[inline(always)] pub fn program_data_account( &mut self, - program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + program_data_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.program_data_account = Some(program_data_account); self @@ -379,7 +373,7 @@ impl<'a, 'b> ExtendProgramCpiBuilder<'a, 'b> { #[inline(always)] pub fn program_account( &mut self, - program_account: &'b solana_program::account_info::AccountInfo<'a>, + program_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.program_account = Some(program_account); self @@ -389,7 +383,7 @@ impl<'a, 'b> ExtendProgramCpiBuilder<'a, 'b> { #[inline(always)] pub fn system_program( &mut self, - system_program: Option<&'b solana_program::account_info::AccountInfo<'a>>, + system_program: Option<&'b solana_account_info::AccountInfo<'a>>, ) -> &mut Self { self.instruction.system_program = system_program; self @@ -397,10 +391,7 @@ impl<'a, 'b> ExtendProgramCpiBuilder<'a, 'b> { /// `[optional account]` /// Payer. #[inline(always)] - pub fn payer( - &mut self, - payer: Option<&'b solana_program::account_info::AccountInfo<'a>>, - ) -> &mut Self { + pub fn payer(&mut self, payer: Option<&'b solana_account_info::AccountInfo<'a>>) -> &mut Self { self.instruction.payer = payer; self } @@ -413,7 +404,7 @@ impl<'a, 'b> ExtendProgramCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_account( &mut self, - account: &'b solana_program::account_info::AccountInfo<'a>, + account: &'b solana_account_info::AccountInfo<'a>, is_writable: bool, is_signer: bool, ) -> &mut Self { @@ -430,11 +421,7 @@ impl<'a, 'b> ExtendProgramCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], + accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], ) -> &mut Self { self.instruction .__remaining_accounts @@ -442,15 +429,12 @@ impl<'a, 'b> ExtendProgramCpiBuilder<'a, 'b> { self } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed(&[]) } #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { let args = ExtendProgramInstructionArgs { additional_bytes: self .instruction @@ -485,16 +469,12 @@ impl<'a, 'b> ExtendProgramCpiBuilder<'a, 'b> { #[derive(Clone, Debug)] struct ExtendProgramCpiBuilderInstruction<'a, 'b> { - __program: &'b solana_program::account_info::AccountInfo<'a>, - program_data_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - program_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - system_program: Option<&'b solana_program::account_info::AccountInfo<'a>>, - payer: Option<&'b solana_program::account_info::AccountInfo<'a>>, + __program: &'b solana_account_info::AccountInfo<'a>, + program_data_account: Option<&'b solana_account_info::AccountInfo<'a>>, + program_account: Option<&'b solana_account_info::AccountInfo<'a>>, + system_program: Option<&'b solana_account_info::AccountInfo<'a>>, + payer: Option<&'b solana_account_info::AccountInfo<'a>>, additional_bytes: Option, /// Additional instruction accounts `(AccountInfo, is_writable, is_signer)`. - __remaining_accounts: Vec<( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )>, + __remaining_accounts: Vec<(&'b solana_account_info::AccountInfo<'a>, bool, bool)>, } diff --git a/clients/rust/src/generated/instructions/initialize_buffer.rs b/clients/rust/src/generated/instructions/initialize_buffer.rs index 5de36ec..5b70f5c 100644 --- a/clients/rust/src/generated/instructions/initialize_buffer.rs +++ b/clients/rust/src/generated/instructions/initialize_buffer.rs @@ -1,41 +1,45 @@ -//! This code was AUTOGENERATED using the kinobi library. +//! This code was AUTOGENERATED using the codama library. //! Please DO NOT EDIT THIS FILE, instead use visitors -//! to add features, then rerun kinobi to update it. +//! to add features, then rerun codama to update it. //! -//! +//! use borsh::{BorshDeserialize, BorshSerialize}; +pub const INITIALIZE_BUFFER_DISCRIMINATOR: u32 = 0; + /// Accounts. +#[derive(Debug)] pub struct InitializeBuffer { /// Source account to initialize. - pub source_account: solana_program::pubkey::Pubkey, + pub source_account: solana_pubkey::Pubkey, /// Buffer authority. - pub buffer_authority: solana_program::pubkey::Pubkey, + pub buffer_authority: solana_pubkey::Pubkey, } impl InitializeBuffer { - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { self.instruction_with_remaining_accounts(&[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::vec_init_then_push)] pub fn instruction_with_remaining_accounts( &self, - remaining_accounts: &[solana_program::instruction::AccountMeta], - ) -> solana_program::instruction::Instruction { + remaining_accounts: &[solana_instruction::AccountMeta], + ) -> solana_instruction::Instruction { let mut accounts = Vec::with_capacity(2 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.source_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( self.buffer_authority, false, )); accounts.extend_from_slice(remaining_accounts); let data = InitializeBufferInstructionData::new().try_to_vec().unwrap(); - solana_program::instruction::Instruction { + solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, @@ -43,7 +47,8 @@ impl InitializeBuffer { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct InitializeBufferInstructionData { discriminator: u32, } @@ -52,6 +57,10 @@ impl InitializeBufferInstructionData { pub fn new() -> Self { Self { discriminator: 0 } } + + pub(crate) fn try_to_vec(&self) -> Result, std::io::Error> { + borsh::to_vec(self) + } } impl Default for InitializeBufferInstructionData { @@ -68,9 +77,9 @@ impl Default for InitializeBufferInstructionData { /// 1. `[]` buffer_authority #[derive(Clone, Debug, Default)] pub struct InitializeBufferBuilder { - source_account: Option, - buffer_authority: Option, - __remaining_accounts: Vec, + source_account: Option, + buffer_authority: Option, + __remaining_accounts: Vec, } impl InitializeBufferBuilder { @@ -79,25 +88,19 @@ impl InitializeBufferBuilder { } /// Source account to initialize. #[inline(always)] - pub fn source_account(&mut self, source_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn source_account(&mut self, source_account: solana_pubkey::Pubkey) -> &mut Self { self.source_account = Some(source_account); self } /// Buffer authority. #[inline(always)] - pub fn buffer_authority( - &mut self, - buffer_authority: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn buffer_authority(&mut self, buffer_authority: solana_pubkey::Pubkey) -> &mut Self { self.buffer_authority = Some(buffer_authority); self } - /// Add an aditional account to the instruction. + /// Add an additional account to the instruction. #[inline(always)] - pub fn add_remaining_account( - &mut self, - account: solana_program::instruction::AccountMeta, - ) -> &mut Self { + pub fn add_remaining_account(&mut self, account: solana_instruction::AccountMeta) -> &mut Self { self.__remaining_accounts.push(account); self } @@ -105,13 +108,13 @@ impl InitializeBufferBuilder { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[solana_program::instruction::AccountMeta], + accounts: &[solana_instruction::AccountMeta], ) -> &mut Self { self.__remaining_accounts.extend_from_slice(accounts); self } #[allow(clippy::clone_on_copy)] - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { let accounts = InitializeBuffer { source_account: self.source_account.expect("source_account is not set"), buffer_authority: self.buffer_authority.expect("buffer_authority is not set"), @@ -124,24 +127,24 @@ impl InitializeBufferBuilder { /// `initialize_buffer` CPI accounts. pub struct InitializeBufferCpiAccounts<'a, 'b> { /// Source account to initialize. - pub source_account: &'b solana_program::account_info::AccountInfo<'a>, + pub source_account: &'b solana_account_info::AccountInfo<'a>, /// Buffer authority. - pub buffer_authority: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_authority: &'b solana_account_info::AccountInfo<'a>, } /// `initialize_buffer` CPI instruction. pub struct InitializeBufferCpi<'a, 'b> { /// The program to invoke. - pub __program: &'b solana_program::account_info::AccountInfo<'a>, + pub __program: &'b solana_account_info::AccountInfo<'a>, /// Source account to initialize. - pub source_account: &'b solana_program::account_info::AccountInfo<'a>, + pub source_account: &'b solana_account_info::AccountInfo<'a>, /// Buffer authority. - pub buffer_authority: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_authority: &'b solana_account_info::AccountInfo<'a>, } impl<'a, 'b> InitializeBufferCpi<'a, 'b> { pub fn new( - program: &'b solana_program::account_info::AccountInfo<'a>, + program: &'b solana_account_info::AccountInfo<'a>, accounts: InitializeBufferCpiAccounts<'a, 'b>, ) -> Self { Self { @@ -151,49 +154,39 @@ impl<'a, 'b> InitializeBufferCpi<'a, 'b> { } } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], &[]) } #[inline(always)] pub fn invoke_with_remaining_accounts( &self, - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], remaining_accounts) } #[inline(always)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(signers_seeds, &[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] pub fn invoke_signed_with_remaining_accounts( &self, signers_seeds: &[&[&[u8]]], - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { let mut accounts = Vec::with_capacity(2 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.source_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *self.buffer_authority.key, false, )); remaining_accounts.iter().for_each(|remaining_account| { - accounts.push(solana_program::instruction::AccountMeta { + accounts.push(solana_instruction::AccountMeta { pubkey: *remaining_account.0.key, is_signer: remaining_account.1, is_writable: remaining_account.2, @@ -201,12 +194,12 @@ impl<'a, 'b> InitializeBufferCpi<'a, 'b> { }); let data = InitializeBufferInstructionData::new().try_to_vec().unwrap(); - let instruction = solana_program::instruction::Instruction { + let instruction = solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, }; - let mut account_infos = Vec::with_capacity(2 + 1 + remaining_accounts.len()); + let mut account_infos = Vec::with_capacity(3 + remaining_accounts.len()); account_infos.push(self.__program.clone()); account_infos.push(self.source_account.clone()); account_infos.push(self.buffer_authority.clone()); @@ -215,9 +208,9 @@ impl<'a, 'b> InitializeBufferCpi<'a, 'b> { .for_each(|remaining_account| account_infos.push(remaining_account.0.clone())); if signers_seeds.is_empty() { - solana_program::program::invoke(&instruction, &account_infos) + solana_cpi::invoke(&instruction, &account_infos) } else { - solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds) + solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds) } } } @@ -234,7 +227,7 @@ pub struct InitializeBufferCpiBuilder<'a, 'b> { } impl<'a, 'b> InitializeBufferCpiBuilder<'a, 'b> { - pub fn new(program: &'b solana_program::account_info::AccountInfo<'a>) -> Self { + pub fn new(program: &'b solana_account_info::AccountInfo<'a>) -> Self { let instruction = Box::new(InitializeBufferCpiBuilderInstruction { __program: program, source_account: None, @@ -247,7 +240,7 @@ impl<'a, 'b> InitializeBufferCpiBuilder<'a, 'b> { #[inline(always)] pub fn source_account( &mut self, - source_account: &'b solana_program::account_info::AccountInfo<'a>, + source_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.source_account = Some(source_account); self @@ -256,7 +249,7 @@ impl<'a, 'b> InitializeBufferCpiBuilder<'a, 'b> { #[inline(always)] pub fn buffer_authority( &mut self, - buffer_authority: &'b solana_program::account_info::AccountInfo<'a>, + buffer_authority: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.buffer_authority = Some(buffer_authority); self @@ -265,7 +258,7 @@ impl<'a, 'b> InitializeBufferCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_account( &mut self, - account: &'b solana_program::account_info::AccountInfo<'a>, + account: &'b solana_account_info::AccountInfo<'a>, is_writable: bool, is_signer: bool, ) -> &mut Self { @@ -282,11 +275,7 @@ impl<'a, 'b> InitializeBufferCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], + accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], ) -> &mut Self { self.instruction .__remaining_accounts @@ -294,15 +283,12 @@ impl<'a, 'b> InitializeBufferCpiBuilder<'a, 'b> { self } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed(&[]) } #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { let instruction = InitializeBufferCpi { __program: self.instruction.__program, @@ -325,13 +311,9 @@ impl<'a, 'b> InitializeBufferCpiBuilder<'a, 'b> { #[derive(Clone, Debug)] struct InitializeBufferCpiBuilderInstruction<'a, 'b> { - __program: &'b solana_program::account_info::AccountInfo<'a>, - source_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - buffer_authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, + __program: &'b solana_account_info::AccountInfo<'a>, + source_account: Option<&'b solana_account_info::AccountInfo<'a>>, + buffer_authority: Option<&'b solana_account_info::AccountInfo<'a>>, /// Additional instruction accounts `(AccountInfo, is_writable, is_signer)`. - __remaining_accounts: Vec<( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )>, + __remaining_accounts: Vec<(&'b solana_account_info::AccountInfo<'a>, bool, bool)>, } diff --git a/clients/rust/src/generated/instructions/mod.rs b/clients/rust/src/generated/instructions/mod.rs index 8557eb7..003edc9 100644 --- a/clients/rust/src/generated/instructions/mod.rs +++ b/clients/rust/src/generated/instructions/mod.rs @@ -1,8 +1,8 @@ -//! This code was AUTOGENERATED using the kinobi library. +//! This code was AUTOGENERATED using the codama library. //! Please DO NOT EDIT THIS FILE, instead use visitors -//! to add features, then rerun kinobi to update it. +//! to add features, then rerun codama to update it. //! -//! +//! pub(crate) mod r#close; pub(crate) mod r#deploy_with_max_data_len; diff --git a/clients/rust/src/generated/instructions/set_authority.rs b/clients/rust/src/generated/instructions/set_authority.rs index 067578a..f7f1137 100644 --- a/clients/rust/src/generated/instructions/set_authority.rs +++ b/clients/rust/src/generated/instructions/set_authority.rs @@ -1,46 +1,50 @@ -//! This code was AUTOGENERATED using the kinobi library. +//! This code was AUTOGENERATED using the codama library. //! Please DO NOT EDIT THIS FILE, instead use visitors -//! to add features, then rerun kinobi to update it. +//! to add features, then rerun codama to update it. //! -//! +//! use borsh::{BorshDeserialize, BorshSerialize}; +pub const SET_AUTHORITY_DISCRIMINATOR: u32 = 4; + /// Accounts. +#[derive(Debug)] pub struct SetAuthority { /// Buffer or ProgramData account. - pub buffer_or_program_data_account: solana_program::pubkey::Pubkey, + pub buffer_or_program_data_account: solana_pubkey::Pubkey, /// Current authority. - pub current_authority: solana_program::pubkey::Pubkey, + pub current_authority: solana_pubkey::Pubkey, /// New authority (optional). - pub new_authority: Option, + pub new_authority: Option, } impl SetAuthority { - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { self.instruction_with_remaining_accounts(&[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::vec_init_then_push)] pub fn instruction_with_remaining_accounts( &self, - remaining_accounts: &[solana_program::instruction::AccountMeta], - ) -> solana_program::instruction::Instruction { + remaining_accounts: &[solana_instruction::AccountMeta], + ) -> solana_instruction::Instruction { let mut accounts = Vec::with_capacity(3 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.buffer_or_program_data_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( self.current_authority, true, )); if let Some(new_authority) = self.new_authority { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( new_authority, false, )); } else { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( crate::LOADER_V3_ID, false, )); @@ -48,7 +52,7 @@ impl SetAuthority { accounts.extend_from_slice(remaining_accounts); let data = SetAuthorityInstructionData::new().try_to_vec().unwrap(); - solana_program::instruction::Instruction { + solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, @@ -56,7 +60,8 @@ impl SetAuthority { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct SetAuthorityInstructionData { discriminator: u32, } @@ -65,6 +70,10 @@ impl SetAuthorityInstructionData { pub fn new() -> Self { Self { discriminator: 4 } } + + pub(crate) fn try_to_vec(&self) -> Result, std::io::Error> { + borsh::to_vec(self) + } } impl Default for SetAuthorityInstructionData { @@ -82,10 +91,10 @@ impl Default for SetAuthorityInstructionData { /// 2. `[optional]` new_authority #[derive(Clone, Debug, Default)] pub struct SetAuthorityBuilder { - buffer_or_program_data_account: Option, - current_authority: Option, - new_authority: Option, - __remaining_accounts: Vec, + buffer_or_program_data_account: Option, + current_authority: Option, + new_authority: Option, + __remaining_accounts: Vec, } impl SetAuthorityBuilder { @@ -96,36 +105,27 @@ impl SetAuthorityBuilder { #[inline(always)] pub fn buffer_or_program_data_account( &mut self, - buffer_or_program_data_account: solana_program::pubkey::Pubkey, + buffer_or_program_data_account: solana_pubkey::Pubkey, ) -> &mut Self { self.buffer_or_program_data_account = Some(buffer_or_program_data_account); self } /// Current authority. #[inline(always)] - pub fn current_authority( - &mut self, - current_authority: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn current_authority(&mut self, current_authority: solana_pubkey::Pubkey) -> &mut Self { self.current_authority = Some(current_authority); self } /// `[optional account]` /// New authority (optional). #[inline(always)] - pub fn new_authority( - &mut self, - new_authority: Option, - ) -> &mut Self { + pub fn new_authority(&mut self, new_authority: Option) -> &mut Self { self.new_authority = new_authority; self } - /// Add an aditional account to the instruction. + /// Add an additional account to the instruction. #[inline(always)] - pub fn add_remaining_account( - &mut self, - account: solana_program::instruction::AccountMeta, - ) -> &mut Self { + pub fn add_remaining_account(&mut self, account: solana_instruction::AccountMeta) -> &mut Self { self.__remaining_accounts.push(account); self } @@ -133,13 +133,13 @@ impl SetAuthorityBuilder { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[solana_program::instruction::AccountMeta], + accounts: &[solana_instruction::AccountMeta], ) -> &mut Self { self.__remaining_accounts.extend_from_slice(accounts); self } #[allow(clippy::clone_on_copy)] - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { let accounts = SetAuthority { buffer_or_program_data_account: self .buffer_or_program_data_account @@ -157,28 +157,28 @@ impl SetAuthorityBuilder { /// `set_authority` CPI accounts. pub struct SetAuthorityCpiAccounts<'a, 'b> { /// Buffer or ProgramData account. - pub buffer_or_program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_or_program_data_account: &'b solana_account_info::AccountInfo<'a>, /// Current authority. - pub current_authority: &'b solana_program::account_info::AccountInfo<'a>, + pub current_authority: &'b solana_account_info::AccountInfo<'a>, /// New authority (optional). - pub new_authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, + pub new_authority: Option<&'b solana_account_info::AccountInfo<'a>>, } /// `set_authority` CPI instruction. pub struct SetAuthorityCpi<'a, 'b> { /// The program to invoke. - pub __program: &'b solana_program::account_info::AccountInfo<'a>, + pub __program: &'b solana_account_info::AccountInfo<'a>, /// Buffer or ProgramData account. - pub buffer_or_program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_or_program_data_account: &'b solana_account_info::AccountInfo<'a>, /// Current authority. - pub current_authority: &'b solana_program::account_info::AccountInfo<'a>, + pub current_authority: &'b solana_account_info::AccountInfo<'a>, /// New authority (optional). - pub new_authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, + pub new_authority: Option<&'b solana_account_info::AccountInfo<'a>>, } impl<'a, 'b> SetAuthorityCpi<'a, 'b> { pub fn new( - program: &'b solana_program::account_info::AccountInfo<'a>, + program: &'b solana_account_info::AccountInfo<'a>, accounts: SetAuthorityCpiAccounts<'a, 'b>, ) -> Self { Self { @@ -189,60 +189,50 @@ impl<'a, 'b> SetAuthorityCpi<'a, 'b> { } } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], &[]) } #[inline(always)] pub fn invoke_with_remaining_accounts( &self, - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], remaining_accounts) } #[inline(always)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(signers_seeds, &[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] pub fn invoke_signed_with_remaining_accounts( &self, signers_seeds: &[&[&[u8]]], - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { let mut accounts = Vec::with_capacity(3 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.buffer_or_program_data_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *self.current_authority.key, true, )); if let Some(new_authority) = self.new_authority { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *new_authority.key, false, )); } else { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( crate::LOADER_V3_ID, false, )); } remaining_accounts.iter().for_each(|remaining_account| { - accounts.push(solana_program::instruction::AccountMeta { + accounts.push(solana_instruction::AccountMeta { pubkey: *remaining_account.0.key, is_signer: remaining_account.1, is_writable: remaining_account.2, @@ -250,12 +240,12 @@ impl<'a, 'b> SetAuthorityCpi<'a, 'b> { }); let data = SetAuthorityInstructionData::new().try_to_vec().unwrap(); - let instruction = solana_program::instruction::Instruction { + let instruction = solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, }; - let mut account_infos = Vec::with_capacity(3 + 1 + remaining_accounts.len()); + let mut account_infos = Vec::with_capacity(4 + remaining_accounts.len()); account_infos.push(self.__program.clone()); account_infos.push(self.buffer_or_program_data_account.clone()); account_infos.push(self.current_authority.clone()); @@ -267,9 +257,9 @@ impl<'a, 'b> SetAuthorityCpi<'a, 'b> { .for_each(|remaining_account| account_infos.push(remaining_account.0.clone())); if signers_seeds.is_empty() { - solana_program::program::invoke(&instruction, &account_infos) + solana_cpi::invoke(&instruction, &account_infos) } else { - solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds) + solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds) } } } @@ -287,7 +277,7 @@ pub struct SetAuthorityCpiBuilder<'a, 'b> { } impl<'a, 'b> SetAuthorityCpiBuilder<'a, 'b> { - pub fn new(program: &'b solana_program::account_info::AccountInfo<'a>) -> Self { + pub fn new(program: &'b solana_account_info::AccountInfo<'a>) -> Self { let instruction = Box::new(SetAuthorityCpiBuilderInstruction { __program: program, buffer_or_program_data_account: None, @@ -301,7 +291,7 @@ impl<'a, 'b> SetAuthorityCpiBuilder<'a, 'b> { #[inline(always)] pub fn buffer_or_program_data_account( &mut self, - buffer_or_program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + buffer_or_program_data_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.buffer_or_program_data_account = Some(buffer_or_program_data_account); self @@ -310,7 +300,7 @@ impl<'a, 'b> SetAuthorityCpiBuilder<'a, 'b> { #[inline(always)] pub fn current_authority( &mut self, - current_authority: &'b solana_program::account_info::AccountInfo<'a>, + current_authority: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.current_authority = Some(current_authority); self @@ -320,7 +310,7 @@ impl<'a, 'b> SetAuthorityCpiBuilder<'a, 'b> { #[inline(always)] pub fn new_authority( &mut self, - new_authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, + new_authority: Option<&'b solana_account_info::AccountInfo<'a>>, ) -> &mut Self { self.instruction.new_authority = new_authority; self @@ -329,7 +319,7 @@ impl<'a, 'b> SetAuthorityCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_account( &mut self, - account: &'b solana_program::account_info::AccountInfo<'a>, + account: &'b solana_account_info::AccountInfo<'a>, is_writable: bool, is_signer: bool, ) -> &mut Self { @@ -346,11 +336,7 @@ impl<'a, 'b> SetAuthorityCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], + accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], ) -> &mut Self { self.instruction .__remaining_accounts @@ -358,15 +344,12 @@ impl<'a, 'b> SetAuthorityCpiBuilder<'a, 'b> { self } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed(&[]) } #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { let instruction = SetAuthorityCpi { __program: self.instruction.__program, @@ -391,14 +374,10 @@ impl<'a, 'b> SetAuthorityCpiBuilder<'a, 'b> { #[derive(Clone, Debug)] struct SetAuthorityCpiBuilderInstruction<'a, 'b> { - __program: &'b solana_program::account_info::AccountInfo<'a>, - buffer_or_program_data_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - current_authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, - new_authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, + __program: &'b solana_account_info::AccountInfo<'a>, + buffer_or_program_data_account: Option<&'b solana_account_info::AccountInfo<'a>>, + current_authority: Option<&'b solana_account_info::AccountInfo<'a>>, + new_authority: Option<&'b solana_account_info::AccountInfo<'a>>, /// Additional instruction accounts `(AccountInfo, is_writable, is_signer)`. - __remaining_accounts: Vec<( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )>, + __remaining_accounts: Vec<(&'b solana_account_info::AccountInfo<'a>, bool, bool)>, } diff --git a/clients/rust/src/generated/instructions/set_authority_checked.rs b/clients/rust/src/generated/instructions/set_authority_checked.rs index e816861..74d8be0 100644 --- a/clients/rust/src/generated/instructions/set_authority_checked.rs +++ b/clients/rust/src/generated/instructions/set_authority_checked.rs @@ -1,40 +1,44 @@ -//! This code was AUTOGENERATED using the kinobi library. +//! This code was AUTOGENERATED using the codama library. //! Please DO NOT EDIT THIS FILE, instead use visitors -//! to add features, then rerun kinobi to update it. +//! to add features, then rerun codama to update it. //! -//! +//! use borsh::{BorshDeserialize, BorshSerialize}; +pub const SET_AUTHORITY_CHECKED_DISCRIMINATOR: u32 = 7; + /// Accounts. +#[derive(Debug)] pub struct SetAuthorityChecked { /// Buffer or ProgramData account to change the authority of. - pub buffer_or_program_data_account: solana_program::pubkey::Pubkey, + pub buffer_or_program_data_account: solana_pubkey::Pubkey, /// Current authority. - pub current_authority: solana_program::pubkey::Pubkey, + pub current_authority: solana_pubkey::Pubkey, /// New authority. - pub new_authority: solana_program::pubkey::Pubkey, + pub new_authority: solana_pubkey::Pubkey, } impl SetAuthorityChecked { - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { self.instruction_with_remaining_accounts(&[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::vec_init_then_push)] pub fn instruction_with_remaining_accounts( &self, - remaining_accounts: &[solana_program::instruction::AccountMeta], - ) -> solana_program::instruction::Instruction { + remaining_accounts: &[solana_instruction::AccountMeta], + ) -> solana_instruction::Instruction { let mut accounts = Vec::with_capacity(3 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.buffer_or_program_data_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( self.current_authority, true, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( self.new_authority, true, )); @@ -43,7 +47,7 @@ impl SetAuthorityChecked { .try_to_vec() .unwrap(); - solana_program::instruction::Instruction { + solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, @@ -51,7 +55,8 @@ impl SetAuthorityChecked { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct SetAuthorityCheckedInstructionData { discriminator: u32, } @@ -60,6 +65,10 @@ impl SetAuthorityCheckedInstructionData { pub fn new() -> Self { Self { discriminator: 7 } } + + pub(crate) fn try_to_vec(&self) -> Result, std::io::Error> { + borsh::to_vec(self) + } } impl Default for SetAuthorityCheckedInstructionData { @@ -77,10 +86,10 @@ impl Default for SetAuthorityCheckedInstructionData { /// 2. `[signer]` new_authority #[derive(Clone, Debug, Default)] pub struct SetAuthorityCheckedBuilder { - buffer_or_program_data_account: Option, - current_authority: Option, - new_authority: Option, - __remaining_accounts: Vec, + buffer_or_program_data_account: Option, + current_authority: Option, + new_authority: Option, + __remaining_accounts: Vec, } impl SetAuthorityCheckedBuilder { @@ -91,32 +100,26 @@ impl SetAuthorityCheckedBuilder { #[inline(always)] pub fn buffer_or_program_data_account( &mut self, - buffer_or_program_data_account: solana_program::pubkey::Pubkey, + buffer_or_program_data_account: solana_pubkey::Pubkey, ) -> &mut Self { self.buffer_or_program_data_account = Some(buffer_or_program_data_account); self } /// Current authority. #[inline(always)] - pub fn current_authority( - &mut self, - current_authority: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn current_authority(&mut self, current_authority: solana_pubkey::Pubkey) -> &mut Self { self.current_authority = Some(current_authority); self } /// New authority. #[inline(always)] - pub fn new_authority(&mut self, new_authority: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn new_authority(&mut self, new_authority: solana_pubkey::Pubkey) -> &mut Self { self.new_authority = Some(new_authority); self } - /// Add an aditional account to the instruction. + /// Add an additional account to the instruction. #[inline(always)] - pub fn add_remaining_account( - &mut self, - account: solana_program::instruction::AccountMeta, - ) -> &mut Self { + pub fn add_remaining_account(&mut self, account: solana_instruction::AccountMeta) -> &mut Self { self.__remaining_accounts.push(account); self } @@ -124,13 +127,13 @@ impl SetAuthorityCheckedBuilder { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[solana_program::instruction::AccountMeta], + accounts: &[solana_instruction::AccountMeta], ) -> &mut Self { self.__remaining_accounts.extend_from_slice(accounts); self } #[allow(clippy::clone_on_copy)] - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { let accounts = SetAuthorityChecked { buffer_or_program_data_account: self .buffer_or_program_data_account @@ -148,28 +151,28 @@ impl SetAuthorityCheckedBuilder { /// `set_authority_checked` CPI accounts. pub struct SetAuthorityCheckedCpiAccounts<'a, 'b> { /// Buffer or ProgramData account to change the authority of. - pub buffer_or_program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_or_program_data_account: &'b solana_account_info::AccountInfo<'a>, /// Current authority. - pub current_authority: &'b solana_program::account_info::AccountInfo<'a>, + pub current_authority: &'b solana_account_info::AccountInfo<'a>, /// New authority. - pub new_authority: &'b solana_program::account_info::AccountInfo<'a>, + pub new_authority: &'b solana_account_info::AccountInfo<'a>, } /// `set_authority_checked` CPI instruction. pub struct SetAuthorityCheckedCpi<'a, 'b> { /// The program to invoke. - pub __program: &'b solana_program::account_info::AccountInfo<'a>, + pub __program: &'b solana_account_info::AccountInfo<'a>, /// Buffer or ProgramData account to change the authority of. - pub buffer_or_program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_or_program_data_account: &'b solana_account_info::AccountInfo<'a>, /// Current authority. - pub current_authority: &'b solana_program::account_info::AccountInfo<'a>, + pub current_authority: &'b solana_account_info::AccountInfo<'a>, /// New authority. - pub new_authority: &'b solana_program::account_info::AccountInfo<'a>, + pub new_authority: &'b solana_account_info::AccountInfo<'a>, } impl<'a, 'b> SetAuthorityCheckedCpi<'a, 'b> { pub fn new( - program: &'b solana_program::account_info::AccountInfo<'a>, + program: &'b solana_account_info::AccountInfo<'a>, accounts: SetAuthorityCheckedCpiAccounts<'a, 'b>, ) -> Self { Self { @@ -180,53 +183,43 @@ impl<'a, 'b> SetAuthorityCheckedCpi<'a, 'b> { } } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], &[]) } #[inline(always)] pub fn invoke_with_remaining_accounts( &self, - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], remaining_accounts) } #[inline(always)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(signers_seeds, &[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] pub fn invoke_signed_with_remaining_accounts( &self, signers_seeds: &[&[&[u8]]], - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { let mut accounts = Vec::with_capacity(3 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.buffer_or_program_data_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *self.current_authority.key, true, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *self.new_authority.key, true, )); remaining_accounts.iter().for_each(|remaining_account| { - accounts.push(solana_program::instruction::AccountMeta { + accounts.push(solana_instruction::AccountMeta { pubkey: *remaining_account.0.key, is_signer: remaining_account.1, is_writable: remaining_account.2, @@ -236,12 +229,12 @@ impl<'a, 'b> SetAuthorityCheckedCpi<'a, 'b> { .try_to_vec() .unwrap(); - let instruction = solana_program::instruction::Instruction { + let instruction = solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, }; - let mut account_infos = Vec::with_capacity(3 + 1 + remaining_accounts.len()); + let mut account_infos = Vec::with_capacity(4 + remaining_accounts.len()); account_infos.push(self.__program.clone()); account_infos.push(self.buffer_or_program_data_account.clone()); account_infos.push(self.current_authority.clone()); @@ -251,9 +244,9 @@ impl<'a, 'b> SetAuthorityCheckedCpi<'a, 'b> { .for_each(|remaining_account| account_infos.push(remaining_account.0.clone())); if signers_seeds.is_empty() { - solana_program::program::invoke(&instruction, &account_infos) + solana_cpi::invoke(&instruction, &account_infos) } else { - solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds) + solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds) } } } @@ -271,7 +264,7 @@ pub struct SetAuthorityCheckedCpiBuilder<'a, 'b> { } impl<'a, 'b> SetAuthorityCheckedCpiBuilder<'a, 'b> { - pub fn new(program: &'b solana_program::account_info::AccountInfo<'a>) -> Self { + pub fn new(program: &'b solana_account_info::AccountInfo<'a>) -> Self { let instruction = Box::new(SetAuthorityCheckedCpiBuilderInstruction { __program: program, buffer_or_program_data_account: None, @@ -285,7 +278,7 @@ impl<'a, 'b> SetAuthorityCheckedCpiBuilder<'a, 'b> { #[inline(always)] pub fn buffer_or_program_data_account( &mut self, - buffer_or_program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + buffer_or_program_data_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.buffer_or_program_data_account = Some(buffer_or_program_data_account); self @@ -294,7 +287,7 @@ impl<'a, 'b> SetAuthorityCheckedCpiBuilder<'a, 'b> { #[inline(always)] pub fn current_authority( &mut self, - current_authority: &'b solana_program::account_info::AccountInfo<'a>, + current_authority: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.current_authority = Some(current_authority); self @@ -303,7 +296,7 @@ impl<'a, 'b> SetAuthorityCheckedCpiBuilder<'a, 'b> { #[inline(always)] pub fn new_authority( &mut self, - new_authority: &'b solana_program::account_info::AccountInfo<'a>, + new_authority: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.new_authority = Some(new_authority); self @@ -312,7 +305,7 @@ impl<'a, 'b> SetAuthorityCheckedCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_account( &mut self, - account: &'b solana_program::account_info::AccountInfo<'a>, + account: &'b solana_account_info::AccountInfo<'a>, is_writable: bool, is_signer: bool, ) -> &mut Self { @@ -329,11 +322,7 @@ impl<'a, 'b> SetAuthorityCheckedCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], + accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], ) -> &mut Self { self.instruction .__remaining_accounts @@ -341,15 +330,12 @@ impl<'a, 'b> SetAuthorityCheckedCpiBuilder<'a, 'b> { self } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed(&[]) } #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { let instruction = SetAuthorityCheckedCpi { __program: self.instruction.__program, @@ -377,14 +363,10 @@ impl<'a, 'b> SetAuthorityCheckedCpiBuilder<'a, 'b> { #[derive(Clone, Debug)] struct SetAuthorityCheckedCpiBuilderInstruction<'a, 'b> { - __program: &'b solana_program::account_info::AccountInfo<'a>, - buffer_or_program_data_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - current_authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, - new_authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, + __program: &'b solana_account_info::AccountInfo<'a>, + buffer_or_program_data_account: Option<&'b solana_account_info::AccountInfo<'a>>, + current_authority: Option<&'b solana_account_info::AccountInfo<'a>>, + new_authority: Option<&'b solana_account_info::AccountInfo<'a>>, /// Additional instruction accounts `(AccountInfo, is_writable, is_signer)`. - __remaining_accounts: Vec<( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )>, + __remaining_accounts: Vec<(&'b solana_account_info::AccountInfo<'a>, bool, bool)>, } diff --git a/clients/rust/src/generated/instructions/upgrade.rs b/clients/rust/src/generated/instructions/upgrade.rs index ff7e0b7..3922b19 100644 --- a/clients/rust/src/generated/instructions/upgrade.rs +++ b/clients/rust/src/generated/instructions/upgrade.rs @@ -1,71 +1,75 @@ -//! This code was AUTOGENERATED using the kinobi library. +//! This code was AUTOGENERATED using the codama library. //! Please DO NOT EDIT THIS FILE, instead use visitors -//! to add features, then rerun kinobi to update it. +//! to add features, then rerun codama to update it. //! -//! +//! use borsh::{BorshDeserialize, BorshSerialize}; +pub const UPGRADE_DISCRIMINATOR: u32 = 3; + /// Accounts. +#[derive(Debug)] pub struct Upgrade { /// ProgramData account. - pub program_data_account: solana_program::pubkey::Pubkey, + pub program_data_account: solana_pubkey::Pubkey, /// Program account. - pub program_account: solana_program::pubkey::Pubkey, + pub program_account: solana_pubkey::Pubkey, /// Buffer account where the new program data has been written. - pub buffer_account: solana_program::pubkey::Pubkey, + pub buffer_account: solana_pubkey::Pubkey, /// Spill account. - pub spill_account: solana_program::pubkey::Pubkey, + pub spill_account: solana_pubkey::Pubkey, /// Rent sysvar. - pub rent_sysvar: solana_program::pubkey::Pubkey, + pub rent_sysvar: solana_pubkey::Pubkey, /// Clock sysvar. - pub clock_sysvar: solana_program::pubkey::Pubkey, + pub clock_sysvar: solana_pubkey::Pubkey, /// Authority. - pub authority: solana_program::pubkey::Pubkey, + pub authority: solana_pubkey::Pubkey, } impl Upgrade { - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { self.instruction_with_remaining_accounts(&[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::vec_init_then_push)] pub fn instruction_with_remaining_accounts( &self, - remaining_accounts: &[solana_program::instruction::AccountMeta], - ) -> solana_program::instruction::Instruction { + remaining_accounts: &[solana_instruction::AccountMeta], + ) -> solana_instruction::Instruction { let mut accounts = Vec::with_capacity(7 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.program_data_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.program_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.buffer_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.spill_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( self.rent_sysvar, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( self.clock_sysvar, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( self.authority, true, )); accounts.extend_from_slice(remaining_accounts); let data = UpgradeInstructionData::new().try_to_vec().unwrap(); - solana_program::instruction::Instruction { + solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, @@ -73,7 +77,8 @@ impl Upgrade { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct UpgradeInstructionData { discriminator: u32, } @@ -82,6 +87,10 @@ impl UpgradeInstructionData { pub fn new() -> Self { Self { discriminator: 3 } } + + pub(crate) fn try_to_vec(&self) -> Result, std::io::Error> { + borsh::to_vec(self) + } } impl Default for UpgradeInstructionData { @@ -105,14 +114,14 @@ impl Default for UpgradeInstructionData { /// 6. `[signer]` authority #[derive(Clone, Debug, Default)] pub struct UpgradeBuilder { - program_data_account: Option, - program_account: Option, - buffer_account: Option, - spill_account: Option, - rent_sysvar: Option, - clock_sysvar: Option, - authority: Option, - __remaining_accounts: Vec, + program_data_account: Option, + program_account: Option, + buffer_account: Option, + spill_account: Option, + rent_sysvar: Option, + clock_sysvar: Option, + authority: Option, + __remaining_accounts: Vec, } impl UpgradeBuilder { @@ -123,58 +132,52 @@ impl UpgradeBuilder { #[inline(always)] pub fn program_data_account( &mut self, - program_data_account: solana_program::pubkey::Pubkey, + program_data_account: solana_pubkey::Pubkey, ) -> &mut Self { self.program_data_account = Some(program_data_account); self } /// Program account. #[inline(always)] - pub fn program_account( - &mut self, - program_account: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn program_account(&mut self, program_account: solana_pubkey::Pubkey) -> &mut Self { self.program_account = Some(program_account); self } /// Buffer account where the new program data has been written. #[inline(always)] - pub fn buffer_account(&mut self, buffer_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn buffer_account(&mut self, buffer_account: solana_pubkey::Pubkey) -> &mut Self { self.buffer_account = Some(buffer_account); self } /// Spill account. #[inline(always)] - pub fn spill_account(&mut self, spill_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn spill_account(&mut self, spill_account: solana_pubkey::Pubkey) -> &mut Self { self.spill_account = Some(spill_account); self } /// `[optional account, default to /// 'SysvarRent111111111111111111111111111111111']` Rent sysvar. #[inline(always)] - pub fn rent_sysvar(&mut self, rent_sysvar: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn rent_sysvar(&mut self, rent_sysvar: solana_pubkey::Pubkey) -> &mut Self { self.rent_sysvar = Some(rent_sysvar); self } /// `[optional account, default to /// 'SysvarC1ock11111111111111111111111111111111']` Clock sysvar. #[inline(always)] - pub fn clock_sysvar(&mut self, clock_sysvar: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn clock_sysvar(&mut self, clock_sysvar: solana_pubkey::Pubkey) -> &mut Self { self.clock_sysvar = Some(clock_sysvar); self } /// Authority. #[inline(always)] - pub fn authority(&mut self, authority: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn authority(&mut self, authority: solana_pubkey::Pubkey) -> &mut Self { self.authority = Some(authority); self } - /// Add an aditional account to the instruction. + /// Add an additional account to the instruction. #[inline(always)] - pub fn add_remaining_account( - &mut self, - account: solana_program::instruction::AccountMeta, - ) -> &mut Self { + pub fn add_remaining_account(&mut self, account: solana_instruction::AccountMeta) -> &mut Self { self.__remaining_accounts.push(account); self } @@ -182,13 +185,13 @@ impl UpgradeBuilder { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[solana_program::instruction::AccountMeta], + accounts: &[solana_instruction::AccountMeta], ) -> &mut Self { self.__remaining_accounts.extend_from_slice(accounts); self } #[allow(clippy::clone_on_copy)] - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { let accounts = Upgrade { program_data_account: self .program_data_account @@ -196,10 +199,10 @@ impl UpgradeBuilder { program_account: self.program_account.expect("program_account is not set"), buffer_account: self.buffer_account.expect("buffer_account is not set"), spill_account: self.spill_account.expect("spill_account is not set"), - rent_sysvar: self.rent_sysvar.unwrap_or(solana_program::pubkey!( + rent_sysvar: self.rent_sysvar.unwrap_or(solana_pubkey::pubkey!( "SysvarRent111111111111111111111111111111111" )), - clock_sysvar: self.clock_sysvar.unwrap_or(solana_program::pubkey!( + clock_sysvar: self.clock_sysvar.unwrap_or(solana_pubkey::pubkey!( "SysvarC1ock11111111111111111111111111111111" )), authority: self.authority.expect("authority is not set"), @@ -212,44 +215,44 @@ impl UpgradeBuilder { /// `upgrade` CPI accounts. pub struct UpgradeCpiAccounts<'a, 'b> { /// ProgramData account. - pub program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + pub program_data_account: &'b solana_account_info::AccountInfo<'a>, /// Program account. - pub program_account: &'b solana_program::account_info::AccountInfo<'a>, + pub program_account: &'b solana_account_info::AccountInfo<'a>, /// Buffer account where the new program data has been written. - pub buffer_account: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_account: &'b solana_account_info::AccountInfo<'a>, /// Spill account. - pub spill_account: &'b solana_program::account_info::AccountInfo<'a>, + pub spill_account: &'b solana_account_info::AccountInfo<'a>, /// Rent sysvar. - pub rent_sysvar: &'b solana_program::account_info::AccountInfo<'a>, + pub rent_sysvar: &'b solana_account_info::AccountInfo<'a>, /// Clock sysvar. - pub clock_sysvar: &'b solana_program::account_info::AccountInfo<'a>, + pub clock_sysvar: &'b solana_account_info::AccountInfo<'a>, /// Authority. - pub authority: &'b solana_program::account_info::AccountInfo<'a>, + pub authority: &'b solana_account_info::AccountInfo<'a>, } /// `upgrade` CPI instruction. pub struct UpgradeCpi<'a, 'b> { /// The program to invoke. - pub __program: &'b solana_program::account_info::AccountInfo<'a>, + pub __program: &'b solana_account_info::AccountInfo<'a>, /// ProgramData account. - pub program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + pub program_data_account: &'b solana_account_info::AccountInfo<'a>, /// Program account. - pub program_account: &'b solana_program::account_info::AccountInfo<'a>, + pub program_account: &'b solana_account_info::AccountInfo<'a>, /// Buffer account where the new program data has been written. - pub buffer_account: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_account: &'b solana_account_info::AccountInfo<'a>, /// Spill account. - pub spill_account: &'b solana_program::account_info::AccountInfo<'a>, + pub spill_account: &'b solana_account_info::AccountInfo<'a>, /// Rent sysvar. - pub rent_sysvar: &'b solana_program::account_info::AccountInfo<'a>, + pub rent_sysvar: &'b solana_account_info::AccountInfo<'a>, /// Clock sysvar. - pub clock_sysvar: &'b solana_program::account_info::AccountInfo<'a>, + pub clock_sysvar: &'b solana_account_info::AccountInfo<'a>, /// Authority. - pub authority: &'b solana_program::account_info::AccountInfo<'a>, + pub authority: &'b solana_account_info::AccountInfo<'a>, } impl<'a, 'b> UpgradeCpi<'a, 'b> { pub fn new( - program: &'b solana_program::account_info::AccountInfo<'a>, + program: &'b solana_account_info::AccountInfo<'a>, accounts: UpgradeCpiAccounts<'a, 'b>, ) -> Self { Self { @@ -264,69 +267,59 @@ impl<'a, 'b> UpgradeCpi<'a, 'b> { } } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], &[]) } #[inline(always)] pub fn invoke_with_remaining_accounts( &self, - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], remaining_accounts) } #[inline(always)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(signers_seeds, &[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] pub fn invoke_signed_with_remaining_accounts( &self, signers_seeds: &[&[&[u8]]], - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { let mut accounts = Vec::with_capacity(7 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.program_data_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.program_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.buffer_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.spill_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *self.rent_sysvar.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *self.clock_sysvar.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *self.authority.key, true, )); remaining_accounts.iter().for_each(|remaining_account| { - accounts.push(solana_program::instruction::AccountMeta { + accounts.push(solana_instruction::AccountMeta { pubkey: *remaining_account.0.key, is_signer: remaining_account.1, is_writable: remaining_account.2, @@ -334,12 +327,12 @@ impl<'a, 'b> UpgradeCpi<'a, 'b> { }); let data = UpgradeInstructionData::new().try_to_vec().unwrap(); - let instruction = solana_program::instruction::Instruction { + let instruction = solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, }; - let mut account_infos = Vec::with_capacity(7 + 1 + remaining_accounts.len()); + let mut account_infos = Vec::with_capacity(8 + remaining_accounts.len()); account_infos.push(self.__program.clone()); account_infos.push(self.program_data_account.clone()); account_infos.push(self.program_account.clone()); @@ -353,9 +346,9 @@ impl<'a, 'b> UpgradeCpi<'a, 'b> { .for_each(|remaining_account| account_infos.push(remaining_account.0.clone())); if signers_seeds.is_empty() { - solana_program::program::invoke(&instruction, &account_infos) + solana_cpi::invoke(&instruction, &account_infos) } else { - solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds) + solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds) } } } @@ -377,7 +370,7 @@ pub struct UpgradeCpiBuilder<'a, 'b> { } impl<'a, 'b> UpgradeCpiBuilder<'a, 'b> { - pub fn new(program: &'b solana_program::account_info::AccountInfo<'a>) -> Self { + pub fn new(program: &'b solana_account_info::AccountInfo<'a>) -> Self { let instruction = Box::new(UpgradeCpiBuilderInstruction { __program: program, program_data_account: None, @@ -395,7 +388,7 @@ impl<'a, 'b> UpgradeCpiBuilder<'a, 'b> { #[inline(always)] pub fn program_data_account( &mut self, - program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + program_data_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.program_data_account = Some(program_data_account); self @@ -404,7 +397,7 @@ impl<'a, 'b> UpgradeCpiBuilder<'a, 'b> { #[inline(always)] pub fn program_account( &mut self, - program_account: &'b solana_program::account_info::AccountInfo<'a>, + program_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.program_account = Some(program_account); self @@ -413,7 +406,7 @@ impl<'a, 'b> UpgradeCpiBuilder<'a, 'b> { #[inline(always)] pub fn buffer_account( &mut self, - buffer_account: &'b solana_program::account_info::AccountInfo<'a>, + buffer_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.buffer_account = Some(buffer_account); self @@ -422,7 +415,7 @@ impl<'a, 'b> UpgradeCpiBuilder<'a, 'b> { #[inline(always)] pub fn spill_account( &mut self, - spill_account: &'b solana_program::account_info::AccountInfo<'a>, + spill_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.spill_account = Some(spill_account); self @@ -431,7 +424,7 @@ impl<'a, 'b> UpgradeCpiBuilder<'a, 'b> { #[inline(always)] pub fn rent_sysvar( &mut self, - rent_sysvar: &'b solana_program::account_info::AccountInfo<'a>, + rent_sysvar: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.rent_sysvar = Some(rent_sysvar); self @@ -440,17 +433,14 @@ impl<'a, 'b> UpgradeCpiBuilder<'a, 'b> { #[inline(always)] pub fn clock_sysvar( &mut self, - clock_sysvar: &'b solana_program::account_info::AccountInfo<'a>, + clock_sysvar: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.clock_sysvar = Some(clock_sysvar); self } /// Authority. #[inline(always)] - pub fn authority( - &mut self, - authority: &'b solana_program::account_info::AccountInfo<'a>, - ) -> &mut Self { + pub fn authority(&mut self, authority: &'b solana_account_info::AccountInfo<'a>) -> &mut Self { self.instruction.authority = Some(authority); self } @@ -458,7 +448,7 @@ impl<'a, 'b> UpgradeCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_account( &mut self, - account: &'b solana_program::account_info::AccountInfo<'a>, + account: &'b solana_account_info::AccountInfo<'a>, is_writable: bool, is_signer: bool, ) -> &mut Self { @@ -475,11 +465,7 @@ impl<'a, 'b> UpgradeCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], + accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], ) -> &mut Self { self.instruction .__remaining_accounts @@ -487,15 +473,12 @@ impl<'a, 'b> UpgradeCpiBuilder<'a, 'b> { self } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed(&[]) } #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { let instruction = UpgradeCpi { __program: self.instruction.__program, @@ -540,18 +523,14 @@ impl<'a, 'b> UpgradeCpiBuilder<'a, 'b> { #[derive(Clone, Debug)] struct UpgradeCpiBuilderInstruction<'a, 'b> { - __program: &'b solana_program::account_info::AccountInfo<'a>, - program_data_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - program_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - buffer_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - spill_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - rent_sysvar: Option<&'b solana_program::account_info::AccountInfo<'a>>, - clock_sysvar: Option<&'b solana_program::account_info::AccountInfo<'a>>, - authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, + __program: &'b solana_account_info::AccountInfo<'a>, + program_data_account: Option<&'b solana_account_info::AccountInfo<'a>>, + program_account: Option<&'b solana_account_info::AccountInfo<'a>>, + buffer_account: Option<&'b solana_account_info::AccountInfo<'a>>, + spill_account: Option<&'b solana_account_info::AccountInfo<'a>>, + rent_sysvar: Option<&'b solana_account_info::AccountInfo<'a>>, + clock_sysvar: Option<&'b solana_account_info::AccountInfo<'a>>, + authority: Option<&'b solana_account_info::AccountInfo<'a>>, /// Additional instruction accounts `(AccountInfo, is_writable, is_signer)`. - __remaining_accounts: Vec<( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )>, + __remaining_accounts: Vec<(&'b solana_account_info::AccountInfo<'a>, bool, bool)>, } diff --git a/clients/rust/src/generated/instructions/write.rs b/clients/rust/src/generated/instructions/write.rs index 2af7b01..edb03f7 100644 --- a/clients/rust/src/generated/instructions/write.rs +++ b/clients/rust/src/generated/instructions/write.rs @@ -1,38 +1,39 @@ -//! This code was AUTOGENERATED using the kinobi library. +//! This code was AUTOGENERATED using the codama library. //! Please DO NOT EDIT THIS FILE, instead use visitors -//! to add features, then rerun kinobi to update it. +//! to add features, then rerun codama to update it. //! -//! +//! use borsh::{BorshDeserialize, BorshSerialize}; +pub const WRITE_DISCRIMINATOR: u32 = 1; + /// Accounts. +#[derive(Debug)] pub struct Write { /// Buffer account. - pub buffer_account: solana_program::pubkey::Pubkey, + pub buffer_account: solana_pubkey::Pubkey, /// Buffer authority. - pub buffer_authority: solana_program::pubkey::Pubkey, + pub buffer_authority: solana_pubkey::Pubkey, } impl Write { - pub fn instruction( - &self, - args: WriteInstructionArgs, - ) -> solana_program::instruction::Instruction { + pub fn instruction(&self, args: WriteInstructionArgs) -> solana_instruction::Instruction { self.instruction_with_remaining_accounts(args, &[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::vec_init_then_push)] pub fn instruction_with_remaining_accounts( &self, args: WriteInstructionArgs, - remaining_accounts: &[solana_program::instruction::AccountMeta], - ) -> solana_program::instruction::Instruction { + remaining_accounts: &[solana_instruction::AccountMeta], + ) -> solana_instruction::Instruction { let mut accounts = Vec::with_capacity(2 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.buffer_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( self.buffer_authority, true, )); @@ -41,7 +42,7 @@ impl Write { let mut args = args.try_to_vec().unwrap(); data.append(&mut args); - solana_program::instruction::Instruction { + solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, @@ -49,7 +50,8 @@ impl Write { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct WriteInstructionData { discriminator: u32, } @@ -58,6 +60,10 @@ impl WriteInstructionData { pub fn new() -> Self { Self { discriminator: 1 } } + + pub(crate) fn try_to_vec(&self) -> Result, std::io::Error> { + borsh::to_vec(self) + } } impl Default for WriteInstructionData { @@ -73,6 +79,12 @@ pub struct WriteInstructionArgs { pub bytes: Vec, } +impl WriteInstructionArgs { + pub(crate) fn try_to_vec(&self) -> Result, std::io::Error> { + borsh::to_vec(self) + } +} + /// Instruction builder for `Write`. /// /// ### Accounts: @@ -81,11 +93,11 @@ pub struct WriteInstructionArgs { /// 1. `[signer]` buffer_authority #[derive(Clone, Debug, Default)] pub struct WriteBuilder { - buffer_account: Option, - buffer_authority: Option, + buffer_account: Option, + buffer_authority: Option, offset: Option, bytes: Option>, - __remaining_accounts: Vec, + __remaining_accounts: Vec, } impl WriteBuilder { @@ -94,16 +106,13 @@ impl WriteBuilder { } /// Buffer account. #[inline(always)] - pub fn buffer_account(&mut self, buffer_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn buffer_account(&mut self, buffer_account: solana_pubkey::Pubkey) -> &mut Self { self.buffer_account = Some(buffer_account); self } /// Buffer authority. #[inline(always)] - pub fn buffer_authority( - &mut self, - buffer_authority: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn buffer_authority(&mut self, buffer_authority: solana_pubkey::Pubkey) -> &mut Self { self.buffer_authority = Some(buffer_authority); self } @@ -117,12 +126,9 @@ impl WriteBuilder { self.bytes = Some(bytes); self } - /// Add an aditional account to the instruction. + /// Add an additional account to the instruction. #[inline(always)] - pub fn add_remaining_account( - &mut self, - account: solana_program::instruction::AccountMeta, - ) -> &mut Self { + pub fn add_remaining_account(&mut self, account: solana_instruction::AccountMeta) -> &mut Self { self.__remaining_accounts.push(account); self } @@ -130,13 +136,13 @@ impl WriteBuilder { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[solana_program::instruction::AccountMeta], + accounts: &[solana_instruction::AccountMeta], ) -> &mut Self { self.__remaining_accounts.extend_from_slice(accounts); self } #[allow(clippy::clone_on_copy)] - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { let accounts = Write { buffer_account: self.buffer_account.expect("buffer_account is not set"), buffer_authority: self.buffer_authority.expect("buffer_authority is not set"), @@ -153,26 +159,26 @@ impl WriteBuilder { /// `write` CPI accounts. pub struct WriteCpiAccounts<'a, 'b> { /// Buffer account. - pub buffer_account: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_account: &'b solana_account_info::AccountInfo<'a>, /// Buffer authority. - pub buffer_authority: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_authority: &'b solana_account_info::AccountInfo<'a>, } /// `write` CPI instruction. pub struct WriteCpi<'a, 'b> { /// The program to invoke. - pub __program: &'b solana_program::account_info::AccountInfo<'a>, + pub __program: &'b solana_account_info::AccountInfo<'a>, /// Buffer account. - pub buffer_account: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_account: &'b solana_account_info::AccountInfo<'a>, /// Buffer authority. - pub buffer_authority: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_authority: &'b solana_account_info::AccountInfo<'a>, /// The arguments for the instruction. pub __args: WriteInstructionArgs, } impl<'a, 'b> WriteCpi<'a, 'b> { pub fn new( - program: &'b solana_program::account_info::AccountInfo<'a>, + program: &'b solana_account_info::AccountInfo<'a>, accounts: WriteCpiAccounts<'a, 'b>, args: WriteInstructionArgs, ) -> Self { @@ -184,49 +190,39 @@ impl<'a, 'b> WriteCpi<'a, 'b> { } } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], &[]) } #[inline(always)] pub fn invoke_with_remaining_accounts( &self, - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], remaining_accounts) } #[inline(always)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(signers_seeds, &[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] pub fn invoke_signed_with_remaining_accounts( &self, signers_seeds: &[&[&[u8]]], - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { let mut accounts = Vec::with_capacity(2 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.buffer_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *self.buffer_authority.key, true, )); remaining_accounts.iter().for_each(|remaining_account| { - accounts.push(solana_program::instruction::AccountMeta { + accounts.push(solana_instruction::AccountMeta { pubkey: *remaining_account.0.key, is_signer: remaining_account.1, is_writable: remaining_account.2, @@ -236,12 +232,12 @@ impl<'a, 'b> WriteCpi<'a, 'b> { let mut args = self.__args.try_to_vec().unwrap(); data.append(&mut args); - let instruction = solana_program::instruction::Instruction { + let instruction = solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, }; - let mut account_infos = Vec::with_capacity(2 + 1 + remaining_accounts.len()); + let mut account_infos = Vec::with_capacity(3 + remaining_accounts.len()); account_infos.push(self.__program.clone()); account_infos.push(self.buffer_account.clone()); account_infos.push(self.buffer_authority.clone()); @@ -250,9 +246,9 @@ impl<'a, 'b> WriteCpi<'a, 'b> { .for_each(|remaining_account| account_infos.push(remaining_account.0.clone())); if signers_seeds.is_empty() { - solana_program::program::invoke(&instruction, &account_infos) + solana_cpi::invoke(&instruction, &account_infos) } else { - solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds) + solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds) } } } @@ -269,7 +265,7 @@ pub struct WriteCpiBuilder<'a, 'b> { } impl<'a, 'b> WriteCpiBuilder<'a, 'b> { - pub fn new(program: &'b solana_program::account_info::AccountInfo<'a>) -> Self { + pub fn new(program: &'b solana_account_info::AccountInfo<'a>) -> Self { let instruction = Box::new(WriteCpiBuilderInstruction { __program: program, buffer_account: None, @@ -284,7 +280,7 @@ impl<'a, 'b> WriteCpiBuilder<'a, 'b> { #[inline(always)] pub fn buffer_account( &mut self, - buffer_account: &'b solana_program::account_info::AccountInfo<'a>, + buffer_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.buffer_account = Some(buffer_account); self @@ -293,7 +289,7 @@ impl<'a, 'b> WriteCpiBuilder<'a, 'b> { #[inline(always)] pub fn buffer_authority( &mut self, - buffer_authority: &'b solana_program::account_info::AccountInfo<'a>, + buffer_authority: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.buffer_authority = Some(buffer_authority); self @@ -312,7 +308,7 @@ impl<'a, 'b> WriteCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_account( &mut self, - account: &'b solana_program::account_info::AccountInfo<'a>, + account: &'b solana_account_info::AccountInfo<'a>, is_writable: bool, is_signer: bool, ) -> &mut Self { @@ -329,11 +325,7 @@ impl<'a, 'b> WriteCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], + accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], ) -> &mut Self { self.instruction .__remaining_accounts @@ -341,15 +333,12 @@ impl<'a, 'b> WriteCpiBuilder<'a, 'b> { self } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed(&[]) } #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { let args = WriteInstructionArgs { offset: self.instruction.offset.clone().expect("offset is not set"), bytes: self.instruction.bytes.clone().expect("bytes is not set"), @@ -377,15 +366,11 @@ impl<'a, 'b> WriteCpiBuilder<'a, 'b> { #[derive(Clone, Debug)] struct WriteCpiBuilderInstruction<'a, 'b> { - __program: &'b solana_program::account_info::AccountInfo<'a>, - buffer_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - buffer_authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, + __program: &'b solana_account_info::AccountInfo<'a>, + buffer_account: Option<&'b solana_account_info::AccountInfo<'a>>, + buffer_authority: Option<&'b solana_account_info::AccountInfo<'a>>, offset: Option, bytes: Option>, /// Additional instruction accounts `(AccountInfo, is_writable, is_signer)`. - __remaining_accounts: Vec<( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )>, + __remaining_accounts: Vec<(&'b solana_account_info::AccountInfo<'a>, bool, bool)>, } diff --git a/clients/rust/src/generated/mod.rs b/clients/rust/src/generated/mod.rs index 8938b2b..cdff1c2 100644 --- a/clients/rust/src/generated/mod.rs +++ b/clients/rust/src/generated/mod.rs @@ -1,8 +1,8 @@ -//! This code was AUTOGENERATED using the kinobi library. +//! This code was AUTOGENERATED using the codama library. //! Please DO NOT EDIT THIS FILE, instead use visitors -//! to add features, then rerun kinobi to update it. +//! to add features, then rerun codama to update it. //! -//! +//! pub mod errors; pub mod instructions; diff --git a/clients/rust/src/generated/programs.rs b/clients/rust/src/generated/programs.rs index 47923c0..ed420e4 100644 --- a/clients/rust/src/generated/programs.rs +++ b/clients/rust/src/generated/programs.rs @@ -1,10 +1,10 @@ -//! This code was AUTOGENERATED using the kinobi library. +//! This code was AUTOGENERATED using the codama library. //! Please DO NOT EDIT THIS FILE, instead use visitors -//! to add features, then rerun kinobi to update it. +//! to add features, then rerun codama to update it. //! -//! +//! -use solana_program::{pubkey, pubkey::Pubkey}; +use solana_pubkey::{pubkey, Pubkey}; /// `loader_v3` program ID. pub const LOADER_V3_ID: Pubkey = pubkey!("BPFLoaderUpgradeab1e11111111111111111111111"); diff --git a/codama.mjs b/codama.mjs new file mode 100644 index 0000000..d890516 --- /dev/null +++ b/codama.mjs @@ -0,0 +1,41 @@ +import { getToolchainArgument } from "./scripts/utils.mjs"; +import path from "node:path"; +import fs from "node:fs"; + +const prettier = JSON.parse( + fs.readFileSync(path.join("clients", "js", ".prettierrc.json"), "utf-8") +); + +export default { + idl: "program/idl.json", + before: [ + { + from: "codama#updateProgramsVisitor", + args: [ + { + solanaLoaderV3Program: { + name: "loaderV3", + publicKey: "BPFLoaderUpgradeab1e11111111111111111111111", + }, + }, + ], + }, + ], + scripts: { + js: { + from: "@codama/renderers-js", + args: ["clients/js/src/generated", { prettier }], + }, + rust: { + from: "@codama/renderers-rust", + args: [ + "clients/rust/src/generated", + { + crateFolder: "clients/rust", + formatCode: true, + toolchain: getToolchainArgument("format"), + }, + ], + }, + }, +}; diff --git a/package.json b/package.json index ad303ff..981e1ed 100644 --- a/package.json +++ b/package.json @@ -24,14 +24,17 @@ "clients:rust:test": "zx ./scripts/client/test-rust.mjs" }, "devDependencies": { + "@codama/nodes-from-anchor": "^1.2.9", + "@codama/renderers-js": "^1.4.2", + "@codama/renderers-rust": "^1.2.7", "@iarna/toml": "^2.2.5", - "@kinobi-so/nodes-from-anchor": "^0.20.9", - "@kinobi-so/renderers-js": "^0.21.2", - "@kinobi-so/renderers-rust": "^0.21.0", "@metaplex-foundation/shank-js": "^0.1.7", - "kinobi": "^0.21.0", + "codama": "^1.3.7", "typescript": "^5.5.2", "zx": "^7.2.3" }, - "packageManager": "pnpm@9.1.0" + "engines": { + "node": ">=v20.0.0" + }, + "packageManager": "pnpm@10.15.1" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1d37536..a98423b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,24 +8,24 @@ importers: .: devDependencies: + '@codama/nodes-from-anchor': + specifier: ^1.2.9 + version: 1.2.9(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) + '@codama/renderers-js': + specifier: ^1.4.2 + version: 1.4.2(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) + '@codama/renderers-rust': + specifier: ^1.2.7 + version: 1.2.7(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) '@iarna/toml': specifier: ^2.2.5 version: 2.2.5 - '@kinobi-so/nodes-from-anchor': - specifier: ^0.20.9 - version: 0.20.10 - '@kinobi-so/renderers-js': - specifier: ^0.21.2 - version: 0.21.8(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) - '@kinobi-so/renderers-rust': - specifier: ^0.21.0 - version: 0.21.6(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) '@metaplex-foundation/shank-js': specifier: ^0.1.7 version: 0.1.7 - kinobi: - specifier: ^0.21.0 - version: 0.21.4 + codama: + specifier: ^1.3.7 + version: 1.3.7 typescript: specifier: ^5.5.2 version: 5.6.2 @@ -35,58 +35,45 @@ importers: packages: - '@iarna/toml@2.2.5': - resolution: {integrity: sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==} - - '@kinobi-so/errors@0.21.1': - resolution: {integrity: sha512-dhpCoAca9Jfd0xcCYXebdGiADlEoMnU7kCHKqeebFMJXF9/KPXlTKtt9ihIa33irxBUdzzWA6X+sD7G87W+vaw==} + '@codama/cli@1.3.5': + resolution: {integrity: sha512-UgJGaTK2TXnbRcnCgReKqcDFjU941XZTvA0qbSiFH0Njrwb0kcLkKirMKwdyDaCHry7QcybzIKbp4ErrwqExMA==} hasBin: true - '@kinobi-so/errors@0.21.4': - resolution: {integrity: sha512-Ffu/l5SGGLbSf451on+hHLWKGm8fpoWocCh6+RTftNSe/OHKnz9K0f2esX7ny83Vckpf77sVub1JXwOMW/hW/w==} + '@codama/errors@1.3.7': + resolution: {integrity: sha512-96BF8agDVc2vAgL4qw1lZZfuJ7XBefdzTBk2VOUnOhdMQiLb0QhJCC4BH88OcL+rZXQdet4pk7Qwarj1I1GFKg==} hasBin: true - '@kinobi-so/node-types@0.21.1': - resolution: {integrity: sha512-VN2DXO8yva1EwZSJ7IQfHpccteLpfd1XI3ij5M1jm0d48tpkiHVeUa0pFBNvZmju480R3qX/rel5j4Ov2JtTBw==} - - '@kinobi-so/node-types@0.21.4': - resolution: {integrity: sha512-/6En6kVU21/skBlKbN6EzD5saDFzFoezDYoonbWurtXJcelTIuqz3D1WwR3iNOXvWco64cqpHG6mM7zdF5WsHA==} - - '@kinobi-so/nodes-from-anchor@0.20.10': - resolution: {integrity: sha512-kC+Lox9Z1y0Xu9hfehR2NvgQ/lL3N5/XWor5bFpT1gSPjZG2lARJS6SqdjIr0P50AqQ23uND9Lbh4aytUf3d+w==} - - '@kinobi-so/nodes-from-anchor@0.21.2': - resolution: {integrity: sha512-c7lDg9MH4LKod5PwNC4Lvsugx3Dj6bqgw5kQFLUYDdIWVRdR2Z8JGK/LhPXceiDvw2bLnjy2Mmroz8zh2/0cuA==} - - '@kinobi-so/nodes@0.21.1': - resolution: {integrity: sha512-i5zRURpiIkrK1PWyRNjjKC3G1o47nWrETEQcl71UM1cXUYPPIl7A3a9+u4PWzWhRw+sGWzKfyXcmkjp8wQNIhA==} + '@codama/node-types@1.3.7': + resolution: {integrity: sha512-L9UTFfoeki5t+BYJAa4OMsqBPpbMbx8YJQar+55mYcjwGlJsKJW7mRfLYvwEFkCUYyLdNva40OVmTf88jccZCA==} - '@kinobi-so/nodes@0.21.4': - resolution: {integrity: sha512-QQbmSsOcfL2GhCMkHP33XihzUDS12jAKMvhNyTzhdpI1QPS40wvMwYfA8UXFtc5B/4aKhneEGUok7QgF4IZXkg==} + '@codama/nodes-from-anchor@1.2.9': + resolution: {integrity: sha512-n+53VumtguLeSzGWZLpJqWRqs+r8NkWb1w8Ci0AuWQ6Qwfbbk9LknUg1XkqpgZZuq2Hh/Xoy28yHBl2JeIXi3w==} - '@kinobi-so/renderers-core@0.21.2': - resolution: {integrity: sha512-czVR9dfKWwZ5YQB1N83+whsh9g1zCS8rMJZ0t/T3Vd7P0uuKOOGL9ej/WMQZ7qQhCLTDJDEn5Lqf2JInArzqLg==} + '@codama/nodes@1.3.7': + resolution: {integrity: sha512-3OV6SIBcqsIDARyzZVGdfnffNlnKSYcb0aGp/9Liz5/EID0oBTIyuh/Cmj5Ww6RX4WPb+GNAxABAGW94zbcfQg==} - '@kinobi-so/renderers-js@0.21.8': - resolution: {integrity: sha512-YYyi5ADxwdC0nbIAH9xHtEFbHW6RJiA9w7i+gtSnX6olpp4g+e0ITOuuV3GmeUlRdflbf3hMMbCNWWl+y7uiOg==} + '@codama/renderers-core@1.2.2': + resolution: {integrity: sha512-dPyHgn5L45G+tWP17ITvOlpX3+s2FcJHMjAhFZlmUHAJpH/wl+UsUwuWg698iSb56Er2jUwqX7srw5iZf7XHjQ==} - '@kinobi-so/renderers-rust@0.21.6': - resolution: {integrity: sha512-AIJVE/3KsKNBbzuzpgV5npC7IyeEX9SjIf6LFuKXEfUcyLTVjAmosn+MBCDCtY7bTC2CD1U+Bfjt9/8a+uO4mA==} + '@codama/renderers-js@1.4.2': + resolution: {integrity: sha512-emYJEPNDQ/DjHYDBNPt/HEr+97ClpEQT7LPPNZ44DRSEG4Qj9ti/aBvtgOrIyESyyTOaKrUzu7Ew6S+TBB/eFg==} + engines: {node: '>=20.18.0'} - '@kinobi-so/validators@0.21.4': - resolution: {integrity: sha512-1bCi035dtbL1x1L8b/faNbYQ5Qb9He9dYdCgThQoxJL/v9a7L8F/9D4DGlKxZxEP1xBAflzbVx21QR6ESVpdMA==} + '@codama/renderers-rust@1.2.7': + resolution: {integrity: sha512-wD6JRfm4GZmY0vUhgHB1fTHIaCw3zrQ7PXl4Fv1hBNiX6hKor5vE72GkIztG/VCZkl1WWVJTNLRLho5oldN9LQ==} + engines: {node: '>=20.18.0'} - '@kinobi-so/visitors-core@0.21.1': - resolution: {integrity: sha512-K20NdxEvo4KaSQ/FTPB3MJ6s/72l5dWhZP5JaYLrt5TqkKaLRTJn58LswUVauKMv/+MTCzZrZnqy0PppgbHv+A==} + '@codama/validators@1.3.7': + resolution: {integrity: sha512-OxuPhIPcuqSLmwDTcl9+VyEq6mwsLLqVXtQjgQgjEpr0IO/KAV9RG98Ye2yoK21jEVGDnzN9jsSQVHysRfpMMA==} - '@kinobi-so/visitors-core@0.21.4': - resolution: {integrity: sha512-xRosguRjUydFX/kdDf56FwW2OQ0dVJQaipG2aceKXGwx8bYorIS7fAWvIOXmLmZbtxKdtggxDW4oSw0DUtWeKQ==} + '@codama/visitors-core@1.3.7': + resolution: {integrity: sha512-B1JnzhRDJiLxewha/F3YzeEp8Zrtd7eKiGNJFJHSPufAnIVm2lQUDaKS+OrAOHnSRmRKIAVdzfpFpdz6EM0N6Q==} - '@kinobi-so/visitors@0.21.1': - resolution: {integrity: sha512-hZV6obCveJIfE5wBBVWGVUhvDjzYxMOj2o/0Y/ZzbenJpjjbFFih/dH9SW8XEDyMewlSjAOglfzqGZVei8e+VA==} + '@codama/visitors@1.3.7': + resolution: {integrity: sha512-pIVK84G4dquvDXmr0q9GACcwDROw7DOBz0Kk/qt837FsKYr37xc6nU2LIguXu8QVIFOHBZk1HVAb7/S0eo/dqg==} - '@kinobi-so/visitors@0.21.4': - resolution: {integrity: sha512-bebFAvRncmnY0Hy448XRb65a+2LkHJ4acnJyJi9dvJqWgJl6zbhX6Lj0NBYluzSwB28317DMynn+V7PSqOKBbQ==} + '@iarna/toml@2.2.5': + resolution: {integrity: sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==} '@metaplex-foundation/rustbin@0.3.5': resolution: {integrity: sha512-m0wkRBEQB/8krwMwKBvFugufZtYwMXiGHud2cTDAv+aGXK4M90y0Hx67/wpu+AqqoQfdV8VM9YezUOHKD+Z5kA==} @@ -94,8 +81,8 @@ packages: '@metaplex-foundation/shank-js@0.1.7': resolution: {integrity: sha512-tSAipn8Ho1UxlMC3jwJ5Opl+Y3lRm60VTkgRDfvzydb57lXW5G+K5MrZhEmhrFUuRYziV+e34CTo+ybpMp1Eqg==} - '@noble/hashes@1.5.0': - resolution: {integrity: sha512-1j6kQFb7QRru7eKN3ZDvRcP13rugwdxZqCjbiAVZfIJwgj2A65UmT4TgARXGlXgnRkORLTDTrO19ZErt7+QXgA==} + '@noble/hashes@1.8.0': + resolution: {integrity: sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==} engines: {node: ^14.21.3 || >=16} '@nodelib/fs.scandir@2.1.5': @@ -110,27 +97,49 @@ packages: resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} engines: {node: '>= 8'} - '@solana/codecs-core@2.0.0-rc.1': - resolution: {integrity: sha512-bauxqMfSs8EHD0JKESaNmNuNvkvHSuN3bbWAF5RjOfDu2PugxHrvRebmYauvSumZ3cTfQ4HJJX6PG5rN852qyQ==} + '@solana/codecs-core@3.0.3': + resolution: {integrity: sha512-emKykJ3h1DmnDOY29Uv9eJXP8E/FHzvlUBJ6te+5EbKdFjj7vdlKYPfDxOI6iGdXTY+YC/ELtbNBh6QwF2uEDQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' + + '@solana/codecs-data-structures@3.0.3': + resolution: {integrity: sha512-R15cLp8riJvToXziW8lP6AMSwsztGhEnwgyGmll32Mo0Yjq+hduW2/fJrA/TJs6tA/OgTzMQjlxgk009EqZHCw==} + engines: {node: '>=20.18.0'} peerDependencies: - typescript: '>=5' + typescript: '>=5.3.3' - '@solana/codecs-numbers@2.0.0-rc.1': - resolution: {integrity: sha512-J5i5mOkvukXn8E3Z7sGIPxsThRCgSdgTWJDQeZvucQ9PT6Y3HiVXJ0pcWiOWAoQ3RX8e/f4I3IC+wE6pZiJzDQ==} + '@solana/codecs-numbers@3.0.3': + resolution: {integrity: sha512-pfXkH9J0glrM8qj6389GAn30+cJOxzXLR2FsPOHCUMXrqLhGjMMZAWhsQkpOQ37SGc/7EiQsT/gmyGC7gxHqJQ==} + engines: {node: '>=20.18.0'} peerDependencies: - typescript: '>=5' + typescript: '>=5.3.3' - '@solana/codecs-strings@2.0.0-rc.1': - resolution: {integrity: sha512-9/wPhw8TbGRTt6mHC4Zz1RqOnuPTqq1Nb4EyuvpZ39GW6O2t2Q7Q0XxiB3+BdoEjwA2XgPw6e2iRfvYgqty44g==} + '@solana/codecs-strings@3.0.3': + resolution: {integrity: sha512-VHBXnnTVtcQ1j+7Vrz+qSYo38no+jiHRdGnhFspRXEHNJbllzwKqgBE7YN3qoIXH+MKxgJUcwO5KHmdzf8Wn2A==} + engines: {node: '>=20.18.0'} peerDependencies: fastestsmallesttextencoderdecoder: ^1.0.22 - typescript: '>=5' + typescript: '>=5.3.3' - '@solana/errors@2.0.0-rc.1': - resolution: {integrity: sha512-ejNvQ2oJ7+bcFAYWj225lyRkHnixuAeb7RQCixm+5mH4n1IA4Qya/9Bmfy5RAAHQzxK43clu3kZmL5eF9VGtYQ==} + '@solana/codecs@3.0.3': + resolution: {integrity: sha512-GOHwTlIQsCoJx9Ryr6cEf0FHKAQ7pY4aO4xgncAftrv0lveTQ1rPP2inQ1QT0gJllsIa8nwbfXAADs9nNJxQDA==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' + + '@solana/errors@3.0.3': + resolution: {integrity: sha512-1l84xJlHNva6io62PcYfUamwWlc0eM95nHgCrKX0g0cLoC6D6QHYPCEbEVkR+C5UtP9JDgyQM8MFiv+Ei5tO9Q==} + engines: {node: '>=20.18.0'} hasBin: true peerDependencies: - typescript: '>=5' + typescript: '>=5.3.3' + + '@solana/options@3.0.3': + resolution: {integrity: sha512-jarsmnQ63RN0JPC5j9sgUat07NrL9PC71XU7pUItd6LOHtu4+wJMio3l5mT0DHVfkfbFLL6iI6+QmXSVhTNF3g==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' '@types/fs-extra@11.0.4': resolution: {integrity: sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==} @@ -164,17 +173,37 @@ packages: resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} engines: {node: '>=8'} - call-bind@1.0.7: - resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==} + call-bind-apply-helpers@1.0.2: + resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==} + engines: {node: '>= 0.4'} + + call-bind@1.0.8: + resolution: {integrity: sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==} + engines: {node: '>= 0.4'} + + call-bound@1.0.4: + resolution: {integrity: sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==} engines: {node: '>= 0.4'} chalk@5.3.0: resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==} engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} - commander@12.1.0: - resolution: {integrity: sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==} - engines: {node: '>=18'} + chalk@5.6.2: + resolution: {integrity: sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==} + engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} + + codama@1.3.7: + resolution: {integrity: sha512-+pUJrvSG3bO4QvfcWfc14p3sklzHRB/lV4gjnXPhyb7T6nCFwYpNWv6/bFuqQyUSgSNI1n3tst/I9EhoPXOjbw==} + hasBin: true + + commander@14.0.0: + resolution: {integrity: sha512-2uM9rYjPvyq39NwLRqaiLtWHyDC1FvryJDa2ATTVims5YAS4PupsEQsDvP14FqhFr0P49CYDugi59xaxJlTXRA==} + engines: {node: '>=20'} + + commander@14.0.1: + resolution: {integrity: sha512-2JkV3gUZUVrbNA+1sjBOYLsMZ5cEEl8GTFP2a4AVz5hvasAMCQ1D2l2le/cX+pV4N6ZU17zjUahLpIXRrnWL8A==} + engines: {node: '>=20'} commander@5.1.0: resolution: {integrity: sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==} @@ -201,6 +230,10 @@ packages: resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} engines: {node: '>=8'} + dunder-proto@1.0.1: + resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==} + engines: {node: '>= 0.4'} + duplexer@0.1.2: resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==} @@ -208,10 +241,18 @@ packages: resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==} engines: {node: '>= 0.4'} + es-define-property@1.0.1: + resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==} + engines: {node: '>= 0.4'} + es-errors@1.3.0: resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==} engines: {node: '>= 0.4'} + es-object-atoms@1.1.1: + resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==} + engines: {node: '>= 0.4'} + event-stream@3.3.4: resolution: {integrity: sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==} @@ -255,6 +296,14 @@ packages: resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==} engines: {node: '>= 0.4'} + get-intrinsic@1.3.0: + resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==} + engines: {node: '>= 0.4'} + + get-proto@1.0.1: + resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==} + engines: {node: '>= 0.4'} + glob-parent@5.1.2: resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} engines: {node: '>= 6'} @@ -266,6 +315,10 @@ packages: gopd@1.0.1: resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} + gopd@1.2.0: + resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==} + engines: {node: '>= 0.4'} + graceful-fs@4.2.11: resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} @@ -280,6 +333,10 @@ packages: resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==} engines: {node: '>= 0.4'} + has-symbols@1.1.0: + resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==} + engines: {node: '>= 0.4'} + hasown@2.0.2: resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} engines: {node: '>= 0.4'} @@ -306,8 +363,8 @@ packages: isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} - json-stable-stringify@1.1.1: - resolution: {integrity: sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==} + json-stable-stringify@1.3.0: + resolution: {integrity: sha512-qtYiSSFlwot9XHtF9bD9c7rwKjr+RecWT//ZnPvSmEjpV5mmPOCN4j8UjY5hbjNkOwZ/jQv3J6R1/pL7RwgMsg==} engines: {node: '>= 0.4'} jsonfile@6.1.0: @@ -316,12 +373,17 @@ packages: jsonify@0.0.1: resolution: {integrity: sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==} - kinobi@0.21.4: - resolution: {integrity: sha512-JPN41QCeZT+OB+XqaqAHaqNesybHCm+Qxw4tRKBOfRmPnaV3od9x0kuedvmut8pyv6mm2r2T3bJHNeA9yyOmtA==} + kleur@3.0.3: + resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==} + engines: {node: '>=6'} map-stream@0.1.0: resolution: {integrity: sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==} + math-intrinsics@1.1.0: + resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==} + engines: {node: '>= 0.4'} + merge2@1.4.1: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} @@ -365,15 +427,22 @@ packages: pause-stream@0.0.11: resolution: {integrity: sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==} + picocolors@1.1.1: + resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==} + picomatch@2.3.1: resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} engines: {node: '>=8.6'} - prettier@3.3.3: - resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==} + prettier@3.6.2: + resolution: {integrity: sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==} engines: {node: '>=14'} hasBin: true + prompts@2.4.2: + resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==} + engines: {node: '>= 6'} + ps-tree@1.2.0: resolution: {integrity: sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==} engines: {node: '>= 0.10'} @@ -398,6 +467,9 @@ packages: resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==} engines: {node: '>= 0.4'} + sisteransi@1.0.5: + resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} + slash@4.0.0: resolution: {integrity: sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==} engines: {node: '>=12'} @@ -458,111 +530,89 @@ packages: snapshots: - '@iarna/toml@2.2.5': {} - - '@kinobi-so/errors@0.21.1': + '@codama/cli@1.3.5': dependencies: - '@kinobi-so/node-types': 0.21.1 - chalk: 5.3.0 - commander: 12.1.0 - - '@kinobi-so/errors@0.21.4': + '@codama/nodes': 1.3.7 + '@codama/visitors': 1.3.7 + '@codama/visitors-core': 1.3.7 + commander: 14.0.1 + picocolors: 1.1.1 + prompts: 2.4.2 + + '@codama/errors@1.3.7': dependencies: - '@kinobi-so/node-types': 0.21.4 - chalk: 5.3.0 - commander: 12.1.0 - - '@kinobi-so/node-types@0.21.1': {} - - '@kinobi-so/node-types@0.21.4': {} + '@codama/node-types': 1.3.7 + commander: 14.0.1 + picocolors: 1.1.1 - '@kinobi-so/nodes-from-anchor@0.20.10': - dependencies: - '@kinobi-so/errors': 0.21.1 - '@kinobi-so/nodes': 0.21.1 - '@kinobi-so/visitors': 0.21.1 - '@noble/hashes': 1.5.0 - - '@kinobi-so/nodes-from-anchor@0.21.2': - dependencies: - '@kinobi-so/errors': 0.21.4 - '@kinobi-so/nodes': 0.21.4 - '@kinobi-so/visitors': 0.21.4 - '@noble/hashes': 1.5.0 + '@codama/node-types@1.3.7': {} - '@kinobi-so/nodes@0.21.1': + '@codama/nodes-from-anchor@1.2.9(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2)': dependencies: - '@kinobi-so/errors': 0.21.1 - '@kinobi-so/node-types': 0.21.1 + '@codama/errors': 1.3.7 + '@codama/nodes': 1.3.7 + '@codama/visitors': 1.3.7 + '@noble/hashes': 1.8.0 + '@solana/codecs': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) + transitivePeerDependencies: + - fastestsmallesttextencoderdecoder + - typescript - '@kinobi-so/nodes@0.21.4': + '@codama/nodes@1.3.7': dependencies: - '@kinobi-so/errors': 0.21.4 - '@kinobi-so/node-types': 0.21.4 + '@codama/errors': 1.3.7 + '@codama/node-types': 1.3.7 - '@kinobi-so/renderers-core@0.21.2': + '@codama/renderers-core@1.2.2': dependencies: - '@kinobi-so/errors': 0.21.4 - '@kinobi-so/nodes': 0.21.4 - '@kinobi-so/visitors-core': 0.21.4 + '@codama/errors': 1.3.7 + '@codama/nodes': 1.3.7 + '@codama/visitors-core': 1.3.7 - '@kinobi-so/renderers-js@0.21.8(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2)': + '@codama/renderers-js@1.4.2(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2)': dependencies: - '@kinobi-so/errors': 0.21.4 - '@kinobi-so/nodes': 0.21.4 - '@kinobi-so/nodes-from-anchor': 0.21.2 - '@kinobi-so/renderers-core': 0.21.2 - '@kinobi-so/visitors-core': 0.21.4 - '@solana/codecs-strings': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) - nunjucks: 3.2.4 - prettier: 3.3.3 + '@codama/errors': 1.3.7 + '@codama/nodes': 1.3.7 + '@codama/renderers-core': 1.2.2 + '@codama/visitors-core': 1.3.7 + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) + prettier: 3.6.2 transitivePeerDependencies: - - chokidar - fastestsmallesttextencoderdecoder - typescript - '@kinobi-so/renderers-rust@0.21.6(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2)': + '@codama/renderers-rust@1.2.7(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2)': dependencies: - '@kinobi-so/errors': 0.21.4 - '@kinobi-so/nodes': 0.21.4 - '@kinobi-so/renderers-core': 0.21.2 - '@kinobi-so/visitors-core': 0.21.4 - '@solana/codecs-strings': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) + '@codama/errors': 1.3.7 + '@codama/nodes': 1.3.7 + '@codama/renderers-core': 1.2.2 + '@codama/visitors-core': 1.3.7 + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) nunjucks: 3.2.4 transitivePeerDependencies: - chokidar - fastestsmallesttextencoderdecoder - typescript - '@kinobi-so/validators@0.21.4': - dependencies: - '@kinobi-so/errors': 0.21.4 - '@kinobi-so/nodes': 0.21.4 - '@kinobi-so/visitors-core': 0.21.4 - - '@kinobi-so/visitors-core@0.21.1': + '@codama/validators@1.3.7': dependencies: - '@kinobi-so/errors': 0.21.1 - '@kinobi-so/nodes': 0.21.1 - json-stable-stringify: 1.1.1 + '@codama/errors': 1.3.7 + '@codama/nodes': 1.3.7 + '@codama/visitors-core': 1.3.7 - '@kinobi-so/visitors-core@0.21.4': + '@codama/visitors-core@1.3.7': dependencies: - '@kinobi-so/errors': 0.21.4 - '@kinobi-so/nodes': 0.21.4 - json-stable-stringify: 1.1.1 + '@codama/errors': 1.3.7 + '@codama/nodes': 1.3.7 + json-stable-stringify: 1.3.0 - '@kinobi-so/visitors@0.21.1': + '@codama/visitors@1.3.7': dependencies: - '@kinobi-so/errors': 0.21.1 - '@kinobi-so/nodes': 0.21.1 - '@kinobi-so/visitors-core': 0.21.1 + '@codama/errors': 1.3.7 + '@codama/nodes': 1.3.7 + '@codama/visitors-core': 1.3.7 - '@kinobi-so/visitors@0.21.4': - dependencies: - '@kinobi-so/errors': 0.21.4 - '@kinobi-so/nodes': 0.21.4 - '@kinobi-so/visitors-core': 0.21.4 + '@iarna/toml@2.2.5': {} '@metaplex-foundation/rustbin@0.3.5': dependencies: @@ -581,7 +631,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@noble/hashes@1.5.0': {} + '@noble/hashes@1.8.0': {} '@nodelib/fs.scandir@2.1.5': dependencies: @@ -595,30 +645,59 @@ snapshots: '@nodelib/fs.scandir': 2.1.5 fastq: 1.17.1 - '@solana/codecs-core@2.0.0-rc.1(typescript@5.6.2)': + '@solana/codecs-core@3.0.3(typescript@5.6.2)': dependencies: - '@solana/errors': 2.0.0-rc.1(typescript@5.6.2) + '@solana/errors': 3.0.3(typescript@5.6.2) typescript: 5.6.2 - '@solana/codecs-numbers@2.0.0-rc.1(typescript@5.6.2)': + '@solana/codecs-data-structures@3.0.3(typescript@5.6.2)': dependencies: - '@solana/codecs-core': 2.0.0-rc.1(typescript@5.6.2) - '@solana/errors': 2.0.0-rc.1(typescript@5.6.2) + '@solana/codecs-core': 3.0.3(typescript@5.6.2) + '@solana/codecs-numbers': 3.0.3(typescript@5.6.2) + '@solana/errors': 3.0.3(typescript@5.6.2) typescript: 5.6.2 - '@solana/codecs-strings@2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2)': + '@solana/codecs-numbers@3.0.3(typescript@5.6.2)': dependencies: - '@solana/codecs-core': 2.0.0-rc.1(typescript@5.6.2) - '@solana/codecs-numbers': 2.0.0-rc.1(typescript@5.6.2) - '@solana/errors': 2.0.0-rc.1(typescript@5.6.2) + '@solana/codecs-core': 3.0.3(typescript@5.6.2) + '@solana/errors': 3.0.3(typescript@5.6.2) + typescript: 5.6.2 + + '@solana/codecs-strings@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2)': + dependencies: + '@solana/codecs-core': 3.0.3(typescript@5.6.2) + '@solana/codecs-numbers': 3.0.3(typescript@5.6.2) + '@solana/errors': 3.0.3(typescript@5.6.2) fastestsmallesttextencoderdecoder: 1.0.22 typescript: 5.6.2 - '@solana/errors@2.0.0-rc.1(typescript@5.6.2)': + '@solana/codecs@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2)': dependencies: - chalk: 5.3.0 - commander: 12.1.0 + '@solana/codecs-core': 3.0.3(typescript@5.6.2) + '@solana/codecs-data-structures': 3.0.3(typescript@5.6.2) + '@solana/codecs-numbers': 3.0.3(typescript@5.6.2) + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) + '@solana/options': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) + typescript: 5.6.2 + transitivePeerDependencies: + - fastestsmallesttextencoderdecoder + + '@solana/errors@3.0.3(typescript@5.6.2)': + dependencies: + chalk: 5.6.2 + commander: 14.0.0 + typescript: 5.6.2 + + '@solana/options@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2)': + dependencies: + '@solana/codecs-core': 3.0.3(typescript@5.6.2) + '@solana/codecs-data-structures': 3.0.3(typescript@5.6.2) + '@solana/codecs-numbers': 3.0.3(typescript@5.6.2) + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) + '@solana/errors': 3.0.3(typescript@5.6.2) typescript: 5.6.2 + transitivePeerDependencies: + - fastestsmallesttextencoderdecoder '@types/fs-extra@11.0.4': dependencies: @@ -649,17 +728,38 @@ snapshots: dependencies: fill-range: 7.1.1 - call-bind@1.0.7: + call-bind-apply-helpers@1.0.2: dependencies: - es-define-property: 1.0.0 es-errors: 1.3.0 function-bind: 1.1.2 + + call-bind@1.0.8: + dependencies: + call-bind-apply-helpers: 1.0.2 + es-define-property: 1.0.0 get-intrinsic: 1.2.4 set-function-length: 1.2.2 + call-bound@1.0.4: + dependencies: + call-bind-apply-helpers: 1.0.2 + get-intrinsic: 1.3.0 + chalk@5.3.0: {} - commander@12.1.0: {} + chalk@5.6.2: {} + + codama@1.3.7: + dependencies: + '@codama/cli': 1.3.5 + '@codama/errors': 1.3.7 + '@codama/nodes': 1.3.7 + '@codama/validators': 1.3.7 + '@codama/visitors': 1.3.7 + + commander@14.0.0: {} + + commander@14.0.1: {} commander@5.1.0: {} @@ -679,14 +779,26 @@ snapshots: dependencies: path-type: 4.0.0 + dunder-proto@1.0.1: + dependencies: + call-bind-apply-helpers: 1.0.2 + es-errors: 1.3.0 + gopd: 1.2.0 + duplexer@0.1.2: {} es-define-property@1.0.0: dependencies: get-intrinsic: 1.2.4 + es-define-property@1.0.1: {} + es-errors@1.3.0: {} + es-object-atoms@1.1.1: + dependencies: + es-errors: 1.3.0 + event-stream@3.3.4: dependencies: duplexer: 0.1.2 @@ -744,6 +856,24 @@ snapshots: has-symbols: 1.0.3 hasown: 2.0.2 + get-intrinsic@1.3.0: + dependencies: + call-bind-apply-helpers: 1.0.2 + es-define-property: 1.0.1 + es-errors: 1.3.0 + es-object-atoms: 1.1.1 + function-bind: 1.1.2 + get-proto: 1.0.1 + gopd: 1.2.0 + has-symbols: 1.1.0 + hasown: 2.0.2 + math-intrinsics: 1.1.0 + + get-proto@1.0.1: + dependencies: + dunder-proto: 1.0.1 + es-object-atoms: 1.1.1 + glob-parent@5.1.2: dependencies: is-glob: 4.0.3 @@ -760,6 +890,8 @@ snapshots: dependencies: get-intrinsic: 1.2.4 + gopd@1.2.0: {} + graceful-fs@4.2.11: {} has-property-descriptors@1.0.2: @@ -770,6 +902,8 @@ snapshots: has-symbols@1.0.3: {} + has-symbols@1.1.0: {} + hasown@2.0.2: dependencies: function-bind: 1.1.2 @@ -788,9 +922,10 @@ snapshots: isexe@2.0.0: {} - json-stable-stringify@1.1.1: + json-stable-stringify@1.3.0: dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 + call-bound: 1.0.4 isarray: 2.0.5 jsonify: 0.0.1 object-keys: 1.1.1 @@ -803,15 +938,12 @@ snapshots: jsonify@0.0.1: {} - kinobi@0.21.4: - dependencies: - '@kinobi-so/errors': 0.21.4 - '@kinobi-so/nodes': 0.21.4 - '@kinobi-so/validators': 0.21.4 - '@kinobi-so/visitors': 0.21.4 + kleur@3.0.3: {} map-stream@0.1.0: {} + math-intrinsics@1.1.0: {} + merge2@1.4.1: {} micromatch@4.0.8: @@ -845,9 +977,16 @@ snapshots: dependencies: through: 2.3.8 + picocolors@1.1.1: {} + picomatch@2.3.1: {} - prettier@3.3.3: {} + prettier@3.6.2: {} + + prompts@2.4.2: + dependencies: + kleur: 3.0.3 + sisteransi: 1.0.5 ps-tree@1.2.0: dependencies: @@ -872,6 +1011,8 @@ snapshots: gopd: 1.0.1 has-property-descriptors: 1.0.2 + sisteransi@1.0.5: {} + slash@4.0.0: {} split@0.3.3: diff --git a/program/idl.json b/program/idl.json index 805cbd4..839bc09 100644 --- a/program/idl.json +++ b/program/idl.json @@ -374,7 +374,7 @@ "metadata": { "origin": "shank", "address": "CoreBPFLoaderUpgradeab1e1111111111111111111", - "binaryVersion": "0.4.2", + "binaryVersion": "0.4.5", "libVersion": "^0.4.2" } } \ No newline at end of file From 9497253b51057b21637d40bd45fbeaf62ca88b71 Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Fri, 3 Oct 2025 09:14:27 +0100 Subject: [PATCH 02/10] Fix prettier option attribute --- codama.mjs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/codama.mjs b/codama.mjs index d890516..02a1446 100644 --- a/codama.mjs +++ b/codama.mjs @@ -2,7 +2,7 @@ import { getToolchainArgument } from "./scripts/utils.mjs"; import path from "node:path"; import fs from "node:fs"; -const prettier = JSON.parse( +const prettierOptions = JSON.parse( fs.readFileSync(path.join("clients", "js", ".prettierrc.json"), "utf-8") ); @@ -24,7 +24,7 @@ export default { scripts: { js: { from: "@codama/renderers-js", - args: ["clients/js/src/generated", { prettier }], + args: ["clients/js/src/generated", { prettierOptions }], }, rust: { from: "@codama/renderers-rust", From f652064ddf529966770ef5314c93b44e1a749032 Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Fri, 3 Oct 2025 09:30:58 +0100 Subject: [PATCH 03/10] Update dependencies --- Cargo.lock | 5151 ++++++++++++++++----------------------- clients/rust/Cargo.toml | 22 +- program/Cargo.toml | 6 +- 3 files changed, 2069 insertions(+), 3110 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9a1f414..fdc22bb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,66 +1,56 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 - -[[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" -dependencies = [ - "lazy_static", - "regex", -] +version = 4 [[package]] name = "addr2line" -version = "0.24.2" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b" dependencies = [ "gimli", ] [[package]] name = "adler2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" - -[[package]] -name = "aead" -version = "0.5.2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" -dependencies = [ - "crypto-common", - "generic-array", -] +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] -name = "aes" -version = "0.8.4" +name = "agave-feature-set" +version = "2.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +checksum = "7c5117ce634f42ce143891c4d7db3536d5054fc19501ef88e21f353b8580c450" dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", + "ahash", + "solana-epoch-schedule", + "solana-hash", + "solana-pubkey", + "solana-sha256-hasher", + "solana-svm-feature-set", ] [[package]] -name = "aes-gcm-siv" -version = "0.11.1" +name = "agave-precompiles" +version = "2.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d" +checksum = "47f7f87574ffda3eb5b4385ef328fd6cca81b415c55e106a05bbae72ea5c428e" dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "polyval", - "subtle", - "zeroize", + "agave-feature-set", + "bincode", + "digest 0.10.7", + "ed25519-dalek", + "libsecp256k1", + "openssl", + "sha3", + "solana-ed25519-program", + "solana-message", + "solana-precompile-error", + "solana-pubkey", + "solana-sdk-ids", + "solana-secp256k1-program", + "solana-secp256r1-program", ] [[package]] @@ -100,12 +90,6 @@ dependencies = [ "alloc-no-stdlib", ] -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - [[package]] name = "android_system_properties" version = "0.1.5" @@ -115,35 +99,12 @@ dependencies = [ "libc", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "anyhow" version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" -[[package]] -name = "aquamarine" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1da02abba9f9063d786eab1509833ebb2fac0f966862ca59439c76b9c566760" -dependencies = [ - "include_dir", - "itertools 0.10.5", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "ark-bn254" version = "0.4.0" @@ -279,95 +240,24 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" -[[package]] -name = "asn1-rs" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" -dependencies = [ - "asn1-rs-derive", - "asn1-rs-impl", - "displaydoc", - "nom", - "num-traits", - "rusticata-macros", - "thiserror", - "time", -] - -[[package]] -name = "asn1-rs-derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure 0.12.6", -] - -[[package]] -name = "asn1-rs-impl" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "assert_matches" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" - -[[package]] -name = "async-channel" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - [[package]] name = "async-compression" -version = "0.4.18" +version = "0.4.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522" +checksum = "5a89bce6054c720275ac2432fbba080a66a2106a44a1b804553930ca6909f4e0" dependencies = [ - "brotli", - "flate2", + "compression-codecs", + "compression-core", "futures-core", - "memchr", "pin-project-lite", "tokio", ] [[package]] -name = "async-mutex" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-trait" -version = "0.1.83" +name = "atomic-waker" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.89", -] +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "atty" @@ -375,7 +265,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi 0.1.19", + "hermit-abi", "libc", "winapi", ] @@ -388,9 +278,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" -version = "0.3.74" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6" dependencies = [ "addr2line", "cfg-if", @@ -398,7 +288,7 @@ dependencies = [ "miniz_oxide", "object", "rustc-demangle", - "windows-targets 0.52.6", + "windows-link", ] [[package]] @@ -407,18 +297,6 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - [[package]] name = "base64" version = "0.22.1" @@ -436,33 +314,18 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.6.0" +version = "2.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394" dependencies = [ "serde", ] -[[package]] -name = "bitmaps" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" -dependencies = [ - "typenum", -] - [[package]] name = "blake3" -version = "1.5.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" +checksum = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0" dependencies = [ "arrayref", "arrayvec", @@ -478,7 +341,6 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "block-padding", "generic-array", ] @@ -491,12 +353,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-padding" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" - [[package]] name = "borsh" version = "0.10.4" @@ -509,12 +365,12 @@ dependencies = [ [[package]] name = "borsh" -version = "1.5.3" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2506947f73ad44e344215ccd6403ac2ae18cd8e046e581a441bf8d199f257f03" +checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce" dependencies = [ - "borsh-derive 1.5.3", - "cfg_aliases 0.2.1", + "borsh-derive 1.5.7", + "cfg_aliases", ] [[package]] @@ -532,9 +388,9 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.5.3" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2593a3b8b938bd68373196c9832f516be11fa487ef4ae745eb282e6a56a7244" +checksum = "fdd1d3c0c2f5833f22386f252fe8ed005c7f59fdcddeef025c01b4c3b9fd9ac3" dependencies = [ "once_cell", "proc-macro-crate 3.2.0", @@ -567,9 +423,9 @@ dependencies = [ [[package]] name = "brotli" -version = "7.0.0" +version = "8.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd" +checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -578,9 +434,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "4.0.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" +checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -613,18 +469,18 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.20.0" +version = "1.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a" +checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.8.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" +checksum = "4f154e572231cb6ba2bd1176980827e3d5dc04cc183a75dea38109fbdd672d29" dependencies = [ "proc-macro2", "quote", @@ -643,45 +499,13 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" -[[package]] -name = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "caps" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190baaad529bcfbde9e1a19022c42781bdb6ff9de25721abdb8fd98c0807730b" -dependencies = [ - "libc", - "thiserror", -] - [[package]] name = "cc" -version = "1.2.1" +version = "1.2.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" +checksum = "e1354349954c6fc9cb0deab020f27f783cf0b604e8bb754dc4658ecf0d29c35f" dependencies = [ - "jobserver", - "libc", + "find-msvc-tools", "shlex", ] @@ -691,12 +515,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - [[package]] name = "cfg_aliases" version = "0.2.1" @@ -704,86 +522,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] -name = "chrono" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.52.6", -] - -[[package]] -name = "chrono-humanize" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799627e6b4d27827a814e837b9d8a504832086081806d45b1afa34dc982b023b" -dependencies = [ - "chrono", -] - -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim 0.8.0", - "textwrap 0.11.0", - "unicode-width 0.1.14", - "vec_map", -] - -[[package]] -name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_lex", - "indexmap 1.9.3", - "once_cell", - "strsim 0.10.0", - "termcolor", - "textwrap 0.16.1", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" +name = "cfg_eval" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +checksum = "45565fc9416b9896014f5732ac776f810ee53a66730c17e4020c3ec064a8f88f" dependencies = [ - "os_str_bytes", + "proc-macro2", + "quote", + "syn 2.0.89", ] [[package]] -name = "cmake" -version = "0.1.51" +name = "chrono" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" +checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" dependencies = [ - "cc", + "iana-time-zone", + "num-traits", + "serde", + "windows-link", ] [[package]] @@ -800,26 +558,22 @@ dependencies = [ ] [[package]] -name = "concurrent-queue" -version = "2.5.0" +name = "compression-codecs" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +checksum = "ef8a506ec4b81c460798f572caead636d57d3d7e940f998160f52bd254bf2d23" dependencies = [ - "crossbeam-utils", + "brotli", + "compression-core", + "flate2", + "memchr", ] [[package]] -name = "console" -version = "0.15.8" +name = "compression-core" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width 0.1.14", - "windows-sys 0.52.0", -] +checksum = "e47641d3deaf41fb1538ac1f54735925e275eaf3bf4d55c81b137fba797e5cbb" [[package]] name = "console_error_panic_hook" @@ -847,16 +601,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -874,46 +618,27 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" @@ -928,7 +653,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core 0.6.4", "typenum", ] @@ -943,97 +667,82 @@ dependencies = [ ] [[package]] -name = "ctr" -version = "0.9.2" +name = "curve25519-dalek" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" dependencies = [ - "cipher", + "byteorder", + "digest 0.9.0", + "rand_core 0.5.1", + "subtle", + "zeroize", ] [[package]] name = "curve25519-dalek" -version = "3.2.1" +version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", + "fiat-crypto", + "rand_core 0.6.4", + "rustc_version", "serde", "subtle", "zeroize", ] [[package]] -name = "darling" -version = "0.20.10" +name = "curve25519-dalek-derive" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ - "darling_core", + "proc-macro2", + "quote", + "syn 2.0.89", +] + +[[package]] +name = "darling" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" +dependencies = [ + "darling_core", "darling_macro", ] [[package]] name = "darling_core" -version = "0.20.10" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.11.1", + "strsim", "syn 2.0.89", ] [[package]] name = "darling_macro" -version = "0.20.10" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" dependencies = [ "darling_core", "quote", "syn 2.0.89", ] -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", - "rayon", -] - -[[package]] -name = "data-encoding" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" - -[[package]] -name = "der-parser" -version = "8.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" -dependencies = [ - "asn1-rs", - "displaydoc", - "nom", - "num-bigint 0.4.6", - "num-traits", - "rusticata-macros", -] - [[package]] name = "deranged" version = "0.3.11" @@ -1061,24 +770,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "dialoguer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" -dependencies = [ - "console", - "shell-words", - "tempfile", - "zeroize", -] - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - [[package]] name = "digest" version = "0.9.0" @@ -1099,15 +790,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "dir-diff" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ad16bf5f84253b50d6557681c58c3ab67c47c77d39fed9aeb56e947290bd10" -dependencies = [ - "walkdir", -] - [[package]] name = "displaydoc" version = "0.2.5" @@ -1120,33 +802,10 @@ dependencies = [ ] [[package]] -name = "dlopen2" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b4f5f101177ff01b8ec4ecc81eead416a8aa42819a2869311b3420fa114ffa" -dependencies = [ - "dlopen2_derive", - "libc", - "once_cell", - "winapi", -] - -[[package]] -name = "dlopen2_derive" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6cbae11b3de8fce2a456e8ea3dada226b35fe791f0dc1d360c0941f0bb681f3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.89", -] - -[[package]] -name = "downcast" -version = "0.11.0" +name = "dyn-clone" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" +checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "eager" @@ -1169,7 +828,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ - "curve25519-dalek", + "curve25519-dalek 3.2.0", "ed25519", "rand 0.7.3", "serde", @@ -1189,39 +848,12 @@ dependencies = [ "sha2 0.10.8", ] -[[package]] -name = "educe" -version = "0.4.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0042ff8246a363dbe77d2ceedb073339e85a804b9a47636c6e016a9a32c05f" -dependencies = [ - "enum-ordinalize", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "either" version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "encoding_rs" -version = "0.8.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" -dependencies = [ - "cfg-if", -] - [[package]] name = "enum-iterator" version = "1.5.0" @@ -1242,19 +874,6 @@ dependencies = [ "syn 2.0.89", ] -[[package]] -name = "enum-ordinalize" -version = "3.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf1fa3f06bbff1ea5b1a9c7b14aa992a39657db60a2759457328d7e058f49ee" -dependencies = [ - "num-bigint 0.4.6", - "num-traits", - "proc-macro2", - "quote", - "syn 2.0.89", -] - [[package]] name = "env_logger" version = "0.9.3" @@ -1284,12 +903,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - [[package]] name = "fastrand" version = "2.2.0" @@ -1303,17 +916,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da" [[package]] -name = "filetime" -version = "0.2.25" +name = "fiat-crypto" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + +[[package]] +name = "find-msvc-tools" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ced73b1dacfc750a6db6c0a0c3a3853c8b41997e2e2c563dc90804ae6867959" + +[[package]] +name = "five8" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" +checksum = "a75b8549488b4715defcb0d8a8a1c1c76a80661b5fa106b4ca0e7fce59d7d875" dependencies = [ - "cfg-if", - "libc", - "libredox", - "windows-sys 0.59.0", + "five8_core", +] + +[[package]] +name = "five8_const" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26dec3da8bc3ef08f2c04f61eab298c3ab334523e55f076354d6d6f613799a7b" +dependencies = [ + "five8_core", ] +[[package]] +name = "five8_core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2551bf44bc5f776c15044b9b94153a00198be06743e262afaaa61f11ac7523a5" + [[package]] name = "fixedbitset" version = "0.4.2" @@ -1322,23 +959,14 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.35" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" +checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d" dependencies = [ "crc32fast", "miniz_oxide", ] -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - [[package]] name = "fnv" version = "1.0.7" @@ -1346,33 +974,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] -name = "form_urlencoded" -version = "1.2.1" +name = "foreign-types" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "percent-encoding", + "foreign-types-shared", ] [[package]] -name = "fragile" -version = "2.0.0" +name = "foreign-types-shared" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] -name = "futures" -version = "0.3.31" +name = "form_urlencoded" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", + "percent-encoding", ] [[package]] @@ -1391,34 +1013,12 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" -[[package]] -name = "futures-executor" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - [[package]] name = "futures-io" version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" -[[package]] -name = "futures-macro" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.89", -] - [[package]] name = "futures-sink" version = "0.3.31" @@ -1437,10 +1037,8 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ - "futures-channel", "futures-core", "futures-io", - "futures-macro", "futures-sink", "futures-task", "memchr", @@ -1455,7 +1053,6 @@ version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ - "serde", "typenum", "version_check", ] @@ -1497,46 +1094,30 @@ dependencies = [ ] [[package]] -name = "gimli" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" - -[[package]] -name = "goblin" -version = "0.5.4" +name = "getrandom" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7666983ed0dd8d21a6f6576ee00053ca0926fb281a5522577a4dbd0f1b54143" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" dependencies = [ - "log", - "plain", - "scroll", + "cfg-if", + "js-sys", + "libc", + "r-efi", + "wasi 0.14.7+wasi-0.2.4", + "wasm-bindgen", ] [[package]] -name = "h2" -version = "0.3.26" +name = "gimli" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap 2.6.0", - "slab", - "tokio", - "tokio-util 0.7.12", - "tracing", -] +checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" [[package]] name = "hash32" -version = "0.2.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" dependencies = [ "byteorder", ] @@ -1556,12 +1137,6 @@ dependencies = [ "ahash", ] -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" - [[package]] name = "hashbrown" version = "0.15.2" @@ -1570,9 +1145,12 @@ checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] name = "heck" -version = "0.4.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] [[package]] name = "hermit-abi" @@ -1583,24 +1161,12 @@ dependencies = [ "libc", ] -[[package]] -name = "hermit-abi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - [[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "histogram" -version = "0.6.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cb882ccb290b8646e554b157ab0b71e64e8d5bef775cd66b6531e52d302669" - [[package]] name = "hmac" version = "0.8.1" @@ -1631,20 +1197,11 @@ dependencies = [ "hmac 0.8.1", ] -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - [[package]] name = "http" -version = "0.2.12" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" dependencies = [ "bytes", "fnv", @@ -1653,26 +1210,32 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.6" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", "http", - "pin-project-lite", ] [[package]] -name = "httparse" -version = "1.9.5" +name = "http-body-util" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" +checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", + "pin-project-lite", +] [[package]] -name = "httpdate" -version = "1.0.3" +name = "httparse" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" [[package]] name = "humantime" @@ -1682,40 +1245,64 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.31" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" +checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e" dependencies = [ + "atomic-waker", "bytes", "futures-channel", "futures-core", - "futures-util", - "h2", "http", "http-body", "httparse", - "httpdate", "itoa", "pin-project-lite", - "socket2", + "pin-utils", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-rustls" -version = "0.24.2" +version = "0.27.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" dependencies = [ - "futures-util", "http", "hyper", + "hyper-util", "rustls", + "rustls-pki-types", "tokio", "tokio-rustls", + "tower-service", + "webpki-roots", +] + +[[package]] +name = "hyper-util" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "http", + "http-body", + "hyper", + "ipnet", + "libc", + "percent-encoding", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", ] [[package]] @@ -1743,21 +1330,22 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" dependencies = [ "displaydoc", + "potential_utf", "yoke", "zerofrom", "zerovec", ] [[package]] -name = "icu_locid" -version = "1.5.0" +name = "icu_locale_core" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" dependencies = [ "displaydoc", "litemap", @@ -1766,31 +1354,11 @@ dependencies = [ "zerovec", ] -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" - [[package]] name = "icu_normalizer" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" dependencies = [ "displaydoc", "icu_collections", @@ -1798,67 +1366,54 @@ dependencies = [ "icu_properties", "icu_provider", "smallvec", - "utf16_iter", - "utf8_iter", - "write16", "zerovec", ] [[package]] name = "icu_normalizer_data" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" +checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" [[package]] name = "icu_properties" -version = "1.5.1" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" dependencies = [ "displaydoc", "icu_collections", - "icu_locid_transform", + "icu_locale_core", "icu_properties_data", "icu_provider", - "tinystr", + "potential_utf", + "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "1.5.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" +checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" [[package]] name = "icu_provider" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" dependencies = [ "displaydoc", - "icu_locid", - "icu_provider_macros", + "icu_locale_core", "stable_deref_trait", "tinystr", "writeable", "yoke", "zerofrom", + "zerotrie", "zerovec", ] -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.89", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -1867,9 +1422,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" dependencies = [ "idna_adapter", "smallvec", @@ -1878,55 +1433,14 @@ dependencies = [ [[package]] name = "idna_adapter" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" dependencies = [ "icu_normalizer", "icu_properties", ] -[[package]] -name = "im" -version = "15.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9" -dependencies = [ - "bitmaps", - "rand_core 0.6.4", - "rand_xoshiro", - "rayon", - "serde", - "sized-chunks", - "typenum", - "version_check", -] - -[[package]] -name = "include_dir" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" -dependencies = [ - "include_dir_macros", -] - -[[package]] -name = "include_dir_macros" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "index_list" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e6ba961c14e98151cd6416dd3685efe786a94c38bc1a535c06ceff0a1600813" - [[package]] name = "indexmap" version = "1.9.3" @@ -1950,32 +1464,31 @@ dependencies = [ ] [[package]] -name = "indicatif" -version = "0.17.9" +name = "io-uring" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf675b85ed934d3c67b5c5469701eec7db22689d0a2139d856e0925fa28b281" +checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b" dependencies = [ - "console", - "number_prefix", - "portable-atomic", - "unicode-width 0.2.0", - "web-time", + "bitflags", + "cfg-if", + "libc", ] [[package]] -name = "inout" -version = "0.1.3" +name = "ipnet" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" [[package]] -name = "ipnet" -version = "2.10.1" +name = "iri-string" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" +checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2" +dependencies = [ + "memchr", + "serde", +] [[package]] name = "itertools" @@ -2001,39 +1514,16 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" -[[package]] -name = "jobserver" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" -dependencies = [ - "libc", -] - [[package]] name = "js-sys" -version = "0.3.72" +version = "0.3.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305" dependencies = [ + "once_cell", "wasm-bindgen", ] -[[package]] -name = "jsonrpc-core" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" -dependencies = [ - "futures", - "futures-executor", - "futures-util", - "log", - "serde", - "serde_derive", - "serde_json", -] - [[package]] name = "keccak" version = "0.1.5" @@ -2051,20 +1541,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.164" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" - -[[package]] -name = "libredox" -version = "0.1.3" +version = "0.2.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.6.0", - "libc", - "redox_syscall", -] +checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174" [[package]] name = "libsecp256k1" @@ -2123,7 +1602,7 @@ dependencies = [ "ark-bn254", "ark-ff", "num-bigint 0.4.6", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2134,9 +1613,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "litemap" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" +checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" [[package]] name = "lock_api" @@ -2150,28 +1629,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" [[package]] -name = "lz4" -version = "1.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d1febb2b4a79ddd1980eede06a8f7902197960aa0383ffcfdd62fe723036725" -dependencies = [ - "lz4-sys", -] - -[[package]] -name = "lz4-sys" -version = "1.11.1+lz4-1.10.0" +name = "lru-slab" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6" -dependencies = [ - "cc", - "libc", -] +checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" [[package]] name = "memchr" @@ -2197,210 +1663,141 @@ dependencies = [ "autocfg", ] -[[package]] -name = "merlin" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" -dependencies = [ - "byteorder", - "keccak", - "rand_core 0.6.4", - "zeroize", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "mime_guess" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" -dependencies = [ - "mime", - "unicase", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" -version = "0.8.0" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ "adler2", ] [[package]] name = "mio" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" dependencies = [ - "hermit-abi 0.3.9", "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.52.0", -] - -[[package]] -name = "mockall" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96" -dependencies = [ - "cfg-if", - "downcast", - "fragile", - "lazy_static", - "mockall_derive", - "predicates", - "predicates-tree", -] - -[[package]] -name = "mockall_derive" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" -dependencies = [ - "cfg-if", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "modular-bitfield" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53d79ba8304ac1c4f9eb3b9d281f21f7be9d4626f72ce7df4ad8fbde4f38a74" -dependencies = [ - "modular-bitfield-impl", - "static_assertions", -] - -[[package]] -name = "modular-bitfield-impl" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a7d5f7076603ebc68de2dc6a650ec331a062a13abaa346975be747bbfa4b789" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "windows-sys 0.59.0", ] [[package]] name = "mollusk-svm" -version = "0.0.10-solana-2.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9626af76e957ae02120553335831d964d095c1530902fa582555bd949bb08e1a" +checksum = "9ac533eca9acad4fb7b4714557cd6263d494c59c02c96036196d4143b68795a8" dependencies = [ + "agave-feature-set", + "agave-precompiles", "bincode", "mollusk-svm-error", "mollusk-svm-fuzz-fixture-firedancer", "mollusk-svm-fuzz-fs", "mollusk-svm-keys", + "mollusk-svm-result", + "solana-account", "solana-bpf-loader-program", + "solana-clock", "solana-compute-budget", + "solana-epoch-rewards", + "solana-epoch-schedule", + "solana-hash", + "solana-instruction", + "solana-loader-v3-interface 3.0.0", + "solana-loader-v4-interface", + "solana-log-collector", "solana-logger", + "solana-precompile-error", + "solana-program-error", "solana-program-runtime", - "solana-sdk", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", + "solana-slot-hashes", + "solana-stake-interface", + "solana-svm-callback", "solana-system-program", + "solana-sysvar", + "solana-sysvar-id", + "solana-timings", + "solana-transaction-context", ] [[package]] name = "mollusk-svm-error" -version = "0.0.10-solana-2.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a766f14e1da90508b0a965986547f27e5cde64b727a85a67d313ed27ef2baa04" +checksum = "4135aa8a9c9069b30109262e63795959040888586ea8f90809c4365a6d439ee9" dependencies = [ - "solana-sdk", - "thiserror", + "solana-pubkey", + "thiserror 1.0.69", ] [[package]] name = "mollusk-svm-fuzz-fixture-firedancer" -version = "0.0.10-solana-2.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c684a6c6fcdde0fcd701fa67d52aaae253d0d53dd42e6901a58e3a1e17d827c7" +checksum = "e0a0f254714b6394f56f965b5651ad7a622e03d2c1b8d7c4bd43ef3ad734fde9" dependencies = [ + "agave-feature-set", "mollusk-svm-fuzz-fs", - "prost 0.10.4", - "prost-build 0.10.4", + "prost", + "prost-build", "serde", "serde_json", - "solana-compute-budget", - "solana-sdk", + "solana-account", + "solana-keccak-hasher", + "solana-pubkey", + "solana-transaction-context", + "which", ] [[package]] name = "mollusk-svm-fuzz-fs" -version = "0.0.10-solana-2.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ace04afb3e493de6e703188e7022240eb7066cc82005e4a52f67d6992f156fe" +checksum = "8b825237cb6bcd6da44b8f4852b62cb6c8279729950b5a18fb8cc3dff38374e3" dependencies = [ "bs58", - "prost 0.10.4", + "prost", "serde", "serde_json", - "solana-sdk", + "solana-keccak-hasher", ] [[package]] name = "mollusk-svm-keys" -version = "0.0.10-solana-2.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4a4bd0dc9357810c27a7eef7e780cb446b26c602eb1b92b56b43f3f7c0f9dc" +checksum = "b230d33b0194b126be2c37a19bf4d59d8e80a5ce63e8d3d4135a6cbf89ed3302" dependencies = [ "mollusk-svm-error", - "solana-sdk", + "solana-account", + "solana-instruction", + "solana-pubkey", + "solana-transaction-context", ] [[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "cfg_aliases 0.1.1", - "libc", - "memoffset", -] - -[[package]] -name = "nom" -version = "7.1.3" +name = "mollusk-svm-result" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +checksum = "a4c788b78a077f73b466dbfa7510804136075fd8e6f3eca8392018991c46fef3" dependencies = [ - "memchr", - "minimal-lexical", + "solana-account", + "solana-instruction", + "solana-program-error", + "solana-pubkey", + "solana-rent", ] [[package]] -name = "normalize-line-endings" -version = "0.3.0" +name = "multimap" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "num" @@ -2516,16 +1913,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.9", - "libc", -] - [[package]] name = "num_enum" version = "0.7.3" @@ -2547,30 +1934,15 @@ dependencies = [ "syn 2.0.89", ] -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - [[package]] name = "object" -version = "0.36.5" +version = "0.37.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" +checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" dependencies = [ "memchr", ] -[[package]] -name = "oid-registry" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" -dependencies = [ - "asn1-rs", -] - [[package]] name = "once_cell" version = "1.20.2" @@ -2584,35 +1956,52 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] -name = "openssl-probe" -version = "0.1.5" +name = "openssl" +version = "0.10.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8" +dependencies = [ + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] [[package]] -name = "opentelemetry" -version = "0.17.0" +name = "openssl-macros" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "js-sys", - "lazy_static", - "percent-encoding", - "pin-project", - "rand 0.8.5", - "thiserror", + "proc-macro2", + "quote", + "syn 2.0.89", +] + +[[package]] +name = "openssl-src" +version = "300.5.3+3.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc6bad8cd0233b63971e232cc9c5e83039375b8586d2312f31fda85db8f888c2" +dependencies = [ + "cc", ] [[package]] -name = "os_str_bytes" -version = "6.6.1" +name = "openssl-sys" +version = "0.9.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" +checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571" +dependencies = [ + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] [[package]] name = "parking_lot" @@ -2643,15 +2032,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" -[[package]] -name = "pbkdf2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" -dependencies = [ - "crypto-mac", -] - [[package]] name = "pbkdf2" version = "0.11.0" @@ -2661,15 +2041,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "pem" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" -dependencies = [ - "base64 0.13.1", -] - [[package]] name = "percent-encoding" version = "2.3.1" @@ -2696,30 +2067,10 @@ dependencies = [ ] [[package]] -name = "pin-project" -version = "1.1.7" +name = "pin-project-lite" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.89", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -2734,29 +2085,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] -name = "plain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" - -[[package]] -name = "polyval" -version = "0.6.2" +name = "potential_utf" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" +checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a" dependencies = [ - "cfg-if", - "cpufeatures", - "opaque-debug", - "universal-hash", + "zerovec", ] -[[package]] -name = "portable-atomic" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" - [[package]] name = "powerfmt" version = "0.2.0" @@ -2772,46 +2108,6 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "predicates" -version = "2.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" -dependencies = [ - "difflib", - "float-cmp", - "itertools 0.10.5", - "normalize-line-endings", - "predicates-core", - "regex", -] - -[[package]] -name = "predicates-core" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" - -[[package]] -name = "predicates-tree" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "prettyplease" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" -dependencies = [ - "proc-macro2", - "syn 1.0.109", -] - [[package]] name = "proc-macro-crate" version = "0.1.5" @@ -2830,86 +2126,30 @@ dependencies = [ "toml_edit", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" dependencies = [ "unicode-ident", ] [[package]] name = "prost" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" -dependencies = [ - "bytes", - "prost-derive 0.10.1", -] - -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive 0.11.9", -] - -[[package]] -name = "prost-build" -version = "0.10.4" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab" +checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" dependencies = [ "bytes", - "cfg-if", - "cmake", - "heck", - "itertools 0.10.5", - "lazy_static", - "log", - "multimap", - "petgraph", - "prost 0.10.4", - "prost-types 0.10.1", - "regex", - "tempfile", - "which", + "prost-derive", ] [[package]] name = "prost-build" -version = "0.11.9" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" dependencies = [ "bytes", "heck", @@ -2918,33 +2158,18 @@ dependencies = [ "log", "multimap", "petgraph", - "prettyplease", - "prost 0.11.9", - "prost-types 0.11.9", + "prost", + "prost-types", "regex", - "syn 1.0.109", "tempfile", "which", ] [[package]] name = "prost-derive" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "prost-derive" -version = "0.11.9" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" dependencies = [ "anyhow", "itertools 0.10.5", @@ -2955,21 +2180,12 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.10.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68" +checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" dependencies = [ "bytes", - "prost 0.10.4", -] - -[[package]] -name = "prost-types" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" -dependencies = [ - "prost 0.11.9", + "prost", ] [[package]] @@ -2994,50 +2210,57 @@ dependencies = [ [[package]] name = "quinn" -version = "0.10.2" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" +checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" dependencies = [ "bytes", + "cfg_aliases", "pin-project-lite", "quinn-proto", "quinn-udp", "rustc-hash", "rustls", - "thiserror", + "socket2", + "thiserror 2.0.17", "tokio", "tracing", + "web-time", ] [[package]] name = "quinn-proto" -version = "0.10.6" +version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" +checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" dependencies = [ "bytes", - "rand 0.8.5", - "ring 0.16.20", + "getrandom 0.3.3", + "lru-slab", + "rand 0.9.2", + "ring", "rustc-hash", "rustls", - "rustls-native-certs", + "rustls-pki-types", "slab", - "thiserror", + "thiserror 2.0.17", "tinyvec", "tracing", + "web-time", ] [[package]] name = "quinn-udp" -version = "0.4.1" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" +checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" dependencies = [ - "bytes", + "cfg_aliases", "libc", + "once_cell", "socket2", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.60.2", ] [[package]] @@ -3049,6 +2272,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + [[package]] name = "rand" version = "0.7.3" @@ -3073,6 +2302,16 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "rand" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.3", +] + [[package]] name = "rand_chacha" version = "0.2.2" @@ -3093,6 +2332,16 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.3", +] + [[package]] name = "rand_core" version = "0.5.1" @@ -3112,50 +2361,50 @@ dependencies = [ ] [[package]] -name = "rand_hc" -version = "0.2.0" +name = "rand_core" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ - "rand_core 0.5.1", + "getrandom 0.3.3", ] [[package]] -name = "rand_xoshiro" -version = "0.6.0" +name = "rand_hc" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" dependencies = [ - "rand_core 0.6.4", + "rand_core 0.5.1", ] [[package]] -name = "rayon" -version = "1.10.0" +name = "redox_syscall" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ - "either", - "rayon-core", + "bitflags", ] [[package]] -name = "rayon-core" -version = "1.12.1" +name = "ref-cast" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" dependencies = [ - "crossbeam-deque", - "crossbeam-utils", + "ref-cast-impl", ] [[package]] -name = "redox_syscall" -version = "0.5.7" +name = "ref-cast-impl" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ - "bitflags 2.6.0", + "proc-macro2", + "quote", + "syn 2.0.89", ] [[package]] @@ -3189,114 +2438,60 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" -version = "0.11.27" +version = "0.12.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb" dependencies = [ "async-compression", - "base64 0.21.7", + "base64 0.22.1", "bytes", - "encoding_rs", + "futures-channel", "futures-core", "futures-util", - "h2", "http", "http-body", + "http-body-util", "hyper", "hyper-rustls", - "ipnet", + "hyper-util", "js-sys", "log", - "mime", - "mime_guess", - "once_cell", "percent-encoding", "pin-project-lite", + "quinn", "rustls", - "rustls-pemfile", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", - "system-configuration", "tokio", "tokio-rustls", - "tokio-util 0.7.12", + "tokio-util", + "tower", + "tower-http", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.25.4", - "winreg", -] - -[[package]] -name = "reqwest-middleware" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a735987236a8e238bf0296c7e351b999c188ccc11477f311b82b55c93984216" -dependencies = [ - "anyhow", - "async-trait", - "http", - "reqwest", - "serde", - "task-local-extensions", - "thiserror", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", + "webpki-roots", ] [[package]] name = "ring" -version = "0.17.8" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", "getrandom 0.2.15", "libc", - "spin 0.9.8", - "untrusted 0.9.0", + "untrusted", "windows-sys 0.52.0", ] -[[package]] -name = "rpassword" -version = "7.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f" -dependencies = [ - "libc", - "rtoolbox", - "windows-sys 0.48.0", -] - -[[package]] -name = "rtoolbox" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "rustc-demangle" version = "0.1.24" @@ -3305,9 +2500,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" -version = "1.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" [[package]] name = "rustc_version" @@ -3318,22 +2513,13 @@ dependencies = [ "semver", ] -[[package]] -name = "rusticata-macros" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" -dependencies = [ - "nom", -] - [[package]] name = "rustix" version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ - "bitflags 2.6.0", + "bitflags", "errno", "libc", "linux-raw-sys", @@ -3342,45 +2528,37 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.12" +version = "0.23.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +checksum = "cd3c25631629d034ce7cd9940adc9d45762d46de2b0f57193c4443b92c6d4d40" dependencies = [ - "log", - "ring 0.17.8", + "once_cell", + "ring", + "rustls-pki-types", "rustls-webpki", - "sct", -] - -[[package]] -name = "rustls-native-certs" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", + "subtle", + "zeroize", ] [[package]] -name = "rustls-pemfile" -version = "1.0.4" +name = "rustls-pki-types" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" dependencies = [ - "base64 0.21.7", + "web-time", + "zeroize", ] [[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.103.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "e10b3f4191e8a80e6b43eebabfac91e5dcecebb27a71f04e820c47ec41d314bf" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "ring", + "rustls-pki-types", + "untrusted", ] [[package]] @@ -3396,21 +2574,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] -name = "same-file" -version = "1.0.6" +name = "schemars" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f" dependencies = [ - "winapi-util", + "dyn-clone", + "ref-cast", + "serde", + "serde_json", ] [[package]] -name = "schannel" -version = "0.1.27" +name = "schemars" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" +checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0" dependencies = [ - "windows-sys 0.59.0", + "dyn-clone", + "ref-cast", + "serde", + "serde_json", ] [[package]] @@ -3420,96 +2604,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "scroll" -version = "0.11.0" +name = "semver" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" -dependencies = [ - "scroll_derive", -] +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] -name = "scroll_derive" -version = "0.11.1" +name = "serde" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.89", + "serde_core", + "serde_derive", ] [[package]] -name = "sct" -version = "0.7.1" +name = "serde-big-array" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +checksum = "11fc7cc2c76d73e0f27ee52abbd64eec84d46f370c88371120433196934e4b7f" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "serde", ] [[package]] -name = "security-framework" -version = "2.11.1" +name = "serde_bytes" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" dependencies = [ - "bitflags 2.6.0", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", + "serde", ] [[package]] -name = "security-framework-sys" -version = "2.12.1" +name = "serde_core" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" - -[[package]] -name = "seqlock" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5c67b6f14ecc5b86c66fa63d76b5092352678545a8a3cdae80aef5128371910" -dependencies = [ - "parking_lot", -] - -[[package]] -name = "serde" -version = "1.0.215" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_bytes" -version = "0.11.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" -dependencies = [ - "serde", + "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.215" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -3518,14 +2659,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.133" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -3542,49 +2684,29 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" -dependencies = [ - "serde", - "serde_with_macros 2.3.3", -] - -[[package]] -name = "serde_with" -version = "3.11.0" +version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" +checksum = "c522100790450cf78eeac1507263d0a350d4d5b30df0c8e1fe051a10c22b376e" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", "indexmap 2.6.0", + "schemars 0.9.0", + "schemars 1.0.4", "serde", "serde_derive", "serde_json", - "serde_with_macros 3.11.0", + "serde_with_macros", "time", ] [[package]] name = "serde_with_macros" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.89", -] - -[[package]] -name = "serde_with_macros" -version = "3.11.0" +version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" +checksum = "327ada00f7d64abaac1e55a6911e90cf665aa051b9a561c7006c157f4633135e" dependencies = [ "darling", "proc-macro2", @@ -3592,17 +2714,6 @@ dependencies = [ "syn 2.0.89", ] -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - [[package]] name = "sha2" version = "0.9.9" @@ -3627,18 +2738,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "sha3" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" -dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "keccak", - "opaque-debug", -] - [[package]] name = "sha3" version = "0.10.8" @@ -3695,27 +2794,22 @@ dependencies = [ "shank_macro_impl", ] -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shell-words" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" - [[package]] name = "shlex" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "signal-hook" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2" +dependencies = [ + "libc", + "signal-hook-registry", +] + [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -3737,24 +2831,11 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" -[[package]] -name = "sized-chunks" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" -dependencies = [ - "bitmaps", - "typenum", -] - [[package]] name = "slab" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] +checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" [[package]] name = "smallvec" @@ -3764,1481 +2845,1715 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.7" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] -name = "solana-account-decoder" -version = "2.0.9" +name = "solana-account" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1889be2bdb77224ed1bb726e64983a9ede622da5a22e8fb0619a2ec6885e84f2" +checksum = "0f949fe4edaeaea78c844023bfc1c898e0b1f5a100f8a8d2d0f85d0a7b090258" dependencies = [ - "Inflector", - "base64 0.22.1", "bincode", - "bs58", - "bv", - "lazy_static", + "qualifier_attr", "serde", + "serde_bytes", "serde_derive", - "serde_json", - "solana-config-program", - "solana-sdk", - "spl-token", - "spl-token-2022", - "spl-token-group-interface", - "spl-token-metadata-interface", - "thiserror", - "zstd", + "solana-account-info", + "solana-clock", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", + "solana-sysvar", ] [[package]] -name = "solana-accounts-db" -version = "2.0.9" +name = "solana-account-info" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9f880ccb0b22c4fdefd47e2cea6509661b6b9ee193334606f0ca5ecdb4edc32" +checksum = "c8f5152a288ef1912300fc6efa6c2d1f9bb55d9398eb6c72326360b8063987da" dependencies = [ "bincode", - "blake3", - "bv", - "bytemuck", - "bytemuck_derive", - "bzip2", - "crossbeam-channel", - "dashmap", - "index_list", - "indexmap 2.6.0", - "itertools 0.12.1", - "lazy_static", - "log", - "lz4", - "memmap2", - "modular-bitfield", - "num_cpus", - "num_enum", - "rand 0.8.5", - "rayon", - "rustc_version", - "seqlock", "serde", - "serde_derive", - "smallvec", - "solana-bucket-map", - "solana-inline-spl", - "solana-measure", - "solana-metrics", - "solana-nohash-hasher", - "solana-rayon-threadlimit", - "solana-sdk", - "solana-svm", - "static_assertions", - "tar", - "tempfile", - "thiserror", + "solana-program-error", + "solana-program-memory", + "solana-pubkey", ] [[package]] -name = "solana-address-lookup-table-program" -version = "2.0.9" +name = "solana-address-lookup-table-interface" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0165da335eb1b5b2da4a8c546e393cdbd55263d3a7eb3136a362553a9cb4678b" +checksum = "d1673f67efe870b64a65cb39e6194be5b26527691ce5922909939961a6e6b395" dependencies = [ "bincode", "bytemuck", - "log", - "num-derive 0.4.2", - "num-traits", - "rustc_version", - "solana-program", - "solana-program-runtime", - "solana-sdk", - "thiserror", + "serde", + "serde_derive", + "solana-clock", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", + "solana-slot-hashes", ] [[package]] -name = "solana-banks-client" -version = "2.0.9" +name = "solana-atomic-u64" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34f632a5ca86729b3674afa3c7bb50f7c1e093f200fc8e34618b246093a49cc2" +checksum = "d52e52720efe60465b052b9e7445a01c17550666beec855cce66f44766697bc2" dependencies = [ - "borsh 1.5.3", - "futures", - "solana-banks-interface", - "solana-program", - "solana-sdk", - "tarpc", - "thiserror", - "tokio", - "tokio-serde", + "parking_lot", ] [[package]] -name = "solana-banks-interface" -version = "2.0.9" +name = "solana-big-mod-exp" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63a1c61cfea4a0d3aad3f300c9ded38f0f77a9e4a36a7cabeea5f9c092014ba1" +checksum = "75db7f2bbac3e62cfd139065d15bcda9e2428883ba61fc8d27ccb251081e7567" dependencies = [ - "serde", - "serde_derive", - "solana-sdk", - "tarpc", + "num-bigint 0.4.6", + "num-traits", + "solana-define-syscall", ] [[package]] -name = "solana-banks-server" -version = "2.0.9" +name = "solana-bincode" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "268119cc56fed44c36e1e12cd2628c2d5643031ed6d91be872f5e1e08db9c606" +checksum = "19a3787b8cf9c9fe3dd360800e8b70982b9e5a8af9e11c354b6665dd4a003adc" dependencies = [ "bincode", - "crossbeam-channel", - "futures", - "solana-banks-interface", - "solana-client", - "solana-runtime", - "solana-sdk", - "solana-send-transaction-service", - "solana-svm", - "tarpc", - "tokio", - "tokio-serde", + "serde", + "solana-instruction", +] + +[[package]] +name = "solana-blake3-hasher" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a0801e25a1b31a14494fc80882a036be0ffd290efc4c2d640bfcca120a4672" +dependencies = [ + "blake3", + "solana-define-syscall", + "solana-hash", + "solana-sanitize", +] + +[[package]] +name = "solana-bn254" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4420f125118732833f36facf96a27e7b78314b2d642ba07fa9ffdacd8d79e243" +dependencies = [ + "ark-bn254", + "ark-ec", + "ark-ff", + "ark-serialize", + "bytemuck", + "solana-define-syscall", + "thiserror 2.0.17", +] + +[[package]] +name = "solana-borsh" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "718333bcd0a1a7aed6655aa66bef8d7fb047944922b2d3a18f49cbc13e73d004" +dependencies = [ + "borsh 0.10.4", + "borsh 1.5.7", ] [[package]] name = "solana-bpf-loader-program" -version = "2.0.9" +version = "2.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ac9c67b1651c35868323f551ada9aa468f0ff731afa0e07084b5af3ef35958" +checksum = "6daee6ef83e49a59375b8858244be57cadc632381fa8e514a788af0699b66b4e" dependencies = [ "bincode", - "byteorder", "libsecp256k1", - "log", + "num-traits", + "qualifier_attr", "scopeguard", - "solana-compute-budget", + "solana-account", + "solana-account-info", + "solana-big-mod-exp", + "solana-bincode", + "solana-blake3-hasher", + "solana-bn254", + "solana-clock", + "solana-cpi", "solana-curve25519", + "solana-hash", + "solana-instruction", + "solana-keccak-hasher", + "solana-loader-v3-interface 5.0.0", + "solana-loader-v4-interface", + "solana-log-collector", "solana-measure", + "solana-packet", "solana-poseidon", + "solana-program-entrypoint", "solana-program-runtime", - "solana-sdk", + "solana-pubkey", + "solana-sbpf", + "solana-sdk-ids", + "solana-secp256k1-recover", + "solana-sha256-hasher", + "solana-stable-layout", + "solana-svm-feature-set", + "solana-system-interface", + "solana-sysvar", + "solana-sysvar-id", + "solana-timings", + "solana-transaction-context", "solana-type-overrides", - "solana_rbpf", - "thiserror", + "thiserror 2.0.17", ] [[package]] -name = "solana-bucket-map" -version = "2.0.9" +name = "solana-client-traits" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ebb86a25bc3a67b905f7ffb87db28a3f3e5531aabe340cb5ab5cdbc85f25992" +checksum = "83f0071874e629f29e0eb3dab8a863e98502ac7aba55b7e0df1803fc5cac72a7" dependencies = [ - "bv", - "bytemuck", - "bytemuck_derive", - "log", - "memmap2", - "modular-bitfield", - "num_enum", - "rand 0.8.5", - "solana-measure", - "solana-sdk", - "tempfile", + "solana-account", + "solana-commitment-config", + "solana-epoch-info", + "solana-hash", + "solana-instruction", + "solana-keypair", + "solana-message", + "solana-pubkey", + "solana-signature", + "solana-signer", + "solana-system-interface", + "solana-transaction", + "solana-transaction-error", ] [[package]] -name = "solana-clap-utils" -version = "2.0.9" +name = "solana-clock" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "044b8e6933bf9d6ccba74e4ea9b9ef589d3e89347d816fdbdeaf31cb218804db" +checksum = "1bb482ab70fced82ad3d7d3d87be33d466a3498eb8aa856434ff3c0dfc2e2e31" dependencies = [ - "chrono", - "clap 2.34.0", - "rpassword", - "solana-remote-wallet", - "solana-sdk", - "thiserror", - "tiny-bip39", - "uriparse", - "url", + "serde", + "serde_derive", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", ] [[package]] -name = "solana-client" -version = "2.0.9" +name = "solana-cluster-type" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0dca5fbbb18347109189799fc4554ba311eb201af9ffdf683628477e9652ccf" +checksum = "7ace9fea2daa28354d107ea879cff107181d85cd4e0f78a2bedb10e1a428c97e" dependencies = [ - "async-trait", - "bincode", - "dashmap", - "futures", - "futures-util", - "indexmap 2.6.0", - "indicatif", - "log", - "quinn", - "rayon", - "solana-connection-cache", - "solana-measure", - "solana-metrics", - "solana-pubsub-client", - "solana-quic-client", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-rpc-client-nonce-utils", - "solana-sdk", - "solana-streamer", - "solana-thin-client", - "solana-tpu-client", - "solana-udp-client", - "thiserror", - "tokio", + "serde", + "serde_derive", + "solana-hash", ] [[package]] -name = "solana-compute-budget" -version = "2.0.9" +name = "solana-commitment-config" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a9d6e202f04a2f57b314ba3494a5230f9708247070393f782a754774b1fbb3" +checksum = "ac49c4dde3edfa832de1697e9bcdb7c3b3f7cb7a1981b7c62526c8bb6700fb73" dependencies = [ - "rustc_version", - "solana-sdk", + "serde", + "serde_derive", ] [[package]] -name = "solana-compute-budget-program" -version = "2.0.9" +name = "solana-compute-budget" +version = "2.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17a441d7944c8df0068b011aa34e60b3c60032baa99057af0d37e09849eaa51c" +checksum = "69b145d19103c186d49a4f98d63d5aff90dfefcf133c4d798578200f0b0dd3b3" dependencies = [ + "solana-fee-structure", "solana-program-runtime", - "solana-sdk", ] [[package]] -name = "solana-config-program" -version = "2.0.9" +name = "solana-compute-budget-interface" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92bbca6f0351b8bf3de4472a6cdc4e5f94ddd8eb571230eb6c57ed42bda10553" +checksum = "8432d2c4c22d0499aa06d62e4f7e333f81777b3d7c96050ae9e5cb71a8c3aee4" dependencies = [ - "bincode", - "chrono", + "borsh 1.5.7", "serde", "serde_derive", - "solana-program-runtime", - "solana-sdk", + "solana-instruction", + "solana-sdk-ids", ] [[package]] -name = "solana-connection-cache" -version = "2.0.9" +name = "solana-cpi" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c72db598b2e364b2457c54a3d26935accf691643a4d9bf94396f526606ff1764" +checksum = "8dc71126edddc2ba014622fc32d0f5e2e78ec6c5a1e0eb511b85618c09e9ea11" dependencies = [ - "async-trait", - "bincode", - "crossbeam-channel", - "futures-util", - "indexmap 2.6.0", - "log", - "rand 0.8.5", - "rayon", - "solana-measure", - "solana-metrics", - "solana-sdk", - "thiserror", - "tokio", + "solana-account-info", + "solana-define-syscall", + "solana-instruction", + "solana-program-error", + "solana-pubkey", + "solana-stable-layout", ] [[package]] -name = "solana-cost-model" -version = "2.0.9" +name = "solana-curve25519" +version = "2.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f87cc950f6af99e19702f8ae1185d19a6f77b63856fb02b0af9f995630a1c08" +checksum = "fa77936de1910002e7ad5817e38c3990402c2d8e92517cdd736df51485c76d88" dependencies = [ - "ahash", - "lazy_static", - "log", - "rustc_version", - "solana-address-lookup-table-program", - "solana-bpf-loader-program", - "solana-compute-budget", - "solana-compute-budget-program", - "solana-config-program", - "solana-loader-v4-program", - "solana-metrics", - "solana-sdk", - "solana-stake-program", - "solana-system-program", - "solana-vote-program", + "bytemuck", + "bytemuck_derive", + "curve25519-dalek 4.1.3", + "solana-define-syscall", + "subtle", + "thiserror 2.0.17", ] [[package]] -name = "solana-curve25519" -version = "2.0.9" +name = "solana-decode-error" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa9209adbba7662a0a6a79ab48b4d09a2cb23a3db3dd817818e1bc28da99a11" +checksum = "8c781686a18db2f942e70913f7ca15dc120ec38dcab42ff7557db2c70c625a35" dependencies = [ - "bytemuck", - "bytemuck_derive", - "curve25519-dalek", - "solana-program", - "thiserror", + "num-traits", ] [[package]] -name = "solana-inline-spl" -version = "2.0.9" +name = "solana-define-syscall" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ae3e2abcf541c8122eafe9a625d4d194b4023c20adde1e251f94e056bb1aee2" + +[[package]] +name = "solana-derivation-path" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb9977e0e7769dfef30b1390289a65eb10b9553c4590eecd1fa5abbf2224c30" +checksum = "939756d798b25c5ec3cca10e06212bdca3b1443cb9bb740a38124f58b258737b" dependencies = [ - "bytemuck", - "rustc_version", - "solana-sdk", + "derivation-path", + "qstring", + "uriparse", ] [[package]] -name = "solana-loader-v3-program" -version = "0.0.0" +name = "solana-ed25519-program" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1feafa1691ea3ae588f99056f4bdd1293212c7ece28243d7da257c443e84753" +dependencies = [ + "bytemuck", + "bytemuck_derive", + "ed25519-dalek", + "solana-feature-set", + "solana-instruction", + "solana-precompile-error", + "solana-sdk-ids", +] + +[[package]] +name = "solana-epoch-info" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ef6f0b449290b0b9f32973eefd95af35b01c5c0c34c569f936c34c5b20d77b" dependencies = [ - "bincode", - "mollusk-svm", - "num-derive 0.3.3", - "num-traits", "serde", - "shank", - "solana-program", - "solana-sdk", - "thiserror", + "serde_derive", ] [[package]] -name = "solana-loader-v3-program-client" -version = "0.0.0" +name = "solana-epoch-rewards" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b575d3dd323b9ea10bb6fe89bf6bf93e249b215ba8ed7f68f1a3633f384db7" dependencies = [ - "assert_matches", - "borsh 0.10.4", - "num-derive 0.3.3", - "num-traits", "serde", - "serde_with 3.11.0", - "solana-program", - "solana-program-test", - "solana-sdk", - "thiserror", + "serde_derive", + "solana-hash", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", ] [[package]] -name = "solana-loader-v4-program" -version = "2.0.9" +name = "solana-epoch-rewards-hasher" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "492191406c9ca8acb6917c63079432a20d024c3d0ee094bb6970a87cdcc3f6a5" +checksum = "96c5fd2662ae7574810904585fd443545ed2b568dbd304b25a31e79ccc76e81b" dependencies = [ - "log", - "solana-compute-budget", - "solana-measure", - "solana-program-runtime", - "solana-sdk", - "solana-type-overrides", - "solana_rbpf", + "siphasher", + "solana-hash", + "solana-pubkey", ] [[package]] -name = "solana-logger" -version = "2.0.9" +name = "solana-epoch-schedule" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ad3a2edfbecfd010c45b4fe34c472910392e273cf165a03e187cb09cf690b22" +checksum = "3fce071fbddecc55d727b1d7ed16a629afe4f6e4c217bc8d00af3b785f6f67ed" dependencies = [ - "env_logger", - "lazy_static", - "log", + "serde", + "serde_derive", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", ] [[package]] -name = "solana-measure" -version = "2.0.9" +name = "solana-example-mocks" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d08a0175bfa4cb16889feeca9d4d5bc144a91cfbe19a3746f1823600a62684b" +checksum = "84461d56cbb8bb8d539347151e0525b53910102e4bced875d49d5139708e39d3" dependencies = [ - "log", - "solana-sdk", + "serde", + "serde_derive", + "solana-address-lookup-table-interface", + "solana-clock", + "solana-hash", + "solana-instruction", + "solana-keccak-hasher", + "solana-message", + "solana-nonce", + "solana-pubkey", + "solana-sdk-ids", + "solana-system-interface", + "thiserror 2.0.17", ] [[package]] -name = "solana-metrics" -version = "2.0.9" +name = "solana-feature-gate-interface" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d312fb471563f31fee1578ca8c51619458bddf25f36ad10388a2a1812ee27e25" +checksum = "43f5c5382b449e8e4e3016fb05e418c53d57782d8b5c30aa372fc265654b956d" dependencies = [ - "crossbeam-channel", - "gethostname", + "bincode", + "serde", + "serde_derive", + "solana-account", + "solana-account-info", + "solana-instruction", + "solana-program-error", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", + "solana-system-interface", +] + +[[package]] +name = "solana-feature-set" +version = "2.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93b93971e289d6425f88e6e3cb6668c4b05df78b3c518c249be55ced8efd6b6d" +dependencies = [ + "ahash", "lazy_static", - "log", - "reqwest", - "solana-sdk", - "thiserror", + "solana-epoch-schedule", + "solana-hash", + "solana-pubkey", + "solana-sha256-hasher", ] [[package]] -name = "solana-net-utils" -version = "2.0.9" +name = "solana-fee-calculator" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed5791e57f3d2e2bf05c23d3be6c8a536dbbb10fe9a3e992b1e4a71eab132b11" +checksum = "d89bc408da0fb3812bc3008189d148b4d3e08252c79ad810b245482a3f70cd8d" dependencies = [ - "bincode", - "clap 3.2.25", - "crossbeam-channel", "log", - "nix", - "rand 0.8.5", "serde", "serde_derive", - "socket2", - "solana-logger", - "solana-sdk", - "solana-version", - "static_assertions", - "tokio", - "url", ] [[package]] -name = "solana-nohash-hasher" -version = "0.2.1" +name = "solana-fee-structure" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8a731ed60e89177c8a7ab05fe0f1511cedd3e70e773f288f9de33a9cfdc21e" +checksum = "33adf673581c38e810bf618f745bf31b683a0a4a4377682e6aaac5d9a058dd4e" +dependencies = [ + "serde", + "serde_derive", + "solana-message", + "solana-native-token", +] [[package]] -name = "solana-perf" -version = "2.0.9" +name = "solana-genesis-config" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab0b0dbc72b93e800c6034c3d76f5e3a09f8fcfb63a1c07853bed54aac2b4094" +checksum = "b3725085d47b96d37fef07a29d78d2787fc89a0b9004c66eed7753d1e554989f" dependencies = [ - "ahash", "bincode", - "bv", - "caps", - "curve25519-dalek", - "dlopen2", - "fnv", - "lazy_static", - "libc", - "log", - "nix", - "rand 0.8.5", - "rayon", - "rustc_version", + "chrono", + "memmap2", "serde", - "solana-metrics", - "solana-rayon-threadlimit", - "solana-sdk", - "solana-vote-program", + "serde_derive", + "solana-account", + "solana-clock", + "solana-cluster-type", + "solana-epoch-schedule", + "solana-fee-calculator", + "solana-hash", + "solana-inflation", + "solana-keypair", + "solana-logger", + "solana-poh-config", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", + "solana-sha256-hasher", + "solana-shred-version", + "solana-signer", + "solana-time-utils", ] [[package]] -name = "solana-poseidon" -version = "2.0.9" +name = "solana-hard-forks" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e84df7056e4c26cf6f4055b28b61bb28f70d6ee0a469ae6a7b2f062090911b1e" +checksum = "b6c28371f878e2ead55611d8ba1b5fb879847156d04edea13693700ad1a28baf" dependencies = [ - "ark-bn254", - "light-poseidon", - "thiserror", + "serde", + "serde_derive", ] [[package]] -name = "solana-program" -version = "2.0.9" +name = "solana-hash" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51237f3618428e8b9dd1e5c3d89b8f44f00dbcb88a7ad577ebdfdfac51501c61" +checksum = "b5b96e9f0300fa287b545613f007dfe20043d7812bee255f418c1eb649c93b63" dependencies = [ - "ark-bn254", - "ark-ec", - "ark-ff", - "ark-serialize", - "base64 0.22.1", - "bincode", - "bitflags 2.6.0", - "blake3", - "borsh 0.10.4", - "borsh 1.5.3", - "bs58", - "bv", + "borsh 1.5.7", "bytemuck", "bytemuck_derive", - "console_error_panic_hook", - "console_log", - "curve25519-dalek", + "five8", + "js-sys", + "serde", + "serde_derive", + "solana-atomic-u64", + "solana-sanitize", + "wasm-bindgen", +] + +[[package]] +name = "solana-inflation" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23eef6a09eb8e568ce6839573e4966850e85e9ce71e6ae1a6c930c1c43947de3" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "solana-instruction" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47298e2ce82876b64f71e9d13a46bc4b9056194e7f9937ad3084385befa50885" +dependencies = [ + "bincode", + "borsh 1.5.7", "getrandom 0.2.15", "js-sys", - "lazy_static", - "libsecp256k1", - "log", - "memoffset", - "num-bigint 0.4.6", - "num-derive 0.4.2", "num-traits", - "parking_lot", - "rand 0.8.5", - "rustc_version", - "rustversion", "serde", - "serde_bytes", "serde_derive", - "sha2 0.10.8", - "sha3 0.10.8", - "solana-sdk-macro", - "thiserror", + "solana-define-syscall", + "solana-pubkey", "wasm-bindgen", ] [[package]] -name = "solana-program-runtime" -version = "2.0.9" +name = "solana-instructions-sysvar" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8d2c1801dc17b166db40968ef1ab30f71b319edcaa69efe8c29a66258baff52" +checksum = "e0e85a6fad5c2d0c4f5b91d34b8ca47118fc593af706e523cdbedf846a954f57" +dependencies = [ + "bitflags", + "solana-account-info", + "solana-instruction", + "solana-program-error", + "solana-pubkey", + "solana-sanitize", + "solana-sdk-ids", + "solana-serialize-utils", + "solana-sysvar-id", +] + +[[package]] +name = "solana-keccak-hasher" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7aeb957fbd42a451b99235df4942d96db7ef678e8d5061ef34c9b34cae12f79" +dependencies = [ + "sha3", + "solana-define-syscall", + "solana-hash", + "solana-sanitize", +] + +[[package]] +name = "solana-keypair" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd3f04aa1a05c535e93e121a95f66e7dcccf57e007282e8255535d24bf1e98bb" +dependencies = [ + "ed25519-dalek", + "ed25519-dalek-bip32", + "five8", + "rand 0.7.3", + "solana-derivation-path", + "solana-pubkey", + "solana-seed-derivable", + "solana-seed-phrase", + "solana-signature", + "solana-signer", + "wasm-bindgen", +] + +[[package]] +name = "solana-last-restart-slot" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a6360ac2fdc72e7463565cd256eedcf10d7ef0c28a1249d261ec168c1b55cdd" +dependencies = [ + "serde", + "serde_derive", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", +] + +[[package]] +name = "solana-loader-v2-interface" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8ab08006dad78ae7cd30df8eea0539e207d08d91eaefb3e1d49a446e1c49654" +dependencies = [ + "serde", + "serde_bytes", + "serde_derive", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", +] + +[[package]] +name = "solana-loader-v3-interface" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4be76cfa9afd84ca2f35ebc09f0da0f0092935ccdac0595d98447f259538c2" +dependencies = [ + "serde", + "serde_bytes", + "serde_derive", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", +] + +[[package]] +name = "solana-loader-v3-interface" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f7162a05b8b0773156b443bccd674ea78bb9aa406325b467ea78c06c99a63a2" +dependencies = [ + "serde", + "serde_bytes", + "serde_derive", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", + "solana-system-interface", +] + +[[package]] +name = "solana-loader-v3-program" +version = "0.0.0" dependencies = [ - "base64 0.22.1", "bincode", - "eager", - "enum-iterator", - "itertools 0.12.1", - "libc", - "log", - "num-derive 0.4.2", + "mollusk-svm", + "num-derive 0.3.3", "num-traits", - "percentage", - "rand 0.8.5", - "rustc_version", "serde", - "solana-compute-budget", - "solana-measure", - "solana-metrics", + "shank", + "solana-program", "solana-sdk", - "solana-type-overrides", - "solana-vote", - "solana_rbpf", - "thiserror", + "thiserror 1.0.69", +] + +[[package]] +name = "solana-loader-v3-program-client" +version = "0.0.0" +dependencies = [ + "borsh 0.10.4", + "num-derive 0.4.2", + "num-traits", + "serde", + "serde_with", + "solana-account", + "solana-account-info", + "solana-cpi", + "solana-decode-error", + "solana-instruction", + "solana-program-error", + "solana-pubkey", + "thiserror 1.0.69", ] [[package]] -name = "solana-program-test" -version = "2.0.9" +name = "solana-loader-v4-interface" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3e91ce4c8966da7a69cbc9e89c7f3909b916c1ba764f3f90e98f84ec573e566" +checksum = "706a777242f1f39a83e2a96a2a6cb034cb41169c6ecbee2cf09cb873d9659e7e" +dependencies = [ + "serde", + "serde_bytes", + "serde_derive", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", + "solana-system-interface", +] + +[[package]] +name = "solana-log-collector" +version = "2.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "621d265d37dbe119e28d481f6db3883294e75966b79293a6edaa8deeac2dfc3d" dependencies = [ - "assert_matches", - "async-trait", - "base64 0.22.1", - "bincode", - "chrono-humanize", - "crossbeam-channel", "log", +] + +[[package]] +name = "solana-logger" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8e777ec1afd733939b532a42492d888ec7c88d8b4127a5d867eb45c6eb5cd5" +dependencies = [ + "env_logger", + "lazy_static", + "libc", + "log", + "signal-hook", +] + +[[package]] +name = "solana-measure" +version = "2.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d98d3c9827ce044863fc67b7cbc15c341c27bf6fa9c1070deccd2a4aa7cb801d" + +[[package]] +name = "solana-message" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1796aabce376ff74bf89b78d268fa5e683d7d7a96a0a4e4813ec34de49d5314b" +dependencies = [ + "bincode", + "blake3", + "lazy_static", "serde", - "solana-accounts-db", - "solana-banks-client", - "solana-banks-interface", - "solana-banks-server", - "solana-bpf-loader-program", - "solana-compute-budget", - "solana-inline-spl", - "solana-logger", - "solana-program-runtime", - "solana-runtime", - "solana-sdk", - "solana-svm", - "solana-vote-program", - "solana_rbpf", - "thiserror", - "tokio", + "serde_derive", + "solana-bincode", + "solana-hash", + "solana-instruction", + "solana-pubkey", + "solana-sanitize", + "solana-sdk-ids", + "solana-short-vec", + "solana-system-interface", + "solana-transaction-error", + "wasm-bindgen", ] [[package]] -name = "solana-pubsub-client" -version = "2.0.9" +name = "solana-metrics" +version = "2.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfee83758014a114d622926172dc5ba661490bee32b1b6cac5b2fe06d53f3e6e" +checksum = "062baa36c40a08f413b1f84c8b739649609883af47e1624a85eaf9f90075441e" dependencies = [ "crossbeam-channel", - "futures-util", + "gethostname", "log", "reqwest", - "semver", + "solana-cluster-type", + "solana-sha256-hasher", + "solana-time-utils", + "thiserror 2.0.17", +] + +[[package]] +name = "solana-msg" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36a1a14399afaabc2781a1db09cb14ee4cc4ee5c7a5a3cfcc601811379a8092" +dependencies = [ + "solana-define-syscall", +] + +[[package]] +name = "solana-native-token" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61515b880c36974053dd499c0510066783f0cc6ac17def0c7ef2a244874cf4a9" + +[[package]] +name = "solana-nonce" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703e22eb185537e06204a5bd9d509b948f0066f2d1d814a6f475dafb3ddf1325" +dependencies = [ "serde", "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-rpc-client-api", - "solana-sdk", - "thiserror", - "tokio", - "tokio-stream", - "tokio-tungstenite", - "tungstenite", - "url", + "solana-fee-calculator", + "solana-hash", + "solana-pubkey", + "solana-sha256-hasher", ] [[package]] -name = "solana-quic-client" -version = "2.0.9" +name = "solana-nonce-account" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3c92fbee83d91f9374cc5e74ec01c7cd8aed846b4c27bc6badf890dcd9441b" +checksum = "cde971a20b8dbf60144d6a84439dda86b5466e00e2843091fe731083cda614da" dependencies = [ - "async-mutex", - "async-trait", - "futures", - "itertools 0.12.1", - "lazy_static", - "log", - "quinn", - "quinn-proto", - "rustls", - "solana-connection-cache", - "solana-measure", - "solana-metrics", - "solana-net-utils", - "solana-rpc-client-api", - "solana-sdk", - "solana-streamer", - "thiserror", - "tokio", + "solana-account", + "solana-hash", + "solana-nonce", + "solana-sdk-ids", ] [[package]] -name = "solana-rayon-threadlimit" -version = "2.0.9" +name = "solana-offchain-message" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e56a83aaa9a09975a5ae7bcbaa59b1fa40414505ac1a4640b350c4b200453ac7" +checksum = "b526398ade5dea37f1f147ce55dae49aa017a5d7326606359b0445ca8d946581" dependencies = [ - "lazy_static", - "num_cpus", + "num_enum", + "solana-hash", + "solana-packet", + "solana-pubkey", + "solana-sanitize", + "solana-sha256-hasher", + "solana-signature", + "solana-signer", ] [[package]] -name = "solana-remote-wallet" -version = "2.0.9" +name = "solana-packet" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca04ef9dbc5d285af02759b788f42b33f2d537f9f4ec9cfe18bbd560f1caac9" +checksum = "004f2d2daf407b3ec1a1ca5ec34b3ccdfd6866dd2d3c7d0715004a96e4b6d127" +dependencies = [ + "bincode", + "bitflags", + "cfg_eval", + "serde", + "serde_derive", + "serde_with", +] + +[[package]] +name = "solana-poh-config" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d650c3b4b9060082ac6b0efbbb66865089c58405bfb45de449f3f2b91eccee75" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "solana-poseidon" +version = "2.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0438136b52589ae8e6c3764edc186455b420693c3e83838d5ae40a3dba9c102" +dependencies = [ + "ark-bn254", + "light-poseidon", + "solana-define-syscall", + "thiserror 2.0.17", +] + +[[package]] +name = "solana-precompile-error" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d87b2c1f5de77dfe2b175ee8dd318d196aaca4d0f66f02842f80c852811f9f8" dependencies = [ - "console", - "dialoguer", - "log", - "num-derive 0.4.2", "num-traits", - "parking_lot", - "qstring", - "semver", - "solana-sdk", - "thiserror", - "uriparse", + "solana-decode-error", ] [[package]] -name = "solana-rpc-client" -version = "2.0.9" +name = "solana-precompiles" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1940f4fa5dcbffc21c35ac4dc9e63545647b39f24ef92bd60ee4c14373f6c772" +checksum = "36e92768a57c652edb0f5d1b30a7d0bc64192139c517967c18600debe9ae3832" +dependencies = [ + "lazy_static", + "solana-ed25519-program", + "solana-feature-set", + "solana-message", + "solana-precompile-error", + "solana-pubkey", + "solana-sdk-ids", + "solana-secp256k1-program", + "solana-secp256r1-program", +] + +[[package]] +name = "solana-presigner" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81a57a24e6a4125fc69510b6774cd93402b943191b6cddad05de7281491c90fe" +dependencies = [ + "solana-pubkey", + "solana-signature", + "solana-signer", +] + +[[package]] +name = "solana-program" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98eca145bd3545e2fbb07166e895370576e47a00a7d824e325390d33bf467210" dependencies = [ - "async-trait", - "base64 0.22.1", "bincode", + "blake3", + "borsh 0.10.4", + "borsh 1.5.7", "bs58", - "indicatif", + "bytemuck", + "console_error_panic_hook", + "console_log", + "getrandom 0.2.15", + "lazy_static", "log", - "reqwest", - "reqwest-middleware", - "semver", + "memoffset", + "num-bigint 0.4.6", + "num-derive 0.4.2", + "num-traits", + "rand 0.8.5", "serde", + "serde_bytes", "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-rpc-client-api", - "solana-sdk", - "solana-transaction-status", - "solana-version", - "solana-vote-program", - "tokio", + "solana-account-info", + "solana-address-lookup-table-interface", + "solana-atomic-u64", + "solana-big-mod-exp", + "solana-bincode", + "solana-blake3-hasher", + "solana-borsh", + "solana-clock", + "solana-cpi", + "solana-decode-error", + "solana-define-syscall", + "solana-epoch-rewards", + "solana-epoch-schedule", + "solana-example-mocks", + "solana-feature-gate-interface", + "solana-fee-calculator", + "solana-hash", + "solana-instruction", + "solana-instructions-sysvar", + "solana-keccak-hasher", + "solana-last-restart-slot", + "solana-loader-v2-interface", + "solana-loader-v3-interface 5.0.0", + "solana-loader-v4-interface", + "solana-message", + "solana-msg", + "solana-native-token", + "solana-nonce", + "solana-program-entrypoint", + "solana-program-error", + "solana-program-memory", + "solana-program-option", + "solana-program-pack", + "solana-pubkey", + "solana-rent", + "solana-sanitize", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-secp256k1-recover", + "solana-serde-varint", + "solana-serialize-utils", + "solana-sha256-hasher", + "solana-short-vec", + "solana-slot-hashes", + "solana-slot-history", + "solana-stable-layout", + "solana-stake-interface", + "solana-system-interface", + "solana-sysvar", + "solana-sysvar-id", + "solana-vote-interface", + "thiserror 2.0.17", + "wasm-bindgen", ] [[package]] -name = "solana-rpc-client-api" -version = "2.0.9" +name = "solana-program-entrypoint" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8045228371e1c8dd9ae7ee5d607640e245c5fb4bcaf74022ce9f7864701d187" +checksum = "32ce041b1a0ed275290a5008ee1a4a6c48f5054c8a3d78d313c08958a06aedbd" dependencies = [ - "anyhow", - "base64 0.22.1", - "bs58", - "jsonrpc-core", - "reqwest", - "reqwest-middleware", - "semver", + "solana-account-info", + "solana-msg", + "solana-program-error", + "solana-pubkey", +] + +[[package]] +name = "solana-program-error" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ee2e0217d642e2ea4bee237f37bd61bb02aec60da3647c48ff88f6556ade775" +dependencies = [ + "borsh 1.5.7", + "num-traits", "serde", "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-inline-spl", - "solana-sdk", - "solana-transaction-status", - "solana-version", - "thiserror", + "solana-decode-error", + "solana-instruction", + "solana-msg", + "solana-pubkey", ] [[package]] -name = "solana-rpc-client-nonce-utils" -version = "2.0.9" +name = "solana-program-memory" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0248b33385d6f4b5eca8c0e396434cbbbd0aa8ac178e83922c1228a4a053c51" +checksum = "3a5426090c6f3fd6cfdc10685322fede9ca8e5af43cd6a59e98bfe4e91671712" dependencies = [ - "clap 2.34.0", - "solana-clap-utils", - "solana-rpc-client", - "solana-sdk", - "thiserror", + "solana-define-syscall", ] [[package]] -name = "solana-runtime" -version = "2.0.9" +name = "solana-program-option" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4ca1e75cc8b9c424453dd09c90d18edc3a28e2e9e4309f837bfe30c46ad56d" +checksum = "dc677a2e9bc616eda6dbdab834d463372b92848b2bfe4a1ed4e4b4adba3397d0" + +[[package]] +name = "solana-program-pack" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "319f0ef15e6e12dc37c597faccb7d62525a509fec5f6975ecb9419efddeb277b" +dependencies = [ + "solana-program-error", +] + +[[package]] +name = "solana-program-runtime" +version = "2.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c3bf99984972a51fbf14ca2122fcc9016d7b1261af58bb00a06050af86bb12e" dependencies = [ - "aquamarine", - "arrayref", "base64 0.22.1", "bincode", - "blake3", - "bv", - "bytemuck", - "byteorder", - "bzip2", - "crossbeam-channel", - "dashmap", - "dir-diff", - "flate2", - "fnv", - "im", - "index_list", + "enum-iterator", "itertools 0.12.1", - "lazy_static", - "libc", "log", - "lz4", - "memmap2", - "mockall", - "modular-bitfield", - "num-derive 0.4.2", - "num-traits", - "num_cpus", - "num_enum", "percentage", - "qualifier_attr", "rand 0.8.5", - "rayon", - "regex", - "rustc_version", "serde", - "serde_derive", - "serde_json", - "solana-accounts-db", - "solana-address-lookup-table-program", - "solana-bpf-loader-program", - "solana-bucket-map", - "solana-compute-budget", - "solana-compute-budget-program", - "solana-config-program", - "solana-cost-model", - "solana-inline-spl", - "solana-loader-v4-program", + "solana-account", + "solana-clock", + "solana-epoch-rewards", + "solana-epoch-schedule", + "solana-fee-structure", + "solana-hash", + "solana-instruction", + "solana-last-restart-slot", + "solana-log-collector", "solana-measure", "solana-metrics", - "solana-perf", - "solana-program-runtime", - "solana-rayon-threadlimit", - "solana-sdk", - "solana-stake-program", - "solana-svm", - "solana-system-program", - "solana-transaction-status", - "solana-version", - "solana-vote", - "solana-vote-program", - "solana-zk-elgamal-proof-program", - "solana-zk-sdk", - "solana-zk-token-proof-program", - "solana-zk-token-sdk", - "static_assertions", - "strum", - "strum_macros", - "symlink", - "tar", - "tempfile", - "thiserror", - "zstd", + "solana-program-entrypoint", + "solana-pubkey", + "solana-rent", + "solana-sbpf", + "solana-sdk-ids", + "solana-slot-hashes", + "solana-stable-layout", + "solana-svm-callback", + "solana-svm-feature-set", + "solana-system-interface", + "solana-sysvar", + "solana-sysvar-id", + "solana-timings", + "solana-transaction-context", + "solana-type-overrides", + "thiserror 2.0.17", ] [[package]] -name = "solana-sdk" -version = "2.0.9" +name = "solana-pubkey" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da640d96314707ba69feb3c0b1c5fdefb418c5d5e684fe5a9a27b8daae8c18b5" +checksum = "9b62adb9c3261a052ca1f999398c388f1daf558a1b492f60a6d9e64857db4ff1" dependencies = [ - "bincode", - "bitflags 2.6.0", - "borsh 1.5.3", - "bs58", + "borsh 0.10.4", + "borsh 1.5.7", "bytemuck", "bytemuck_derive", - "byteorder", - "chrono", - "derivation-path", - "digest 0.10.7", - "ed25519-dalek", - "ed25519-dalek-bip32", - "generic-array", - "getrandom 0.1.16", - "hmac 0.12.1", - "itertools 0.12.1", + "curve25519-dalek 4.1.3", + "five8", + "five8_const", + "getrandom 0.2.15", "js-sys", - "lazy_static", - "libsecp256k1", - "log", - "memmap2", - "num_enum", - "pbkdf2 0.11.0", - "qstring", - "rand 0.7.3", + "num-traits", "rand 0.8.5", - "rustc_version", - "rustversion", "serde", - "serde_bytes", "serde_derive", - "serde_json", - "serde_with 2.3.3", - "sha2 0.10.8", - "sha3 0.10.8", - "siphasher", - "solana-program", - "solana-sdk-macro", - "thiserror", - "uriparse", + "solana-atomic-u64", + "solana-decode-error", + "solana-define-syscall", + "solana-sanitize", + "solana-sha256-hasher", "wasm-bindgen", ] [[package]] -name = "solana-sdk-macro" -version = "2.0.9" +name = "solana-quic-definitions" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45b6e930455ef68cf15e5a22a0e0c207e67c3d70978a565e0a64f568c8a24129" +checksum = "fbf0d4d5b049eb1d0c35f7b18f305a27c8986fc5c0c9b383e97adaa35334379e" dependencies = [ - "bs58", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.89", + "solana-keypair", ] [[package]] -name = "solana-security-txt" -version = "1.1.1" +name = "solana-rent" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" +checksum = "d1aea8fdea9de98ca6e8c2da5827707fb3842833521b528a713810ca685d2480" +dependencies = [ + "serde", + "serde_derive", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", +] [[package]] -name = "solana-send-transaction-service" -version = "2.0.9" +name = "solana-rent-collector" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "749434a1135647ab00be4755db72ec4426a7e6724e12fa05e4c1981ad0e49095" +checksum = "127e6dfa51e8c8ae3aa646d8b2672bc4ac901972a338a9e1cd249e030564fb9d" dependencies = [ - "crossbeam-channel", - "log", - "solana-client", - "solana-connection-cache", - "solana-measure", - "solana-metrics", - "solana-runtime", - "solana-sdk", - "solana-tpu-client", + "serde", + "serde_derive", + "solana-account", + "solana-clock", + "solana-epoch-schedule", + "solana-genesis-config", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", ] [[package]] -name = "solana-stake-program" -version = "2.0.9" +name = "solana-rent-debits" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f5873ec93dca602781f9192cf3aeffa61ae590eb4994405356bb584bc276c77" +checksum = "4f6f9113c6003492e74438d1288e30cffa8ccfdc2ef7b49b9e816d8034da18cd" dependencies = [ - "bincode", - "log", - "rustc_version", - "solana-config-program", - "solana-program-runtime", - "solana-sdk", - "solana-type-overrides", - "solana-vote-program", + "solana-pubkey", + "solana-reward-info", ] [[package]] -name = "solana-streamer" -version = "2.0.9" +name = "solana-reserved-account-keys" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11a89e779ac29efff96530d6756623ceed4986cb0c9e43597aa02a57db19fc2" +checksum = "e4b22ea19ca2a3f28af7cd047c914abf833486bf7a7c4a10fc652fff09b385b1" dependencies = [ - "async-channel", - "bytes", - "crossbeam-channel", - "dashmap", - "futures-util", - "histogram", - "indexmap 2.6.0", - "itertools 0.12.1", - "libc", - "log", - "nix", - "pem", - "percentage", - "quinn", - "quinn-proto", - "rand 0.8.5", - "rustls", - "smallvec", - "solana-measure", - "solana-metrics", - "solana-perf", - "solana-sdk", - "solana-transaction-metrics-tracker", - "thiserror", - "tokio", - "x509-parser", + "lazy_static", + "solana-feature-set", + "solana-pubkey", + "solana-sdk-ids", ] [[package]] -name = "solana-svm" -version = "2.0.9" +name = "solana-reward-info" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eababbdcdc687fa51ba325b02ff81c2d1ca3432676b3daec74c2fb4971d3c437" +checksum = "18205b69139b1ae0ab8f6e11cdcb627328c0814422ad2482000fa2ca54ae4a2f" dependencies = [ - "itertools 0.12.1", - "log", - "percentage", - "prost-build 0.11.9", - "qualifier_attr", - "rustc_version", "serde", "serde_derive", - "solana-bpf-loader-program", - "solana-compute-budget", - "solana-loader-v4-program", - "solana-measure", - "solana-metrics", - "solana-program-runtime", - "solana-sdk", - "solana-system-program", - "solana-type-overrides", - "solana-vote", ] [[package]] -name = "solana-system-program" -version = "2.0.9" +name = "solana-sanitize" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61f1bc1357b8188d9c4a3af3fc55276e56987265eb7ad073ae6f8180ee54cecf" + +[[package]] +name = "solana-sbpf" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bac1656c5771eb6bf68e58df67783d4099b76a95ab680ea2bf31d5518f1542" +checksum = "474a2d95dc819898ded08d24f29642d02189d3e1497bbb442a92a3997b7eb55f" dependencies = [ - "bincode", + "byteorder", + "combine", + "hash32", + "libc", "log", - "serde", - "serde_derive", - "solana-program-runtime", - "solana-sdk", - "solana-type-overrides", + "rand 0.8.5", + "rustc-demangle", + "thiserror 2.0.17", + "winapi", ] [[package]] -name = "solana-thin-client" -version = "2.0.9" +name = "solana-sdk" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528410974827ea364e8055a41c26859f60d633553d70da338d3dd1c668bc4f06" +checksum = "8cc0e4a7635b902791c44b6581bfb82f3ada32c5bc0929a64f39fe4bb384c86a" dependencies = [ "bincode", - "log", - "rayon", - "solana-connection-cache", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-sdk", + "bs58", + "getrandom 0.1.16", + "js-sys", + "serde", + "serde_json", + "solana-account", + "solana-bn254", + "solana-client-traits", + "solana-cluster-type", + "solana-commitment-config", + "solana-compute-budget-interface", + "solana-decode-error", + "solana-derivation-path", + "solana-ed25519-program", + "solana-epoch-info", + "solana-epoch-rewards-hasher", + "solana-feature-set", + "solana-fee-structure", + "solana-genesis-config", + "solana-hard-forks", + "solana-inflation", + "solana-instruction", + "solana-keypair", + "solana-message", + "solana-native-token", + "solana-nonce-account", + "solana-offchain-message", + "solana-packet", + "solana-poh-config", + "solana-precompile-error", + "solana-precompiles", + "solana-presigner", + "solana-program", + "solana-program-memory", + "solana-pubkey", + "solana-quic-definitions", + "solana-rent-collector", + "solana-rent-debits", + "solana-reserved-account-keys", + "solana-reward-info", + "solana-sanitize", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-secp256k1-program", + "solana-secp256k1-recover", + "solana-secp256r1-program", + "solana-seed-derivable", + "solana-seed-phrase", + "solana-serde", + "solana-serde-varint", + "solana-short-vec", + "solana-shred-version", + "solana-signature", + "solana-signer", + "solana-system-transaction", + "solana-time-utils", + "solana-transaction", + "solana-transaction-context", + "solana-transaction-error", + "solana-validator-exit", + "thiserror 2.0.17", + "wasm-bindgen", ] [[package]] -name = "solana-tpu-client" -version = "2.0.9" +name = "solana-sdk-ids" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7b35d5344bf37ac9febca33a2afeccf00d235919927494937b15e57622726f4" +checksum = "5c5d8b9cc68d5c88b062a33e23a6466722467dde0035152d8fb1afbcdf350a5f" dependencies = [ - "async-trait", - "bincode", - "futures-util", - "indexmap 2.6.0", - "indicatif", - "log", - "rayon", - "solana-connection-cache", - "solana-measure", - "solana-metrics", - "solana-pubsub-client", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-sdk", - "thiserror", - "tokio", + "solana-pubkey", ] [[package]] -name = "solana-transaction-metrics-tracker" -version = "2.0.9" +name = "solana-sdk-macro" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4866898994a7b9436df0431b8400934242eb7ef6e548f5311efb2e4aafcced30" +checksum = "86280da8b99d03560f6ab5aca9de2e38805681df34e0bb8f238e69b29433b9df" dependencies = [ - "Inflector", - "base64 0.22.1", - "bincode", - "lazy_static", - "log", - "rand 0.8.5", - "solana-perf", - "solana-sdk", + "bs58", + "proc-macro2", + "quote", + "syn 2.0.89", ] [[package]] -name = "solana-transaction-status" -version = "2.0.9" +name = "solana-secp256k1-program" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3294eebb17ee6a2bf7f5365a332da714a8c88b92e59121fc32c495d0f7c4d8" +checksum = "f19833e4bc21558fe9ec61f239553abe7d05224347b57d65c2218aeeb82d6149" dependencies = [ - "Inflector", - "base64 0.22.1", "bincode", - "borsh 1.5.3", - "bs58", - "lazy_static", - "log", + "digest 0.10.7", + "libsecp256k1", "serde", "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-sdk", - "spl-associated-token-account", - "spl-memo", - "spl-token", - "spl-token-2022", - "spl-token-group-interface", - "spl-token-metadata-interface", - "thiserror", + "sha3", + "solana-feature-set", + "solana-instruction", + "solana-precompile-error", + "solana-sdk-ids", + "solana-signature", ] [[package]] -name = "solana-type-overrides" -version = "2.0.9" +name = "solana-secp256k1-recover" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4201087a2d944f1fe1a5531d612384a825378339b26c84df4681afb7b52018b" +checksum = "baa3120b6cdaa270f39444f5093a90a7b03d296d362878f7a6991d6de3bbe496" dependencies = [ - "lazy_static", - "rand 0.8.5", + "borsh 1.5.7", + "libsecp256k1", + "solana-define-syscall", + "thiserror 2.0.17", ] [[package]] -name = "solana-udp-client" -version = "2.0.9" +name = "solana-secp256r1-program" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6f0f2db2e9266a0818df69ac6365d0109bf1f2f1832c8a7d033be70ac742138" +checksum = "ce0ae46da3071a900f02d367d99b2f3058fe2e90c5062ac50c4f20cfedad8f0f" dependencies = [ - "async-trait", - "solana-connection-cache", - "solana-net-utils", - "solana-sdk", - "solana-streamer", - "thiserror", - "tokio", + "bytemuck", + "openssl", + "solana-feature-set", + "solana-instruction", + "solana-precompile-error", + "solana-sdk-ids", ] [[package]] -name = "solana-version" -version = "2.0.9" +name = "solana-seed-derivable" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c5e80bec4215dac4a0bacd3b68be430621adf1a37aba3239032f8c91ab1517a" +checksum = "3beb82b5adb266c6ea90e5cf3967235644848eac476c5a1f2f9283a143b7c97f" dependencies = [ - "log", - "rustc_version", - "semver", - "serde", - "serde_derive", - "solana-sdk", + "solana-derivation-path", ] [[package]] -name = "solana-vote" -version = "2.0.9" +name = "solana-seed-phrase" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a72891adbea06048965dfd4e0f1897f113d03bafb9e81f895bbe560e0b3a5ec" +checksum = "36187af2324f079f65a675ec22b31c24919cb4ac22c79472e85d819db9bbbc15" +dependencies = [ + "hmac 0.12.1", + "pbkdf2", + "sha2 0.10.8", +] + +[[package]] +name = "solana-serde" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1931484a408af466e14171556a47adaa215953c7f48b24e5f6b0282763818b04" dependencies = [ - "itertools 0.12.1", - "log", - "rustc_version", "serde", - "serde_derive", - "solana-sdk", - "thiserror", ] [[package]] -name = "solana-vote-program" -version = "2.0.9" +name = "solana-serde-varint" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd00cd5515020cb6c0c5167f1d173fddeae5e1f7ffd77909ea43bece86f38cc9" +checksum = "2a7e155eba458ecfb0107b98236088c3764a09ddf0201ec29e52a0be40857113" dependencies = [ - "bincode", - "log", - "num-derive 0.4.2", - "num-traits", - "rustc_version", "serde", - "serde_derive", - "solana-metrics", - "solana-program", - "solana-program-runtime", - "solana-sdk", - "thiserror", ] [[package]] -name = "solana-zk-elgamal-proof-program" -version = "2.0.9" +name = "solana-serialize-utils" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1bdd121de9f8e897fb5c113f62791cc9b560d8057c837fad1e16adce08aca3" +checksum = "817a284b63197d2b27afdba829c5ab34231da4a9b4e763466a003c40ca4f535e" dependencies = [ - "bytemuck", - "num-derive 0.4.2", - "num-traits", - "solana-program-runtime", - "solana-sdk", - "solana-zk-sdk", + "solana-instruction", + "solana-pubkey", + "solana-sanitize", ] [[package]] -name = "solana-zk-sdk" -version = "2.0.9" +name = "solana-sha256-hasher" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "366951623087ec3221605dfaae7f94e61d7b6593fa3cc62eae1f767bcc9f7d79" +checksum = "5aa3feb32c28765f6aa1ce8f3feac30936f16c5c3f7eb73d63a5b8f6f8ecdc44" +dependencies = [ + "sha2 0.10.8", + "solana-define-syscall", + "solana-hash", +] + +[[package]] +name = "solana-short-vec" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c54c66f19b9766a56fa0057d060de8378676cb64987533fa088861858fc5a69" dependencies = [ - "aes-gcm-siv", - "base64 0.22.1", - "bincode", - "bytemuck", - "bytemuck_derive", - "curve25519-dalek", - "itertools 0.12.1", - "lazy_static", - "merlin", - "num-derive 0.4.2", - "num-traits", - "rand 0.7.3", "serde", - "serde_derive", - "serde_json", - "sha3 0.9.1", - "solana-program", - "solana-sdk", - "subtle", - "thiserror", - "zeroize", ] [[package]] -name = "solana-zk-token-proof-program" -version = "2.0.9" +name = "solana-shred-version" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a4f5067ffc0dcf47bfc5f27403c615f9682affa9a23889bda47c3a6b2720fa9" +checksum = "afd3db0461089d1ad1a78d9ba3f15b563899ca2386351d38428faa5350c60a98" dependencies = [ - "bytemuck", - "num-derive 0.4.2", - "num-traits", - "solana-program-runtime", - "solana-sdk", - "solana-zk-token-sdk", + "solana-hard-forks", + "solana-hash", + "solana-sha256-hasher", ] [[package]] -name = "solana-zk-token-sdk" -version = "2.0.9" +name = "solana-signature" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "860d780884e7e0eab6bdc909d80ef32b791d1c0963aff8cdfcbd4f00ca640c8a" +checksum = "64c8ec8e657aecfc187522fc67495142c12f35e55ddeca8698edbb738b8dbd8c" dependencies = [ - "aes-gcm-siv", - "base64 0.22.1", - "bincode", - "bytemuck", - "bytemuck_derive", - "byteorder", - "curve25519-dalek", - "itertools 0.12.1", - "lazy_static", - "merlin", - "num-derive 0.4.2", - "num-traits", - "rand 0.7.3", + "ed25519-dalek", + "five8", + "rand 0.8.5", "serde", + "serde-big-array", "serde_derive", - "serde_json", - "sha3 0.9.1", - "solana-curve25519", - "solana-program", - "solana-sdk", - "subtle", - "thiserror", - "zeroize", + "solana-sanitize", ] [[package]] -name = "solana_rbpf" -version = "0.8.4" +name = "solana-signer" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff08afd63f70a1ba712fb0017be41e93b017f7e874785b54bb5ec9aa8949781d" +checksum = "7c41991508a4b02f021c1342ba00bcfa098630b213726ceadc7cb032e051975b" dependencies = [ - "byteorder", - "combine", - "goblin", - "hash32", - "libc", - "log", - "rand 0.8.5", - "rustc-demangle", - "scroll", - "thiserror", - "winapi", + "solana-pubkey", + "solana-signature", + "solana-transaction-error", ] [[package]] -name = "spin" -version = "0.5.2" +name = "solana-slot-hashes" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "0c8691982114513763e88d04094c9caa0376b867a29577939011331134c301ce" +dependencies = [ + "serde", + "serde_derive", + "solana-hash", + "solana-sdk-ids", + "solana-sysvar-id", +] [[package]] -name = "spin" -version = "0.9.8" +name = "solana-slot-history" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +checksum = "97ccc1b2067ca22754d5283afb2b0126d61eae734fc616d23871b0943b0d935e" +dependencies = [ + "bv", + "serde", + "serde_derive", + "solana-sdk-ids", + "solana-sysvar-id", +] [[package]] -name = "spl-associated-token-account" -version = "4.0.0" +name = "solana-stable-layout" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68034596cf4804880d265f834af1ff2f821ad5293e41fa0f8f59086c181fc38e" +checksum = "9f14f7d02af8f2bc1b5efeeae71bc1c2b7f0f65cd75bcc7d8180f2c762a57f54" dependencies = [ - "assert_matches", - "borsh 1.5.3", - "num-derive 0.4.2", - "num-traits", - "solana-program", - "spl-token", - "spl-token-2022", - "thiserror", + "solana-instruction", + "solana-pubkey", ] [[package]] -name = "spl-discriminator" -version = "0.3.0" +name = "solana-stake-interface" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38ea8b6dedb7065887f12d62ed62c1743aa70749e8558f963609793f6fb12bc" +checksum = "5269e89fde216b4d7e1d1739cf5303f8398a1ff372a81232abbee80e554a838c" dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator-derive", + "borsh 0.10.4", + "borsh 1.5.7", + "num-traits", + "serde", + "serde_derive", + "solana-clock", + "solana-cpi", + "solana-decode-error", + "solana-instruction", + "solana-program-error", + "solana-pubkey", + "solana-system-interface", + "solana-sysvar-id", ] [[package]] -name = "spl-discriminator-derive" -version = "0.2.0" +name = "solana-svm-callback" +version = "2.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9e8418ea6269dcfb01c712f0444d2c75542c04448b480e87de59d2865edc750" +checksum = "fc71d742f57c922a66dfc786f9158b85a3a46bc7d230ebd8a92724ec9bcef641" dependencies = [ - "quote", - "spl-discriminator-syn", - "syn 2.0.89", + "solana-account", + "solana-precompile-error", + "solana-pubkey", ] [[package]] -name = "spl-discriminator-syn" -version = "0.2.0" +name = "solana-svm-feature-set" +version = "2.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c1f05593b7ca9eac7caca309720f2eafb96355e037e6d373b909a80fe7b69b9" +checksum = "a7fe5a6e173eec22c54806b413f5e383b8b82ca13b1767fa53fd40ec8512e6ee" + +[[package]] +name = "solana-system-interface" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94d7c18cb1a91c6be5f5a8ac9276a1d7c737e39a21beba9ea710ab4b9c63bc90" dependencies = [ - "proc-macro2", - "quote", - "sha2 0.10.8", - "syn 2.0.89", - "thiserror", + "js-sys", + "num-traits", + "serde", + "serde_derive", + "solana-decode-error", + "solana-instruction", + "solana-pubkey", + "wasm-bindgen", +] + +[[package]] +name = "solana-system-program" +version = "2.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62286f3c6b6cdaaa66be54bb7e2a1acbd7462b435fa05f31f78ec690772e4d11" +dependencies = [ + "bincode", + "log", + "serde", + "serde_derive", + "solana-account", + "solana-bincode", + "solana-fee-calculator", + "solana-instruction", + "solana-log-collector", + "solana-nonce", + "solana-nonce-account", + "solana-packet", + "solana-program-runtime", + "solana-pubkey", + "solana-sdk-ids", + "solana-system-interface", + "solana-sysvar", + "solana-transaction-context", + "solana-type-overrides", ] [[package]] -name = "spl-memo" -version = "5.0.0" +name = "solana-system-transaction" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0dba2f2bb6419523405d21c301a32c9f9568354d4742552e7972af801f4bdb3" +checksum = "5bd98a25e5bcba8b6be8bcbb7b84b24c2a6a8178d7fb0e3077a916855ceba91a" dependencies = [ - "solana-program", + "solana-hash", + "solana-keypair", + "solana-message", + "solana-pubkey", + "solana-signer", + "solana-system-interface", + "solana-transaction", ] [[package]] -name = "spl-pod" -version = "0.3.1" +name = "solana-sysvar" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c704c88fc457fa649ba3aabe195c79d885c3f26709efaddc453c8de352c90b87" +checksum = "b8c3595f95069f3d90f275bb9bd235a1973c4d059028b0a7f81baca2703815db" dependencies = [ - "borsh 1.5.3", + "base64 0.22.1", + "bincode", "bytemuck", "bytemuck_derive", - "solana-program", - "solana-zk-token-sdk", - "spl-program-error", + "lazy_static", + "serde", + "serde_derive", + "solana-account-info", + "solana-clock", + "solana-define-syscall", + "solana-epoch-rewards", + "solana-epoch-schedule", + "solana-fee-calculator", + "solana-hash", + "solana-instruction", + "solana-instructions-sysvar", + "solana-last-restart-slot", + "solana-program-entrypoint", + "solana-program-error", + "solana-program-memory", + "solana-pubkey", + "solana-rent", + "solana-sanitize", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-slot-hashes", + "solana-slot-history", + "solana-stake-interface", + "solana-sysvar-id", ] [[package]] -name = "spl-program-error" -version = "0.5.0" +name = "solana-sysvar-id" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7b28bed65356558133751cc32b48a7a5ddfc59ac4e941314630bbed1ac10532" +checksum = "5762b273d3325b047cfda250787f8d796d781746860d5d0a746ee29f3e8812c1" dependencies = [ - "num-derive 0.4.2", - "num-traits", - "solana-program", - "spl-program-error-derive", - "thiserror", + "solana-pubkey", + "solana-sdk-ids", ] [[package]] -name = "spl-program-error-derive" -version = "0.4.1" +name = "solana-time-utils" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d375dd76c517836353e093c2dbb490938ff72821ab568b545fd30ab3256b3e" -dependencies = [ - "proc-macro2", - "quote", - "sha2 0.10.8", - "syn 2.0.89", -] +checksum = "6af261afb0e8c39252a04d026e3ea9c405342b08c871a2ad8aa5448e068c784c" [[package]] -name = "spl-tlv-account-resolution" -version = "0.7.0" +name = "solana-timings" +version = "2.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a75a5f0fcc58126693ed78a17042e9dc53f07e357d6be91789f7d62aff61a4" +checksum = "6c693612dde6208558c03b81e51b17477ced8cc592d43f57649b18afe19d1250" dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", - "spl-type-length-value", + "eager", + "enum-iterator", + "solana-pubkey", ] [[package]] -name = "spl-token" -version = "6.0.0" +name = "solana-transaction" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a0f06ac7f23dc0984931b1fe309468f14ea58e32660439c1cef19456f5d0e3" +checksum = "80657d6088f721148f5d889c828ca60c7daeedac9a8679f9ec215e0c42bcbf41" dependencies = [ - "arrayref", - "bytemuck", - "num-derive 0.4.2", - "num-traits", - "num_enum", - "solana-program", - "thiserror", + "bincode", + "serde", + "serde_derive", + "solana-bincode", + "solana-feature-set", + "solana-hash", + "solana-instruction", + "solana-keypair", + "solana-message", + "solana-precompiles", + "solana-pubkey", + "solana-sanitize", + "solana-sdk-ids", + "solana-short-vec", + "solana-signature", + "solana-signer", + "solana-system-interface", + "solana-transaction-error", + "wasm-bindgen", ] [[package]] -name = "spl-token-2022" -version = "4.0.0" +name = "solana-transaction-context" +version = "2.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c10f3483e48679619c76598d4e4aebb955bc49b0a5cc63323afbf44135c9bf" +checksum = "99b02e4d84d75dc196689f0256234b31a11e3cc97abc22ac71c945e930d1fea1" dependencies = [ - "arrayref", - "bytemuck", - "num-derive 0.4.2", - "num-traits", - "num_enum", - "solana-program", - "solana-security-txt", - "solana-zk-token-sdk", - "spl-memo", - "spl-pod", - "spl-token", - "spl-token-group-interface", - "spl-token-metadata-interface", - "spl-transfer-hook-interface", - "spl-type-length-value", - "thiserror", + "bincode", + "serde", + "serde_derive", + "solana-account", + "solana-instruction", + "solana-instructions-sysvar", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", ] [[package]] -name = "spl-token-group-interface" -version = "0.3.0" +name = "solana-transaction-error" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8752b85a5ecc1d9f3a43bce3dd9a6a053673aacf5deb513d1cbb88d3534ffd" +checksum = "222a9dc8fdb61c6088baab34fc3a8b8473a03a7a5fd404ed8dd502fa79b67cb1" dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", + "serde", + "serde_derive", + "solana-instruction", + "solana-sanitize", ] [[package]] -name = "spl-token-metadata-interface" -version = "0.4.0" +name = "solana-type-overrides" +version = "2.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c2318ddff97e006ed9b1291ebec0750a78547f870f62a69c56fe3b46a5d8fc" +checksum = "a545d312699b2874b1452344d114bb84f843452d8396e7e7bf71686d04141d62" dependencies = [ - "borsh 1.5.3", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", - "spl-type-length-value", + "rand 0.8.5", ] [[package]] -name = "spl-transfer-hook-interface" -version = "0.7.0" +name = "solana-validator-exit" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a110f33d941275d9f868b96daaa993f1e73b6806cc8836e43075b4d3ad8338a7" -dependencies = [ - "arrayref", - "bytemuck", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", - "spl-tlv-account-resolution", - "spl-type-length-value", -] +checksum = "7bbf6d7a3c0b28dd5335c52c0e9eae49d0ae489a8f324917faf0ded65a812c1d" [[package]] -name = "spl-type-length-value" -version = "0.5.0" +name = "solana-vote-interface" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdcd73ec187bc409464c60759232e309f83b52a18a9c5610bf281c9c6432918c" +checksum = "b80d57478d6599d30acc31cc5ae7f93ec2361a06aefe8ea79bc81739a08af4c3" dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", + "bincode", + "num-derive 0.4.2", + "num-traits", + "serde", + "serde_derive", + "solana-clock", + "solana-decode-error", + "solana-hash", + "solana-instruction", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", + "solana-serde-varint", + "solana-serialize-utils", + "solana-short-vec", + "solana-system-interface", ] [[package]] @@ -5247,64 +4562,18 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "strsim" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" -[[package]] -name = "strum" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", -] - [[package]] name = "subtle" version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" -[[package]] -name = "symlink" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7973cce6668464ea31f176d85b13c7ab3bba2cb3b77a2ed26abd7801688010a" - [[package]] name = "syn" version = "1.0.109" @@ -5329,109 +4598,24 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "synstructure" -version = "0.12.6" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", + "futures-core", ] [[package]] name = "synstructure" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", "syn 2.0.89", ] -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "tar" -version = "0.4.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "tarpc" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38a012bed6fb9681d3bf71ffaa4f88f3b4b9ed3198cda6e4c8462d24d4bb80" -dependencies = [ - "anyhow", - "fnv", - "futures", - "humantime", - "opentelemetry", - "pin-project", - "rand 0.8.5", - "serde", - "static_assertions", - "tarpc-plugins", - "thiserror", - "tokio", - "tokio-serde", - "tokio-util 0.6.10", - "tracing", - "tracing-opentelemetry", -] - -[[package]] -name = "tarpc-plugins" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee42b4e559f17bce0385ebf511a7beb67d5cc33c12c96b7f4e9789919d9c10f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "task-local-extensions" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba323866e5d033818e3240feeb9f7db2c4296674e4d9e16b97b7bf8f490434e8" -dependencies = [ - "pin-utils", -] - [[package]] name = "tempfile" version = "3.14.0" @@ -5455,33 +4639,21 @@ dependencies = [ ] [[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "textwrap" -version = "0.11.0" +name = "thiserror" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "unicode-width 0.1.14", + "thiserror-impl 1.0.69", ] -[[package]] -name = "textwrap" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" - [[package]] name = "thiserror" -version = "1.0.69" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" dependencies = [ - "thiserror-impl", + "thiserror-impl 2.0.17", ] [[package]] @@ -5496,13 +4668,14 @@ dependencies = [ ] [[package]] -name = "thread_local" -version = "1.1.8" +name = "thiserror-impl" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ - "cfg-if", - "once_cell", + "proc-macro2", + "quote", + "syn 2.0.89", ] [[package]] @@ -5536,151 +4709,63 @@ dependencies = [ "time-core", ] -[[package]] -name = "tiny-bip39" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d" -dependencies = [ - "anyhow", - "hmac 0.8.1", - "once_cell", - "pbkdf2 0.4.0", - "rand 0.7.3", - "rustc-hash", - "sha2 0.9.9", - "thiserror", - "unicode-normalization", - "wasm-bindgen", - "zeroize", -] - [[package]] name = "tinystr" -version = "0.7.6" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" dependencies = [ "displaydoc", - "zerovec", -] - -[[package]] -name = "tinyvec" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.41.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.52.0", -] - -[[package]] -name = "tokio-macros" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.89", -] - -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls", - "tokio", -] - -[[package]] -name = "tokio-serde" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "911a61637386b789af998ee23f50aa30d5fd7edcec8d6d3dedae5e5815205466" -dependencies = [ - "bincode", - "bytes", - "educe", - "futures-core", - "futures-sink", - "pin-project", - "serde", - "serde_json", + "zerovec", ] [[package]] -name = "tokio-stream" -version = "0.1.16" +name = "tinyvec" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", + "tinyvec_macros", ] [[package]] -name = "tokio-tungstenite" -version = "0.20.1" +name = "tinyvec_macros" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" -dependencies = [ - "futures-util", - "log", - "rustls", - "tokio", - "tokio-rustls", - "tungstenite", - "webpki-roots 0.25.4", -] +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] -name = "tokio-util" -version = "0.6.10" +name = "tokio" +version = "1.47.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" +checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038" dependencies = [ + "backtrace", "bytes", - "futures-core", - "futures-sink", - "log", + "io-uring", + "libc", + "mio", "pin-project-lite", "slab", + "socket2", + "windows-sys 0.59.0", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" +dependencies = [ + "rustls", "tokio", ] [[package]] name = "tokio-util" -version = "0.7.12" +version = "0.7.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5" dependencies = [ "bytes", "futures-core", @@ -5716,66 +4801,67 @@ dependencies = [ ] [[package]] -name = "tower-service" -version = "0.3.3" +name = "tower" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper", + "tokio", + "tower-layer", + "tower-service", +] [[package]] -name = "tracing" -version = "0.1.40" +name = "tower-http" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" dependencies = [ - "log", + "bitflags", + "bytes", + "futures-util", + "http", + "http-body", + "iri-string", "pin-project-lite", - "tracing-attributes", - "tracing-core", + "tower", + "tower-layer", + "tower-service", ] [[package]] -name = "tracing-attributes" -version = "0.1.27" +name = "tower-layer" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.89", -] +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] -name = "tracing-core" -version = "0.1.32" +name = "tower-service" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] -name = "tracing-opentelemetry" -version = "0.17.4" +name = "tracing" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbe89715c1dbbb790059e2565353978564924ee85017b5fff365c872ff6721f" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ - "once_cell", - "opentelemetry", - "tracing", + "pin-project-lite", "tracing-core", - "tracing-subscriber", ] [[package]] -name = "tracing-subscriber" -version = "0.3.18" +name = "tracing-core" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" dependencies = [ - "sharded-slab", - "thread_local", - "tracing-core", + "once_cell", ] [[package]] @@ -5784,39 +4870,12 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" -[[package]] -name = "tungstenite" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand 0.8.5", - "rustls", - "sha1", - "thiserror", - "url", - "utf-8", - "webpki-roots 0.24.0", -] - [[package]] name = "typenum" version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" -[[package]] -name = "unicase" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" - [[package]] name = "unicode-ident" version = "1.0.14" @@ -5824,41 +4883,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] -name = "unicode-normalization" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-width" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" - -[[package]] -name = "unicode-width" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" - -[[package]] -name = "unicode-xid" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" - -[[package]] -name = "universal-hash" -version = "0.5.1" +name = "unicode-segmentation" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" -dependencies = [ - "crypto-common", - "subtle", -] +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unreachable" @@ -5869,12 +4897,6 @@ dependencies = [ "void", ] -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" @@ -5902,18 +4924,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - [[package]] name = "utf8_iter" version = "1.0.4" @@ -5921,16 +4931,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vec_map" -version = "0.8.2" +name = "vcpkg" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" @@ -5944,16 +4948,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - [[package]] name = "want" version = "0.3.1" @@ -5975,26 +4969,45 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasi" +version = "0.14.7+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c" +dependencies = [ + "wasip2", +] + +[[package]] +name = "wasip2" +version = "1.0.1+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +dependencies = [ + "wit-bindgen", +] + [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", + "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn 2.0.89", @@ -6003,21 +5016,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.45" +version = "0.4.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" +checksum = "7e038d41e478cc73bae0ff9b36c60cff1c98b8f38f8d7e8061e79ee63608ac5c" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6025,9 +5039,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" dependencies = [ "proc-macro2", "quote", @@ -6038,15 +5052,18 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1" +dependencies = [ + "unicode-ident", +] [[package]] name = "web-sys" -version = "0.3.72" +version = "0.3.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120" dependencies = [ "js-sys", "wasm-bindgen", @@ -6064,29 +5081,22 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.24.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" +checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2" dependencies = [ - "rustls-webpki", + "rustls-pki-types", ] -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - [[package]] name = "which" -version = "4.4.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", - "home", + "libc", "once_cell", - "rustix", ] [[package]] @@ -6130,13 +5140,10 @@ dependencies = [ ] [[package]] -name = "windows-sys" -version = "0.48.0" +name = "windows-link" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] +checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" [[package]] name = "windows-sys" @@ -6157,18 +5164,12 @@ dependencies = [ ] [[package]] -name = "windows-targets" -version = "0.48.5" +name = "windows-sys" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", + "windows-targets 0.53.4", ] [[package]] @@ -6180,7 +5181,7 @@ dependencies = [ "windows_aarch64_gnullvm 0.52.6", "windows_aarch64_msvc 0.52.6", "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", + "windows_i686_gnullvm 0.52.6", "windows_i686_msvc 0.52.6", "windows_x86_64_gnu 0.52.6", "windows_x86_64_gnullvm 0.52.6", @@ -6188,10 +5189,21 @@ dependencies = [ ] [[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" +name = "windows-targets" +version = "0.53.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +checksum = "2d42b7b7f66d2a06854650af09cfdf8713e427a439c97ad65a6375318033ac4b" +dependencies = [ + "windows-link", + "windows_aarch64_gnullvm 0.53.0", + "windows_aarch64_msvc 0.53.0", + "windows_i686_gnu 0.53.0", + "windows_i686_gnullvm 0.53.0", + "windows_i686_msvc 0.53.0", + "windows_x86_64_gnu 0.53.0", + "windows_x86_64_gnullvm 0.53.0", + "windows_x86_64_msvc 0.53.0", +] [[package]] name = "windows_aarch64_gnullvm" @@ -6200,10 +5212,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" +name = "windows_aarch64_gnullvm" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" [[package]] name = "windows_aarch64_msvc" @@ -6212,10 +5224,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] -name = "windows_i686_gnu" -version = "0.48.5" +name = "windows_aarch64_msvc" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" [[package]] name = "windows_i686_gnu" @@ -6223,6 +5235,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3" + [[package]] name = "windows_i686_gnullvm" version = "0.52.6" @@ -6230,10 +5248,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] -name = "windows_i686_msvc" -version = "0.48.5" +name = "windows_i686_gnullvm" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" [[package]] name = "windows_i686_msvc" @@ -6242,10 +5260,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" +name = "windows_i686_msvc" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" [[package]] name = "windows_x86_64_gnu" @@ -6254,10 +5272,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" +name = "windows_x86_64_gnu" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" [[package]] name = "windows_x86_64_gnullvm" @@ -6266,10 +5284,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" +name = "windows_x86_64_gnullvm" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" [[package]] name = "windows_x86_64_msvc" @@ -6277,6 +5295,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" + [[package]] name = "winnow" version = "0.6.20" @@ -6287,61 +5311,22 @@ dependencies = [ ] [[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - -[[package]] -name = "write16" -version = "1.0.0" +name = "wit-bindgen" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "writeable" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" - -[[package]] -name = "x509-parser" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" -dependencies = [ - "asn1-rs", - "base64 0.13.1", - "data-encoding", - "der-parser", - "lazy_static", - "nom", - "oid-registry", - "rusticata-macros", - "thiserror", - "time", -] - -[[package]] -name = "xattr" -version = "1.3.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" -dependencies = [ - "libc", - "linux-raw-sys", - "rustix", -] +checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" [[package]] name = "yoke" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" dependencies = [ "serde", "stable_deref_trait", @@ -6351,14 +5336,14 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" dependencies = [ "proc-macro2", "quote", "syn 2.0.89", - "synstructure 0.13.1", + "synstructure", ] [[package]] @@ -6384,30 +5369,30 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", "syn 2.0.89", - "synstructure 0.13.1", + "synstructure", ] [[package]] name = "zeroize" -version = "1.3.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" dependencies = [ "zeroize_derive", ] @@ -6423,11 +5408,22 @@ dependencies = [ "syn 2.0.89", ] +[[package]] +name = "zerotrie" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + [[package]] name = "zerovec" -version = "0.10.4" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b" dependencies = [ "yoke", "zerofrom", @@ -6436,40 +5432,11 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" dependencies = [ "proc-macro2", "quote", "syn 2.0.89", ] - -[[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.13+zstd.1.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" -dependencies = [ - "cc", - "pkg-config", -] diff --git a/clients/rust/Cargo.toml b/clients/rust/Cargo.toml index 78c6764..d2ae6e0 100644 --- a/clients/rust/Cargo.toml +++ b/clients/rust/Cargo.toml @@ -8,7 +8,6 @@ license-file = "../../LICENSE" [features] test-sbf = [] serde = ["dep:serde", "dep:serde_with"] -fetch = ["dep:solana-client", "dep:solana-sdk"] [dependencies] borsh = "^0.10" @@ -16,18 +15,11 @@ num-derive = "^0.4" num-traits = "^0.2" serde = { version = "^1.0", features = ["derive"], optional = true } serde_with = { version = "^3.0", optional = true } -solana-account = "~2.2" -solana-account-info = "~2.3" -solana-client = { version = "~2.3", optional = true } -solana-cpi = "~2.2" -solana-decode-error = "~2.3" -solana-instruction = "~2.3" -solana-program-error = "~2.2" -solana-pubkey = { version = "~2.4", features = ["curve25519", "borsh"] } -solana-sdk = { version = "^2.3", optional = true } +solana-account = "^2.2.1" +solana-account-info = "^2.2.1" +solana-cpi = "^2.2.1" +solana-decode-error = "^2.2.1" +solana-instruction = "^2.2.1" +solana-program-error = "^2.2.1" +solana-pubkey = { version = "^2.2.1", features = ["curve25519", "borsh"] } thiserror = "^1.0" - -[dev-dependencies] -assert_matches = "1.5.0" -solana-program-test = "~2.3" -solana-sdk = "~2.3" diff --git a/program/Cargo.toml b/program/Cargo.toml index cef40b3..699abd9 100644 --- a/program/Cargo.toml +++ b/program/Cargo.toml @@ -19,12 +19,12 @@ num-derive = "^0.3" num-traits = "^0.2" serde = { version = "1.0.193", features = ["derive"] } shank = "^0.4.2" -solana-program = "~2.0" +solana-program = "^2.2.1" thiserror = "^1.0" [dev-dependencies] -mollusk-svm = { version = "0.0.10-solana-2.0", features = ["fuzz-fd"] } -solana-sdk = "~2.0" +mollusk-svm = { version = "^0.4", features = ["fuzz-fd"] } +solana-sdk = "^2.2.1" [features] bpf-entrypoint = [] From 728818eab9edff9cd2ee0d2277e17c768f40664b Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Fri, 3 Oct 2025 09:44:50 +0100 Subject: [PATCH 04/10] Update mollusk --- Cargo.lock | 4916 +++++++++--------------- clients/rust/Cargo.toml | 7 +- program/Cargo.toml | 6 +- program/tests/close.rs | 55 +- program/tests/common.rs | 25 +- program/tests/deploy.rs | 64 +- program/tests/initialize_buffer.rs | 16 +- program/tests/set_authority.rs | 44 +- program/tests/set_authority_checked.rs | 46 +- program/tests/upgrade.rs | 62 +- program/tests/write.rs | 21 +- 11 files changed, 2074 insertions(+), 3188 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9a1f414..f4a459b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,16 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 - -[[package]] -name = "Inflector" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" -dependencies = [ - "lazy_static", - "regex", -] +version = 4 [[package]] name = "addr2line" @@ -28,39 +18,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] -name = "aead" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" -dependencies = [ - "crypto-common", - "generic-array", -] - -[[package]] -name = "aes" -version = "0.8.4" +name = "agave-feature-set" +version = "2.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" +checksum = "7c5117ce634f42ce143891c4d7db3536d5054fc19501ef88e21f353b8580c450" dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", + "ahash", + "solana-epoch-schedule", + "solana-hash", + "solana-pubkey", + "solana-sha256-hasher", + "solana-svm-feature-set", ] [[package]] -name = "aes-gcm-siv" -version = "0.11.1" +name = "agave-precompiles" +version = "2.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d" +checksum = "47f7f87574ffda3eb5b4385ef328fd6cca81b415c55e106a05bbae72ea5c428e" dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "polyval", - "subtle", - "zeroize", + "agave-feature-set", + "bincode", + "digest 0.10.7", + "ed25519-dalek", + "libsecp256k1", + "openssl", + "sha3", + "solana-ed25519-program", + "solana-message", + "solana-precompile-error", + "solana-pubkey", + "solana-sdk-ids", + "solana-secp256k1-program", + "solana-secp256r1-program", ] [[package]] @@ -100,12 +90,6 @@ dependencies = [ "alloc-no-stdlib", ] -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - [[package]] name = "android_system_properties" version = "0.1.5" @@ -115,35 +99,12 @@ dependencies = [ "libc", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "anyhow" version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" -[[package]] -name = "aquamarine" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1da02abba9f9063d786eab1509833ebb2fac0f966862ca59439c76b9c566760" -dependencies = [ - "include_dir", - "itertools 0.10.5", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "ark-bn254" version = "0.4.0" @@ -279,62 +240,6 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" -[[package]] -name = "asn1-rs" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" -dependencies = [ - "asn1-rs-derive", - "asn1-rs-impl", - "displaydoc", - "nom", - "num-traits", - "rusticata-macros", - "thiserror", - "time", -] - -[[package]] -name = "asn1-rs-derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure 0.12.6", -] - -[[package]] -name = "asn1-rs-impl" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "assert_matches" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" - -[[package]] -name = "async-channel" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - [[package]] name = "async-compression" version = "0.4.18" @@ -350,24 +255,10 @@ dependencies = [ ] [[package]] -name = "async-mutex" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-trait" -version = "0.1.83" +name = "atomic-waker" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.89", -] +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "atty" @@ -398,7 +289,7 @@ dependencies = [ "miniz_oxide", "object", "rustc-demangle", - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -407,18 +298,6 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - [[package]] name = "base64" version = "0.22.1" @@ -436,33 +315,18 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.6.0" +version = "2.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394" dependencies = [ "serde", ] -[[package]] -name = "bitmaps" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" -dependencies = [ - "typenum", -] - [[package]] name = "blake3" -version = "1.5.1" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" +checksum = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0" dependencies = [ "arrayref", "arrayvec", @@ -478,7 +342,6 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "block-padding", "generic-array", ] @@ -491,12 +354,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-padding" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" - [[package]] name = "borsh" version = "0.10.4" @@ -509,12 +366,12 @@ dependencies = [ [[package]] name = "borsh" -version = "1.5.3" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2506947f73ad44e344215ccd6403ac2ae18cd8e046e581a441bf8d199f257f03" +checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce" dependencies = [ - "borsh-derive 1.5.3", - "cfg_aliases 0.2.1", + "borsh-derive 1.5.7", + "cfg_aliases", ] [[package]] @@ -532,9 +389,9 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.5.3" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2593a3b8b938bd68373196c9832f516be11fa487ef4ae745eb282e6a56a7244" +checksum = "fdd1d3c0c2f5833f22386f252fe8ed005c7f59fdcddeef025c01b4c3b9fd9ac3" dependencies = [ "once_cell", "proc-macro-crate 3.2.0", @@ -613,18 +470,18 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.20.0" +version = "1.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a" +checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.8.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" +checksum = "4f154e572231cb6ba2bd1176980827e3d5dc04cc183a75dea38109fbdd672d29" dependencies = [ "proc-macro2", "quote", @@ -643,45 +500,12 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" -[[package]] -name = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "caps" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190baaad529bcfbde9e1a19022c42781bdb6ff9de25721abdb8fd98c0807730b" -dependencies = [ - "libc", - "thiserror", -] - [[package]] name = "cc" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" dependencies = [ - "jobserver", - "libc", "shlex", ] @@ -691,12 +515,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - [[package]] name = "cfg_aliases" version = "0.2.1" @@ -704,86 +522,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] -name = "chrono" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.52.6", -] - -[[package]] -name = "chrono-humanize" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799627e6b4d27827a814e837b9d8a504832086081806d45b1afa34dc982b023b" -dependencies = [ - "chrono", -] - -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim 0.8.0", - "textwrap 0.11.0", - "unicode-width 0.1.14", - "vec_map", -] - -[[package]] -name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_lex", - "indexmap 1.9.3", - "once_cell", - "strsim 0.10.0", - "termcolor", - "textwrap 0.16.1", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" +name = "cfg_eval" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +checksum = "45565fc9416b9896014f5732ac776f810ee53a66730c17e4020c3ec064a8f88f" dependencies = [ - "os_str_bytes", + "proc-macro2", + "quote", + "syn 2.0.89", ] [[package]] -name = "cmake" -version = "0.1.51" +name = "chrono" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" +checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" dependencies = [ - "cc", + "iana-time-zone", + "num-traits", + "serde", + "windows-link", ] [[package]] @@ -799,28 +557,6 @@ dependencies = [ "unreachable", ] -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "console" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width 0.1.14", - "windows-sys 0.52.0", -] - [[package]] name = "console_error_panic_hook" version = "0.1.7" @@ -847,16 +583,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -883,28 +609,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" dependencies = [ "crossbeam-utils", ] @@ -928,7 +635,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core 0.6.4", "typenum", ] @@ -942,96 +648,81 @@ dependencies = [ "subtle", ] -[[package]] -name = "ctr" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" -dependencies = [ - "cipher", -] - [[package]] name = "curve25519-dalek" -version = "3.2.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" +checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.5.1", - "serde", "subtle", "zeroize", ] [[package]] -name = "darling" -version = "0.20.10" +name = "curve25519-dalek" +version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ - "darling_core", - "darling_macro", + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", + "fiat-crypto", + "rand_core 0.6.4", + "rustc_version", + "serde", + "subtle", + "zeroize", ] [[package]] -name = "darling_core" -version = "0.20.10" +name = "curve25519-dalek-derive" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ - "fnv", - "ident_case", "proc-macro2", "quote", - "strsim 0.11.1", "syn 2.0.89", ] [[package]] -name = "darling_macro" -version = "0.20.10" +name = "darling" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0" dependencies = [ "darling_core", - "quote", - "syn 2.0.89", + "darling_macro", ] [[package]] -name = "dashmap" -version = "5.5.3" +name = "darling_core" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4" dependencies = [ - "cfg-if", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", - "rayon", + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.89", ] [[package]] -name = "data-encoding" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" - -[[package]] -name = "der-parser" -version = "8.2.0" +name = "darling_macro" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" +checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" dependencies = [ - "asn1-rs", - "displaydoc", - "nom", - "num-bigint 0.4.6", - "num-traits", - "rusticata-macros", + "darling_core", + "quote", + "syn 2.0.89", ] [[package]] @@ -1061,24 +752,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "dialoguer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" -dependencies = [ - "console", - "shell-words", - "tempfile", - "zeroize", -] - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - [[package]] name = "digest" version = "0.9.0" @@ -1099,15 +772,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "dir-diff" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ad16bf5f84253b50d6557681c58c3ab67c47c77d39fed9aeb56e947290bd10" -dependencies = [ - "walkdir", -] - [[package]] name = "displaydoc" version = "0.2.5" @@ -1120,33 +784,10 @@ dependencies = [ ] [[package]] -name = "dlopen2" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b4f5f101177ff01b8ec4ecc81eead416a8aa42819a2869311b3420fa114ffa" -dependencies = [ - "dlopen2_derive", - "libc", - "once_cell", - "winapi", -] - -[[package]] -name = "dlopen2_derive" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6cbae11b3de8fce2a456e8ea3dada226b35fe791f0dc1d360c0941f0bb681f3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.89", -] - -[[package]] -name = "downcast" -version = "0.11.0" +name = "dyn-clone" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" +checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "eager" @@ -1169,7 +810,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ - "curve25519-dalek", + "curve25519-dalek 3.2.0", "ed25519", "rand 0.7.3", "serde", @@ -1189,39 +830,12 @@ dependencies = [ "sha2 0.10.8", ] -[[package]] -name = "educe" -version = "0.4.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0042ff8246a363dbe77d2ceedb073339e85a804b9a47636c6e016a9a32c05f" -dependencies = [ - "enum-ordinalize", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "either" version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "encoding_rs" -version = "0.8.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" -dependencies = [ - "cfg-if", -] - [[package]] name = "enum-iterator" version = "1.5.0" @@ -1242,19 +856,6 @@ dependencies = [ "syn 2.0.89", ] -[[package]] -name = "enum-ordinalize" -version = "3.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf1fa3f06bbff1ea5b1a9c7b14aa992a39657db60a2759457328d7e058f49ee" -dependencies = [ - "num-bigint 0.4.6", - "num-traits", - "proc-macro2", - "quote", - "syn 2.0.89", -] - [[package]] name = "env_logger" version = "0.9.3" @@ -1284,12 +885,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - [[package]] name = "fastrand" version = "2.2.0" @@ -1303,17 +898,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da" [[package]] -name = "filetime" -version = "0.2.25" +name = "fiat-crypto" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + +[[package]] +name = "five8" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" +checksum = "a75b8549488b4715defcb0d8a8a1c1c76a80661b5fa106b4ca0e7fce59d7d875" dependencies = [ - "cfg-if", - "libc", - "libredox", - "windows-sys 0.59.0", + "five8_core", +] + +[[package]] +name = "five8_const" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26dec3da8bc3ef08f2c04f61eab298c3ab334523e55f076354d6d6f613799a7b" +dependencies = [ + "five8_core", ] +[[package]] +name = "five8_core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2551bf44bc5f776c15044b9b94153a00198be06743e262afaaa61f11ac7523a5" + [[package]] name = "fixedbitset" version = "0.4.2" @@ -1330,15 +943,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - [[package]] name = "fnv" version = "1.0.7" @@ -1346,33 +950,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] -name = "form_urlencoded" -version = "1.2.1" +name = "foreign-types" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "percent-encoding", + "foreign-types-shared", ] [[package]] -name = "fragile" -version = "2.0.0" +name = "foreign-types-shared" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] -name = "futures" -version = "0.3.31" +name = "form_urlencoded" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", + "percent-encoding", ] [[package]] @@ -1391,34 +989,12 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" -[[package]] -name = "futures-executor" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - [[package]] name = "futures-io" version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" -[[package]] -name = "futures-macro" -version = "0.3.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.89", -] - [[package]] name = "futures-sink" version = "0.3.31" @@ -1437,10 +1013,8 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ - "futures-channel", "futures-core", "futures-io", - "futures-macro", "futures-sink", "futures-task", "memchr", @@ -1455,7 +1029,6 @@ version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ - "serde", "typenum", "version_check", ] @@ -1497,46 +1070,30 @@ dependencies = [ ] [[package]] -name = "gimli" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" - -[[package]] -name = "goblin" -version = "0.5.4" +name = "getrandom" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7666983ed0dd8d21a6f6576ee00053ca0926fb281a5522577a4dbd0f1b54143" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" dependencies = [ - "log", - "plain", - "scroll", + "cfg-if", + "js-sys", + "libc", + "r-efi", + "wasi 0.14.7+wasi-0.2.4", + "wasm-bindgen", ] [[package]] -name = "h2" -version = "0.3.26" +name = "gimli" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap 2.6.0", - "slab", - "tokio", - "tokio-util 0.7.12", - "tracing", -] +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "hash32" -version = "0.2.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" dependencies = [ "byteorder", ] @@ -1556,12 +1113,6 @@ dependencies = [ "ahash", ] -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" - [[package]] name = "hashbrown" version = "0.15.2" @@ -1570,9 +1121,12 @@ checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] name = "heck" -version = "0.4.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] [[package]] name = "hermit-abi" @@ -1595,12 +1149,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "histogram" -version = "0.6.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cb882ccb290b8646e554b157ab0b71e64e8d5bef775cd66b6531e52d302669" - [[package]] name = "hmac" version = "0.8.1" @@ -1632,33 +1180,36 @@ dependencies = [ ] [[package]] -name = "home" -version = "0.5.9" +name = "http" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" dependencies = [ - "windows-sys 0.52.0", + "bytes", + "fnv", + "itoa", ] [[package]] -name = "http" -version = "0.2.12" +name = "http-body" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "fnv", - "itoa", + "http", ] [[package]] -name = "http-body" -version = "0.4.6" +name = "http-body-util" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" dependencies = [ "bytes", + "futures-core", "http", + "http-body", "pin-project-lite", ] @@ -1668,12 +1219,6 @@ version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - [[package]] name = "humantime" version = "2.1.0" @@ -1682,40 +1227,64 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.31" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" +checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e" dependencies = [ + "atomic-waker", "bytes", "futures-channel", "futures-core", - "futures-util", - "h2", "http", "http-body", "httparse", - "httpdate", "itoa", "pin-project-lite", - "socket2", + "pin-utils", + "smallvec", "tokio", - "tower-service", - "tracing", "want", ] [[package]] name = "hyper-rustls" -version = "0.24.2" +version = "0.27.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" dependencies = [ - "futures-util", "http", "hyper", + "hyper-util", "rustls", + "rustls-pki-types", "tokio", "tokio-rustls", + "tower-service", + "webpki-roots", +] + +[[package]] +name = "hyper-util" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "http", + "http-body", + "hyper", + "ipnet", + "libc", + "percent-encoding", + "pin-project-lite", + "socket2 0.6.0", + "tokio", + "tower-service", + "tracing", ] [[package]] @@ -1887,60 +1456,19 @@ dependencies = [ ] [[package]] -name = "im" -version = "15.1.0" +name = "indexmap" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ - "bitmaps", - "rand_core 0.6.4", - "rand_xoshiro", - "rayon", + "autocfg", + "hashbrown 0.12.3", "serde", - "sized-chunks", - "typenum", - "version_check", ] [[package]] -name = "include_dir" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" -dependencies = [ - "include_dir_macros", -] - -[[package]] -name = "include_dir_macros" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "index_list" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e6ba961c14e98151cd6416dd3685efe786a94c38bc1a535c06ceff0a1600813" - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - -[[package]] -name = "indexmap" -version = "2.6.0" +name = "indexmap" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ @@ -1950,33 +1478,21 @@ dependencies = [ ] [[package]] -name = "indicatif" -version = "0.17.9" +name = "ipnet" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf675b85ed934d3c67b5c5469701eec7db22689d0a2139d856e0925fa28b281" -dependencies = [ - "console", - "number_prefix", - "portable-atomic", - "unicode-width 0.2.0", - "web-time", -] +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] -name = "inout" -version = "0.1.3" +name = "iri-string" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2" dependencies = [ - "generic-array", + "memchr", + "serde", ] -[[package]] -name = "ipnet" -version = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" - [[package]] name = "itertools" version = "0.10.5" @@ -2001,39 +1517,16 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" -[[package]] -name = "jobserver" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" -dependencies = [ - "libc", -] - [[package]] name = "js-sys" -version = "0.3.72" +version = "0.3.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305" dependencies = [ + "once_cell", "wasm-bindgen", ] -[[package]] -name = "jsonrpc-core" -version = "18.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" -dependencies = [ - "futures", - "futures-executor", - "futures-util", - "log", - "serde", - "serde_derive", - "serde_json", -] - [[package]] name = "keccak" version = "0.1.5" @@ -2051,20 +1544,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.164" +version = "0.2.176" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" - -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags 2.6.0", - "libc", - "redox_syscall", -] +checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174" [[package]] name = "libsecp256k1" @@ -2123,7 +1605,7 @@ dependencies = [ "ark-bn254", "ark-ff", "num-bigint 0.4.6", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2150,28 +1632,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" [[package]] -name = "lz4" -version = "1.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d1febb2b4a79ddd1980eede06a8f7902197960aa0383ffcfdd62fe723036725" -dependencies = [ - "lz4-sys", -] - -[[package]] -name = "lz4-sys" -version = "1.11.1+lz4-1.10.0" +name = "lru-slab" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6" -dependencies = [ - "cc", - "libc", -] +checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" [[package]] name = "memchr" @@ -2197,40 +1666,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "merlin" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" -dependencies = [ - "byteorder", - "keccak", - "rand_core 0.6.4", - "zeroize", -] - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "mime_guess" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" -dependencies = [ - "mime", - "unicase", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" version = "0.8.0" @@ -2252,155 +1687,121 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "mockall" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96" -dependencies = [ - "cfg-if", - "downcast", - "fragile", - "lazy_static", - "mockall_derive", - "predicates", - "predicates-tree", -] - -[[package]] -name = "mockall_derive" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" -dependencies = [ - "cfg-if", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "modular-bitfield" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53d79ba8304ac1c4f9eb3b9d281f21f7be9d4626f72ce7df4ad8fbde4f38a74" -dependencies = [ - "modular-bitfield-impl", - "static_assertions", -] - -[[package]] -name = "modular-bitfield-impl" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a7d5f7076603ebc68de2dc6a650ec331a062a13abaa346975be747bbfa4b789" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "mollusk-svm" -version = "0.0.10-solana-2.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9626af76e957ae02120553335831d964d095c1530902fa582555bd949bb08e1a" +checksum = "9ac533eca9acad4fb7b4714557cd6263d494c59c02c96036196d4143b68795a8" dependencies = [ + "agave-feature-set", + "agave-precompiles", "bincode", "mollusk-svm-error", "mollusk-svm-fuzz-fixture-firedancer", "mollusk-svm-fuzz-fs", "mollusk-svm-keys", + "mollusk-svm-result", + "solana-account", "solana-bpf-loader-program", + "solana-clock", "solana-compute-budget", + "solana-epoch-rewards", + "solana-epoch-schedule", + "solana-hash", + "solana-instruction", + "solana-loader-v3-interface 3.0.0", + "solana-loader-v4-interface", + "solana-log-collector", "solana-logger", + "solana-precompile-error", + "solana-program-error", "solana-program-runtime", - "solana-sdk", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", + "solana-slot-hashes", + "solana-stake-interface", + "solana-svm-callback", "solana-system-program", + "solana-sysvar", + "solana-sysvar-id", + "solana-timings", + "solana-transaction-context", ] [[package]] name = "mollusk-svm-error" -version = "0.0.10-solana-2.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a766f14e1da90508b0a965986547f27e5cde64b727a85a67d313ed27ef2baa04" +checksum = "4135aa8a9c9069b30109262e63795959040888586ea8f90809c4365a6d439ee9" dependencies = [ - "solana-sdk", - "thiserror", + "solana-pubkey", + "thiserror 1.0.69", ] [[package]] name = "mollusk-svm-fuzz-fixture-firedancer" -version = "0.0.10-solana-2.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c684a6c6fcdde0fcd701fa67d52aaae253d0d53dd42e6901a58e3a1e17d827c7" +checksum = "e0a0f254714b6394f56f965b5651ad7a622e03d2c1b8d7c4bd43ef3ad734fde9" dependencies = [ + "agave-feature-set", "mollusk-svm-fuzz-fs", - "prost 0.10.4", - "prost-build 0.10.4", + "prost", + "prost-build", "serde", "serde_json", - "solana-compute-budget", - "solana-sdk", + "solana-account", + "solana-keccak-hasher", + "solana-pubkey", + "solana-transaction-context", + "which", ] [[package]] name = "mollusk-svm-fuzz-fs" -version = "0.0.10-solana-2.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ace04afb3e493de6e703188e7022240eb7066cc82005e4a52f67d6992f156fe" +checksum = "8b825237cb6bcd6da44b8f4852b62cb6c8279729950b5a18fb8cc3dff38374e3" dependencies = [ "bs58", - "prost 0.10.4", + "prost", "serde", "serde_json", - "solana-sdk", + "solana-keccak-hasher", ] [[package]] name = "mollusk-svm-keys" -version = "0.0.10-solana-2.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4a4bd0dc9357810c27a7eef7e780cb446b26c602eb1b92b56b43f3f7c0f9dc" +checksum = "b230d33b0194b126be2c37a19bf4d59d8e80a5ce63e8d3d4135a6cbf89ed3302" dependencies = [ "mollusk-svm-error", - "solana-sdk", -] - -[[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "cfg_aliases 0.1.1", - "libc", - "memoffset", + "solana-account", + "solana-instruction", + "solana-pubkey", + "solana-transaction-context", ] [[package]] -name = "nom" -version = "7.1.3" +name = "mollusk-svm-result" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +checksum = "a4c788b78a077f73b466dbfa7510804136075fd8e6f3eca8392018991c46fef3" dependencies = [ - "memchr", - "minimal-lexical", + "solana-account", + "solana-instruction", + "solana-program-error", + "solana-pubkey", + "solana-rent", ] [[package]] -name = "normalize-line-endings" -version = "0.3.0" +name = "multimap" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "num" @@ -2516,16 +1917,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.9", - "libc", -] - [[package]] name = "num_enum" version = "0.7.3" @@ -2547,12 +1938,6 @@ dependencies = [ "syn 2.0.89", ] -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - [[package]] name = "object" version = "0.36.5" @@ -2562,15 +1947,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "oid-registry" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" -dependencies = [ - "asn1-rs", -] - [[package]] name = "once_cell" version = "1.20.2" @@ -2584,35 +1960,52 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] -name = "openssl-probe" -version = "0.1.5" +name = "openssl" +version = "0.10.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8" +dependencies = [ + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] [[package]] -name = "opentelemetry" -version = "0.17.0" +name = "openssl-macros" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", - "js-sys", - "lazy_static", - "percent-encoding", - "pin-project", - "rand 0.8.5", - "thiserror", + "proc-macro2", + "quote", + "syn 2.0.89", +] + +[[package]] +name = "openssl-src" +version = "300.5.3+3.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc6bad8cd0233b63971e232cc9c5e83039375b8586d2312f31fda85db8f888c2" +dependencies = [ + "cc", ] [[package]] -name = "os_str_bytes" -version = "6.6.1" +name = "openssl-sys" +version = "0.9.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" +checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571" +dependencies = [ + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] [[package]] name = "parking_lot" @@ -2634,7 +2027,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -2643,15 +2036,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" -[[package]] -name = "pbkdf2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" -dependencies = [ - "crypto-mac", -] - [[package]] name = "pbkdf2" version = "0.11.0" @@ -2661,15 +2045,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "pem" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" -dependencies = [ - "base64 0.13.1", -] - [[package]] name = "percent-encoding" version = "2.3.1" @@ -2695,26 +2070,6 @@ dependencies = [ "indexmap 2.6.0", ] -[[package]] -name = "pin-project" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.89", -] - [[package]] name = "pin-project-lite" version = "0.2.15" @@ -2733,30 +2088,6 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" -[[package]] -name = "plain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" - -[[package]] -name = "polyval" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" -dependencies = [ - "cfg-if", - "cpufeatures", - "opaque-debug", - "universal-hash", -] - -[[package]] -name = "portable-atomic" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" - [[package]] name = "powerfmt" version = "0.2.0" @@ -2773,52 +2104,12 @@ dependencies = [ ] [[package]] -name = "predicates" -version = "2.1.5" +name = "proc-macro-crate" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" +checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" dependencies = [ - "difflib", - "float-cmp", - "itertools 0.10.5", - "normalize-line-endings", - "predicates-core", - "regex", -] - -[[package]] -name = "predicates-core" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" - -[[package]] -name = "predicates-tree" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "prettyplease" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" -dependencies = [ - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml", + "toml", ] [[package]] @@ -2830,86 +2121,30 @@ dependencies = [ "toml_edit", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" dependencies = [ "unicode-ident", ] [[package]] name = "prost" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" -dependencies = [ - "bytes", - "prost-derive 0.10.1", -] - -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive 0.11.9", -] - -[[package]] -name = "prost-build" -version = "0.10.4" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae5a4388762d5815a9fc0dea33c56b021cdc8dde0c55e0c9ca57197254b0cab" +checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" dependencies = [ "bytes", - "cfg-if", - "cmake", - "heck", - "itertools 0.10.5", - "lazy_static", - "log", - "multimap", - "petgraph", - "prost 0.10.4", - "prost-types 0.10.1", - "regex", - "tempfile", - "which", + "prost-derive", ] [[package]] name = "prost-build" -version = "0.11.9" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" dependencies = [ "bytes", "heck", @@ -2918,33 +2153,18 @@ dependencies = [ "log", "multimap", "petgraph", - "prettyplease", - "prost 0.11.9", - "prost-types 0.11.9", + "prost", + "prost-types", "regex", - "syn 1.0.109", "tempfile", "which", ] [[package]] name = "prost-derive" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "prost-derive" -version = "0.11.9" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" dependencies = [ "anyhow", "itertools 0.10.5", @@ -2955,21 +2175,12 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.10.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0a014229361011dc8e69c8a1ec6c2e8d0f2af7c91e3ea3f5b2170298461e68" +checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" dependencies = [ "bytes", - "prost 0.10.4", -] - -[[package]] -name = "prost-types" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" -dependencies = [ - "prost 0.11.9", + "prost", ] [[package]] @@ -2994,50 +2205,57 @@ dependencies = [ [[package]] name = "quinn" -version = "0.10.2" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" +checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" dependencies = [ "bytes", + "cfg_aliases", "pin-project-lite", "quinn-proto", "quinn-udp", "rustc-hash", "rustls", - "thiserror", + "socket2 0.5.7", + "thiserror 2.0.17", "tokio", "tracing", + "web-time", ] [[package]] name = "quinn-proto" -version = "0.10.6" +version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" +checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" dependencies = [ "bytes", - "rand 0.8.5", - "ring 0.16.20", + "getrandom 0.3.3", + "lru-slab", + "rand 0.9.2", + "ring", "rustc-hash", "rustls", - "rustls-native-certs", + "rustls-pki-types", "slab", - "thiserror", + "thiserror 2.0.17", "tinyvec", "tracing", + "web-time", ] [[package]] name = "quinn-udp" -version = "0.4.1" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" +checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" dependencies = [ - "bytes", + "cfg_aliases", "libc", - "socket2", + "once_cell", + "socket2 0.5.7", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -3049,6 +2267,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + [[package]] name = "rand" version = "0.7.3" @@ -3073,6 +2297,16 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "rand" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" +dependencies = [ + "rand_chacha 0.9.0", + "rand_core 0.9.3", +] + [[package]] name = "rand_chacha" version = "0.2.2" @@ -3093,6 +2327,16 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.3", +] + [[package]] name = "rand_core" version = "0.5.1" @@ -3112,50 +2356,50 @@ dependencies = [ ] [[package]] -name = "rand_hc" -version = "0.2.0" +name = "rand_core" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ - "rand_core 0.5.1", + "getrandom 0.3.3", ] [[package]] -name = "rand_xoshiro" -version = "0.6.0" +name = "rand_hc" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" dependencies = [ - "rand_core 0.6.4", + "rand_core 0.5.1", ] [[package]] -name = "rayon" -version = "1.10.0" +name = "redox_syscall" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ - "either", - "rayon-core", + "bitflags", ] [[package]] -name = "rayon-core" -version = "1.12.1" +name = "ref-cast" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" dependencies = [ - "crossbeam-deque", - "crossbeam-utils", + "ref-cast-impl", ] [[package]] -name = "redox_syscall" -version = "0.5.7" +name = "ref-cast-impl" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ - "bitflags 2.6.0", + "proc-macro2", + "quote", + "syn 2.0.89", ] [[package]] @@ -3189,76 +2433,44 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" -version = "0.11.27" +version = "0.12.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb" dependencies = [ "async-compression", - "base64 0.21.7", + "base64 0.22.1", "bytes", - "encoding_rs", + "futures-channel", "futures-core", "futures-util", - "h2", "http", "http-body", + "http-body-util", "hyper", "hyper-rustls", - "ipnet", + "hyper-util", "js-sys", "log", - "mime", - "mime_guess", - "once_cell", "percent-encoding", "pin-project-lite", + "quinn", "rustls", - "rustls-pemfile", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", - "system-configuration", "tokio", "tokio-rustls", - "tokio-util 0.7.12", + "tokio-util", + "tower", + "tower-http", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.25.4", - "winreg", -] - -[[package]] -name = "reqwest-middleware" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a735987236a8e238bf0296c7e351b999c188ccc11477f311b82b55c93984216" -dependencies = [ - "anyhow", - "async-trait", - "http", - "reqwest", - "serde", - "task-local-extensions", - "thiserror", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", + "webpki-roots", ] [[package]] @@ -3271,32 +2483,11 @@ dependencies = [ "cfg-if", "getrandom 0.2.15", "libc", - "spin 0.9.8", - "untrusted 0.9.0", + "spin", + "untrusted", "windows-sys 0.52.0", ] -[[package]] -name = "rpassword" -version = "7.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f" -dependencies = [ - "libc", - "rtoolbox", - "windows-sys 0.48.0", -] - -[[package]] -name = "rtoolbox" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "rustc-demangle" version = "0.1.24" @@ -3305,9 +2496,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" -version = "1.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" [[package]] name = "rustc_version" @@ -3318,22 +2509,13 @@ dependencies = [ "semver", ] -[[package]] -name = "rusticata-macros" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" -dependencies = [ - "nom", -] - [[package]] name = "rustix" version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ - "bitflags 2.6.0", + "bitflags", "errno", "libc", "linux-raw-sys", @@ -3342,45 +2524,37 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.12" +version = "0.23.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" +checksum = "cd3c25631629d034ce7cd9940adc9d45762d46de2b0f57193c4443b92c6d4d40" dependencies = [ - "log", - "ring 0.17.8", + "once_cell", + "ring", + "rustls-pki-types", "rustls-webpki", - "sct", -] - -[[package]] -name = "rustls-native-certs" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", + "subtle", + "zeroize", ] [[package]] -name = "rustls-pemfile" -version = "1.0.4" +name = "rustls-pki-types" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" dependencies = [ - "base64 0.21.7", + "web-time", + "zeroize", ] [[package]] name = "rustls-webpki" -version = "0.101.7" +version = "0.103.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +checksum = "e10b3f4191e8a80e6b43eebabfac91e5dcecebb27a71f04e820c47ec41d314bf" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "ring", + "rustls-pki-types", + "untrusted", ] [[package]] @@ -3396,21 +2570,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] -name = "same-file" -version = "1.0.6" +name = "schemars" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f" dependencies = [ - "winapi-util", + "dyn-clone", + "ref-cast", + "serde", + "serde_json", ] [[package]] -name = "schannel" -version = "0.1.27" +name = "schemars" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" +checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0" dependencies = [ - "windows-sys 0.59.0", + "dyn-clone", + "ref-cast", + "serde", + "serde_json", ] [[package]] @@ -3420,117 +2600,75 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "scroll" -version = "0.11.0" +name = "semver" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" -dependencies = [ - "scroll_derive", -] +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] -name = "scroll_derive" -version = "0.11.1" +name = "serde" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.89", + "serde_core", + "serde_derive", ] [[package]] -name = "sct" -version = "0.7.1" +name = "serde-big-array" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +checksum = "11fc7cc2c76d73e0f27ee52abbd64eec84d46f370c88371120433196934e4b7f" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "serde", ] [[package]] -name = "security-framework" -version = "2.11.1" +name = "serde_bytes" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" dependencies = [ - "bitflags 2.6.0", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", + "serde", ] [[package]] -name = "security-framework-sys" -version = "2.12.1" +name = "serde_core" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ - "core-foundation-sys", - "libc", + "serde_derive", ] [[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" - -[[package]] -name = "seqlock" -version = "0.2.0" +name = "serde_derive" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5c67b6f14ecc5b86c66fa63d76b5092352678545a8a3cdae80aef5128371910" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ - "parking_lot", + "proc-macro2", + "quote", + "syn 2.0.89", ] [[package]] -name = "serde" -version = "1.0.215" +name = "serde_json" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ - "serde_derive", + "itoa", + "memchr", + "ryu", + "serde", + "serde_core", ] [[package]] -name = "serde_bytes" -version = "0.11.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_derive" -version = "1.0.215" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.89", -] - -[[package]] -name = "serde_json" -version = "1.0.133" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" -dependencies = [ - "itoa", - "memchr", - "ryu", - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" +name = "serde_urlencoded" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ @@ -3542,49 +2680,29 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" -dependencies = [ - "serde", - "serde_with_macros 2.3.3", -] - -[[package]] -name = "serde_with" -version = "3.11.0" +version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" +checksum = "c522100790450cf78eeac1507263d0a350d4d5b30df0c8e1fe051a10c22b376e" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", "indexmap 2.6.0", + "schemars 0.9.0", + "schemars 1.0.4", "serde", "serde_derive", "serde_json", - "serde_with_macros 3.11.0", + "serde_with_macros", "time", ] [[package]] name = "serde_with_macros" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.89", -] - -[[package]] -name = "serde_with_macros" -version = "3.11.0" +version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" +checksum = "327ada00f7d64abaac1e55a6911e90cf665aa051b9a561c7006c157f4633135e" dependencies = [ "darling", "proc-macro2", @@ -3592,17 +2710,6 @@ dependencies = [ "syn 2.0.89", ] -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest 0.10.7", -] - [[package]] name = "sha2" version = "0.9.9" @@ -3627,18 +2734,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "sha3" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" -dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "keccak", - "opaque-debug", -] - [[package]] name = "sha3" version = "0.10.8" @@ -3695,27 +2790,22 @@ dependencies = [ "shank_macro_impl", ] -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shell-words" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" - [[package]] name = "shlex" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "signal-hook" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2" +dependencies = [ + "libc", + "signal-hook-registry", +] + [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -3737,16 +2827,6 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" -[[package]] -name = "sized-chunks" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" -dependencies = [ - "bitmaps", - "typenum", -] - [[package]] name = "slab" version = "0.4.9" @@ -3773,1525 +2853,1729 @@ dependencies = [ ] [[package]] -name = "solana-account-decoder" -version = "2.0.9" +name = "socket2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1889be2bdb77224ed1bb726e64983a9ede622da5a22e8fb0619a2ec6885e84f2" +checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + +[[package]] +name = "solana-account" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f949fe4edaeaea78c844023bfc1c898e0b1f5a100f8a8d2d0f85d0a7b090258" dependencies = [ - "Inflector", - "base64 0.22.1", "bincode", - "bs58", - "bv", - "lazy_static", + "qualifier_attr", "serde", + "serde_bytes", "serde_derive", - "serde_json", - "solana-config-program", - "solana-sdk", - "spl-token", - "spl-token-2022", - "spl-token-group-interface", - "spl-token-metadata-interface", - "thiserror", - "zstd", + "solana-account-info", + "solana-clock", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", + "solana-sysvar", ] [[package]] -name = "solana-accounts-db" -version = "2.0.9" +name = "solana-account-info" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9f880ccb0b22c4fdefd47e2cea6509661b6b9ee193334606f0ca5ecdb4edc32" +checksum = "c8f5152a288ef1912300fc6efa6c2d1f9bb55d9398eb6c72326360b8063987da" dependencies = [ "bincode", - "blake3", - "bv", - "bytemuck", - "bytemuck_derive", - "bzip2", - "crossbeam-channel", - "dashmap", - "index_list", - "indexmap 2.6.0", - "itertools 0.12.1", - "lazy_static", - "log", - "lz4", - "memmap2", - "modular-bitfield", - "num_cpus", - "num_enum", - "rand 0.8.5", - "rayon", - "rustc_version", - "seqlock", "serde", - "serde_derive", - "smallvec", - "solana-bucket-map", - "solana-inline-spl", - "solana-measure", - "solana-metrics", - "solana-nohash-hasher", - "solana-rayon-threadlimit", - "solana-sdk", - "solana-svm", - "static_assertions", - "tar", - "tempfile", - "thiserror", + "solana-program-error", + "solana-program-memory", + "solana-pubkey", ] [[package]] -name = "solana-address-lookup-table-program" -version = "2.0.9" +name = "solana-address-lookup-table-interface" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0165da335eb1b5b2da4a8c546e393cdbd55263d3a7eb3136a362553a9cb4678b" +checksum = "d1673f67efe870b64a65cb39e6194be5b26527691ce5922909939961a6e6b395" dependencies = [ "bincode", "bytemuck", - "log", - "num-derive 0.4.2", - "num-traits", - "rustc_version", - "solana-program", - "solana-program-runtime", - "solana-sdk", - "thiserror", + "serde", + "serde_derive", + "solana-clock", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", + "solana-slot-hashes", ] [[package]] -name = "solana-banks-client" -version = "2.0.9" +name = "solana-atomic-u64" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34f632a5ca86729b3674afa3c7bb50f7c1e093f200fc8e34618b246093a49cc2" +checksum = "d52e52720efe60465b052b9e7445a01c17550666beec855cce66f44766697bc2" dependencies = [ - "borsh 1.5.3", - "futures", - "solana-banks-interface", - "solana-program", - "solana-sdk", - "tarpc", - "thiserror", - "tokio", - "tokio-serde", + "parking_lot", ] [[package]] -name = "solana-banks-interface" -version = "2.0.9" +name = "solana-big-mod-exp" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63a1c61cfea4a0d3aad3f300c9ded38f0f77a9e4a36a7cabeea5f9c092014ba1" +checksum = "75db7f2bbac3e62cfd139065d15bcda9e2428883ba61fc8d27ccb251081e7567" dependencies = [ - "serde", - "serde_derive", - "solana-sdk", - "tarpc", + "num-bigint 0.4.6", + "num-traits", + "solana-define-syscall", ] [[package]] -name = "solana-banks-server" -version = "2.0.9" +name = "solana-bincode" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "268119cc56fed44c36e1e12cd2628c2d5643031ed6d91be872f5e1e08db9c606" +checksum = "19a3787b8cf9c9fe3dd360800e8b70982b9e5a8af9e11c354b6665dd4a003adc" dependencies = [ "bincode", - "crossbeam-channel", - "futures", - "solana-banks-interface", - "solana-client", - "solana-runtime", - "solana-sdk", - "solana-send-transaction-service", - "solana-svm", - "tarpc", - "tokio", - "tokio-serde", + "serde", + "solana-instruction", +] + +[[package]] +name = "solana-blake3-hasher" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a0801e25a1b31a14494fc80882a036be0ffd290efc4c2d640bfcca120a4672" +dependencies = [ + "blake3", + "solana-define-syscall", + "solana-hash", + "solana-sanitize", +] + +[[package]] +name = "solana-bn254" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4420f125118732833f36facf96a27e7b78314b2d642ba07fa9ffdacd8d79e243" +dependencies = [ + "ark-bn254", + "ark-ec", + "ark-ff", + "ark-serialize", + "bytemuck", + "solana-define-syscall", + "thiserror 2.0.17", +] + +[[package]] +name = "solana-borsh" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "718333bcd0a1a7aed6655aa66bef8d7fb047944922b2d3a18f49cbc13e73d004" +dependencies = [ + "borsh 0.10.4", + "borsh 1.5.7", ] [[package]] name = "solana-bpf-loader-program" -version = "2.0.9" +version = "2.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ac9c67b1651c35868323f551ada9aa468f0ff731afa0e07084b5af3ef35958" +checksum = "6daee6ef83e49a59375b8858244be57cadc632381fa8e514a788af0699b66b4e" dependencies = [ "bincode", - "byteorder", "libsecp256k1", - "log", + "num-traits", + "qualifier_attr", "scopeguard", - "solana-compute-budget", + "solana-account", + "solana-account-info", + "solana-big-mod-exp", + "solana-bincode", + "solana-blake3-hasher", + "solana-bn254", + "solana-clock", + "solana-cpi", "solana-curve25519", + "solana-hash", + "solana-instruction", + "solana-keccak-hasher", + "solana-loader-v3-interface 5.0.0", + "solana-loader-v4-interface", + "solana-log-collector", "solana-measure", + "solana-packet", "solana-poseidon", + "solana-program-entrypoint", "solana-program-runtime", - "solana-sdk", + "solana-pubkey", + "solana-sbpf", + "solana-sdk-ids", + "solana-secp256k1-recover", + "solana-sha256-hasher", + "solana-stable-layout", + "solana-svm-feature-set", + "solana-system-interface", + "solana-sysvar", + "solana-sysvar-id", + "solana-timings", + "solana-transaction-context", "solana-type-overrides", - "solana_rbpf", - "thiserror", + "thiserror 2.0.17", ] [[package]] -name = "solana-bucket-map" -version = "2.0.9" +name = "solana-client-traits" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ebb86a25bc3a67b905f7ffb87db28a3f3e5531aabe340cb5ab5cdbc85f25992" +checksum = "83f0071874e629f29e0eb3dab8a863e98502ac7aba55b7e0df1803fc5cac72a7" dependencies = [ - "bv", - "bytemuck", - "bytemuck_derive", - "log", - "memmap2", - "modular-bitfield", - "num_enum", - "rand 0.8.5", - "solana-measure", - "solana-sdk", - "tempfile", + "solana-account", + "solana-commitment-config", + "solana-epoch-info", + "solana-hash", + "solana-instruction", + "solana-keypair", + "solana-message", + "solana-pubkey", + "solana-signature", + "solana-signer", + "solana-system-interface", + "solana-transaction", + "solana-transaction-error", ] [[package]] -name = "solana-clap-utils" -version = "2.0.9" +name = "solana-clock" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "044b8e6933bf9d6ccba74e4ea9b9ef589d3e89347d816fdbdeaf31cb218804db" +checksum = "1bb482ab70fced82ad3d7d3d87be33d466a3498eb8aa856434ff3c0dfc2e2e31" dependencies = [ - "chrono", - "clap 2.34.0", - "rpassword", - "solana-remote-wallet", - "solana-sdk", - "thiserror", - "tiny-bip39", - "uriparse", - "url", + "serde", + "serde_derive", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", ] [[package]] -name = "solana-client" -version = "2.0.9" +name = "solana-cluster-type" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0dca5fbbb18347109189799fc4554ba311eb201af9ffdf683628477e9652ccf" +checksum = "7ace9fea2daa28354d107ea879cff107181d85cd4e0f78a2bedb10e1a428c97e" dependencies = [ - "async-trait", - "bincode", - "dashmap", - "futures", - "futures-util", - "indexmap 2.6.0", - "indicatif", - "log", - "quinn", - "rayon", - "solana-connection-cache", - "solana-measure", - "solana-metrics", - "solana-pubsub-client", - "solana-quic-client", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-rpc-client-nonce-utils", - "solana-sdk", - "solana-streamer", - "solana-thin-client", - "solana-tpu-client", - "solana-udp-client", - "thiserror", - "tokio", + "serde", + "serde_derive", + "solana-hash", ] [[package]] -name = "solana-compute-budget" -version = "2.0.9" +name = "solana-commitment-config" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a9d6e202f04a2f57b314ba3494a5230f9708247070393f782a754774b1fbb3" +checksum = "ac49c4dde3edfa832de1697e9bcdb7c3b3f7cb7a1981b7c62526c8bb6700fb73" dependencies = [ - "rustc_version", - "solana-sdk", + "serde", + "serde_derive", ] [[package]] -name = "solana-compute-budget-program" -version = "2.0.9" +name = "solana-compute-budget" +version = "2.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17a441d7944c8df0068b011aa34e60b3c60032baa99057af0d37e09849eaa51c" +checksum = "69b145d19103c186d49a4f98d63d5aff90dfefcf133c4d798578200f0b0dd3b3" dependencies = [ + "solana-fee-structure", "solana-program-runtime", - "solana-sdk", ] [[package]] -name = "solana-config-program" -version = "2.0.9" +name = "solana-compute-budget-interface" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92bbca6f0351b8bf3de4472a6cdc4e5f94ddd8eb571230eb6c57ed42bda10553" +checksum = "8432d2c4c22d0499aa06d62e4f7e333f81777b3d7c96050ae9e5cb71a8c3aee4" dependencies = [ - "bincode", - "chrono", + "borsh 1.5.7", "serde", "serde_derive", - "solana-program-runtime", - "solana-sdk", + "solana-instruction", + "solana-sdk-ids", ] [[package]] -name = "solana-connection-cache" -version = "2.0.9" +name = "solana-cpi" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c72db598b2e364b2457c54a3d26935accf691643a4d9bf94396f526606ff1764" +checksum = "8dc71126edddc2ba014622fc32d0f5e2e78ec6c5a1e0eb511b85618c09e9ea11" dependencies = [ - "async-trait", - "bincode", - "crossbeam-channel", - "futures-util", - "indexmap 2.6.0", - "log", - "rand 0.8.5", - "rayon", - "solana-measure", - "solana-metrics", - "solana-sdk", - "thiserror", - "tokio", + "solana-account-info", + "solana-define-syscall", + "solana-instruction", + "solana-program-error", + "solana-pubkey", + "solana-stable-layout", ] [[package]] -name = "solana-cost-model" -version = "2.0.9" +name = "solana-curve25519" +version = "2.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f87cc950f6af99e19702f8ae1185d19a6f77b63856fb02b0af9f995630a1c08" +checksum = "fa77936de1910002e7ad5817e38c3990402c2d8e92517cdd736df51485c76d88" dependencies = [ - "ahash", - "lazy_static", - "log", - "rustc_version", - "solana-address-lookup-table-program", - "solana-bpf-loader-program", - "solana-compute-budget", - "solana-compute-budget-program", - "solana-config-program", - "solana-loader-v4-program", - "solana-metrics", - "solana-sdk", - "solana-stake-program", - "solana-system-program", - "solana-vote-program", + "bytemuck", + "bytemuck_derive", + "curve25519-dalek 4.1.3", + "solana-define-syscall", + "subtle", + "thiserror 2.0.17", ] [[package]] -name = "solana-curve25519" -version = "2.0.9" +name = "solana-decode-error" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa9209adbba7662a0a6a79ab48b4d09a2cb23a3db3dd817818e1bc28da99a11" +checksum = "8c781686a18db2f942e70913f7ca15dc120ec38dcab42ff7557db2c70c625a35" dependencies = [ - "bytemuck", - "bytemuck_derive", - "curve25519-dalek", - "solana-program", - "thiserror", + "num-traits", ] [[package]] -name = "solana-inline-spl" -version = "2.0.9" +name = "solana-define-syscall" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ae3e2abcf541c8122eafe9a625d4d194b4023c20adde1e251f94e056bb1aee2" + +[[package]] +name = "solana-derivation-path" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb9977e0e7769dfef30b1390289a65eb10b9553c4590eecd1fa5abbf2224c30" +checksum = "939756d798b25c5ec3cca10e06212bdca3b1443cb9bb740a38124f58b258737b" dependencies = [ - "bytemuck", - "rustc_version", - "solana-sdk", + "derivation-path", + "qstring", + "uriparse", ] [[package]] -name = "solana-loader-v3-program" -version = "0.0.0" +name = "solana-ed25519-program" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1feafa1691ea3ae588f99056f4bdd1293212c7ece28243d7da257c443e84753" dependencies = [ - "bincode", - "mollusk-svm", + "bytemuck", + "bytemuck_derive", + "ed25519-dalek", + "solana-feature-set", + "solana-instruction", + "solana-precompile-error", + "solana-sdk-ids", +] + +[[package]] +name = "solana-epoch-info" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ef6f0b449290b0b9f32973eefd95af35b01c5c0c34c569f936c34c5b20d77b" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "solana-epoch-rewards" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b575d3dd323b9ea10bb6fe89bf6bf93e249b215ba8ed7f68f1a3633f384db7" +dependencies = [ + "serde", + "serde_derive", + "solana-hash", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", +] + +[[package]] +name = "solana-epoch-rewards-hasher" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c5fd2662ae7574810904585fd443545ed2b568dbd304b25a31e79ccc76e81b" +dependencies = [ + "siphasher", + "solana-hash", + "solana-pubkey", +] + +[[package]] +name = "solana-epoch-schedule" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fce071fbddecc55d727b1d7ed16a629afe4f6e4c217bc8d00af3b785f6f67ed" +dependencies = [ + "serde", + "serde_derive", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", +] + +[[package]] +name = "solana-example-mocks" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84461d56cbb8bb8d539347151e0525b53910102e4bced875d49d5139708e39d3" +dependencies = [ + "serde", + "serde_derive", + "solana-address-lookup-table-interface", + "solana-clock", + "solana-hash", + "solana-instruction", + "solana-keccak-hasher", + "solana-message", + "solana-nonce", + "solana-pubkey", + "solana-sdk-ids", + "solana-system-interface", + "thiserror 2.0.17", +] + +[[package]] +name = "solana-feature-gate-interface" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f5c5382b449e8e4e3016fb05e418c53d57782d8b5c30aa372fc265654b956d" +dependencies = [ + "bincode", + "serde", + "serde_derive", + "solana-account", + "solana-account-info", + "solana-instruction", + "solana-program-error", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", + "solana-system-interface", +] + +[[package]] +name = "solana-feature-set" +version = "2.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93b93971e289d6425f88e6e3cb6668c4b05df78b3c518c249be55ced8efd6b6d" +dependencies = [ + "ahash", + "lazy_static", + "solana-epoch-schedule", + "solana-hash", + "solana-pubkey", + "solana-sha256-hasher", +] + +[[package]] +name = "solana-fee-calculator" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89bc408da0fb3812bc3008189d148b4d3e08252c79ad810b245482a3f70cd8d" +dependencies = [ + "log", + "serde", + "serde_derive", +] + +[[package]] +name = "solana-fee-structure" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33adf673581c38e810bf618f745bf31b683a0a4a4377682e6aaac5d9a058dd4e" +dependencies = [ + "serde", + "serde_derive", + "solana-message", + "solana-native-token", +] + +[[package]] +name = "solana-genesis-config" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3725085d47b96d37fef07a29d78d2787fc89a0b9004c66eed7753d1e554989f" +dependencies = [ + "bincode", + "chrono", + "memmap2", + "serde", + "serde_derive", + "solana-account", + "solana-clock", + "solana-cluster-type", + "solana-epoch-schedule", + "solana-fee-calculator", + "solana-hash", + "solana-inflation", + "solana-keypair", + "solana-logger", + "solana-poh-config", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", + "solana-sha256-hasher", + "solana-shred-version", + "solana-signer", + "solana-time-utils", +] + +[[package]] +name = "solana-hard-forks" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c28371f878e2ead55611d8ba1b5fb879847156d04edea13693700ad1a28baf" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "solana-hash" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5b96e9f0300fa287b545613f007dfe20043d7812bee255f418c1eb649c93b63" +dependencies = [ + "borsh 1.5.7", + "bytemuck", + "bytemuck_derive", + "five8", + "js-sys", + "serde", + "serde_derive", + "solana-atomic-u64", + "solana-sanitize", + "wasm-bindgen", +] + +[[package]] +name = "solana-inflation" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23eef6a09eb8e568ce6839573e4966850e85e9ce71e6ae1a6c930c1c43947de3" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "solana-instruction" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47298e2ce82876b64f71e9d13a46bc4b9056194e7f9937ad3084385befa50885" +dependencies = [ + "bincode", + "borsh 1.5.7", + "getrandom 0.2.15", + "js-sys", + "num-traits", + "serde", + "serde_derive", + "solana-define-syscall", + "solana-pubkey", + "wasm-bindgen", +] + +[[package]] +name = "solana-instructions-sysvar" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0e85a6fad5c2d0c4f5b91d34b8ca47118fc593af706e523cdbedf846a954f57" +dependencies = [ + "bitflags", + "solana-account-info", + "solana-instruction", + "solana-program-error", + "solana-pubkey", + "solana-sanitize", + "solana-sdk-ids", + "solana-serialize-utils", + "solana-sysvar-id", +] + +[[package]] +name = "solana-keccak-hasher" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7aeb957fbd42a451b99235df4942d96db7ef678e8d5061ef34c9b34cae12f79" +dependencies = [ + "sha3", + "solana-define-syscall", + "solana-hash", + "solana-sanitize", +] + +[[package]] +name = "solana-keypair" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd3f04aa1a05c535e93e121a95f66e7dcccf57e007282e8255535d24bf1e98bb" +dependencies = [ + "ed25519-dalek", + "ed25519-dalek-bip32", + "five8", + "rand 0.7.3", + "solana-derivation-path", + "solana-pubkey", + "solana-seed-derivable", + "solana-seed-phrase", + "solana-signature", + "solana-signer", + "wasm-bindgen", +] + +[[package]] +name = "solana-last-restart-slot" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a6360ac2fdc72e7463565cd256eedcf10d7ef0c28a1249d261ec168c1b55cdd" +dependencies = [ + "serde", + "serde_derive", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", +] + +[[package]] +name = "solana-loader-v2-interface" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8ab08006dad78ae7cd30df8eea0539e207d08d91eaefb3e1d49a446e1c49654" +dependencies = [ + "serde", + "serde_bytes", + "serde_derive", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", +] + +[[package]] +name = "solana-loader-v3-interface" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4be76cfa9afd84ca2f35ebc09f0da0f0092935ccdac0595d98447f259538c2" +dependencies = [ + "serde", + "serde_bytes", + "serde_derive", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", +] + +[[package]] +name = "solana-loader-v3-interface" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f7162a05b8b0773156b443bccd674ea78bb9aa406325b467ea78c06c99a63a2" +dependencies = [ + "serde", + "serde_bytes", + "serde_derive", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", + "solana-system-interface", +] + +[[package]] +name = "solana-loader-v3-program" +version = "0.0.0" +dependencies = [ + "bincode", + "mollusk-svm", "num-derive 0.3.3", "num-traits", "serde", "shank", "solana-program", "solana-sdk", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "solana-loader-v3-program-client" version = "0.0.0" dependencies = [ - "assert_matches", "borsh 0.10.4", "num-derive 0.3.3", "num-traits", "serde", - "serde_with 3.11.0", + "serde_with", "solana-program", - "solana-program-test", - "solana-sdk", - "thiserror", + "thiserror 1.0.69", ] [[package]] -name = "solana-loader-v4-program" -version = "2.0.9" +name = "solana-loader-v4-interface" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "492191406c9ca8acb6917c63079432a20d024c3d0ee094bb6970a87cdcc3f6a5" +checksum = "706a777242f1f39a83e2a96a2a6cb034cb41169c6ecbee2cf09cb873d9659e7e" +dependencies = [ + "serde", + "serde_bytes", + "serde_derive", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", + "solana-system-interface", +] + +[[package]] +name = "solana-log-collector" +version = "2.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "621d265d37dbe119e28d481f6db3883294e75966b79293a6edaa8deeac2dfc3d" dependencies = [ "log", - "solana-compute-budget", - "solana-measure", - "solana-program-runtime", - "solana-sdk", - "solana-type-overrides", - "solana_rbpf", ] [[package]] name = "solana-logger" -version = "2.0.9" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ad3a2edfbecfd010c45b4fe34c472910392e273cf165a03e187cb09cf690b22" +checksum = "db8e777ec1afd733939b532a42492d888ec7c88d8b4127a5d867eb45c6eb5cd5" dependencies = [ "env_logger", "lazy_static", + "libc", "log", + "signal-hook", ] [[package]] name = "solana-measure" -version = "2.0.9" +version = "2.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d98d3c9827ce044863fc67b7cbc15c341c27bf6fa9c1070deccd2a4aa7cb801d" + +[[package]] +name = "solana-message" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d08a0175bfa4cb16889feeca9d4d5bc144a91cfbe19a3746f1823600a62684b" +checksum = "1796aabce376ff74bf89b78d268fa5e683d7d7a96a0a4e4813ec34de49d5314b" dependencies = [ - "log", - "solana-sdk", + "bincode", + "blake3", + "lazy_static", + "serde", + "serde_derive", + "solana-bincode", + "solana-hash", + "solana-instruction", + "solana-pubkey", + "solana-sanitize", + "solana-sdk-ids", + "solana-short-vec", + "solana-system-interface", + "solana-transaction-error", + "wasm-bindgen", ] [[package]] name = "solana-metrics" -version = "2.0.9" +version = "2.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d312fb471563f31fee1578ca8c51619458bddf25f36ad10388a2a1812ee27e25" +checksum = "062baa36c40a08f413b1f84c8b739649609883af47e1624a85eaf9f90075441e" dependencies = [ "crossbeam-channel", "gethostname", - "lazy_static", "log", "reqwest", - "solana-sdk", - "thiserror", + "solana-cluster-type", + "solana-sha256-hasher", + "solana-time-utils", + "thiserror 2.0.17", ] [[package]] -name = "solana-net-utils" -version = "2.0.9" +name = "solana-msg" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed5791e57f3d2e2bf05c23d3be6c8a536dbbb10fe9a3e992b1e4a71eab132b11" +checksum = "f36a1a14399afaabc2781a1db09cb14ee4cc4ee5c7a5a3cfcc601811379a8092" dependencies = [ - "bincode", - "clap 3.2.25", - "crossbeam-channel", - "log", - "nix", - "rand 0.8.5", - "serde", - "serde_derive", - "socket2", - "solana-logger", - "solana-sdk", - "solana-version", - "static_assertions", - "tokio", - "url", + "solana-define-syscall", ] [[package]] -name = "solana-nohash-hasher" -version = "0.2.1" +name = "solana-native-token" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b8a731ed60e89177c8a7ab05fe0f1511cedd3e70e773f288f9de33a9cfdc21e" +checksum = "61515b880c36974053dd499c0510066783f0cc6ac17def0c7ef2a244874cf4a9" [[package]] -name = "solana-perf" -version = "2.0.9" +name = "solana-nonce" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab0b0dbc72b93e800c6034c3d76f5e3a09f8fcfb63a1c07853bed54aac2b4094" +checksum = "703e22eb185537e06204a5bd9d509b948f0066f2d1d814a6f475dafb3ddf1325" dependencies = [ - "ahash", - "bincode", - "bv", - "caps", - "curve25519-dalek", - "dlopen2", - "fnv", - "lazy_static", - "libc", - "log", - "nix", - "rand 0.8.5", - "rayon", - "rustc_version", "serde", - "solana-metrics", - "solana-rayon-threadlimit", - "solana-sdk", - "solana-vote-program", + "serde_derive", + "solana-fee-calculator", + "solana-hash", + "solana-pubkey", + "solana-sha256-hasher", ] [[package]] -name = "solana-poseidon" -version = "2.0.9" +name = "solana-nonce-account" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e84df7056e4c26cf6f4055b28b61bb28f70d6ee0a469ae6a7b2f062090911b1e" +checksum = "cde971a20b8dbf60144d6a84439dda86b5466e00e2843091fe731083cda614da" dependencies = [ - "ark-bn254", - "light-poseidon", - "thiserror", + "solana-account", + "solana-hash", + "solana-nonce", + "solana-sdk-ids", ] [[package]] -name = "solana-program" -version = "2.0.9" +name = "solana-offchain-message" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51237f3618428e8b9dd1e5c3d89b8f44f00dbcb88a7ad577ebdfdfac51501c61" +checksum = "b526398ade5dea37f1f147ce55dae49aa017a5d7326606359b0445ca8d946581" dependencies = [ - "ark-bn254", - "ark-ec", - "ark-ff", - "ark-serialize", - "base64 0.22.1", - "bincode", - "bitflags 2.6.0", - "blake3", - "borsh 0.10.4", - "borsh 1.5.3", - "bs58", - "bv", - "bytemuck", - "bytemuck_derive", - "console_error_panic_hook", - "console_log", - "curve25519-dalek", - "getrandom 0.2.15", - "js-sys", - "lazy_static", - "libsecp256k1", - "log", - "memoffset", - "num-bigint 0.4.6", - "num-derive 0.4.2", - "num-traits", - "parking_lot", - "rand 0.8.5", - "rustc_version", - "rustversion", - "serde", - "serde_bytes", - "serde_derive", - "sha2 0.10.8", - "sha3 0.10.8", - "solana-sdk-macro", - "thiserror", - "wasm-bindgen", + "num_enum", + "solana-hash", + "solana-packet", + "solana-pubkey", + "solana-sanitize", + "solana-sha256-hasher", + "solana-signature", + "solana-signer", ] [[package]] -name = "solana-program-runtime" -version = "2.0.9" +name = "solana-packet" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8d2c1801dc17b166db40968ef1ab30f71b319edcaa69efe8c29a66258baff52" +checksum = "004f2d2daf407b3ec1a1ca5ec34b3ccdfd6866dd2d3c7d0715004a96e4b6d127" dependencies = [ - "base64 0.22.1", "bincode", - "eager", - "enum-iterator", - "itertools 0.12.1", - "libc", - "log", - "num-derive 0.4.2", - "num-traits", - "percentage", - "rand 0.8.5", - "rustc_version", + "bitflags", + "cfg_eval", "serde", - "solana-compute-budget", - "solana-measure", - "solana-metrics", - "solana-sdk", - "solana-type-overrides", - "solana-vote", - "solana_rbpf", - "thiserror", + "serde_derive", + "serde_with", ] [[package]] -name = "solana-program-test" -version = "2.0.9" +name = "solana-poh-config" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3e91ce4c8966da7a69cbc9e89c7f3909b916c1ba764f3f90e98f84ec573e566" +checksum = "d650c3b4b9060082ac6b0efbbb66865089c58405bfb45de449f3f2b91eccee75" dependencies = [ - "assert_matches", - "async-trait", - "base64 0.22.1", - "bincode", - "chrono-humanize", - "crossbeam-channel", - "log", "serde", - "solana-accounts-db", - "solana-banks-client", - "solana-banks-interface", - "solana-banks-server", - "solana-bpf-loader-program", - "solana-compute-budget", - "solana-inline-spl", - "solana-logger", - "solana-program-runtime", - "solana-runtime", - "solana-sdk", - "solana-svm", - "solana-vote-program", - "solana_rbpf", - "thiserror", - "tokio", + "serde_derive", ] [[package]] -name = "solana-pubsub-client" -version = "2.0.9" +name = "solana-poseidon" +version = "2.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfee83758014a114d622926172dc5ba661490bee32b1b6cac5b2fe06d53f3e6e" +checksum = "f0438136b52589ae8e6c3764edc186455b420693c3e83838d5ae40a3dba9c102" dependencies = [ - "crossbeam-channel", - "futures-util", - "log", - "reqwest", - "semver", - "serde", - "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-rpc-client-api", - "solana-sdk", - "thiserror", - "tokio", - "tokio-stream", - "tokio-tungstenite", - "tungstenite", - "url", + "ark-bn254", + "light-poseidon", + "solana-define-syscall", + "thiserror 2.0.17", ] [[package]] -name = "solana-quic-client" -version = "2.0.9" +name = "solana-precompile-error" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3c92fbee83d91f9374cc5e74ec01c7cd8aed846b4c27bc6badf890dcd9441b" +checksum = "4d87b2c1f5de77dfe2b175ee8dd318d196aaca4d0f66f02842f80c852811f9f8" dependencies = [ - "async-mutex", - "async-trait", - "futures", - "itertools 0.12.1", - "lazy_static", - "log", - "quinn", - "quinn-proto", - "rustls", - "solana-connection-cache", - "solana-measure", - "solana-metrics", - "solana-net-utils", - "solana-rpc-client-api", - "solana-sdk", - "solana-streamer", - "thiserror", - "tokio", + "num-traits", + "solana-decode-error", ] [[package]] -name = "solana-rayon-threadlimit" -version = "2.0.9" +name = "solana-precompiles" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e56a83aaa9a09975a5ae7bcbaa59b1fa40414505ac1a4640b350c4b200453ac7" +checksum = "36e92768a57c652edb0f5d1b30a7d0bc64192139c517967c18600debe9ae3832" dependencies = [ "lazy_static", - "num_cpus", + "solana-ed25519-program", + "solana-feature-set", + "solana-message", + "solana-precompile-error", + "solana-pubkey", + "solana-sdk-ids", + "solana-secp256k1-program", + "solana-secp256r1-program", ] [[package]] -name = "solana-remote-wallet" -version = "2.0.9" +name = "solana-presigner" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca04ef9dbc5d285af02759b788f42b33f2d537f9f4ec9cfe18bbd560f1caac9" +checksum = "81a57a24e6a4125fc69510b6774cd93402b943191b6cddad05de7281491c90fe" dependencies = [ - "console", - "dialoguer", - "log", - "num-derive 0.4.2", - "num-traits", - "parking_lot", - "qstring", - "semver", - "solana-sdk", - "thiserror", - "uriparse", + "solana-pubkey", + "solana-signature", + "solana-signer", ] [[package]] -name = "solana-rpc-client" -version = "2.0.9" +name = "solana-program" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1940f4fa5dcbffc21c35ac4dc9e63545647b39f24ef92bd60ee4c14373f6c772" +checksum = "98eca145bd3545e2fbb07166e895370576e47a00a7d824e325390d33bf467210" dependencies = [ - "async-trait", - "base64 0.22.1", "bincode", + "blake3", + "borsh 0.10.4", + "borsh 1.5.7", "bs58", - "indicatif", + "bytemuck", + "console_error_panic_hook", + "console_log", + "getrandom 0.2.15", + "lazy_static", "log", - "reqwest", - "reqwest-middleware", - "semver", + "memoffset", + "num-bigint 0.4.6", + "num-derive 0.4.2", + "num-traits", + "rand 0.8.5", "serde", + "serde_bytes", "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-rpc-client-api", - "solana-sdk", - "solana-transaction-status", - "solana-version", - "solana-vote-program", - "tokio", + "solana-account-info", + "solana-address-lookup-table-interface", + "solana-atomic-u64", + "solana-big-mod-exp", + "solana-bincode", + "solana-blake3-hasher", + "solana-borsh", + "solana-clock", + "solana-cpi", + "solana-decode-error", + "solana-define-syscall", + "solana-epoch-rewards", + "solana-epoch-schedule", + "solana-example-mocks", + "solana-feature-gate-interface", + "solana-fee-calculator", + "solana-hash", + "solana-instruction", + "solana-instructions-sysvar", + "solana-keccak-hasher", + "solana-last-restart-slot", + "solana-loader-v2-interface", + "solana-loader-v3-interface 5.0.0", + "solana-loader-v4-interface", + "solana-message", + "solana-msg", + "solana-native-token", + "solana-nonce", + "solana-program-entrypoint", + "solana-program-error", + "solana-program-memory", + "solana-program-option", + "solana-program-pack", + "solana-pubkey", + "solana-rent", + "solana-sanitize", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-secp256k1-recover", + "solana-serde-varint", + "solana-serialize-utils", + "solana-sha256-hasher", + "solana-short-vec", + "solana-slot-hashes", + "solana-slot-history", + "solana-stable-layout", + "solana-stake-interface", + "solana-system-interface", + "solana-sysvar", + "solana-sysvar-id", + "solana-vote-interface", + "thiserror 2.0.17", + "wasm-bindgen", ] [[package]] -name = "solana-rpc-client-api" -version = "2.0.9" +name = "solana-program-entrypoint" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8045228371e1c8dd9ae7ee5d607640e245c5fb4bcaf74022ce9f7864701d187" +checksum = "32ce041b1a0ed275290a5008ee1a4a6c48f5054c8a3d78d313c08958a06aedbd" dependencies = [ - "anyhow", - "base64 0.22.1", - "bs58", - "jsonrpc-core", - "reqwest", - "reqwest-middleware", - "semver", + "solana-account-info", + "solana-msg", + "solana-program-error", + "solana-pubkey", +] + +[[package]] +name = "solana-program-error" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ee2e0217d642e2ea4bee237f37bd61bb02aec60da3647c48ff88f6556ade775" +dependencies = [ + "borsh 1.5.7", + "num-traits", "serde", "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-inline-spl", - "solana-sdk", - "solana-transaction-status", - "solana-version", - "thiserror", + "solana-decode-error", + "solana-instruction", + "solana-msg", + "solana-pubkey", ] [[package]] -name = "solana-rpc-client-nonce-utils" -version = "2.0.9" +name = "solana-program-memory" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0248b33385d6f4b5eca8c0e396434cbbbd0aa8ac178e83922c1228a4a053c51" +checksum = "3a5426090c6f3fd6cfdc10685322fede9ca8e5af43cd6a59e98bfe4e91671712" dependencies = [ - "clap 2.34.0", - "solana-clap-utils", - "solana-rpc-client", - "solana-sdk", - "thiserror", + "solana-define-syscall", ] [[package]] -name = "solana-runtime" -version = "2.0.9" +name = "solana-program-option" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc677a2e9bc616eda6dbdab834d463372b92848b2bfe4a1ed4e4b4adba3397d0" + +[[package]] +name = "solana-program-pack" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4ca1e75cc8b9c424453dd09c90d18edc3a28e2e9e4309f837bfe30c46ad56d" +checksum = "319f0ef15e6e12dc37c597faccb7d62525a509fec5f6975ecb9419efddeb277b" +dependencies = [ + "solana-program-error", +] + +[[package]] +name = "solana-program-runtime" +version = "2.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c3bf99984972a51fbf14ca2122fcc9016d7b1261af58bb00a06050af86bb12e" dependencies = [ - "aquamarine", - "arrayref", "base64 0.22.1", "bincode", - "blake3", - "bv", - "bytemuck", - "byteorder", - "bzip2", - "crossbeam-channel", - "dashmap", - "dir-diff", - "flate2", - "fnv", - "im", - "index_list", + "enum-iterator", "itertools 0.12.1", - "lazy_static", - "libc", "log", - "lz4", - "memmap2", - "mockall", - "modular-bitfield", - "num-derive 0.4.2", - "num-traits", - "num_cpus", - "num_enum", "percentage", - "qualifier_attr", "rand 0.8.5", - "rayon", - "regex", - "rustc_version", "serde", - "serde_derive", - "serde_json", - "solana-accounts-db", - "solana-address-lookup-table-program", - "solana-bpf-loader-program", - "solana-bucket-map", - "solana-compute-budget", - "solana-compute-budget-program", - "solana-config-program", - "solana-cost-model", - "solana-inline-spl", - "solana-loader-v4-program", + "solana-account", + "solana-clock", + "solana-epoch-rewards", + "solana-epoch-schedule", + "solana-fee-structure", + "solana-hash", + "solana-instruction", + "solana-last-restart-slot", + "solana-log-collector", "solana-measure", - "solana-metrics", - "solana-perf", - "solana-program-runtime", - "solana-rayon-threadlimit", - "solana-sdk", - "solana-stake-program", - "solana-svm", - "solana-system-program", - "solana-transaction-status", - "solana-version", - "solana-vote", - "solana-vote-program", - "solana-zk-elgamal-proof-program", - "solana-zk-sdk", - "solana-zk-token-proof-program", - "solana-zk-token-sdk", - "static_assertions", - "strum", - "strum_macros", - "symlink", - "tar", - "tempfile", - "thiserror", - "zstd", + "solana-metrics", + "solana-program-entrypoint", + "solana-pubkey", + "solana-rent", + "solana-sbpf", + "solana-sdk-ids", + "solana-slot-hashes", + "solana-stable-layout", + "solana-svm-callback", + "solana-svm-feature-set", + "solana-system-interface", + "solana-sysvar", + "solana-sysvar-id", + "solana-timings", + "solana-transaction-context", + "solana-type-overrides", + "thiserror 2.0.17", ] [[package]] -name = "solana-sdk" -version = "2.0.9" +name = "solana-pubkey" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da640d96314707ba69feb3c0b1c5fdefb418c5d5e684fe5a9a27b8daae8c18b5" +checksum = "9b62adb9c3261a052ca1f999398c388f1daf558a1b492f60a6d9e64857db4ff1" dependencies = [ - "bincode", - "bitflags 2.6.0", - "borsh 1.5.3", - "bs58", + "borsh 0.10.4", + "borsh 1.5.7", "bytemuck", "bytemuck_derive", - "byteorder", - "chrono", - "derivation-path", - "digest 0.10.7", - "ed25519-dalek", - "ed25519-dalek-bip32", - "generic-array", - "getrandom 0.1.16", - "hmac 0.12.1", - "itertools 0.12.1", + "curve25519-dalek 4.1.3", + "five8", + "five8_const", + "getrandom 0.2.15", "js-sys", - "lazy_static", - "libsecp256k1", - "log", - "memmap2", - "num_enum", - "pbkdf2 0.11.0", - "qstring", - "rand 0.7.3", + "num-traits", "rand 0.8.5", - "rustc_version", - "rustversion", "serde", - "serde_bytes", "serde_derive", - "serde_json", - "serde_with 2.3.3", - "sha2 0.10.8", - "sha3 0.10.8", - "siphasher", - "solana-program", - "solana-sdk-macro", - "thiserror", - "uriparse", + "solana-atomic-u64", + "solana-decode-error", + "solana-define-syscall", + "solana-sanitize", + "solana-sha256-hasher", "wasm-bindgen", ] [[package]] -name = "solana-sdk-macro" -version = "2.0.9" +name = "solana-quic-definitions" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45b6e930455ef68cf15e5a22a0e0c207e67c3d70978a565e0a64f568c8a24129" +checksum = "fbf0d4d5b049eb1d0c35f7b18f305a27c8986fc5c0c9b383e97adaa35334379e" dependencies = [ - "bs58", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.89", + "solana-keypair", ] [[package]] -name = "solana-security-txt" -version = "1.1.1" +name = "solana-rent" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" +checksum = "d1aea8fdea9de98ca6e8c2da5827707fb3842833521b528a713810ca685d2480" +dependencies = [ + "serde", + "serde_derive", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", +] [[package]] -name = "solana-send-transaction-service" -version = "2.0.9" +name = "solana-rent-collector" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "749434a1135647ab00be4755db72ec4426a7e6724e12fa05e4c1981ad0e49095" +checksum = "127e6dfa51e8c8ae3aa646d8b2672bc4ac901972a338a9e1cd249e030564fb9d" dependencies = [ - "crossbeam-channel", - "log", - "solana-client", - "solana-connection-cache", - "solana-measure", - "solana-metrics", - "solana-runtime", - "solana-sdk", - "solana-tpu-client", + "serde", + "serde_derive", + "solana-account", + "solana-clock", + "solana-epoch-schedule", + "solana-genesis-config", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", ] [[package]] -name = "solana-stake-program" -version = "2.0.9" +name = "solana-rent-debits" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f5873ec93dca602781f9192cf3aeffa61ae590eb4994405356bb584bc276c77" +checksum = "4f6f9113c6003492e74438d1288e30cffa8ccfdc2ef7b49b9e816d8034da18cd" dependencies = [ - "bincode", - "log", - "rustc_version", - "solana-config-program", - "solana-program-runtime", - "solana-sdk", - "solana-type-overrides", - "solana-vote-program", + "solana-pubkey", + "solana-reward-info", ] [[package]] -name = "solana-streamer" -version = "2.0.9" +name = "solana-reserved-account-keys" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11a89e779ac29efff96530d6756623ceed4986cb0c9e43597aa02a57db19fc2" +checksum = "e4b22ea19ca2a3f28af7cd047c914abf833486bf7a7c4a10fc652fff09b385b1" dependencies = [ - "async-channel", - "bytes", - "crossbeam-channel", - "dashmap", - "futures-util", - "histogram", - "indexmap 2.6.0", - "itertools 0.12.1", - "libc", - "log", - "nix", - "pem", - "percentage", - "quinn", - "quinn-proto", - "rand 0.8.5", - "rustls", - "smallvec", - "solana-measure", - "solana-metrics", - "solana-perf", - "solana-sdk", - "solana-transaction-metrics-tracker", - "thiserror", - "tokio", - "x509-parser", + "lazy_static", + "solana-feature-set", + "solana-pubkey", + "solana-sdk-ids", ] [[package]] -name = "solana-svm" -version = "2.0.9" +name = "solana-reward-info" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eababbdcdc687fa51ba325b02ff81c2d1ca3432676b3daec74c2fb4971d3c437" +checksum = "18205b69139b1ae0ab8f6e11cdcb627328c0814422ad2482000fa2ca54ae4a2f" dependencies = [ - "itertools 0.12.1", - "log", - "percentage", - "prost-build 0.11.9", - "qualifier_attr", - "rustc_version", "serde", "serde_derive", - "solana-bpf-loader-program", - "solana-compute-budget", - "solana-loader-v4-program", - "solana-measure", - "solana-metrics", - "solana-program-runtime", - "solana-sdk", - "solana-system-program", - "solana-type-overrides", - "solana-vote", ] [[package]] -name = "solana-system-program" -version = "2.0.9" +name = "solana-sanitize" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61f1bc1357b8188d9c4a3af3fc55276e56987265eb7ad073ae6f8180ee54cecf" + +[[package]] +name = "solana-sbpf" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bac1656c5771eb6bf68e58df67783d4099b76a95ab680ea2bf31d5518f1542" +checksum = "474a2d95dc819898ded08d24f29642d02189d3e1497bbb442a92a3997b7eb55f" dependencies = [ - "bincode", + "byteorder", + "combine", + "hash32", + "libc", "log", - "serde", - "serde_derive", - "solana-program-runtime", - "solana-sdk", - "solana-type-overrides", + "rand 0.8.5", + "rustc-demangle", + "thiserror 2.0.17", + "winapi", ] [[package]] -name = "solana-thin-client" -version = "2.0.9" +name = "solana-sdk" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528410974827ea364e8055a41c26859f60d633553d70da338d3dd1c668bc4f06" +checksum = "8cc0e4a7635b902791c44b6581bfb82f3ada32c5bc0929a64f39fe4bb384c86a" dependencies = [ "bincode", - "log", - "rayon", - "solana-connection-cache", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-sdk", + "bs58", + "getrandom 0.1.16", + "js-sys", + "serde", + "serde_json", + "solana-account", + "solana-bn254", + "solana-client-traits", + "solana-cluster-type", + "solana-commitment-config", + "solana-compute-budget-interface", + "solana-decode-error", + "solana-derivation-path", + "solana-ed25519-program", + "solana-epoch-info", + "solana-epoch-rewards-hasher", + "solana-feature-set", + "solana-fee-structure", + "solana-genesis-config", + "solana-hard-forks", + "solana-inflation", + "solana-instruction", + "solana-keypair", + "solana-message", + "solana-native-token", + "solana-nonce-account", + "solana-offchain-message", + "solana-packet", + "solana-poh-config", + "solana-precompile-error", + "solana-precompiles", + "solana-presigner", + "solana-program", + "solana-program-memory", + "solana-pubkey", + "solana-quic-definitions", + "solana-rent-collector", + "solana-rent-debits", + "solana-reserved-account-keys", + "solana-reward-info", + "solana-sanitize", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-secp256k1-program", + "solana-secp256k1-recover", + "solana-secp256r1-program", + "solana-seed-derivable", + "solana-seed-phrase", + "solana-serde", + "solana-serde-varint", + "solana-short-vec", + "solana-shred-version", + "solana-signature", + "solana-signer", + "solana-system-transaction", + "solana-time-utils", + "solana-transaction", + "solana-transaction-context", + "solana-transaction-error", + "solana-validator-exit", + "thiserror 2.0.17", + "wasm-bindgen", ] [[package]] -name = "solana-tpu-client" -version = "2.0.9" +name = "solana-sdk-ids" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7b35d5344bf37ac9febca33a2afeccf00d235919927494937b15e57622726f4" +checksum = "5c5d8b9cc68d5c88b062a33e23a6466722467dde0035152d8fb1afbcdf350a5f" dependencies = [ - "async-trait", - "bincode", - "futures-util", - "indexmap 2.6.0", - "indicatif", - "log", - "rayon", - "solana-connection-cache", - "solana-measure", - "solana-metrics", - "solana-pubsub-client", - "solana-rpc-client", - "solana-rpc-client-api", - "solana-sdk", - "thiserror", - "tokio", + "solana-pubkey", ] [[package]] -name = "solana-transaction-metrics-tracker" -version = "2.0.9" +name = "solana-sdk-macro" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4866898994a7b9436df0431b8400934242eb7ef6e548f5311efb2e4aafcced30" +checksum = "86280da8b99d03560f6ab5aca9de2e38805681df34e0bb8f238e69b29433b9df" dependencies = [ - "Inflector", - "base64 0.22.1", - "bincode", - "lazy_static", - "log", - "rand 0.8.5", - "solana-perf", - "solana-sdk", + "bs58", + "proc-macro2", + "quote", + "syn 2.0.89", ] [[package]] -name = "solana-transaction-status" -version = "2.0.9" +name = "solana-secp256k1-program" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3294eebb17ee6a2bf7f5365a332da714a8c88b92e59121fc32c495d0f7c4d8" +checksum = "f19833e4bc21558fe9ec61f239553abe7d05224347b57d65c2218aeeb82d6149" dependencies = [ - "Inflector", - "base64 0.22.1", "bincode", - "borsh 1.5.3", - "bs58", - "lazy_static", - "log", + "digest 0.10.7", + "libsecp256k1", "serde", "serde_derive", - "serde_json", - "solana-account-decoder", - "solana-sdk", - "spl-associated-token-account", - "spl-memo", - "spl-token", - "spl-token-2022", - "spl-token-group-interface", - "spl-token-metadata-interface", - "thiserror", + "sha3", + "solana-feature-set", + "solana-instruction", + "solana-precompile-error", + "solana-sdk-ids", + "solana-signature", ] [[package]] -name = "solana-type-overrides" -version = "2.0.9" +name = "solana-secp256k1-recover" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4201087a2d944f1fe1a5531d612384a825378339b26c84df4681afb7b52018b" +checksum = "baa3120b6cdaa270f39444f5093a90a7b03d296d362878f7a6991d6de3bbe496" dependencies = [ - "lazy_static", - "rand 0.8.5", + "borsh 1.5.7", + "libsecp256k1", + "solana-define-syscall", + "thiserror 2.0.17", ] [[package]] -name = "solana-udp-client" -version = "2.0.9" +name = "solana-secp256r1-program" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6f0f2db2e9266a0818df69ac6365d0109bf1f2f1832c8a7d033be70ac742138" +checksum = "ce0ae46da3071a900f02d367d99b2f3058fe2e90c5062ac50c4f20cfedad8f0f" dependencies = [ - "async-trait", - "solana-connection-cache", - "solana-net-utils", - "solana-sdk", - "solana-streamer", - "thiserror", - "tokio", + "bytemuck", + "openssl", + "solana-feature-set", + "solana-instruction", + "solana-precompile-error", + "solana-sdk-ids", ] [[package]] -name = "solana-version" -version = "2.0.9" +name = "solana-seed-derivable" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c5e80bec4215dac4a0bacd3b68be430621adf1a37aba3239032f8c91ab1517a" +checksum = "3beb82b5adb266c6ea90e5cf3967235644848eac476c5a1f2f9283a143b7c97f" dependencies = [ - "log", - "rustc_version", - "semver", - "serde", - "serde_derive", - "solana-sdk", + "solana-derivation-path", ] [[package]] -name = "solana-vote" -version = "2.0.9" +name = "solana-seed-phrase" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a72891adbea06048965dfd4e0f1897f113d03bafb9e81f895bbe560e0b3a5ec" +checksum = "36187af2324f079f65a675ec22b31c24919cb4ac22c79472e85d819db9bbbc15" dependencies = [ - "itertools 0.12.1", - "log", - "rustc_version", - "serde", - "serde_derive", - "solana-sdk", - "thiserror", + "hmac 0.12.1", + "pbkdf2", + "sha2 0.10.8", ] [[package]] -name = "solana-vote-program" -version = "2.0.9" +name = "solana-serde" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd00cd5515020cb6c0c5167f1d173fddeae5e1f7ffd77909ea43bece86f38cc9" +checksum = "1931484a408af466e14171556a47adaa215953c7f48b24e5f6b0282763818b04" dependencies = [ - "bincode", - "log", - "num-derive 0.4.2", - "num-traits", - "rustc_version", "serde", - "serde_derive", - "solana-metrics", - "solana-program", - "solana-program-runtime", - "solana-sdk", - "thiserror", ] [[package]] -name = "solana-zk-elgamal-proof-program" -version = "2.0.9" +name = "solana-serde-varint" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1bdd121de9f8e897fb5c113f62791cc9b560d8057c837fad1e16adce08aca3" +checksum = "2a7e155eba458ecfb0107b98236088c3764a09ddf0201ec29e52a0be40857113" dependencies = [ - "bytemuck", - "num-derive 0.4.2", - "num-traits", - "solana-program-runtime", - "solana-sdk", - "solana-zk-sdk", + "serde", ] [[package]] -name = "solana-zk-sdk" -version = "2.0.9" +name = "solana-serialize-utils" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "366951623087ec3221605dfaae7f94e61d7b6593fa3cc62eae1f767bcc9f7d79" +checksum = "817a284b63197d2b27afdba829c5ab34231da4a9b4e763466a003c40ca4f535e" dependencies = [ - "aes-gcm-siv", - "base64 0.22.1", - "bincode", - "bytemuck", - "bytemuck_derive", - "curve25519-dalek", - "itertools 0.12.1", - "lazy_static", - "merlin", - "num-derive 0.4.2", - "num-traits", - "rand 0.7.3", - "serde", - "serde_derive", - "serde_json", - "sha3 0.9.1", - "solana-program", - "solana-sdk", - "subtle", - "thiserror", - "zeroize", + "solana-instruction", + "solana-pubkey", + "solana-sanitize", ] [[package]] -name = "solana-zk-token-proof-program" -version = "2.0.9" +name = "solana-sha256-hasher" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a4f5067ffc0dcf47bfc5f27403c615f9682affa9a23889bda47c3a6b2720fa9" +checksum = "5aa3feb32c28765f6aa1ce8f3feac30936f16c5c3f7eb73d63a5b8f6f8ecdc44" dependencies = [ - "bytemuck", - "num-derive 0.4.2", - "num-traits", - "solana-program-runtime", - "solana-sdk", - "solana-zk-token-sdk", + "sha2 0.10.8", + "solana-define-syscall", + "solana-hash", ] [[package]] -name = "solana-zk-token-sdk" -version = "2.0.9" +name = "solana-short-vec" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "860d780884e7e0eab6bdc909d80ef32b791d1c0963aff8cdfcbd4f00ca640c8a" +checksum = "5c54c66f19b9766a56fa0057d060de8378676cb64987533fa088861858fc5a69" dependencies = [ - "aes-gcm-siv", - "base64 0.22.1", - "bincode", - "bytemuck", - "bytemuck_derive", - "byteorder", - "curve25519-dalek", - "itertools 0.12.1", - "lazy_static", - "merlin", - "num-derive 0.4.2", - "num-traits", - "rand 0.7.3", "serde", - "serde_derive", - "serde_json", - "sha3 0.9.1", - "solana-curve25519", - "solana-program", - "solana-sdk", - "subtle", - "thiserror", - "zeroize", ] [[package]] -name = "solana_rbpf" -version = "0.8.4" +name = "solana-shred-version" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff08afd63f70a1ba712fb0017be41e93b017f7e874785b54bb5ec9aa8949781d" +checksum = "afd3db0461089d1ad1a78d9ba3f15b563899ca2386351d38428faa5350c60a98" dependencies = [ - "byteorder", - "combine", - "goblin", - "hash32", - "libc", - "log", - "rand 0.8.5", - "rustc-demangle", - "scroll", - "thiserror", - "winapi", + "solana-hard-forks", + "solana-hash", + "solana-sha256-hasher", ] [[package]] -name = "spin" -version = "0.5.2" +name = "solana-signature" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "64c8ec8e657aecfc187522fc67495142c12f35e55ddeca8698edbb738b8dbd8c" +dependencies = [ + "ed25519-dalek", + "five8", + "rand 0.8.5", + "serde", + "serde-big-array", + "serde_derive", + "solana-sanitize", +] [[package]] -name = "spin" -version = "0.9.8" +name = "solana-signer" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +checksum = "7c41991508a4b02f021c1342ba00bcfa098630b213726ceadc7cb032e051975b" +dependencies = [ + "solana-pubkey", + "solana-signature", + "solana-transaction-error", +] [[package]] -name = "spl-associated-token-account" -version = "4.0.0" +name = "solana-slot-hashes" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68034596cf4804880d265f834af1ff2f821ad5293e41fa0f8f59086c181fc38e" +checksum = "0c8691982114513763e88d04094c9caa0376b867a29577939011331134c301ce" dependencies = [ - "assert_matches", - "borsh 1.5.3", - "num-derive 0.4.2", - "num-traits", - "solana-program", - "spl-token", - "spl-token-2022", - "thiserror", + "serde", + "serde_derive", + "solana-hash", + "solana-sdk-ids", + "solana-sysvar-id", ] [[package]] -name = "spl-discriminator" -version = "0.3.0" +name = "solana-slot-history" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38ea8b6dedb7065887f12d62ed62c1743aa70749e8558f963609793f6fb12bc" +checksum = "97ccc1b2067ca22754d5283afb2b0126d61eae734fc616d23871b0943b0d935e" dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator-derive", + "bv", + "serde", + "serde_derive", + "solana-sdk-ids", + "solana-sysvar-id", ] [[package]] -name = "spl-discriminator-derive" -version = "0.2.0" +name = "solana-stable-layout" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9e8418ea6269dcfb01c712f0444d2c75542c04448b480e87de59d2865edc750" +checksum = "9f14f7d02af8f2bc1b5efeeae71bc1c2b7f0f65cd75bcc7d8180f2c762a57f54" dependencies = [ - "quote", - "spl-discriminator-syn", - "syn 2.0.89", + "solana-instruction", + "solana-pubkey", ] [[package]] -name = "spl-discriminator-syn" -version = "0.2.0" +name = "solana-stake-interface" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c1f05593b7ca9eac7caca309720f2eafb96355e037e6d373b909a80fe7b69b9" +checksum = "5269e89fde216b4d7e1d1739cf5303f8398a1ff372a81232abbee80e554a838c" dependencies = [ - "proc-macro2", - "quote", - "sha2 0.10.8", - "syn 2.0.89", - "thiserror", + "borsh 0.10.4", + "borsh 1.5.7", + "num-traits", + "serde", + "serde_derive", + "solana-clock", + "solana-cpi", + "solana-decode-error", + "solana-instruction", + "solana-program-error", + "solana-pubkey", + "solana-system-interface", + "solana-sysvar-id", ] [[package]] -name = "spl-memo" -version = "5.0.0" +name = "solana-svm-callback" +version = "2.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0dba2f2bb6419523405d21c301a32c9f9568354d4742552e7972af801f4bdb3" +checksum = "fc71d742f57c922a66dfc786f9158b85a3a46bc7d230ebd8a92724ec9bcef641" dependencies = [ - "solana-program", + "solana-account", + "solana-precompile-error", + "solana-pubkey", ] [[package]] -name = "spl-pod" -version = "0.3.1" +name = "solana-svm-feature-set" +version = "2.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c704c88fc457fa649ba3aabe195c79d885c3f26709efaddc453c8de352c90b87" -dependencies = [ - "borsh 1.5.3", - "bytemuck", - "bytemuck_derive", - "solana-program", - "solana-zk-token-sdk", - "spl-program-error", -] +checksum = "a7fe5a6e173eec22c54806b413f5e383b8b82ca13b1767fa53fd40ec8512e6ee" [[package]] -name = "spl-program-error" -version = "0.5.0" +name = "solana-system-interface" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7b28bed65356558133751cc32b48a7a5ddfc59ac4e941314630bbed1ac10532" +checksum = "94d7c18cb1a91c6be5f5a8ac9276a1d7c737e39a21beba9ea710ab4b9c63bc90" dependencies = [ - "num-derive 0.4.2", + "js-sys", "num-traits", - "solana-program", - "spl-program-error-derive", - "thiserror", + "serde", + "serde_derive", + "solana-decode-error", + "solana-instruction", + "solana-pubkey", + "wasm-bindgen", ] [[package]] -name = "spl-program-error-derive" -version = "0.4.1" +name = "solana-system-program" +version = "2.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d375dd76c517836353e093c2dbb490938ff72821ab568b545fd30ab3256b3e" +checksum = "62286f3c6b6cdaaa66be54bb7e2a1acbd7462b435fa05f31f78ec690772e4d11" dependencies = [ - "proc-macro2", - "quote", - "sha2 0.10.8", - "syn 2.0.89", + "bincode", + "log", + "serde", + "serde_derive", + "solana-account", + "solana-bincode", + "solana-fee-calculator", + "solana-instruction", + "solana-log-collector", + "solana-nonce", + "solana-nonce-account", + "solana-packet", + "solana-program-runtime", + "solana-pubkey", + "solana-sdk-ids", + "solana-system-interface", + "solana-sysvar", + "solana-transaction-context", + "solana-type-overrides", ] [[package]] -name = "spl-tlv-account-resolution" -version = "0.7.0" +name = "solana-system-transaction" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a75a5f0fcc58126693ed78a17042e9dc53f07e357d6be91789f7d62aff61a4" +checksum = "5bd98a25e5bcba8b6be8bcbb7b84b24c2a6a8178d7fb0e3077a916855ceba91a" dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", - "spl-type-length-value", + "solana-hash", + "solana-keypair", + "solana-message", + "solana-pubkey", + "solana-signer", + "solana-system-interface", + "solana-transaction", ] [[package]] -name = "spl-token" -version = "6.0.0" +name = "solana-sysvar" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a0f06ac7f23dc0984931b1fe309468f14ea58e32660439c1cef19456f5d0e3" +checksum = "b8c3595f95069f3d90f275bb9bd235a1973c4d059028b0a7f81baca2703815db" dependencies = [ - "arrayref", + "base64 0.22.1", + "bincode", "bytemuck", - "num-derive 0.4.2", - "num-traits", - "num_enum", - "solana-program", - "thiserror", + "bytemuck_derive", + "lazy_static", + "serde", + "serde_derive", + "solana-account-info", + "solana-clock", + "solana-define-syscall", + "solana-epoch-rewards", + "solana-epoch-schedule", + "solana-fee-calculator", + "solana-hash", + "solana-instruction", + "solana-instructions-sysvar", + "solana-last-restart-slot", + "solana-program-entrypoint", + "solana-program-error", + "solana-program-memory", + "solana-pubkey", + "solana-rent", + "solana-sanitize", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-slot-hashes", + "solana-slot-history", + "solana-stake-interface", + "solana-sysvar-id", ] [[package]] -name = "spl-token-2022" -version = "4.0.0" +name = "solana-sysvar-id" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c10f3483e48679619c76598d4e4aebb955bc49b0a5cc63323afbf44135c9bf" +checksum = "5762b273d3325b047cfda250787f8d796d781746860d5d0a746ee29f3e8812c1" dependencies = [ - "arrayref", - "bytemuck", - "num-derive 0.4.2", - "num-traits", - "num_enum", - "solana-program", - "solana-security-txt", - "solana-zk-token-sdk", - "spl-memo", - "spl-pod", - "spl-token", - "spl-token-group-interface", - "spl-token-metadata-interface", - "spl-transfer-hook-interface", - "spl-type-length-value", - "thiserror", + "solana-pubkey", + "solana-sdk-ids", ] [[package]] -name = "spl-token-group-interface" -version = "0.3.0" +name = "solana-time-utils" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8752b85a5ecc1d9f3a43bce3dd9a6a053673aacf5deb513d1cbb88d3534ffd" -dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", -] +checksum = "6af261afb0e8c39252a04d026e3ea9c405342b08c871a2ad8aa5448e068c784c" [[package]] -name = "spl-token-metadata-interface" -version = "0.4.0" +name = "solana-timings" +version = "2.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c2318ddff97e006ed9b1291ebec0750a78547f870f62a69c56fe3b46a5d8fc" +checksum = "6c693612dde6208558c03b81e51b17477ced8cc592d43f57649b18afe19d1250" dependencies = [ - "borsh 1.5.3", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", - "spl-type-length-value", + "eager", + "enum-iterator", + "solana-pubkey", ] [[package]] -name = "spl-transfer-hook-interface" -version = "0.7.0" +name = "solana-transaction" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a110f33d941275d9f868b96daaa993f1e73b6806cc8836e43075b4d3ad8338a7" +checksum = "80657d6088f721148f5d889c828ca60c7daeedac9a8679f9ec215e0c42bcbf41" dependencies = [ - "arrayref", - "bytemuck", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", - "spl-tlv-account-resolution", - "spl-type-length-value", + "bincode", + "serde", + "serde_derive", + "solana-bincode", + "solana-feature-set", + "solana-hash", + "solana-instruction", + "solana-keypair", + "solana-message", + "solana-precompiles", + "solana-pubkey", + "solana-sanitize", + "solana-sdk-ids", + "solana-short-vec", + "solana-signature", + "solana-signer", + "solana-system-interface", + "solana-transaction-error", + "wasm-bindgen", ] [[package]] -name = "spl-type-length-value" -version = "0.5.0" +name = "solana-transaction-context" +version = "2.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdcd73ec187bc409464c60759232e309f83b52a18a9c5610bf281c9c6432918c" +checksum = "99b02e4d84d75dc196689f0256234b31a11e3cc97abc22ac71c945e930d1fea1" dependencies = [ - "bytemuck", - "solana-program", - "spl-discriminator", - "spl-pod", - "spl-program-error", + "bincode", + "serde", + "serde_derive", + "solana-account", + "solana-instruction", + "solana-instructions-sysvar", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", ] [[package]] -name = "stable_deref_trait" -version = "1.2.0" +name = "solana-transaction-error" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "222a9dc8fdb61c6088baab34fc3a8b8473a03a7a5fd404ed8dd502fa79b67cb1" +dependencies = [ + "serde", + "serde_derive", + "solana-instruction", + "solana-sanitize", +] [[package]] -name = "static_assertions" -version = "1.1.0" +name = "solana-type-overrides" +version = "2.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +checksum = "a545d312699b2874b1452344d114bb84f843452d8396e7e7bf71686d04141d62" +dependencies = [ + "rand 0.8.5", +] [[package]] -name = "strsim" -version = "0.8.0" +name = "solana-validator-exit" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +checksum = "7bbf6d7a3c0b28dd5335c52c0e9eae49d0ae489a8f324917faf0ded65a812c1d" [[package]] -name = "strsim" -version = "0.10.0" +name = "solana-vote-interface" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "b80d57478d6599d30acc31cc5ae7f93ec2361a06aefe8ea79bc81739a08af4c3" +dependencies = [ + "bincode", + "num-derive 0.4.2", + "num-traits", + "serde", + "serde_derive", + "solana-clock", + "solana-decode-error", + "solana-hash", + "solana-instruction", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", + "solana-serde-varint", + "solana-serialize-utils", + "solana-short-vec", + "solana-system-interface", +] [[package]] -name = "strsim" -version = "0.11.1" +name = "spin" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] -name = "strum" -version = "0.24.1" +name = "stable_deref_trait" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" -dependencies = [ - "strum_macros", -] +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] -name = "strum_macros" -version = "0.24.3" +name = "strsim" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", -] +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" @@ -5299,12 +4583,6 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" -[[package]] -name = "symlink" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7973cce6668464ea31f176d85b13c7ab3bba2cb3b77a2ed26abd7801688010a" - [[package]] name = "syn" version = "1.0.109" @@ -5329,20 +4607,11 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - -[[package]] -name = "synstructure" -version = "0.12.6" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", + "futures-core", ] [[package]] @@ -5356,82 +4625,6 @@ dependencies = [ "syn 2.0.89", ] -[[package]] -name = "system-configuration" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" -dependencies = [ - "bitflags 1.3.2", - "core-foundation", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "tar" -version = "0.4.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "tarpc" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38a012bed6fb9681d3bf71ffaa4f88f3b4b9ed3198cda6e4c8462d24d4bb80" -dependencies = [ - "anyhow", - "fnv", - "futures", - "humantime", - "opentelemetry", - "pin-project", - "rand 0.8.5", - "serde", - "static_assertions", - "tarpc-plugins", - "thiserror", - "tokio", - "tokio-serde", - "tokio-util 0.6.10", - "tracing", - "tracing-opentelemetry", -] - -[[package]] -name = "tarpc-plugins" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee42b4e559f17bce0385ebf511a7beb67d5cc33c12c96b7f4e9789919d9c10f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "task-local-extensions" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba323866e5d033818e3240feeb9f7db2c4296674e4d9e16b97b7bf8f490434e8" -dependencies = [ - "pin-utils", -] - [[package]] name = "tempfile" version = "3.14.0" @@ -5455,33 +4648,21 @@ dependencies = [ ] [[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "textwrap" -version = "0.11.0" +name = "thiserror" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "unicode-width 0.1.14", + "thiserror-impl 1.0.69", ] -[[package]] -name = "textwrap" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" - [[package]] name = "thiserror" -version = "1.0.69" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" dependencies = [ - "thiserror-impl", + "thiserror-impl 2.0.17", ] [[package]] @@ -5496,13 +4677,14 @@ dependencies = [ ] [[package]] -name = "thread_local" -version = "1.1.8" +name = "thiserror-impl" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ - "cfg-if", - "once_cell", + "proc-macro2", + "quote", + "syn 2.0.89", ] [[package]] @@ -5536,25 +4718,6 @@ dependencies = [ "time-core", ] -[[package]] -name = "tiny-bip39" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d" -dependencies = [ - "anyhow", - "hmac 0.8.1", - "once_cell", - "pbkdf2 0.4.0", - "rand 0.7.3", - "rustc-hash", - "sha2 0.9.9", - "thiserror", - "unicode-normalization", - "wasm-bindgen", - "zeroize", -] - [[package]] name = "tinystr" version = "0.7.6" @@ -5566,114 +4729,43 @@ dependencies = [ ] [[package]] -name = "tinyvec" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.41.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" -dependencies = [ - "backtrace", - "bytes", - "libc", - "mio", - "parking_lot", - "pin-project-lite", - "signal-hook-registry", - "socket2", - "tokio-macros", - "windows-sys 0.52.0", -] - -[[package]] -name = "tokio-macros" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.89", -] - -[[package]] -name = "tokio-rustls" -version = "0.24.1" +name = "tinyvec" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ - "rustls", - "tokio", + "tinyvec_macros", ] [[package]] -name = "tokio-serde" -version = "0.8.0" +name = "tinyvec_macros" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "911a61637386b789af998ee23f50aa30d5fd7edcec8d6d3dedae5e5815205466" -dependencies = [ - "bincode", - "bytes", - "educe", - "futures-core", - "futures-sink", - "pin-project", - "serde", - "serde_json", -] +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] -name = "tokio-stream" -version = "0.1.16" +name = "tokio" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" dependencies = [ - "futures-core", + "backtrace", + "bytes", + "libc", + "mio", "pin-project-lite", - "tokio", + "socket2 0.5.7", + "windows-sys 0.52.0", ] [[package]] -name = "tokio-tungstenite" -version = "0.20.1" +name = "tokio-rustls" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" +checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" dependencies = [ - "futures-util", - "log", "rustls", "tokio", - "tokio-rustls", - "tungstenite", - "webpki-roots 0.25.4", -] - -[[package]] -name = "tokio-util" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "log", - "pin-project-lite", - "slab", - "tokio", ] [[package]] @@ -5716,66 +4808,67 @@ dependencies = [ ] [[package]] -name = "tower-service" -version = "0.3.3" +name = "tower" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper", + "tokio", + "tower-layer", + "tower-service", +] [[package]] -name = "tracing" -version = "0.1.40" +name = "tower-http" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" dependencies = [ - "log", + "bitflags", + "bytes", + "futures-util", + "http", + "http-body", + "iri-string", "pin-project-lite", - "tracing-attributes", - "tracing-core", + "tower", + "tower-layer", + "tower-service", ] [[package]] -name = "tracing-attributes" -version = "0.1.27" +name = "tower-layer" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.89", -] +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] -name = "tracing-core" -version = "0.1.32" +name = "tower-service" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] -name = "tracing-opentelemetry" -version = "0.17.4" +name = "tracing" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbe89715c1dbbb790059e2565353978564924ee85017b5fff365c872ff6721f" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "once_cell", - "opentelemetry", - "tracing", + "pin-project-lite", "tracing-core", - "tracing-subscriber", ] [[package]] -name = "tracing-subscriber" -version = "0.3.18" +name = "tracing-core" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ - "sharded-slab", - "thread_local", - "tracing-core", + "once_cell", ] [[package]] @@ -5784,39 +4877,12 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" -[[package]] -name = "tungstenite" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" -dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand 0.8.5", - "rustls", - "sha1", - "thiserror", - "url", - "utf-8", - "webpki-roots 0.24.0", -] - [[package]] name = "typenum" version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" -[[package]] -name = "unicase" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" - [[package]] name = "unicode-ident" version = "1.0.14" @@ -5824,41 +4890,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] -name = "unicode-normalization" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-width" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" - -[[package]] -name = "unicode-width" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" - -[[package]] -name = "unicode-xid" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" - -[[package]] -name = "universal-hash" -version = "0.5.1" +name = "unicode-segmentation" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" -dependencies = [ - "crypto-common", - "subtle", -] +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unreachable" @@ -5869,12 +4904,6 @@ dependencies = [ "void", ] -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" @@ -5902,12 +4931,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - [[package]] name = "utf16_iter" version = "1.0.5" @@ -5921,16 +4944,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "vec_map" -version = "0.8.2" +name = "vcpkg" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" @@ -5944,16 +4961,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - [[package]] name = "want" version = "0.3.1" @@ -5975,26 +4982,45 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasi" +version = "0.14.7+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c" +dependencies = [ + "wasip2", +] + +[[package]] +name = "wasip2" +version = "1.0.1+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +dependencies = [ + "wit-bindgen", +] + [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", + "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn 2.0.89", @@ -6015,9 +5041,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6025,9 +5051,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" dependencies = [ "proc-macro2", "quote", @@ -6038,9 +5064,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1" +dependencies = [ + "unicode-ident", +] [[package]] name = "web-sys" @@ -6064,29 +5093,22 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.24.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" +checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2" dependencies = [ - "rustls-webpki", + "rustls-pki-types", ] -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - [[package]] name = "which" -version = "4.4.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", - "home", + "libc", "once_cell", - "rustix", ] [[package]] @@ -6126,17 +5148,14 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.6", + "windows-targets", ] [[package]] -name = "windows-sys" -version = "0.48.0" +name = "windows-link" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] +checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" [[package]] name = "windows-sys" @@ -6144,7 +5163,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.6", + "windows-targets", ] [[package]] @@ -6153,22 +5172,7 @@ version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", + "windows-targets", ] [[package]] @@ -6177,46 +5181,28 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -6229,48 +5215,24 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" @@ -6287,14 +5249,10 @@ dependencies = [ ] [[package]] -name = "winreg" -version = "0.50.0" +name = "wit-bindgen" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "write16" @@ -6308,35 +5266,6 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" -[[package]] -name = "x509-parser" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" -dependencies = [ - "asn1-rs", - "base64 0.13.1", - "data-encoding", - "der-parser", - "lazy_static", - "nom", - "oid-registry", - "rusticata-macros", - "thiserror", - "time", -] - -[[package]] -name = "xattr" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" -dependencies = [ - "libc", - "linux-raw-sys", - "rustix", -] - [[package]] name = "yoke" version = "0.7.5" @@ -6358,7 +5287,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.89", - "synstructure 0.13.1", + "synstructure", ] [[package]] @@ -6400,14 +5329,14 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.89", - "synstructure 0.13.1", + "synstructure", ] [[package]] name = "zeroize" -version = "1.3.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" dependencies = [ "zeroize_derive", ] @@ -6444,32 +5373,3 @@ dependencies = [ "quote", "syn 2.0.89", ] - -[[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.13+zstd.1.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" -dependencies = [ - "cc", - "pkg-config", -] diff --git a/clients/rust/Cargo.toml b/clients/rust/Cargo.toml index 18fdc23..0895337 100644 --- a/clients/rust/Cargo.toml +++ b/clients/rust/Cargo.toml @@ -15,10 +15,5 @@ num-derive = "^0.3" num-traits = "^0.2" serde = { version = "^1.0", features = ["derive"], optional = true } serde_with = { version = "^3.0", optional = true } -solana-program = "~2.0" +solana-program = "^2.2.1" thiserror = "^1.0" - -[dev-dependencies] -assert_matches = "1.5.0" -solana-program-test = "~2.0" -solana-sdk = "~2.0" diff --git a/program/Cargo.toml b/program/Cargo.toml index cef40b3..699abd9 100644 --- a/program/Cargo.toml +++ b/program/Cargo.toml @@ -19,12 +19,12 @@ num-derive = "^0.3" num-traits = "^0.2" serde = { version = "1.0.193", features = ["derive"] } shank = "^0.4.2" -solana-program = "~2.0" +solana-program = "^2.2.1" thiserror = "^1.0" [dev-dependencies] -mollusk-svm = { version = "0.0.10-solana-2.0", features = ["fuzz-fd"] } -solana-sdk = "~2.0" +mollusk-svm = { version = "^0.4", features = ["fuzz-fd"] } +solana-sdk = "^2.2.1" [features] bpf-entrypoint = [] diff --git a/program/tests/close.rs b/program/tests/close.rs index 07ac7a3..d12aef1 100644 --- a/program/tests/close.rs +++ b/program/tests/close.rs @@ -10,7 +10,7 @@ use { state::{get_program_data_address, UpgradeableLoaderState}, }, solana_sdk::{ - account::{AccountSharedData, WritableAccount}, + account::{Account, WritableAccount}, program_error::ProgramError, pubkey::Pubkey, }, @@ -24,10 +24,7 @@ fn fail_recipient_same_as_close_account() { mollusk.process_and_validate_instruction( &close(&target, &target, None, None), - &[ - (target, AccountSharedData::default()), - (target, AccountSharedData::default()), - ], + &[(target, Account::default()), (target, Account::default())], &[Check::err(ProgramError::InvalidArgument)], ); } @@ -53,7 +50,7 @@ fn fail_invalid_account_state() { true, ), ), - (destination, AccountSharedData::default()), + (destination, Account::default()), ], &[Check::err(ProgramError::InvalidArgument)], ); @@ -78,7 +75,7 @@ fn uninitialized_success() { target, upgradeable_state_account(&UpgradeableLoaderState::Uninitialized, &[], false), ), - (destination, AccountSharedData::default()), + (destination, Account::default()), ], &[ Check::success(), @@ -116,8 +113,8 @@ fn buffer_fail_buffer_immutable() { false, ), ), - (destination, AccountSharedData::default()), - (authority, AccountSharedData::default()), + (destination, Account::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::Immutable)], ); @@ -144,8 +141,8 @@ fn buffer_fail_incorrect_authority() { false, ), ), - (destination, AccountSharedData::default()), - (authority, AccountSharedData::default()), + (destination, Account::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::IncorrectAuthority)], ); @@ -175,8 +172,8 @@ fn buffer_fail_authority_not_signer() { false, ), ), - (destination, AccountSharedData::default()), - (authority, AccountSharedData::default()), + (destination, Account::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::MissingRequiredSignature)], ); @@ -208,8 +205,8 @@ fn buffer_success() { false, ), ), - (destination, AccountSharedData::default()), - (authority, AccountSharedData::default()), + (destination, Account::default()), + (authority, Account::default()), ], &[ Check::success(), @@ -254,8 +251,8 @@ fn programdata_fail_program_not_writable() { false, ), ), - (destination, AccountSharedData::default()), - (authority, AccountSharedData::default()), + (destination, Account::default()), + (authority, Account::default()), ( program, upgradeable_state_account( @@ -304,8 +301,8 @@ fn programdata_fail_program_not_owned_by_loader() { false, ), ), - (destination, AccountSharedData::default()), - (authority, AccountSharedData::default()), + (destination, Account::default()), + (authority, Account::default()), (program, program_account), ], &[Check::err(ProgramError::IncorrectProgramId)], @@ -337,8 +334,8 @@ fn programdata_fail_program_deployed_in_slot() { false, ), ), - (destination, AccountSharedData::default()), - (authority, AccountSharedData::default()), + (destination, Account::default()), + (authority, Account::default()), ( program, upgradeable_state_account( @@ -379,8 +376,8 @@ fn programdata_fail_not_upgradeable() { false, ), ), - (destination, AccountSharedData::default()), - (authority, AccountSharedData::default()), + (destination, Account::default()), + (authority, Account::default()), ( program, upgradeable_state_account( @@ -421,8 +418,8 @@ fn programdata_fail_incorrect_authority() { false, ), ), - (destination, AccountSharedData::default()), - (authority, AccountSharedData::default()), + (destination, Account::default()), + (authority, Account::default()), ( program, upgradeable_state_account( @@ -466,8 +463,8 @@ fn programdata_fail_authority_not_signer() { false, ), ), - (destination, AccountSharedData::default()), - (authority, AccountSharedData::default()), + (destination, Account::default()), + (authority, Account::default()), ( program, upgradeable_state_account( @@ -513,8 +510,8 @@ fn programdata_success() { false, ), ), - (destination, AccountSharedData::default()), - (authority, AccountSharedData::default()), + (destination, Account::default()), + (authority, Account::default()), ( program, upgradeable_state_account( diff --git a/program/tests/common.rs b/program/tests/common.rs index 3c85120..5894898 100644 --- a/program/tests/common.rs +++ b/program/tests/common.rs @@ -4,26 +4,22 @@ use { mollusk_svm::Mollusk, solana_loader_v3_program::state::UpgradeableLoaderState, - solana_sdk::{ - account::{AccountSharedData, WritableAccount}, - rent::Rent, - system_program, - }, + solana_sdk::{account::Account, rent::Rent, system_program}, }; pub fn setup() -> Mollusk { Mollusk::new(&solana_loader_v3_program::id(), "solana_loader_v3_program") } -pub fn system_account_with_lamports(lamports: u64) -> AccountSharedData { - AccountSharedData::new(lamports, 0, &system_program::id()) +pub fn system_account_with_lamports(lamports: u64) -> Account { + Account::new(lamports, 0, &system_program::id()) } pub fn upgradeable_state_account( state: &UpgradeableLoaderState, additional_bytes: &[u8], executable: bool, -) -> AccountSharedData { +) -> Account { // Annoying, but necessary because of the program's layout expectations. let data_size = match state { UpgradeableLoaderState::Uninitialized => UpgradeableLoaderState::size_of_uninitialized(), @@ -41,10 +37,11 @@ pub fn upgradeable_state_account( let space = data.len(); let lamports = Rent::default().minimum_balance(space); - let mut account = AccountSharedData::new(lamports, space, &solana_loader_v3_program::id()); - account.set_data_from_slice(&data); - - account.set_executable(executable); - - account + Account { + lamports, + owner: solana_loader_v3_program::id(), + data, + executable, + ..Account::default() + } } diff --git a/program/tests/deploy.rs b/program/tests/deploy.rs index 59e830b..b3af779 100644 --- a/program/tests/deploy.rs +++ b/program/tests/deploy.rs @@ -10,7 +10,7 @@ use { state::{get_program_data_address, UpgradeableLoaderState}, }, solana_sdk::{ - account::{AccountSharedData, ReadableAccount}, + account::{Account, ReadableAccount}, program_error::ProgramError, pubkey::Pubkey, system_instruction::MAX_PERMITTED_DATA_LENGTH, @@ -42,7 +42,7 @@ fn fail_program_already_initialized() { ), &[ (payer, system_account_with_lamports(100_000_000_000)), - (programdata, AccountSharedData::default()), + (programdata, Account::default()), ( program, // Already initialized. @@ -67,7 +67,7 @@ fn fail_program_already_initialized() { mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), keyed_account_for_system_program(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::AccountAlreadyInitialized)], ); @@ -98,10 +98,10 @@ fn fail_program_account_too_small() { ), &[ (payer, system_account_with_lamports(100_000_000_000)), - (programdata, AccountSharedData::default()), + (programdata, Account::default()), ( program, - AccountSharedData::new( + Account::new( 100_000_000, UpgradeableLoaderState::size_of_program().saturating_sub(1), // Too small. &solana_loader_v3_program::id(), @@ -120,7 +120,7 @@ fn fail_program_account_too_small() { mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), keyed_account_for_system_program(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::AccountDataTooSmall)], ); @@ -156,10 +156,10 @@ fn fail_program_account_not_rent_exempt() { ), &[ (payer, system_account_with_lamports(100_000_000_000)), - (programdata, AccountSharedData::default()), + (programdata, Account::default()), ( program, - AccountSharedData::new( + Account::new( program_rent_exempt_lamports.saturating_sub(1), // Not rent exempt. UpgradeableLoaderState::size_of_program(), &solana_loader_v3_program::id(), @@ -178,7 +178,7 @@ fn fail_program_account_not_rent_exempt() { mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), keyed_account_for_system_program(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::InsufficientFunds)], ); @@ -214,10 +214,10 @@ fn fail_invalid_buffer_state() { ), &[ (payer, system_account_with_lamports(100_000_000_000)), - (programdata, AccountSharedData::default()), + (programdata, Account::default()), ( program, - AccountSharedData::new( + Account::new( program_rent_exempt_lamports, UpgradeableLoaderState::size_of_program(), &solana_loader_v3_program::id(), @@ -238,7 +238,7 @@ fn fail_invalid_buffer_state() { mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), keyed_account_for_system_program(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::InvalidArgument)], ); @@ -274,10 +274,10 @@ fn fail_incorrect_buffer_authority() { ), &[ (payer, system_account_with_lamports(100_000_000_000)), - (programdata, AccountSharedData::default()), + (programdata, Account::default()), ( program, - AccountSharedData::new( + Account::new( program_rent_exempt_lamports, UpgradeableLoaderState::size_of_program(), &solana_loader_v3_program::id(), @@ -296,7 +296,7 @@ fn fail_incorrect_buffer_authority() { mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), keyed_account_for_system_program(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::IncorrectAuthority)], ); @@ -335,10 +335,10 @@ fn fail_buffer_authority_not_signer() { &instruction, &[ (payer, system_account_with_lamports(100_000_000_000)), - (programdata, AccountSharedData::default()), + (programdata, Account::default()), ( program, - AccountSharedData::new( + Account::new( program_rent_exempt_lamports, UpgradeableLoaderState::size_of_program(), &solana_loader_v3_program::id(), @@ -357,7 +357,7 @@ fn fail_buffer_authority_not_signer() { mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), keyed_account_for_system_program(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::MissingRequiredSignature)], ); @@ -399,10 +399,10 @@ fn fail_max_data_len_too_small() { ), &[ (payer, system_account_with_lamports(100_000_000_000)), - (programdata, AccountSharedData::default()), + (programdata, Account::default()), ( program, - AccountSharedData::new( + Account::new( program_rent_exempt_lamports, UpgradeableLoaderState::size_of_program(), &solana_loader_v3_program::id(), @@ -421,7 +421,7 @@ fn fail_max_data_len_too_small() { mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), keyed_account_for_system_program(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::AccountDataTooSmall)], ); @@ -457,10 +457,10 @@ fn fail_max_data_len_too_large() { ), &[ (payer, system_account_with_lamports(100_000_000_000)), - (programdata, AccountSharedData::default()), + (programdata, Account::default()), ( program, - AccountSharedData::new( + Account::new( program_rent_exempt_lamports, UpgradeableLoaderState::size_of_program(), &solana_loader_v3_program::id(), @@ -479,7 +479,7 @@ fn fail_max_data_len_too_large() { mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), keyed_account_for_system_program(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::InvalidArgument)], ); @@ -515,10 +515,10 @@ fn fail_incorrect_programdata_address() { ), &[ (payer, system_account_with_lamports(100_000_000_000)), - (programdata, AccountSharedData::default()), + (programdata, Account::default()), ( program, - AccountSharedData::new( + Account::new( program_rent_exempt_lamports, UpgradeableLoaderState::size_of_program(), &solana_loader_v3_program::id(), @@ -537,7 +537,7 @@ fn fail_incorrect_programdata_address() { mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), keyed_account_for_system_program(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::InvalidArgument)], ); @@ -587,7 +587,7 @@ fn fail_programdata_already_initialized() { ), ( program, - AccountSharedData::new( + Account::new( program_rent_exempt_lamports, UpgradeableLoaderState::size_of_program(), &solana_loader_v3_program::id(), @@ -606,7 +606,7 @@ fn fail_programdata_already_initialized() { mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), keyed_account_for_system_program(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::Custom( 0, // SystemError::AccountAlreadyInUse @@ -644,10 +644,10 @@ fn success() { ), &[ (payer, system_account_with_lamports(100_000_000_000)), - (programdata, AccountSharedData::default()), + (programdata, Account::default()), ( program, - AccountSharedData::new( + Account::new( program_rent_exempt_lamports, UpgradeableLoaderState::size_of_program(), &solana_loader_v3_program::id(), @@ -666,7 +666,7 @@ fn success() { mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), keyed_account_for_system_program(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[ Check::success(), diff --git a/program/tests/initialize_buffer.rs b/program/tests/initialize_buffer.rs index 3e93492..ac0d6c2 100644 --- a/program/tests/initialize_buffer.rs +++ b/program/tests/initialize_buffer.rs @@ -7,7 +7,7 @@ use { mollusk_svm::result::Check, solana_loader_v3_program::{instruction::initialize_buffer, state::UpgradeableLoaderState}, solana_sdk::{ - account::AccountSharedData, instruction::InstructionError, program_error::ProgramError, + account::Account, instruction::InstructionError, program_error::ProgramError, pubkey::Pubkey, }, }; @@ -32,7 +32,7 @@ fn fail_buffer_already_initialized() { false, ), ), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::AccountAlreadyInitialized)], ); @@ -50,13 +50,13 @@ fn fail_buffer_account_too_small() { &[ ( source, - AccountSharedData::new( + Account::new( 100_000_000, 0, // Too small. &solana_loader_v3_program::id(), ), ), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::InvalidAccountData)], ); @@ -74,13 +74,13 @@ fn fail_buffer_account_not_owned_by_loader() { &[ ( source, - AccountSharedData::new( + Account::new( 100_000_000, UpgradeableLoaderState::size_of_buffer(0), &Pubkey::new_unique(), // Not the loader. ), ), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::instruction_err( InstructionError::ExternalAccountDataModified, @@ -100,13 +100,13 @@ fn success() { &[ ( source, - AccountSharedData::new( + Account::new( 100_000_000, UpgradeableLoaderState::size_of_buffer(0), &solana_loader_v3_program::id(), ), ), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[ Check::success(), diff --git a/program/tests/set_authority.rs b/program/tests/set_authority.rs index f182e70..386d534 100644 --- a/program/tests/set_authority.rs +++ b/program/tests/set_authority.rs @@ -6,7 +6,7 @@ use { common::{setup, upgradeable_state_account}, mollusk_svm::result::Check, solana_loader_v3_program::{instruction::set_authority, state::UpgradeableLoaderState}, - solana_sdk::{account::AccountSharedData, program_error::ProgramError, pubkey::Pubkey}, + solana_sdk::{account::Account, program_error::ProgramError, pubkey::Pubkey}, }; #[test] @@ -33,8 +33,8 @@ fn fail_invalid_account_state() { false, ), ), - (current_authority, AccountSharedData::default()), - (new_authority, AccountSharedData::default()), + (current_authority, Account::default()), + (new_authority, Account::default()), ], &[Check::err(ProgramError::InvalidArgument)], ); @@ -66,7 +66,7 @@ fn buffer_fail_authority_not_provided() { false, ), ), - (current_authority, AccountSharedData::default()), + (current_authority, Account::default()), ], &[Check::err(ProgramError::IncorrectAuthority)], ); @@ -95,8 +95,8 @@ fn buffer_fail_buffer_immutable() { false, ), ), - (current_authority, AccountSharedData::default()), - (new_authority, AccountSharedData::default()), + (current_authority, Account::default()), + (new_authority, Account::default()), ], &[Check::err(ProgramError::Immutable)], ); @@ -125,8 +125,8 @@ fn buffer_fail_incorrect_authority() { false, ), ), - (current_authority, AccountSharedData::default()), - (new_authority, AccountSharedData::default()), + (current_authority, Account::default()), + (new_authority, Account::default()), ], &[Check::err(ProgramError::IncorrectAuthority)], ); @@ -158,8 +158,8 @@ fn buffer_fail_authority_not_signer() { false, ), ), - (current_authority, AccountSharedData::default()), - (new_authority, AccountSharedData::default()), + (current_authority, Account::default()), + (new_authority, Account::default()), ], &[Check::err(ProgramError::MissingRequiredSignature)], ); @@ -199,8 +199,8 @@ fn buffer_success() { false, ), ), - (current_authority, AccountSharedData::default()), - (new_authority, AccountSharedData::default()), + (current_authority, Account::default()), + (new_authority, Account::default()), ], &[ Check::success(), @@ -240,8 +240,8 @@ fn programdata_fail_not_upgradeable() { false, ), ), - (current_authority, AccountSharedData::default()), - (new_authority, AccountSharedData::default()), + (current_authority, Account::default()), + (new_authority, Account::default()), ], &[Check::err(ProgramError::Immutable)], ); @@ -271,8 +271,8 @@ fn programdata_fail_incorrect_authority() { false, ), ), - (current_authority, AccountSharedData::default()), - (new_authority, AccountSharedData::default()), + (current_authority, Account::default()), + (new_authority, Account::default()), ], &[Check::err(ProgramError::IncorrectAuthority)], ); @@ -305,8 +305,8 @@ fn programdata_fail_authority_not_signer() { false, ), ), - (current_authority, AccountSharedData::default()), - (new_authority, AccountSharedData::default()), + (current_authority, Account::default()), + (new_authority, Account::default()), ], &[Check::err(ProgramError::MissingRequiredSignature)], ); @@ -350,8 +350,8 @@ fn programdata_success() { false, ), ), - (current_authority, AccountSharedData::default()), - (new_authority, AccountSharedData::default()), + (current_authority, Account::default()), + (new_authority, Account::default()), ], &[ Check::success(), @@ -379,8 +379,8 @@ fn programdata_success() { false, ), ), - (current_authority, AccountSharedData::default()), - (new_authority, AccountSharedData::default()), + (current_authority, Account::default()), + (new_authority, Account::default()), ], &[ Check::success(), diff --git a/program/tests/set_authority_checked.rs b/program/tests/set_authority_checked.rs index 2f6c3e8..f6743c5 100644 --- a/program/tests/set_authority_checked.rs +++ b/program/tests/set_authority_checked.rs @@ -6,7 +6,7 @@ use { common::{setup, upgradeable_state_account}, mollusk_svm::result::Check, solana_loader_v3_program::{instruction::set_authority_checked, state::UpgradeableLoaderState}, - solana_sdk::{account::AccountSharedData, program_error::ProgramError, pubkey::Pubkey}, + solana_sdk::{account::Account, program_error::ProgramError, pubkey::Pubkey}, }; #[test] @@ -33,8 +33,8 @@ fn fail_invalid_account_state() { false, ), ), - (current_authority, AccountSharedData::default()), - (new_authority, AccountSharedData::default()), + (current_authority, Account::default()), + (new_authority, Account::default()), ], &[Check::err(ProgramError::InvalidArgument)], ); @@ -63,8 +63,8 @@ fn buffer_fail_buffer_immutable() { false, ), ), - (current_authority, AccountSharedData::default()), - (new_authority, AccountSharedData::default()), + (current_authority, Account::default()), + (new_authority, Account::default()), ], &[Check::err(ProgramError::Immutable)], ); @@ -93,8 +93,8 @@ fn buffer_fail_incorrect_authority() { false, ), ), - (current_authority, AccountSharedData::default()), - (new_authority, AccountSharedData::default()), + (current_authority, Account::default()), + (new_authority, Account::default()), ], &[Check::err(ProgramError::IncorrectAuthority)], ); @@ -126,8 +126,8 @@ fn buffer_fail_authority_not_signer() { false, ), ), - (current_authority, AccountSharedData::default()), - (new_authority, AccountSharedData::default()), + (current_authority, Account::default()), + (new_authority, Account::default()), ], &[Check::err(ProgramError::MissingRequiredSignature)], ); @@ -159,8 +159,8 @@ fn buffer_fail_new_authority_not_signer() { false, ), ), - (current_authority, AccountSharedData::default()), - (new_authority, AccountSharedData::default()), + (current_authority, Account::default()), + (new_authority, Account::default()), ], &[Check::err(ProgramError::MissingRequiredSignature)], ); @@ -200,8 +200,8 @@ fn buffer_success() { false, ), ), - (current_authority, AccountSharedData::default()), - (new_authority, AccountSharedData::default()), + (current_authority, Account::default()), + (new_authority, Account::default()), ], &[ Check::success(), @@ -239,8 +239,8 @@ fn programdata_fail_not_upgradeable() { false, ), ), - (current_authority, AccountSharedData::default()), - (new_authority, AccountSharedData::default()), + (current_authority, Account::default()), + (new_authority, Account::default()), ], &[Check::err(ProgramError::Immutable)], ); @@ -270,8 +270,8 @@ fn programdata_fail_incorrect_authority() { false, ), ), - (current_authority, AccountSharedData::default()), - (new_authority, AccountSharedData::default()), + (current_authority, Account::default()), + (new_authority, Account::default()), ], &[Check::err(ProgramError::IncorrectAuthority)], ); @@ -304,8 +304,8 @@ fn programdata_fail_authority_not_signer() { false, ), ), - (current_authority, AccountSharedData::default()), - (new_authority, AccountSharedData::default()), + (current_authority, Account::default()), + (new_authority, Account::default()), ], &[Check::err(ProgramError::MissingRequiredSignature)], ); @@ -338,8 +338,8 @@ fn programdata_fail_new_authority_not_signer() { false, ), ), - (current_authority, AccountSharedData::default()), - (new_authority, AccountSharedData::default()), + (current_authority, Account::default()), + (new_authority, Account::default()), ], &[Check::err(ProgramError::MissingRequiredSignature)], ); @@ -383,8 +383,8 @@ fn programdata_success() { false, ), ), - (current_authority, AccountSharedData::default()), - (new_authority, AccountSharedData::default()), + (current_authority, Account::default()), + (new_authority, Account::default()), ], &[ Check::success(), diff --git a/program/tests/upgrade.rs b/program/tests/upgrade.rs index de3da68..7adc4c3 100644 --- a/program/tests/upgrade.rs +++ b/program/tests/upgrade.rs @@ -10,7 +10,7 @@ use { state::{get_program_data_address, UpgradeableLoaderState}, }, solana_sdk::{ - account::{AccountSharedData, ReadableAccount, WritableAccount}, + account::{Account, ReadableAccount, WritableAccount}, program_error::ProgramError, pubkey::Pubkey, }, @@ -64,10 +64,10 @@ fn fail_program_not_executable() { false, ), ), - (spill, AccountSharedData::default()), + (spill, Account::default()), mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::InvalidAccountData)], ); @@ -124,10 +124,10 @@ fn fail_program_not_writable() { false, ), ), - (spill, AccountSharedData::default()), + (spill, Account::default()), mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::InvalidArgument)], ); @@ -181,10 +181,10 @@ fn fail_program_not_owned_by_loader() { false, ), ), - (spill, AccountSharedData::default()), + (spill, Account::default()), mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::IncorrectProgramId)], ); @@ -240,10 +240,10 @@ fn fail_invalid_program_state() { false, ), ), - (spill, AccountSharedData::default()), + (spill, Account::default()), mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::InvalidAccountData)], ); @@ -297,10 +297,10 @@ fn fail_incorrect_programdata_address() { false, ), ), - (spill, AccountSharedData::default()), + (spill, Account::default()), mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::InvalidArgument)], ); @@ -356,10 +356,10 @@ fn fail_invalid_buffer_state() { false, ), ), - (spill, AccountSharedData::default()), + (spill, Account::default()), mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::InvalidArgument)], ); @@ -413,10 +413,10 @@ fn fail_incorrect_buffer_authority() { false, ), ), - (spill, AccountSharedData::default()), + (spill, Account::default()), mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::IncorrectAuthority)], ); @@ -473,10 +473,10 @@ fn fail_buffer_authority_not_signer() { false, ), ), - (spill, AccountSharedData::default()), + (spill, Account::default()), mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::MissingRequiredSignature)], ); @@ -536,10 +536,10 @@ fn fail_programdata_account_too_small() { false, ), ), - (spill, AccountSharedData::default()), + (spill, Account::default()), mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::AccountDataTooSmall)], ); @@ -599,10 +599,10 @@ fn fail_invalid_programdata_state() { false, ), ), - (spill, AccountSharedData::default()), + (spill, Account::default()), mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::InvalidAccountData)], ); @@ -657,10 +657,10 @@ fn fail_program_deployed_in_slot() { false, ), ), - (spill, AccountSharedData::default()), + (spill, Account::default()), mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::InvalidArgument)], ); @@ -715,10 +715,10 @@ fn fail_program_not_upgradeable() { false, ), ), - (spill, AccountSharedData::default()), + (spill, Account::default()), mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::Immutable)], ); @@ -773,10 +773,10 @@ fn fail_incorrect_upgrade_authority() { false, ), ), - (spill, AccountSharedData::default()), + (spill, Account::default()), mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::IncorrectAuthority)], ); @@ -834,10 +834,10 @@ fn fail_upgrade_authority_not_signer() { false, ), ), - (spill, AccountSharedData::default()), + (spill, Account::default()), mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::MissingRequiredSignature)], ); @@ -892,10 +892,10 @@ fn success() { false, ), ), - (spill, AccountSharedData::default()), + (spill, Account::default()), mollusk.sysvars.keyed_account_for_rent_sysvar(), mollusk.sysvars.keyed_account_for_clock_sysvar(), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[ Check::success(), diff --git a/program/tests/write.rs b/program/tests/write.rs index eba1e5a..174f69b 100644 --- a/program/tests/write.rs +++ b/program/tests/write.rs @@ -7,7 +7,7 @@ use { mollusk_svm::result::Check, solana_loader_v3_program::{instruction::write, state::UpgradeableLoaderState}, solana_sdk::{ - account::{AccountSharedData, WritableAccount}, + account::{Account, WritableAccount}, instruction::InstructionError, program_error::ProgramError, pubkey::Pubkey, @@ -36,7 +36,7 @@ fn fail_invalid_buffer_state() { false, ), ), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::InvalidAccountData)], ); @@ -62,7 +62,7 @@ fn fail_immutable_buffer() { false, ), ), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::Immutable)], ); @@ -88,7 +88,7 @@ fn fail_incorrect_buffer_authority() { false, ), ), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::IncorrectAuthority)], ); @@ -117,7 +117,7 @@ fn fail_buffer_authority_not_signer() { false, ), ), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::MissingRequiredSignature)], ); @@ -143,7 +143,7 @@ fn fail_buffer_too_small() { false, ), ), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[Check::err(ProgramError::AccountDataTooSmall)], ); @@ -166,10 +166,7 @@ fn fail_buffer_account_not_owned_by_loader() { mollusk.process_and_validate_instruction( &write(&buffer, &authority, 0, vec![4; 12]), - &[ - (buffer, buffer_account), - (authority, AccountSharedData::default()), - ], + &[(buffer, buffer_account), (authority, Account::default())], &[Check::instruction_err( InstructionError::ExternalAccountDataModified, )], @@ -205,7 +202,7 @@ fn success() { buffer, upgradeable_state_account(&state, uninitialized_data, false), ), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[ Check::success(), @@ -224,7 +221,7 @@ fn success() { &write(&buffer, &authority, offset, bytes), &[ (buffer, result.get_account(&buffer).unwrap().clone()), - (authority, AccountSharedData::default()), + (authority, Account::default()), ], &[ Check::success(), From 08110a6b2c5a7b228943a99ba839471c4ed90698 Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Thu, 2 Oct 2025 11:30:40 +0100 Subject: [PATCH 05/10] Update Codama and client dependencies --- Cargo.lock | 78 +- clients/js/package.json | 23 +- clients/js/pnpm-lock.yaml | 1745 ++++++++++------- clients/js/src/generated/index.ts | 6 +- .../js/src/generated/instructions/close.ts | 79 +- .../instructions/deployWithMaxDataLen.ts | 89 +- .../generated/instructions/extendProgram.ts | 79 +- .../js/src/generated/instructions/index.ts | 6 +- .../instructions/initializeBuffer.ts | 71 +- .../generated/instructions/setAuthority.ts | 77 +- .../instructions/setAuthorityChecked.ts | 79 +- .../js/src/generated/instructions/upgrade.ts | 85 +- .../js/src/generated/instructions/write.ts | 62 +- clients/js/src/generated/programs/index.ts | 6 +- clients/js/src/generated/programs/loaderV3.ts | 8 +- clients/js/src/generated/shared/index.ts | 24 +- clients/rust/Cargo.toml | 10 +- clients/rust/src/generated/errors/mod.rs | 6 +- .../rust/src/generated/instructions/close.rs | 187 +- .../instructions/deploy_with_max_data_len.rs | 263 ++- .../generated/instructions/extend_program.rs | 198 +- .../instructions/initialize_buffer.rs | 140 +- .../rust/src/generated/instructions/mod.rs | 6 +- .../generated/instructions/set_authority.rs | 165 +- .../instructions/set_authority_checked.rs | 158 +- .../src/generated/instructions/upgrade.rs | 237 +-- .../rust/src/generated/instructions/write.rs | 149 +- clients/rust/src/generated/mod.rs | 6 +- clients/rust/src/generated/programs.rs | 8 +- codama.mjs | 41 + package.json | 13 +- pnpm-lock.yaml | 497 +++-- program/idl.json | 2 +- 33 files changed, 2502 insertions(+), 2101 deletions(-) create mode 100644 codama.mjs diff --git a/Cargo.lock b/Cargo.lock index f4a459b..b87dc63 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -101,9 +101,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.93" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" +checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" [[package]] name = "ark-bn254" @@ -496,9 +496,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.8.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "cc" @@ -1281,7 +1281,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.6.0", + "socket2", "tokio", "tower-service", "tracing", @@ -1468,13 +1468,25 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.6.0" +version = "2.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5" dependencies = [ "equivalent", "hashbrown 0.15.2", "serde", + "serde_core", +] + +[[package]] +name = "io-uring" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b" +dependencies = [ + "bitflags", + "cfg-if", + "libc", ] [[package]] @@ -2067,7 +2079,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.6.0", + "indexmap 2.11.4", ] [[package]] @@ -2216,7 +2228,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2 0.5.7", + "socket2", "thiserror 2.0.17", "tokio", "tracing", @@ -2253,7 +2265,7 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.5.7", + "socket2", "tracing", "windows-sys 0.59.0", ] @@ -2601,9 +2613,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "semver" -version = "1.0.23" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" [[package]] name = "serde" @@ -2688,7 +2700,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.6.0", + "indexmap 2.11.4", "schemars 0.9.0", "schemars 1.0.4", "serde", @@ -2838,19 +2850,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.2" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "socket2" @@ -3508,11 +3510,17 @@ name = "solana-loader-v3-program-client" version = "0.0.0" dependencies = [ "borsh 0.10.4", - "num-derive 0.3.3", + "num-derive 0.4.2", "num-traits", "serde", "serde_with", - "solana-program", + "solana-account", + "solana-account-info", + "solana-cpi", + "solana-decode-error", + "solana-instruction", + "solana-program-error", + "solana-pubkey", "thiserror 1.0.69", ] @@ -4745,17 +4753,19 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.41.1" +version = "1.47.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" +checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038" dependencies = [ "backtrace", "bytes", + "io-uring", "libc", "mio", "pin-project-lite", - "socket2 0.5.7", - "windows-sys 0.52.0", + "slab", + "socket2", + "windows-sys 0.59.0", ] [[package]] @@ -4770,9 +4780,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.12" +version = "0.7.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5" dependencies = [ "bytes", "futures-core", @@ -4802,7 +4812,7 @@ version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.11.4", "toml_datetime", "winnow", ] diff --git a/clients/js/package.json b/clients/js/package.json index f54c443..f1823a6 100644 --- a/clients/js/package.json +++ b/clients/js/package.json @@ -34,38 +34,33 @@ }, "license": "MIT", "peerDependencies": { - "@solana/web3.js": "2.0.0-preview.3" + "@solana/kit": "^3.0.0" }, "devDependencies": { "@ava/typescript": "^4.1.0", "@solana/eslint-config-solana": "^3.0.0", - "@solana/web3.js": "2.0.0-preview.3", - "@solana/webcrypto-ed25519-polyfill": "2.0.0-preview.3", - "@types/node": "^20", + "@solana/kit": "^3.0.0", + "@types/node": "^24", "@typescript-eslint/eslint-plugin": "^7.3.1", "@typescript-eslint/parser": "^7.3.1", "ava": "^6.1.2", "eslint": "^8.57.0", - "prettier": "^3.2.5", + "prettier": "^3.6.2", "rimraf": "^5.0.5", - "tsup": "^8.0.2", - "typedoc": "^0.25.12", - "typedoc-plugin-missing-exports": "^2.2.0", - "typescript": "^5.4.2" + "tsup": "^8.5.0", + "typedoc": "^0.28.13", + "typedoc-plugin-missing-exports": "^4.1.0", + "typescript": "^5.9.3" }, "ava": { "nodeArguments": [ "--no-warnings" ], - "require": [ - "@solana/webcrypto-ed25519-polyfill" - ], "typescript": { "compile": false, "rewritePaths": { "test/": "dist/test/" } } - }, - "packageManager": "pnpm@9.1.0" + } } diff --git a/clients/js/pnpm-lock.yaml b/clients/js/pnpm-lock.yaml index 92640ff..a5955ff 100644 --- a/clients/js/pnpm-lock.yaml +++ b/clients/js/pnpm-lock.yaml @@ -13,22 +13,19 @@ importers: version: 4.1.0 '@solana/eslint-config-solana': specifier: ^3.0.0 - version: 3.0.4(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-simple-import-sort@12.1.1(eslint@8.57.1))(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.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2) - '@solana/web3.js': - specifier: 2.0.0-preview.3 - version: 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)(ws@8.18.0) - '@solana/webcrypto-ed25519-polyfill': - specifier: 2.0.0-preview.3 - version: 2.0.0-preview.3 + version: 3.0.4(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3))(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-simple-import-sort@12.1.1(eslint@8.57.1))(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.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3) + '@solana/kit': + specifier: ^3.0.0 + version: 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)(ws@8.18.0) '@types/node': - specifier: ^20 - version: 20.16.10 + specifier: ^24 + version: 24.6.2 '@typescript-eslint/eslint-plugin': specifier: ^7.3.1 - version: 7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2) + version: 7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3) '@typescript-eslint/parser': specifier: ^7.3.1 - version: 7.18.0(eslint@8.57.1)(typescript@5.6.2) + version: 7.18.0(eslint@8.57.1)(typescript@5.9.3) ava: specifier: ^6.1.2 version: 6.1.3(@ava/typescript@4.1.0) @@ -36,23 +33,23 @@ importers: specifier: ^8.57.0 version: 8.57.1 prettier: - specifier: ^3.2.5 - version: 3.3.3 + specifier: ^3.6.2 + version: 3.6.2 rimraf: specifier: ^5.0.5 version: 5.0.10 tsup: - specifier: ^8.0.2 - version: 8.3.0(typescript@5.6.2) + specifier: ^8.5.0 + version: 8.5.0(typescript@5.9.3)(yaml@2.8.1) typedoc: - specifier: ^0.25.12 - version: 0.25.13(typescript@5.6.2) + specifier: ^0.28.13 + version: 0.28.13(typescript@5.9.3) typedoc-plugin-missing-exports: - specifier: ^2.2.0 - version: 2.3.0(typedoc@0.25.13(typescript@5.6.2)) + specifier: ^4.1.0 + version: 4.1.0(typedoc@0.28.13(typescript@5.9.3)) typescript: - specifier: ^5.4.2 - version: 5.6.2 + specifier: ^5.9.3 + version: 5.9.3 packages: @@ -60,146 +57,158 @@ packages: resolution: {integrity: sha512-1iWZQ/nr9iflhLK9VN8H+1oDZqe93qxNnyYUz+jTzkYPAHc5fdZXBrqmNIgIfFhWYXK5OaQ5YtC7OmLeTNhVEg==} engines: {node: ^14.19 || ^16.15 || ^18 || ^20} - '@esbuild/aix-ppc64@0.23.1': - resolution: {integrity: sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==} + '@esbuild/aix-ppc64@0.25.10': + resolution: {integrity: sha512-0NFWnA+7l41irNuaSVlLfgNT12caWJVLzp5eAVhZ0z1qpxbockccEt3s+149rE64VUI3Ml2zt8Nv5JVc4QXTsw==} engines: {node: '>=18'} cpu: [ppc64] os: [aix] - '@esbuild/android-arm64@0.23.1': - resolution: {integrity: sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==} + '@esbuild/android-arm64@0.25.10': + resolution: {integrity: sha512-LSQa7eDahypv/VO6WKohZGPSJDq5OVOo3UoFR1E4t4Gj1W7zEQMUhI+lo81H+DtB+kP+tDgBp+M4oNCwp6kffg==} engines: {node: '>=18'} cpu: [arm64] os: [android] - '@esbuild/android-arm@0.23.1': - resolution: {integrity: sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==} + '@esbuild/android-arm@0.25.10': + resolution: {integrity: sha512-dQAxF1dW1C3zpeCDc5KqIYuZ1tgAdRXNoZP7vkBIRtKZPYe2xVr/d3SkirklCHudW1B45tGiUlz2pUWDfbDD4w==} engines: {node: '>=18'} cpu: [arm] os: [android] - '@esbuild/android-x64@0.23.1': - resolution: {integrity: sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==} + '@esbuild/android-x64@0.25.10': + resolution: {integrity: sha512-MiC9CWdPrfhibcXwr39p9ha1x0lZJ9KaVfvzA0Wxwz9ETX4v5CHfF09bx935nHlhi+MxhA63dKRRQLiVgSUtEg==} engines: {node: '>=18'} cpu: [x64] os: [android] - '@esbuild/darwin-arm64@0.23.1': - resolution: {integrity: sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==} + '@esbuild/darwin-arm64@0.25.10': + resolution: {integrity: sha512-JC74bdXcQEpW9KkV326WpZZjLguSZ3DfS8wrrvPMHgQOIEIG/sPXEN/V8IssoJhbefLRcRqw6RQH2NnpdprtMA==} engines: {node: '>=18'} cpu: [arm64] os: [darwin] - '@esbuild/darwin-x64@0.23.1': - resolution: {integrity: sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==} + '@esbuild/darwin-x64@0.25.10': + resolution: {integrity: sha512-tguWg1olF6DGqzws97pKZ8G2L7Ig1vjDmGTwcTuYHbuU6TTjJe5FXbgs5C1BBzHbJ2bo1m3WkQDbWO2PvamRcg==} engines: {node: '>=18'} cpu: [x64] os: [darwin] - '@esbuild/freebsd-arm64@0.23.1': - resolution: {integrity: sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==} + '@esbuild/freebsd-arm64@0.25.10': + resolution: {integrity: sha512-3ZioSQSg1HT2N05YxeJWYR+Libe3bREVSdWhEEgExWaDtyFbbXWb49QgPvFH8u03vUPX10JhJPcz7s9t9+boWg==} engines: {node: '>=18'} cpu: [arm64] os: [freebsd] - '@esbuild/freebsd-x64@0.23.1': - resolution: {integrity: sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==} + '@esbuild/freebsd-x64@0.25.10': + resolution: {integrity: sha512-LLgJfHJk014Aa4anGDbh8bmI5Lk+QidDmGzuC2D+vP7mv/GeSN+H39zOf7pN5N8p059FcOfs2bVlrRr4SK9WxA==} engines: {node: '>=18'} cpu: [x64] os: [freebsd] - '@esbuild/linux-arm64@0.23.1': - resolution: {integrity: sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==} + '@esbuild/linux-arm64@0.25.10': + resolution: {integrity: sha512-5luJWN6YKBsawd5f9i4+c+geYiVEw20FVW5x0v1kEMWNq8UctFjDiMATBxLvmmHA4bf7F6hTRaJgtghFr9iziQ==} engines: {node: '>=18'} cpu: [arm64] os: [linux] - '@esbuild/linux-arm@0.23.1': - resolution: {integrity: sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==} + '@esbuild/linux-arm@0.25.10': + resolution: {integrity: sha512-oR31GtBTFYCqEBALI9r6WxoU/ZofZl962pouZRTEYECvNF/dtXKku8YXcJkhgK/beU+zedXfIzHijSRapJY3vg==} engines: {node: '>=18'} cpu: [arm] os: [linux] - '@esbuild/linux-ia32@0.23.1': - resolution: {integrity: sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==} + '@esbuild/linux-ia32@0.25.10': + resolution: {integrity: sha512-NrSCx2Kim3EnnWgS4Txn0QGt0Xipoumb6z6sUtl5bOEZIVKhzfyp/Lyw4C1DIYvzeW/5mWYPBFJU3a/8Yr75DQ==} engines: {node: '>=18'} cpu: [ia32] os: [linux] - '@esbuild/linux-loong64@0.23.1': - resolution: {integrity: sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==} + '@esbuild/linux-loong64@0.25.10': + resolution: {integrity: sha512-xoSphrd4AZda8+rUDDfD9J6FUMjrkTz8itpTITM4/xgerAZZcFW7Dv+sun7333IfKxGG8gAq+3NbfEMJfiY+Eg==} engines: {node: '>=18'} cpu: [loong64] os: [linux] - '@esbuild/linux-mips64el@0.23.1': - resolution: {integrity: sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==} + '@esbuild/linux-mips64el@0.25.10': + resolution: {integrity: sha512-ab6eiuCwoMmYDyTnyptoKkVS3k8fy/1Uvq7Dj5czXI6DF2GqD2ToInBI0SHOp5/X1BdZ26RKc5+qjQNGRBelRA==} engines: {node: '>=18'} cpu: [mips64el] os: [linux] - '@esbuild/linux-ppc64@0.23.1': - resolution: {integrity: sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==} + '@esbuild/linux-ppc64@0.25.10': + resolution: {integrity: sha512-NLinzzOgZQsGpsTkEbdJTCanwA5/wozN9dSgEl12haXJBzMTpssebuXR42bthOF3z7zXFWH1AmvWunUCkBE4EA==} engines: {node: '>=18'} cpu: [ppc64] os: [linux] - '@esbuild/linux-riscv64@0.23.1': - resolution: {integrity: sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==} + '@esbuild/linux-riscv64@0.25.10': + resolution: {integrity: sha512-FE557XdZDrtX8NMIeA8LBJX3dC2M8VGXwfrQWU7LB5SLOajfJIxmSdyL/gU1m64Zs9CBKvm4UAuBp5aJ8OgnrA==} engines: {node: '>=18'} cpu: [riscv64] os: [linux] - '@esbuild/linux-s390x@0.23.1': - resolution: {integrity: sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==} + '@esbuild/linux-s390x@0.25.10': + resolution: {integrity: sha512-3BBSbgzuB9ajLoVZk0mGu+EHlBwkusRmeNYdqmznmMc9zGASFjSsxgkNsqmXugpPk00gJ0JNKh/97nxmjctdew==} engines: {node: '>=18'} cpu: [s390x] os: [linux] - '@esbuild/linux-x64@0.23.1': - resolution: {integrity: sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==} + '@esbuild/linux-x64@0.25.10': + resolution: {integrity: sha512-QSX81KhFoZGwenVyPoberggdW1nrQZSvfVDAIUXr3WqLRZGZqWk/P4T8p2SP+de2Sr5HPcvjhcJzEiulKgnxtA==} engines: {node: '>=18'} cpu: [x64] os: [linux] - '@esbuild/netbsd-x64@0.23.1': - resolution: {integrity: sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==} + '@esbuild/netbsd-arm64@0.25.10': + resolution: {integrity: sha512-AKQM3gfYfSW8XRk8DdMCzaLUFB15dTrZfnX8WXQoOUpUBQ+NaAFCP1kPS/ykbbGYz7rxn0WS48/81l9hFl3u4A==} + engines: {node: '>=18'} + cpu: [arm64] + os: [netbsd] + + '@esbuild/netbsd-x64@0.25.10': + resolution: {integrity: sha512-7RTytDPGU6fek/hWuN9qQpeGPBZFfB4zZgcz2VK2Z5VpdUxEI8JKYsg3JfO0n/Z1E/6l05n0unDCNc4HnhQGig==} engines: {node: '>=18'} cpu: [x64] os: [netbsd] - '@esbuild/openbsd-arm64@0.23.1': - resolution: {integrity: sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==} + '@esbuild/openbsd-arm64@0.25.10': + resolution: {integrity: sha512-5Se0VM9Wtq797YFn+dLimf2Zx6McttsH2olUBsDml+lm0GOCRVebRWUvDtkY4BWYv/3NgzS8b/UM3jQNh5hYyw==} engines: {node: '>=18'} cpu: [arm64] os: [openbsd] - '@esbuild/openbsd-x64@0.23.1': - resolution: {integrity: sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==} + '@esbuild/openbsd-x64@0.25.10': + resolution: {integrity: sha512-XkA4frq1TLj4bEMB+2HnI0+4RnjbuGZfet2gs/LNs5Hc7D89ZQBHQ0gL2ND6Lzu1+QVkjp3x1gIcPKzRNP8bXw==} engines: {node: '>=18'} cpu: [x64] os: [openbsd] - '@esbuild/sunos-x64@0.23.1': - resolution: {integrity: sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==} + '@esbuild/openharmony-arm64@0.25.10': + resolution: {integrity: sha512-AVTSBhTX8Y/Fz6OmIVBip9tJzZEUcY8WLh7I59+upa5/GPhh2/aM6bvOMQySspnCCHvFi79kMtdJS1w0DXAeag==} + engines: {node: '>=18'} + cpu: [arm64] + os: [openharmony] + + '@esbuild/sunos-x64@0.25.10': + resolution: {integrity: sha512-fswk3XT0Uf2pGJmOpDB7yknqhVkJQkAQOcW/ccVOtfx05LkbWOaRAtn5SaqXypeKQra1QaEa841PgrSL9ubSPQ==} engines: {node: '>=18'} cpu: [x64] os: [sunos] - '@esbuild/win32-arm64@0.23.1': - resolution: {integrity: sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==} + '@esbuild/win32-arm64@0.25.10': + resolution: {integrity: sha512-ah+9b59KDTSfpaCg6VdJoOQvKjI33nTaQr4UluQwW7aEwZQsbMCfTmfEO4VyewOxx4RaDT/xCy9ra2GPWmO7Kw==} engines: {node: '>=18'} cpu: [arm64] os: [win32] - '@esbuild/win32-ia32@0.23.1': - resolution: {integrity: sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==} + '@esbuild/win32-ia32@0.25.10': + resolution: {integrity: sha512-QHPDbKkrGO8/cz9LKVnJU22HOi4pxZnZhhA2HYHez5Pz4JeffhDjf85E57Oyco163GnzNCVkZK0b/n4Y0UHcSw==} engines: {node: '>=18'} cpu: [ia32] os: [win32] - '@esbuild/win32-x64@0.23.1': - resolution: {integrity: sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==} + '@esbuild/win32-x64@0.25.10': + resolution: {integrity: sha512-9KpxSVFCu0iK1owoez6aC/s/EdUQLDN3adTxGCqxMVhrPDj6bt5dbrHDXUuq+Bs2vATFBBrQS5vdQ/Ed2P+nbw==} engines: {node: '>=18'} cpu: [x64] os: [win32] @@ -222,6 +231,9 @@ packages: resolution: {integrity: sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + '@gerrit0/mini-shiki@3.13.0': + resolution: {integrity: sha512-mCrNvZNYNrwKer5PWLF6cOc0OEe2eKzgy976x+IT2tynwJYl+7UpHTSeXQJGijgTcoOf+f359L946unWlYRnsg==} + '@humanwhocodes/config-array@0.13.0': resolution: {integrity: sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==} engines: {node: '>=10.10.0'} @@ -254,6 +266,9 @@ packages: '@jridgewell/sourcemap-codec@1.5.0': resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==} + '@jridgewell/sourcemap-codec@1.5.5': + resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==} + '@jridgewell/trace-mapping@0.3.25': resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} @@ -261,9 +276,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'} @@ -284,119 +296,190 @@ packages: resolution: {integrity: sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==} engines: {node: '>= 8.0.0'} - '@rollup/rollup-android-arm-eabi@4.22.5': - resolution: {integrity: sha512-SU5cvamg0Eyu/F+kLeMXS7GoahL+OoizlclVFX3l5Ql6yNlywJJ0OuqTzUx0v+aHhPHEB/56CT06GQrRrGNYww==} + '@rollup/rollup-android-arm-eabi@4.52.3': + resolution: {integrity: sha512-h6cqHGZ6VdnwliFG1NXvMPTy/9PS3h8oLh7ImwR+kl+oYnQizgjxsONmmPSb2C66RksfkfIxEVtDSEcJiO0tqw==} cpu: [arm] os: [android] - '@rollup/rollup-android-arm64@4.22.5': - resolution: {integrity: sha512-S4pit5BP6E5R5C8S6tgU/drvgjtYW76FBuG6+ibG3tMvlD1h9LHVF9KmlmaUBQ8Obou7hEyS+0w+IR/VtxwNMQ==} + '@rollup/rollup-android-arm64@4.52.3': + resolution: {integrity: sha512-wd+u7SLT/u6knklV/ifG7gr5Qy4GUbH2hMWcDauPFJzmCZUAJ8L2bTkVXC2niOIxp8lk3iH/QX8kSrUxVZrOVw==} cpu: [arm64] os: [android] - '@rollup/rollup-darwin-arm64@4.22.5': - resolution: {integrity: sha512-250ZGg4ipTL0TGvLlfACkIxS9+KLtIbn7BCZjsZj88zSg2Lvu3Xdw6dhAhfe/FjjXPVNCtcSp+WZjVsD3a/Zlw==} + '@rollup/rollup-darwin-arm64@4.52.3': + resolution: {integrity: sha512-lj9ViATR1SsqycwFkJCtYfQTheBdvlWJqzqxwc9f2qrcVrQaF/gCuBRTiTolkRWS6KvNxSk4KHZWG7tDktLgjg==} cpu: [arm64] os: [darwin] - '@rollup/rollup-darwin-x64@4.22.5': - resolution: {integrity: sha512-D8brJEFg5D+QxFcW6jYANu+Rr9SlKtTenmsX5hOSzNYVrK5oLAEMTUgKWYJP+wdKyCdeSwnapLsn+OVRFycuQg==} + '@rollup/rollup-darwin-x64@4.52.3': + resolution: {integrity: sha512-+Dyo7O1KUmIsbzx1l+4V4tvEVnVQqMOIYtrxK7ncLSknl1xnMHLgn7gddJVrYPNZfEB8CIi3hK8gq8bDhb3h5A==} cpu: [x64] os: [darwin] - '@rollup/rollup-linux-arm-gnueabihf@4.22.5': - resolution: {integrity: sha512-PNqXYmdNFyWNg0ma5LdY8wP+eQfdvyaBAojAXgO7/gs0Q/6TQJVXAXe8gwW9URjbS0YAammur0fynYGiWsKlXw==} + '@rollup/rollup-freebsd-arm64@4.52.3': + resolution: {integrity: sha512-u9Xg2FavYbD30g3DSfNhxgNrxhi6xVG4Y6i9Ur1C7xUuGDW3banRbXj+qgnIrwRN4KeJ396jchwy9bCIzbyBEQ==} + cpu: [arm64] + os: [freebsd] + + '@rollup/rollup-freebsd-x64@4.52.3': + resolution: {integrity: sha512-5M8kyi/OX96wtD5qJR89a/3x5x8x5inXBZO04JWhkQb2JWavOWfjgkdvUqibGJeNNaz1/Z1PPza5/tAPXICI6A==} + cpu: [x64] + os: [freebsd] + + '@rollup/rollup-linux-arm-gnueabihf@4.52.3': + resolution: {integrity: sha512-IoerZJ4l1wRMopEHRKOO16e04iXRDyZFZnNZKrWeNquh5d6bucjezgd+OxG03mOMTnS1x7hilzb3uURPkJ0OfA==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm-musleabihf@4.22.5': - resolution: {integrity: sha512-kSSCZOKz3HqlrEuwKd9TYv7vxPYD77vHSUvM2y0YaTGnFc8AdI5TTQRrM1yIp3tXCKrSL9A7JLoILjtad5t8pQ==} + '@rollup/rollup-linux-arm-musleabihf@4.52.3': + resolution: {integrity: sha512-ZYdtqgHTDfvrJHSh3W22TvjWxwOgc3ThK/XjgcNGP2DIwFIPeAPNsQxrJO5XqleSlgDux2VAoWQ5iJrtaC1TbA==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.22.5': - resolution: {integrity: sha512-oTXQeJHRbOnwRnRffb6bmqmUugz0glXaPyspp4gbQOPVApdpRrY/j7KP3lr7M8kTfQTyrBUzFjj5EuHAhqH4/w==} + '@rollup/rollup-linux-arm64-gnu@4.52.3': + resolution: {integrity: sha512-NcViG7A0YtuFDA6xWSgmFb6iPFzHlf5vcqb2p0lGEbT+gjrEEz8nC/EeDHvx6mnGXnGCC1SeVV+8u+smj0CeGQ==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-musl@4.22.5': - resolution: {integrity: sha512-qnOTIIs6tIGFKCHdhYitgC2XQ2X25InIbZFor5wh+mALH84qnFHvc+vmWUpyX97B0hNvwNUL4B+MB8vJvH65Fw==} + '@rollup/rollup-linux-arm64-musl@4.52.3': + resolution: {integrity: sha512-d3pY7LWno6SYNXRm6Ebsq0DJGoiLXTb83AIPCXl9fmtIQs/rXoS8SJxxUNtFbJ5MiOvs+7y34np77+9l4nfFMw==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-powerpc64le-gnu@4.22.5': - resolution: {integrity: sha512-TMYu+DUdNlgBXING13rHSfUc3Ky5nLPbWs4bFnT+R6Vu3OvXkTkixvvBKk8uO4MT5Ab6lC3U7x8S8El2q5o56w==} + '@rollup/rollup-linux-loong64-gnu@4.52.3': + resolution: {integrity: sha512-3y5GA0JkBuirLqmjwAKwB0keDlI6JfGYduMlJD/Rl7fvb4Ni8iKdQs1eiunMZJhwDWdCvrcqXRY++VEBbvk6Eg==} + cpu: [loong64] + os: [linux] + + '@rollup/rollup-linux-ppc64-gnu@4.52.3': + resolution: {integrity: sha512-AUUH65a0p3Q0Yfm5oD2KVgzTKgwPyp9DSXc3UA7DtxhEb/WSPfbG4wqXeSN62OG5gSo18em4xv6dbfcUGXcagw==} cpu: [ppc64] os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.22.5': - resolution: {integrity: sha512-PTQq1Kz22ZRvuhr3uURH+U/Q/a0pbxJoICGSprNLAoBEkyD3Sh9qP5I0Asn0y0wejXQBbsVMRZRxlbGFD9OK4A==} + '@rollup/rollup-linux-riscv64-gnu@4.52.3': + resolution: {integrity: sha512-1makPhFFVBqZE+XFg3Dkq+IkQ7JvmUrwwqaYBL2CE+ZpxPaqkGaiWFEWVGyvTwZace6WLJHwjVh/+CXbKDGPmg==} cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-s390x-gnu@4.22.5': - resolution: {integrity: sha512-bR5nCojtpuMss6TDEmf/jnBnzlo+6n1UhgwqUvRoe4VIotC7FG1IKkyJbwsT7JDsF2jxR+NTnuOwiGv0hLyDoQ==} + '@rollup/rollup-linux-riscv64-musl@4.52.3': + resolution: {integrity: sha512-OOFJa28dxfl8kLOPMUOQBCO6z3X2SAfzIE276fwT52uXDWUS178KWq0pL7d6p1kz7pkzA0yQwtqL0dEPoVcRWg==} + cpu: [riscv64] + os: [linux] + + '@rollup/rollup-linux-s390x-gnu@4.52.3': + resolution: {integrity: sha512-jMdsML2VI5l+V7cKfZx3ak+SLlJ8fKvLJ0Eoa4b9/vCUrzXKgoKxvHqvJ/mkWhFiyp88nCkM5S2v6nIwRtPcgg==} cpu: [s390x] os: [linux] - '@rollup/rollup-linux-x64-gnu@4.22.5': - resolution: {integrity: sha512-N0jPPhHjGShcB9/XXZQWuWBKZQnC1F36Ce3sDqWpujsGjDz/CQtOL9LgTrJ+rJC8MJeesMWrMWVLKKNR/tMOCA==} + '@rollup/rollup-linux-x64-gnu@4.52.3': + resolution: {integrity: sha512-tPgGd6bY2M2LJTA1uGq8fkSPK8ZLYjDjY+ZLK9WHncCnfIz29LIXIqUgzCR0hIefzy6Hpbe8Th5WOSwTM8E7LA==} cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-musl@4.22.5': - resolution: {integrity: sha512-uBa2e28ohzNNwjr6Uxm4XyaA1M/8aTgfF2T7UIlElLaeXkgpmIJ2EitVNQxjO9xLLLy60YqAgKn/AqSpCUkE9g==} + '@rollup/rollup-linux-x64-musl@4.52.3': + resolution: {integrity: sha512-BCFkJjgk+WFzP+tcSMXq77ymAPIxsX9lFJWs+2JzuZTLtksJ2o5hvgTdIcZ5+oKzUDMwI0PfWzRBYAydAHF2Mw==} cpu: [x64] os: [linux] - '@rollup/rollup-win32-arm64-msvc@4.22.5': - resolution: {integrity: sha512-RXT8S1HP8AFN/Kr3tg4fuYrNxZ/pZf1HemC5Tsddc6HzgGnJm0+Lh5rAHJkDuW3StI0ynNXukidROMXYl6ew8w==} + '@rollup/rollup-openharmony-arm64@4.52.3': + resolution: {integrity: sha512-KTD/EqjZF3yvRaWUJdD1cW+IQBk4fbQaHYJUmP8N4XoKFZilVL8cobFSTDnjTtxWJQ3JYaMgF4nObY/+nYkumA==} + cpu: [arm64] + os: [openharmony] + + '@rollup/rollup-win32-arm64-msvc@4.52.3': + resolution: {integrity: sha512-+zteHZdoUYLkyYKObGHieibUFLbttX2r+58l27XZauq0tcWYYuKUwY2wjeCN9oK1Um2YgH2ibd6cnX/wFD7DuA==} cpu: [arm64] os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.22.5': - resolution: {integrity: sha512-ElTYOh50InL8kzyUD6XsnPit7jYCKrphmddKAe1/Ytt74apOxDq5YEcbsiKs0fR3vff3jEneMM+3I7jbqaMyBg==} + '@rollup/rollup-win32-ia32-msvc@4.52.3': + resolution: {integrity: sha512-of1iHkTQSo3kr6dTIRX6t81uj/c/b15HXVsPcEElN5sS859qHrOepM5p9G41Hah+CTqSh2r8Bm56dL2z9UQQ7g==} cpu: [ia32] os: [win32] - '@rollup/rollup-win32-x64-msvc@4.22.5': - resolution: {integrity: sha512-+lvL/4mQxSV8MukpkKyyvfwhH266COcWlXE/1qxwN08ajovta3459zrjLghYMgDerlzNwLAcFpvU+WWE5y6nAQ==} + '@rollup/rollup-win32-x64-gnu@4.52.3': + resolution: {integrity: sha512-s0hybmlHb56mWVZQj8ra9048/WZTPLILKxcvcq+8awSZmyiSUZjjem1AhU3Tf4ZKpYhK4mg36HtHDOe8QJS5PQ==} + cpu: [x64] + os: [win32] + + '@rollup/rollup-win32-x64-msvc@4.52.3': + resolution: {integrity: sha512-zGIbEVVXVtauFgl3MRwGWEN36P5ZGenHRMgNw88X5wEhEBpq0XrMEZwOn07+ICrwM17XO5xfMZqh0OldCH5VTA==} cpu: [x64] os: [win32] + '@shikijs/engine-oniguruma@3.13.0': + resolution: {integrity: sha512-O42rBGr4UDSlhT2ZFMxqM7QzIU+IcpoTMzb3W7AlziI1ZF7R8eS2M0yt5Ry35nnnTX/LTLXFPUjRFCIW+Operg==} + + '@shikijs/langs@3.13.0': + resolution: {integrity: sha512-672c3WAETDYHwrRP0yLy3W1QYB89Hbpj+pO4KhxK6FzIrDI2FoEXNiNCut6BQmEApYLfuYfpgOZaqbY+E9b8wQ==} + + '@shikijs/themes@3.13.0': + resolution: {integrity: sha512-Vxw1Nm1/Od8jyA7QuAenaV78BG2nSr3/gCGdBkLpfLscddCkzkL36Q5b67SrLLfvAJTOUzW39x4FHVCFriPVgg==} + + '@shikijs/types@3.13.0': + resolution: {integrity: sha512-oM9P+NCFri/mmQ8LoFGVfVyemm5Hi27330zuOBp0annwJdKH1kOLndw3zCtAVDehPLg9fKqoEx3Ht/wNZxolfw==} + + '@shikijs/vscode-textmate@10.0.2': + resolution: {integrity: sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==} + '@sindresorhus/merge-streams@2.3.0': resolution: {integrity: sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==} engines: {node: '>=18'} - '@solana/accounts@2.0.0-preview.3': - resolution: {integrity: sha512-30GCO7SF3VRYqsumfCTW4bJ1fK67KwX62ZSi6nlU3+6ni4ZmmCT4jPYcqoBgO1kUzDJ4UORNeh/PbdFfbCA0FA==} + '@solana/accounts@3.0.3': + resolution: {integrity: sha512-KqlePrlZaHXfu8YQTCxN204ZuVm9o68CCcUr6l27MG2cuRUtEM1Ta0iR8JFkRUAEfZJC4Cu0ZDjK/v49loXjZQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/addresses@2.0.0-preview.3': - resolution: {integrity: sha512-JjiPOsVddQibd9EdzYEOiZtMSeveNHI7R6s9UADWVMvlIAqN9+uACficM0/XAdZmycZnvqKzS+Io0CNJClofUA==} + '@solana/addresses@3.0.3': + resolution: {integrity: sha512-AuMwKhJI89ANqiuJ/fawcwxNKkSeHH9CApZd2xelQQLS7X8uxAOovpcmEgiObQuiVP944s9ScGUT62Bdul9qYg==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/assertions@2.0.0-preview.3': - resolution: {integrity: sha512-K8ZwlDwuVJKeKOggejy524UoaTDGk6sthW1KvEQXOkIPqJdtST3I9Rco4Xh4hL2w/RnhKXqsQUa3bg+if2ifEg==} + '@solana/assertions@3.0.3': + resolution: {integrity: sha512-2qspxdbWp2y62dfCIlqeWQr4g+hE8FYSSwcaP6itwMwGRb8393yDGCJfI/znuzJh6m/XVWhMHIgFgsBwnevCmg==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/codecs-core@2.0.0-preview.3': - resolution: {integrity: sha512-xQz6USSBs82lUNoVa/wwnm6wa2y2eWtGwPLUwF/NOGGpR+QH9EODijXvJ8wuC9llyqerqdC+5mrmx9C8VSMNYg==} + '@solana/codecs-core@3.0.3': + resolution: {integrity: sha512-emKykJ3h1DmnDOY29Uv9eJXP8E/FHzvlUBJ6te+5EbKdFjj7vdlKYPfDxOI6iGdXTY+YC/ELtbNBh6QwF2uEDQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/codecs-data-structures@2.0.0-preview.3': - resolution: {integrity: sha512-PfXvZCf9qDF+Dv4WG6cb4xZoY9tj117bmZWS17iKimuNSsvuFSHpzERy0mmX2hwYEAM4CnQBd/9dgx+eAeMAsg==} + '@solana/codecs-data-structures@3.0.3': + resolution: {integrity: sha512-R15cLp8riJvToXziW8lP6AMSwsztGhEnwgyGmll32Mo0Yjq+hduW2/fJrA/TJs6tA/OgTzMQjlxgk009EqZHCw==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/codecs-numbers@2.0.0-preview.3': - resolution: {integrity: sha512-cjsHexVAj4GveDtG0+WjW121TKMbWN7AkOvGlf1qauOJgzJvX3V7KXHWuEg8wGGfRiLiXKEgh7KieQiB17EI3Q==} + '@solana/codecs-numbers@3.0.3': + resolution: {integrity: sha512-pfXkH9J0glrM8qj6389GAn30+cJOxzXLR2FsPOHCUMXrqLhGjMMZAWhsQkpOQ37SGc/7EiQsT/gmyGC7gxHqJQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/codecs-strings@2.0.0-preview.3': - resolution: {integrity: sha512-CUij3XgdoqbrEYncyy+kHCIXRHjqkcjiyJhf4hWVjMXM5nu2jreehhBiLFHFjlFw2U3vp1gig5QNxji8SjpQzw==} + '@solana/codecs-strings@3.0.3': + resolution: {integrity: sha512-VHBXnnTVtcQ1j+7Vrz+qSYo38no+jiHRdGnhFspRXEHNJbllzwKqgBE7YN3qoIXH+MKxgJUcwO5KHmdzf8Wn2A==} + engines: {node: '>=20.18.0'} peerDependencies: fastestsmallesttextencoderdecoder: ^1.0.22 + typescript: '>=5.3.3' - '@solana/codecs@2.0.0-preview.3': - resolution: {integrity: sha512-uB0GMAY1VrNoJxZ9S4F1RBL57gI+8YwxnV9DD5EP5rU8iD7Wq4wbaB2IPcENyJi7rmzytIjKJg0MI6i2bBr+0w==} + '@solana/codecs@3.0.3': + resolution: {integrity: sha512-GOHwTlIQsCoJx9Ryr6cEf0FHKAQ7pY4aO4xgncAftrv0lveTQ1rPP2inQ1QT0gJllsIa8nwbfXAADs9nNJxQDA==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/errors@2.0.0-preview.3': - resolution: {integrity: sha512-IZAUMcKaV3Hn0QTfzlGmVsDaH1mVUq0uURJi+tm8K3n37cKrvXyS2GQsHtIMRaLdOVp1IbTtIc5YF3+qATlpyw==} + '@solana/errors@3.0.3': + resolution: {integrity: sha512-1l84xJlHNva6io62PcYfUamwWlc0eM95nHgCrKX0g0cLoC6D6QHYPCEbEVkR+C5UtP9JDgyQM8MFiv+Ei5tO9Q==} + engines: {node: '>=20.18.0'} hasBin: true + peerDependencies: + typescript: '>=5.3.3' '@solana/eslint-config-solana@3.0.4': resolution: {integrity: sha512-G8n9zIz3MOwkj0+l0G6UZqvIM8ifJuNI0vvkhbOPDcif/T42hK0phgb+Lvo8RhQetusCWIUj+4lWUBJWk76O2w==} @@ -411,92 +494,193 @@ packages: eslint-plugin-typescript-sort-keys: ^3.2.0 typescript: ^5.1.6 - '@solana/fast-stable-stringify@2.0.0-preview.3': - resolution: {integrity: sha512-JBx++3mFJ6WwvMtn6sZihtSicbD2pIP95tJ4hP2go18p6e2gFWRDpAmicKHhg0AT3qSkD6HdpfXtth+OQNnI2A==} + '@solana/fast-stable-stringify@3.0.3': + resolution: {integrity: sha512-ED0pxB6lSEYvg+vOd5hcuQrgzEDnOrURFgp1ZOY+lQhJkQU6xo+P829NcJZQVP1rdU2/YQPAKJKEseyfe9VMIw==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' + + '@solana/functional@3.0.3': + resolution: {integrity: sha512-2qX1kKANn8995vOOh5S9AmF4ItGZcfbny0w28Eqy8AFh+GMnSDN4gqpmV2LvxBI9HibXZptGH3RVOMk82h1Mpw==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' + + '@solana/instruction-plans@3.0.3': + resolution: {integrity: sha512-eqoaPtWtmLTTpdvbt4BZF5H6FIlJtXi9H7qLOM1dLYonkOX2Ncezx5NDCZ9tMb2qxVMF4IocYsQnNSnMfjQF1w==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' + + '@solana/instructions@3.0.3': + resolution: {integrity: sha512-4csIi8YUDb5j/J+gDzmYtOvq7ZWLbCxj4t0xKn+fPrBk/FD2pK29KVT3Fu7j4Lh1/ojunQUP9X4NHwUexY3PnA==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' + + '@solana/keys@3.0.3': + resolution: {integrity: sha512-tp8oK9tMadtSIc4vF4aXXWkPd4oU5XPW8nf28NgrGDWGt25fUHIydKjkf2hPtMt9i1WfRyQZ33B5P3dnsNqcPQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' + + '@solana/kit@3.0.3': + resolution: {integrity: sha512-CEEhCDmkvztd1zbgADsEQhmj9GyWOOGeW1hZD+gtwbBSF5YN1uofS/pex5MIh/VIqKRj+A2UnYWI1V+9+q/lyQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/functional@2.0.0-preview.3': - resolution: {integrity: sha512-Zf305CAzEPRcaGLQdXq9SilxBnPcbUQk46jztOpkNzNMqL4Ipw7sIYHdbn/O+RhM2d7mDnthz2IGcYVyMaseKg==} + '@solana/nominal-types@3.0.3': + resolution: {integrity: sha512-aZavCiexeUAoMHRQg4s1AHkH3wscbOb70diyfjhwZVgFz1uUsFez7csPp9tNFkNolnadVb2gky7yBk3IImQJ6A==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/instructions@2.0.0-preview.3': - resolution: {integrity: sha512-P6Nkt++I/Ph7DFluVDAlgEYtFLtcvGFhRnqEa/BkkzRjbl28+HyDKRXcUPkP3o00+zuAqPjJ08qRxjywBOHPxg==} + '@solana/options@3.0.3': + resolution: {integrity: sha512-jarsmnQ63RN0JPC5j9sgUat07NrL9PC71XU7pUItd6LOHtu4+wJMio3l5mT0DHVfkfbFLL6iI6+QmXSVhTNF3g==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/keys@2.0.0-preview.3': - resolution: {integrity: sha512-TwQ0MQCafbKy277tDl4Q0CbIVuGAcd7NnlnrGXakhgNgO47N+vkEBhP+Zdw6YHWZwnuc30kdcXlaXSXPAMP2jQ==} + '@solana/programs@3.0.3': + resolution: {integrity: sha512-JZlVE3/AeSNDuH3aEzCZoDu8GTXkMpGXxf93zXLzbxfxhiQ/kHrReN4XE/JWZ/uGWbaFZGR5B3UtdN2QsoZL7w==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/options@2.0.0-preview.3': - resolution: {integrity: sha512-tT5O1CCJVE+rzo4VeeivYLNUL4L/2BjIeiy0MRh04lPxieiR346vUOPC1uCWGD6WqyTOOVUL0tsY4saYLmCTtA==} + '@solana/promises@3.0.3': + resolution: {integrity: sha512-K+UflGBVxj30XQMHTylHHZJdKH5QG3oj5k2s42GrZ/Wbu72oapVJySMBgpK45+p90t8/LEqV6rRPyTXlet9J+Q==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/programs@2.0.0-preview.3': - resolution: {integrity: sha512-lGbXyAdoSu9a6GjMK34fUvm2id8dFY++ktOnOfJ9hiJ6JS9nK1CKzJUDNRESdF8B/y9t8Es4YzxF0VlDFy9QnQ==} + '@solana/rpc-api@3.0.3': + resolution: {integrity: sha512-Yym9/Ama62OY69rAZgbOCAy1QlqaWAyb0VlqFuwSaZV1pkFCCFSwWEJEsiN1n8pb2ZP+RtwNvmYixvWizx9yvA==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/rpc-api@2.0.0-preview.3': - resolution: {integrity: sha512-L6AQBPzR1n45tk2t0ROp4XPSUFQTPv2jjb6LwIkn/+ocrmzLgfvMA4EfYG3TqdLkDQqouN7Z5H/k3u7g0Tt6Fg==} + '@solana/rpc-parsed-types@3.0.3': + resolution: {integrity: sha512-/koM05IM2fU91kYDQxXil3VBNlOfcP+gXE0js1sdGz8KonGuLsF61CiKB5xt6u1KEXhRyDdXYLjf63JarL4Ozg==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/rpc-parsed-types@2.0.0-preview.3': - resolution: {integrity: sha512-FCGDUUM4rNTwoXGVNZ1m94f5piKY0xuTEFevUsrzHV+gdNQT57JoA6riz0tcdWJQ8vkYdh5oZSrnngxRfhrevg==} + '@solana/rpc-spec-types@3.0.3': + resolution: {integrity: sha512-A6Jt8SRRetnN3CeGAvGJxigA9zYRslGgWcSjueAZGvPX+MesFxEUjSWZCfl+FogVFvwkqfkgQZQbPAGZQFJQ6Q==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/rpc-spec-types@2.0.0-preview.3': - resolution: {integrity: sha512-u56NbeoYpBc1ingOT6Fu5nIDYoNfF0wbzCXA7X2iCv6qOTf2gI6yP18OZHDbxB1QWTrd+cgeCC79ZZGuN1oXng==} + '@solana/rpc-spec@3.0.3': + resolution: {integrity: sha512-MZn5/8BebB6MQ4Gstw6zyfWsFAZYAyLzMK+AUf/rSfT8tPmWiJ/mcxnxqOXvFup/l6D67U8pyGpIoFqwCeZqqA==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/rpc-spec@2.0.0-preview.3': - resolution: {integrity: sha512-WA7L3v5CPNuhtyaQSQWJ9DI6VRLIxm7uyKbiaFQLSd6XGRq/4aJTICwklftqyKgKRnLoXfbFth0y1ddlboCnrg==} + '@solana/rpc-subscriptions-api@3.0.3': + resolution: {integrity: sha512-MGgVK3PUS15qsjuhimpzGZrKD/CTTvS0mAlQ0Jw84zsr1RJVdQJK/F0igu07BVd172eTZL8d90NoAQ3dahW5pA==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/rpc-subscriptions-api@2.0.0-preview.3': - resolution: {integrity: sha512-DVc17PVRTtrq2Y4B/KoOq5MpvQsmD4qijfv6rauZS9j/1Zp/ifNv3wlQT1ZPR5D7O3iG7YrZ9pPr8G/xUvhR7w==} + '@solana/rpc-subscriptions-channel-websocket@3.0.3': + resolution: {integrity: sha512-zUzUlb8Cwnw+SHlsLrSqyBRtOJKGc+FvSNJo/vWAkLShoV0wUDMPv7VvhTngJx3B/3ANfrOZ4i08i9QfYPAvpQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' + ws: ^8.18.0 - '@solana/rpc-subscriptions-spec@2.0.0-preview.3': - resolution: {integrity: sha512-hdZJzcJe6qWW1lOP2scmsByh0D6D88PUI8MHbvJPvJcN2YtH05NTkA4zZERpn71YC8kLmEz7yYRncb1YgGeLCg==} + '@solana/rpc-subscriptions-spec@3.0.3': + resolution: {integrity: sha512-9KpQ32OBJWS85mn6q3gkM0AjQe1LKYlMU7gpJRrla/lvXxNLhI95tz5K6StctpUreVmRWTVkNamHE69uUQyY8A==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/rpc-subscriptions-transport-websocket@2.0.0-preview.3': - resolution: {integrity: sha512-lDdS8tZRssobOsWNlB46hTqP755ddIRwI9l6B3b16pORxKhWbKav5+9VMs81hJi8NIE8Yidy90NqrIgXnkavAw==} + '@solana/rpc-subscriptions@3.0.3': + resolution: {integrity: sha512-LRvz6NaqvtsYFd32KwZ+rwYQ9XCs+DWjV8BvBLsJpt9/NWSuHf/7Sy/vvP6qtKxut692H/TMvHnC4iulg0WmiQ==} + engines: {node: '>=20.18.0'} peerDependencies: - ws: ^8.14.0 + typescript: '>=5.3.3' - '@solana/rpc-subscriptions@2.0.0-preview.3': - resolution: {integrity: sha512-TDMrA1io0ch2OlhM6ZU1hDPYl8v4uXdiqb1oC2YsRkP8Ee6hFSroYk21WEbM0ozlTmJslr4pEEM2eFKB8kPR7A==} + '@solana/rpc-transformers@3.0.3': + resolution: {integrity: sha512-lzdaZM/dG3s19Tsk4mkJA5JBoS1eX9DnD7z62gkDwrwJDkDBzkAJT9aLcsYFfTmwTfIp6uU2UPgGYc97i1wezw==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/rpc-transformers@2.0.0-preview.3': - resolution: {integrity: sha512-6JdtzomieglDGrktDywCc5C+jjnailrrlEiS8+6aoysVkvFFBWBS+er/jr0U7MI3v3khcAXokkzHePc+yC2jOg==} + '@solana/rpc-transport-http@3.0.3': + resolution: {integrity: sha512-bIXFwr2LR5A97Z46dI661MJPbHnPfcShBjFzOS/8Rnr8P4ho3j/9EUtjDrsqoxGJT3SLWj5OlyXAlaDAvVTOUQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/rpc-transport-http@2.0.0-preview.3': - resolution: {integrity: sha512-mv6aK9aQ85lE0bMH+V9nU0HU5S7vCn3P805sEl+UPEVzZ/P74VWYZSx13hf/+0uirXG84Qx6GGpmY1nMAKn8DA==} + '@solana/rpc-types@3.0.3': + resolution: {integrity: sha512-petWQ5xSny9UfmC3Qp2owyhNU0w9SyBww4+v7tSVyXMcCC9v6j/XsqTeimH1S0qQUllnv0/FY83ohFaxofmZ6Q==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/rpc-types@2.0.0-preview.3': - resolution: {integrity: sha512-c58YHqG92BqElH0ISXnh1nKDEr1fg0K4g6Z+HjadbvBp45P3iPwCrS4nbGMzNrKgk6YoGWixSQYzw1Tg7vQs6A==} + '@solana/rpc@3.0.3': + resolution: {integrity: sha512-3oukAaLK78GegkKcm6iNmRnO4mFeNz+BMvA8T56oizoBNKiRVEq/6DFzVX/LkmZ+wvD601pAB3uCdrTPcC0YKQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/rpc@2.0.0-preview.3': - resolution: {integrity: sha512-cMqaILF1R/L71f1WVWKMP8mhkZKuHTo0wSbya2BZwK+6Kw4PngHNyjEzshej5NO0E72RhaXFdFzs3L7ezNiG2g==} + '@solana/signers@3.0.3': + resolution: {integrity: sha512-UwCd/uPYTZiwd283JKVyOWLLN5sIgMBqGDyUmNU3vo9hcmXKv5ZGm/9TvwMY2z35sXWuIOcj7etxJ8OoWc/ObQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/signers@2.0.0-preview.3': - resolution: {integrity: sha512-j9k8KrivoFMxuNk9+vgDxRLXQzC+ZwDzUntfqaNhg6T6TqIiT9NITrQO5SqDfv1/Rj1nw+JLrtl8S1nrYR9w/A==} + '@solana/subscribable@3.0.3': + resolution: {integrity: sha512-FJ27LKGHLQ5GGttPvTOLQDLrrOZEgvaJhB7yYaHAhPk25+p+erBaQpjePhfkMyUbL1FQbxn1SUJmS6jUuaPjlQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/transaction-confirmation@2.0.0-preview.3': - resolution: {integrity: sha512-QCd1NutYo1kL7rUBxEQK1tM4OfdeOH6SzMY4luANduGzrPDOEnK1taatzNybZrrDt1VBz21N7ke2/WdQlKvMVg==} + '@solana/sysvars@3.0.3': + resolution: {integrity: sha512-GnHew+QeKCs2f9ow+20swEJMH4mDfJA/QhtPgOPTYQx/z69J4IieYJ7fZenSHnA//lJ45fVdNdmy1trypvPLBQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/transaction-messages@2.0.0-preview.3': - resolution: {integrity: sha512-8nfSMUe9L3CmD7D5iNVe4A9lu7d20OG5w1LhkkJNXpvenmK4IQ9WlwjWjD7gR+MzVgywICgPbw+e8FwTUFCKog==} + '@solana/transaction-confirmation@3.0.3': + resolution: {integrity: sha512-dXx0OLtR95LMuARgi2dDQlL1QYmk56DOou5q9wKymmeV3JTvfDExeWXnOgjRBBq/dEfj4ugN1aZuTaS18UirFw==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/transactions@2.0.0-preview.3': - resolution: {integrity: sha512-OJ7GDzWb/eA9iFNh1hYOn9tuiZqzIr1NDLQktOdR1DeiCAGrnuweEWLLYHCA1QyZ5J/X50lX8lasMFXYtzt6zA==} + '@solana/transaction-messages@3.0.3': + resolution: {integrity: sha512-s+6NWRnBhnnjFWV4x2tzBzoWa6e5LiIxIvJlWwVQBFkc8fMGY04w7jkFh0PM08t/QFKeXBEWkyBDa/TFYdkWug==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/web3.js@2.0.0-preview.3': - resolution: {integrity: sha512-BivbEWn49waNJV3FLlyd9mYsm960snRZbj+i8PVKbYTVOejLeKyI7KEfUnz+BwbFQl+35PEO3CUp/xpdca3KOA==} + '@solana/transactions@3.0.3': + resolution: {integrity: sha512-iMX+n9j4ON7H1nKlWEbMqMOpKYC6yVGxKKmWHT1KdLRG7v+03I4DnDeFoI+Zmw56FA+7Bbne8jwwX60Q1vk/MQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' - '@solana/webcrypto-ed25519-polyfill@2.0.0-preview.3': - resolution: {integrity: sha512-MaV4swf8QJr+H7BVr9hJiZxn/nWedvCMSJB53GtHse5/EC+STdBMzfELICKXiQtycWC5V4vC9LKTOHIjx2zXhg==} + '@types/estree@1.0.8': + resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==} - '@types/estree@1.0.6': - resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==} + '@types/hast@3.0.4': + resolution: {integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==} '@types/json-schema@7.0.15': resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} - '@types/node@20.16.10': - resolution: {integrity: sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA==} + '@types/node@24.6.2': + resolution: {integrity: sha512-d2L25Y4j+W3ZlNAeMKcy7yDsK425ibcAOO2t7aPTz6gNMH0z2GThtwENCDc0d/Pw9wgyRqE5Px1wkV7naz8ang==} '@types/semver@7.5.8': resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==} + '@types/unist@3.0.3': + resolution: {integrity: sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==} + '@typescript-eslint/eslint-plugin@7.18.0': resolution: {integrity: sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==} engines: {node: ^18.18.0 || >=20.0.0} @@ -623,6 +807,11 @@ packages: engines: {node: '>=0.4.0'} hasBin: true + acorn@8.15.0: + resolution: {integrity: sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==} + engines: {node: '>=0.4.0'} + hasBin: true + agent-base@6.0.2: resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} engines: {node: '>= 6.0.0'} @@ -638,9 +827,6 @@ packages: resolution: {integrity: sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==} engines: {node: '>=12'} - ansi-sequence-parser@1.1.1: - resolution: {integrity: sha512-vJXt3yiaUL4UU546s3rPXlsry/RnM730G1+HkpKE012AN0sx1eOrxSu95oKDIonskeLTijMgqWZ3uDEe3NFvyg==} - ansi-styles@4.3.0: resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} engines: {node: '>=8'} @@ -652,10 +838,6 @@ packages: any-promise@1.3.0: resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==} - anymatch@3.1.3: - resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==} - engines: {node: '>= 8'} - aproba@2.0.0: resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==} @@ -702,10 +884,6 @@ packages: balanced-match@1.0.2: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} - binary-extensions@2.3.0: - resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==} - engines: {node: '>=8'} - bindings@1.5.0: resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==} @@ -722,8 +900,8 @@ packages: resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} engines: {node: '>=8'} - bundle-require@5.0.0: - resolution: {integrity: sha512-GuziW3fSSmopcx4KRymQEJVbZUfqlCqcq7dvs6TYwKRZiegK/2buMxQTPs6MGlNv50wms1699qYO54R8XfRX4w==} + bundle-require@5.1.0: + resolution: {integrity: sha512-3WrrOuZiyaaZPWiEt4G3+IffISVC9HYlWueJEBWED4ZH4aIAC2PnkdnuRrR94M+w6yGWn4AglWtJtBI8YqvgoA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} peerDependencies: esbuild: '>=0.18' @@ -752,9 +930,13 @@ packages: resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==} engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} - chokidar@3.6.0: - resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} - engines: {node: '>= 8.10.0'} + chalk@5.6.2: + resolution: {integrity: sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==} + engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} + + chokidar@4.0.3: + resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==} + engines: {node: '>= 14.16.0'} chownr@2.0.0: resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} @@ -793,9 +975,9 @@ packages: resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==} hasBin: true - commander@12.1.0: - resolution: {integrity: sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==} - engines: {node: '>=18'} + commander@14.0.0: + resolution: {integrity: sha512-2uM9rYjPvyq39NwLRqaiLtWHyDC1FvryJDa2ATTVims5YAS4PupsEQsDvP14FqhFr0P49CYDugi59xaxJlTXRA==} + engines: {node: '>=20'} commander@4.1.1: resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==} @@ -811,8 +993,11 @@ packages: resolution: {integrity: sha512-OAcsnTEYu1ARJqWVGwf4zh4JDfHZEaSNlNccFmt8YjB2l/n19/PF2viLINHc57vO4FKIAFl2FWASIGZZWZ2Kxw==} engines: {node: '>=10.18.0 <11 || >=12.14.0 <13 || >=14'} - consola@3.2.3: - resolution: {integrity: sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==} + confbox@0.1.8: + resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==} + + consola@3.4.2: + resolution: {integrity: sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA==} engines: {node: ^14.18.0 || >=16.10.0} console-control-strings@1.1.0: @@ -843,6 +1028,15 @@ packages: supports-color: optional: true + debug@4.4.3: + resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + deep-is@0.1.4: resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==} @@ -877,8 +1071,12 @@ packages: emoji-regex@9.2.2: resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==} - esbuild@0.23.1: - resolution: {integrity: sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==} + entities@4.5.0: + resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} + engines: {node: '>=0.12'} + + esbuild@0.25.10: + resolution: {integrity: sha512-9RiGKvCwaqxO2owP61uQ4BgNborAQskMR6QusfWzQqv7AZOg5oGehdY2pRJMTKuwxd1IDBP4rSbI5lHzU7SMsQ==} engines: {node: '>=18'} hasBin: true @@ -991,10 +1189,6 @@ packages: resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==} engines: {node: '>=0.10.0'} - execa@5.1.1: - resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==} - engines: {node: '>=10'} - execa@7.2.0: resolution: {integrity: sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==} engines: {node: ^14.18.0 || ^16.14.0 || >=18.0.0} @@ -1021,8 +1215,9 @@ packages: fastq@1.17.1: resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==} - fdir@6.4.0: - resolution: {integrity: sha512-3oB133prH1o4j/L5lLW7uOCF1PlD+/It2L0eL/iAqWMB91RBbqTewABqxhj0ibBd90EEmWZq7ntIWzVaWcXTGQ==} + fdir@6.5.0: + resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==} + engines: {node: '>=12.0.0'} peerDependencies: picomatch: ^3 || ^4 peerDependenciesMeta: @@ -1052,6 +1247,9 @@ packages: resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==} engines: {node: '>=10'} + fix-dts-default-cjs-exports@1.0.1: + resolution: {integrity: sha512-pVIECanWFC61Hzl2+oOCtoJ3F17kglZC/6N94eRWycFgBH35hHx0Li604ZIzhseh97mf2p0cv7vVrOZGoqhlEg==} + flat-cache@3.2.0: resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==} engines: {node: ^10.12.0 || >=12.0.0} @@ -1137,10 +1335,6 @@ packages: resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==} engines: {node: '>= 6'} - human-signals@2.1.0: - resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==} - engines: {node: '>=10.17.0'} - human-signals@4.3.1: resolution: {integrity: sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==} engines: {node: '>=14.18.0'} @@ -1176,10 +1370,6 @@ packages: resolution: {integrity: sha512-1ANGLZ+Nkv1ptFb2pa8oG8Lem4krflKuX/gINiHJHjJUKaJHk/SXk5x6K3J+39/p0h1RQ2saROclJJ+QLvETCQ==} engines: {node: '>=8'} - is-binary-path@2.1.0: - resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} - engines: {node: '>=8'} - is-extglob@2.1.1: resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==} engines: {node: '>=0.10.0'} @@ -1211,10 +1401,6 @@ packages: is-promise@4.0.0: resolution: {integrity: sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==} - is-stream@2.0.1: - resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==} - engines: {node: '>=8'} - is-stream@3.0.0: resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -1257,9 +1443,6 @@ packages: json-stable-stringify-without-jsonify@1.0.1: resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==} - jsonc-parser@3.3.1: - resolution: {integrity: sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==} - keyv@4.5.4: resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==} @@ -1274,6 +1457,9 @@ packages: lines-and-columns@1.2.4: resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} + linkify-it@5.0.0: + resolution: {integrity: sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==} + load-json-file@7.0.1: resolution: {integrity: sha512-Gnxj3ev3mB5TkVBGad0JM6dmLiQL+o0t23JPBZ9sd+yvSLk05mFoqKBw5N8gbbkU4TNXyqCgIrl/VM17OgUIgQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -1301,13 +1487,15 @@ packages: lunr@2.3.9: resolution: {integrity: sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==} + magic-string@0.30.19: + resolution: {integrity: sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw==} + make-dir@3.1.0: resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} engines: {node: '>=8'} - marked@4.3.0: - resolution: {integrity: sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==} - engines: {node: '>= 12'} + markdown-it@14.1.0: + resolution: {integrity: sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==} hasBin: true matcher@5.0.0: @@ -1318,6 +1506,9 @@ packages: resolution: {integrity: sha512-BUiRtTtV39LIJwinWBjqVsU9xhdnz7/i889V859IBFpuqGAj6LuOvHv5XLbgZ2R7ptJoJaEcxkv88/h25T7Ciw==} engines: {node: '>=8'} + mdurl@2.0.0: + resolution: {integrity: sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==} + memoize@10.0.0: resolution: {integrity: sha512-H6cBLgsi6vMWOcCpvVCdFFnl3kerEXbrYh9q+lY6VXvQSmM6CkmV08VOwT+WE2tzIEqRPFfAq3fm4v/UIW6mSA==} engines: {node: '>=18'} @@ -1333,10 +1524,6 @@ packages: resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==} engines: {node: '>=8.6'} - mimic-fn@2.1.0: - resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==} - engines: {node: '>=6'} - mimic-fn@4.0.0: resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==} engines: {node: '>=12'} @@ -1373,6 +1560,9 @@ packages: engines: {node: '>=10'} hasBin: true + mlly@1.8.0: + resolution: {integrity: sha512-l8D9ODSRWLe2KHJSifWGwBqpTZXIXTeo8mlKjY+E2HAakaTeNpqAyBZ8GSqLzHgw4XmHmC8whvpjJNMbFZN7/g==} + ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} @@ -1407,14 +1597,6 @@ packages: engines: {node: '>=6'} hasBin: true - normalize-path@3.0.0: - resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} - engines: {node: '>=0.10.0'} - - npm-run-path@4.0.1: - resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==} - engines: {node: '>=8'} - npm-run-path@5.3.0: resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -1430,10 +1612,6 @@ packages: once@1.4.0: resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} - onetime@5.1.2: - resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==} - engines: {node: '>=6'} - onetime@6.0.0: resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==} engines: {node: '>=12'} @@ -1497,8 +1675,11 @@ packages: resolution: {integrity: sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==} engines: {node: '>=12'} - picocolors@1.1.0: - resolution: {integrity: sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==} + pathe@2.0.3: + resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==} + + picocolors@1.1.1: + resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==} picomatch@2.3.1: resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} @@ -1508,14 +1689,17 @@ packages: resolution: {integrity: sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==} engines: {node: '>=10'} - picomatch@4.0.2: - resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==} + picomatch@4.0.3: + resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==} engines: {node: '>=12'} pirates@4.0.6: resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==} engines: {node: '>= 6'} + pkg-types@1.3.1: + resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==} + plur@5.1.0: resolution: {integrity: sha512-VP/72JeXqak2KiOzjgKtQen5y3IZHn+9GOuLDafPv0eXa47xq0At93XahYBs26MsifCQ4enGKwbjBTKgb9QJXg==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} @@ -1542,8 +1726,8 @@ packages: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} - prettier@3.3.3: - resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==} + prettier@3.6.2: + resolution: {integrity: sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==} engines: {node: '>=14'} hasBin: true @@ -1551,6 +1735,10 @@ packages: resolution: {integrity: sha512-o1piW0n3tgKIKCwk2vpM/vOV13zjJzvP37Ioze54YlTHE06m4tjEbzg9WsKkvTuyYln2DHjo5pY4qrZGI0otpw==} engines: {node: '>=18'} + punycode.js@2.3.1: + resolution: {integrity: sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==} + engines: {node: '>=6'} + punycode@2.3.1: resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} engines: {node: '>=6'} @@ -1562,9 +1750,9 @@ packages: resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==} engines: {node: '>= 6'} - readdirp@3.6.0: - resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==} - engines: {node: '>=8.10.0'} + readdirp@4.1.2: + resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==} + engines: {node: '>= 14.18.0'} require-directory@2.1.1: resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==} @@ -1599,8 +1787,8 @@ packages: resolution: {integrity: sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==} hasBin: true - rollup@4.22.5: - resolution: {integrity: sha512-WoinX7GeQOFMGznEcWA1WrTQCd/tpEbMkc3nuMs9BT0CPjMdSjPMTVClwWd4pgSQwJdP65SK9mTCNvItlr5o7w==} + rollup@4.52.3: + resolution: {integrity: sha512-RIDh866U8agLgiIcdpB+COKnlCreHJLfIhWC3LVflku5YHfpnsIKigRZeFfMfCc4dVcqNVfQQ5gO/afOck064A==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true @@ -1634,9 +1822,6 @@ packages: resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} engines: {node: '>=8'} - shiki@0.14.7: - resolution: {integrity: sha512-dNPAPrxSc87ua2sKJ3H5dQ/6ZaY8RNnaAqK+t0eG7p0Soi2ydiqbGOTaZCqaYvA/uZYfS1LJnemt3Q+mSfcPCg==} - signal-exit@3.0.7: resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==} @@ -1659,6 +1844,7 @@ packages: source-map@0.8.0-beta.0: resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==} engines: {node: '>= 8'} + deprecated: The work that was done in this beta branch won't be included in future versions sprintf-js@1.0.3: resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==} @@ -1690,10 +1876,6 @@ packages: resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==} engines: {node: '>=12'} - strip-final-newline@2.0.0: - resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==} - engines: {node: '>=6'} - strip-final-newline@3.0.0: resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==} engines: {node: '>=12'} @@ -1737,8 +1919,11 @@ packages: resolution: {integrity: sha512-TIsDdtKo6+XrPtiTm1ssmMngN1sAhyKnTO2kunQWqNPWIVvCm15Wmw4SWInwTVgJ5u/Tr04+8Ei9TNcw4x4ONA==} engines: {node: '>=4'} - tinyglobby@0.2.8: - resolution: {integrity: sha512-AMLZywN0vbhiZi2neFEaj9VIIxC+PjDMsp0nAK6tpR86LJavZgHqGz0S/FOONwBygC+mu7R0/TyAQw0gx0Mu9Q==} + tinyexec@0.3.2: + resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==} + + tinyglobby@0.2.15: + resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==} engines: {node: '>=12.0.0'} to-regex-range@5.0.1: @@ -1767,8 +1952,8 @@ packages: tslib@1.14.1: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} - tsup@8.3.0: - resolution: {integrity: sha512-ALscEeyS03IomcuNdFdc0YWGVIkwH1Ws7nfTbAPuoILvEV2hpGQAY72LIOjglGo4ShWpZfpBqP/jpQVCzqYQag==} + tsup@8.5.0: + resolution: {integrity: sha512-VmBp77lWNQq6PfuMqCHD3xWl22vEoWsKajkF8t+yMBawlUS8JzEI+vOVMeuNZIuMML8qXRizFKi9oD5glKQVcQ==} engines: {node: '>=18'} hasBin: true peerDependencies: @@ -1804,25 +1989,34 @@ 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==} + typedoc-plugin-missing-exports@4.1.0: + resolution: {integrity: sha512-p1M5jXnEbQ4qqy0erJz41BBZEDb8XDrbLjndlH4RhYEcymbdQr0xLF6yUw1GWBrhSIfkU98m3BELMAiQh+R1zA==} peerDependencies: - typedoc: 0.24.x || 0.25.x + typedoc: ^0.28.1 - typedoc@0.25.13: - resolution: {integrity: sha512-pQqiwiJ+Z4pigfOnnysObszLiU3mVLWAExSPf+Mu06G/qsc3wzbuM56SZQvONhHLncLUhYzOVkjFFpFfL5AzhQ==} - engines: {node: '>= 16'} + typedoc@0.28.13: + resolution: {integrity: sha512-dNWY8msnYB2a+7Audha+aTF1Pu3euiE7ySp53w8kEsXoYw7dMouV5A1UsTUY345aB152RHnmRMDiovuBi7BD+w==} + engines: {node: '>= 18', pnpm: '>= 10'} hasBin: true peerDependencies: - typescript: 4.6.x || 4.7.x || 4.8.x || 4.9.x || 5.0.x || 5.1.x || 5.2.x || 5.3.x || 5.4.x + typescript: 5.0.x || 5.1.x || 5.2.x || 5.3.x || 5.4.x || 5.5.x || 5.6.x || 5.7.x || 5.8.x || 5.9.x - typescript@5.6.2: - resolution: {integrity: sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==} + typescript@5.9.3: + resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==} engines: {node: '>=14.17'} hasBin: true - undici-types@6.19.8: - resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} + uc.micro@2.1.0: + resolution: {integrity: sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==} + + ufo@1.6.1: + resolution: {integrity: sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==} + + undici-types@7.13.0: + resolution: {integrity: sha512-Ov2Rr9Sx+fRgagJ5AX0qvItZG/JKKoBRAVITs1zk7IqZGTJUwgUr7qoYBpWwakpWilTZFM98rG/AFRocu10iIQ==} + + undici-types@7.16.0: + resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==} unicorn-magic@0.1.0: resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==} @@ -1834,12 +2028,6 @@ packages: util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} - vscode-oniguruma@1.7.0: - resolution: {integrity: sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==} - - vscode-textmate@8.0.0: - resolution: {integrity: sha512-AFbieoL7a5LMqcnOF04ji+rpXadgOXnZsxQr//r83kLPr7biP7am3g9zbaZIaBGwBRWeSvoMD4mgPdX3e4NWBg==} - webidl-conversions@3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} @@ -1902,6 +2090,11 @@ packages: yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} + yaml@2.8.1: + resolution: {integrity: sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==} + engines: {node: '>= 14.6'} + hasBin: true + yargs-parser@21.1.1: resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} engines: {node: '>=12'} @@ -1921,76 +2114,82 @@ snapshots: escape-string-regexp: 5.0.0 execa: 7.2.0 - '@esbuild/aix-ppc64@0.23.1': + '@esbuild/aix-ppc64@0.25.10': + optional: true + + '@esbuild/android-arm64@0.25.10': optional: true - '@esbuild/android-arm64@0.23.1': + '@esbuild/android-arm@0.25.10': optional: true - '@esbuild/android-arm@0.23.1': + '@esbuild/android-x64@0.25.10': optional: true - '@esbuild/android-x64@0.23.1': + '@esbuild/darwin-arm64@0.25.10': optional: true - '@esbuild/darwin-arm64@0.23.1': + '@esbuild/darwin-x64@0.25.10': optional: true - '@esbuild/darwin-x64@0.23.1': + '@esbuild/freebsd-arm64@0.25.10': optional: true - '@esbuild/freebsd-arm64@0.23.1': + '@esbuild/freebsd-x64@0.25.10': optional: true - '@esbuild/freebsd-x64@0.23.1': + '@esbuild/linux-arm64@0.25.10': optional: true - '@esbuild/linux-arm64@0.23.1': + '@esbuild/linux-arm@0.25.10': optional: true - '@esbuild/linux-arm@0.23.1': + '@esbuild/linux-ia32@0.25.10': optional: true - '@esbuild/linux-ia32@0.23.1': + '@esbuild/linux-loong64@0.25.10': optional: true - '@esbuild/linux-loong64@0.23.1': + '@esbuild/linux-mips64el@0.25.10': optional: true - '@esbuild/linux-mips64el@0.23.1': + '@esbuild/linux-ppc64@0.25.10': optional: true - '@esbuild/linux-ppc64@0.23.1': + '@esbuild/linux-riscv64@0.25.10': optional: true - '@esbuild/linux-riscv64@0.23.1': + '@esbuild/linux-s390x@0.25.10': optional: true - '@esbuild/linux-s390x@0.23.1': + '@esbuild/linux-x64@0.25.10': optional: true - '@esbuild/linux-x64@0.23.1': + '@esbuild/netbsd-arm64@0.25.10': optional: true - '@esbuild/netbsd-x64@0.23.1': + '@esbuild/netbsd-x64@0.25.10': optional: true - '@esbuild/openbsd-arm64@0.23.1': + '@esbuild/openbsd-arm64@0.25.10': optional: true - '@esbuild/openbsd-x64@0.23.1': + '@esbuild/openbsd-x64@0.25.10': optional: true - '@esbuild/sunos-x64@0.23.1': + '@esbuild/openharmony-arm64@0.25.10': optional: true - '@esbuild/win32-arm64@0.23.1': + '@esbuild/sunos-x64@0.25.10': optional: true - '@esbuild/win32-ia32@0.23.1': + '@esbuild/win32-arm64@0.25.10': optional: true - '@esbuild/win32-x64@0.23.1': + '@esbuild/win32-ia32@0.25.10': + optional: true + + '@esbuild/win32-x64@0.25.10': optional: true '@eslint-community/eslint-utils@4.4.0(eslint@8.57.1)': @@ -2016,6 +2215,14 @@ snapshots: '@eslint/js@8.57.1': {} + '@gerrit0/mini-shiki@3.13.0': + dependencies: + '@shikijs/engine-oniguruma': 3.13.0 + '@shikijs/langs': 3.13.0 + '@shikijs/themes': 3.13.0 + '@shikijs/types': 3.13.0 + '@shikijs/vscode-textmate': 10.0.2 + '@humanwhocodes/config-array@0.13.0': dependencies: '@humanwhocodes/object-schema': 2.0.3 @@ -2049,6 +2256,8 @@ snapshots: '@jridgewell/sourcemap-codec@1.5.0': {} + '@jridgewell/sourcemap-codec@1.5.5': {} + '@jridgewell/trace-mapping@0.3.25': dependencies: '@jridgewell/resolve-uri': 3.1.2 @@ -2069,8 +2278,6 @@ snapshots: - encoding - supports-color - '@noble/ed25519@2.1.0': {} - '@nodelib/fs.scandir@2.1.5': dependencies: '@nodelib/fs.stat': 2.0.5 @@ -2091,390 +2298,522 @@ snapshots: estree-walker: 2.0.2 picomatch: 2.3.1 - '@rollup/rollup-android-arm-eabi@4.22.5': + '@rollup/rollup-android-arm-eabi@4.52.3': + optional: true + + '@rollup/rollup-android-arm64@4.52.3': + optional: true + + '@rollup/rollup-darwin-arm64@4.52.3': + optional: true + + '@rollup/rollup-darwin-x64@4.52.3': optional: true - '@rollup/rollup-android-arm64@4.22.5': + '@rollup/rollup-freebsd-arm64@4.52.3': optional: true - '@rollup/rollup-darwin-arm64@4.22.5': + '@rollup/rollup-freebsd-x64@4.52.3': optional: true - '@rollup/rollup-darwin-x64@4.22.5': + '@rollup/rollup-linux-arm-gnueabihf@4.52.3': optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.22.5': + '@rollup/rollup-linux-arm-musleabihf@4.52.3': optional: true - '@rollup/rollup-linux-arm-musleabihf@4.22.5': + '@rollup/rollup-linux-arm64-gnu@4.52.3': optional: true - '@rollup/rollup-linux-arm64-gnu@4.22.5': + '@rollup/rollup-linux-arm64-musl@4.52.3': optional: true - '@rollup/rollup-linux-arm64-musl@4.22.5': + '@rollup/rollup-linux-loong64-gnu@4.52.3': optional: true - '@rollup/rollup-linux-powerpc64le-gnu@4.22.5': + '@rollup/rollup-linux-ppc64-gnu@4.52.3': optional: true - '@rollup/rollup-linux-riscv64-gnu@4.22.5': + '@rollup/rollup-linux-riscv64-gnu@4.52.3': optional: true - '@rollup/rollup-linux-s390x-gnu@4.22.5': + '@rollup/rollup-linux-riscv64-musl@4.52.3': optional: true - '@rollup/rollup-linux-x64-gnu@4.22.5': + '@rollup/rollup-linux-s390x-gnu@4.52.3': optional: true - '@rollup/rollup-linux-x64-musl@4.22.5': + '@rollup/rollup-linux-x64-gnu@4.52.3': optional: true - '@rollup/rollup-win32-arm64-msvc@4.22.5': + '@rollup/rollup-linux-x64-musl@4.52.3': optional: true - '@rollup/rollup-win32-ia32-msvc@4.22.5': + '@rollup/rollup-openharmony-arm64@4.52.3': optional: true - '@rollup/rollup-win32-x64-msvc@4.22.5': + '@rollup/rollup-win32-arm64-msvc@4.52.3': optional: true + '@rollup/rollup-win32-ia32-msvc@4.52.3': + optional: true + + '@rollup/rollup-win32-x64-gnu@4.52.3': + optional: true + + '@rollup/rollup-win32-x64-msvc@4.52.3': + optional: true + + '@shikijs/engine-oniguruma@3.13.0': + dependencies: + '@shikijs/types': 3.13.0 + '@shikijs/vscode-textmate': 10.0.2 + + '@shikijs/langs@3.13.0': + dependencies: + '@shikijs/types': 3.13.0 + + '@shikijs/themes@3.13.0': + dependencies: + '@shikijs/types': 3.13.0 + + '@shikijs/types@3.13.0': + dependencies: + '@shikijs/vscode-textmate': 10.0.2 + '@types/hast': 3.0.4 + + '@shikijs/vscode-textmate@10.0.2': {} + '@sindresorhus/merge-streams@2.3.0': {} - '@solana/accounts@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': + '@solana/accounts@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': dependencies: - '@solana/addresses': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/codecs-core': 2.0.0-preview.3 - '@solana/codecs-strings': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/errors': 2.0.0-preview.3 - '@solana/rpc-spec': 2.0.0-preview.3 - '@solana/rpc-types': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) + '@solana/addresses': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/rpc-spec': 3.0.3(typescript@5.9.3) + '@solana/rpc-types': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/addresses@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': + '@solana/addresses@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': dependencies: - '@solana/assertions': 2.0.0-preview.3 - '@solana/codecs-core': 2.0.0-preview.3 - '@solana/codecs-strings': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/errors': 2.0.0-preview.3 + '@solana/assertions': 3.0.3(typescript@5.9.3) + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/nominal-types': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/assertions@2.0.0-preview.3': + '@solana/assertions@3.0.3(typescript@5.9.3)': dependencies: - '@solana/errors': 2.0.0-preview.3 + '@solana/errors': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 - '@solana/codecs-core@2.0.0-preview.3': + '@solana/codecs-core@3.0.3(typescript@5.9.3)': dependencies: - '@solana/errors': 2.0.0-preview.3 + '@solana/errors': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 - '@solana/codecs-data-structures@2.0.0-preview.3': + '@solana/codecs-data-structures@3.0.3(typescript@5.9.3)': dependencies: - '@solana/codecs-core': 2.0.0-preview.3 - '@solana/codecs-numbers': 2.0.0-preview.3 - '@solana/errors': 2.0.0-preview.3 + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/codecs-numbers': 3.0.3(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 - '@solana/codecs-numbers@2.0.0-preview.3': + '@solana/codecs-numbers@3.0.3(typescript@5.9.3)': dependencies: - '@solana/codecs-core': 2.0.0-preview.3 - '@solana/errors': 2.0.0-preview.3 + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 - '@solana/codecs-strings@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': + '@solana/codecs-strings@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': dependencies: - '@solana/codecs-core': 2.0.0-preview.3 - '@solana/codecs-numbers': 2.0.0-preview.3 - '@solana/errors': 2.0.0-preview.3 + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/codecs-numbers': 3.0.3(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) fastestsmallesttextencoderdecoder: 1.0.22 + typescript: 5.9.3 - '@solana/codecs@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': + '@solana/codecs@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': dependencies: - '@solana/codecs-core': 2.0.0-preview.3 - '@solana/codecs-data-structures': 2.0.0-preview.3 - '@solana/codecs-numbers': 2.0.0-preview.3 - '@solana/codecs-strings': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/options': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/codecs-data-structures': 3.0.3(typescript@5.9.3) + '@solana/codecs-numbers': 3.0.3(typescript@5.9.3) + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/options': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/errors@2.0.0-preview.3': + '@solana/errors@3.0.3(typescript@5.9.3)': dependencies: - chalk: 5.3.0 - commander: 12.1.0 + chalk: 5.6.2 + commander: 14.0.0 + typescript: 5.9.3 - '@solana/eslint-config-solana@3.0.4(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-simple-import-sort@12.1.1(eslint@8.57.1))(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.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2)': + '@solana/eslint-config-solana@3.0.4(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3))(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.1))(eslint-plugin-simple-import-sort@12.1.1(eslint@8.57.1))(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.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3)': dependencies: - '@typescript-eslint/eslint-plugin': 7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2) - '@typescript-eslint/parser': 7.18.0(eslint@8.57.1)(typescript@5.6.2) + '@typescript-eslint/eslint-plugin': 7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3) + '@typescript-eslint/parser': 7.18.0(eslint@8.57.1)(typescript@5.9.3) eslint: 8.57.1 - eslint-plugin-jest: 27.9.0(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2) + eslint-plugin-jest: 27.9.0(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3) eslint-plugin-react-hooks: 4.6.2(eslint@8.57.1) eslint-plugin-simple-import-sort: 12.1.1(eslint@8.57.1) 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.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2) - typescript: 5.6.2 + eslint-plugin-typescript-sort-keys: 3.2.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3) + typescript: 5.9.3 - '@solana/fast-stable-stringify@2.0.0-preview.3': {} + '@solana/fast-stable-stringify@3.0.3(typescript@5.9.3)': + dependencies: + typescript: 5.9.3 + + '@solana/functional@3.0.3(typescript@5.9.3)': + dependencies: + typescript: 5.9.3 - '@solana/functional@2.0.0-preview.3': {} + '@solana/instruction-plans@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': + dependencies: + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/instructions': 3.0.3(typescript@5.9.3) + '@solana/promises': 3.0.3(typescript@5.9.3) + '@solana/transaction-messages': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/transactions': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 + transitivePeerDependencies: + - fastestsmallesttextencoderdecoder - '@solana/instructions@2.0.0-preview.3': + '@solana/instructions@3.0.3(typescript@5.9.3)': dependencies: - '@solana/errors': 2.0.0-preview.3 + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 - '@solana/keys@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': + '@solana/keys@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': dependencies: - '@solana/assertions': 2.0.0-preview.3 - '@solana/codecs-core': 2.0.0-preview.3 - '@solana/codecs-strings': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/errors': 2.0.0-preview.3 + '@solana/assertions': 3.0.3(typescript@5.9.3) + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/nominal-types': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 + transitivePeerDependencies: + - fastestsmallesttextencoderdecoder + + '@solana/kit@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)(ws@8.18.0)': + dependencies: + '@solana/accounts': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/addresses': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/codecs': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/functional': 3.0.3(typescript@5.9.3) + '@solana/instruction-plans': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/instructions': 3.0.3(typescript@5.9.3) + '@solana/keys': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/programs': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/rpc': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/rpc-parsed-types': 3.0.3(typescript@5.9.3) + '@solana/rpc-spec-types': 3.0.3(typescript@5.9.3) + '@solana/rpc-subscriptions': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)(ws@8.18.0) + '@solana/rpc-types': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/signers': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/sysvars': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/transaction-confirmation': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)(ws@8.18.0) + '@solana/transaction-messages': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/transactions': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder + - ws + + '@solana/nominal-types@3.0.3(typescript@5.9.3)': + dependencies: + typescript: 5.9.3 - '@solana/options@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': + '@solana/options@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': dependencies: - '@solana/codecs-core': 2.0.0-preview.3 - '@solana/codecs-data-structures': 2.0.0-preview.3 - '@solana/codecs-numbers': 2.0.0-preview.3 - '@solana/codecs-strings': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/errors': 2.0.0-preview.3 + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/codecs-data-structures': 3.0.3(typescript@5.9.3) + '@solana/codecs-numbers': 3.0.3(typescript@5.9.3) + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/programs@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': + '@solana/programs@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': dependencies: - '@solana/addresses': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/errors': 2.0.0-preview.3 + '@solana/addresses': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/rpc-api@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': - dependencies: - '@solana/addresses': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/codecs-core': 2.0.0-preview.3 - '@solana/codecs-strings': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/errors': 2.0.0-preview.3 - '@solana/keys': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc-parsed-types': 2.0.0-preview.3 - '@solana/rpc-spec': 2.0.0-preview.3 - '@solana/rpc-transformers': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc-types': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/transaction-messages': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/transactions': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) + '@solana/promises@3.0.3(typescript@5.9.3)': + dependencies: + typescript: 5.9.3 + + '@solana/rpc-api@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': + dependencies: + '@solana/addresses': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/keys': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/rpc-parsed-types': 3.0.3(typescript@5.9.3) + '@solana/rpc-spec': 3.0.3(typescript@5.9.3) + '@solana/rpc-transformers': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/rpc-types': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/transaction-messages': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/transactions': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/rpc-parsed-types@2.0.0-preview.3': {} + '@solana/rpc-parsed-types@3.0.3(typescript@5.9.3)': + dependencies: + typescript: 5.9.3 - '@solana/rpc-spec-types@2.0.0-preview.3': {} + '@solana/rpc-spec-types@3.0.3(typescript@5.9.3)': + dependencies: + typescript: 5.9.3 - '@solana/rpc-spec@2.0.0-preview.3': + '@solana/rpc-spec@3.0.3(typescript@5.9.3)': dependencies: - '@solana/errors': 2.0.0-preview.3 - '@solana/rpc-spec-types': 2.0.0-preview.3 + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/rpc-spec-types': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 - '@solana/rpc-subscriptions-api@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': + '@solana/rpc-subscriptions-api@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': dependencies: - '@solana/addresses': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/keys': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc-subscriptions-spec': 2.0.0-preview.3 - '@solana/rpc-transformers': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc-types': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/transaction-messages': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/transactions': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) + '@solana/addresses': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/keys': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/rpc-subscriptions-spec': 3.0.3(typescript@5.9.3) + '@solana/rpc-transformers': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/rpc-types': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/transaction-messages': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/transactions': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/rpc-subscriptions-spec@2.0.0-preview.3': - dependencies: - '@solana/errors': 2.0.0-preview.3 - '@solana/rpc-spec-types': 2.0.0-preview.3 - - '@solana/rpc-subscriptions-transport-websocket@2.0.0-preview.3(ws@8.18.0)': + '@solana/rpc-subscriptions-channel-websocket@3.0.3(typescript@5.9.3)(ws@8.18.0)': dependencies: - '@solana/errors': 2.0.0-preview.3 - '@solana/rpc-subscriptions-spec': 2.0.0-preview.3 + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/functional': 3.0.3(typescript@5.9.3) + '@solana/rpc-subscriptions-spec': 3.0.3(typescript@5.9.3) + '@solana/subscribable': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 ws: 8.18.0 - '@solana/rpc-subscriptions@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)(ws@8.18.0)': - dependencies: - '@solana/errors': 2.0.0-preview.3 - '@solana/fast-stable-stringify': 2.0.0-preview.3 - '@solana/functional': 2.0.0-preview.3 - '@solana/rpc-subscriptions-api': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc-subscriptions-spec': 2.0.0-preview.3 - '@solana/rpc-subscriptions-transport-websocket': 2.0.0-preview.3(ws@8.18.0) - '@solana/rpc-transformers': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc-types': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) + '@solana/rpc-subscriptions-spec@3.0.3(typescript@5.9.3)': + dependencies: + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/promises': 3.0.3(typescript@5.9.3) + '@solana/rpc-spec-types': 3.0.3(typescript@5.9.3) + '@solana/subscribable': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 + + '@solana/rpc-subscriptions@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)(ws@8.18.0)': + dependencies: + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/fast-stable-stringify': 3.0.3(typescript@5.9.3) + '@solana/functional': 3.0.3(typescript@5.9.3) + '@solana/promises': 3.0.3(typescript@5.9.3) + '@solana/rpc-spec-types': 3.0.3(typescript@5.9.3) + '@solana/rpc-subscriptions-api': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/rpc-subscriptions-channel-websocket': 3.0.3(typescript@5.9.3)(ws@8.18.0) + '@solana/rpc-subscriptions-spec': 3.0.3(typescript@5.9.3) + '@solana/rpc-transformers': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/rpc-types': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/subscribable': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - ws - '@solana/rpc-transformers@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': + '@solana/rpc-transformers@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': dependencies: - '@solana/functional': 2.0.0-preview.3 - '@solana/rpc-spec': 2.0.0-preview.3 - '@solana/rpc-subscriptions-spec': 2.0.0-preview.3 - '@solana/rpc-types': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/functional': 3.0.3(typescript@5.9.3) + '@solana/nominal-types': 3.0.3(typescript@5.9.3) + '@solana/rpc-spec-types': 3.0.3(typescript@5.9.3) + '@solana/rpc-types': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/rpc-transport-http@2.0.0-preview.3': + '@solana/rpc-transport-http@3.0.3(typescript@5.9.3)': dependencies: - '@solana/errors': 2.0.0-preview.3 - '@solana/rpc-spec': 2.0.0-preview.3 - undici-types: 6.19.8 + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/rpc-spec': 3.0.3(typescript@5.9.3) + '@solana/rpc-spec-types': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 + undici-types: 7.16.0 - '@solana/rpc-types@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': + '@solana/rpc-types@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': dependencies: - '@solana/addresses': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/codecs-core': 2.0.0-preview.3 - '@solana/codecs-numbers': 2.0.0-preview.3 - '@solana/codecs-strings': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/errors': 2.0.0-preview.3 + '@solana/addresses': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/codecs-numbers': 3.0.3(typescript@5.9.3) + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/nominal-types': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/rpc@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': - dependencies: - '@solana/errors': 2.0.0-preview.3 - '@solana/fast-stable-stringify': 2.0.0-preview.3 - '@solana/functional': 2.0.0-preview.3 - '@solana/rpc-api': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc-spec': 2.0.0-preview.3 - '@solana/rpc-transformers': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc-transport-http': 2.0.0-preview.3 - '@solana/rpc-types': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) + '@solana/rpc@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': + dependencies: + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/fast-stable-stringify': 3.0.3(typescript@5.9.3) + '@solana/functional': 3.0.3(typescript@5.9.3) + '@solana/rpc-api': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/rpc-spec': 3.0.3(typescript@5.9.3) + '@solana/rpc-spec-types': 3.0.3(typescript@5.9.3) + '@solana/rpc-transformers': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/rpc-transport-http': 3.0.3(typescript@5.9.3) + '@solana/rpc-types': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/signers@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': - dependencies: - '@solana/addresses': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/errors': 2.0.0-preview.3 - '@solana/instructions': 2.0.0-preview.3 - '@solana/keys': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/transaction-messages': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/transactions': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) + '@solana/signers@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': + dependencies: + '@solana/addresses': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/instructions': 3.0.3(typescript@5.9.3) + '@solana/keys': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/nominal-types': 3.0.3(typescript@5.9.3) + '@solana/transaction-messages': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/transactions': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/transaction-confirmation@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)(ws@8.18.0)': - dependencies: - '@solana/addresses': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/codecs-strings': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/errors': 2.0.0-preview.3 - '@solana/keys': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc-subscriptions': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)(ws@8.18.0) - '@solana/rpc-types': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/transaction-messages': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/transactions': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) + '@solana/subscribable@3.0.3(typescript@5.9.3)': + dependencies: + '@solana/errors': 3.0.3(typescript@5.9.3) + typescript: 5.9.3 + + '@solana/sysvars@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': + dependencies: + '@solana/accounts': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/codecs': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/rpc-types': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - - ws - '@solana/transaction-messages@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': - dependencies: - '@solana/addresses': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/codecs-core': 2.0.0-preview.3 - '@solana/codecs-data-structures': 2.0.0-preview.3 - '@solana/codecs-numbers': 2.0.0-preview.3 - '@solana/errors': 2.0.0-preview.3 - '@solana/functional': 2.0.0-preview.3 - '@solana/instructions': 2.0.0-preview.3 - '@solana/rpc-types': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) + '@solana/transaction-confirmation@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)(ws@8.18.0)': + dependencies: + '@solana/addresses': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/keys': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/promises': 3.0.3(typescript@5.9.3) + '@solana/rpc': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/rpc-subscriptions': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)(ws@8.18.0) + '@solana/rpc-types': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/transaction-messages': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/transactions': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder + - ws - '@solana/transactions@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)': - dependencies: - '@solana/addresses': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/codecs-core': 2.0.0-preview.3 - '@solana/codecs-data-structures': 2.0.0-preview.3 - '@solana/codecs-numbers': 2.0.0-preview.3 - '@solana/codecs-strings': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/errors': 2.0.0-preview.3 - '@solana/functional': 2.0.0-preview.3 - '@solana/instructions': 2.0.0-preview.3 - '@solana/keys': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc-types': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/transaction-messages': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) + '@solana/transaction-messages@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': + dependencies: + '@solana/addresses': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/codecs-data-structures': 3.0.3(typescript@5.9.3) + '@solana/codecs-numbers': 3.0.3(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/functional': 3.0.3(typescript@5.9.3) + '@solana/instructions': 3.0.3(typescript@5.9.3) + '@solana/nominal-types': 3.0.3(typescript@5.9.3) + '@solana/rpc-types': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - '@solana/web3.js@2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)(ws@8.18.0)': - dependencies: - '@solana/accounts': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/addresses': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/codecs': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/errors': 2.0.0-preview.3 - '@solana/functional': 2.0.0-preview.3 - '@solana/instructions': 2.0.0-preview.3 - '@solana/keys': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/programs': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/rpc-parsed-types': 2.0.0-preview.3 - '@solana/rpc-subscriptions': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)(ws@8.18.0) - '@solana/rpc-types': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/signers': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/transaction-confirmation': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22)(ws@8.18.0) - '@solana/transaction-messages': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) - '@solana/transactions': 2.0.0-preview.3(fastestsmallesttextencoderdecoder@1.0.22) + '@solana/transactions@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3)': + dependencies: + '@solana/addresses': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/codecs-core': 3.0.3(typescript@5.9.3) + '@solana/codecs-data-structures': 3.0.3(typescript@5.9.3) + '@solana/codecs-numbers': 3.0.3(typescript@5.9.3) + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/errors': 3.0.3(typescript@5.9.3) + '@solana/functional': 3.0.3(typescript@5.9.3) + '@solana/instructions': 3.0.3(typescript@5.9.3) + '@solana/keys': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/nominal-types': 3.0.3(typescript@5.9.3) + '@solana/rpc-types': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + '@solana/transaction-messages': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.9.3) + typescript: 5.9.3 transitivePeerDependencies: - fastestsmallesttextencoderdecoder - - ws - '@solana/webcrypto-ed25519-polyfill@2.0.0-preview.3': - dependencies: - '@noble/ed25519': 2.1.0 + '@types/estree@1.0.8': {} - '@types/estree@1.0.6': {} + '@types/hast@3.0.4': + dependencies: + '@types/unist': 3.0.3 '@types/json-schema@7.0.15': {} - '@types/node@20.16.10': + '@types/node@24.6.2': dependencies: - undici-types: 6.19.8 + undici-types: 7.13.0 '@types/semver@7.5.8': {} - '@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2)': + '@types/unist@3.0.3': {} + + '@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3)': dependencies: '@eslint-community/regexpp': 4.11.1 - '@typescript-eslint/parser': 7.18.0(eslint@8.57.1)(typescript@5.6.2) + '@typescript-eslint/parser': 7.18.0(eslint@8.57.1)(typescript@5.9.3) '@typescript-eslint/scope-manager': 7.18.0 - '@typescript-eslint/type-utils': 7.18.0(eslint@8.57.1)(typescript@5.6.2) - '@typescript-eslint/utils': 7.18.0(eslint@8.57.1)(typescript@5.6.2) + '@typescript-eslint/type-utils': 7.18.0(eslint@8.57.1)(typescript@5.9.3) + '@typescript-eslint/utils': 7.18.0(eslint@8.57.1)(typescript@5.9.3) '@typescript-eslint/visitor-keys': 7.18.0 eslint: 8.57.1 graphemer: 1.4.0 ignore: 5.3.2 natural-compare: 1.4.0 - ts-api-utils: 1.3.0(typescript@5.6.2) + ts-api-utils: 1.3.0(typescript@5.9.3) optionalDependencies: - typescript: 5.6.2 + typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/experimental-utils@5.62.0(eslint@8.57.1)(typescript@5.6.2)': + '@typescript-eslint/experimental-utils@5.62.0(eslint@8.57.1)(typescript@5.9.3)': dependencies: - '@typescript-eslint/utils': 5.62.0(eslint@8.57.1)(typescript@5.6.2) + '@typescript-eslint/utils': 5.62.0(eslint@8.57.1)(typescript@5.9.3) eslint: 8.57.1 transitivePeerDependencies: - supports-color - typescript - '@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2)': + '@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3)': dependencies: '@typescript-eslint/scope-manager': 7.18.0 '@typescript-eslint/types': 7.18.0 - '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.6.2) + '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.9.3) '@typescript-eslint/visitor-keys': 7.18.0 debug: 4.3.7 eslint: 8.57.1 optionalDependencies: - typescript: 5.6.2 + typescript: 5.9.3 transitivePeerDependencies: - supports-color @@ -2488,15 +2827,15 @@ snapshots: '@typescript-eslint/types': 7.18.0 '@typescript-eslint/visitor-keys': 7.18.0 - '@typescript-eslint/type-utils@7.18.0(eslint@8.57.1)(typescript@5.6.2)': + '@typescript-eslint/type-utils@7.18.0(eslint@8.57.1)(typescript@5.9.3)': dependencies: - '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.6.2) - '@typescript-eslint/utils': 7.18.0(eslint@8.57.1)(typescript@5.6.2) + '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.9.3) + '@typescript-eslint/utils': 7.18.0(eslint@8.57.1)(typescript@5.9.3) debug: 4.3.7 eslint: 8.57.1 - ts-api-utils: 1.3.0(typescript@5.6.2) + ts-api-utils: 1.3.0(typescript@5.9.3) optionalDependencies: - typescript: 5.6.2 + typescript: 5.9.3 transitivePeerDependencies: - supports-color @@ -2504,7 +2843,7 @@ snapshots: '@typescript-eslint/types@7.18.0': {} - '@typescript-eslint/typescript-estree@5.62.0(typescript@5.6.2)': + '@typescript-eslint/typescript-estree@5.62.0(typescript@5.9.3)': dependencies: '@typescript-eslint/types': 5.62.0 '@typescript-eslint/visitor-keys': 5.62.0 @@ -2512,13 +2851,13 @@ snapshots: globby: 11.1.0 is-glob: 4.0.3 semver: 7.6.3 - tsutils: 3.21.0(typescript@5.6.2) + tsutils: 3.21.0(typescript@5.9.3) optionalDependencies: - typescript: 5.6.2 + typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/typescript-estree@7.18.0(typescript@5.6.2)': + '@typescript-eslint/typescript-estree@7.18.0(typescript@5.9.3)': dependencies: '@typescript-eslint/types': 7.18.0 '@typescript-eslint/visitor-keys': 7.18.0 @@ -2527,20 +2866,20 @@ snapshots: is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.6.3 - ts-api-utils: 1.3.0(typescript@5.6.2) + ts-api-utils: 1.3.0(typescript@5.9.3) optionalDependencies: - typescript: 5.6.2 + typescript: 5.9.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@5.62.0(eslint@8.57.1)(typescript@5.6.2)': + '@typescript-eslint/utils@5.62.0(eslint@8.57.1)(typescript@5.9.3)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.1) '@types/json-schema': 7.0.15 '@types/semver': 7.5.8 '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.6.2) + '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.9.3) eslint: 8.57.1 eslint-scope: 5.1.1 semver: 7.6.3 @@ -2548,12 +2887,12 @@ snapshots: - supports-color - typescript - '@typescript-eslint/utils@7.18.0(eslint@8.57.1)(typescript@5.6.2)': + '@typescript-eslint/utils@7.18.0(eslint@8.57.1)(typescript@5.9.3)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.1) '@typescript-eslint/scope-manager': 7.18.0 '@typescript-eslint/types': 7.18.0 - '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.6.2) + '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.9.3) eslint: 8.57.1 transitivePeerDependencies: - supports-color @@ -2611,6 +2950,8 @@ snapshots: acorn@8.12.1: {} + acorn@8.15.0: {} + agent-base@6.0.2: dependencies: debug: 4.3.7 @@ -2628,8 +2969,6 @@ snapshots: ansi-regex@6.1.0: {} - ansi-sequence-parser@1.1.1: {} - ansi-styles@4.3.0: dependencies: color-convert: 2.0.1 @@ -2638,11 +2977,6 @@ snapshots: any-promise@1.3.0: {} - anymatch@3.1.3: - dependencies: - normalize-path: 3.0.0 - picomatch: 2.3.1 - aproba@2.0.0: {} are-we-there-yet@2.0.0: @@ -2716,8 +3050,6 @@ snapshots: balanced-match@1.0.2: {} - binary-extensions@2.3.0: {} - bindings@1.5.0: dependencies: file-uri-to-path: 1.0.0 @@ -2737,9 +3069,9 @@ snapshots: dependencies: fill-range: 7.1.1 - bundle-require@5.0.0(esbuild@0.23.1): + bundle-require@5.1.0(esbuild@0.25.10): dependencies: - esbuild: 0.23.1 + esbuild: 0.25.10 load-tsconfig: 0.2.5 cac@6.7.14: {} @@ -2759,17 +3091,11 @@ snapshots: chalk@5.3.0: {} - chokidar@3.6.0: + chalk@5.6.2: {} + + chokidar@4.0.3: dependencies: - anymatch: 3.1.3 - braces: 3.0.3 - glob-parent: 5.1.2 - is-binary-path: 2.1.0 - is-glob: 4.0.3 - normalize-path: 3.0.0 - readdirp: 3.6.0 - optionalDependencies: - fsevents: 2.3.3 + readdirp: 4.1.2 chownr@2.0.0: {} @@ -2802,7 +3128,7 @@ snapshots: color-support@1.1.3: {} - commander@12.1.0: {} + commander@14.0.0: {} commander@4.1.1: {} @@ -2821,7 +3147,9 @@ snapshots: semver: 7.6.3 well-known-symbols: 2.0.0 - consola@3.2.3: {} + confbox@0.1.8: {} + + consola@3.4.2: {} console-control-strings@1.1.0: {} @@ -2845,6 +3173,10 @@ snapshots: dependencies: ms: 2.1.3 + debug@4.4.3: + dependencies: + ms: 2.1.3 + deep-is@0.1.4: {} delegates@1.0.0: {} @@ -2869,32 +3201,36 @@ snapshots: emoji-regex@9.2.2: {} - esbuild@0.23.1: + entities@4.5.0: {} + + esbuild@0.25.10: optionalDependencies: - '@esbuild/aix-ppc64': 0.23.1 - '@esbuild/android-arm': 0.23.1 - '@esbuild/android-arm64': 0.23.1 - '@esbuild/android-x64': 0.23.1 - '@esbuild/darwin-arm64': 0.23.1 - '@esbuild/darwin-x64': 0.23.1 - '@esbuild/freebsd-arm64': 0.23.1 - '@esbuild/freebsd-x64': 0.23.1 - '@esbuild/linux-arm': 0.23.1 - '@esbuild/linux-arm64': 0.23.1 - '@esbuild/linux-ia32': 0.23.1 - '@esbuild/linux-loong64': 0.23.1 - '@esbuild/linux-mips64el': 0.23.1 - '@esbuild/linux-ppc64': 0.23.1 - '@esbuild/linux-riscv64': 0.23.1 - '@esbuild/linux-s390x': 0.23.1 - '@esbuild/linux-x64': 0.23.1 - '@esbuild/netbsd-x64': 0.23.1 - '@esbuild/openbsd-arm64': 0.23.1 - '@esbuild/openbsd-x64': 0.23.1 - '@esbuild/sunos-x64': 0.23.1 - '@esbuild/win32-arm64': 0.23.1 - '@esbuild/win32-ia32': 0.23.1 - '@esbuild/win32-x64': 0.23.1 + '@esbuild/aix-ppc64': 0.25.10 + '@esbuild/android-arm': 0.25.10 + '@esbuild/android-arm64': 0.25.10 + '@esbuild/android-x64': 0.25.10 + '@esbuild/darwin-arm64': 0.25.10 + '@esbuild/darwin-x64': 0.25.10 + '@esbuild/freebsd-arm64': 0.25.10 + '@esbuild/freebsd-x64': 0.25.10 + '@esbuild/linux-arm': 0.25.10 + '@esbuild/linux-arm64': 0.25.10 + '@esbuild/linux-ia32': 0.25.10 + '@esbuild/linux-loong64': 0.25.10 + '@esbuild/linux-mips64el': 0.25.10 + '@esbuild/linux-ppc64': 0.25.10 + '@esbuild/linux-riscv64': 0.25.10 + '@esbuild/linux-s390x': 0.25.10 + '@esbuild/linux-x64': 0.25.10 + '@esbuild/netbsd-arm64': 0.25.10 + '@esbuild/netbsd-x64': 0.25.10 + '@esbuild/openbsd-arm64': 0.25.10 + '@esbuild/openbsd-x64': 0.25.10 + '@esbuild/openharmony-arm64': 0.25.10 + '@esbuild/sunos-x64': 0.25.10 + '@esbuild/win32-arm64': 0.25.10 + '@esbuild/win32-ia32': 0.25.10 + '@esbuild/win32-x64': 0.25.10 escalade@3.2.0: {} @@ -2904,12 +3240,12 @@ snapshots: escape-string-regexp@5.0.0: {} - eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2): + eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3): dependencies: - '@typescript-eslint/utils': 5.62.0(eslint@8.57.1)(typescript@5.6.2) + '@typescript-eslint/utils': 5.62.0(eslint@8.57.1)(typescript@5.9.3) eslint: 8.57.1 optionalDependencies: - '@typescript-eslint/eslint-plugin': 7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2) + '@typescript-eslint/eslint-plugin': 7.18.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3) transitivePeerDependencies: - supports-color - typescript @@ -2929,14 +3265,14 @@ snapshots: natural-compare: 1.4.0 requireindex: 1.2.0 - eslint-plugin-typescript-sort-keys@3.2.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2): + eslint-plugin-typescript-sort-keys@3.2.0(@typescript-eslint/parser@7.18.0(eslint@8.57.1)(typescript@5.9.3))(eslint@8.57.1)(typescript@5.9.3): dependencies: - '@typescript-eslint/experimental-utils': 5.62.0(eslint@8.57.1)(typescript@5.6.2) - '@typescript-eslint/parser': 7.18.0(eslint@8.57.1)(typescript@5.6.2) + '@typescript-eslint/experimental-utils': 5.62.0(eslint@8.57.1)(typescript@5.9.3) + '@typescript-eslint/parser': 7.18.0(eslint@8.57.1)(typescript@5.9.3) eslint: 8.57.1 json-schema: 0.4.0 natural-compare-lite: 1.4.0 - typescript: 5.6.2 + typescript: 5.9.3 transitivePeerDependencies: - supports-color @@ -3027,18 +3363,6 @@ snapshots: esutils@2.0.3: {} - execa@5.1.1: - dependencies: - cross-spawn: 7.0.3 - get-stream: 6.0.1 - human-signals: 2.1.0 - is-stream: 2.0.1 - merge-stream: 2.0.0 - npm-run-path: 4.0.1 - onetime: 5.1.2 - signal-exit: 3.0.7 - strip-final-newline: 2.0.0 - execa@7.2.0: dependencies: cross-spawn: 7.0.3 @@ -3073,9 +3397,9 @@ snapshots: dependencies: reusify: 1.0.4 - fdir@6.4.0(picomatch@4.0.2): + fdir@6.5.0(picomatch@4.0.3): optionalDependencies: - picomatch: 4.0.2 + picomatch: 4.0.3 figures@6.1.0: dependencies: @@ -3098,6 +3422,12 @@ snapshots: locate-path: 6.0.0 path-exists: 4.0.0 + fix-dts-default-cjs-exports@1.0.1: + dependencies: + magic-string: 0.30.19 + mlly: 1.8.0 + rollup: 4.52.3 + flat-cache@3.2.0: dependencies: flatted: 3.3.1 @@ -3201,8 +3531,6 @@ snapshots: transitivePeerDependencies: - supports-color - human-signals@2.1.0: {} - human-signals@4.3.1: {} ignore-by-default@2.1.0: {} @@ -3227,10 +3555,6 @@ snapshots: irregular-plurals@3.5.0: {} - is-binary-path@2.1.0: - dependencies: - binary-extensions: 2.3.0 - is-extglob@2.1.1: {} is-fullwidth-code-point@3.0.0: {} @@ -3249,8 +3573,6 @@ snapshots: is-promise@4.0.0: {} - is-stream@2.0.1: {} - is-stream@3.0.0: {} is-unicode-supported@2.1.0: {} @@ -3284,8 +3606,6 @@ snapshots: json-stable-stringify-without-jsonify@1.0.1: {} - jsonc-parser@3.3.1: {} - keyv@4.5.4: dependencies: json-buffer: 3.0.1 @@ -3299,6 +3619,10 @@ snapshots: lines-and-columns@1.2.4: {} + linkify-it@5.0.0: + dependencies: + uc.micro: 2.1.0 + load-json-file@7.0.1: {} load-tsconfig@0.2.5: {} @@ -3317,11 +3641,22 @@ snapshots: lunr@2.3.9: {} + magic-string@0.30.19: + dependencies: + '@jridgewell/sourcemap-codec': 1.5.5 + make-dir@3.1.0: dependencies: semver: 6.3.1 - marked@4.3.0: {} + markdown-it@14.1.0: + dependencies: + argparse: 2.0.1 + entities: 4.5.0 + linkify-it: 5.0.0 + mdurl: 2.0.0 + punycode.js: 2.3.1 + uc.micro: 2.1.0 matcher@5.0.0: dependencies: @@ -3331,6 +3666,8 @@ snapshots: dependencies: blueimp-md5: 2.19.0 + mdurl@2.0.0: {} + memoize@10.0.0: dependencies: mimic-function: 5.0.1 @@ -3344,8 +3681,6 @@ snapshots: braces: 3.0.3 picomatch: 2.3.1 - mimic-fn@2.1.0: {} - mimic-fn@4.0.0: {} mimic-function@5.0.1: {} @@ -3373,6 +3708,13 @@ snapshots: mkdirp@1.0.4: {} + mlly@1.8.0: + dependencies: + acorn: 8.15.0 + pathe: 2.0.3 + pkg-types: 1.3.1 + ufo: 1.6.1 + ms@2.1.3: {} mz@2.7.0: @@ -3397,12 +3739,6 @@ snapshots: dependencies: abbrev: 1.1.1 - normalize-path@3.0.0: {} - - npm-run-path@4.0.1: - dependencies: - path-key: 3.1.1 - npm-run-path@5.3.0: dependencies: path-key: 4.0.0 @@ -3420,10 +3756,6 @@ snapshots: dependencies: wrappy: 1.0.2 - onetime@5.1.2: - dependencies: - mimic-fn: 2.1.0 - onetime@6.0.0: dependencies: mimic-fn: 4.0.0 @@ -3477,32 +3809,44 @@ snapshots: path-type@5.0.0: {} - picocolors@1.1.0: {} + pathe@2.0.3: {} + + picocolors@1.1.1: {} picomatch@2.3.1: {} picomatch@3.0.1: {} - picomatch@4.0.2: {} + picomatch@4.0.3: {} pirates@4.0.6: {} + pkg-types@1.3.1: + dependencies: + confbox: 0.1.8 + mlly: 1.8.0 + pathe: 2.0.3 + plur@5.1.0: dependencies: irregular-plurals: 3.5.0 - postcss-load-config@6.0.1: + postcss-load-config@6.0.1(yaml@2.8.1): dependencies: lilconfig: 3.1.2 + optionalDependencies: + yaml: 2.8.1 prelude-ls@1.2.1: {} - prettier@3.3.3: {} + prettier@3.6.2: {} pretty-ms@9.1.0: dependencies: parse-ms: 4.0.0 + punycode.js@2.3.1: {} + punycode@2.3.1: {} queue-microtask@1.2.3: {} @@ -3513,9 +3857,7 @@ snapshots: string_decoder: 1.3.0 util-deprecate: 1.0.2 - readdirp@3.6.0: - dependencies: - picomatch: 2.3.1 + readdirp@4.1.2: {} require-directory@2.1.1: {} @@ -3539,26 +3881,32 @@ snapshots: dependencies: glob: 10.4.5 - rollup@4.22.5: + rollup@4.52.3: dependencies: - '@types/estree': 1.0.6 + '@types/estree': 1.0.8 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.22.5 - '@rollup/rollup-android-arm64': 4.22.5 - '@rollup/rollup-darwin-arm64': 4.22.5 - '@rollup/rollup-darwin-x64': 4.22.5 - '@rollup/rollup-linux-arm-gnueabihf': 4.22.5 - '@rollup/rollup-linux-arm-musleabihf': 4.22.5 - '@rollup/rollup-linux-arm64-gnu': 4.22.5 - '@rollup/rollup-linux-arm64-musl': 4.22.5 - '@rollup/rollup-linux-powerpc64le-gnu': 4.22.5 - '@rollup/rollup-linux-riscv64-gnu': 4.22.5 - '@rollup/rollup-linux-s390x-gnu': 4.22.5 - '@rollup/rollup-linux-x64-gnu': 4.22.5 - '@rollup/rollup-linux-x64-musl': 4.22.5 - '@rollup/rollup-win32-arm64-msvc': 4.22.5 - '@rollup/rollup-win32-ia32-msvc': 4.22.5 - '@rollup/rollup-win32-x64-msvc': 4.22.5 + '@rollup/rollup-android-arm-eabi': 4.52.3 + '@rollup/rollup-android-arm64': 4.52.3 + '@rollup/rollup-darwin-arm64': 4.52.3 + '@rollup/rollup-darwin-x64': 4.52.3 + '@rollup/rollup-freebsd-arm64': 4.52.3 + '@rollup/rollup-freebsd-x64': 4.52.3 + '@rollup/rollup-linux-arm-gnueabihf': 4.52.3 + '@rollup/rollup-linux-arm-musleabihf': 4.52.3 + '@rollup/rollup-linux-arm64-gnu': 4.52.3 + '@rollup/rollup-linux-arm64-musl': 4.52.3 + '@rollup/rollup-linux-loong64-gnu': 4.52.3 + '@rollup/rollup-linux-ppc64-gnu': 4.52.3 + '@rollup/rollup-linux-riscv64-gnu': 4.52.3 + '@rollup/rollup-linux-riscv64-musl': 4.52.3 + '@rollup/rollup-linux-s390x-gnu': 4.52.3 + '@rollup/rollup-linux-x64-gnu': 4.52.3 + '@rollup/rollup-linux-x64-musl': 4.52.3 + '@rollup/rollup-openharmony-arm64': 4.52.3 + '@rollup/rollup-win32-arm64-msvc': 4.52.3 + '@rollup/rollup-win32-ia32-msvc': 4.52.3 + '@rollup/rollup-win32-x64-gnu': 4.52.3 + '@rollup/rollup-win32-x64-msvc': 4.52.3 fsevents: 2.3.3 run-parallel@1.2.0: @@ -3583,13 +3931,6 @@ snapshots: shebang-regex@3.0.0: {} - shiki@0.14.7: - dependencies: - ansi-sequence-parser: 1.1.1 - jsonc-parser: 3.3.1 - vscode-oniguruma: 1.7.0 - vscode-textmate: 8.0.0 - signal-exit@3.0.7: {} signal-exit@4.1.0: {} @@ -3643,8 +3984,6 @@ snapshots: dependencies: ansi-regex: 6.1.0 - strip-final-newline@2.0.0: {} - strip-final-newline@3.0.0: {} strip-json-comments@3.1.1: {} @@ -3693,10 +4032,12 @@ snapshots: time-zone@1.0.0: {} - tinyglobby@0.2.8: + tinyexec@0.3.2: {} + + tinyglobby@0.2.15: dependencies: - fdir: 6.4.0(picomatch@4.0.2) - picomatch: 4.0.2 + fdir: 6.5.0(picomatch@4.0.3) + picomatch: 4.0.3 to-regex-range@5.0.1: dependencies: @@ -3710,44 +4051,45 @@ snapshots: tree-kill@1.2.2: {} - ts-api-utils@1.3.0(typescript@5.6.2): + ts-api-utils@1.3.0(typescript@5.9.3): dependencies: - typescript: 5.6.2 + typescript: 5.9.3 ts-interface-checker@0.1.13: {} tslib@1.14.1: {} - tsup@8.3.0(typescript@5.6.2): + tsup@8.5.0(typescript@5.9.3)(yaml@2.8.1): dependencies: - bundle-require: 5.0.0(esbuild@0.23.1) + bundle-require: 5.1.0(esbuild@0.25.10) cac: 6.7.14 - chokidar: 3.6.0 - consola: 3.2.3 - debug: 4.3.7 - esbuild: 0.23.1 - execa: 5.1.1 + chokidar: 4.0.3 + consola: 3.4.2 + debug: 4.4.3 + esbuild: 0.25.10 + fix-dts-default-cjs-exports: 1.0.1 joycon: 3.1.1 - picocolors: 1.1.0 - postcss-load-config: 6.0.1 + picocolors: 1.1.1 + postcss-load-config: 6.0.1(yaml@2.8.1) resolve-from: 5.0.0 - rollup: 4.22.5 + rollup: 4.52.3 source-map: 0.8.0-beta.0 sucrase: 3.35.0 - tinyglobby: 0.2.8 + tinyexec: 0.3.2 + tinyglobby: 0.2.15 tree-kill: 1.2.2 optionalDependencies: - typescript: 5.6.2 + typescript: 5.9.3 transitivePeerDependencies: - jiti - supports-color - tsx - yaml - tsutils@3.21.0(typescript@5.6.2): + tsutils@3.21.0(typescript@5.9.3): dependencies: tslib: 1.14.1 - typescript: 5.6.2 + typescript: 5.9.3 type-check@0.4.0: dependencies: @@ -3757,21 +4099,28 @@ snapshots: type-fest@0.20.2: {} - typedoc-plugin-missing-exports@2.3.0(typedoc@0.25.13(typescript@5.6.2)): + typedoc-plugin-missing-exports@4.1.0(typedoc@0.28.13(typescript@5.9.3)): dependencies: - typedoc: 0.25.13(typescript@5.6.2) + typedoc: 0.28.13(typescript@5.9.3) - typedoc@0.25.13(typescript@5.6.2): + typedoc@0.28.13(typescript@5.9.3): dependencies: + '@gerrit0/mini-shiki': 3.13.0 lunr: 2.3.9 - marked: 4.3.0 + markdown-it: 14.1.0 minimatch: 9.0.5 - shiki: 0.14.7 - typescript: 5.6.2 + typescript: 5.9.3 + yaml: 2.8.1 + + typescript@5.9.3: {} + + uc.micro@2.1.0: {} - typescript@5.6.2: {} + ufo@1.6.1: {} - undici-types@6.19.8: {} + undici-types@7.13.0: {} + + undici-types@7.16.0: {} unicorn-magic@0.1.0: {} @@ -3781,10 +4130,6 @@ snapshots: util-deprecate@1.0.2: {} - vscode-oniguruma@1.7.0: {} - - vscode-textmate@8.0.0: {} - webidl-conversions@3.0.1: {} webidl-conversions@4.0.2: {} @@ -3837,6 +4182,8 @@ snapshots: yallist@4.0.0: {} + yaml@2.8.1: {} + yargs-parser@21.1.1: {} yargs@17.7.2: diff --git a/clients/js/src/generated/index.ts b/clients/js/src/generated/index.ts index d5f8838..b1631cf 100644 --- a/clients/js/src/generated/index.ts +++ b/clients/js/src/generated/index.ts @@ -1,9 +1,9 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ export * from './instructions'; diff --git a/clients/js/src/generated/instructions/close.ts b/clients/js/src/generated/instructions/close.ts index fe5da03..38187e5 100644 --- a/clients/js/src/generated/instructions/close.ts +++ b/clients/js/src/generated/instructions/close.ts @@ -1,9 +1,9 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ import { @@ -13,20 +13,21 @@ import { getU32Decoder, getU32Encoder, transformEncoder, + type AccountMeta, + type AccountSignerMeta, type Address, - type Codec, - type Decoder, - type Encoder, - type IAccountMeta, - type IAccountSignerMeta, - type IInstruction, - type IInstructionWithAccounts, - type IInstructionWithData, + type FixedSizeCodec, + type FixedSizeDecoder, + type FixedSizeEncoder, + type Instruction, + type InstructionWithAccounts, + type InstructionWithData, type ReadonlyAccount, type ReadonlySignerAccount, + type ReadonlyUint8Array, type TransactionSigner, type WritableAccount, -} from '@solana/web3.js'; +} from '@solana/kit'; import { LOADER_V3_PROGRAM_ADDRESS } from '../programs'; import { getAccountMetaFactory, type ResolvedAccount } from '../shared'; @@ -40,14 +41,14 @@ export type CloseInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, TAccountBufferOrProgramDataAccount extends | string - | IAccountMeta = string, - TAccountDestinationAccount extends string | IAccountMeta = string, - TAccountAuthority extends string | IAccountMeta = string, - TAccountProgramAccount extends string | IAccountMeta = string, - TRemainingAccounts extends readonly IAccountMeta[] = [], -> = IInstruction & - IInstructionWithData & - IInstructionWithAccounts< + | AccountMeta = string, + TAccountDestinationAccount extends string | AccountMeta = string, + TAccountAuthority extends string | AccountMeta = string, + TAccountProgramAccount extends string | AccountMeta = string, + TRemainingAccounts extends readonly AccountMeta[] = [], +> = Instruction & + InstructionWithData & + InstructionWithAccounts< [ TAccountBufferOrProgramDataAccount extends string ? WritableAccount @@ -57,7 +58,7 @@ export type CloseInstruction< : TAccountDestinationAccount, TAccountAuthority extends string ? ReadonlySignerAccount & - IAccountSignerMeta + AccountSignerMeta : TAccountAuthority, TAccountProgramAccount extends string ? ReadonlyAccount @@ -70,18 +71,18 @@ export type CloseInstructionData = { discriminator: number }; export type CloseInstructionDataArgs = {}; -export function getCloseInstructionDataEncoder(): Encoder { +export function getCloseInstructionDataEncoder(): FixedSizeEncoder { return transformEncoder( getStructEncoder([['discriminator', getU32Encoder()]]), (value) => ({ ...value, discriminator: CLOSE_DISCRIMINATOR }) ); } -export function getCloseInstructionDataDecoder(): Decoder { +export function getCloseInstructionDataDecoder(): FixedSizeDecoder { return getStructDecoder([['discriminator', getU32Decoder()]]); } -export function getCloseInstructionDataCodec(): Codec< +export function getCloseInstructionDataCodec(): FixedSizeCodec< CloseInstructionDataArgs, CloseInstructionData > { @@ -112,22 +113,24 @@ export function getCloseInstruction< TAccountDestinationAccount extends string, TAccountAuthority extends string, TAccountProgramAccount extends string, + TProgramAddress extends Address = typeof LOADER_V3_PROGRAM_ADDRESS, >( input: CloseInput< TAccountBufferOrProgramDataAccount, TAccountDestinationAccount, TAccountAuthority, TAccountProgramAccount - > + >, + config?: { programAddress?: TProgramAddress } ): CloseInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountBufferOrProgramDataAccount, TAccountDestinationAccount, TAccountAuthority, TAccountProgramAccount > { // Program address. - const programAddress = LOADER_V3_PROGRAM_ADDRESS; + const programAddress = config?.programAddress ?? LOADER_V3_PROGRAM_ADDRESS; // Original accounts. const originalAccounts = { @@ -148,29 +151,27 @@ export function getCloseInstruction< >; const getAccountMeta = getAccountMetaFactory(programAddress, 'programId'); - const instruction = { + return Object.freeze({ accounts: [ getAccountMeta(accounts.bufferOrProgramDataAccount), getAccountMeta(accounts.destinationAccount), getAccountMeta(accounts.authority), getAccountMeta(accounts.programAccount), ], - programAddress, data: getCloseInstructionDataEncoder().encode({}), + programAddress, } as CloseInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountBufferOrProgramDataAccount, TAccountDestinationAccount, TAccountAuthority, TAccountProgramAccount - >; - - return instruction; + >); } export type ParsedCloseInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[], > = { programAddress: Address; accounts: { @@ -188,11 +189,11 @@ export type ParsedCloseInstruction< export function parseCloseInstruction< TProgram extends string, - TAccountMetas extends readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[], >( - instruction: IInstruction & - IInstructionWithAccounts & - IInstructionWithData + instruction: Instruction & + InstructionWithAccounts & + InstructionWithData ): ParsedCloseInstruction { if (instruction.accounts.length < 4) { // TODO: Coded error. @@ -200,7 +201,7 @@ export function parseCloseInstruction< } let accountIndex = 0; const getNextAccount = () => { - const accountMeta = instruction.accounts![accountIndex]!; + const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!; accountIndex += 1; return accountMeta; }; diff --git a/clients/js/src/generated/instructions/deployWithMaxDataLen.ts b/clients/js/src/generated/instructions/deployWithMaxDataLen.ts index 186d5f5..0e16b20 100644 --- a/clients/js/src/generated/instructions/deployWithMaxDataLen.ts +++ b/clients/js/src/generated/instructions/deployWithMaxDataLen.ts @@ -1,9 +1,9 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ import { @@ -15,21 +15,22 @@ import { getU64Decoder, getU64Encoder, transformEncoder, + type AccountMeta, + type AccountSignerMeta, type Address, - type Codec, - type Decoder, - type Encoder, - type IAccountMeta, - type IAccountSignerMeta, - type IInstruction, - type IInstructionWithAccounts, - type IInstructionWithData, + type FixedSizeCodec, + type FixedSizeDecoder, + type FixedSizeEncoder, + type Instruction, + type InstructionWithAccounts, + type InstructionWithData, type ReadonlyAccount, type ReadonlySignerAccount, + type ReadonlyUint8Array, type TransactionSigner, type WritableAccount, type WritableSignerAccount, -} from '@solana/web3.js'; +} from '@solana/kit'; import { LOADER_V3_PROGRAM_ADDRESS } from '../programs'; import { getAccountMetaFactory, type ResolvedAccount } from '../shared'; @@ -41,28 +42,28 @@ export function getDeployWithMaxDataLenDiscriminatorBytes() { export type DeployWithMaxDataLenInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountPayerAccount extends string | IAccountMeta = string, - TAccountProgramDataAccount extends string | IAccountMeta = string, - TAccountProgramAccount extends string | IAccountMeta = string, - TAccountBufferAccount extends string | IAccountMeta = string, + TAccountPayerAccount extends string | AccountMeta = string, + TAccountProgramDataAccount extends string | AccountMeta = string, + TAccountProgramAccount extends string | AccountMeta = string, + TAccountBufferAccount extends string | AccountMeta = string, TAccountRentSysvar extends | string - | IAccountMeta = 'SysvarRent111111111111111111111111111111111', + | AccountMeta = 'SysvarRent111111111111111111111111111111111', TAccountClockSysvar extends | string - | IAccountMeta = 'SysvarC1ock11111111111111111111111111111111', + | AccountMeta = 'SysvarC1ock11111111111111111111111111111111', TAccountSystemProgram extends | string - | IAccountMeta = '11111111111111111111111111111111', - TAccountAuthority extends string | IAccountMeta = string, - TRemainingAccounts extends readonly IAccountMeta[] = [], -> = IInstruction & - IInstructionWithData & - IInstructionWithAccounts< + | AccountMeta = '11111111111111111111111111111111', + TAccountAuthority extends string | AccountMeta = string, + TRemainingAccounts extends readonly AccountMeta[] = [], +> = Instruction & + InstructionWithData & + InstructionWithAccounts< [ TAccountPayerAccount extends string ? WritableSignerAccount & - IAccountSignerMeta + AccountSignerMeta : TAccountPayerAccount, TAccountProgramDataAccount extends string ? WritableAccount @@ -84,7 +85,7 @@ export type DeployWithMaxDataLenInstruction< : TAccountSystemProgram, TAccountAuthority extends string ? ReadonlySignerAccount & - IAccountSignerMeta + AccountSignerMeta : TAccountAuthority, ...TRemainingAccounts, ] @@ -99,7 +100,7 @@ export type DeployWithMaxDataLenInstructionDataArgs = { maxDataLen: number | bigint; }; -export function getDeployWithMaxDataLenInstructionDataEncoder(): Encoder { +export function getDeployWithMaxDataLenInstructionDataEncoder(): FixedSizeEncoder { return transformEncoder( getStructEncoder([ ['discriminator', getU32Encoder()], @@ -112,14 +113,14 @@ export function getDeployWithMaxDataLenInstructionDataEncoder(): Encoder { +export function getDeployWithMaxDataLenInstructionDataDecoder(): FixedSizeDecoder { return getStructDecoder([ ['discriminator', getU32Decoder()], ['maxDataLen', getU64Decoder()], ]); } -export function getDeployWithMaxDataLenInstructionDataCodec(): Codec< +export function getDeployWithMaxDataLenInstructionDataCodec(): FixedSizeCodec< DeployWithMaxDataLenInstructionDataArgs, DeployWithMaxDataLenInstructionData > { @@ -167,6 +168,7 @@ export function getDeployWithMaxDataLenInstruction< TAccountClockSysvar extends string, TAccountSystemProgram extends string, TAccountAuthority extends string, + TProgramAddress extends Address = typeof LOADER_V3_PROGRAM_ADDRESS, >( input: DeployWithMaxDataLenInput< TAccountPayerAccount, @@ -177,9 +179,10 @@ export function getDeployWithMaxDataLenInstruction< TAccountClockSysvar, TAccountSystemProgram, TAccountAuthority - > + >, + config?: { programAddress?: TProgramAddress } ): DeployWithMaxDataLenInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountPayerAccount, TAccountProgramDataAccount, TAccountProgramAccount, @@ -190,7 +193,7 @@ export function getDeployWithMaxDataLenInstruction< TAccountAuthority > { // Program address. - const programAddress = LOADER_V3_PROGRAM_ADDRESS; + const programAddress = config?.programAddress ?? LOADER_V3_PROGRAM_ADDRESS; // Original accounts. const originalAccounts = { @@ -229,7 +232,7 @@ export function getDeployWithMaxDataLenInstruction< } const getAccountMeta = getAccountMetaFactory(programAddress, 'programId'); - const instruction = { + return Object.freeze({ accounts: [ getAccountMeta(accounts.payerAccount), getAccountMeta(accounts.programDataAccount), @@ -240,12 +243,12 @@ export function getDeployWithMaxDataLenInstruction< getAccountMeta(accounts.systemProgram), getAccountMeta(accounts.authority), ], - programAddress, data: getDeployWithMaxDataLenInstructionDataEncoder().encode( args as DeployWithMaxDataLenInstructionDataArgs ), + programAddress, } as DeployWithMaxDataLenInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountPayerAccount, TAccountProgramDataAccount, TAccountProgramAccount, @@ -254,14 +257,12 @@ export function getDeployWithMaxDataLenInstruction< TAccountClockSysvar, TAccountSystemProgram, TAccountAuthority - >; - - return instruction; + >); } export type ParsedDeployWithMaxDataLenInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[], > = { programAddress: Address; accounts: { @@ -287,11 +288,11 @@ export type ParsedDeployWithMaxDataLenInstruction< export function parseDeployWithMaxDataLenInstruction< TProgram extends string, - TAccountMetas extends readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[], >( - instruction: IInstruction & - IInstructionWithAccounts & - IInstructionWithData + instruction: Instruction & + InstructionWithAccounts & + InstructionWithData ): ParsedDeployWithMaxDataLenInstruction { if (instruction.accounts.length < 8) { // TODO: Coded error. @@ -299,7 +300,7 @@ export function parseDeployWithMaxDataLenInstruction< } let accountIndex = 0; const getNextAccount = () => { - const accountMeta = instruction.accounts![accountIndex]!; + const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!; accountIndex += 1; return accountMeta; }; diff --git a/clients/js/src/generated/instructions/extendProgram.ts b/clients/js/src/generated/instructions/extendProgram.ts index a0e1888..c514bbd 100644 --- a/clients/js/src/generated/instructions/extendProgram.ts +++ b/clients/js/src/generated/instructions/extendProgram.ts @@ -1,9 +1,9 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ import { @@ -13,20 +13,21 @@ import { getU32Decoder, getU32Encoder, transformEncoder, + type AccountMeta, + type AccountSignerMeta, type Address, - type Codec, - type Decoder, - type Encoder, - type IAccountMeta, - type IAccountSignerMeta, - type IInstruction, - type IInstructionWithAccounts, - type IInstructionWithData, + type FixedSizeCodec, + type FixedSizeDecoder, + type FixedSizeEncoder, + type Instruction, + type InstructionWithAccounts, + type InstructionWithData, type ReadonlyAccount, + type ReadonlyUint8Array, type TransactionSigner, type WritableAccount, type WritableSignerAccount, -} from '@solana/web3.js'; +} from '@solana/kit'; import { LOADER_V3_PROGRAM_ADDRESS } from '../programs'; import { getAccountMetaFactory, type ResolvedAccount } from '../shared'; @@ -38,14 +39,14 @@ export function getExtendProgramDiscriminatorBytes() { export type ExtendProgramInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountProgramDataAccount extends string | IAccountMeta = string, - TAccountProgramAccount extends string | IAccountMeta = string, - TAccountSystemProgram extends string | IAccountMeta = string, - TAccountPayer extends string | IAccountMeta = string, - TRemainingAccounts extends readonly IAccountMeta[] = [], -> = IInstruction & - IInstructionWithData & - IInstructionWithAccounts< + TAccountProgramDataAccount extends string | AccountMeta = string, + TAccountProgramAccount extends string | AccountMeta = string, + TAccountSystemProgram extends string | AccountMeta = string, + TAccountPayer extends string | AccountMeta = string, + TRemainingAccounts extends readonly AccountMeta[] = [], +> = Instruction & + InstructionWithData & + InstructionWithAccounts< [ TAccountProgramDataAccount extends string ? WritableAccount @@ -58,7 +59,7 @@ export type ExtendProgramInstruction< : TAccountSystemProgram, TAccountPayer extends string ? WritableSignerAccount & - IAccountSignerMeta + AccountSignerMeta : TAccountPayer, ...TRemainingAccounts, ] @@ -71,7 +72,7 @@ export type ExtendProgramInstructionData = { export type ExtendProgramInstructionDataArgs = { additionalBytes: number }; -export function getExtendProgramInstructionDataEncoder(): Encoder { +export function getExtendProgramInstructionDataEncoder(): FixedSizeEncoder { return transformEncoder( getStructEncoder([ ['discriminator', getU32Encoder()], @@ -81,14 +82,14 @@ export function getExtendProgramInstructionDataEncoder(): Encoder { +export function getExtendProgramInstructionDataDecoder(): FixedSizeDecoder { return getStructDecoder([ ['discriminator', getU32Decoder()], ['additionalBytes', getU32Decoder()], ]); } -export function getExtendProgramInstructionDataCodec(): Codec< +export function getExtendProgramInstructionDataCodec(): FixedSizeCodec< ExtendProgramInstructionDataArgs, ExtendProgramInstructionData > { @@ -120,22 +121,24 @@ export function getExtendProgramInstruction< TAccountProgramAccount extends string, TAccountSystemProgram extends string, TAccountPayer extends string, + TProgramAddress extends Address = typeof LOADER_V3_PROGRAM_ADDRESS, >( input: ExtendProgramInput< TAccountProgramDataAccount, TAccountProgramAccount, TAccountSystemProgram, TAccountPayer - > + >, + config?: { programAddress?: TProgramAddress } ): ExtendProgramInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountProgramDataAccount, TAccountProgramAccount, TAccountSystemProgram, TAccountPayer > { // Program address. - const programAddress = LOADER_V3_PROGRAM_ADDRESS; + const programAddress = config?.programAddress ?? LOADER_V3_PROGRAM_ADDRESS; // Original accounts. const originalAccounts = { @@ -156,31 +159,29 @@ export function getExtendProgramInstruction< const args = { ...input }; const getAccountMeta = getAccountMetaFactory(programAddress, 'programId'); - const instruction = { + return Object.freeze({ accounts: [ getAccountMeta(accounts.programDataAccount), getAccountMeta(accounts.programAccount), getAccountMeta(accounts.systemProgram), getAccountMeta(accounts.payer), ], - programAddress, data: getExtendProgramInstructionDataEncoder().encode( args as ExtendProgramInstructionDataArgs ), + programAddress, } as ExtendProgramInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountProgramDataAccount, TAccountProgramAccount, TAccountSystemProgram, TAccountPayer - >; - - return instruction; + >); } export type ParsedExtendProgramInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[], > = { programAddress: Address; accounts: { @@ -198,11 +199,11 @@ export type ParsedExtendProgramInstruction< export function parseExtendProgramInstruction< TProgram extends string, - TAccountMetas extends readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[], >( - instruction: IInstruction & - IInstructionWithAccounts & - IInstructionWithData + instruction: Instruction & + InstructionWithAccounts & + InstructionWithData ): ParsedExtendProgramInstruction { if (instruction.accounts.length < 4) { // TODO: Coded error. @@ -210,7 +211,7 @@ export function parseExtendProgramInstruction< } let accountIndex = 0; const getNextAccount = () => { - const accountMeta = instruction.accounts![accountIndex]!; + const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!; accountIndex += 1; return accountMeta; }; diff --git a/clients/js/src/generated/instructions/index.ts b/clients/js/src/generated/instructions/index.ts index 08f0400..7b60b36 100644 --- a/clients/js/src/generated/instructions/index.ts +++ b/clients/js/src/generated/instructions/index.ts @@ -1,9 +1,9 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ export * from './close'; diff --git a/clients/js/src/generated/instructions/initializeBuffer.ts b/clients/js/src/generated/instructions/initializeBuffer.ts index 03fadc9..9329deb 100644 --- a/clients/js/src/generated/instructions/initializeBuffer.ts +++ b/clients/js/src/generated/instructions/initializeBuffer.ts @@ -1,9 +1,9 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ import { @@ -13,17 +13,18 @@ import { getU32Decoder, getU32Encoder, transformEncoder, + type AccountMeta, type Address, - type Codec, - type Decoder, - type Encoder, - type IAccountMeta, - type IInstruction, - type IInstructionWithAccounts, - type IInstructionWithData, + type FixedSizeCodec, + type FixedSizeDecoder, + type FixedSizeEncoder, + type Instruction, + type InstructionWithAccounts, + type InstructionWithData, type ReadonlyAccount, + type ReadonlyUint8Array, type WritableAccount, -} from '@solana/web3.js'; +} from '@solana/kit'; import { LOADER_V3_PROGRAM_ADDRESS } from '../programs'; import { getAccountMetaFactory, type ResolvedAccount } from '../shared'; @@ -35,12 +36,12 @@ export function getInitializeBufferDiscriminatorBytes() { export type InitializeBufferInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountSourceAccount extends string | IAccountMeta = string, - TAccountBufferAuthority extends string | IAccountMeta = string, - TRemainingAccounts extends readonly IAccountMeta[] = [], -> = IInstruction & - IInstructionWithData & - IInstructionWithAccounts< + TAccountSourceAccount extends string | AccountMeta = string, + TAccountBufferAuthority extends string | AccountMeta = string, + TRemainingAccounts extends readonly AccountMeta[] = [], +> = Instruction & + InstructionWithData & + InstructionWithAccounts< [ TAccountSourceAccount extends string ? WritableAccount @@ -56,18 +57,18 @@ export type InitializeBufferInstructionData = { discriminator: number }; export type InitializeBufferInstructionDataArgs = {}; -export function getInitializeBufferInstructionDataEncoder(): Encoder { +export function getInitializeBufferInstructionDataEncoder(): FixedSizeEncoder { return transformEncoder( getStructEncoder([['discriminator', getU32Encoder()]]), (value) => ({ ...value, discriminator: INITIALIZE_BUFFER_DISCRIMINATOR }) ); } -export function getInitializeBufferInstructionDataDecoder(): Decoder { +export function getInitializeBufferInstructionDataDecoder(): FixedSizeDecoder { return getStructDecoder([['discriminator', getU32Decoder()]]); } -export function getInitializeBufferInstructionDataCodec(): Codec< +export function getInitializeBufferInstructionDataCodec(): FixedSizeCodec< InitializeBufferInstructionDataArgs, InitializeBufferInstructionData > { @@ -90,15 +91,17 @@ export type InitializeBufferInput< export function getInitializeBufferInstruction< TAccountSourceAccount extends string, TAccountBufferAuthority extends string, + TProgramAddress extends Address = typeof LOADER_V3_PROGRAM_ADDRESS, >( - input: InitializeBufferInput + input: InitializeBufferInput, + config?: { programAddress?: TProgramAddress } ): InitializeBufferInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountSourceAccount, TAccountBufferAuthority > { // Program address. - const programAddress = LOADER_V3_PROGRAM_ADDRESS; + const programAddress = config?.programAddress ?? LOADER_V3_PROGRAM_ADDRESS; // Original accounts. const originalAccounts = { @@ -114,25 +117,23 @@ export function getInitializeBufferInstruction< >; const getAccountMeta = getAccountMetaFactory(programAddress, 'programId'); - const instruction = { + return Object.freeze({ accounts: [ getAccountMeta(accounts.sourceAccount), getAccountMeta(accounts.bufferAuthority), ], - programAddress, data: getInitializeBufferInstructionDataEncoder().encode({}), + programAddress, } as InitializeBufferInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountSourceAccount, TAccountBufferAuthority - >; - - return instruction; + >); } export type ParsedInitializeBufferInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[], > = { programAddress: Address; accounts: { @@ -146,11 +147,11 @@ export type ParsedInitializeBufferInstruction< export function parseInitializeBufferInstruction< TProgram extends string, - TAccountMetas extends readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[], >( - instruction: IInstruction & - IInstructionWithAccounts & - IInstructionWithData + instruction: Instruction & + InstructionWithAccounts & + InstructionWithData ): ParsedInitializeBufferInstruction { if (instruction.accounts.length < 2) { // TODO: Coded error. @@ -158,7 +159,7 @@ export function parseInitializeBufferInstruction< } let accountIndex = 0; const getNextAccount = () => { - const accountMeta = instruction.accounts![accountIndex]!; + const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!; accountIndex += 1; return accountMeta; }; diff --git a/clients/js/src/generated/instructions/setAuthority.ts b/clients/js/src/generated/instructions/setAuthority.ts index e06f343..8a45a35 100644 --- a/clients/js/src/generated/instructions/setAuthority.ts +++ b/clients/js/src/generated/instructions/setAuthority.ts @@ -1,9 +1,9 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ import { @@ -13,20 +13,21 @@ import { getU32Decoder, getU32Encoder, transformEncoder, + type AccountMeta, + type AccountSignerMeta, type Address, - type Codec, - type Decoder, - type Encoder, - type IAccountMeta, - type IAccountSignerMeta, - type IInstruction, - type IInstructionWithAccounts, - type IInstructionWithData, + type FixedSizeCodec, + type FixedSizeDecoder, + type FixedSizeEncoder, + type Instruction, + type InstructionWithAccounts, + type InstructionWithData, type ReadonlyAccount, type ReadonlySignerAccount, + type ReadonlyUint8Array, type TransactionSigner, type WritableAccount, -} from '@solana/web3.js'; +} from '@solana/kit'; import { LOADER_V3_PROGRAM_ADDRESS } from '../programs'; import { getAccountMetaFactory, type ResolvedAccount } from '../shared'; @@ -40,20 +41,20 @@ export type SetAuthorityInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, TAccountBufferOrProgramDataAccount extends | string - | IAccountMeta = string, - TAccountCurrentAuthority extends string | IAccountMeta = string, - TAccountNewAuthority extends string | IAccountMeta = string, - TRemainingAccounts extends readonly IAccountMeta[] = [], -> = IInstruction & - IInstructionWithData & - IInstructionWithAccounts< + | AccountMeta = string, + TAccountCurrentAuthority extends string | AccountMeta = string, + TAccountNewAuthority extends string | AccountMeta = string, + TRemainingAccounts extends readonly AccountMeta[] = [], +> = Instruction & + InstructionWithData & + InstructionWithAccounts< [ TAccountBufferOrProgramDataAccount extends string ? WritableAccount : TAccountBufferOrProgramDataAccount, TAccountCurrentAuthority extends string ? ReadonlySignerAccount & - IAccountSignerMeta + AccountSignerMeta : TAccountCurrentAuthority, TAccountNewAuthority extends string ? ReadonlyAccount @@ -66,18 +67,18 @@ export type SetAuthorityInstructionData = { discriminator: number }; export type SetAuthorityInstructionDataArgs = {}; -export function getSetAuthorityInstructionDataEncoder(): Encoder { +export function getSetAuthorityInstructionDataEncoder(): FixedSizeEncoder { return transformEncoder( getStructEncoder([['discriminator', getU32Encoder()]]), (value) => ({ ...value, discriminator: SET_AUTHORITY_DISCRIMINATOR }) ); } -export function getSetAuthorityInstructionDataDecoder(): Decoder { +export function getSetAuthorityInstructionDataDecoder(): FixedSizeDecoder { return getStructDecoder([['discriminator', getU32Decoder()]]); } -export function getSetAuthorityInstructionDataCodec(): Codec< +export function getSetAuthorityInstructionDataCodec(): FixedSizeCodec< SetAuthorityInstructionDataArgs, SetAuthorityInstructionData > { @@ -104,20 +105,22 @@ export function getSetAuthorityInstruction< TAccountBufferOrProgramDataAccount extends string, TAccountCurrentAuthority extends string, TAccountNewAuthority extends string, + TProgramAddress extends Address = typeof LOADER_V3_PROGRAM_ADDRESS, >( input: SetAuthorityInput< TAccountBufferOrProgramDataAccount, TAccountCurrentAuthority, TAccountNewAuthority - > + >, + config?: { programAddress?: TProgramAddress } ): SetAuthorityInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountBufferOrProgramDataAccount, TAccountCurrentAuthority, TAccountNewAuthority > { // Program address. - const programAddress = LOADER_V3_PROGRAM_ADDRESS; + const programAddress = config?.programAddress ?? LOADER_V3_PROGRAM_ADDRESS; // Original accounts. const originalAccounts = { @@ -137,27 +140,25 @@ export function getSetAuthorityInstruction< >; const getAccountMeta = getAccountMetaFactory(programAddress, 'programId'); - const instruction = { + return Object.freeze({ accounts: [ getAccountMeta(accounts.bufferOrProgramDataAccount), getAccountMeta(accounts.currentAuthority), getAccountMeta(accounts.newAuthority), ], - programAddress, data: getSetAuthorityInstructionDataEncoder().encode({}), + programAddress, } as SetAuthorityInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountBufferOrProgramDataAccount, TAccountCurrentAuthority, TAccountNewAuthority - >; - - return instruction; + >); } export type ParsedSetAuthorityInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[], > = { programAddress: Address; accounts: { @@ -173,11 +174,11 @@ export type ParsedSetAuthorityInstruction< export function parseSetAuthorityInstruction< TProgram extends string, - TAccountMetas extends readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[], >( - instruction: IInstruction & - IInstructionWithAccounts & - IInstructionWithData + instruction: Instruction & + InstructionWithAccounts & + InstructionWithData ): ParsedSetAuthorityInstruction { if (instruction.accounts.length < 3) { // TODO: Coded error. @@ -185,7 +186,7 @@ export function parseSetAuthorityInstruction< } let accountIndex = 0; const getNextAccount = () => { - const accountMeta = instruction.accounts![accountIndex]!; + const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!; accountIndex += 1; return accountMeta; }; diff --git a/clients/js/src/generated/instructions/setAuthorityChecked.ts b/clients/js/src/generated/instructions/setAuthorityChecked.ts index ab84ae8..58a33a0 100644 --- a/clients/js/src/generated/instructions/setAuthorityChecked.ts +++ b/clients/js/src/generated/instructions/setAuthorityChecked.ts @@ -1,9 +1,9 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ import { @@ -13,19 +13,20 @@ import { getU32Decoder, getU32Encoder, transformEncoder, + type AccountMeta, + type AccountSignerMeta, type Address, - type Codec, - type Decoder, - type Encoder, - type IAccountMeta, - type IAccountSignerMeta, - type IInstruction, - type IInstructionWithAccounts, - type IInstructionWithData, + type FixedSizeCodec, + type FixedSizeDecoder, + type FixedSizeEncoder, + type Instruction, + type InstructionWithAccounts, + type InstructionWithData, type ReadonlySignerAccount, + type ReadonlyUint8Array, type TransactionSigner, type WritableAccount, -} from '@solana/web3.js'; +} from '@solana/kit'; import { LOADER_V3_PROGRAM_ADDRESS } from '../programs'; import { getAccountMetaFactory, type ResolvedAccount } from '../shared'; @@ -39,24 +40,24 @@ export type SetAuthorityCheckedInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, TAccountBufferOrProgramDataAccount extends | string - | IAccountMeta = string, - TAccountCurrentAuthority extends string | IAccountMeta = string, - TAccountNewAuthority extends string | IAccountMeta = string, - TRemainingAccounts extends readonly IAccountMeta[] = [], -> = IInstruction & - IInstructionWithData & - IInstructionWithAccounts< + | AccountMeta = string, + TAccountCurrentAuthority extends string | AccountMeta = string, + TAccountNewAuthority extends string | AccountMeta = string, + TRemainingAccounts extends readonly AccountMeta[] = [], +> = Instruction & + InstructionWithData & + InstructionWithAccounts< [ TAccountBufferOrProgramDataAccount extends string ? WritableAccount : TAccountBufferOrProgramDataAccount, TAccountCurrentAuthority extends string ? ReadonlySignerAccount & - IAccountSignerMeta + AccountSignerMeta : TAccountCurrentAuthority, TAccountNewAuthority extends string ? ReadonlySignerAccount & - IAccountSignerMeta + AccountSignerMeta : TAccountNewAuthority, ...TRemainingAccounts, ] @@ -66,7 +67,7 @@ export type SetAuthorityCheckedInstructionData = { discriminator: number }; export type SetAuthorityCheckedInstructionDataArgs = {}; -export function getSetAuthorityCheckedInstructionDataEncoder(): Encoder { +export function getSetAuthorityCheckedInstructionDataEncoder(): FixedSizeEncoder { return transformEncoder( getStructEncoder([['discriminator', getU32Encoder()]]), (value) => ({ @@ -76,11 +77,11 @@ export function getSetAuthorityCheckedInstructionDataEncoder(): Encoder { +export function getSetAuthorityCheckedInstructionDataDecoder(): FixedSizeDecoder { return getStructDecoder([['discriminator', getU32Decoder()]]); } -export function getSetAuthorityCheckedInstructionDataCodec(): Codec< +export function getSetAuthorityCheckedInstructionDataCodec(): FixedSizeCodec< SetAuthorityCheckedInstructionDataArgs, SetAuthorityCheckedInstructionData > { @@ -107,20 +108,22 @@ export function getSetAuthorityCheckedInstruction< TAccountBufferOrProgramDataAccount extends string, TAccountCurrentAuthority extends string, TAccountNewAuthority extends string, + TProgramAddress extends Address = typeof LOADER_V3_PROGRAM_ADDRESS, >( input: SetAuthorityCheckedInput< TAccountBufferOrProgramDataAccount, TAccountCurrentAuthority, TAccountNewAuthority - > + >, + config?: { programAddress?: TProgramAddress } ): SetAuthorityCheckedInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountBufferOrProgramDataAccount, TAccountCurrentAuthority, TAccountNewAuthority > { // Program address. - const programAddress = LOADER_V3_PROGRAM_ADDRESS; + const programAddress = config?.programAddress ?? LOADER_V3_PROGRAM_ADDRESS; // Original accounts. const originalAccounts = { @@ -140,27 +143,25 @@ export function getSetAuthorityCheckedInstruction< >; const getAccountMeta = getAccountMetaFactory(programAddress, 'programId'); - const instruction = { + return Object.freeze({ accounts: [ getAccountMeta(accounts.bufferOrProgramDataAccount), getAccountMeta(accounts.currentAuthority), getAccountMeta(accounts.newAuthority), ], - programAddress, data: getSetAuthorityCheckedInstructionDataEncoder().encode({}), + programAddress, } as SetAuthorityCheckedInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountBufferOrProgramDataAccount, TAccountCurrentAuthority, TAccountNewAuthority - >; - - return instruction; + >); } export type ParsedSetAuthorityCheckedInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[], > = { programAddress: Address; accounts: { @@ -176,11 +177,11 @@ export type ParsedSetAuthorityCheckedInstruction< export function parseSetAuthorityCheckedInstruction< TProgram extends string, - TAccountMetas extends readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[], >( - instruction: IInstruction & - IInstructionWithAccounts & - IInstructionWithData + instruction: Instruction & + InstructionWithAccounts & + InstructionWithData ): ParsedSetAuthorityCheckedInstruction { if (instruction.accounts.length < 3) { // TODO: Coded error. @@ -188,7 +189,7 @@ export function parseSetAuthorityCheckedInstruction< } let accountIndex = 0; const getNextAccount = () => { - const accountMeta = instruction.accounts![accountIndex]!; + const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!; accountIndex += 1; return accountMeta; }; diff --git a/clients/js/src/generated/instructions/upgrade.ts b/clients/js/src/generated/instructions/upgrade.ts index c21780c..de05183 100644 --- a/clients/js/src/generated/instructions/upgrade.ts +++ b/clients/js/src/generated/instructions/upgrade.ts @@ -1,9 +1,9 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ import { @@ -13,20 +13,21 @@ import { getU32Decoder, getU32Encoder, transformEncoder, + type AccountMeta, + type AccountSignerMeta, type Address, - type Codec, - type Decoder, - type Encoder, - type IAccountMeta, - type IAccountSignerMeta, - type IInstruction, - type IInstructionWithAccounts, - type IInstructionWithData, + type FixedSizeCodec, + type FixedSizeDecoder, + type FixedSizeEncoder, + type Instruction, + type InstructionWithAccounts, + type InstructionWithData, type ReadonlyAccount, type ReadonlySignerAccount, + type ReadonlyUint8Array, type TransactionSigner, type WritableAccount, -} from '@solana/web3.js'; +} from '@solana/kit'; import { LOADER_V3_PROGRAM_ADDRESS } from '../programs'; import { getAccountMetaFactory, type ResolvedAccount } from '../shared'; @@ -38,21 +39,21 @@ export function getUpgradeDiscriminatorBytes() { export type UpgradeInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountProgramDataAccount extends string | IAccountMeta = string, - TAccountProgramAccount extends string | IAccountMeta = string, - TAccountBufferAccount extends string | IAccountMeta = string, - TAccountSpillAccount extends string | IAccountMeta = string, + TAccountProgramDataAccount extends string | AccountMeta = string, + TAccountProgramAccount extends string | AccountMeta = string, + TAccountBufferAccount extends string | AccountMeta = string, + TAccountSpillAccount extends string | AccountMeta = string, TAccountRentSysvar extends | string - | IAccountMeta = 'SysvarRent111111111111111111111111111111111', + | AccountMeta = 'SysvarRent111111111111111111111111111111111', TAccountClockSysvar extends | string - | IAccountMeta = 'SysvarC1ock11111111111111111111111111111111', - TAccountAuthority extends string | IAccountMeta = string, - TRemainingAccounts extends readonly IAccountMeta[] = [], -> = IInstruction & - IInstructionWithData & - IInstructionWithAccounts< + | AccountMeta = 'SysvarC1ock11111111111111111111111111111111', + TAccountAuthority extends string | AccountMeta = string, + TRemainingAccounts extends readonly AccountMeta[] = [], +> = Instruction & + InstructionWithData & + InstructionWithAccounts< [ TAccountProgramDataAccount extends string ? WritableAccount @@ -74,7 +75,7 @@ export type UpgradeInstruction< : TAccountClockSysvar, TAccountAuthority extends string ? ReadonlySignerAccount & - IAccountSignerMeta + AccountSignerMeta : TAccountAuthority, ...TRemainingAccounts, ] @@ -84,18 +85,18 @@ export type UpgradeInstructionData = { discriminator: number }; export type UpgradeInstructionDataArgs = {}; -export function getUpgradeInstructionDataEncoder(): Encoder { +export function getUpgradeInstructionDataEncoder(): FixedSizeEncoder { return transformEncoder( getStructEncoder([['discriminator', getU32Encoder()]]), (value) => ({ ...value, discriminator: UPGRADE_DISCRIMINATOR }) ); } -export function getUpgradeInstructionDataDecoder(): Decoder { +export function getUpgradeInstructionDataDecoder(): FixedSizeDecoder { return getStructDecoder([['discriminator', getU32Decoder()]]); } -export function getUpgradeInstructionDataCodec(): Codec< +export function getUpgradeInstructionDataCodec(): FixedSizeCodec< UpgradeInstructionDataArgs, UpgradeInstructionData > { @@ -138,6 +139,7 @@ export function getUpgradeInstruction< TAccountRentSysvar extends string, TAccountClockSysvar extends string, TAccountAuthority extends string, + TProgramAddress extends Address = typeof LOADER_V3_PROGRAM_ADDRESS, >( input: UpgradeInput< TAccountProgramDataAccount, @@ -147,9 +149,10 @@ export function getUpgradeInstruction< TAccountRentSysvar, TAccountClockSysvar, TAccountAuthority - > + >, + config?: { programAddress?: TProgramAddress } ): UpgradeInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountProgramDataAccount, TAccountProgramAccount, TAccountBufferAccount, @@ -159,7 +162,7 @@ export function getUpgradeInstruction< TAccountAuthority > { // Program address. - const programAddress = LOADER_V3_PROGRAM_ADDRESS; + const programAddress = config?.programAddress ?? LOADER_V3_PROGRAM_ADDRESS; // Original accounts. const originalAccounts = { @@ -190,7 +193,7 @@ export function getUpgradeInstruction< } const getAccountMeta = getAccountMetaFactory(programAddress, 'programId'); - const instruction = { + return Object.freeze({ accounts: [ getAccountMeta(accounts.programDataAccount), getAccountMeta(accounts.programAccount), @@ -200,10 +203,10 @@ export function getUpgradeInstruction< getAccountMeta(accounts.clockSysvar), getAccountMeta(accounts.authority), ], - programAddress, data: getUpgradeInstructionDataEncoder().encode({}), + programAddress, } as UpgradeInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountProgramDataAccount, TAccountProgramAccount, TAccountBufferAccount, @@ -211,14 +214,12 @@ export function getUpgradeInstruction< TAccountRentSysvar, TAccountClockSysvar, TAccountAuthority - >; - - return instruction; + >); } export type ParsedUpgradeInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[], > = { programAddress: Address; accounts: { @@ -242,11 +243,11 @@ export type ParsedUpgradeInstruction< export function parseUpgradeInstruction< TProgram extends string, - TAccountMetas extends readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[], >( - instruction: IInstruction & - IInstructionWithAccounts & - IInstructionWithData + instruction: Instruction & + InstructionWithAccounts & + InstructionWithData ): ParsedUpgradeInstruction { if (instruction.accounts.length < 7) { // TODO: Coded error. @@ -254,7 +255,7 @@ export function parseUpgradeInstruction< } let accountIndex = 0; const getNextAccount = () => { - const accountMeta = instruction.accounts![accountIndex]!; + const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!; accountIndex += 1; return accountMeta; }; diff --git a/clients/js/src/generated/instructions/write.ts b/clients/js/src/generated/instructions/write.ts index bc5c77f..50b1559 100644 --- a/clients/js/src/generated/instructions/write.ts +++ b/clients/js/src/generated/instructions/write.ts @@ -1,9 +1,9 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ import { @@ -17,20 +17,20 @@ import { getU32Decoder, getU32Encoder, transformEncoder, + type AccountMeta, + type AccountSignerMeta, type Address, type Codec, type Decoder, type Encoder, - type IAccountMeta, - type IAccountSignerMeta, - type IInstruction, - type IInstructionWithAccounts, - type IInstructionWithData, + type Instruction, + type InstructionWithAccounts, + type InstructionWithData, type ReadonlySignerAccount, type ReadonlyUint8Array, type TransactionSigner, type WritableAccount, -} from '@solana/web3.js'; +} from '@solana/kit'; import { LOADER_V3_PROGRAM_ADDRESS } from '../programs'; import { getAccountMetaFactory, type ResolvedAccount } from '../shared'; @@ -42,19 +42,19 @@ export function getWriteDiscriminatorBytes() { export type WriteInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountBufferAccount extends string | IAccountMeta = string, - TAccountBufferAuthority extends string | IAccountMeta = string, - TRemainingAccounts extends readonly IAccountMeta[] = [], -> = IInstruction & - IInstructionWithData & - IInstructionWithAccounts< + TAccountBufferAccount extends string | AccountMeta = string, + TAccountBufferAuthority extends string | AccountMeta = string, + TRemainingAccounts extends readonly AccountMeta[] = [], +> = Instruction & + InstructionWithData & + InstructionWithAccounts< [ TAccountBufferAccount extends string ? WritableAccount : TAccountBufferAccount, TAccountBufferAuthority extends string ? ReadonlySignerAccount & - IAccountSignerMeta + AccountSignerMeta : TAccountBufferAuthority, ...TRemainingAccounts, ] @@ -115,15 +115,17 @@ export type WriteInput< export function getWriteInstruction< TAccountBufferAccount extends string, TAccountBufferAuthority extends string, + TProgramAddress extends Address = typeof LOADER_V3_PROGRAM_ADDRESS, >( - input: WriteInput + input: WriteInput, + config?: { programAddress?: TProgramAddress } ): WriteInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountBufferAccount, TAccountBufferAuthority > { // Program address. - const programAddress = LOADER_V3_PROGRAM_ADDRESS; + const programAddress = config?.programAddress ?? LOADER_V3_PROGRAM_ADDRESS; // Original accounts. const originalAccounts = { @@ -142,27 +144,25 @@ export function getWriteInstruction< const args = { ...input }; const getAccountMeta = getAccountMetaFactory(programAddress, 'programId'); - const instruction = { + return Object.freeze({ accounts: [ getAccountMeta(accounts.bufferAccount), getAccountMeta(accounts.bufferAuthority), ], - programAddress, data: getWriteInstructionDataEncoder().encode( args as WriteInstructionDataArgs ), + programAddress, } as WriteInstruction< - typeof LOADER_V3_PROGRAM_ADDRESS, + TProgramAddress, TAccountBufferAccount, TAccountBufferAuthority - >; - - return instruction; + >); } export type ParsedWriteInstruction< TProgram extends string = typeof LOADER_V3_PROGRAM_ADDRESS, - TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[], > = { programAddress: Address; accounts: { @@ -176,11 +176,11 @@ export type ParsedWriteInstruction< export function parseWriteInstruction< TProgram extends string, - TAccountMetas extends readonly IAccountMeta[], + TAccountMetas extends readonly AccountMeta[], >( - instruction: IInstruction & - IInstructionWithAccounts & - IInstructionWithData + instruction: Instruction & + InstructionWithAccounts & + InstructionWithData ): ParsedWriteInstruction { if (instruction.accounts.length < 2) { // TODO: Coded error. @@ -188,7 +188,7 @@ export function parseWriteInstruction< } let accountIndex = 0; const getNextAccount = () => { - const accountMeta = instruction.accounts![accountIndex]!; + const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!; accountIndex += 1; return accountMeta; }; diff --git a/clients/js/src/generated/programs/index.ts b/clients/js/src/generated/programs/index.ts index edc53db..970bf79 100644 --- a/clients/js/src/generated/programs/index.ts +++ b/clients/js/src/generated/programs/index.ts @@ -1,9 +1,9 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ export * from './loaderV3'; diff --git a/clients/js/src/generated/programs/loaderV3.ts b/clients/js/src/generated/programs/loaderV3.ts index c0be619..14728ee 100644 --- a/clients/js/src/generated/programs/loaderV3.ts +++ b/clients/js/src/generated/programs/loaderV3.ts @@ -1,9 +1,9 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ import { @@ -11,7 +11,7 @@ import { getU32Encoder, type Address, type ReadonlyUint8Array, -} from '@solana/web3.js'; +} from '@solana/kit'; import { type ParsedCloseInstruction, type ParsedDeployWithMaxDataLenInstruction, diff --git a/clients/js/src/generated/shared/index.ts b/clients/js/src/generated/shared/index.ts index 278bf59..83a3183 100644 --- a/clients/js/src/generated/shared/index.ts +++ b/clients/js/src/generated/shared/index.ts @@ -1,29 +1,29 @@ /** - * This code was AUTOGENERATED using the kinobi library. + * This code was AUTOGENERATED using the Codama library. * Please DO NOT EDIT THIS FILE, instead use visitors - * to add features, then rerun kinobi to update it. + * to add features, then rerun Codama to update it. * - * @see https://github.com/kinobi-so/kinobi + * @see https://github.com/codama-idl/codama */ import { AccountRole, isProgramDerivedAddress, - isTransactionSigner as web3JsIsTransactionSigner, + isTransactionSigner as kitIsTransactionSigner, + type AccountMeta, + type AccountSignerMeta, type Address, - type IAccountMeta, - type IAccountSignerMeta, type ProgramDerivedAddress, type TransactionSigner, upgradeRoleToSigner, -} from '@solana/web3.js'; +} from '@solana/kit'; /** * Asserts that the given value is not null or undefined. * @internal */ export function expectSome(value: T | null | undefined): T { - if (value == null) { + if (value === null || value === undefined) { throw new Error('Expected a value but received null or undefined.'); } return value; @@ -48,7 +48,7 @@ export function expectAddress( return value.address; } if (Array.isArray(value)) { - return value[0]; + return value[0] as Address; } return value as Address; } @@ -113,7 +113,7 @@ export type ResolvedAccount< * Defines an instruction that stores additional bytes on-chain. * @internal */ -export type IInstructionWithByteDelta = { +export type InstructionWithByteDelta = { byteDelta: number; }; @@ -127,7 +127,7 @@ export function getAccountMetaFactory( ) { return ( account: ResolvedAccount - ): IAccountMeta | IAccountSignerMeta | undefined => { + ): AccountMeta | AccountSignerMeta | undefined => { if (!account.value) { if (optionalAccountStrategy === 'omitted') return; return Object.freeze({ @@ -159,6 +159,6 @@ export function isTransactionSigner( !!value && typeof value === 'object' && 'address' in value && - web3JsIsTransactionSigner(value) + kitIsTransactionSigner(value) ); } diff --git a/clients/rust/Cargo.toml b/clients/rust/Cargo.toml index 0895337..d2ae6e0 100644 --- a/clients/rust/Cargo.toml +++ b/clients/rust/Cargo.toml @@ -11,9 +11,15 @@ serde = ["dep:serde", "dep:serde_with"] [dependencies] borsh = "^0.10" -num-derive = "^0.3" +num-derive = "^0.4" num-traits = "^0.2" serde = { version = "^1.0", features = ["derive"], optional = true } serde_with = { version = "^3.0", optional = true } -solana-program = "^2.2.1" +solana-account = "^2.2.1" +solana-account-info = "^2.2.1" +solana-cpi = "^2.2.1" +solana-decode-error = "^2.2.1" +solana-instruction = "^2.2.1" +solana-program-error = "^2.2.1" +solana-pubkey = { version = "^2.2.1", features = ["curve25519", "borsh"] } thiserror = "^1.0" diff --git a/clients/rust/src/generated/errors/mod.rs b/clients/rust/src/generated/errors/mod.rs index 05ea2cd..d698264 100644 --- a/clients/rust/src/generated/errors/mod.rs +++ b/clients/rust/src/generated/errors/mod.rs @@ -1,5 +1,5 @@ -//! This code was AUTOGENERATED using the kinobi library. +//! This code was AUTOGENERATED using the codama library. //! Please DO NOT EDIT THIS FILE, instead use visitors -//! to add features, then rerun kinobi to update it. +//! to add features, then rerun codama to update it. //! -//! +//! diff --git a/clients/rust/src/generated/instructions/close.rs b/clients/rust/src/generated/instructions/close.rs index c78a575..3d782a0 100644 --- a/clients/rust/src/generated/instructions/close.rs +++ b/clients/rust/src/generated/instructions/close.rs @@ -1,58 +1,62 @@ -//! This code was AUTOGENERATED using the kinobi library. +//! This code was AUTOGENERATED using the codama library. //! Please DO NOT EDIT THIS FILE, instead use visitors -//! to add features, then rerun kinobi to update it. +//! to add features, then rerun codama to update it. //! -//! +//! use borsh::{BorshDeserialize, BorshSerialize}; +pub const CLOSE_DISCRIMINATOR: u32 = 5; + /// Accounts. +#[derive(Debug)] pub struct Close { /// Buffer or ProgramData account to close. - pub buffer_or_program_data_account: solana_program::pubkey::Pubkey, + pub buffer_or_program_data_account: solana_pubkey::Pubkey, /// Destination account for reclaimed lamports. - pub destination_account: solana_program::pubkey::Pubkey, + pub destination_account: solana_pubkey::Pubkey, /// Authority (optional). - pub authority: Option, + pub authority: Option, /// Program account (optional). - pub program_account: Option, + pub program_account: Option, } impl Close { - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { self.instruction_with_remaining_accounts(&[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::vec_init_then_push)] pub fn instruction_with_remaining_accounts( &self, - remaining_accounts: &[solana_program::instruction::AccountMeta], - ) -> solana_program::instruction::Instruction { + remaining_accounts: &[solana_instruction::AccountMeta], + ) -> solana_instruction::Instruction { let mut accounts = Vec::with_capacity(4 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.buffer_or_program_data_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.destination_account, false, )); if let Some(authority) = self.authority { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( authority, true, )); } else { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( crate::LOADER_V3_ID, false, )); } if let Some(program_account) = self.program_account { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( program_account, false, )); } else { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( crate::LOADER_V3_ID, false, )); @@ -60,7 +64,7 @@ impl Close { accounts.extend_from_slice(remaining_accounts); let data = CloseInstructionData::new().try_to_vec().unwrap(); - solana_program::instruction::Instruction { + solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, @@ -68,7 +72,8 @@ impl Close { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct CloseInstructionData { discriminator: u32, } @@ -77,6 +82,10 @@ impl CloseInstructionData { pub fn new() -> Self { Self { discriminator: 5 } } + + pub(crate) fn try_to_vec(&self) -> Result, std::io::Error> { + borsh::to_vec(self) + } } impl Default for CloseInstructionData { @@ -95,11 +104,11 @@ impl Default for CloseInstructionData { /// 3. `[optional]` program_account #[derive(Clone, Debug, Default)] pub struct CloseBuilder { - buffer_or_program_data_account: Option, - destination_account: Option, - authority: Option, - program_account: Option, - __remaining_accounts: Vec, + buffer_or_program_data_account: Option, + destination_account: Option, + authority: Option, + program_account: Option, + __remaining_accounts: Vec, } impl CloseBuilder { @@ -110,43 +119,34 @@ impl CloseBuilder { #[inline(always)] pub fn buffer_or_program_data_account( &mut self, - buffer_or_program_data_account: solana_program::pubkey::Pubkey, + buffer_or_program_data_account: solana_pubkey::Pubkey, ) -> &mut Self { self.buffer_or_program_data_account = Some(buffer_or_program_data_account); self } /// Destination account for reclaimed lamports. #[inline(always)] - pub fn destination_account( - &mut self, - destination_account: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn destination_account(&mut self, destination_account: solana_pubkey::Pubkey) -> &mut Self { self.destination_account = Some(destination_account); self } /// `[optional account]` /// Authority (optional). #[inline(always)] - pub fn authority(&mut self, authority: Option) -> &mut Self { + pub fn authority(&mut self, authority: Option) -> &mut Self { self.authority = authority; self } /// `[optional account]` /// Program account (optional). #[inline(always)] - pub fn program_account( - &mut self, - program_account: Option, - ) -> &mut Self { + pub fn program_account(&mut self, program_account: Option) -> &mut Self { self.program_account = program_account; self } - /// Add an aditional account to the instruction. + /// Add an additional account to the instruction. #[inline(always)] - pub fn add_remaining_account( - &mut self, - account: solana_program::instruction::AccountMeta, - ) -> &mut Self { + pub fn add_remaining_account(&mut self, account: solana_instruction::AccountMeta) -> &mut Self { self.__remaining_accounts.push(account); self } @@ -154,13 +154,13 @@ impl CloseBuilder { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[solana_program::instruction::AccountMeta], + accounts: &[solana_instruction::AccountMeta], ) -> &mut Self { self.__remaining_accounts.extend_from_slice(accounts); self } #[allow(clippy::clone_on_copy)] - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { let accounts = Close { buffer_or_program_data_account: self .buffer_or_program_data_account @@ -179,32 +179,32 @@ impl CloseBuilder { /// `close` CPI accounts. pub struct CloseCpiAccounts<'a, 'b> { /// Buffer or ProgramData account to close. - pub buffer_or_program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_or_program_data_account: &'b solana_account_info::AccountInfo<'a>, /// Destination account for reclaimed lamports. - pub destination_account: &'b solana_program::account_info::AccountInfo<'a>, + pub destination_account: &'b solana_account_info::AccountInfo<'a>, /// Authority (optional). - pub authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, + pub authority: Option<&'b solana_account_info::AccountInfo<'a>>, /// Program account (optional). - pub program_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, + pub program_account: Option<&'b solana_account_info::AccountInfo<'a>>, } /// `close` CPI instruction. pub struct CloseCpi<'a, 'b> { /// The program to invoke. - pub __program: &'b solana_program::account_info::AccountInfo<'a>, + pub __program: &'b solana_account_info::AccountInfo<'a>, /// Buffer or ProgramData account to close. - pub buffer_or_program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_or_program_data_account: &'b solana_account_info::AccountInfo<'a>, /// Destination account for reclaimed lamports. - pub destination_account: &'b solana_program::account_info::AccountInfo<'a>, + pub destination_account: &'b solana_account_info::AccountInfo<'a>, /// Authority (optional). - pub authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, + pub authority: Option<&'b solana_account_info::AccountInfo<'a>>, /// Program account (optional). - pub program_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, + pub program_account: Option<&'b solana_account_info::AccountInfo<'a>>, } impl<'a, 'b> CloseCpi<'a, 'b> { pub fn new( - program: &'b solana_program::account_info::AccountInfo<'a>, + program: &'b solana_account_info::AccountInfo<'a>, accounts: CloseCpiAccounts<'a, 'b>, ) -> Self { Self { @@ -216,71 +216,61 @@ impl<'a, 'b> CloseCpi<'a, 'b> { } } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], &[]) } #[inline(always)] pub fn invoke_with_remaining_accounts( &self, - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], remaining_accounts) } #[inline(always)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(signers_seeds, &[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] pub fn invoke_signed_with_remaining_accounts( &self, signers_seeds: &[&[&[u8]]], - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { let mut accounts = Vec::with_capacity(4 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.buffer_or_program_data_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.destination_account.key, false, )); if let Some(authority) = self.authority { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *authority.key, true, )); } else { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( crate::LOADER_V3_ID, false, )); } if let Some(program_account) = self.program_account { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *program_account.key, false, )); } else { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( crate::LOADER_V3_ID, false, )); } remaining_accounts.iter().for_each(|remaining_account| { - accounts.push(solana_program::instruction::AccountMeta { + accounts.push(solana_instruction::AccountMeta { pubkey: *remaining_account.0.key, is_signer: remaining_account.1, is_writable: remaining_account.2, @@ -288,12 +278,12 @@ impl<'a, 'b> CloseCpi<'a, 'b> { }); let data = CloseInstructionData::new().try_to_vec().unwrap(); - let instruction = solana_program::instruction::Instruction { + let instruction = solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, }; - let mut account_infos = Vec::with_capacity(4 + 1 + remaining_accounts.len()); + let mut account_infos = Vec::with_capacity(5 + remaining_accounts.len()); account_infos.push(self.__program.clone()); account_infos.push(self.buffer_or_program_data_account.clone()); account_infos.push(self.destination_account.clone()); @@ -308,9 +298,9 @@ impl<'a, 'b> CloseCpi<'a, 'b> { .for_each(|remaining_account| account_infos.push(remaining_account.0.clone())); if signers_seeds.is_empty() { - solana_program::program::invoke(&instruction, &account_infos) + solana_cpi::invoke(&instruction, &account_infos) } else { - solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds) + solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds) } } } @@ -329,7 +319,7 @@ pub struct CloseCpiBuilder<'a, 'b> { } impl<'a, 'b> CloseCpiBuilder<'a, 'b> { - pub fn new(program: &'b solana_program::account_info::AccountInfo<'a>) -> Self { + pub fn new(program: &'b solana_account_info::AccountInfo<'a>) -> Self { let instruction = Box::new(CloseCpiBuilderInstruction { __program: program, buffer_or_program_data_account: None, @@ -344,7 +334,7 @@ impl<'a, 'b> CloseCpiBuilder<'a, 'b> { #[inline(always)] pub fn buffer_or_program_data_account( &mut self, - buffer_or_program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + buffer_or_program_data_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.buffer_or_program_data_account = Some(buffer_or_program_data_account); self @@ -353,7 +343,7 @@ impl<'a, 'b> CloseCpiBuilder<'a, 'b> { #[inline(always)] pub fn destination_account( &mut self, - destination_account: &'b solana_program::account_info::AccountInfo<'a>, + destination_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.destination_account = Some(destination_account); self @@ -363,7 +353,7 @@ impl<'a, 'b> CloseCpiBuilder<'a, 'b> { #[inline(always)] pub fn authority( &mut self, - authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, + authority: Option<&'b solana_account_info::AccountInfo<'a>>, ) -> &mut Self { self.instruction.authority = authority; self @@ -373,7 +363,7 @@ impl<'a, 'b> CloseCpiBuilder<'a, 'b> { #[inline(always)] pub fn program_account( &mut self, - program_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, + program_account: Option<&'b solana_account_info::AccountInfo<'a>>, ) -> &mut Self { self.instruction.program_account = program_account; self @@ -382,7 +372,7 @@ impl<'a, 'b> CloseCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_account( &mut self, - account: &'b solana_program::account_info::AccountInfo<'a>, + account: &'b solana_account_info::AccountInfo<'a>, is_writable: bool, is_signer: bool, ) -> &mut Self { @@ -399,11 +389,7 @@ impl<'a, 'b> CloseCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], + accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], ) -> &mut Self { self.instruction .__remaining_accounts @@ -411,15 +397,12 @@ impl<'a, 'b> CloseCpiBuilder<'a, 'b> { self } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed(&[]) } #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { let instruction = CloseCpi { __program: self.instruction.__program, @@ -446,15 +429,11 @@ impl<'a, 'b> CloseCpiBuilder<'a, 'b> { #[derive(Clone, Debug)] struct CloseCpiBuilderInstruction<'a, 'b> { - __program: &'b solana_program::account_info::AccountInfo<'a>, - buffer_or_program_data_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - destination_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, - program_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, + __program: &'b solana_account_info::AccountInfo<'a>, + buffer_or_program_data_account: Option<&'b solana_account_info::AccountInfo<'a>>, + destination_account: Option<&'b solana_account_info::AccountInfo<'a>>, + authority: Option<&'b solana_account_info::AccountInfo<'a>>, + program_account: Option<&'b solana_account_info::AccountInfo<'a>>, /// Additional instruction accounts `(AccountInfo, is_writable, is_signer)`. - __remaining_accounts: Vec<( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )>, + __remaining_accounts: Vec<(&'b solana_account_info::AccountInfo<'a>, bool, bool)>, } diff --git a/clients/rust/src/generated/instructions/deploy_with_max_data_len.rs b/clients/rust/src/generated/instructions/deploy_with_max_data_len.rs index 0da3d6c..f2e7631 100644 --- a/clients/rust/src/generated/instructions/deploy_with_max_data_len.rs +++ b/clients/rust/src/generated/instructions/deploy_with_max_data_len.rs @@ -1,74 +1,78 @@ -//! This code was AUTOGENERATED using the kinobi library. +//! This code was AUTOGENERATED using the codama library. //! Please DO NOT EDIT THIS FILE, instead use visitors -//! to add features, then rerun kinobi to update it. +//! to add features, then rerun codama to update it. //! -//! +//! use borsh::{BorshDeserialize, BorshSerialize}; +pub const DEPLOY_WITH_MAX_DATA_LEN_DISCRIMINATOR: u32 = 2; + /// Accounts. +#[derive(Debug)] pub struct DeployWithMaxDataLen { /// Payer account that will pay to create the ProgramData account. - pub payer_account: solana_program::pubkey::Pubkey, + pub payer_account: solana_pubkey::Pubkey, /// ProgramData account (uninitialized). - pub program_data_account: solana_program::pubkey::Pubkey, + pub program_data_account: solana_pubkey::Pubkey, /// Program account (uninitialized). - pub program_account: solana_program::pubkey::Pubkey, + pub program_account: solana_pubkey::Pubkey, /// Buffer account where the program data has been written. - pub buffer_account: solana_program::pubkey::Pubkey, + pub buffer_account: solana_pubkey::Pubkey, /// Rent sysvar. - pub rent_sysvar: solana_program::pubkey::Pubkey, + pub rent_sysvar: solana_pubkey::Pubkey, /// Clock sysvar. - pub clock_sysvar: solana_program::pubkey::Pubkey, + pub clock_sysvar: solana_pubkey::Pubkey, /// System program. - pub system_program: solana_program::pubkey::Pubkey, + pub system_program: solana_pubkey::Pubkey, /// Authority. - pub authority: solana_program::pubkey::Pubkey, + pub authority: solana_pubkey::Pubkey, } impl DeployWithMaxDataLen { pub fn instruction( &self, args: DeployWithMaxDataLenInstructionArgs, - ) -> solana_program::instruction::Instruction { + ) -> solana_instruction::Instruction { self.instruction_with_remaining_accounts(args, &[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::vec_init_then_push)] pub fn instruction_with_remaining_accounts( &self, args: DeployWithMaxDataLenInstructionArgs, - remaining_accounts: &[solana_program::instruction::AccountMeta], - ) -> solana_program::instruction::Instruction { + remaining_accounts: &[solana_instruction::AccountMeta], + ) -> solana_instruction::Instruction { let mut accounts = Vec::with_capacity(8 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.payer_account, true, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.program_data_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.program_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.buffer_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( self.rent_sysvar, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( self.clock_sysvar, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( self.system_program, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( self.authority, true, )); @@ -79,7 +83,7 @@ impl DeployWithMaxDataLen { let mut args = args.try_to_vec().unwrap(); data.append(&mut args); - solana_program::instruction::Instruction { + solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, @@ -87,7 +91,8 @@ impl DeployWithMaxDataLen { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct DeployWithMaxDataLenInstructionData { discriminator: u32, } @@ -96,6 +101,10 @@ impl DeployWithMaxDataLenInstructionData { pub fn new() -> Self { Self { discriminator: 2 } } + + pub(crate) fn try_to_vec(&self) -> Result, std::io::Error> { + borsh::to_vec(self) + } } impl Default for DeployWithMaxDataLenInstructionData { @@ -110,6 +119,12 @@ pub struct DeployWithMaxDataLenInstructionArgs { pub max_data_len: u64, } +impl DeployWithMaxDataLenInstructionArgs { + pub(crate) fn try_to_vec(&self) -> Result, std::io::Error> { + borsh::to_vec(self) + } +} + /// Instruction builder for `DeployWithMaxDataLen`. /// /// ### Accounts: @@ -127,16 +142,16 @@ pub struct DeployWithMaxDataLenInstructionArgs { /// 7. `[signer]` authority #[derive(Clone, Debug, Default)] pub struct DeployWithMaxDataLenBuilder { - payer_account: Option, - program_data_account: Option, - program_account: Option, - buffer_account: Option, - rent_sysvar: Option, - clock_sysvar: Option, - system_program: Option, - authority: Option, + payer_account: Option, + program_data_account: Option, + program_account: Option, + buffer_account: Option, + rent_sysvar: Option, + clock_sysvar: Option, + system_program: Option, + authority: Option, max_data_len: Option, - __remaining_accounts: Vec, + __remaining_accounts: Vec, } impl DeployWithMaxDataLenBuilder { @@ -145,7 +160,7 @@ impl DeployWithMaxDataLenBuilder { } /// Payer account that will pay to create the ProgramData account. #[inline(always)] - pub fn payer_account(&mut self, payer_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn payer_account(&mut self, payer_account: solana_pubkey::Pubkey) -> &mut Self { self.payer_account = Some(payer_account); self } @@ -153,50 +168,47 @@ impl DeployWithMaxDataLenBuilder { #[inline(always)] pub fn program_data_account( &mut self, - program_data_account: solana_program::pubkey::Pubkey, + program_data_account: solana_pubkey::Pubkey, ) -> &mut Self { self.program_data_account = Some(program_data_account); self } /// Program account (uninitialized). #[inline(always)] - pub fn program_account( - &mut self, - program_account: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn program_account(&mut self, program_account: solana_pubkey::Pubkey) -> &mut Self { self.program_account = Some(program_account); self } /// Buffer account where the program data has been written. #[inline(always)] - pub fn buffer_account(&mut self, buffer_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn buffer_account(&mut self, buffer_account: solana_pubkey::Pubkey) -> &mut Self { self.buffer_account = Some(buffer_account); self } /// `[optional account, default to /// 'SysvarRent111111111111111111111111111111111']` Rent sysvar. #[inline(always)] - pub fn rent_sysvar(&mut self, rent_sysvar: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn rent_sysvar(&mut self, rent_sysvar: solana_pubkey::Pubkey) -> &mut Self { self.rent_sysvar = Some(rent_sysvar); self } /// `[optional account, default to /// 'SysvarC1ock11111111111111111111111111111111']` Clock sysvar. #[inline(always)] - pub fn clock_sysvar(&mut self, clock_sysvar: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn clock_sysvar(&mut self, clock_sysvar: solana_pubkey::Pubkey) -> &mut Self { self.clock_sysvar = Some(clock_sysvar); self } /// `[optional account, default to '11111111111111111111111111111111']` /// System program. #[inline(always)] - pub fn system_program(&mut self, system_program: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn system_program(&mut self, system_program: solana_pubkey::Pubkey) -> &mut Self { self.system_program = Some(system_program); self } /// Authority. #[inline(always)] - pub fn authority(&mut self, authority: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn authority(&mut self, authority: solana_pubkey::Pubkey) -> &mut Self { self.authority = Some(authority); self } @@ -205,12 +217,9 @@ impl DeployWithMaxDataLenBuilder { self.max_data_len = Some(max_data_len); self } - /// Add an aditional account to the instruction. + /// Add an additional account to the instruction. #[inline(always)] - pub fn add_remaining_account( - &mut self, - account: solana_program::instruction::AccountMeta, - ) -> &mut Self { + pub fn add_remaining_account(&mut self, account: solana_instruction::AccountMeta) -> &mut Self { self.__remaining_accounts.push(account); self } @@ -218,13 +227,13 @@ impl DeployWithMaxDataLenBuilder { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[solana_program::instruction::AccountMeta], + accounts: &[solana_instruction::AccountMeta], ) -> &mut Self { self.__remaining_accounts.extend_from_slice(accounts); self } #[allow(clippy::clone_on_copy)] - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { let accounts = DeployWithMaxDataLen { payer_account: self.payer_account.expect("payer_account is not set"), program_data_account: self @@ -232,15 +241,15 @@ impl DeployWithMaxDataLenBuilder { .expect("program_data_account is not set"), program_account: self.program_account.expect("program_account is not set"), buffer_account: self.buffer_account.expect("buffer_account is not set"), - rent_sysvar: self.rent_sysvar.unwrap_or(solana_program::pubkey!( + rent_sysvar: self.rent_sysvar.unwrap_or(solana_pubkey::pubkey!( "SysvarRent111111111111111111111111111111111" )), - clock_sysvar: self.clock_sysvar.unwrap_or(solana_program::pubkey!( + clock_sysvar: self.clock_sysvar.unwrap_or(solana_pubkey::pubkey!( "SysvarC1ock11111111111111111111111111111111" )), system_program: self .system_program - .unwrap_or(solana_program::pubkey!("11111111111111111111111111111111")), + .unwrap_or(solana_pubkey::pubkey!("11111111111111111111111111111111")), authority: self.authority.expect("authority is not set"), }; let args = DeployWithMaxDataLenInstructionArgs { @@ -254,50 +263,50 @@ impl DeployWithMaxDataLenBuilder { /// `deploy_with_max_data_len` CPI accounts. pub struct DeployWithMaxDataLenCpiAccounts<'a, 'b> { /// Payer account that will pay to create the ProgramData account. - pub payer_account: &'b solana_program::account_info::AccountInfo<'a>, + pub payer_account: &'b solana_account_info::AccountInfo<'a>, /// ProgramData account (uninitialized). - pub program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + pub program_data_account: &'b solana_account_info::AccountInfo<'a>, /// Program account (uninitialized). - pub program_account: &'b solana_program::account_info::AccountInfo<'a>, + pub program_account: &'b solana_account_info::AccountInfo<'a>, /// Buffer account where the program data has been written. - pub buffer_account: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_account: &'b solana_account_info::AccountInfo<'a>, /// Rent sysvar. - pub rent_sysvar: &'b solana_program::account_info::AccountInfo<'a>, + pub rent_sysvar: &'b solana_account_info::AccountInfo<'a>, /// Clock sysvar. - pub clock_sysvar: &'b solana_program::account_info::AccountInfo<'a>, + pub clock_sysvar: &'b solana_account_info::AccountInfo<'a>, /// System program. - pub system_program: &'b solana_program::account_info::AccountInfo<'a>, + pub system_program: &'b solana_account_info::AccountInfo<'a>, /// Authority. - pub authority: &'b solana_program::account_info::AccountInfo<'a>, + pub authority: &'b solana_account_info::AccountInfo<'a>, } /// `deploy_with_max_data_len` CPI instruction. pub struct DeployWithMaxDataLenCpi<'a, 'b> { /// The program to invoke. - pub __program: &'b solana_program::account_info::AccountInfo<'a>, + pub __program: &'b solana_account_info::AccountInfo<'a>, /// Payer account that will pay to create the ProgramData account. - pub payer_account: &'b solana_program::account_info::AccountInfo<'a>, + pub payer_account: &'b solana_account_info::AccountInfo<'a>, /// ProgramData account (uninitialized). - pub program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + pub program_data_account: &'b solana_account_info::AccountInfo<'a>, /// Program account (uninitialized). - pub program_account: &'b solana_program::account_info::AccountInfo<'a>, + pub program_account: &'b solana_account_info::AccountInfo<'a>, /// Buffer account where the program data has been written. - pub buffer_account: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_account: &'b solana_account_info::AccountInfo<'a>, /// Rent sysvar. - pub rent_sysvar: &'b solana_program::account_info::AccountInfo<'a>, + pub rent_sysvar: &'b solana_account_info::AccountInfo<'a>, /// Clock sysvar. - pub clock_sysvar: &'b solana_program::account_info::AccountInfo<'a>, + pub clock_sysvar: &'b solana_account_info::AccountInfo<'a>, /// System program. - pub system_program: &'b solana_program::account_info::AccountInfo<'a>, + pub system_program: &'b solana_account_info::AccountInfo<'a>, /// Authority. - pub authority: &'b solana_program::account_info::AccountInfo<'a>, + pub authority: &'b solana_account_info::AccountInfo<'a>, /// The arguments for the instruction. pub __args: DeployWithMaxDataLenInstructionArgs, } impl<'a, 'b> DeployWithMaxDataLenCpi<'a, 'b> { pub fn new( - program: &'b solana_program::account_info::AccountInfo<'a>, + program: &'b solana_account_info::AccountInfo<'a>, accounts: DeployWithMaxDataLenCpiAccounts<'a, 'b>, args: DeployWithMaxDataLenInstructionArgs, ) -> Self { @@ -315,73 +324,63 @@ impl<'a, 'b> DeployWithMaxDataLenCpi<'a, 'b> { } } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], &[]) } #[inline(always)] pub fn invoke_with_remaining_accounts( &self, - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], remaining_accounts) } #[inline(always)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(signers_seeds, &[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] pub fn invoke_signed_with_remaining_accounts( &self, signers_seeds: &[&[&[u8]]], - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { let mut accounts = Vec::with_capacity(8 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.payer_account.key, true, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.program_data_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.program_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.buffer_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *self.rent_sysvar.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *self.clock_sysvar.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *self.system_program.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *self.authority.key, true, )); remaining_accounts.iter().for_each(|remaining_account| { - accounts.push(solana_program::instruction::AccountMeta { + accounts.push(solana_instruction::AccountMeta { pubkey: *remaining_account.0.key, is_signer: remaining_account.1, is_writable: remaining_account.2, @@ -393,12 +392,12 @@ impl<'a, 'b> DeployWithMaxDataLenCpi<'a, 'b> { let mut args = self.__args.try_to_vec().unwrap(); data.append(&mut args); - let instruction = solana_program::instruction::Instruction { + let instruction = solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, }; - let mut account_infos = Vec::with_capacity(8 + 1 + remaining_accounts.len()); + let mut account_infos = Vec::with_capacity(9 + remaining_accounts.len()); account_infos.push(self.__program.clone()); account_infos.push(self.payer_account.clone()); account_infos.push(self.program_data_account.clone()); @@ -413,9 +412,9 @@ impl<'a, 'b> DeployWithMaxDataLenCpi<'a, 'b> { .for_each(|remaining_account| account_infos.push(remaining_account.0.clone())); if signers_seeds.is_empty() { - solana_program::program::invoke(&instruction, &account_infos) + solana_cpi::invoke(&instruction, &account_infos) } else { - solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds) + solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds) } } } @@ -438,7 +437,7 @@ pub struct DeployWithMaxDataLenCpiBuilder<'a, 'b> { } impl<'a, 'b> DeployWithMaxDataLenCpiBuilder<'a, 'b> { - pub fn new(program: &'b solana_program::account_info::AccountInfo<'a>) -> Self { + pub fn new(program: &'b solana_account_info::AccountInfo<'a>) -> Self { let instruction = Box::new(DeployWithMaxDataLenCpiBuilderInstruction { __program: program, payer_account: None, @@ -458,7 +457,7 @@ impl<'a, 'b> DeployWithMaxDataLenCpiBuilder<'a, 'b> { #[inline(always)] pub fn payer_account( &mut self, - payer_account: &'b solana_program::account_info::AccountInfo<'a>, + payer_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.payer_account = Some(payer_account); self @@ -467,7 +466,7 @@ impl<'a, 'b> DeployWithMaxDataLenCpiBuilder<'a, 'b> { #[inline(always)] pub fn program_data_account( &mut self, - program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + program_data_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.program_data_account = Some(program_data_account); self @@ -476,7 +475,7 @@ impl<'a, 'b> DeployWithMaxDataLenCpiBuilder<'a, 'b> { #[inline(always)] pub fn program_account( &mut self, - program_account: &'b solana_program::account_info::AccountInfo<'a>, + program_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.program_account = Some(program_account); self @@ -485,7 +484,7 @@ impl<'a, 'b> DeployWithMaxDataLenCpiBuilder<'a, 'b> { #[inline(always)] pub fn buffer_account( &mut self, - buffer_account: &'b solana_program::account_info::AccountInfo<'a>, + buffer_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.buffer_account = Some(buffer_account); self @@ -494,7 +493,7 @@ impl<'a, 'b> DeployWithMaxDataLenCpiBuilder<'a, 'b> { #[inline(always)] pub fn rent_sysvar( &mut self, - rent_sysvar: &'b solana_program::account_info::AccountInfo<'a>, + rent_sysvar: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.rent_sysvar = Some(rent_sysvar); self @@ -503,7 +502,7 @@ impl<'a, 'b> DeployWithMaxDataLenCpiBuilder<'a, 'b> { #[inline(always)] pub fn clock_sysvar( &mut self, - clock_sysvar: &'b solana_program::account_info::AccountInfo<'a>, + clock_sysvar: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.clock_sysvar = Some(clock_sysvar); self @@ -512,17 +511,14 @@ impl<'a, 'b> DeployWithMaxDataLenCpiBuilder<'a, 'b> { #[inline(always)] pub fn system_program( &mut self, - system_program: &'b solana_program::account_info::AccountInfo<'a>, + system_program: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.system_program = Some(system_program); self } /// Authority. #[inline(always)] - pub fn authority( - &mut self, - authority: &'b solana_program::account_info::AccountInfo<'a>, - ) -> &mut Self { + pub fn authority(&mut self, authority: &'b solana_account_info::AccountInfo<'a>) -> &mut Self { self.instruction.authority = Some(authority); self } @@ -535,7 +531,7 @@ impl<'a, 'b> DeployWithMaxDataLenCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_account( &mut self, - account: &'b solana_program::account_info::AccountInfo<'a>, + account: &'b solana_account_info::AccountInfo<'a>, is_writable: bool, is_signer: bool, ) -> &mut Self { @@ -552,11 +548,7 @@ impl<'a, 'b> DeployWithMaxDataLenCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], + accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], ) -> &mut Self { self.instruction .__remaining_accounts @@ -564,15 +556,12 @@ impl<'a, 'b> DeployWithMaxDataLenCpiBuilder<'a, 'b> { self } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed(&[]) } #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { let args = DeployWithMaxDataLenInstructionArgs { max_data_len: self .instruction @@ -630,20 +619,16 @@ impl<'a, 'b> DeployWithMaxDataLenCpiBuilder<'a, 'b> { #[derive(Clone, Debug)] struct DeployWithMaxDataLenCpiBuilderInstruction<'a, 'b> { - __program: &'b solana_program::account_info::AccountInfo<'a>, - payer_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - program_data_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - program_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - buffer_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - rent_sysvar: Option<&'b solana_program::account_info::AccountInfo<'a>>, - clock_sysvar: Option<&'b solana_program::account_info::AccountInfo<'a>>, - system_program: Option<&'b solana_program::account_info::AccountInfo<'a>>, - authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, + __program: &'b solana_account_info::AccountInfo<'a>, + payer_account: Option<&'b solana_account_info::AccountInfo<'a>>, + program_data_account: Option<&'b solana_account_info::AccountInfo<'a>>, + program_account: Option<&'b solana_account_info::AccountInfo<'a>>, + buffer_account: Option<&'b solana_account_info::AccountInfo<'a>>, + rent_sysvar: Option<&'b solana_account_info::AccountInfo<'a>>, + clock_sysvar: Option<&'b solana_account_info::AccountInfo<'a>>, + system_program: Option<&'b solana_account_info::AccountInfo<'a>>, + authority: Option<&'b solana_account_info::AccountInfo<'a>>, max_data_len: Option, /// Additional instruction accounts `(AccountInfo, is_writable, is_signer)`. - __remaining_accounts: Vec<( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )>, + __remaining_accounts: Vec<(&'b solana_account_info::AccountInfo<'a>, bool, bool)>, } diff --git a/clients/rust/src/generated/instructions/extend_program.rs b/clients/rust/src/generated/instructions/extend_program.rs index cd01b14..1061b20 100644 --- a/clients/rust/src/generated/instructions/extend_program.rs +++ b/clients/rust/src/generated/instructions/extend_program.rs @@ -1,60 +1,64 @@ -//! This code was AUTOGENERATED using the kinobi library. +//! This code was AUTOGENERATED using the codama library. //! Please DO NOT EDIT THIS FILE, instead use visitors -//! to add features, then rerun kinobi to update it. +//! to add features, then rerun codama to update it. //! -//! +//! use borsh::{BorshDeserialize, BorshSerialize}; +pub const EXTEND_PROGRAM_DISCRIMINATOR: u32 = 6; + /// Accounts. +#[derive(Debug)] pub struct ExtendProgram { /// ProgramData account. - pub program_data_account: solana_program::pubkey::Pubkey, + pub program_data_account: solana_pubkey::Pubkey, /// Program account. - pub program_account: solana_program::pubkey::Pubkey, + pub program_account: solana_pubkey::Pubkey, /// System program (optional). - pub system_program: Option, + pub system_program: Option, /// Payer. - pub payer: Option, + pub payer: Option, } impl ExtendProgram { pub fn instruction( &self, args: ExtendProgramInstructionArgs, - ) -> solana_program::instruction::Instruction { + ) -> solana_instruction::Instruction { self.instruction_with_remaining_accounts(args, &[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::vec_init_then_push)] pub fn instruction_with_remaining_accounts( &self, args: ExtendProgramInstructionArgs, - remaining_accounts: &[solana_program::instruction::AccountMeta], - ) -> solana_program::instruction::Instruction { + remaining_accounts: &[solana_instruction::AccountMeta], + ) -> solana_instruction::Instruction { let mut accounts = Vec::with_capacity(4 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.program_data_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.program_account, false, )); if let Some(system_program) = self.system_program { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( system_program, false, )); } else { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( crate::LOADER_V3_ID, false, )); } if let Some(payer) = self.payer { - accounts.push(solana_program::instruction::AccountMeta::new(payer, true)); + accounts.push(solana_instruction::AccountMeta::new(payer, true)); } else { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( crate::LOADER_V3_ID, false, )); @@ -64,7 +68,7 @@ impl ExtendProgram { let mut args = args.try_to_vec().unwrap(); data.append(&mut args); - solana_program::instruction::Instruction { + solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, @@ -72,7 +76,8 @@ impl ExtendProgram { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct ExtendProgramInstructionData { discriminator: u32, } @@ -81,6 +86,10 @@ impl ExtendProgramInstructionData { pub fn new() -> Self { Self { discriminator: 6 } } + + pub(crate) fn try_to_vec(&self) -> Result, std::io::Error> { + borsh::to_vec(self) + } } impl Default for ExtendProgramInstructionData { @@ -95,6 +104,12 @@ pub struct ExtendProgramInstructionArgs { pub additional_bytes: u32, } +impl ExtendProgramInstructionArgs { + pub(crate) fn try_to_vec(&self) -> Result, std::io::Error> { + borsh::to_vec(self) + } +} + /// Instruction builder for `ExtendProgram`. /// /// ### Accounts: @@ -105,12 +120,12 @@ pub struct ExtendProgramInstructionArgs { /// 3. `[writable, signer, optional]` payer #[derive(Clone, Debug, Default)] pub struct ExtendProgramBuilder { - program_data_account: Option, - program_account: Option, - system_program: Option, - payer: Option, + program_data_account: Option, + program_account: Option, + system_program: Option, + payer: Option, additional_bytes: Option, - __remaining_accounts: Vec, + __remaining_accounts: Vec, } impl ExtendProgramBuilder { @@ -121,34 +136,28 @@ impl ExtendProgramBuilder { #[inline(always)] pub fn program_data_account( &mut self, - program_data_account: solana_program::pubkey::Pubkey, + program_data_account: solana_pubkey::Pubkey, ) -> &mut Self { self.program_data_account = Some(program_data_account); self } /// Program account. #[inline(always)] - pub fn program_account( - &mut self, - program_account: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn program_account(&mut self, program_account: solana_pubkey::Pubkey) -> &mut Self { self.program_account = Some(program_account); self } /// `[optional account]` /// System program (optional). #[inline(always)] - pub fn system_program( - &mut self, - system_program: Option, - ) -> &mut Self { + pub fn system_program(&mut self, system_program: Option) -> &mut Self { self.system_program = system_program; self } /// `[optional account]` /// Payer. #[inline(always)] - pub fn payer(&mut self, payer: Option) -> &mut Self { + pub fn payer(&mut self, payer: Option) -> &mut Self { self.payer = payer; self } @@ -157,12 +166,9 @@ impl ExtendProgramBuilder { self.additional_bytes = Some(additional_bytes); self } - /// Add an aditional account to the instruction. + /// Add an additional account to the instruction. #[inline(always)] - pub fn add_remaining_account( - &mut self, - account: solana_program::instruction::AccountMeta, - ) -> &mut Self { + pub fn add_remaining_account(&mut self, account: solana_instruction::AccountMeta) -> &mut Self { self.__remaining_accounts.push(account); self } @@ -170,13 +176,13 @@ impl ExtendProgramBuilder { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[solana_program::instruction::AccountMeta], + accounts: &[solana_instruction::AccountMeta], ) -> &mut Self { self.__remaining_accounts.extend_from_slice(accounts); self } #[allow(clippy::clone_on_copy)] - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { let accounts = ExtendProgram { program_data_account: self .program_data_account @@ -199,34 +205,34 @@ impl ExtendProgramBuilder { /// `extend_program` CPI accounts. pub struct ExtendProgramCpiAccounts<'a, 'b> { /// ProgramData account. - pub program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + pub program_data_account: &'b solana_account_info::AccountInfo<'a>, /// Program account. - pub program_account: &'b solana_program::account_info::AccountInfo<'a>, + pub program_account: &'b solana_account_info::AccountInfo<'a>, /// System program (optional). - pub system_program: Option<&'b solana_program::account_info::AccountInfo<'a>>, + pub system_program: Option<&'b solana_account_info::AccountInfo<'a>>, /// Payer. - pub payer: Option<&'b solana_program::account_info::AccountInfo<'a>>, + pub payer: Option<&'b solana_account_info::AccountInfo<'a>>, } /// `extend_program` CPI instruction. pub struct ExtendProgramCpi<'a, 'b> { /// The program to invoke. - pub __program: &'b solana_program::account_info::AccountInfo<'a>, + pub __program: &'b solana_account_info::AccountInfo<'a>, /// ProgramData account. - pub program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + pub program_data_account: &'b solana_account_info::AccountInfo<'a>, /// Program account. - pub program_account: &'b solana_program::account_info::AccountInfo<'a>, + pub program_account: &'b solana_account_info::AccountInfo<'a>, /// System program (optional). - pub system_program: Option<&'b solana_program::account_info::AccountInfo<'a>>, + pub system_program: Option<&'b solana_account_info::AccountInfo<'a>>, /// Payer. - pub payer: Option<&'b solana_program::account_info::AccountInfo<'a>>, + pub payer: Option<&'b solana_account_info::AccountInfo<'a>>, /// The arguments for the instruction. pub __args: ExtendProgramInstructionArgs, } impl<'a, 'b> ExtendProgramCpi<'a, 'b> { pub fn new( - program: &'b solana_program::account_info::AccountInfo<'a>, + program: &'b solana_account_info::AccountInfo<'a>, accounts: ExtendProgramCpiAccounts<'a, 'b>, args: ExtendProgramInstructionArgs, ) -> Self { @@ -240,70 +246,58 @@ impl<'a, 'b> ExtendProgramCpi<'a, 'b> { } } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], &[]) } #[inline(always)] pub fn invoke_with_remaining_accounts( &self, - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], remaining_accounts) } #[inline(always)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(signers_seeds, &[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] pub fn invoke_signed_with_remaining_accounts( &self, signers_seeds: &[&[&[u8]]], - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { let mut accounts = Vec::with_capacity(4 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.program_data_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.program_account.key, false, )); if let Some(system_program) = self.system_program { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *system_program.key, false, )); } else { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( crate::LOADER_V3_ID, false, )); } if let Some(payer) = self.payer { - accounts.push(solana_program::instruction::AccountMeta::new( - *payer.key, true, - )); + accounts.push(solana_instruction::AccountMeta::new(*payer.key, true)); } else { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( crate::LOADER_V3_ID, false, )); } remaining_accounts.iter().for_each(|remaining_account| { - accounts.push(solana_program::instruction::AccountMeta { + accounts.push(solana_instruction::AccountMeta { pubkey: *remaining_account.0.key, is_signer: remaining_account.1, is_writable: remaining_account.2, @@ -313,12 +307,12 @@ impl<'a, 'b> ExtendProgramCpi<'a, 'b> { let mut args = self.__args.try_to_vec().unwrap(); data.append(&mut args); - let instruction = solana_program::instruction::Instruction { + let instruction = solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, }; - let mut account_infos = Vec::with_capacity(4 + 1 + remaining_accounts.len()); + let mut account_infos = Vec::with_capacity(5 + remaining_accounts.len()); account_infos.push(self.__program.clone()); account_infos.push(self.program_data_account.clone()); account_infos.push(self.program_account.clone()); @@ -333,9 +327,9 @@ impl<'a, 'b> ExtendProgramCpi<'a, 'b> { .for_each(|remaining_account| account_infos.push(remaining_account.0.clone())); if signers_seeds.is_empty() { - solana_program::program::invoke(&instruction, &account_infos) + solana_cpi::invoke(&instruction, &account_infos) } else { - solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds) + solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds) } } } @@ -354,7 +348,7 @@ pub struct ExtendProgramCpiBuilder<'a, 'b> { } impl<'a, 'b> ExtendProgramCpiBuilder<'a, 'b> { - pub fn new(program: &'b solana_program::account_info::AccountInfo<'a>) -> Self { + pub fn new(program: &'b solana_account_info::AccountInfo<'a>) -> Self { let instruction = Box::new(ExtendProgramCpiBuilderInstruction { __program: program, program_data_account: None, @@ -370,7 +364,7 @@ impl<'a, 'b> ExtendProgramCpiBuilder<'a, 'b> { #[inline(always)] pub fn program_data_account( &mut self, - program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + program_data_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.program_data_account = Some(program_data_account); self @@ -379,7 +373,7 @@ impl<'a, 'b> ExtendProgramCpiBuilder<'a, 'b> { #[inline(always)] pub fn program_account( &mut self, - program_account: &'b solana_program::account_info::AccountInfo<'a>, + program_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.program_account = Some(program_account); self @@ -389,7 +383,7 @@ impl<'a, 'b> ExtendProgramCpiBuilder<'a, 'b> { #[inline(always)] pub fn system_program( &mut self, - system_program: Option<&'b solana_program::account_info::AccountInfo<'a>>, + system_program: Option<&'b solana_account_info::AccountInfo<'a>>, ) -> &mut Self { self.instruction.system_program = system_program; self @@ -397,10 +391,7 @@ impl<'a, 'b> ExtendProgramCpiBuilder<'a, 'b> { /// `[optional account]` /// Payer. #[inline(always)] - pub fn payer( - &mut self, - payer: Option<&'b solana_program::account_info::AccountInfo<'a>>, - ) -> &mut Self { + pub fn payer(&mut self, payer: Option<&'b solana_account_info::AccountInfo<'a>>) -> &mut Self { self.instruction.payer = payer; self } @@ -413,7 +404,7 @@ impl<'a, 'b> ExtendProgramCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_account( &mut self, - account: &'b solana_program::account_info::AccountInfo<'a>, + account: &'b solana_account_info::AccountInfo<'a>, is_writable: bool, is_signer: bool, ) -> &mut Self { @@ -430,11 +421,7 @@ impl<'a, 'b> ExtendProgramCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], + accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], ) -> &mut Self { self.instruction .__remaining_accounts @@ -442,15 +429,12 @@ impl<'a, 'b> ExtendProgramCpiBuilder<'a, 'b> { self } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed(&[]) } #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { let args = ExtendProgramInstructionArgs { additional_bytes: self .instruction @@ -485,16 +469,12 @@ impl<'a, 'b> ExtendProgramCpiBuilder<'a, 'b> { #[derive(Clone, Debug)] struct ExtendProgramCpiBuilderInstruction<'a, 'b> { - __program: &'b solana_program::account_info::AccountInfo<'a>, - program_data_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - program_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - system_program: Option<&'b solana_program::account_info::AccountInfo<'a>>, - payer: Option<&'b solana_program::account_info::AccountInfo<'a>>, + __program: &'b solana_account_info::AccountInfo<'a>, + program_data_account: Option<&'b solana_account_info::AccountInfo<'a>>, + program_account: Option<&'b solana_account_info::AccountInfo<'a>>, + system_program: Option<&'b solana_account_info::AccountInfo<'a>>, + payer: Option<&'b solana_account_info::AccountInfo<'a>>, additional_bytes: Option, /// Additional instruction accounts `(AccountInfo, is_writable, is_signer)`. - __remaining_accounts: Vec<( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )>, + __remaining_accounts: Vec<(&'b solana_account_info::AccountInfo<'a>, bool, bool)>, } diff --git a/clients/rust/src/generated/instructions/initialize_buffer.rs b/clients/rust/src/generated/instructions/initialize_buffer.rs index 5de36ec..5b70f5c 100644 --- a/clients/rust/src/generated/instructions/initialize_buffer.rs +++ b/clients/rust/src/generated/instructions/initialize_buffer.rs @@ -1,41 +1,45 @@ -//! This code was AUTOGENERATED using the kinobi library. +//! This code was AUTOGENERATED using the codama library. //! Please DO NOT EDIT THIS FILE, instead use visitors -//! to add features, then rerun kinobi to update it. +//! to add features, then rerun codama to update it. //! -//! +//! use borsh::{BorshDeserialize, BorshSerialize}; +pub const INITIALIZE_BUFFER_DISCRIMINATOR: u32 = 0; + /// Accounts. +#[derive(Debug)] pub struct InitializeBuffer { /// Source account to initialize. - pub source_account: solana_program::pubkey::Pubkey, + pub source_account: solana_pubkey::Pubkey, /// Buffer authority. - pub buffer_authority: solana_program::pubkey::Pubkey, + pub buffer_authority: solana_pubkey::Pubkey, } impl InitializeBuffer { - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { self.instruction_with_remaining_accounts(&[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::vec_init_then_push)] pub fn instruction_with_remaining_accounts( &self, - remaining_accounts: &[solana_program::instruction::AccountMeta], - ) -> solana_program::instruction::Instruction { + remaining_accounts: &[solana_instruction::AccountMeta], + ) -> solana_instruction::Instruction { let mut accounts = Vec::with_capacity(2 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.source_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( self.buffer_authority, false, )); accounts.extend_from_slice(remaining_accounts); let data = InitializeBufferInstructionData::new().try_to_vec().unwrap(); - solana_program::instruction::Instruction { + solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, @@ -43,7 +47,8 @@ impl InitializeBuffer { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct InitializeBufferInstructionData { discriminator: u32, } @@ -52,6 +57,10 @@ impl InitializeBufferInstructionData { pub fn new() -> Self { Self { discriminator: 0 } } + + pub(crate) fn try_to_vec(&self) -> Result, std::io::Error> { + borsh::to_vec(self) + } } impl Default for InitializeBufferInstructionData { @@ -68,9 +77,9 @@ impl Default for InitializeBufferInstructionData { /// 1. `[]` buffer_authority #[derive(Clone, Debug, Default)] pub struct InitializeBufferBuilder { - source_account: Option, - buffer_authority: Option, - __remaining_accounts: Vec, + source_account: Option, + buffer_authority: Option, + __remaining_accounts: Vec, } impl InitializeBufferBuilder { @@ -79,25 +88,19 @@ impl InitializeBufferBuilder { } /// Source account to initialize. #[inline(always)] - pub fn source_account(&mut self, source_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn source_account(&mut self, source_account: solana_pubkey::Pubkey) -> &mut Self { self.source_account = Some(source_account); self } /// Buffer authority. #[inline(always)] - pub fn buffer_authority( - &mut self, - buffer_authority: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn buffer_authority(&mut self, buffer_authority: solana_pubkey::Pubkey) -> &mut Self { self.buffer_authority = Some(buffer_authority); self } - /// Add an aditional account to the instruction. + /// Add an additional account to the instruction. #[inline(always)] - pub fn add_remaining_account( - &mut self, - account: solana_program::instruction::AccountMeta, - ) -> &mut Self { + pub fn add_remaining_account(&mut self, account: solana_instruction::AccountMeta) -> &mut Self { self.__remaining_accounts.push(account); self } @@ -105,13 +108,13 @@ impl InitializeBufferBuilder { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[solana_program::instruction::AccountMeta], + accounts: &[solana_instruction::AccountMeta], ) -> &mut Self { self.__remaining_accounts.extend_from_slice(accounts); self } #[allow(clippy::clone_on_copy)] - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { let accounts = InitializeBuffer { source_account: self.source_account.expect("source_account is not set"), buffer_authority: self.buffer_authority.expect("buffer_authority is not set"), @@ -124,24 +127,24 @@ impl InitializeBufferBuilder { /// `initialize_buffer` CPI accounts. pub struct InitializeBufferCpiAccounts<'a, 'b> { /// Source account to initialize. - pub source_account: &'b solana_program::account_info::AccountInfo<'a>, + pub source_account: &'b solana_account_info::AccountInfo<'a>, /// Buffer authority. - pub buffer_authority: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_authority: &'b solana_account_info::AccountInfo<'a>, } /// `initialize_buffer` CPI instruction. pub struct InitializeBufferCpi<'a, 'b> { /// The program to invoke. - pub __program: &'b solana_program::account_info::AccountInfo<'a>, + pub __program: &'b solana_account_info::AccountInfo<'a>, /// Source account to initialize. - pub source_account: &'b solana_program::account_info::AccountInfo<'a>, + pub source_account: &'b solana_account_info::AccountInfo<'a>, /// Buffer authority. - pub buffer_authority: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_authority: &'b solana_account_info::AccountInfo<'a>, } impl<'a, 'b> InitializeBufferCpi<'a, 'b> { pub fn new( - program: &'b solana_program::account_info::AccountInfo<'a>, + program: &'b solana_account_info::AccountInfo<'a>, accounts: InitializeBufferCpiAccounts<'a, 'b>, ) -> Self { Self { @@ -151,49 +154,39 @@ impl<'a, 'b> InitializeBufferCpi<'a, 'b> { } } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], &[]) } #[inline(always)] pub fn invoke_with_remaining_accounts( &self, - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], remaining_accounts) } #[inline(always)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(signers_seeds, &[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] pub fn invoke_signed_with_remaining_accounts( &self, signers_seeds: &[&[&[u8]]], - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { let mut accounts = Vec::with_capacity(2 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.source_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *self.buffer_authority.key, false, )); remaining_accounts.iter().for_each(|remaining_account| { - accounts.push(solana_program::instruction::AccountMeta { + accounts.push(solana_instruction::AccountMeta { pubkey: *remaining_account.0.key, is_signer: remaining_account.1, is_writable: remaining_account.2, @@ -201,12 +194,12 @@ impl<'a, 'b> InitializeBufferCpi<'a, 'b> { }); let data = InitializeBufferInstructionData::new().try_to_vec().unwrap(); - let instruction = solana_program::instruction::Instruction { + let instruction = solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, }; - let mut account_infos = Vec::with_capacity(2 + 1 + remaining_accounts.len()); + let mut account_infos = Vec::with_capacity(3 + remaining_accounts.len()); account_infos.push(self.__program.clone()); account_infos.push(self.source_account.clone()); account_infos.push(self.buffer_authority.clone()); @@ -215,9 +208,9 @@ impl<'a, 'b> InitializeBufferCpi<'a, 'b> { .for_each(|remaining_account| account_infos.push(remaining_account.0.clone())); if signers_seeds.is_empty() { - solana_program::program::invoke(&instruction, &account_infos) + solana_cpi::invoke(&instruction, &account_infos) } else { - solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds) + solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds) } } } @@ -234,7 +227,7 @@ pub struct InitializeBufferCpiBuilder<'a, 'b> { } impl<'a, 'b> InitializeBufferCpiBuilder<'a, 'b> { - pub fn new(program: &'b solana_program::account_info::AccountInfo<'a>) -> Self { + pub fn new(program: &'b solana_account_info::AccountInfo<'a>) -> Self { let instruction = Box::new(InitializeBufferCpiBuilderInstruction { __program: program, source_account: None, @@ -247,7 +240,7 @@ impl<'a, 'b> InitializeBufferCpiBuilder<'a, 'b> { #[inline(always)] pub fn source_account( &mut self, - source_account: &'b solana_program::account_info::AccountInfo<'a>, + source_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.source_account = Some(source_account); self @@ -256,7 +249,7 @@ impl<'a, 'b> InitializeBufferCpiBuilder<'a, 'b> { #[inline(always)] pub fn buffer_authority( &mut self, - buffer_authority: &'b solana_program::account_info::AccountInfo<'a>, + buffer_authority: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.buffer_authority = Some(buffer_authority); self @@ -265,7 +258,7 @@ impl<'a, 'b> InitializeBufferCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_account( &mut self, - account: &'b solana_program::account_info::AccountInfo<'a>, + account: &'b solana_account_info::AccountInfo<'a>, is_writable: bool, is_signer: bool, ) -> &mut Self { @@ -282,11 +275,7 @@ impl<'a, 'b> InitializeBufferCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], + accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], ) -> &mut Self { self.instruction .__remaining_accounts @@ -294,15 +283,12 @@ impl<'a, 'b> InitializeBufferCpiBuilder<'a, 'b> { self } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed(&[]) } #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { let instruction = InitializeBufferCpi { __program: self.instruction.__program, @@ -325,13 +311,9 @@ impl<'a, 'b> InitializeBufferCpiBuilder<'a, 'b> { #[derive(Clone, Debug)] struct InitializeBufferCpiBuilderInstruction<'a, 'b> { - __program: &'b solana_program::account_info::AccountInfo<'a>, - source_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - buffer_authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, + __program: &'b solana_account_info::AccountInfo<'a>, + source_account: Option<&'b solana_account_info::AccountInfo<'a>>, + buffer_authority: Option<&'b solana_account_info::AccountInfo<'a>>, /// Additional instruction accounts `(AccountInfo, is_writable, is_signer)`. - __remaining_accounts: Vec<( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )>, + __remaining_accounts: Vec<(&'b solana_account_info::AccountInfo<'a>, bool, bool)>, } diff --git a/clients/rust/src/generated/instructions/mod.rs b/clients/rust/src/generated/instructions/mod.rs index 8557eb7..003edc9 100644 --- a/clients/rust/src/generated/instructions/mod.rs +++ b/clients/rust/src/generated/instructions/mod.rs @@ -1,8 +1,8 @@ -//! This code was AUTOGENERATED using the kinobi library. +//! This code was AUTOGENERATED using the codama library. //! Please DO NOT EDIT THIS FILE, instead use visitors -//! to add features, then rerun kinobi to update it. +//! to add features, then rerun codama to update it. //! -//! +//! pub(crate) mod r#close; pub(crate) mod r#deploy_with_max_data_len; diff --git a/clients/rust/src/generated/instructions/set_authority.rs b/clients/rust/src/generated/instructions/set_authority.rs index 067578a..f7f1137 100644 --- a/clients/rust/src/generated/instructions/set_authority.rs +++ b/clients/rust/src/generated/instructions/set_authority.rs @@ -1,46 +1,50 @@ -//! This code was AUTOGENERATED using the kinobi library. +//! This code was AUTOGENERATED using the codama library. //! Please DO NOT EDIT THIS FILE, instead use visitors -//! to add features, then rerun kinobi to update it. +//! to add features, then rerun codama to update it. //! -//! +//! use borsh::{BorshDeserialize, BorshSerialize}; +pub const SET_AUTHORITY_DISCRIMINATOR: u32 = 4; + /// Accounts. +#[derive(Debug)] pub struct SetAuthority { /// Buffer or ProgramData account. - pub buffer_or_program_data_account: solana_program::pubkey::Pubkey, + pub buffer_or_program_data_account: solana_pubkey::Pubkey, /// Current authority. - pub current_authority: solana_program::pubkey::Pubkey, + pub current_authority: solana_pubkey::Pubkey, /// New authority (optional). - pub new_authority: Option, + pub new_authority: Option, } impl SetAuthority { - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { self.instruction_with_remaining_accounts(&[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::vec_init_then_push)] pub fn instruction_with_remaining_accounts( &self, - remaining_accounts: &[solana_program::instruction::AccountMeta], - ) -> solana_program::instruction::Instruction { + remaining_accounts: &[solana_instruction::AccountMeta], + ) -> solana_instruction::Instruction { let mut accounts = Vec::with_capacity(3 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.buffer_or_program_data_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( self.current_authority, true, )); if let Some(new_authority) = self.new_authority { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( new_authority, false, )); } else { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( crate::LOADER_V3_ID, false, )); @@ -48,7 +52,7 @@ impl SetAuthority { accounts.extend_from_slice(remaining_accounts); let data = SetAuthorityInstructionData::new().try_to_vec().unwrap(); - solana_program::instruction::Instruction { + solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, @@ -56,7 +60,8 @@ impl SetAuthority { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct SetAuthorityInstructionData { discriminator: u32, } @@ -65,6 +70,10 @@ impl SetAuthorityInstructionData { pub fn new() -> Self { Self { discriminator: 4 } } + + pub(crate) fn try_to_vec(&self) -> Result, std::io::Error> { + borsh::to_vec(self) + } } impl Default for SetAuthorityInstructionData { @@ -82,10 +91,10 @@ impl Default for SetAuthorityInstructionData { /// 2. `[optional]` new_authority #[derive(Clone, Debug, Default)] pub struct SetAuthorityBuilder { - buffer_or_program_data_account: Option, - current_authority: Option, - new_authority: Option, - __remaining_accounts: Vec, + buffer_or_program_data_account: Option, + current_authority: Option, + new_authority: Option, + __remaining_accounts: Vec, } impl SetAuthorityBuilder { @@ -96,36 +105,27 @@ impl SetAuthorityBuilder { #[inline(always)] pub fn buffer_or_program_data_account( &mut self, - buffer_or_program_data_account: solana_program::pubkey::Pubkey, + buffer_or_program_data_account: solana_pubkey::Pubkey, ) -> &mut Self { self.buffer_or_program_data_account = Some(buffer_or_program_data_account); self } /// Current authority. #[inline(always)] - pub fn current_authority( - &mut self, - current_authority: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn current_authority(&mut self, current_authority: solana_pubkey::Pubkey) -> &mut Self { self.current_authority = Some(current_authority); self } /// `[optional account]` /// New authority (optional). #[inline(always)] - pub fn new_authority( - &mut self, - new_authority: Option, - ) -> &mut Self { + pub fn new_authority(&mut self, new_authority: Option) -> &mut Self { self.new_authority = new_authority; self } - /// Add an aditional account to the instruction. + /// Add an additional account to the instruction. #[inline(always)] - pub fn add_remaining_account( - &mut self, - account: solana_program::instruction::AccountMeta, - ) -> &mut Self { + pub fn add_remaining_account(&mut self, account: solana_instruction::AccountMeta) -> &mut Self { self.__remaining_accounts.push(account); self } @@ -133,13 +133,13 @@ impl SetAuthorityBuilder { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[solana_program::instruction::AccountMeta], + accounts: &[solana_instruction::AccountMeta], ) -> &mut Self { self.__remaining_accounts.extend_from_slice(accounts); self } #[allow(clippy::clone_on_copy)] - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { let accounts = SetAuthority { buffer_or_program_data_account: self .buffer_or_program_data_account @@ -157,28 +157,28 @@ impl SetAuthorityBuilder { /// `set_authority` CPI accounts. pub struct SetAuthorityCpiAccounts<'a, 'b> { /// Buffer or ProgramData account. - pub buffer_or_program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_or_program_data_account: &'b solana_account_info::AccountInfo<'a>, /// Current authority. - pub current_authority: &'b solana_program::account_info::AccountInfo<'a>, + pub current_authority: &'b solana_account_info::AccountInfo<'a>, /// New authority (optional). - pub new_authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, + pub new_authority: Option<&'b solana_account_info::AccountInfo<'a>>, } /// `set_authority` CPI instruction. pub struct SetAuthorityCpi<'a, 'b> { /// The program to invoke. - pub __program: &'b solana_program::account_info::AccountInfo<'a>, + pub __program: &'b solana_account_info::AccountInfo<'a>, /// Buffer or ProgramData account. - pub buffer_or_program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_or_program_data_account: &'b solana_account_info::AccountInfo<'a>, /// Current authority. - pub current_authority: &'b solana_program::account_info::AccountInfo<'a>, + pub current_authority: &'b solana_account_info::AccountInfo<'a>, /// New authority (optional). - pub new_authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, + pub new_authority: Option<&'b solana_account_info::AccountInfo<'a>>, } impl<'a, 'b> SetAuthorityCpi<'a, 'b> { pub fn new( - program: &'b solana_program::account_info::AccountInfo<'a>, + program: &'b solana_account_info::AccountInfo<'a>, accounts: SetAuthorityCpiAccounts<'a, 'b>, ) -> Self { Self { @@ -189,60 +189,50 @@ impl<'a, 'b> SetAuthorityCpi<'a, 'b> { } } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], &[]) } #[inline(always)] pub fn invoke_with_remaining_accounts( &self, - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], remaining_accounts) } #[inline(always)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(signers_seeds, &[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] pub fn invoke_signed_with_remaining_accounts( &self, signers_seeds: &[&[&[u8]]], - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { let mut accounts = Vec::with_capacity(3 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.buffer_or_program_data_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *self.current_authority.key, true, )); if let Some(new_authority) = self.new_authority { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *new_authority.key, false, )); } else { - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( crate::LOADER_V3_ID, false, )); } remaining_accounts.iter().for_each(|remaining_account| { - accounts.push(solana_program::instruction::AccountMeta { + accounts.push(solana_instruction::AccountMeta { pubkey: *remaining_account.0.key, is_signer: remaining_account.1, is_writable: remaining_account.2, @@ -250,12 +240,12 @@ impl<'a, 'b> SetAuthorityCpi<'a, 'b> { }); let data = SetAuthorityInstructionData::new().try_to_vec().unwrap(); - let instruction = solana_program::instruction::Instruction { + let instruction = solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, }; - let mut account_infos = Vec::with_capacity(3 + 1 + remaining_accounts.len()); + let mut account_infos = Vec::with_capacity(4 + remaining_accounts.len()); account_infos.push(self.__program.clone()); account_infos.push(self.buffer_or_program_data_account.clone()); account_infos.push(self.current_authority.clone()); @@ -267,9 +257,9 @@ impl<'a, 'b> SetAuthorityCpi<'a, 'b> { .for_each(|remaining_account| account_infos.push(remaining_account.0.clone())); if signers_seeds.is_empty() { - solana_program::program::invoke(&instruction, &account_infos) + solana_cpi::invoke(&instruction, &account_infos) } else { - solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds) + solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds) } } } @@ -287,7 +277,7 @@ pub struct SetAuthorityCpiBuilder<'a, 'b> { } impl<'a, 'b> SetAuthorityCpiBuilder<'a, 'b> { - pub fn new(program: &'b solana_program::account_info::AccountInfo<'a>) -> Self { + pub fn new(program: &'b solana_account_info::AccountInfo<'a>) -> Self { let instruction = Box::new(SetAuthorityCpiBuilderInstruction { __program: program, buffer_or_program_data_account: None, @@ -301,7 +291,7 @@ impl<'a, 'b> SetAuthorityCpiBuilder<'a, 'b> { #[inline(always)] pub fn buffer_or_program_data_account( &mut self, - buffer_or_program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + buffer_or_program_data_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.buffer_or_program_data_account = Some(buffer_or_program_data_account); self @@ -310,7 +300,7 @@ impl<'a, 'b> SetAuthorityCpiBuilder<'a, 'b> { #[inline(always)] pub fn current_authority( &mut self, - current_authority: &'b solana_program::account_info::AccountInfo<'a>, + current_authority: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.current_authority = Some(current_authority); self @@ -320,7 +310,7 @@ impl<'a, 'b> SetAuthorityCpiBuilder<'a, 'b> { #[inline(always)] pub fn new_authority( &mut self, - new_authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, + new_authority: Option<&'b solana_account_info::AccountInfo<'a>>, ) -> &mut Self { self.instruction.new_authority = new_authority; self @@ -329,7 +319,7 @@ impl<'a, 'b> SetAuthorityCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_account( &mut self, - account: &'b solana_program::account_info::AccountInfo<'a>, + account: &'b solana_account_info::AccountInfo<'a>, is_writable: bool, is_signer: bool, ) -> &mut Self { @@ -346,11 +336,7 @@ impl<'a, 'b> SetAuthorityCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], + accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], ) -> &mut Self { self.instruction .__remaining_accounts @@ -358,15 +344,12 @@ impl<'a, 'b> SetAuthorityCpiBuilder<'a, 'b> { self } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed(&[]) } #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { let instruction = SetAuthorityCpi { __program: self.instruction.__program, @@ -391,14 +374,10 @@ impl<'a, 'b> SetAuthorityCpiBuilder<'a, 'b> { #[derive(Clone, Debug)] struct SetAuthorityCpiBuilderInstruction<'a, 'b> { - __program: &'b solana_program::account_info::AccountInfo<'a>, - buffer_or_program_data_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - current_authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, - new_authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, + __program: &'b solana_account_info::AccountInfo<'a>, + buffer_or_program_data_account: Option<&'b solana_account_info::AccountInfo<'a>>, + current_authority: Option<&'b solana_account_info::AccountInfo<'a>>, + new_authority: Option<&'b solana_account_info::AccountInfo<'a>>, /// Additional instruction accounts `(AccountInfo, is_writable, is_signer)`. - __remaining_accounts: Vec<( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )>, + __remaining_accounts: Vec<(&'b solana_account_info::AccountInfo<'a>, bool, bool)>, } diff --git a/clients/rust/src/generated/instructions/set_authority_checked.rs b/clients/rust/src/generated/instructions/set_authority_checked.rs index e816861..74d8be0 100644 --- a/clients/rust/src/generated/instructions/set_authority_checked.rs +++ b/clients/rust/src/generated/instructions/set_authority_checked.rs @@ -1,40 +1,44 @@ -//! This code was AUTOGENERATED using the kinobi library. +//! This code was AUTOGENERATED using the codama library. //! Please DO NOT EDIT THIS FILE, instead use visitors -//! to add features, then rerun kinobi to update it. +//! to add features, then rerun codama to update it. //! -//! +//! use borsh::{BorshDeserialize, BorshSerialize}; +pub const SET_AUTHORITY_CHECKED_DISCRIMINATOR: u32 = 7; + /// Accounts. +#[derive(Debug)] pub struct SetAuthorityChecked { /// Buffer or ProgramData account to change the authority of. - pub buffer_or_program_data_account: solana_program::pubkey::Pubkey, + pub buffer_or_program_data_account: solana_pubkey::Pubkey, /// Current authority. - pub current_authority: solana_program::pubkey::Pubkey, + pub current_authority: solana_pubkey::Pubkey, /// New authority. - pub new_authority: solana_program::pubkey::Pubkey, + pub new_authority: solana_pubkey::Pubkey, } impl SetAuthorityChecked { - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { self.instruction_with_remaining_accounts(&[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::vec_init_then_push)] pub fn instruction_with_remaining_accounts( &self, - remaining_accounts: &[solana_program::instruction::AccountMeta], - ) -> solana_program::instruction::Instruction { + remaining_accounts: &[solana_instruction::AccountMeta], + ) -> solana_instruction::Instruction { let mut accounts = Vec::with_capacity(3 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.buffer_or_program_data_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( self.current_authority, true, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( self.new_authority, true, )); @@ -43,7 +47,7 @@ impl SetAuthorityChecked { .try_to_vec() .unwrap(); - solana_program::instruction::Instruction { + solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, @@ -51,7 +55,8 @@ impl SetAuthorityChecked { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct SetAuthorityCheckedInstructionData { discriminator: u32, } @@ -60,6 +65,10 @@ impl SetAuthorityCheckedInstructionData { pub fn new() -> Self { Self { discriminator: 7 } } + + pub(crate) fn try_to_vec(&self) -> Result, std::io::Error> { + borsh::to_vec(self) + } } impl Default for SetAuthorityCheckedInstructionData { @@ -77,10 +86,10 @@ impl Default for SetAuthorityCheckedInstructionData { /// 2. `[signer]` new_authority #[derive(Clone, Debug, Default)] pub struct SetAuthorityCheckedBuilder { - buffer_or_program_data_account: Option, - current_authority: Option, - new_authority: Option, - __remaining_accounts: Vec, + buffer_or_program_data_account: Option, + current_authority: Option, + new_authority: Option, + __remaining_accounts: Vec, } impl SetAuthorityCheckedBuilder { @@ -91,32 +100,26 @@ impl SetAuthorityCheckedBuilder { #[inline(always)] pub fn buffer_or_program_data_account( &mut self, - buffer_or_program_data_account: solana_program::pubkey::Pubkey, + buffer_or_program_data_account: solana_pubkey::Pubkey, ) -> &mut Self { self.buffer_or_program_data_account = Some(buffer_or_program_data_account); self } /// Current authority. #[inline(always)] - pub fn current_authority( - &mut self, - current_authority: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn current_authority(&mut self, current_authority: solana_pubkey::Pubkey) -> &mut Self { self.current_authority = Some(current_authority); self } /// New authority. #[inline(always)] - pub fn new_authority(&mut self, new_authority: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn new_authority(&mut self, new_authority: solana_pubkey::Pubkey) -> &mut Self { self.new_authority = Some(new_authority); self } - /// Add an aditional account to the instruction. + /// Add an additional account to the instruction. #[inline(always)] - pub fn add_remaining_account( - &mut self, - account: solana_program::instruction::AccountMeta, - ) -> &mut Self { + pub fn add_remaining_account(&mut self, account: solana_instruction::AccountMeta) -> &mut Self { self.__remaining_accounts.push(account); self } @@ -124,13 +127,13 @@ impl SetAuthorityCheckedBuilder { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[solana_program::instruction::AccountMeta], + accounts: &[solana_instruction::AccountMeta], ) -> &mut Self { self.__remaining_accounts.extend_from_slice(accounts); self } #[allow(clippy::clone_on_copy)] - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { let accounts = SetAuthorityChecked { buffer_or_program_data_account: self .buffer_or_program_data_account @@ -148,28 +151,28 @@ impl SetAuthorityCheckedBuilder { /// `set_authority_checked` CPI accounts. pub struct SetAuthorityCheckedCpiAccounts<'a, 'b> { /// Buffer or ProgramData account to change the authority of. - pub buffer_or_program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_or_program_data_account: &'b solana_account_info::AccountInfo<'a>, /// Current authority. - pub current_authority: &'b solana_program::account_info::AccountInfo<'a>, + pub current_authority: &'b solana_account_info::AccountInfo<'a>, /// New authority. - pub new_authority: &'b solana_program::account_info::AccountInfo<'a>, + pub new_authority: &'b solana_account_info::AccountInfo<'a>, } /// `set_authority_checked` CPI instruction. pub struct SetAuthorityCheckedCpi<'a, 'b> { /// The program to invoke. - pub __program: &'b solana_program::account_info::AccountInfo<'a>, + pub __program: &'b solana_account_info::AccountInfo<'a>, /// Buffer or ProgramData account to change the authority of. - pub buffer_or_program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_or_program_data_account: &'b solana_account_info::AccountInfo<'a>, /// Current authority. - pub current_authority: &'b solana_program::account_info::AccountInfo<'a>, + pub current_authority: &'b solana_account_info::AccountInfo<'a>, /// New authority. - pub new_authority: &'b solana_program::account_info::AccountInfo<'a>, + pub new_authority: &'b solana_account_info::AccountInfo<'a>, } impl<'a, 'b> SetAuthorityCheckedCpi<'a, 'b> { pub fn new( - program: &'b solana_program::account_info::AccountInfo<'a>, + program: &'b solana_account_info::AccountInfo<'a>, accounts: SetAuthorityCheckedCpiAccounts<'a, 'b>, ) -> Self { Self { @@ -180,53 +183,43 @@ impl<'a, 'b> SetAuthorityCheckedCpi<'a, 'b> { } } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], &[]) } #[inline(always)] pub fn invoke_with_remaining_accounts( &self, - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], remaining_accounts) } #[inline(always)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(signers_seeds, &[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] pub fn invoke_signed_with_remaining_accounts( &self, signers_seeds: &[&[&[u8]]], - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { let mut accounts = Vec::with_capacity(3 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.buffer_or_program_data_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *self.current_authority.key, true, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *self.new_authority.key, true, )); remaining_accounts.iter().for_each(|remaining_account| { - accounts.push(solana_program::instruction::AccountMeta { + accounts.push(solana_instruction::AccountMeta { pubkey: *remaining_account.0.key, is_signer: remaining_account.1, is_writable: remaining_account.2, @@ -236,12 +229,12 @@ impl<'a, 'b> SetAuthorityCheckedCpi<'a, 'b> { .try_to_vec() .unwrap(); - let instruction = solana_program::instruction::Instruction { + let instruction = solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, }; - let mut account_infos = Vec::with_capacity(3 + 1 + remaining_accounts.len()); + let mut account_infos = Vec::with_capacity(4 + remaining_accounts.len()); account_infos.push(self.__program.clone()); account_infos.push(self.buffer_or_program_data_account.clone()); account_infos.push(self.current_authority.clone()); @@ -251,9 +244,9 @@ impl<'a, 'b> SetAuthorityCheckedCpi<'a, 'b> { .for_each(|remaining_account| account_infos.push(remaining_account.0.clone())); if signers_seeds.is_empty() { - solana_program::program::invoke(&instruction, &account_infos) + solana_cpi::invoke(&instruction, &account_infos) } else { - solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds) + solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds) } } } @@ -271,7 +264,7 @@ pub struct SetAuthorityCheckedCpiBuilder<'a, 'b> { } impl<'a, 'b> SetAuthorityCheckedCpiBuilder<'a, 'b> { - pub fn new(program: &'b solana_program::account_info::AccountInfo<'a>) -> Self { + pub fn new(program: &'b solana_account_info::AccountInfo<'a>) -> Self { let instruction = Box::new(SetAuthorityCheckedCpiBuilderInstruction { __program: program, buffer_or_program_data_account: None, @@ -285,7 +278,7 @@ impl<'a, 'b> SetAuthorityCheckedCpiBuilder<'a, 'b> { #[inline(always)] pub fn buffer_or_program_data_account( &mut self, - buffer_or_program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + buffer_or_program_data_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.buffer_or_program_data_account = Some(buffer_or_program_data_account); self @@ -294,7 +287,7 @@ impl<'a, 'b> SetAuthorityCheckedCpiBuilder<'a, 'b> { #[inline(always)] pub fn current_authority( &mut self, - current_authority: &'b solana_program::account_info::AccountInfo<'a>, + current_authority: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.current_authority = Some(current_authority); self @@ -303,7 +296,7 @@ impl<'a, 'b> SetAuthorityCheckedCpiBuilder<'a, 'b> { #[inline(always)] pub fn new_authority( &mut self, - new_authority: &'b solana_program::account_info::AccountInfo<'a>, + new_authority: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.new_authority = Some(new_authority); self @@ -312,7 +305,7 @@ impl<'a, 'b> SetAuthorityCheckedCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_account( &mut self, - account: &'b solana_program::account_info::AccountInfo<'a>, + account: &'b solana_account_info::AccountInfo<'a>, is_writable: bool, is_signer: bool, ) -> &mut Self { @@ -329,11 +322,7 @@ impl<'a, 'b> SetAuthorityCheckedCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], + accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], ) -> &mut Self { self.instruction .__remaining_accounts @@ -341,15 +330,12 @@ impl<'a, 'b> SetAuthorityCheckedCpiBuilder<'a, 'b> { self } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed(&[]) } #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { let instruction = SetAuthorityCheckedCpi { __program: self.instruction.__program, @@ -377,14 +363,10 @@ impl<'a, 'b> SetAuthorityCheckedCpiBuilder<'a, 'b> { #[derive(Clone, Debug)] struct SetAuthorityCheckedCpiBuilderInstruction<'a, 'b> { - __program: &'b solana_program::account_info::AccountInfo<'a>, - buffer_or_program_data_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - current_authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, - new_authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, + __program: &'b solana_account_info::AccountInfo<'a>, + buffer_or_program_data_account: Option<&'b solana_account_info::AccountInfo<'a>>, + current_authority: Option<&'b solana_account_info::AccountInfo<'a>>, + new_authority: Option<&'b solana_account_info::AccountInfo<'a>>, /// Additional instruction accounts `(AccountInfo, is_writable, is_signer)`. - __remaining_accounts: Vec<( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )>, + __remaining_accounts: Vec<(&'b solana_account_info::AccountInfo<'a>, bool, bool)>, } diff --git a/clients/rust/src/generated/instructions/upgrade.rs b/clients/rust/src/generated/instructions/upgrade.rs index ff7e0b7..3922b19 100644 --- a/clients/rust/src/generated/instructions/upgrade.rs +++ b/clients/rust/src/generated/instructions/upgrade.rs @@ -1,71 +1,75 @@ -//! This code was AUTOGENERATED using the kinobi library. +//! This code was AUTOGENERATED using the codama library. //! Please DO NOT EDIT THIS FILE, instead use visitors -//! to add features, then rerun kinobi to update it. +//! to add features, then rerun codama to update it. //! -//! +//! use borsh::{BorshDeserialize, BorshSerialize}; +pub const UPGRADE_DISCRIMINATOR: u32 = 3; + /// Accounts. +#[derive(Debug)] pub struct Upgrade { /// ProgramData account. - pub program_data_account: solana_program::pubkey::Pubkey, + pub program_data_account: solana_pubkey::Pubkey, /// Program account. - pub program_account: solana_program::pubkey::Pubkey, + pub program_account: solana_pubkey::Pubkey, /// Buffer account where the new program data has been written. - pub buffer_account: solana_program::pubkey::Pubkey, + pub buffer_account: solana_pubkey::Pubkey, /// Spill account. - pub spill_account: solana_program::pubkey::Pubkey, + pub spill_account: solana_pubkey::Pubkey, /// Rent sysvar. - pub rent_sysvar: solana_program::pubkey::Pubkey, + pub rent_sysvar: solana_pubkey::Pubkey, /// Clock sysvar. - pub clock_sysvar: solana_program::pubkey::Pubkey, + pub clock_sysvar: solana_pubkey::Pubkey, /// Authority. - pub authority: solana_program::pubkey::Pubkey, + pub authority: solana_pubkey::Pubkey, } impl Upgrade { - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { self.instruction_with_remaining_accounts(&[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::vec_init_then_push)] pub fn instruction_with_remaining_accounts( &self, - remaining_accounts: &[solana_program::instruction::AccountMeta], - ) -> solana_program::instruction::Instruction { + remaining_accounts: &[solana_instruction::AccountMeta], + ) -> solana_instruction::Instruction { let mut accounts = Vec::with_capacity(7 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.program_data_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.program_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.buffer_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.spill_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( self.rent_sysvar, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( self.clock_sysvar, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( self.authority, true, )); accounts.extend_from_slice(remaining_accounts); let data = UpgradeInstructionData::new().try_to_vec().unwrap(); - solana_program::instruction::Instruction { + solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, @@ -73,7 +77,8 @@ impl Upgrade { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct UpgradeInstructionData { discriminator: u32, } @@ -82,6 +87,10 @@ impl UpgradeInstructionData { pub fn new() -> Self { Self { discriminator: 3 } } + + pub(crate) fn try_to_vec(&self) -> Result, std::io::Error> { + borsh::to_vec(self) + } } impl Default for UpgradeInstructionData { @@ -105,14 +114,14 @@ impl Default for UpgradeInstructionData { /// 6. `[signer]` authority #[derive(Clone, Debug, Default)] pub struct UpgradeBuilder { - program_data_account: Option, - program_account: Option, - buffer_account: Option, - spill_account: Option, - rent_sysvar: Option, - clock_sysvar: Option, - authority: Option, - __remaining_accounts: Vec, + program_data_account: Option, + program_account: Option, + buffer_account: Option, + spill_account: Option, + rent_sysvar: Option, + clock_sysvar: Option, + authority: Option, + __remaining_accounts: Vec, } impl UpgradeBuilder { @@ -123,58 +132,52 @@ impl UpgradeBuilder { #[inline(always)] pub fn program_data_account( &mut self, - program_data_account: solana_program::pubkey::Pubkey, + program_data_account: solana_pubkey::Pubkey, ) -> &mut Self { self.program_data_account = Some(program_data_account); self } /// Program account. #[inline(always)] - pub fn program_account( - &mut self, - program_account: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn program_account(&mut self, program_account: solana_pubkey::Pubkey) -> &mut Self { self.program_account = Some(program_account); self } /// Buffer account where the new program data has been written. #[inline(always)] - pub fn buffer_account(&mut self, buffer_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn buffer_account(&mut self, buffer_account: solana_pubkey::Pubkey) -> &mut Self { self.buffer_account = Some(buffer_account); self } /// Spill account. #[inline(always)] - pub fn spill_account(&mut self, spill_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn spill_account(&mut self, spill_account: solana_pubkey::Pubkey) -> &mut Self { self.spill_account = Some(spill_account); self } /// `[optional account, default to /// 'SysvarRent111111111111111111111111111111111']` Rent sysvar. #[inline(always)] - pub fn rent_sysvar(&mut self, rent_sysvar: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn rent_sysvar(&mut self, rent_sysvar: solana_pubkey::Pubkey) -> &mut Self { self.rent_sysvar = Some(rent_sysvar); self } /// `[optional account, default to /// 'SysvarC1ock11111111111111111111111111111111']` Clock sysvar. #[inline(always)] - pub fn clock_sysvar(&mut self, clock_sysvar: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn clock_sysvar(&mut self, clock_sysvar: solana_pubkey::Pubkey) -> &mut Self { self.clock_sysvar = Some(clock_sysvar); self } /// Authority. #[inline(always)] - pub fn authority(&mut self, authority: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn authority(&mut self, authority: solana_pubkey::Pubkey) -> &mut Self { self.authority = Some(authority); self } - /// Add an aditional account to the instruction. + /// Add an additional account to the instruction. #[inline(always)] - pub fn add_remaining_account( - &mut self, - account: solana_program::instruction::AccountMeta, - ) -> &mut Self { + pub fn add_remaining_account(&mut self, account: solana_instruction::AccountMeta) -> &mut Self { self.__remaining_accounts.push(account); self } @@ -182,13 +185,13 @@ impl UpgradeBuilder { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[solana_program::instruction::AccountMeta], + accounts: &[solana_instruction::AccountMeta], ) -> &mut Self { self.__remaining_accounts.extend_from_slice(accounts); self } #[allow(clippy::clone_on_copy)] - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { let accounts = Upgrade { program_data_account: self .program_data_account @@ -196,10 +199,10 @@ impl UpgradeBuilder { program_account: self.program_account.expect("program_account is not set"), buffer_account: self.buffer_account.expect("buffer_account is not set"), spill_account: self.spill_account.expect("spill_account is not set"), - rent_sysvar: self.rent_sysvar.unwrap_or(solana_program::pubkey!( + rent_sysvar: self.rent_sysvar.unwrap_or(solana_pubkey::pubkey!( "SysvarRent111111111111111111111111111111111" )), - clock_sysvar: self.clock_sysvar.unwrap_or(solana_program::pubkey!( + clock_sysvar: self.clock_sysvar.unwrap_or(solana_pubkey::pubkey!( "SysvarC1ock11111111111111111111111111111111" )), authority: self.authority.expect("authority is not set"), @@ -212,44 +215,44 @@ impl UpgradeBuilder { /// `upgrade` CPI accounts. pub struct UpgradeCpiAccounts<'a, 'b> { /// ProgramData account. - pub program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + pub program_data_account: &'b solana_account_info::AccountInfo<'a>, /// Program account. - pub program_account: &'b solana_program::account_info::AccountInfo<'a>, + pub program_account: &'b solana_account_info::AccountInfo<'a>, /// Buffer account where the new program data has been written. - pub buffer_account: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_account: &'b solana_account_info::AccountInfo<'a>, /// Spill account. - pub spill_account: &'b solana_program::account_info::AccountInfo<'a>, + pub spill_account: &'b solana_account_info::AccountInfo<'a>, /// Rent sysvar. - pub rent_sysvar: &'b solana_program::account_info::AccountInfo<'a>, + pub rent_sysvar: &'b solana_account_info::AccountInfo<'a>, /// Clock sysvar. - pub clock_sysvar: &'b solana_program::account_info::AccountInfo<'a>, + pub clock_sysvar: &'b solana_account_info::AccountInfo<'a>, /// Authority. - pub authority: &'b solana_program::account_info::AccountInfo<'a>, + pub authority: &'b solana_account_info::AccountInfo<'a>, } /// `upgrade` CPI instruction. pub struct UpgradeCpi<'a, 'b> { /// The program to invoke. - pub __program: &'b solana_program::account_info::AccountInfo<'a>, + pub __program: &'b solana_account_info::AccountInfo<'a>, /// ProgramData account. - pub program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + pub program_data_account: &'b solana_account_info::AccountInfo<'a>, /// Program account. - pub program_account: &'b solana_program::account_info::AccountInfo<'a>, + pub program_account: &'b solana_account_info::AccountInfo<'a>, /// Buffer account where the new program data has been written. - pub buffer_account: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_account: &'b solana_account_info::AccountInfo<'a>, /// Spill account. - pub spill_account: &'b solana_program::account_info::AccountInfo<'a>, + pub spill_account: &'b solana_account_info::AccountInfo<'a>, /// Rent sysvar. - pub rent_sysvar: &'b solana_program::account_info::AccountInfo<'a>, + pub rent_sysvar: &'b solana_account_info::AccountInfo<'a>, /// Clock sysvar. - pub clock_sysvar: &'b solana_program::account_info::AccountInfo<'a>, + pub clock_sysvar: &'b solana_account_info::AccountInfo<'a>, /// Authority. - pub authority: &'b solana_program::account_info::AccountInfo<'a>, + pub authority: &'b solana_account_info::AccountInfo<'a>, } impl<'a, 'b> UpgradeCpi<'a, 'b> { pub fn new( - program: &'b solana_program::account_info::AccountInfo<'a>, + program: &'b solana_account_info::AccountInfo<'a>, accounts: UpgradeCpiAccounts<'a, 'b>, ) -> Self { Self { @@ -264,69 +267,59 @@ impl<'a, 'b> UpgradeCpi<'a, 'b> { } } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], &[]) } #[inline(always)] pub fn invoke_with_remaining_accounts( &self, - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], remaining_accounts) } #[inline(always)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(signers_seeds, &[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] pub fn invoke_signed_with_remaining_accounts( &self, signers_seeds: &[&[&[u8]]], - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { let mut accounts = Vec::with_capacity(7 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.program_data_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.program_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.buffer_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.spill_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *self.rent_sysvar.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *self.clock_sysvar.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *self.authority.key, true, )); remaining_accounts.iter().for_each(|remaining_account| { - accounts.push(solana_program::instruction::AccountMeta { + accounts.push(solana_instruction::AccountMeta { pubkey: *remaining_account.0.key, is_signer: remaining_account.1, is_writable: remaining_account.2, @@ -334,12 +327,12 @@ impl<'a, 'b> UpgradeCpi<'a, 'b> { }); let data = UpgradeInstructionData::new().try_to_vec().unwrap(); - let instruction = solana_program::instruction::Instruction { + let instruction = solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, }; - let mut account_infos = Vec::with_capacity(7 + 1 + remaining_accounts.len()); + let mut account_infos = Vec::with_capacity(8 + remaining_accounts.len()); account_infos.push(self.__program.clone()); account_infos.push(self.program_data_account.clone()); account_infos.push(self.program_account.clone()); @@ -353,9 +346,9 @@ impl<'a, 'b> UpgradeCpi<'a, 'b> { .for_each(|remaining_account| account_infos.push(remaining_account.0.clone())); if signers_seeds.is_empty() { - solana_program::program::invoke(&instruction, &account_infos) + solana_cpi::invoke(&instruction, &account_infos) } else { - solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds) + solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds) } } } @@ -377,7 +370,7 @@ pub struct UpgradeCpiBuilder<'a, 'b> { } impl<'a, 'b> UpgradeCpiBuilder<'a, 'b> { - pub fn new(program: &'b solana_program::account_info::AccountInfo<'a>) -> Self { + pub fn new(program: &'b solana_account_info::AccountInfo<'a>) -> Self { let instruction = Box::new(UpgradeCpiBuilderInstruction { __program: program, program_data_account: None, @@ -395,7 +388,7 @@ impl<'a, 'b> UpgradeCpiBuilder<'a, 'b> { #[inline(always)] pub fn program_data_account( &mut self, - program_data_account: &'b solana_program::account_info::AccountInfo<'a>, + program_data_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.program_data_account = Some(program_data_account); self @@ -404,7 +397,7 @@ impl<'a, 'b> UpgradeCpiBuilder<'a, 'b> { #[inline(always)] pub fn program_account( &mut self, - program_account: &'b solana_program::account_info::AccountInfo<'a>, + program_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.program_account = Some(program_account); self @@ -413,7 +406,7 @@ impl<'a, 'b> UpgradeCpiBuilder<'a, 'b> { #[inline(always)] pub fn buffer_account( &mut self, - buffer_account: &'b solana_program::account_info::AccountInfo<'a>, + buffer_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.buffer_account = Some(buffer_account); self @@ -422,7 +415,7 @@ impl<'a, 'b> UpgradeCpiBuilder<'a, 'b> { #[inline(always)] pub fn spill_account( &mut self, - spill_account: &'b solana_program::account_info::AccountInfo<'a>, + spill_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.spill_account = Some(spill_account); self @@ -431,7 +424,7 @@ impl<'a, 'b> UpgradeCpiBuilder<'a, 'b> { #[inline(always)] pub fn rent_sysvar( &mut self, - rent_sysvar: &'b solana_program::account_info::AccountInfo<'a>, + rent_sysvar: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.rent_sysvar = Some(rent_sysvar); self @@ -440,17 +433,14 @@ impl<'a, 'b> UpgradeCpiBuilder<'a, 'b> { #[inline(always)] pub fn clock_sysvar( &mut self, - clock_sysvar: &'b solana_program::account_info::AccountInfo<'a>, + clock_sysvar: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.clock_sysvar = Some(clock_sysvar); self } /// Authority. #[inline(always)] - pub fn authority( - &mut self, - authority: &'b solana_program::account_info::AccountInfo<'a>, - ) -> &mut Self { + pub fn authority(&mut self, authority: &'b solana_account_info::AccountInfo<'a>) -> &mut Self { self.instruction.authority = Some(authority); self } @@ -458,7 +448,7 @@ impl<'a, 'b> UpgradeCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_account( &mut self, - account: &'b solana_program::account_info::AccountInfo<'a>, + account: &'b solana_account_info::AccountInfo<'a>, is_writable: bool, is_signer: bool, ) -> &mut Self { @@ -475,11 +465,7 @@ impl<'a, 'b> UpgradeCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], + accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], ) -> &mut Self { self.instruction .__remaining_accounts @@ -487,15 +473,12 @@ impl<'a, 'b> UpgradeCpiBuilder<'a, 'b> { self } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed(&[]) } #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { let instruction = UpgradeCpi { __program: self.instruction.__program, @@ -540,18 +523,14 @@ impl<'a, 'b> UpgradeCpiBuilder<'a, 'b> { #[derive(Clone, Debug)] struct UpgradeCpiBuilderInstruction<'a, 'b> { - __program: &'b solana_program::account_info::AccountInfo<'a>, - program_data_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - program_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - buffer_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - spill_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - rent_sysvar: Option<&'b solana_program::account_info::AccountInfo<'a>>, - clock_sysvar: Option<&'b solana_program::account_info::AccountInfo<'a>>, - authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, + __program: &'b solana_account_info::AccountInfo<'a>, + program_data_account: Option<&'b solana_account_info::AccountInfo<'a>>, + program_account: Option<&'b solana_account_info::AccountInfo<'a>>, + buffer_account: Option<&'b solana_account_info::AccountInfo<'a>>, + spill_account: Option<&'b solana_account_info::AccountInfo<'a>>, + rent_sysvar: Option<&'b solana_account_info::AccountInfo<'a>>, + clock_sysvar: Option<&'b solana_account_info::AccountInfo<'a>>, + authority: Option<&'b solana_account_info::AccountInfo<'a>>, /// Additional instruction accounts `(AccountInfo, is_writable, is_signer)`. - __remaining_accounts: Vec<( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )>, + __remaining_accounts: Vec<(&'b solana_account_info::AccountInfo<'a>, bool, bool)>, } diff --git a/clients/rust/src/generated/instructions/write.rs b/clients/rust/src/generated/instructions/write.rs index 2af7b01..edb03f7 100644 --- a/clients/rust/src/generated/instructions/write.rs +++ b/clients/rust/src/generated/instructions/write.rs @@ -1,38 +1,39 @@ -//! This code was AUTOGENERATED using the kinobi library. +//! This code was AUTOGENERATED using the codama library. //! Please DO NOT EDIT THIS FILE, instead use visitors -//! to add features, then rerun kinobi to update it. +//! to add features, then rerun codama to update it. //! -//! +//! use borsh::{BorshDeserialize, BorshSerialize}; +pub const WRITE_DISCRIMINATOR: u32 = 1; + /// Accounts. +#[derive(Debug)] pub struct Write { /// Buffer account. - pub buffer_account: solana_program::pubkey::Pubkey, + pub buffer_account: solana_pubkey::Pubkey, /// Buffer authority. - pub buffer_authority: solana_program::pubkey::Pubkey, + pub buffer_authority: solana_pubkey::Pubkey, } impl Write { - pub fn instruction( - &self, - args: WriteInstructionArgs, - ) -> solana_program::instruction::Instruction { + pub fn instruction(&self, args: WriteInstructionArgs) -> solana_instruction::Instruction { self.instruction_with_remaining_accounts(args, &[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::vec_init_then_push)] pub fn instruction_with_remaining_accounts( &self, args: WriteInstructionArgs, - remaining_accounts: &[solana_program::instruction::AccountMeta], - ) -> solana_program::instruction::Instruction { + remaining_accounts: &[solana_instruction::AccountMeta], + ) -> solana_instruction::Instruction { let mut accounts = Vec::with_capacity(2 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( self.buffer_account, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( self.buffer_authority, true, )); @@ -41,7 +42,7 @@ impl Write { let mut args = args.try_to_vec().unwrap(); data.append(&mut args); - solana_program::instruction::Instruction { + solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, @@ -49,7 +50,8 @@ impl Write { } } -#[derive(BorshDeserialize, BorshSerialize)] +#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct WriteInstructionData { discriminator: u32, } @@ -58,6 +60,10 @@ impl WriteInstructionData { pub fn new() -> Self { Self { discriminator: 1 } } + + pub(crate) fn try_to_vec(&self) -> Result, std::io::Error> { + borsh::to_vec(self) + } } impl Default for WriteInstructionData { @@ -73,6 +79,12 @@ pub struct WriteInstructionArgs { pub bytes: Vec, } +impl WriteInstructionArgs { + pub(crate) fn try_to_vec(&self) -> Result, std::io::Error> { + borsh::to_vec(self) + } +} + /// Instruction builder for `Write`. /// /// ### Accounts: @@ -81,11 +93,11 @@ pub struct WriteInstructionArgs { /// 1. `[signer]` buffer_authority #[derive(Clone, Debug, Default)] pub struct WriteBuilder { - buffer_account: Option, - buffer_authority: Option, + buffer_account: Option, + buffer_authority: Option, offset: Option, bytes: Option>, - __remaining_accounts: Vec, + __remaining_accounts: Vec, } impl WriteBuilder { @@ -94,16 +106,13 @@ impl WriteBuilder { } /// Buffer account. #[inline(always)] - pub fn buffer_account(&mut self, buffer_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn buffer_account(&mut self, buffer_account: solana_pubkey::Pubkey) -> &mut Self { self.buffer_account = Some(buffer_account); self } /// Buffer authority. #[inline(always)] - pub fn buffer_authority( - &mut self, - buffer_authority: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn buffer_authority(&mut self, buffer_authority: solana_pubkey::Pubkey) -> &mut Self { self.buffer_authority = Some(buffer_authority); self } @@ -117,12 +126,9 @@ impl WriteBuilder { self.bytes = Some(bytes); self } - /// Add an aditional account to the instruction. + /// Add an additional account to the instruction. #[inline(always)] - pub fn add_remaining_account( - &mut self, - account: solana_program::instruction::AccountMeta, - ) -> &mut Self { + pub fn add_remaining_account(&mut self, account: solana_instruction::AccountMeta) -> &mut Self { self.__remaining_accounts.push(account); self } @@ -130,13 +136,13 @@ impl WriteBuilder { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[solana_program::instruction::AccountMeta], + accounts: &[solana_instruction::AccountMeta], ) -> &mut Self { self.__remaining_accounts.extend_from_slice(accounts); self } #[allow(clippy::clone_on_copy)] - pub fn instruction(&self) -> solana_program::instruction::Instruction { + pub fn instruction(&self) -> solana_instruction::Instruction { let accounts = Write { buffer_account: self.buffer_account.expect("buffer_account is not set"), buffer_authority: self.buffer_authority.expect("buffer_authority is not set"), @@ -153,26 +159,26 @@ impl WriteBuilder { /// `write` CPI accounts. pub struct WriteCpiAccounts<'a, 'b> { /// Buffer account. - pub buffer_account: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_account: &'b solana_account_info::AccountInfo<'a>, /// Buffer authority. - pub buffer_authority: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_authority: &'b solana_account_info::AccountInfo<'a>, } /// `write` CPI instruction. pub struct WriteCpi<'a, 'b> { /// The program to invoke. - pub __program: &'b solana_program::account_info::AccountInfo<'a>, + pub __program: &'b solana_account_info::AccountInfo<'a>, /// Buffer account. - pub buffer_account: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_account: &'b solana_account_info::AccountInfo<'a>, /// Buffer authority. - pub buffer_authority: &'b solana_program::account_info::AccountInfo<'a>, + pub buffer_authority: &'b solana_account_info::AccountInfo<'a>, /// The arguments for the instruction. pub __args: WriteInstructionArgs, } impl<'a, 'b> WriteCpi<'a, 'b> { pub fn new( - program: &'b solana_program::account_info::AccountInfo<'a>, + program: &'b solana_account_info::AccountInfo<'a>, accounts: WriteCpiAccounts<'a, 'b>, args: WriteInstructionArgs, ) -> Self { @@ -184,49 +190,39 @@ impl<'a, 'b> WriteCpi<'a, 'b> { } } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], &[]) } #[inline(always)] pub fn invoke_with_remaining_accounts( &self, - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(&[], remaining_accounts) } #[inline(always)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { self.invoke_signed_with_remaining_accounts(signers_seeds, &[]) } + #[allow(clippy::arithmetic_side_effects)] #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] pub fn invoke_signed_with_remaining_accounts( &self, signers_seeds: &[&[&[u8]]], - remaining_accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], - ) -> solana_program::entrypoint::ProgramResult { + remaining_accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], + ) -> solana_program_error::ProgramResult { let mut accounts = Vec::with_capacity(2 + remaining_accounts.len()); - accounts.push(solana_program::instruction::AccountMeta::new( + accounts.push(solana_instruction::AccountMeta::new( *self.buffer_account.key, false, )); - accounts.push(solana_program::instruction::AccountMeta::new_readonly( + accounts.push(solana_instruction::AccountMeta::new_readonly( *self.buffer_authority.key, true, )); remaining_accounts.iter().for_each(|remaining_account| { - accounts.push(solana_program::instruction::AccountMeta { + accounts.push(solana_instruction::AccountMeta { pubkey: *remaining_account.0.key, is_signer: remaining_account.1, is_writable: remaining_account.2, @@ -236,12 +232,12 @@ impl<'a, 'b> WriteCpi<'a, 'b> { let mut args = self.__args.try_to_vec().unwrap(); data.append(&mut args); - let instruction = solana_program::instruction::Instruction { + let instruction = solana_instruction::Instruction { program_id: crate::LOADER_V3_ID, accounts, data, }; - let mut account_infos = Vec::with_capacity(2 + 1 + remaining_accounts.len()); + let mut account_infos = Vec::with_capacity(3 + remaining_accounts.len()); account_infos.push(self.__program.clone()); account_infos.push(self.buffer_account.clone()); account_infos.push(self.buffer_authority.clone()); @@ -250,9 +246,9 @@ impl<'a, 'b> WriteCpi<'a, 'b> { .for_each(|remaining_account| account_infos.push(remaining_account.0.clone())); if signers_seeds.is_empty() { - solana_program::program::invoke(&instruction, &account_infos) + solana_cpi::invoke(&instruction, &account_infos) } else { - solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds) + solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds) } } } @@ -269,7 +265,7 @@ pub struct WriteCpiBuilder<'a, 'b> { } impl<'a, 'b> WriteCpiBuilder<'a, 'b> { - pub fn new(program: &'b solana_program::account_info::AccountInfo<'a>) -> Self { + pub fn new(program: &'b solana_account_info::AccountInfo<'a>) -> Self { let instruction = Box::new(WriteCpiBuilderInstruction { __program: program, buffer_account: None, @@ -284,7 +280,7 @@ impl<'a, 'b> WriteCpiBuilder<'a, 'b> { #[inline(always)] pub fn buffer_account( &mut self, - buffer_account: &'b solana_program::account_info::AccountInfo<'a>, + buffer_account: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.buffer_account = Some(buffer_account); self @@ -293,7 +289,7 @@ impl<'a, 'b> WriteCpiBuilder<'a, 'b> { #[inline(always)] pub fn buffer_authority( &mut self, - buffer_authority: &'b solana_program::account_info::AccountInfo<'a>, + buffer_authority: &'b solana_account_info::AccountInfo<'a>, ) -> &mut Self { self.instruction.buffer_authority = Some(buffer_authority); self @@ -312,7 +308,7 @@ impl<'a, 'b> WriteCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_account( &mut self, - account: &'b solana_program::account_info::AccountInfo<'a>, + account: &'b solana_account_info::AccountInfo<'a>, is_writable: bool, is_signer: bool, ) -> &mut Self { @@ -329,11 +325,7 @@ impl<'a, 'b> WriteCpiBuilder<'a, 'b> { #[inline(always)] pub fn add_remaining_accounts( &mut self, - accounts: &[( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )], + accounts: &[(&'b solana_account_info::AccountInfo<'a>, bool, bool)], ) -> &mut Self { self.instruction .__remaining_accounts @@ -341,15 +333,12 @@ impl<'a, 'b> WriteCpiBuilder<'a, 'b> { self } #[inline(always)] - pub fn invoke(&self) -> solana_program::entrypoint::ProgramResult { + pub fn invoke(&self) -> solana_program_error::ProgramResult { self.invoke_signed(&[]) } #[allow(clippy::clone_on_copy)] #[allow(clippy::vec_init_then_push)] - pub fn invoke_signed( - &self, - signers_seeds: &[&[&[u8]]], - ) -> solana_program::entrypoint::ProgramResult { + pub fn invoke_signed(&self, signers_seeds: &[&[&[u8]]]) -> solana_program_error::ProgramResult { let args = WriteInstructionArgs { offset: self.instruction.offset.clone().expect("offset is not set"), bytes: self.instruction.bytes.clone().expect("bytes is not set"), @@ -377,15 +366,11 @@ impl<'a, 'b> WriteCpiBuilder<'a, 'b> { #[derive(Clone, Debug)] struct WriteCpiBuilderInstruction<'a, 'b> { - __program: &'b solana_program::account_info::AccountInfo<'a>, - buffer_account: Option<&'b solana_program::account_info::AccountInfo<'a>>, - buffer_authority: Option<&'b solana_program::account_info::AccountInfo<'a>>, + __program: &'b solana_account_info::AccountInfo<'a>, + buffer_account: Option<&'b solana_account_info::AccountInfo<'a>>, + buffer_authority: Option<&'b solana_account_info::AccountInfo<'a>>, offset: Option, bytes: Option>, /// Additional instruction accounts `(AccountInfo, is_writable, is_signer)`. - __remaining_accounts: Vec<( - &'b solana_program::account_info::AccountInfo<'a>, - bool, - bool, - )>, + __remaining_accounts: Vec<(&'b solana_account_info::AccountInfo<'a>, bool, bool)>, } diff --git a/clients/rust/src/generated/mod.rs b/clients/rust/src/generated/mod.rs index 8938b2b..cdff1c2 100644 --- a/clients/rust/src/generated/mod.rs +++ b/clients/rust/src/generated/mod.rs @@ -1,8 +1,8 @@ -//! This code was AUTOGENERATED using the kinobi library. +//! This code was AUTOGENERATED using the codama library. //! Please DO NOT EDIT THIS FILE, instead use visitors -//! to add features, then rerun kinobi to update it. +//! to add features, then rerun codama to update it. //! -//! +//! pub mod errors; pub mod instructions; diff --git a/clients/rust/src/generated/programs.rs b/clients/rust/src/generated/programs.rs index 47923c0..ed420e4 100644 --- a/clients/rust/src/generated/programs.rs +++ b/clients/rust/src/generated/programs.rs @@ -1,10 +1,10 @@ -//! This code was AUTOGENERATED using the kinobi library. +//! This code was AUTOGENERATED using the codama library. //! Please DO NOT EDIT THIS FILE, instead use visitors -//! to add features, then rerun kinobi to update it. +//! to add features, then rerun codama to update it. //! -//! +//! -use solana_program::{pubkey, pubkey::Pubkey}; +use solana_pubkey::{pubkey, Pubkey}; /// `loader_v3` program ID. pub const LOADER_V3_ID: Pubkey = pubkey!("BPFLoaderUpgradeab1e11111111111111111111111"); diff --git a/codama.mjs b/codama.mjs new file mode 100644 index 0000000..d890516 --- /dev/null +++ b/codama.mjs @@ -0,0 +1,41 @@ +import { getToolchainArgument } from "./scripts/utils.mjs"; +import path from "node:path"; +import fs from "node:fs"; + +const prettier = JSON.parse( + fs.readFileSync(path.join("clients", "js", ".prettierrc.json"), "utf-8") +); + +export default { + idl: "program/idl.json", + before: [ + { + from: "codama#updateProgramsVisitor", + args: [ + { + solanaLoaderV3Program: { + name: "loaderV3", + publicKey: "BPFLoaderUpgradeab1e11111111111111111111111", + }, + }, + ], + }, + ], + scripts: { + js: { + from: "@codama/renderers-js", + args: ["clients/js/src/generated", { prettier }], + }, + rust: { + from: "@codama/renderers-rust", + args: [ + "clients/rust/src/generated", + { + crateFolder: "clients/rust", + formatCode: true, + toolchain: getToolchainArgument("format"), + }, + ], + }, + }, +}; diff --git a/package.json b/package.json index ad303ff..981e1ed 100644 --- a/package.json +++ b/package.json @@ -24,14 +24,17 @@ "clients:rust:test": "zx ./scripts/client/test-rust.mjs" }, "devDependencies": { + "@codama/nodes-from-anchor": "^1.2.9", + "@codama/renderers-js": "^1.4.2", + "@codama/renderers-rust": "^1.2.7", "@iarna/toml": "^2.2.5", - "@kinobi-so/nodes-from-anchor": "^0.20.9", - "@kinobi-so/renderers-js": "^0.21.2", - "@kinobi-so/renderers-rust": "^0.21.0", "@metaplex-foundation/shank-js": "^0.1.7", - "kinobi": "^0.21.0", + "codama": "^1.3.7", "typescript": "^5.5.2", "zx": "^7.2.3" }, - "packageManager": "pnpm@9.1.0" + "engines": { + "node": ">=v20.0.0" + }, + "packageManager": "pnpm@10.15.1" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1d37536..a98423b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,24 +8,24 @@ importers: .: devDependencies: + '@codama/nodes-from-anchor': + specifier: ^1.2.9 + version: 1.2.9(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) + '@codama/renderers-js': + specifier: ^1.4.2 + version: 1.4.2(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) + '@codama/renderers-rust': + specifier: ^1.2.7 + version: 1.2.7(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) '@iarna/toml': specifier: ^2.2.5 version: 2.2.5 - '@kinobi-so/nodes-from-anchor': - specifier: ^0.20.9 - version: 0.20.10 - '@kinobi-so/renderers-js': - specifier: ^0.21.2 - version: 0.21.8(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) - '@kinobi-so/renderers-rust': - specifier: ^0.21.0 - version: 0.21.6(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) '@metaplex-foundation/shank-js': specifier: ^0.1.7 version: 0.1.7 - kinobi: - specifier: ^0.21.0 - version: 0.21.4 + codama: + specifier: ^1.3.7 + version: 1.3.7 typescript: specifier: ^5.5.2 version: 5.6.2 @@ -35,58 +35,45 @@ importers: packages: - '@iarna/toml@2.2.5': - resolution: {integrity: sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==} - - '@kinobi-so/errors@0.21.1': - resolution: {integrity: sha512-dhpCoAca9Jfd0xcCYXebdGiADlEoMnU7kCHKqeebFMJXF9/KPXlTKtt9ihIa33irxBUdzzWA6X+sD7G87W+vaw==} + '@codama/cli@1.3.5': + resolution: {integrity: sha512-UgJGaTK2TXnbRcnCgReKqcDFjU941XZTvA0qbSiFH0Njrwb0kcLkKirMKwdyDaCHry7QcybzIKbp4ErrwqExMA==} hasBin: true - '@kinobi-so/errors@0.21.4': - resolution: {integrity: sha512-Ffu/l5SGGLbSf451on+hHLWKGm8fpoWocCh6+RTftNSe/OHKnz9K0f2esX7ny83Vckpf77sVub1JXwOMW/hW/w==} + '@codama/errors@1.3.7': + resolution: {integrity: sha512-96BF8agDVc2vAgL4qw1lZZfuJ7XBefdzTBk2VOUnOhdMQiLb0QhJCC4BH88OcL+rZXQdet4pk7Qwarj1I1GFKg==} hasBin: true - '@kinobi-so/node-types@0.21.1': - resolution: {integrity: sha512-VN2DXO8yva1EwZSJ7IQfHpccteLpfd1XI3ij5M1jm0d48tpkiHVeUa0pFBNvZmju480R3qX/rel5j4Ov2JtTBw==} - - '@kinobi-so/node-types@0.21.4': - resolution: {integrity: sha512-/6En6kVU21/skBlKbN6EzD5saDFzFoezDYoonbWurtXJcelTIuqz3D1WwR3iNOXvWco64cqpHG6mM7zdF5WsHA==} - - '@kinobi-so/nodes-from-anchor@0.20.10': - resolution: {integrity: sha512-kC+Lox9Z1y0Xu9hfehR2NvgQ/lL3N5/XWor5bFpT1gSPjZG2lARJS6SqdjIr0P50AqQ23uND9Lbh4aytUf3d+w==} - - '@kinobi-so/nodes-from-anchor@0.21.2': - resolution: {integrity: sha512-c7lDg9MH4LKod5PwNC4Lvsugx3Dj6bqgw5kQFLUYDdIWVRdR2Z8JGK/LhPXceiDvw2bLnjy2Mmroz8zh2/0cuA==} - - '@kinobi-so/nodes@0.21.1': - resolution: {integrity: sha512-i5zRURpiIkrK1PWyRNjjKC3G1o47nWrETEQcl71UM1cXUYPPIl7A3a9+u4PWzWhRw+sGWzKfyXcmkjp8wQNIhA==} + '@codama/node-types@1.3.7': + resolution: {integrity: sha512-L9UTFfoeki5t+BYJAa4OMsqBPpbMbx8YJQar+55mYcjwGlJsKJW7mRfLYvwEFkCUYyLdNva40OVmTf88jccZCA==} - '@kinobi-so/nodes@0.21.4': - resolution: {integrity: sha512-QQbmSsOcfL2GhCMkHP33XihzUDS12jAKMvhNyTzhdpI1QPS40wvMwYfA8UXFtc5B/4aKhneEGUok7QgF4IZXkg==} + '@codama/nodes-from-anchor@1.2.9': + resolution: {integrity: sha512-n+53VumtguLeSzGWZLpJqWRqs+r8NkWb1w8Ci0AuWQ6Qwfbbk9LknUg1XkqpgZZuq2Hh/Xoy28yHBl2JeIXi3w==} - '@kinobi-so/renderers-core@0.21.2': - resolution: {integrity: sha512-czVR9dfKWwZ5YQB1N83+whsh9g1zCS8rMJZ0t/T3Vd7P0uuKOOGL9ej/WMQZ7qQhCLTDJDEn5Lqf2JInArzqLg==} + '@codama/nodes@1.3.7': + resolution: {integrity: sha512-3OV6SIBcqsIDARyzZVGdfnffNlnKSYcb0aGp/9Liz5/EID0oBTIyuh/Cmj5Ww6RX4WPb+GNAxABAGW94zbcfQg==} - '@kinobi-so/renderers-js@0.21.8': - resolution: {integrity: sha512-YYyi5ADxwdC0nbIAH9xHtEFbHW6RJiA9w7i+gtSnX6olpp4g+e0ITOuuV3GmeUlRdflbf3hMMbCNWWl+y7uiOg==} + '@codama/renderers-core@1.2.2': + resolution: {integrity: sha512-dPyHgn5L45G+tWP17ITvOlpX3+s2FcJHMjAhFZlmUHAJpH/wl+UsUwuWg698iSb56Er2jUwqX7srw5iZf7XHjQ==} - '@kinobi-so/renderers-rust@0.21.6': - resolution: {integrity: sha512-AIJVE/3KsKNBbzuzpgV5npC7IyeEX9SjIf6LFuKXEfUcyLTVjAmosn+MBCDCtY7bTC2CD1U+Bfjt9/8a+uO4mA==} + '@codama/renderers-js@1.4.2': + resolution: {integrity: sha512-emYJEPNDQ/DjHYDBNPt/HEr+97ClpEQT7LPPNZ44DRSEG4Qj9ti/aBvtgOrIyESyyTOaKrUzu7Ew6S+TBB/eFg==} + engines: {node: '>=20.18.0'} - '@kinobi-so/validators@0.21.4': - resolution: {integrity: sha512-1bCi035dtbL1x1L8b/faNbYQ5Qb9He9dYdCgThQoxJL/v9a7L8F/9D4DGlKxZxEP1xBAflzbVx21QR6ESVpdMA==} + '@codama/renderers-rust@1.2.7': + resolution: {integrity: sha512-wD6JRfm4GZmY0vUhgHB1fTHIaCw3zrQ7PXl4Fv1hBNiX6hKor5vE72GkIztG/VCZkl1WWVJTNLRLho5oldN9LQ==} + engines: {node: '>=20.18.0'} - '@kinobi-so/visitors-core@0.21.1': - resolution: {integrity: sha512-K20NdxEvo4KaSQ/FTPB3MJ6s/72l5dWhZP5JaYLrt5TqkKaLRTJn58LswUVauKMv/+MTCzZrZnqy0PppgbHv+A==} + '@codama/validators@1.3.7': + resolution: {integrity: sha512-OxuPhIPcuqSLmwDTcl9+VyEq6mwsLLqVXtQjgQgjEpr0IO/KAV9RG98Ye2yoK21jEVGDnzN9jsSQVHysRfpMMA==} - '@kinobi-so/visitors-core@0.21.4': - resolution: {integrity: sha512-xRosguRjUydFX/kdDf56FwW2OQ0dVJQaipG2aceKXGwx8bYorIS7fAWvIOXmLmZbtxKdtggxDW4oSw0DUtWeKQ==} + '@codama/visitors-core@1.3.7': + resolution: {integrity: sha512-B1JnzhRDJiLxewha/F3YzeEp8Zrtd7eKiGNJFJHSPufAnIVm2lQUDaKS+OrAOHnSRmRKIAVdzfpFpdz6EM0N6Q==} - '@kinobi-so/visitors@0.21.1': - resolution: {integrity: sha512-hZV6obCveJIfE5wBBVWGVUhvDjzYxMOj2o/0Y/ZzbenJpjjbFFih/dH9SW8XEDyMewlSjAOglfzqGZVei8e+VA==} + '@codama/visitors@1.3.7': + resolution: {integrity: sha512-pIVK84G4dquvDXmr0q9GACcwDROw7DOBz0Kk/qt837FsKYr37xc6nU2LIguXu8QVIFOHBZk1HVAb7/S0eo/dqg==} - '@kinobi-so/visitors@0.21.4': - resolution: {integrity: sha512-bebFAvRncmnY0Hy448XRb65a+2LkHJ4acnJyJi9dvJqWgJl6zbhX6Lj0NBYluzSwB28317DMynn+V7PSqOKBbQ==} + '@iarna/toml@2.2.5': + resolution: {integrity: sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==} '@metaplex-foundation/rustbin@0.3.5': resolution: {integrity: sha512-m0wkRBEQB/8krwMwKBvFugufZtYwMXiGHud2cTDAv+aGXK4M90y0Hx67/wpu+AqqoQfdV8VM9YezUOHKD+Z5kA==} @@ -94,8 +81,8 @@ packages: '@metaplex-foundation/shank-js@0.1.7': resolution: {integrity: sha512-tSAipn8Ho1UxlMC3jwJ5Opl+Y3lRm60VTkgRDfvzydb57lXW5G+K5MrZhEmhrFUuRYziV+e34CTo+ybpMp1Eqg==} - '@noble/hashes@1.5.0': - resolution: {integrity: sha512-1j6kQFb7QRru7eKN3ZDvRcP13rugwdxZqCjbiAVZfIJwgj2A65UmT4TgARXGlXgnRkORLTDTrO19ZErt7+QXgA==} + '@noble/hashes@1.8.0': + resolution: {integrity: sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==} engines: {node: ^14.21.3 || >=16} '@nodelib/fs.scandir@2.1.5': @@ -110,27 +97,49 @@ packages: resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} engines: {node: '>= 8'} - '@solana/codecs-core@2.0.0-rc.1': - resolution: {integrity: sha512-bauxqMfSs8EHD0JKESaNmNuNvkvHSuN3bbWAF5RjOfDu2PugxHrvRebmYauvSumZ3cTfQ4HJJX6PG5rN852qyQ==} + '@solana/codecs-core@3.0.3': + resolution: {integrity: sha512-emKykJ3h1DmnDOY29Uv9eJXP8E/FHzvlUBJ6te+5EbKdFjj7vdlKYPfDxOI6iGdXTY+YC/ELtbNBh6QwF2uEDQ==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' + + '@solana/codecs-data-structures@3.0.3': + resolution: {integrity: sha512-R15cLp8riJvToXziW8lP6AMSwsztGhEnwgyGmll32Mo0Yjq+hduW2/fJrA/TJs6tA/OgTzMQjlxgk009EqZHCw==} + engines: {node: '>=20.18.0'} peerDependencies: - typescript: '>=5' + typescript: '>=5.3.3' - '@solana/codecs-numbers@2.0.0-rc.1': - resolution: {integrity: sha512-J5i5mOkvukXn8E3Z7sGIPxsThRCgSdgTWJDQeZvucQ9PT6Y3HiVXJ0pcWiOWAoQ3RX8e/f4I3IC+wE6pZiJzDQ==} + '@solana/codecs-numbers@3.0.3': + resolution: {integrity: sha512-pfXkH9J0glrM8qj6389GAn30+cJOxzXLR2FsPOHCUMXrqLhGjMMZAWhsQkpOQ37SGc/7EiQsT/gmyGC7gxHqJQ==} + engines: {node: '>=20.18.0'} peerDependencies: - typescript: '>=5' + typescript: '>=5.3.3' - '@solana/codecs-strings@2.0.0-rc.1': - resolution: {integrity: sha512-9/wPhw8TbGRTt6mHC4Zz1RqOnuPTqq1Nb4EyuvpZ39GW6O2t2Q7Q0XxiB3+BdoEjwA2XgPw6e2iRfvYgqty44g==} + '@solana/codecs-strings@3.0.3': + resolution: {integrity: sha512-VHBXnnTVtcQ1j+7Vrz+qSYo38no+jiHRdGnhFspRXEHNJbllzwKqgBE7YN3qoIXH+MKxgJUcwO5KHmdzf8Wn2A==} + engines: {node: '>=20.18.0'} peerDependencies: fastestsmallesttextencoderdecoder: ^1.0.22 - typescript: '>=5' + typescript: '>=5.3.3' - '@solana/errors@2.0.0-rc.1': - resolution: {integrity: sha512-ejNvQ2oJ7+bcFAYWj225lyRkHnixuAeb7RQCixm+5mH4n1IA4Qya/9Bmfy5RAAHQzxK43clu3kZmL5eF9VGtYQ==} + '@solana/codecs@3.0.3': + resolution: {integrity: sha512-GOHwTlIQsCoJx9Ryr6cEf0FHKAQ7pY4aO4xgncAftrv0lveTQ1rPP2inQ1QT0gJllsIa8nwbfXAADs9nNJxQDA==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' + + '@solana/errors@3.0.3': + resolution: {integrity: sha512-1l84xJlHNva6io62PcYfUamwWlc0eM95nHgCrKX0g0cLoC6D6QHYPCEbEVkR+C5UtP9JDgyQM8MFiv+Ei5tO9Q==} + engines: {node: '>=20.18.0'} hasBin: true peerDependencies: - typescript: '>=5' + typescript: '>=5.3.3' + + '@solana/options@3.0.3': + resolution: {integrity: sha512-jarsmnQ63RN0JPC5j9sgUat07NrL9PC71XU7pUItd6LOHtu4+wJMio3l5mT0DHVfkfbFLL6iI6+QmXSVhTNF3g==} + engines: {node: '>=20.18.0'} + peerDependencies: + typescript: '>=5.3.3' '@types/fs-extra@11.0.4': resolution: {integrity: sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==} @@ -164,17 +173,37 @@ packages: resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} engines: {node: '>=8'} - call-bind@1.0.7: - resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==} + call-bind-apply-helpers@1.0.2: + resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==} + engines: {node: '>= 0.4'} + + call-bind@1.0.8: + resolution: {integrity: sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==} + engines: {node: '>= 0.4'} + + call-bound@1.0.4: + resolution: {integrity: sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==} engines: {node: '>= 0.4'} chalk@5.3.0: resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==} engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} - commander@12.1.0: - resolution: {integrity: sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==} - engines: {node: '>=18'} + chalk@5.6.2: + resolution: {integrity: sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==} + engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} + + codama@1.3.7: + resolution: {integrity: sha512-+pUJrvSG3bO4QvfcWfc14p3sklzHRB/lV4gjnXPhyb7T6nCFwYpNWv6/bFuqQyUSgSNI1n3tst/I9EhoPXOjbw==} + hasBin: true + + commander@14.0.0: + resolution: {integrity: sha512-2uM9rYjPvyq39NwLRqaiLtWHyDC1FvryJDa2ATTVims5YAS4PupsEQsDvP14FqhFr0P49CYDugi59xaxJlTXRA==} + engines: {node: '>=20'} + + commander@14.0.1: + resolution: {integrity: sha512-2JkV3gUZUVrbNA+1sjBOYLsMZ5cEEl8GTFP2a4AVz5hvasAMCQ1D2l2le/cX+pV4N6ZU17zjUahLpIXRrnWL8A==} + engines: {node: '>=20'} commander@5.1.0: resolution: {integrity: sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==} @@ -201,6 +230,10 @@ packages: resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} engines: {node: '>=8'} + dunder-proto@1.0.1: + resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==} + engines: {node: '>= 0.4'} + duplexer@0.1.2: resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==} @@ -208,10 +241,18 @@ packages: resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==} engines: {node: '>= 0.4'} + es-define-property@1.0.1: + resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==} + engines: {node: '>= 0.4'} + es-errors@1.3.0: resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==} engines: {node: '>= 0.4'} + es-object-atoms@1.1.1: + resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==} + engines: {node: '>= 0.4'} + event-stream@3.3.4: resolution: {integrity: sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==} @@ -255,6 +296,14 @@ packages: resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==} engines: {node: '>= 0.4'} + get-intrinsic@1.3.0: + resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==} + engines: {node: '>= 0.4'} + + get-proto@1.0.1: + resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==} + engines: {node: '>= 0.4'} + glob-parent@5.1.2: resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} engines: {node: '>= 6'} @@ -266,6 +315,10 @@ packages: gopd@1.0.1: resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} + gopd@1.2.0: + resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==} + engines: {node: '>= 0.4'} + graceful-fs@4.2.11: resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} @@ -280,6 +333,10 @@ packages: resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==} engines: {node: '>= 0.4'} + has-symbols@1.1.0: + resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==} + engines: {node: '>= 0.4'} + hasown@2.0.2: resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==} engines: {node: '>= 0.4'} @@ -306,8 +363,8 @@ packages: isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} - json-stable-stringify@1.1.1: - resolution: {integrity: sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==} + json-stable-stringify@1.3.0: + resolution: {integrity: sha512-qtYiSSFlwot9XHtF9bD9c7rwKjr+RecWT//ZnPvSmEjpV5mmPOCN4j8UjY5hbjNkOwZ/jQv3J6R1/pL7RwgMsg==} engines: {node: '>= 0.4'} jsonfile@6.1.0: @@ -316,12 +373,17 @@ packages: jsonify@0.0.1: resolution: {integrity: sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==} - kinobi@0.21.4: - resolution: {integrity: sha512-JPN41QCeZT+OB+XqaqAHaqNesybHCm+Qxw4tRKBOfRmPnaV3od9x0kuedvmut8pyv6mm2r2T3bJHNeA9yyOmtA==} + kleur@3.0.3: + resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==} + engines: {node: '>=6'} map-stream@0.1.0: resolution: {integrity: sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==} + math-intrinsics@1.1.0: + resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==} + engines: {node: '>= 0.4'} + merge2@1.4.1: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} @@ -365,15 +427,22 @@ packages: pause-stream@0.0.11: resolution: {integrity: sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==} + picocolors@1.1.1: + resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==} + picomatch@2.3.1: resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} engines: {node: '>=8.6'} - prettier@3.3.3: - resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==} + prettier@3.6.2: + resolution: {integrity: sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==} engines: {node: '>=14'} hasBin: true + prompts@2.4.2: + resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==} + engines: {node: '>= 6'} + ps-tree@1.2.0: resolution: {integrity: sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==} engines: {node: '>= 0.10'} @@ -398,6 +467,9 @@ packages: resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==} engines: {node: '>= 0.4'} + sisteransi@1.0.5: + resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==} + slash@4.0.0: resolution: {integrity: sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==} engines: {node: '>=12'} @@ -458,111 +530,89 @@ packages: snapshots: - '@iarna/toml@2.2.5': {} - - '@kinobi-so/errors@0.21.1': + '@codama/cli@1.3.5': dependencies: - '@kinobi-so/node-types': 0.21.1 - chalk: 5.3.0 - commander: 12.1.0 - - '@kinobi-so/errors@0.21.4': + '@codama/nodes': 1.3.7 + '@codama/visitors': 1.3.7 + '@codama/visitors-core': 1.3.7 + commander: 14.0.1 + picocolors: 1.1.1 + prompts: 2.4.2 + + '@codama/errors@1.3.7': dependencies: - '@kinobi-so/node-types': 0.21.4 - chalk: 5.3.0 - commander: 12.1.0 - - '@kinobi-so/node-types@0.21.1': {} - - '@kinobi-so/node-types@0.21.4': {} + '@codama/node-types': 1.3.7 + commander: 14.0.1 + picocolors: 1.1.1 - '@kinobi-so/nodes-from-anchor@0.20.10': - dependencies: - '@kinobi-so/errors': 0.21.1 - '@kinobi-so/nodes': 0.21.1 - '@kinobi-so/visitors': 0.21.1 - '@noble/hashes': 1.5.0 - - '@kinobi-so/nodes-from-anchor@0.21.2': - dependencies: - '@kinobi-so/errors': 0.21.4 - '@kinobi-so/nodes': 0.21.4 - '@kinobi-so/visitors': 0.21.4 - '@noble/hashes': 1.5.0 + '@codama/node-types@1.3.7': {} - '@kinobi-so/nodes@0.21.1': + '@codama/nodes-from-anchor@1.2.9(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2)': dependencies: - '@kinobi-so/errors': 0.21.1 - '@kinobi-so/node-types': 0.21.1 + '@codama/errors': 1.3.7 + '@codama/nodes': 1.3.7 + '@codama/visitors': 1.3.7 + '@noble/hashes': 1.8.0 + '@solana/codecs': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) + transitivePeerDependencies: + - fastestsmallesttextencoderdecoder + - typescript - '@kinobi-so/nodes@0.21.4': + '@codama/nodes@1.3.7': dependencies: - '@kinobi-so/errors': 0.21.4 - '@kinobi-so/node-types': 0.21.4 + '@codama/errors': 1.3.7 + '@codama/node-types': 1.3.7 - '@kinobi-so/renderers-core@0.21.2': + '@codama/renderers-core@1.2.2': dependencies: - '@kinobi-so/errors': 0.21.4 - '@kinobi-so/nodes': 0.21.4 - '@kinobi-so/visitors-core': 0.21.4 + '@codama/errors': 1.3.7 + '@codama/nodes': 1.3.7 + '@codama/visitors-core': 1.3.7 - '@kinobi-so/renderers-js@0.21.8(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2)': + '@codama/renderers-js@1.4.2(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2)': dependencies: - '@kinobi-so/errors': 0.21.4 - '@kinobi-so/nodes': 0.21.4 - '@kinobi-so/nodes-from-anchor': 0.21.2 - '@kinobi-so/renderers-core': 0.21.2 - '@kinobi-so/visitors-core': 0.21.4 - '@solana/codecs-strings': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) - nunjucks: 3.2.4 - prettier: 3.3.3 + '@codama/errors': 1.3.7 + '@codama/nodes': 1.3.7 + '@codama/renderers-core': 1.2.2 + '@codama/visitors-core': 1.3.7 + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) + prettier: 3.6.2 transitivePeerDependencies: - - chokidar - fastestsmallesttextencoderdecoder - typescript - '@kinobi-so/renderers-rust@0.21.6(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2)': + '@codama/renderers-rust@1.2.7(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2)': dependencies: - '@kinobi-so/errors': 0.21.4 - '@kinobi-so/nodes': 0.21.4 - '@kinobi-so/renderers-core': 0.21.2 - '@kinobi-so/visitors-core': 0.21.4 - '@solana/codecs-strings': 2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) + '@codama/errors': 1.3.7 + '@codama/nodes': 1.3.7 + '@codama/renderers-core': 1.2.2 + '@codama/visitors-core': 1.3.7 + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) nunjucks: 3.2.4 transitivePeerDependencies: - chokidar - fastestsmallesttextencoderdecoder - typescript - '@kinobi-so/validators@0.21.4': - dependencies: - '@kinobi-so/errors': 0.21.4 - '@kinobi-so/nodes': 0.21.4 - '@kinobi-so/visitors-core': 0.21.4 - - '@kinobi-so/visitors-core@0.21.1': + '@codama/validators@1.3.7': dependencies: - '@kinobi-so/errors': 0.21.1 - '@kinobi-so/nodes': 0.21.1 - json-stable-stringify: 1.1.1 + '@codama/errors': 1.3.7 + '@codama/nodes': 1.3.7 + '@codama/visitors-core': 1.3.7 - '@kinobi-so/visitors-core@0.21.4': + '@codama/visitors-core@1.3.7': dependencies: - '@kinobi-so/errors': 0.21.4 - '@kinobi-so/nodes': 0.21.4 - json-stable-stringify: 1.1.1 + '@codama/errors': 1.3.7 + '@codama/nodes': 1.3.7 + json-stable-stringify: 1.3.0 - '@kinobi-so/visitors@0.21.1': + '@codama/visitors@1.3.7': dependencies: - '@kinobi-so/errors': 0.21.1 - '@kinobi-so/nodes': 0.21.1 - '@kinobi-so/visitors-core': 0.21.1 + '@codama/errors': 1.3.7 + '@codama/nodes': 1.3.7 + '@codama/visitors-core': 1.3.7 - '@kinobi-so/visitors@0.21.4': - dependencies: - '@kinobi-so/errors': 0.21.4 - '@kinobi-so/nodes': 0.21.4 - '@kinobi-so/visitors-core': 0.21.4 + '@iarna/toml@2.2.5': {} '@metaplex-foundation/rustbin@0.3.5': dependencies: @@ -581,7 +631,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@noble/hashes@1.5.0': {} + '@noble/hashes@1.8.0': {} '@nodelib/fs.scandir@2.1.5': dependencies: @@ -595,30 +645,59 @@ snapshots: '@nodelib/fs.scandir': 2.1.5 fastq: 1.17.1 - '@solana/codecs-core@2.0.0-rc.1(typescript@5.6.2)': + '@solana/codecs-core@3.0.3(typescript@5.6.2)': dependencies: - '@solana/errors': 2.0.0-rc.1(typescript@5.6.2) + '@solana/errors': 3.0.3(typescript@5.6.2) typescript: 5.6.2 - '@solana/codecs-numbers@2.0.0-rc.1(typescript@5.6.2)': + '@solana/codecs-data-structures@3.0.3(typescript@5.6.2)': dependencies: - '@solana/codecs-core': 2.0.0-rc.1(typescript@5.6.2) - '@solana/errors': 2.0.0-rc.1(typescript@5.6.2) + '@solana/codecs-core': 3.0.3(typescript@5.6.2) + '@solana/codecs-numbers': 3.0.3(typescript@5.6.2) + '@solana/errors': 3.0.3(typescript@5.6.2) typescript: 5.6.2 - '@solana/codecs-strings@2.0.0-rc.1(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2)': + '@solana/codecs-numbers@3.0.3(typescript@5.6.2)': dependencies: - '@solana/codecs-core': 2.0.0-rc.1(typescript@5.6.2) - '@solana/codecs-numbers': 2.0.0-rc.1(typescript@5.6.2) - '@solana/errors': 2.0.0-rc.1(typescript@5.6.2) + '@solana/codecs-core': 3.0.3(typescript@5.6.2) + '@solana/errors': 3.0.3(typescript@5.6.2) + typescript: 5.6.2 + + '@solana/codecs-strings@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2)': + dependencies: + '@solana/codecs-core': 3.0.3(typescript@5.6.2) + '@solana/codecs-numbers': 3.0.3(typescript@5.6.2) + '@solana/errors': 3.0.3(typescript@5.6.2) fastestsmallesttextencoderdecoder: 1.0.22 typescript: 5.6.2 - '@solana/errors@2.0.0-rc.1(typescript@5.6.2)': + '@solana/codecs@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2)': dependencies: - chalk: 5.3.0 - commander: 12.1.0 + '@solana/codecs-core': 3.0.3(typescript@5.6.2) + '@solana/codecs-data-structures': 3.0.3(typescript@5.6.2) + '@solana/codecs-numbers': 3.0.3(typescript@5.6.2) + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) + '@solana/options': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) + typescript: 5.6.2 + transitivePeerDependencies: + - fastestsmallesttextencoderdecoder + + '@solana/errors@3.0.3(typescript@5.6.2)': + dependencies: + chalk: 5.6.2 + commander: 14.0.0 + typescript: 5.6.2 + + '@solana/options@3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2)': + dependencies: + '@solana/codecs-core': 3.0.3(typescript@5.6.2) + '@solana/codecs-data-structures': 3.0.3(typescript@5.6.2) + '@solana/codecs-numbers': 3.0.3(typescript@5.6.2) + '@solana/codecs-strings': 3.0.3(fastestsmallesttextencoderdecoder@1.0.22)(typescript@5.6.2) + '@solana/errors': 3.0.3(typescript@5.6.2) typescript: 5.6.2 + transitivePeerDependencies: + - fastestsmallesttextencoderdecoder '@types/fs-extra@11.0.4': dependencies: @@ -649,17 +728,38 @@ snapshots: dependencies: fill-range: 7.1.1 - call-bind@1.0.7: + call-bind-apply-helpers@1.0.2: dependencies: - es-define-property: 1.0.0 es-errors: 1.3.0 function-bind: 1.1.2 + + call-bind@1.0.8: + dependencies: + call-bind-apply-helpers: 1.0.2 + es-define-property: 1.0.0 get-intrinsic: 1.2.4 set-function-length: 1.2.2 + call-bound@1.0.4: + dependencies: + call-bind-apply-helpers: 1.0.2 + get-intrinsic: 1.3.0 + chalk@5.3.0: {} - commander@12.1.0: {} + chalk@5.6.2: {} + + codama@1.3.7: + dependencies: + '@codama/cli': 1.3.5 + '@codama/errors': 1.3.7 + '@codama/nodes': 1.3.7 + '@codama/validators': 1.3.7 + '@codama/visitors': 1.3.7 + + commander@14.0.0: {} + + commander@14.0.1: {} commander@5.1.0: {} @@ -679,14 +779,26 @@ snapshots: dependencies: path-type: 4.0.0 + dunder-proto@1.0.1: + dependencies: + call-bind-apply-helpers: 1.0.2 + es-errors: 1.3.0 + gopd: 1.2.0 + duplexer@0.1.2: {} es-define-property@1.0.0: dependencies: get-intrinsic: 1.2.4 + es-define-property@1.0.1: {} + es-errors@1.3.0: {} + es-object-atoms@1.1.1: + dependencies: + es-errors: 1.3.0 + event-stream@3.3.4: dependencies: duplexer: 0.1.2 @@ -744,6 +856,24 @@ snapshots: has-symbols: 1.0.3 hasown: 2.0.2 + get-intrinsic@1.3.0: + dependencies: + call-bind-apply-helpers: 1.0.2 + es-define-property: 1.0.1 + es-errors: 1.3.0 + es-object-atoms: 1.1.1 + function-bind: 1.1.2 + get-proto: 1.0.1 + gopd: 1.2.0 + has-symbols: 1.1.0 + hasown: 2.0.2 + math-intrinsics: 1.1.0 + + get-proto@1.0.1: + dependencies: + dunder-proto: 1.0.1 + es-object-atoms: 1.1.1 + glob-parent@5.1.2: dependencies: is-glob: 4.0.3 @@ -760,6 +890,8 @@ snapshots: dependencies: get-intrinsic: 1.2.4 + gopd@1.2.0: {} + graceful-fs@4.2.11: {} has-property-descriptors@1.0.2: @@ -770,6 +902,8 @@ snapshots: has-symbols@1.0.3: {} + has-symbols@1.1.0: {} + hasown@2.0.2: dependencies: function-bind: 1.1.2 @@ -788,9 +922,10 @@ snapshots: isexe@2.0.0: {} - json-stable-stringify@1.1.1: + json-stable-stringify@1.3.0: dependencies: - call-bind: 1.0.7 + call-bind: 1.0.8 + call-bound: 1.0.4 isarray: 2.0.5 jsonify: 0.0.1 object-keys: 1.1.1 @@ -803,15 +938,12 @@ snapshots: jsonify@0.0.1: {} - kinobi@0.21.4: - dependencies: - '@kinobi-so/errors': 0.21.4 - '@kinobi-so/nodes': 0.21.4 - '@kinobi-so/validators': 0.21.4 - '@kinobi-so/visitors': 0.21.4 + kleur@3.0.3: {} map-stream@0.1.0: {} + math-intrinsics@1.1.0: {} + merge2@1.4.1: {} micromatch@4.0.8: @@ -845,9 +977,16 @@ snapshots: dependencies: through: 2.3.8 + picocolors@1.1.1: {} + picomatch@2.3.1: {} - prettier@3.3.3: {} + prettier@3.6.2: {} + + prompts@2.4.2: + dependencies: + kleur: 3.0.3 + sisteransi: 1.0.5 ps-tree@1.2.0: dependencies: @@ -872,6 +1011,8 @@ snapshots: gopd: 1.0.1 has-property-descriptors: 1.0.2 + sisteransi@1.0.5: {} + slash@4.0.0: {} split@0.3.3: diff --git a/program/idl.json b/program/idl.json index 805cbd4..839bc09 100644 --- a/program/idl.json +++ b/program/idl.json @@ -374,7 +374,7 @@ "metadata": { "origin": "shank", "address": "CoreBPFLoaderUpgradeab1e1111111111111111111", - "binaryVersion": "0.4.2", + "binaryVersion": "0.4.5", "libVersion": "^0.4.2" } } \ No newline at end of file From d82b87f5707253bcc6b2a043efe9287aa8c0de78 Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Fri, 3 Oct 2025 09:14:27 +0100 Subject: [PATCH 06/10] Fix prettier option attribute --- codama.mjs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/codama.mjs b/codama.mjs index d890516..02a1446 100644 --- a/codama.mjs +++ b/codama.mjs @@ -2,7 +2,7 @@ import { getToolchainArgument } from "./scripts/utils.mjs"; import path from "node:path"; import fs from "node:fs"; -const prettier = JSON.parse( +const prettierOptions = JSON.parse( fs.readFileSync(path.join("clients", "js", ".prettierrc.json"), "utf-8") ); @@ -24,7 +24,7 @@ export default { scripts: { js: { from: "@codama/renderers-js", - args: ["clients/js/src/generated", { prettier }], + args: ["clients/js/src/generated", { prettierOptions }], }, rust: { from: "@codama/renderers-rust", From 15e04e8cc4df210a0993a8a2baa0d974a79b1f5a Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Fri, 3 Oct 2025 10:03:19 +0100 Subject: [PATCH 07/10] Update generate:clients script --- package.json | 2 +- scripts/generate-clients.mjs | 41 ------------------------------------ 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 scripts/generate-clients.mjs diff --git a/package.json b/package.json index 981e1ed..8501a08 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "solana:check": "zx ./scripts/check-solana-version.mjs", "solana:link": "zx ./scripts/link-solana-version.mjs", "generate": "pnpm generate:idls && pnpm generate:clients", - "generate:clients": "zx ./scripts/generate-clients.mjs", + "generate:clients": "codama run --all", "validator:start": "zx ./scripts/start-validator.mjs", "validator:restart": "pnpm validator:start --restart", "validator:stop": "zx ./scripts/stop-validator.mjs", diff --git a/scripts/generate-clients.mjs b/scripts/generate-clients.mjs deleted file mode 100644 index 7ffc4e4..0000000 --- a/scripts/generate-clients.mjs +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env zx -import "zx/globals"; -import * as k from "kinobi"; -import { rootNodeFromAnchor } from "@kinobi-so/nodes-from-anchor"; -import { renderVisitor as renderJavaScriptVisitor } from "@kinobi-so/renderers-js"; -import { renderVisitor as renderRustVisitor } from "@kinobi-so/renderers-rust"; -import { getAllProgramIdls, getToolchainArgument } from "./utils.mjs"; - -// Instanciate Kinobi. -const [idl, ...additionalIdls] = getAllProgramIdls().map(idl => rootNodeFromAnchor(require(idl))) -const kinobi = k.createFromRoot(idl, additionalIdls); - -const ciDir = path.join(__dirname, "..", "ci"); - -// Update programs. -kinobi.update( - k.updateProgramsVisitor({ - solanaLoaderV3Program: { - name: "loaderV3", - publicKey: "BPFLoaderUpgradeab1e11111111111111111111111", - }, - }) -); - -// Render JavaScript. -const jsClient = path.join(__dirname, "..", "clients", "js"); -kinobi.accept( - renderJavaScriptVisitor(path.join(jsClient, "src", "generated"), { - prettier: require(path.join(jsClient, ".prettierrc.json")) - }) -); - -// Render Rust. -const rustClient = path.join(__dirname, "..", "clients", "rust"); -kinobi.accept( - renderRustVisitor(path.join(rustClient, "src", "generated"), { - formatCode: true, - crateFolder: rustClient, - toolchain: getToolchainArgument('format') - }) -); From e5a4d486e9246eea24d82cf07c50ffe32352f909 Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Tue, 7 Oct 2025 10:11:43 +0100 Subject: [PATCH 08/10] Dummy commit to trigger CI Somehow it didn't trigger after main rebase --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index fdf4bd1..b9eb228 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # Solana Loader V3 - - From 949fe14e62000d37b79fe771eae4aa72c9e0e758 Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Tue, 7 Oct 2025 10:23:59 +0100 Subject: [PATCH 09/10] Remove redundant system_program import --- program/tests/common.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/program/tests/common.rs b/program/tests/common.rs index 6f50646..0ae8c02 100644 --- a/program/tests/common.rs +++ b/program/tests/common.rs @@ -6,7 +6,7 @@ use solana_sdk::system_program; use { mollusk_svm::Mollusk, solana_loader_v3_program::state::UpgradeableLoaderState, - solana_sdk::{account::Account, rent::Rent, system_program}, + solana_sdk::{account::Account, rent::Rent}, }; pub fn setup() -> Mollusk { From f25b321a5b7cc849ef940dad1b27cc0ce428cdd7 Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Tue, 7 Oct 2025 10:36:43 +0100 Subject: [PATCH 10/10] Add PAT to publish steps --- .github/workflows/publish-js-client.yml | 2 ++ .github/workflows/publish-rust-client.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/publish-js-client.yml b/.github/workflows/publish-js-client.yml index d32f29a..d6ba832 100644 --- a/.github/workflows/publish-js-client.yml +++ b/.github/workflows/publish-js-client.yml @@ -62,6 +62,8 @@ jobs: steps: - name: Git Checkout uses: actions/checkout@v4 + with: + token: ${{ secrets.ANZA_TEAM_PAT }} - name: Setup Environment uses: ./.github/actions/setup diff --git a/.github/workflows/publish-rust-client.yml b/.github/workflows/publish-rust-client.yml index 546cee7..2968406 100644 --- a/.github/workflows/publish-rust-client.yml +++ b/.github/workflows/publish-rust-client.yml @@ -69,6 +69,8 @@ jobs: steps: - name: Git Checkout uses: actions/checkout@v4 + with: + token: ${{ secrets.ANZA_TEAM_PAT }} - name: Setup Environment uses: ./.github/actions/setup