Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into audit-caching
Browse files Browse the repository at this point in the history
  • Loading branch information
casey committed Dec 1, 2023
2 parents 94f6b2d + 172c65d commit 353b55e
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion docs/src/bounty/3.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ sat 0, the first sat to be mined is `nvtdijuwxlp` and the name of sat
2,099,999,997,689,999, the last sat to be mined, is `a`.

The bounty is open for submissions until block 840000—the first block after the
fourth halvening. Submissions included in block 840000 or later will not be
fourth halving. Submissions included in block 840000 or later will not be
considered.

Both parts use [frequency.tsv](frequency.tsv), a list of words and the number
Expand Down
6 changes: 3 additions & 3 deletions docs/src/guides/explorer.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Ordinal Explorer
================

The `ord` binary includes a block explorer. We host a instance of the block
The `ord` binary includes a block explorer. We host an instance of the block
explorer on mainnet at [ordinals.com](https://ordinals.com), and on signet at
[signet.ordinals.com](https://signet.ordinals.com).

Expand Down Expand Up @@ -43,7 +43,7 @@ transaction:

### Outputs

Transaction outputs can searched by outpoint, for example, the only output of
Transaction outputs can be searched by outpoint, for example, the only output of
the genesis block coinbase transaction:

[4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b:0](https://ordinals.com/search/4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b:0)
Expand Down Expand Up @@ -78,7 +78,7 @@ JSON-API

You can run `ord server` with the `--enable-json-api` flag to access endpoints that
return JSON instead of HTML if you set the HTTP `Accept: application/json`
header. The structure of theses objects closely follows
header. The structure of these objects closely follows
what is shown in the HTML. These endpoints are:

- `/inscription/<INSCRIPTION_ID>`
Expand Down
2 changes: 1 addition & 1 deletion docs/src/guides/inscriptions.md
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ See the pending transaction with:
ord wallet transactions
```

Once the send transaction confirms, you can can confirm receipt by running:
Once the send transaction confirms, you can confirm receipt by running:

```
ord wallet inscriptions
Expand Down
2 changes: 1 addition & 1 deletion src/index/updater/rune_updater.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ impl<'a, 'db, 'tx> RuneUpdater<'a, 'db, 'tx> {
let mut allocated: Vec<HashMap<u128, u128>> = vec![HashMap::new(); tx.output.len()];

if let Some(runestone) = runestone {
// Determine if this runestone conains a valid issuance
// Determine if this runestone contains a valid issuance
let mut allocation = match runestone.etching {
Some(etching) => {
// If the issuance symbol is already taken, the issuance is ignored
Expand Down
2 changes: 1 addition & 1 deletion src/media.rs
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ mod tests {
}

#[test]
fn no_duplicate_exensions() {
fn no_duplicate_extensions() {
let mut set = HashSet::new();
for (_, _, _, extensions) in Media::TABLE {
for extension in *extensions {
Expand Down

0 comments on commit 353b55e

Please sign in to comment.