chore: update npm ordering and update foundry init step

content/10.quick-start/00.index.md

@@ -98,7 +98,10 @@ yet and may not work as fully intended. It is open-sourced and contributions are
 Install `foundry-zksync` with the following command:
 <!-- TODO: @dutterbutter this should be a single curl command -->
 ```bash
-curl -L https://foundry-zksync.zksync.io | bash
+# TODO: @dutterbutter this should be a single curl command without Rust requirements
+git clone [email protected]:matter-labs/foundry-zksync.git
+cd foundry-zksync
+cargo build --bin forge --bin cast --release
 ```
 
 ---

content/10.quick-start/_deploy_factory/_foundry_deploy_contract_factory.md

@@ -1,8 +1,14 @@
 ---
 title: Foundry | Deploy Contract Factory
 ---
+<!-- TODO: @dutterbutter update to simplify the project init step -->
+Run the following command in your terminal to initialize the Foundry project.
 
-:display-partial{path = "/_partials/_environment-setup-with-foundry"}
+```sh
+git clone https://github.com/dutterbutter/zksync-foundry-quickstart-guide
+cd zksync-foundry-quickstart-guide
+git checkout db/deploy-contract-factory
+```
 
 ## Set up your wallet
 

content/10.quick-start/_deploy_factory/_hardhat_deploy_contract_factory.md

@@ -15,6 +15,10 @@ Install the dependencies:
 
 ::code-group
 
+```bash [npm]
+npm install
+```
+
 ```bash [yarn]
 yarn install
 ```
@@ -23,10 +27,6 @@ yarn install
 pnpm install
 ```
 
-```bash [npm]
-npm install
-```
-
 ```bash [bun]
 bun install
 ```
@@ -165,6 +165,12 @@ deploys to the configured network in your Hardhat setup. For local deployment, a
 
 ::code-group
 
+```bash [npm]
+npm run hardhat deploy-zksync --script deployUsingFactory.ts
+# To deploy the contract on local in-memory node:
+# npm run hardhat deploy-zksync --script deployUsingFactory.ts --network inMemoryNode
+```
+
 ```bash [yarn]
 yarn hardhat deploy-zksync --script deployUsingFactory.ts
 # To deploy the contract on local in-memory node:
@@ -177,12 +183,6 @@ pnpm run hardhat deploy-zksync --script deployUsingFactory.ts
 # pnpm run hardhat deploy-zksync --script deployUsingFactory.ts --network inMemoryNode
 ```
 
-```bash [npm]
-npm run hardhat deploy-zksync --script deployUsingFactory.ts
-# To deploy the contract on local in-memory node:
-# npm run hardhat deploy-zksync --script deployUsingFactory.ts --network inMemoryNode
-```
-
 ```bash [bun]
 bun run hardhat deploy-zksync --script deployUsingFactory.ts
 # To deploy the contract on local in-memory node:

content/10.quick-start/_hello-zksync/_hardhat_deploy_contract.md

@@ -16,6 +16,10 @@ Install the dependencies:
 
 ::code-group
 
+```bash [npm]
+npm install
+```
+
 ```bash [yarn]
 yarn install
 ```
@@ -24,10 +28,6 @@ yarn install
 pnpm install
 ```
 
-```bash [npm]
-npm install
-```
-
 ```bash [bun]
 bun install
 ```
@@ -148,6 +148,12 @@ deploys to the configured network in your Hardhat setup. For local deployment, a
 
 ::code-group
 
+```bash [npm]
+npm run hardhat deploy-zksync --script deploy.ts
+# To deploy the contract on local in-memory node:
+# npm run hardhat deploy-zksync --script deploy.ts --network inMemoryNode
+```
+
 ```bash [yarn]
 yarn hardhat deploy-zksync --script deploy.ts
 # To deploy the contract on local in-memory node:
@@ -160,12 +166,6 @@ pnpm run hardhat deploy-zksync --script deploy.ts
 # pnpm run hardhat deploy-zksync --script deploy.ts --network inMemoryNode
 ```
 
-```bash [npm]
-npm run hardhat deploy-zksync --script deploy.ts
-# To deploy the contract on local in-memory node:
-# npm run hardhat deploy-zksync --script deploy.ts --network inMemoryNode
-```
-
 ```bash [bun]
 bun run hardhat deploy-zksync --script deploy.ts
 # To deploy the contract on local in-memory node:

content/10.quick-start/_paymasters/_approval_paymaster_flow.md

@@ -17,6 +17,10 @@ Install the dependencies:
 
 ::code-group
 
+```bash [npm]
+npm install
+```
+
 ```bash [yarn]
 yarn install
 
@@ -26,10 +30,6 @@ yarn install
 pnpm install
 ```
 
-```bash [npm]
-npm install
-```
-
 ```bash [bun]
 bun install
 ```
@@ -205,6 +205,12 @@ deploys to the configured network in your Hardhat setup. For local deployment, a
 
 ::code-group
 
+```bash [npm]
+npm run hardhat deploy-zksync --script deployGaslessPaymaster.ts
+# To deploy the contract on local in-memory node:
+# npm run hardhat deploy-zksync --script deployGaslessPaymaster.ts --network inMemoryNode
+```
+
 ```bash [yarn]
 yarn hardhat deploy-zksync --script deployGaslessPaymaster.ts
 # To deploy the contract on local in-memory node:
@@ -217,12 +223,6 @@ pnpm run hardhat deploy-zksync --script deployGaslessPaymaster.ts
 # pnpm run hardhat deploy-zksync --script deployGaslessPaymaster.ts --network inMemoryNode
 ```
 
-```bash [npm]
-npm run hardhat deploy-zksync --script deployGaslessPaymaster.ts
-# To deploy the contract on local in-memory node:
-# npm run hardhat deploy-zksync --script deployGaslessPaymaster.ts --network inMemoryNode
-```
-
 ```bash [bun]
 bun run hardhat deploy-zksync --script deployGaslessPaymaster.ts
 # To deploy the contract on local in-memory node:
@@ -349,6 +349,10 @@ Execute the command corresponding to your package manager:
 
 ::code-group
 
+```bash [npm]
+npm run hardhat deploy-zksync --script interact/interactWithPaymaster.ts
+```
+
 ```bash [yarn]
 yarn hardhat deploy-zksync --script interact/interactWithPaymaster.ts
 ```
@@ -357,10 +361,6 @@ yarn hardhat deploy-zksync --script interact/interactWithPaymaster.ts
 pnpm run hardhat deploy-zksync --script interact/interactWithPaymaster.ts
 ```
 
-```bash [npm]
-npm run hardhat deploy-zksync --script interact/interactWithPaymaster.ts
-```
-
 ```bash [bun]
 bun run hardhat deploy-zksync --script interact/interactWithPaymaster.ts
 ```

content/10.quick-start/_paymasters/_general_paymaster_flow.md

@@ -17,6 +17,10 @@ Install the dependencies:
 
 ::code-group
 
+```bash [npm]
+npm install
+```
+
 ```bash [yarn]
 yarn install
 ```
@@ -25,10 +29,6 @@ yarn install
 pnpm install
 ```
 
-```bash [npm]
-npm install
-```
-
 ```bash [bun]
 bun install
 ```
@@ -208,6 +208,12 @@ deploys to the configured network in your Hardhat setup. For local deployment, a
 
 ::code-group
 
+```bash [npm]
+npm run hardhat deploy-zksync --script deployGaslessPaymaster.ts
+# To deploy the contract on local in-memory node:
+# npm run hardhat deploy-zksync --script deployGaslessPaymaster.ts --network inMemoryNode
+```
+
 ```bash [yarn]
 yarn hardhat deploy-zksync --script deployGaslessPaymaster.ts
 # To deploy the contract on local in-memory node:
@@ -220,12 +226,6 @@ pnpm run hardhat deploy-zksync --script deployGaslessPaymaster.ts
 # pnpm run hardhat deploy-zksync --script deployGaslessPaymaster.ts --network inMemoryNode
 ```
 
-```bash [npm]
-npm run hardhat deploy-zksync --script deployGaslessPaymaster.ts
-# To deploy the contract on local in-memory node:
-# npm run hardhat deploy-zksync --script deployGaslessPaymaster.ts --network inMemoryNode
-```
-
 ```bash [bun]
 bun run hardhat deploy-zksync --script deployGaslessPaymaster.ts
 # To deploy the contract on local in-memory node:
@@ -352,6 +352,10 @@ Execute the command corresponding to your package manager:
 
 ::code-group
 
+```bash [npm]
+npm run hardhat deploy-zksync --script interact/interactWithPaymaster.ts
+```
+
 ```bash [yarn]
 yarn hardhat deploy-zksync --script interact/interactWithPaymaster.ts
 ```
@@ -360,10 +364,6 @@ yarn hardhat deploy-zksync --script interact/interactWithPaymaster.ts
 pnpm run hardhat deploy-zksync --script interact/interactWithPaymaster.ts
 ```
 
-```bash [npm]
-npm run hardhat deploy-zksync --script interact/interactWithPaymaster.ts
-```
-
 ```bash [bun]
 bun run hardhat deploy-zksync --script interact/interactWithPaymaster.ts
 ```

content/10.quick-start/_testing/_foundry_contract_testing.md

@@ -2,7 +2,14 @@
 title: Hardhat | Contract Testing
 ---
 
-:display-partial{path = "/_partials/_environment-setup-with-foundry"}
+<!-- TODO: @dutterbutter update to simplify the project init step -->
+Run the following command in your terminal to initialize the Foundry project.
+
+```sh
+git clone https://github.com/dutterbutter/zksync-foundry-quickstart-guide
+cd zksync-foundry-quickstart-guide
+git checkout db/contract-testing
+```
 
 ---
 

content/10.quick-start/_testing/_hardhat_contract_testing.md

@@ -15,6 +15,10 @@ Run the following command in your terminal to initialize the project.
 
   ::code-group
 
+  ```bash [npm]
+  npm install
+  ```
+
   ```bash [yarn]
   yarn install
   ```
@@ -23,10 +27,6 @@ Run the following command in your terminal to initialize the project.
   pnpm install
   ```
 
-  ```bash [npm]
-  npm install
-  ```
-
   ```bash [bun]
   bun install
   ```
@@ -226,6 +226,10 @@ Execute the test command corresponding to your package manager:
 
 ::code-group
 
+```bash [npm]
+npm run hardhat test --network hardhat
+```
+
 ```bash [yarn]
 yarn hardhat test --network hardhat
 ```
@@ -234,10 +238,6 @@ yarn hardhat test --network hardhat
 pnpm run hardhat test --network hardhat
 ```
 
-```bash [npm]
-npm run hardhat test --network hardhat
-```
-
 ```bash [bun]
 bun run hardhat test --network hardhat
 ```