Skip to content

Commit

Permalink
Merge branch 'main' into tutorial-9-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
barriebyron authored Nov 8, 2023
2 parents d301cce + 23f8069 commit adb55d1
Show file tree
Hide file tree
Showing 81 changed files with 1,125 additions and 1,609 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/algolia-search.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
wait-for-vercel:
runs-on: ubuntu-latest
steps:
- run: sleep 210s
- run: sleep 300s
shell: bash
algolia-search:
runs-on: ubuntu-latest
Expand Down
22 changes: 9 additions & 13 deletions algolia-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,17 @@
"sitemap_urls": ["https://docs.minaprotocol.com/sitemap.xml"],
"sitemap_alternate_links": true,
"js_render": true,
"js_wait": 1,
"stop_urls": ["https://docs.minaprotocol.com/node-developers"],
"js_wait": 3,
"selectors_exclude": ["footer"],
"selectors": {
"lvl0": {
"selector": "",
"defaultValue": "Documentation"
},
"lvl1": "header h1, article h1, main h1, h1, head > title",
"lvl2": "article h2, main h2, h2",
"lvl3": "article h3, main h3, h3",
"lvl4": "article h4, main h4, h4",
"lvl5": "article h5, main h5, h5",
"lvl6": "article h6, main h6, h6",
"text": "article p, article li, main p, main li, p, li"
"lvl0": "",
"lvl1": ".markdown h1",
"lvl2": ".markdown h2",
"lvl3": ".markdown h3",
"lvl4": ".markdown h4",
"lvl5": ".markdown h5",
"lvl6": ".markdown h6",
"text": ".markdown p, .markdown li"
},
"strip_chars": " .,;:#",
"custom_settings": {
Expand Down
4 changes: 2 additions & 2 deletions docs/node-operators/generating-a-keypair.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ Make sure to set a new and secure password for the following commands. Mina will

```
cd ~
docker run --interactive --tty --rm --volume $(pwd)/keys:/keys minaprotocol/mina-generate-keypair:1.4.0-c980ba8 --privkey-path /keys/my-wallet
docker run --interactive --tty --rm --volume $(pwd)/keys:/keys minaprotocol/mina-generate-keypair:1.3.1-3e3abec --privkey-path /keys/my-wallet
```

1. When prompted, type in the password you intend to use to secure this key. <em>Do NOT forget this password.</em>
Expand Down Expand Up @@ -139,7 +139,7 @@ mina-validate-keypair --privkey-path <path-to-the-private-key-file>
On Docker:

```
docker run --interactive --tty --rm --entrypoint=mina-validate-keypair --volume $(pwd)/keys:/keys minaprotocol/mina-generate-keypair:1.4.0-c980ba8 --privkey-path /keys/my-wallet
docker run --interactive --tty --rm --entrypoint=mina-validate-keypair --volume $(pwd)/keys:/keys minaprotocol/mina-generate-keypair:1.3.1-3e3abec --privkey-path /keys/my-wallet
```

## Ledger Hardware Wallet
Expand Down
6 changes: 2 additions & 4 deletions docs/test-world-2/launching-a-node.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ You must configure the node to restart automatically. Follow the instructions in

Please refer to the [Discord testworld-2](https://discord.com/channels/484437221055922177/1103364666517901342) channel for questions or to find any configuration options.

Please note that the flag `--max-connections 200` has been removed for all types of nodes.

:::

## Launching the Nodes
Expand Down Expand Up @@ -71,7 +73,6 @@ You must configure the block producer node with the following flags:
--enable-peer-exchange true
--libp2p-keypair <keyfile path> (**libp2p keypair pre-generated by the Node Operator**)
--log-precomputed-blocks true
--max-connections 200
--peer-list-url (**seeds.txt URL will be distributed prior to launch**)
--generate-genesis-proof true
--block-producer-key <keyfile path> (**keys will be distributed prior to launch**)
Expand Down Expand Up @@ -112,7 +113,6 @@ You must configure Load Testing nodes with the following flags:
--enable-peer-exchange true
--libp2p-keypair <keyfile path> (**libp2p keypair pre-generated by the Node Operator**)
--log-precomputed-blocks true
--max-connections 200
--peer-list-url (**seeds.txt URL will be distributed prior to launch**)
--generate-genesis-proof true
--node-status-url https://nodestats-itn.minaprotocol.tools/submit/stats
Expand Down Expand Up @@ -172,7 +172,6 @@ You must configure the SNARK coordinators with the following flags:
--enable-peer-exchange true
--libp2p-keypair <keyfile path> (**libp2p keypair pre-generated by the Node Operator**)
--log-precomputed-blocks true
--max-connections 200
--peer-list-url (**seeds.txt URL will be distributed prior to launch**)
--node-status-url https://nodestats-itn.minaprotocol.tools/submit/stats
--node-error-url https://nodestats-itn.minaprotocol.tools/submit/stats
Expand Down Expand Up @@ -221,7 +220,6 @@ The non-block producing node must be configured with the following flags:
--enable-peer-exchange true
--libp2p-keypair <keyfile path> (**libp2p keypair pre-generated by the Node Operator**)
--log-precomputed-blocks true
--max-connections 200
--peer-list-url (**seeds.txt URL will be distributed prior to launch**)
--generate-genesis-proof true
--node-status-url https://nodestats-itn.minaprotocol.tools/submit/stats
Expand Down
5 changes: 0 additions & 5 deletions docs/zkapps/how-to-test-a-zkapp.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ describe('Add smart contract integration test', () => {
txn;

beforeAll(async () => {
await isReady;
// setup local blockchain
let Local = Mina.LocalBlockchain();
Mina.setActiveInstance(Local);
Expand All @@ -172,10 +171,6 @@ describe('Add smart contract integration test', () => {
await txn.send();
});

afterAll(async () => {
setTimeout(shutdown, 0);
});

it('sets intitial state of num to 1', async () => {
currentState = zkAppInstance.num.get();
expect(currentState).toEqual(Field(1));
Expand Down
Loading

0 comments on commit adb55d1

Please sign in to comment.