Skip to content

Commit

Permalink
Merge branch 'develop' into tooling-dashboard/fix-number-of-native-to…
Browse files Browse the repository at this point in the history
…kens-in-migration-summary
  • Loading branch information
evavirseda authored Jan 2, 2025
2 parents 552ee88 + 8f98781 commit 42d253c
Show file tree
Hide file tree
Showing 21 changed files with 115 additions and 323 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/release_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
with:
context: .
file: docker/iota-node/Dockerfile
platforms: linux/amd64
platforms: linux/amd64,linux/arm64
tags: ${{ steps.meta-node.outputs.tags }}
push: true
pull: true
Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:
with:
context: .
file: docker/iota-indexer/Dockerfile
platforms: linux/amd64
platforms: linux/amd64,linux/arm64
tags: ${{ steps.meta-indexer.outputs.tags }}
push: true
pull: true
Expand Down Expand Up @@ -225,7 +225,7 @@ jobs:
with:
context: .
file: docker/iota-tools/Dockerfile
platforms: linux/amd64
platforms: linux/amd64,linux/arm64
tags: ${{ steps.meta-tools.outputs.tags }}
push: true
pull: true
Expand Down Expand Up @@ -294,7 +294,7 @@ jobs:
with:
context: .
file: docker/iota-graphql-rpc/Dockerfile
platforms: linux/amd64
platforms: linux/amd64,linux/arm64
tags: ${{ steps.meta-tools.outputs.tags }}
push: true
pull: true
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Thanks for considering making a contribution to the IOTA network or its document

## Contribute to IOTA

See [IOTA Environment Setup](https://github.com/iotaledger/iota/blob/main/docs/content/developer/getting-started/iota-environment.mdx) for approach to submitting code fixes and enhancements.
See [IOTA Environment Setup](https://github.com/iotaledger/iota/blob/develop/docs/content/developer/getting-started/iota-environment.mdx) for approach to submitting code fixes and enhancements.

Found a bug or security vulnerability? Create a [GitHub issue](https://github.com/iotaledger/iota/issues/new/choose).

Expand Down
30 changes: 20 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion chocolatey/iota.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ enclosed in quotation marks, you should use an editor that supports UTF-8, not t
<title>Main Iota Binary</title>
<authors>iota</authors>
<projectUrl>https://iota.org/</projectUrl>
<licenseUrl>https://github.com/iotaledger/iota/blob/main/LICENSE</licenseUrl>
<licenseUrl>https://github.com/iotaledger/iota/blob/develop/LICENSE</licenseUrl>
<iconUrl>https://assets-global.website-files.com/6425f546844727ce5fb9e5ab/643775f4a15c9a9e10426daa_Iota_Favicon_256.png</iconUrl>
<projectSourceUrl>https://github.com/iotaledger/iota/</projectSourceUrl>
<bugTrackerUrl>https://github.com/iotaledger/iota/issues</bugTrackerUrl>
Expand Down
2 changes: 1 addition & 1 deletion crates/iota-types/src/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Note: this README file currently covers cryptography-related structs and methods.

Currently, three files are equipped with signature and hashing functionality (`crypto.rs`, `signature_seed` and
`messages.rs`). See [Iota Signatures](https://github.com/iotaledger/iota/blob/main/docs/content/concepts/cryptography/transaction-auth/signatures.mdx) for supported signature schemes and its requirments for user and authority signatures. See [fastcrypto](https://github.com/MystenLabs/fastcrypto) for concrete implementation of various cryptography libraries.
`messages.rs`). See [Iota Signatures](https://github.com/iotaledger/iota/blob/develop/docs/content/concepts/cryptography/transaction-auth/signatures.mdx) for supported signature schemes and its requirments for user and authority signatures. See [fastcrypto](https://github.com/MystenLabs/fastcrypto) for concrete implementation of various cryptography libraries.

## Quick links

Expand Down
Loading

0 comments on commit 42d253c

Please sign in to comment.