Skip to content

Commit

Permalink
feat(mm-login): fix merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Magne Cedric committed Aug 1, 2024
2 parents 450cfba + c56eaf5 commit b81e5f1
Show file tree
Hide file tree
Showing 47 changed files with 1,684 additions and 183 deletions.
2 changes: 2 additions & 0 deletions docs/whats-new.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ of the [MetaMask developer page](https://metamask.io/developer/).

## June 2024

- Documented [Snaps custom UI with JSX](/snaps/features/custom-ui/with-jsx).
([#1348](https://github.com/MetaMask/metamask-docs/pull/1348))
- Updated [React dapp with global state tutorial](/wallet/tutorials/react-dapp-global-state) with
instructions for EIP-6963.
([#1330](https://github.com/MetaMask/metamask-docs/pull/1330))
Expand Down
16 changes: 6 additions & 10 deletions services/concepts/archive-data.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,25 +56,21 @@ Infura applies [rate limits](../how-to/avoid-rate-limiting.md) to ensure network

Requests for Ethereum archive data are more expensive and are therefore subject to different rate limits.

**Free plan**
### Free plan

- 25,000 archive requests per day.
- 100,000 total requests per day.

Rate limits kick in on archive requests after 25,000 per day. 75,000 standard requests are still available after this point.
You can make up to 25,000 archive requests and 100,000 total requests per day.
After reaching 25,000 archive requests, you can still make 75,000 additional standard requests.

:::info

If you need more archive requests, upgrade to the Developer plan.

:::

**Developer plan**

- 100,000 archive requests per day.
- 200,000 total requests per day.
### Developer plan

Rate limits kick in on archive requests after 100,000 per day. 100,000 standard requests are still available after this point.
You can make up to 100,000 archive requests and 200,000 total requests per day.
After reaching 100,000 archive requests, you can still make 100,000 additional standard requests.

:::info

Expand Down
2 changes: 1 addition & 1 deletion services/get-started/endpoints.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ Sepolia instead.
| Testnet (Amoy) | JSON-RPC over HTTPS | `https://polygon-amoy.infura.io/v3/<API-KEY>` |
| Testnet (Amoy) | JSON-RPC over WebSocket | `wss://polygon-amoy.infura.io/ws/v3/<API-KEY>` |

## StarkNet
## Starknet

| Network | Description | URL |
| ----------------- | ------------------- | ------------------------------------------------- |
Expand Down
23 changes: 13 additions & 10 deletions services/get-started/infura.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,11 @@ For more information refer to the [Infura pricing information](https://www.infur

## 2. Configure your API key

Once verified, youll be taken to the [Infura dashboard](../../../developer-tools/dashboard) where you can configure your
After verification, you'll be directed to the [Infura dashboard](../../../developer-tools/dashboard) to configure your
auto-generated API key.

:::info

Infura will automatically generate the **My First Key** API key for you.
Infura will automatically generate the **My First Key** API key.

:::

<div class="left-align-container">
<div class="img-large">
Expand All @@ -46,10 +43,10 @@ Infura will automatically generate the **My First Key** API key for you.
</div>
</div>

In the API key page that appears, select **My First Key** to access your API key settings. In the **All Endpoints** tab, select
the networks that you wish to connect to, and select **Save Changes**.
In the API key page that displays, select **My First Key** to access your API key settings. In the **All Endpoints** tab, select
the networks that you want to connect to, and select **Save Changes**.

In this example, we've selected the Ethereum mainnet and Linea mainnet networks.
In the following example, Ethereum mainnet and Linea mainnet networks are selected.

<div class="left-align-container">
<div class="img-large">
Expand All @@ -61,7 +58,7 @@ In this example, we've selected the Ethereum mainnet and Linea mainnet networks.

## 3. Send requests

Use the API key when sending requests. The following examples interact with the Ethereum network by sending requests using HTTP.
Use the API key when sending requests. The following examples interact with the Ethereum network by sending requests using HTTP:

:::info

Expand All @@ -70,7 +67,13 @@ Use the API key when sending requests. The following examples interact with the

:::

Use a tool such as the [Client Uniform Resource Locator (curl)](../concepts/curl.md) or [Postman](https://www.postman.com/downloads/) to make requests. We recommend using Postman if you're a Windows user.
Use a tool such as the [Client Uniform Resource Locator (curl)](../concepts/curl.md) or [Postman](https://www.postman.com/downloads/) to make requests.

:::info

We recommend using Postman if you're a Windows user.

:::

### 3.1 Get the current block number

Expand Down
52 changes: 25 additions & 27 deletions services/how-to/json-web-token-jwt.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,51 +74,49 @@ Upload the contents of the public key file that you [generated earlier](json-web

1. Go to the **SECURITY** section in your project settings.

![Security settings](../images/security-page.png)
![Security settings](../images/security-page.png)

:::info
:::info

You must implement separate security settings for each project.
You must implement separate security settings for each project.

:::
:::

2. Check the **Require JWT for all requests** box to enforce JWT on all requests. This is optional.
2. (Optional) Check the **Require JWT for all requests** box to enforce JWT on all requests.

:::info
:::info

Use allowlists to specify a subset of requests that must use JWTs.
Use allowlists to specify a subset of requests that must use JWTs.

:::
:::

3. Give the public key a name.

4. Paste the public key into the **JWT PUBLIC KEY** input box. It looks something like this:

```
-----BEGIN PUBLIC KEY-----
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr7VlNytvNFt9wVkjJ8vG
L4F0+id4kS1CpG7UMh1kghrLg9KMb8gauy7Bxk6PRz5Ckv1FnG4FL+Z3Cdzwd6c8
jJlzJxbRTYvNi3elqAyItE3tRl6CatRur49t9nGepgFOrwmPP5We52G5O0BsW6Mx
w/neqQH+Y/bXqs0PG/0ZbpTyr044Lh+p9grSuPIogIGIY5JM4AI+fpdH6hVnA7od
PkinkWhQqAW+F8jngwZK+JCFS1GAeobTZVbvsiHZQGuP/T7hqE8z5Q8HYO4ymnkI
MPH6zSKhSxsQRs/kWU5lXqY67ORC3DIMA+I/AJujLuoqC+YaMP0fO81XjrwXPf2j
4wIDAQAB
-----END PUBLIC KEY-----
```

5. Click **ADD** to add the key to the settings.
```
-----BEGIN PUBLIC KEY-----
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr7VlNytvNFt9wVkjJ8vG
L4F0+id4kS1CpG7UMh1kghrLg9KMb8gauy7Bxk6PRz5Ckv1FnG4FL+Z3Cdzwd6c8
jJlzJxbRTYvNi3elqAyItE3tRl6CatRur49t9nGepgFOrwmPP5We52G5O0BsW6Mx
w/neqQH+Y/bXqs0PG/0ZbpTyr044Lh+p9grSuPIogIGIY5JM4AI+fpdH6hVnA7od
PkinkWhQqAW+F8jngwZK+JCFS1GAeobTZVbvsiHZQGuP/T7hqE8z5Q8HYO4ymnkI
MPH6zSKhSxsQRs/kWU5lXqY67ORC3DIMA+I/AJujLuoqC+YaMP0fO81XjrwXPf2j
4wIDAQAB
-----END PUBLIC KEY-----
```

6. The key is added to security settings.
5. Click **ADD** to add the key to the settings. After the key is added, the security settings look like the following:

![JWT set up](../images/jwt-set-up.png)
![JWT set up](../images/jwt-set-up.png)

7. The key has a **NAME**, **ID**, **FINGERPRINT**. These are used for creating and verifying JWTs. You'll need the **ID** to [generate the JWT](json-web-token-jwt.md#generate-a-jwt).
6. The key has a **NAME**, **ID**, **FINGERPRINT**. These are used for creating and verifying JWTs. You'll need the **ID** to [generate the JWT](json-web-token-jwt.md#generate-a-jwt).

:::info
:::info

For key rotation, upload up to three keys for each project.
For key rotation, upload up to three keys for each project.

:::
:::

## Send requests with JWTs

Expand Down
6 changes: 3 additions & 3 deletions services/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ sidebar_label: Introduction
sidebar_position: 1
---

import CodeTerminal from '@site/src/components/CodeTerminal/CodeTerminal.jsx';
import SectionAPIs from '@site/src/components/Sections/SectionAPIs.jsx';
import SectionNetworks from '@site/src/components/Sections/SectionNetworks.jsx';
import CodeTerminal from "@site/src/components/CodeTerminal/CodeTerminal.jsx";
import SectionAPIs from "@site/src/components/Sections/SectionAPIs.jsx";
import SectionNetworks from "@site/src/components/Sections/SectionNetworks.jsx";

# Build and scale your dapp using services

Expand Down
2 changes: 1 addition & 1 deletion services/reference/palm/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import CardList from '@site/src/components/CardList'

# Palm

The [Palm Network](https://palm.io/) is an Ethereum Virtual Machine-compatible Polygon Supernet. The Palm network is for
The [Palm Network](https://palm.io/) is an Ethereum Virtual Machine-compatible Polygon Supernet. The Palm Network is for
creators, fans, and leaders in various industries such as art, technology, sports, and entertainment. The network
provides support to developers in their quest to build new and user-friendly tools that contributes to the growth of
the Web3 ecosystem.
Expand Down
8 changes: 4 additions & 4 deletions services/reference/starknet/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ description: Starknet network information.

import CardList from '@site/src/components/CardList'

# StarkNet
# Starknet

StarkNet is a decentralized, permissionless and scalable Layer-2 network protocol developed by StarkWare for the Ethereum
Starknet is a decentralized, permissionless and scalable Layer-2 network protocol developed by StarkWare for the Ethereum
network. It leverages zk-STARKs technology for scalability and privacy, allowing developers to build and deploy smart contracts
that can perform more computations than on Ethereum's base layer, while maintaining a high level of security and decentralization.

:::info see also

See the [StarkNet documentation](https://docs.starknet.io/documentation/) to find out more. You can also watch an
[introduction to StarkNet](https://www.youtube.com/watch?v=eL9le56gcS0).
See the [Starknet documentation](https://docs.starknet.io/documentation/) to find out more. You can also watch an
[Introduction to Starknet](https://www.youtube.com/watch?v=eL9le56gcS0).

:::

Expand Down
6 changes: 3 additions & 3 deletions services/reference/starknet/json-rpc-methods/index.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
title: "JSON-RPC methods"
description: StarkNet JSON RPC API methods.
description: Starknet JSON RPC API methods.
---

# JSON-RPC methods

Infura supports a subset of the [StarkNet API methods](https://github.com/starkware-libs/starknet-specs/).
Infura supports a subset of the [Starknet API methods](https://github.com/starkware-libs/starknet-specs/).

The following StarkNet methods are not supported:
The following Starknet methods are not supported:

- `starknet_pendingTransactions`
- `starknet_addDeployTransaction`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Submits a new class declaration transaction.

`declare_transaction`: [*Required*] A
[declare transaction](https://docs.starknet.io/documentation/architecture_and_concepts/Network_Architecture/transactions/#declare-transaction)
object to declare a new class on StarkNet.
object to declare a new class on Starknet.

## Returns

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Submits a new deploy account transaction.

`deploy_account_transaction`: [*Required*] A
[deploy account transaction](https://docs.starknet.io/documentation/architecture_and_concepts/Network_Architecture/transactions/#deploy_account_transaction)
object to deploy a new account contract on StarkNet.
object to deploy a new account contract on Starknet.

## Returns

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Submits a new invoke transaction.

`invoke_transaction`: [*Required*] An
[invoke transaction](https://docs.starknet.io/documentation/architecture_and_concepts/Network_Architecture/transactions/#invoke_transaction)
object to invoke an existing contract function on StarkNet.
object to invoke an existing contract function on Starknet.

## Returns

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Tabs from "@theme/Tabs"
import TabItem from "@theme/TabItem"

Calls the specified contract function at the specified block, and returns the value of the function,
without creating a StarkNet transaction.
without creating a Starknet transaction.
This method does not change the network state.

## Parameters
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ title: "starknet_chainId"
import Tabs from "@theme/Tabs"
import TabItem from "@theme/TabItem"

Returns the currently connected StarkNet chain ID.
Returns the currently connected Starknet chain ID.

## Parameters

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ the specified block.
## Parameters

- `request`: (array) [*Required*] A sequence of
[StarkNet transactions](https://docs.starknet.io/documentation/architecture_and_concepts/Network_Architecture/transactions/)
[Starknet transactions](https://docs.starknet.io/documentation/architecture_and_concepts/Network_Architecture/transactions/)
to estimate gas fees for.
If multiple transactions are provided, each transaction is simulated on the state resulting from
applying the previous transactions.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ A block object or pending block object containing:
- `new_root`: The new global state root.
This is not included in a pending block object.
- `timestamp`: The time at which the block was created.
- `sequencer_address`: The StarkNet identity of the sequencer submitting this block.
- `sequencer_address`: The Starknet identity of the sequencer submitting this block.
- `l1_gas_price`: The price of L1 gas in the block.
An object containing `price_in_fri` (gas price denominated in fri) or `price_in_wei` (gas price
denominated in wei).
- `starknet_version`: Version of the current StarkNet protocol.
- `starknet_version`: Version of the current Starknet protocol.
- `transactions`: An array of transaction hashes included in this block.

## Example
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ A block object or pending block object containing:
- `new_root`: The new global state root.
This is not included in a pending block object.
- `timestamp`: The time at which the block was created.
- `sequencer_address`: The StarkNet identity of the sequencer submitting this block.
- `sequencer_address`: The Starknet identity of the sequencer submitting this block.
- `l1_gas_price`: The price of L1 gas in the block.
An object containing `price_in_fri` (gas price denominated in fri) or `price_in_wei` (gas price
denominated in wei).
- `starknet_version`: Version of the current StarkNet protocol.
- `starknet_version`: Version of the current Starknet protocol.
- `transactions`: An array of transaction objects included in this block.

## Example
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Returns the details of the specified transaction.

## Returns

A [StarkNet transaction](https://docs.starknet.io/documentation/architecture_and_concepts/Network_Architecture/transactions/)
A [Starknet transaction](https://docs.starknet.io/documentation/architecture_and_concepts/Network_Architecture/transactions/)
object.

## Example
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Returns the details of the specified transaction.

## Returns

A [StarkNet transaction](https://docs.starknet.io/documentation/architecture_and_concepts/Network_Architecture/transactions/)
A [Starknet transaction](https://docs.starknet.io/documentation/architecture_and_concepts/Network_Architecture/transactions/)
object.

## Example
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Returns the receipt of the specified transaction.

## Returns

A [StarkNet transaction](https://docs.starknet.io/documentation/architecture_and_concepts/Network_Architecture/transactions/)
A [Starknet transaction](https://docs.starknet.io/documentation/architecture_and_concepts/Network_Architecture/transactions/)
receipt object.

## Example
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Simulates the execution of the specified transactions at the specified block.
## Parameters

- `transactions`: (array) [*Required*] A sequence of
[StarkNet transactions](https://docs.starknet.io/documentation/architecture_and_concepts/Network_Architecture/transactions/)
[Starknet transactions](https://docs.starknet.io/documentation/architecture_and_concepts/Network_Architecture/transactions/)
to simulate.
If multiple transactions are provided, each transaction is simulated on the state resulting from
applying the previous transactions..
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ title: "starknet_specVersion"
import Tabs from "@theme/Tabs"
import TabItem from "@theme/TabItem"

Returns the version of the StarkNet JSON-RPC specification that the client is using.
Returns the version of the Starknet JSON-RPC specification that the client is using.

## Parameters

None.

## Returns

The current StarkNet JSON-RPC specification version.
The current Starknet JSON-RPC specification version.

## Example

Expand Down
10 changes: 5 additions & 5 deletions services/test-net/get-starknet-eth.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
description: Get Starknet ETH.
---

# Get StarkNet ETH
# Get Starknet ETH

Use the [StarkNet faucet](https://starknet-faucet.vercel.app/) to get StarkNet ETH for use on the
Use the [Starknet faucet](https://starknet-faucet.vercel.app/) to get Starknet ETH for use on the
Starknet testnet (Sepolia).

Use the [StarkNet bridge (StarkGate)](https://starkgate.starknet.io/) to bridge ETH or DAI between
Ethereum mainnet and StarkNet mainnet. StarkGate requires a MetaMask wallet extension and a
StarkNet-compatible wallet (for example, ArgentX) installed in the user's browser.
Use the [Starknet bridge (StarkGate)](https://starkgate.starknet.io/) to bridge ETH or DAI between
Ethereum mainnet and Starknet mainnet. StarkGate requires a MetaMask wallet extension and a
Starknet-compatible wallet (for example, ArgentX) installed in the user's browser.
Loading

0 comments on commit b81e5f1

Please sign in to comment.