Skip to content

Commit

Permalink
Rebase on main to sort out conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
lucas-tortora committed Mar 7, 2024
1 parent f2eca4b commit cfcae20
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 24 deletions.
4 changes: 0 additions & 4 deletions articleRedirects.js
Original file line number Diff line number Diff line change
Expand Up @@ -398,10 +398,6 @@ exports.articleRedirects = [
from: '/shimmer/learn/role-of-token',
to: '/get-started/introduction/shimmer/shimmer-token',
},
{
from: '/shimmer/learn/smart-contracts/smart-contracts-chains',
to: '/isc/explanations/isc-architecture',
},
{
from: '/shimmer/learn/smart-contracts/smart-contracts-community-tutorials',
to: '/learn/smart-contracts/introduction',
Expand Down
2 changes: 1 addition & 1 deletion docs/build/isc/v1.0.0-rc.6/docs/explanations/consensus.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
description: IOTA Smart Contracts consensus is how Layer 2 validators agree to change the chain state in the same way.
image: /img/logo/WASP_logo_dark.png
keywords:
tags:
- smart contracts
- consensus
- validator committee
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
description: There currently are 6 core smart contracts that are always deployed on each chain, root, _default, accounts, blob, blocklog, and governance.
image: /img/banner/banner_wasp_core_contracts_overview.png
keywords:
tags:
- smart contracts
- core
- initialization
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
description: Networks and endpoints in the IOTA ecosystem.
keywords:
tags:
- mainnet
- shimmer
- devnet
- public testnet
- reference
- Endpoints
---

import { AddToMetaMaskButton, EVMNetworks } from '@theme/AddToMetaMaskButton';
import { ChainId } from '@theme/ChainId';

# Networks & Chains

Expand Down
2 changes: 1 addition & 1 deletion docs/build/isc/v1.0.0-rc.6/docs/how-tos/introduction.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
description: 'Explore the how-to guides for IOTA Smart Contracts, offering step-by-step instructions on various topics and functionalities.'
image: /img/logo/WASP_logo_dark.png
keywords:
tags:

- EVM
- Solidity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
description: How to send funds from L1 to L2.
image: /img/logo/WASP_logo_dark.png
keywords:
tags:
- configure
- using
- EVM
Expand Down
2 changes: 1 addition & 1 deletion docs/build/isc/v1.0.0-rc.6/docs/introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
description: 'The current release of IOTA Smart Contracts also has experimental support for EVM/Solidity, providing
limited compatibility with existing smart contracts and tooling from other EVM based chains like Ethereum.'
image: /img/logo/WASP_logo_dark.png
keywords:
tags:

- EVM
- Solidity
Expand Down
4 changes: 2 additions & 2 deletions docs/build/isc/v1.0.0-rc.6/docs/solo/how-tos/invoking-sc.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
description: Invoking smart contracts with on-ledger and off-ledger requests with Solo.
image: /img/tutorial/send_request.png
keywords:
- how-tos
tags:
- how-to
- explanation
- testing
- PostRequestSync
Expand Down
2 changes: 1 addition & 1 deletion docs/learn/smart-contracts/accounts-addresses-and-fees.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
description: An overview of account types, gas costs, and fees in IOTA Smart Contracts for efficient transaction management.
image: /img/logo/WASP_logo_dark.png
keywords:
tags:
- IOTA Smart Contracts
- Accounts and Addresses
- Gas and Fees
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
description: Explore the roles of chain owners, validator nodes, and access nodes in the governance and operation of IOTA Smart Contracts.
image: /img/logo/WASP_logo_dark.png
keywords:
tags:
- IOTA Smart Contracts
- Chain Owners
- Validator Nodes
Expand Down
14 changes: 8 additions & 6 deletions docs/learn/smart-contracts/consensus.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
---
description: An insightful overview of the consensus process in IOTA Smart Contracts, detailing the steps involved in updating the chain.
image: /img/logo/WASP_logo_dark.png
keywords:
- IOTA Smart Contracts
- Consensus Process
- Validator Nodes
- Blockchain Updates
- State Anchor
tags:
- smart contracts
- consensus
- validator committee
- validators
- validator nodes
- explanation
- state anchor
---

# Consensus
Expand Down
2 changes: 1 addition & 1 deletion docs/learn/smart-contracts/protocol-overview.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
description: An overview of the ISC Protocol, detailing the function and interaction of smart contracts, virtual machines, validators, state, and blockchains in IOTA.
image: /img/logo/WASP_logo_dark.png
keywords:
tags:
- ISC Protocol
- IOTA Smart Contracts
- Virtual Machines
Expand Down
2 changes: 1 addition & 1 deletion docs/learn/smart-contracts/smart-contract-execution.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ known as 'gas', varies depending on the complexity and size of the request. User
:::tip Dive Deeper

You can gain a deeper understanding
of [ISC Architecture](/isc/explanations/isc-architecture/) and [smart contract invocation](/isc/explanations/invocation/)
of [ISC Architecture](/isc/introduction#isc-architecture) and [smart contract invocation](/isc/explanations/invocation/)
in the [IOTA Smart Contracts](/isc/introduction) documentation.

:::
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
description: An overview of state management and anchoring in IOTA Smart Contracts, detailing how blockchain state and digital assets are handled and secured.
image: /img/logo/WASP_logo_dark.png
keywords:
tags:
- IOTA Smart Contracts
- State Management
- Blockchain Technology
Expand Down

0 comments on commit cfcae20

Please sign in to comment.