create-near-app 8.1.0 → 8.3.0

package/dist/app.js

@@ -31,6 +31,7 @@ const semver_1 = __importDefault(require("semver"));
 const make_1 = require("./make");
 const user_input_1 = require("./user-input");
 const show = __importStar(require("./messages"));
+const utils_1 = require("./utils");
 (async function () {
     const supportedNodeVersion = require('../package.json').engines.node;
     if (!semver_1.default.satisfies(process.version, supportedNodeVersion)) {
@@ -54,9 +55,18 @@ const show = __importStar(require("./messages"));
         console.error(e);
         createSuccess = false;
     }
+    let needsToInstallCargoNear = false;
+    if (contract === 'rs') {
+        show.checkingCargoNear();
+        let cargoNearInstalled = await (0, utils_1.isCargoNearInstalled)();
+        if (!cargoNearInstalled) {
+            needsToInstallCargoNear = true;
+            show.cargoNearIsNotInstalled();
+        }
+    }
     if (createSuccess) {
         install && await (0, make_1.runDepsInstall)(projectPath);
-        show.setupSuccess(projectName, contract, frontend, install);
+        show.setupSuccess(projectName, contract, frontend, install, needsToInstallCargoNear);
     }
     else {
         return show.setupFailed();

package/dist/make.js

@@ -27,11 +27,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runDepsInstall = exports.copyDir = exports.createProject = void 0;
-const show = __importStar(require("./messages"));
 const cross_spawn_1 = __importDefault(require("cross-spawn"));
 const fs_1 = __importDefault(require("fs"));
 const ncp_1 = require("ncp");
 const path_1 = __importDefault(require("path"));
+const show = __importStar(require("./messages"));
+const utils_1 = require("./utils");
 async function createProject({ contract, frontend, projectPath, templatesDir }) {
     if (contract !== 'none') {
         await createContract({ contract, projectPath, templatesDir });
@@ -43,11 +44,32 @@ async function createProject({ contract, frontend, projectPath, templatesDir })
 }
 exports.createProject = createProject;
 async function createContract({ contract, projectPath, templatesDir }) {
+    await createContractFromTemplate({ contract, projectPath, templatesDir });
+    if (contract === 'rs') {
+        await updateTemplateFiles(projectPath);
+    }
+}
+async function createContractFromTemplate({ contract, projectPath, templatesDir }) {
     // contract folder
     const sourceContractDir = path_1.default.resolve(templatesDir, 'contracts', contract);
     fs_1.default.mkdirSync(projectPath, { recursive: true });
     await copyDir(sourceContractDir, projectPath);
 }
+async function updateTemplateFiles(projectPath) {
+    const targetDir = path_1.default.join(projectPath);
+    const cargoTomlRemotePath = 'https://raw.githubusercontent.com/near/cargo-near/refs/heads/main/cargo-near/src/commands/new/new-project-template/Cargo.template.toml';
+    const cargoTomlFilePath = path_1.default.join(targetDir, 'Cargo.toml');
+    const rustToolchainRemotePath = 'https://raw.githubusercontent.com/near/cargo-near/refs/heads/main/cargo-near/src/commands/new/new-project-template/rust-toolchain.toml';
+    const rustToolchainFilePath = path_1.default.join(targetDir, 'rust-toolchain.toml');
+    show.updatingFiles();
+    try {
+        await (0, utils_1.downloadFile)(cargoTomlRemotePath, cargoTomlFilePath);
+        await (0, utils_1.downloadFile)(rustToolchainRemotePath, rustToolchainFilePath);
+    }
+    catch (err) {
+        show.updateFilesFailed();
+    }
+}
 async function createGateway({ frontend, projectPath, templatesDir }) {
     const sourceFrontendDir = path_1.default.resolve(`${templatesDir}/frontend/${frontend}`);
     fs_1.default.mkdirSync(projectPath, { recursive: true });

package/dist/messages.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.depsInstallError = exports.depsInstall = exports.creatingApp = exports.directoryExists = exports.windowsWarning = exports.unsupportedNodeVersion = exports.argsError = exports.gatewayInstructions = exports.contractInstructions = exports.setupSuccess = exports.successFrontendToText = exports.successContractToText = exports.setupFailed = exports.welcome = exports.show = void 0;
+exports.cargoNearIsNotInstalled = exports.checkingCargoNear = exports.updateFilesFailed = exports.updatingFiles = exports.depsInstallError = exports.depsInstall = exports.creatingApp = exports.directoryExists = exports.windowsWarning = exports.unsupportedNodeVersion = exports.argsError = exports.gatewayInstructions = exports.contractInstructions = exports.setupSuccess = exports.successFrontendToText = exports.successContractToText = exports.setupFailed = exports.welcome = exports.show = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const tracking_1 = require("./tracking");
 if (process.env.NEAR_NO_COLOR) {
@@ -37,34 +37,46 @@ const successFrontendToText = (frontend) => frontend === 'none'
     ? ''
     : (0, chalk_1.default) `a web-app using ${frontendTemplates[frontend]}`;
 exports.successFrontendToText = successFrontendToText;
-const setupSuccess = (projectName, contract, frontend, install) => (0, exports.show)((0, chalk_1.default) `
-{green ======================================================}
+const setupSuccess = (projectName, contract, frontend, install, needsToInstallCargoNear) => (0, exports.show)((0, chalk_1.default) `
 ✅  Success! Created '${projectName}', ${(0, exports.successContractToText)(contract)}${(0, exports.successFrontendToText)(frontend)}.
 ${contract === 'rs'
     ? (0, chalk_1.default) `🦀 If you are new to Rust please visit {bold {green https://www.rust-lang.org }}\n`
     : ''}
 {bold {bgYellow {black Next steps}}}:
-${(0, exports.contractInstructions)(projectName, contract, install)}${(0, exports.gatewayInstructions)(projectName, frontend, install)}`);
+${(0, exports.contractInstructions)(projectName, contract, install, needsToInstallCargoNear)}${(0, exports.gatewayInstructions)(projectName, frontend, install)}`);
 exports.setupSuccess = setupSuccess;
-const contractInstructions = (projectName, contract, install) => contract === 'none'
-    ? ''
-    : (0, chalk_1.default) `
-   - {inverse Navigate to your project}:
-         {blue cd {bold ${projectName}}}
-${contract === 'ts' && !install
-        ? (0, chalk_1.default) `   - {inverse Install all dependencies}
-         {blue npm {bold install}}`
-        : 'Then:'}
-   - {inverse Build your contract}:
-         ${contract === 'ts'
-        ? (0, chalk_1.default) `{blue npm {bold run build}}`
-        : (0, chalk_1.default) `{blue {bold cargo near build}}`}
-   - {inverse Test your contract} in the Sandbox:
-         ${contract === 'ts'
-        ? (0, chalk_1.default) `{blue npm {bold run test}}`
-        : (0, chalk_1.default) `{blue {bold cargo test}}`}
-   
-🧠 Read {bold {greenBright README.md}} to explore further`;
+const contractInstructions = (projectName, contract, install, needsToInstallCargoNear) => {
+    if (contract === 'none') {
+        return '';
+    }
+    let message = '';
+    if (needsToInstallCargoNear) {
+        message += (0, chalk_1.default) `   - {inverse Install cargo-near}:
+         {blue Go to {bold https://github.com/near/cargo-near}}\n`;
+    }
+    message += (0, chalk_1.default) `   - {inverse Navigate to your project}:
+         {blue cd {bold ${projectName}}}\n`;
+    if (contract === 'ts' && !install) {
+        message += (0, chalk_1.default) `   - {inverse Install all dependencies}
+         {blue npm {bold install}}\n`;
+    }
+    message += (0, chalk_1.default) `   - {inverse Build your contract}:\n`;
+    if (contract === 'ts') {
+        message += (0, chalk_1.default) `         {blue npm {bold run build}}\n`;
+    }
+    else {
+        message += (0, chalk_1.default) `         {blue {bold cargo near build}}\n`;
+    }
+    message += (0, chalk_1.default) `   - {inverse Test your contract} in the Sandbox:\n`;
+    if (contract === 'ts') {
+        message += (0, chalk_1.default) `         {blue npm {bold run test}}\n`;
+    }
+    else {
+        message += (0, chalk_1.default) `         {blue {bold cargo near test}}\n`;
+    }
+    message += (0, chalk_1.default) `\n🧠 Read {bold {greenBright README.md}} to explore further`;
+    return message;
+};
 exports.contractInstructions = contractInstructions;
 const gatewayInstructions = (projectName, frontend, install) => frontend === 'none'
     ? ''
@@ -91,12 +103,21 @@ const windowsWarning = () => (0, exports.show)((0, chalk_1.default) `{red Please
 exports.windowsWarning = windowsWarning;
 const directoryExists = (dirName) => (0, exports.show)((0, chalk_1.default) `{red This directory already exists! ${dirName}}`);
 exports.directoryExists = directoryExists;
-const creatingApp = () => (0, exports.show)((0, chalk_1.default) `\nCreating a new {bold NEAR dApp}`);
+const creatingApp = () => (0, exports.show)((0, chalk_1.default) `\n- Creating a new {bold NEAR dApp}...`);
 exports.creatingApp = creatingApp;
-const depsInstall = () => (0, exports.show)((0, chalk_1.default) `
-{green Installing dependencies in a few folders, this might take a while.}
-`);
+// Installing dependencies messages
+const depsInstall = () => (0, exports.show)((0, chalk_1.default) `- Installing dependencies in a few folders, this might take a while...`);
 exports.depsInstall = depsInstall;
 const depsInstallError = () => (0, exports.show)(chalk_1.default.red('Error installing NEAR project dependencies'));
 exports.depsInstallError = depsInstallError;
+// Updating files messages
+const updatingFiles = () => (0, exports.show)((0, chalk_1.default) `- Updating Cargo.toml and rust-toolchain.toml files from the remote source...`);
+exports.updatingFiles = updatingFiles;
+const updateFilesFailed = () => (0, exports.show)((0, chalk_1.default) `  {yellow There was a problem during the Cargo.toml and rust-toolchain.toml files remote updating. Check your internet connection.}\n`);
+exports.updateFilesFailed = updateFilesFailed;
+// Checking cargo-near messages
+const checkingCargoNear = () => (0, exports.show)((0, chalk_1.default) `- Checking if cargo-near extension is installed...`);
+exports.checkingCargoNear = checkingCargoNear;
+const cargoNearIsNotInstalled = () => (0, exports.show)((0, chalk_1.default) `  {bold {yellow Did not find cargo-near, please install it to build and deploy Rust contracts: https://github.com/near/cargo-near}}`);
+exports.cargoNearIsNotInstalled = cargoNearIsNotInstalled;
 //# sourceMappingURL=messages.js.map

package/dist/tracking.js

@@ -45,7 +45,7 @@ const trackUsage = async (frontend, contract) => {
         });
     }
     catch (e) {
-        console.error('Warning: problem while sending tracking data. Error: ', e);
+        console.error('  Warning: problem while sending tracking data\n');
     }
 };
 exports.trackUsage = trackUsage;

package/dist/utils/checkCargoNear.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const { execSync } = require('child_process');
+function isCargoNearInstalled() {
+    try {
+        // execute but hide output
+        execSync('cargo near --version', { stdio: 'ignore' });
+        return true;
+    }
+    catch (error) {
+        return false;
+    }
+}
+exports.default = isCargoNearInstalled;
+//# sourceMappingURL=checkCargoNear.js.map

package/dist/utils/donwloadFile.js

@@ -0,0 +1,25 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const https_1 = __importDefault(require("https"));
+const fs_1 = __importDefault(require("fs"));
+const stream_1 = require("stream");
+const util_1 = require("util");
+const streamPipeline = (0, util_1.promisify)(stream_1.pipeline);
+async function downloadFile(url, destination) {
+    return new Promise((resolve, reject) => {
+        https_1.default.get(url, (response) => {
+            if (response.statusCode !== 200) {
+                reject(new Error(`Downloading failed: ${response.statusCode}`));
+                return;
+            }
+            streamPipeline(response, fs_1.default.createWriteStream(destination))
+                .then(resolve)
+                .catch(reject);
+        }).on('error', reject);
+    });
+}
+exports.default = downloadFile;
+//# sourceMappingURL=donwloadFile.js.map

package/dist/utils/index.js

@@ -0,0 +1,11 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isCargoNearInstalled = exports.downloadFile = void 0;
+const donwloadFile_1 = __importDefault(require("./donwloadFile"));
+exports.downloadFile = donwloadFile_1.default;
+const checkCargoNear_1 = __importDefault(require("./checkCargoNear"));
+exports.isCargoNearInstalled = checkCargoNear_1.default;
+//# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-near-app",
-  "version": "8.1.0",
+  "version": "8.3.0",
   "description": "Quickly scaffold your dApp on NEAR Blockchain",
   "main": "index.js",
   "engines": {
@@ -18,6 +18,7 @@
     "build": "tsc",
     "test": "npm run build && FORCE_COLOR=1 jest --runInBand",
     "test-e2e": "npm run build && ./test/e2e.sh",
+    "test:update": "jest -u",
     "lint": "eslint .",
     "fix": "eslint . --fix",
     "release": "npm run build && release-it",

package/templates/contracts/rs/.github/workflows/deploy-production.yml

@@ -15,13 +15,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Install cargo-near CLI
-        run: curl --proto '=https' --tlsv1.2 -LsSf https://github.com/near/cargo-near/releases/download/cargo-near-v0.13.2/cargo-near-installer.sh | sh
+        run: curl --proto '=https' --tlsv1.2 -LsSf https://github.com/near/cargo-near/releases/latest/download/cargo-near-installer.sh | sh
       - name: Deploy to production
         run: |
           cargo near deploy build-reproducible-wasm "${{ vars.NEAR_CONTRACT_PRODUCTION_ACCOUNT_ID }}" \
             without-init-call \
             network-config "${{ vars.NEAR_CONTRACT_PRODUCTION_NETWORK }}" \
-            sign-with-plaintext-private-key \
-              --signer-public-key "${{ vars.NEAR_CONTRACT_PRODUCTION_ACCOUNT_PUBLIC_KEY }}" \
-              --signer-private-key "${{ secrets.NEAR_CONTRACT_PRODUCTION_ACCOUNT_PRIVATE_KEY }}" \
+            sign-with-plaintext-private-key "${{ secrets.NEAR_CONTRACT_PRODUCTION_ACCOUNT_PRIVATE_KEY }}" \
             send

package/templates/contracts/rs/.github/workflows/deploy-staging.yml

@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install near CLI
-        run: curl --proto '=https' --tlsv1.2 -LsSf https://github.com/near/near-cli-rs/releases/download/v0.11.1/near-cli-rs-installer.sh | sh
+        run: curl --proto '=https' --tlsv1.2 -LsSf https://github.com/near/near-cli-rs/releases/download/v0.20.0/near-cli-rs-installer.sh | sh
       - name: Create staging account
         if: github.event.action == 'opened' || github.event.action == 'reopened'
         run: |
@@ -28,13 +28,11 @@ jobs:
             use-manually-provided-public-key "${{ vars.NEAR_CONTRACT_STAGING_ACCOUNT_PUBLIC_KEY }}" \
             sign-as "${{ vars.NEAR_CONTRACT_STAGING_ACCOUNT_ID }}" \
             network-config "${{ vars.NEAR_CONTRACT_STAGING_NETWORK }}" \
-            sign-with-plaintext-private-key \
-              --signer-public-key "${{ vars.NEAR_CONTRACT_STAGING_ACCOUNT_PUBLIC_KEY }}" \
-              --signer-private-key "${{ secrets.NEAR_CONTRACT_STAGING_ACCOUNT_PRIVATE_KEY }}" \
+            sign-with-plaintext-private-key "${{ secrets.NEAR_CONTRACT_STAGING_ACCOUNT_PRIVATE_KEY }}" \
             send
 
       - name: Install cargo-near CLI
-        run: curl --proto '=https' --tlsv1.2 -LsSf https://github.com/near/cargo-near/releases/download/cargo-near-v0.13.2/cargo-near-installer.sh | sh
+        run: curl --proto '=https' --tlsv1.2 -LsSf https://github.com/near/cargo-near/releases/latest/download/cargo-near-installer.sh | sh
       - name: Deploy to staging
         # `--skip-git-remote-check` was used
         # as pull request git refs `refs/pull/NUMBER/merge` are somewhat harder to access and live only as long as PRs do
@@ -44,9 +42,7 @@ jobs:
           cargo near deploy build-reproducible-wasm --skip-git-remote-check "${{ env.NEAR_CONTRACT_PR_STAGING_ACCOUNT_ID }}" \
             without-init-call \
             network-config "${{ vars.NEAR_CONTRACT_STAGING_NETWORK }}" \
-            sign-with-plaintext-private-key \
-              --signer-public-key "${{ vars.NEAR_CONTRACT_STAGING_ACCOUNT_PUBLIC_KEY }}" \
-              --signer-private-key "${{ secrets.NEAR_CONTRACT_STAGING_ACCOUNT_PRIVATE_KEY }}" \
+            sign-with-plaintext-private-key "${{ secrets.NEAR_CONTRACT_STAGING_ACCOUNT_PRIVATE_KEY }}" \
             send
 
       - name: Comment on pull request

package/templates/contracts/rs/.github/workflows/test.yml

@@ -28,5 +28,7 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+      - name: Install cargo-near CLI
+        run: curl --proto '=https' --tlsv1.2 -LsSf https://github.com/near/cargo-near/releases/download/cargo-near-vcargo-near-new-ci-tool-version-self/cargo-near-installer.sh | sh
       - name: Run cargo test
         run: cargo test

package/templates/contracts/rs/.github/workflows/undeploy-staging.yml

@@ -13,13 +13,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Install near CLI
-        run: curl --proto '=https' --tlsv1.2 -LsSf https://github.com/near/near-cli-rs/releases/download/v0.11.1/near-cli-rs-installer.sh | sh
+        run: curl --proto '=https' --tlsv1.2 -LsSf https://github.com/near/near-cli-rs/releases/download/v0.20.0/near-cli-rs-installer.sh | sh
       - name: Remove staging account
         run: |
           near account delete-account "${{ env.NEAR_CONTRACT_PR_STAGING_ACCOUNT_ID }}" \
             beneficiary "${{ vars.NEAR_CONTRACT_STAGING_ACCOUNT_ID }}" \
             network-config "${{ vars.NEAR_CONTRACT_STAGING_NETWORK }}" \
-            sign-with-plaintext-private-key \
-              --signer-public-key "${{ vars.NEAR_CONTRACT_STAGING_ACCOUNT_PUBLIC_KEY }}" \
-              --signer-private-key "${{ secrets.NEAR_CONTRACT_STAGING_ACCOUNT_PRIVATE_KEY }}" \
+            sign-with-plaintext-private-key "${{ secrets.NEAR_CONTRACT_STAGING_ACCOUNT_PRIVATE_KEY }}" \
             send

package/templates/contracts/rs/Cargo.toml

@@ -11,30 +11,36 @@ repository = "https://github.com/<xxx>/<xxx>"
 [lib]
 crate-type = ["cdylib", "rlib"]
 
-# fields to configure build with WASM reproducibility, according to specs  
-# in https://github.com/near/NEPs/blob/master/neps/nep-0330.md 
+# fields to configure build with WASM reproducibility, according to specs
+# in https://github.com/near/NEPs/blob/master/neps/nep-0330.md
 [package.metadata.near.reproducible_build]
 # docker image, descriptor of build environment
-image = "sourcescan/cargo-near:0.13.1-rust-1.83.0"
+image = "sourcescan/cargo-near:0.16.0-rust-1.86.0"
 # tag after colon above serves only descriptive purpose; image is identified by digest
-image_digest = "sha256:cc80ff2f2a42823ffd991eaf45ea9fada71ee206d79561eea4f40ecc27bff1be"
+image_digest = "sha256:3220302ebb7036c1942e772810f21edd9381edf9a339983da43487c77fbad488"
 # list of environment variables names, whose values, if set, will be used as external build parameters
 # in a reproducible manner
 # supported by `sourcescan/cargo-near:0.10.1-rust-1.82.0` image or later images
 passed_env = []
-# build command inside of docker container 
+# build command inside of docker container
 # if docker image from default gallery is used https://hub.docker.com/r/sourcescan/cargo-near/tags,
 # the command may be any combination of flags of `cargo-near`,
 # supported by respective version of binary inside the container besides `--no-locked` flag
-container_build_command = ["cargo", "near", "build", "non-reproducible-wasm", "--locked"]
+container_build_command = [
+    "cargo",
+    "near",
+    "build",
+    "non-reproducible-wasm",
+    "--locked",
+]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
-near-sdk = "5.7"
+near-sdk = "5.14"
 
 [dev-dependencies]
-near-sdk = { version = "5.7", features = ["unit-testing"] }
-near-workspaces = { version = "0.16", features = ["unstable"] }
+near-sdk = { version = "5.14", features = ["unit-testing"] }
+near-workspaces = { version = "0.20", features = ["unstable"] }
 tokio = { version = "1.12.0", features = ["full"] }
 serde_json = "1"
 

package/templates/contracts/rs/README.md

@@ -21,6 +21,12 @@ cargo test
 Deployment is automated with GitHub Actions CI/CD pipeline.
 To deploy manually, install [`cargo-near`](https://github.com/near/cargo-near) and run:
 
+If you deploy for debugging purposes:
+```bash
+cargo near deploy build-non-reproducible-wasm <account-id>
+```
+
+If you deploy a production ready smart contract:
 ```bash
 cargo near deploy build-reproducible-wasm <account-id>
 ```

package/templates/contracts/rs/rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "stable"
-components = ["rustfmt"]
+channel = "1.86.0"
+components = ["rustfmt", "clippy", "rust-analyzer"]
 targets = ["wasm32-unknown-unknown"]

package/templates/frontend/next-app/next.config.js

@@ -1,6 +1,7 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   reactStrictMode: true,
+  transpilePackages: ['reown'],
 };
 
 module.exports = nextConfig;

package/templates/frontend/next-app/package.json

@@ -12,29 +12,35 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@near-js/providers": "^1.0.0",
-    "@near-wallet-selector/bitte-wallet": "^8.9.13",
-    "@near-wallet-selector/core": "^8.9.13",
-    "@near-wallet-selector/ethereum-wallets": "^8.9.13",
-    "@near-wallet-selector/here-wallet": "^8.9.13",
-    "@near-wallet-selector/ledger": "^8.9.13",
-    "@near-wallet-selector/meteor-wallet": "^8.9.13",
-    "@near-wallet-selector/modal-ui": "^8.9.13",
-    "@near-wallet-selector/my-near-wallet": "^8.9.13",
-    "@near-wallet-selector/sender": "^8.9.13",
-    "@web3modal/wagmi": "^5.1.10",
+    "@near-wallet-selector/bitte-wallet": "^9.0.2",
+    "@near-wallet-selector/core": "^9.0.2",
+    "@near-wallet-selector/ethereum-wallets": "^9.0.2",
+    "@near-wallet-selector/here-wallet": "^9.0.2",
+    "@near-wallet-selector/hot-wallet": "^9.0.2",
+    "@near-wallet-selector/ledger": "^9.0.2",
+    "@near-wallet-selector/meteor-wallet": "^9.0.2",
+    "@near-wallet-selector/meteor-wallet-app": "^9.0.2",
+    "@near-wallet-selector/modal-ui": "^9.0.2",
+    "@near-wallet-selector/my-near-wallet": "^9.0.2",
+    "@near-wallet-selector/near-mobile-wallet": "^9.0.2",
+    "@near-wallet-selector/react-hook": "^9.0.2",
+    "@near-wallet-selector/sender": "^9.0.2",
+    "@near-wallet-selector/welldone-wallet": "^9.0.2",
+    "@reown/appkit": "^1.7.7",
+    "@reown/appkit-adapter-wagmi": "^1.7.7",
+    "@wagmi/core": "^2.17.2",
     "bootstrap": "^5",
     "bootstrap-icons": "^1.11.3",
-    "near-api-js": "^4.0.3",
-    "next": "14.2.13",
+    "near-api-js": "^5.0.0",
+    "next": "^15",
     "react": "^18",
     "react-dom": "^18",
-    "wagmi": "^2.12.16"
+    "viem": "^2.30.5"
   },
   "devDependencies": {
     "encoding": "^0.1.13",
-    "eslint": "^8",
-    "eslint-config-next": "14.2.13",
+    "eslint": "^9",
+    "eslint-config-next": "^15",
     "pino-pretty": "^11.2.2"
   }
-}
+}

package/templates/frontend/next-app/src/app/hello-near/page.js

@@ -1,17 +1,17 @@
 'use client';
-import { useState, useEffect, useContext } from 'react';
+import { useState, useEffect } from 'react';
 
 import styles from '@/app/app.module.css';
 import { Cards } from '@/components/cards';
 
-import { NearContext } from '@/wallets/near';
 import { HelloNearContract } from '@/config';
+import { useWalletSelector } from '@near-wallet-selector/react-hook';
 
 // Contract that the app will interact with
 const CONTRACT = HelloNearContract;
 
 export default function HelloNear() {
-  const { signedAccountId, wallet } = useContext(NearContext);
+  const { signedAccountId, viewFunction, callFunction } = useWalletSelector();
 
   const [greeting, setGreeting] = useState('loading...');
   const [newGreeting, setNewGreeting] = useState('loading...');
@@ -19,11 +19,9 @@ export default function HelloNear() {
   const [showSpinner, setShowSpinner] = useState(false);
 
   useEffect(() => {
-    if (!wallet) return;
-
-    wallet.viewMethod({ contractId: CONTRACT, method: 'get_greeting' })
+    viewFunction({ contractId: CONTRACT, method: 'get_greeting' })
       .then(greeting => setGreeting(greeting));
-  }, [wallet]);
+  }, [viewFunction]);
 
   useEffect(() => {
     setLoggedIn(!!signedAccountId);
@@ -31,8 +29,8 @@ export default function HelloNear() {
 
   const storeGreeting = async () => {
     setShowSpinner(true);
-    await wallet.callMethod({ contractId: CONTRACT, method: 'set_greeting', args: { greeting: newGreeting } });
-    const greeting = await wallet.viewMethod({ contractId: CONTRACT, method: 'get_greeting' });
+    await callFunction({ contractId: CONTRACT, method: 'set_greeting', args: { greeting: newGreeting } });
+    const greeting = await viewFunction({ contractId: CONTRACT, method: 'get_greeting' });
     setGreeting(greeting);
     setShowSpinner(false);
   };

package/templates/frontend/next-app/src/app/layout.js

@@ -4,25 +4,50 @@ import { useEffect, useState } from 'react';
 
 import '@/app/globals.css';
 import { Navigation } from '@/components/navigation';
-import { NetworkId } from '@/config';
+import '@near-wallet-selector/modal-ui/styles.css';
+import { setupMyNearWallet } from '@near-wallet-selector/my-near-wallet';
+import { setupMeteorWallet } from '@near-wallet-selector/meteor-wallet';
+import { setupMeteorWalletApp } from '@near-wallet-selector/meteor-wallet-app';
+import { setupBitteWallet } from '@near-wallet-selector/bitte-wallet';
+import { setupEthereumWallets } from '@near-wallet-selector/ethereum-wallets';
+import { setupHotWallet } from '@near-wallet-selector/hot-wallet';
+import { setupLedger } from '@near-wallet-selector/ledger';
+import { setupSender } from '@near-wallet-selector/sender';
+import { setupHereWallet } from '@near-wallet-selector/here-wallet';
+import { setupNearMobileWallet } from '@near-wallet-selector/near-mobile-wallet';
+import { setupWelldoneWallet } from '@near-wallet-selector/welldone-wallet';
+import { HelloNearContract, NetworkId } from '@/config';
+import { WalletSelectorProvider } from '@near-wallet-selector/react-hook';
+import { wagmiAdapter, web3Modal } from '@/wallets/web3modal';
 
-import { NearContext, Wallet } from '@/wallets/near';
-
-const wallet = new Wallet({ networkId: NetworkId });
+const walletSelectorConfig = {
+  network: NetworkId,
+  // createAccessKeyFor: HelloNearContract,
+  modules: [
+    setupMeteorWallet(),
+    setupEthereumWallets({ wagmiConfig: wagmiAdapter.wagmiConfig, web3Modal }),
+    setupBitteWallet(),
+    setupMeteorWalletApp({ contractId: HelloNearContract }),
+    setupHotWallet(),
+    setupLedger(),
+    setupSender(),
+    setupHereWallet(),
+    setupNearMobileWallet(),
+    setupWelldoneWallet(),
+    setupMyNearWallet(),
+  ],
+}
 
 // Layout Component
 export default function RootLayout({ children }) {
-  const [signedAccountId, setSignedAccountId] = useState('');
-
-  useEffect(() => { wallet.startUp(setSignedAccountId); }, []);
 
   return (
     <html lang="en">
       <body>
-        <NearContext.Provider value={{ wallet, signedAccountId }}>
+        <WalletSelectorProvider config={walletSelectorConfig}>
           <Navigation />
           {children}
-        </NearContext.Provider>
+        </WalletSelectorProvider>
       </body>
     </html>
   );

package/templates/frontend/next-app/src/components/navigation.js

@@ -1,31 +1,29 @@
 import Image from 'next/image';
 import Link from 'next/link';
-import { useEffect, useState, useContext } from 'react';
+import { useEffect, useState } from 'react';
 
-import { NearContext } from '@/wallets/near';
 import NearLogo from '/public/near-logo.svg';
+import { useWalletSelector } from '@near-wallet-selector/react-hook';
 
 export const Navigation = () => {
-  const { signedAccountId, wallet } = useContext(NearContext);
+  const { signedAccountId, signIn, signOut } = useWalletSelector();
   const [action, setAction] = useState(() => { });
   const [label, setLabel] = useState('Loading...');
 
   useEffect(() => {
-    if (!wallet) return;
-
     if (signedAccountId) {
-      setAction(() => wallet.signOut);
+      setAction(() => signOut);
       setLabel(`Logout ${signedAccountId}`);
     } else {
-      setAction(() => wallet.signIn);
+      setAction(() => signIn);
       setLabel('Login');
     }
-  }, [signedAccountId, wallet]);
+  }, [signedAccountId, signIn, signOut]);
 
   return (
     <nav className="navbar navbar-expand-lg">
       <div className="container-fluid">
-        <Link href="/" passHref legacyBehavior>
+        <Link href="/" passHref>
           <Image priority src={NearLogo} alt="NEAR" width="30" height="24" className="d-inline-block align-text-top" />
         </Link>
         <div className='navbar-nav pt-1'>