Skip to content

Commit

Permalink
Merge pull request #1250 from algorandfoundation/staging
Browse files Browse the repository at this point in the history
staging => master
  • Loading branch information
nullun authored Mar 27, 2024
2 parents 760ecca + 7aced52 commit 7c6e603
Show file tree
Hide file tree
Showing 130 changed files with 3,554 additions and 1,241 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pr-generator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ jobs:
uses: actions/checkout@v3
with:
repository: algorand/indexer
ref: ${{ inputs.indexer_version }}
ref: v${{ inputs.indexer_version }}
path: indexer
submodules: true

- name: Install golang
if: (contains(inputs.go_algorand_version, '-stable')) && (!contains(inputs.indexer_version, '-'))
uses: actions/setup-go@v3
with:
go-version: 1.17.9
go-version: 1.20.7

- name: Generate conduit docs
if: (contains(inputs.go_algorand_version, '-stable')) && (!contains(inputs.indexer_version, '-'))
Expand Down
2 changes: 1 addition & 1 deletion .go-algorand-beta.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v3.22.0-beta
v3.23.1-beta
2 changes: 1 addition & 1 deletion .go-algorand-stable.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v3.21.0-stable
v3.23.1-stable
2 changes: 1 addition & 1 deletion .indexer.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.15.4
3.4.0
2 changes: 2 additions & 0 deletions docs/clis/algokey/generate.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ algokey generate [flags]

```
--discreet Print mnemonic discreetly to an alternate screen
-h, --help help for generate
-f, --keyfile string Private key filename
Expand Down
16 changes: 0 additions & 16 deletions docs/clis/indexer/daemon.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,8 @@ indexer daemon [flags]

```
-d, --algod string path to algod data dir, or $ALGORAND_DATA
--algod-net string host:port of algod
--algod-token string api access token for algod
--allow-migration allow migrations to happen even when no algod connected
--api-config-file string supply an API config file to enable/disable parameters
--catchpoint string initialize local ledger using fast catchup
-c, --configfile string file path to configuration file (indexer.yml)
--cpuprofile string file to record cpu profile to
Expand All @@ -66,12 +56,8 @@ indexer daemon [flags]
--enable-all-parameters override default configuration and enable all parameters. Can't be used with --api-config-file
-g, --genesis string path to genesis.json (defaults to genesis.json in algod data dir if that was set)
-h, --help help for daemon
--init-ledger initialize local ledger using sequential mode (default true)
-f, --logfile string file to write logs to, if unset logs are written to standard out
-l, --loglevel string verbosity of logs: [error, warn, info, debug, trace] (default "info")
Expand All @@ -94,8 +80,6 @@ indexer daemon [flags]
--metrics-mode string configure the /metrics endpoint to [ON, OFF, VERBOSE] (default "OFF")
--no-algod disable connecting to algod for block following
--pidfile string file to write daemon's process id to
-P, --postgres string connection string for postgres database
Expand Down
3 changes: 0 additions & 3 deletions docs/clis/indexer/util/block-generator/.pages

This file was deleted.

32 changes: 0 additions & 32 deletions docs/clis/indexer/util/block-generator/block-generator.md

This file was deleted.

42 changes: 0 additions & 42 deletions docs/clis/indexer/util/block-generator/daemon.md

This file was deleted.

68 changes: 0 additions & 68 deletions docs/clis/indexer/util/block-generator/runner.md

This file was deleted.

1 change: 0 additions & 1 deletion docs/clis/indexer/util/util.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ Utilities used for Indexer development. These are low level tools that may requi


* [indexer](../../../indexer/indexer/) - Algorand Indexer
* [indexer util block-generator](../block-generator/block-generator/) - Block generator testing tools.
* [indexer util validator](../validator/) - validator


Expand Down
4 changes: 3 additions & 1 deletion docs/clis/indexer/util/validator.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ indexer util validator [flags]
--algod-url string Algod url.
--box string If provided validate a single box (in the format "appid,b64boxname") instead of reading Stdin.
-e, --error-log-file string When specified, error messages are written to this file instead of to stderr.
-h, --help help for validator
Expand All @@ -44,7 +46,7 @@ indexer util validator [flags]
--indexer-url string Indexer url.
--print-commands Print curl commands, including tokens, to query algod and indexer.
--print-commands Print curl commands, including tokens, to query algod and indexer contents.
--print-skipped Include accounts which were skipped in the error log.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ title: algokit generate command

- **Status**: Approved
- **Owner:** Altynbek Orumbayev, Inaie Ignacio
- **Deciders**: Rob Moore, Daniel McGregor, Alessandro Ferrari
- **Deciders**: Rob Moore, Daniel McGregor, Alessandro Cappellato
- **Date created**: 2023-07-19
- **Date decided:** 2023-07-24
- **Date updated**: 2023-07-24
Expand Down
Loading

0 comments on commit 7c6e603

Please sign in to comment.