Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ISC - Restructure and Edit docs #1166

Merged
merged 40 commits into from
Sep 22, 2023
Merged
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
f7ae3bb
initial sorting
lucas-tortora Sep 5, 2023
1cbd2eb
initial sorting
lucas-tortora Sep 11, 2023
de597ac
apply diataxis 1
lucas-tortora Sep 11, 2023
622e78b
* change switcher labels
lucas-tortora Sep 11, 2023
787226c
* edit learn
lucas-tortora Sep 12, 2023
04e8f80
revert unwanted change
lucas-tortora Sep 12, 2023
5f256d8
format
lucas-tortora Sep 12, 2023
0685c6d
initial sorting
lucas-tortora Sep 5, 2023
ca1c7c2
initial sorting
lucas-tortora Sep 11, 2023
ad6c345
apply diataxis 1
lucas-tortora Sep 11, 2023
47171d2
* change switcher labels
lucas-tortora Sep 11, 2023
70bd8dd
* edit learn
lucas-tortora Sep 12, 2023
2a7e0ce
revert unwanted change
lucas-tortora Sep 12, 2023
d8c1b88
format
lucas-tortora Sep 12, 2023
723e53d
Merge remote-tracking branch 'origin/ISC/restructure-docs' into ISC/r…
lucas-tortora Sep 12, 2023
e5d757f
add admonition that was lost in rebase
lucas-tortora Sep 12, 2023
e9fdaf8
fix redirect
lucas-tortora Sep 12, 2023
e33f190
fix redirect
lucas-tortora Sep 12, 2023
58d3a5c
fix redirect
lucas-tortora Sep 12, 2023
bd67bdc
reduce Wasm intro content
lucas-tortora Sep 12, 2023
de3401e
fix link
lucas-tortora Sep 12, 2023
75aa9a7
edit wasm, damn it's long.
lucas-tortora Sep 12, 2023
af9773a
fix links
lucas-tortora Sep 13, 2023
86bebac
fix links to /smart-contracts
lucas-tortora Sep 13, 2023
dca3dd5
more dead links
lucas-tortora Sep 13, 2023
eab908c
add redirects
lucas-tortora Sep 13, 2023
71a608e
fixes
lucas-tortora Sep 13, 2023
8b37d1c
feedback
lucas-tortora Sep 13, 2023
c0f3985
edit wasp and wasp cli
lucas-tortora Sep 13, 2023
7a8342f
fix frontmatter
lucas-tortora Sep 13, 2023
6dd0190
Apply suggestions from code review
lucas-tortora Sep 14, 2023
af936ff
Apply suggestions from code review
lucas-tortora Sep 14, 2023
e8a99c7
Addressed comments by luca-mose
lucas-tortora Sep 14, 2023
49ab27d
format
lucas-tortora Sep 14, 2023
9fced5d
correct spelling of inccounter contract
lucas-tortora Sep 14, 2023
467c222
Apply suggestions from code review
lucas-tortora Sep 20, 2023
b5df882
merge from main to resolve conflicts
lucas-tortora Sep 22, 2023
9da336b
add core conctracts to EVM as well
lucas-tortora Sep 22, 2023
e5a1bfe
format
lucas-tortora Sep 22, 2023
01bbc85
add explanations and how tos relevant to core contracts
lucas-tortora Sep 22, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix links to /smart-contracts
lucas-tortora committed Sep 13, 2023
commit 86bebac76b210109520ae2065ea532ef397444d6
4 changes: 2 additions & 2 deletions docs/build/getting-started/welcome.md
Original file line number Diff line number Diff line change
@@ -46,9 +46,9 @@ any object in a GDPR-compliant, cost-efficient, and privacy-enabling manner.

### Smart Contracts

The [IOTA Smart Contracts (ISC)](/smart-contracts/overview) bring scalable, flexible, and cost-effective smart
The [IOTA Smart Contracts (ISC)](/learn/smart-contracts/introduction) bring scalable, flexible, and cost-effective smart
contract functionality to the IOTA ecosystem. By anchoring multiple chains to the IOTA Tangle, ISC enables
higher throughput and lower fees than traditional single-chain solutions. Users have the freedom to create custom
chains with control over gas fees and privacy settings, and the platform is virtual machine-agnostic, supporting both
[Rust/Wasm](/smart-contracts/guide/wasm_vm/intro) and [Solidity/EVM](/smart-contracts/guide/evm/introduction)
[Rust/Wasm](/wasp-wasm/introduction) and [Solidity/EVM](/wasp-evm/introduction)
smart contracts.
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ image: /img/logo/preview.png
The previous IOTA protocol, Chrysalis, was optimized for a single application: sending digital money from A to B.
The upcoming Stardust upgrade introduces computation and utility to the ledger:

- Making IOTA an **infrastructure and settlement layer** for [second-layer smart contract chains](/smart-contracts/overview) using [IOTA Smart Contracts (ISC)](#isc).
- Making IOTA an **infrastructure and settlement layer** for [second-layer smart contract chains](/learn/smart-contracts/introduction/) using [IOTA Smart Contracts (ISC)](#isc).
- Transforming IOTA into a **multi-asset ledger** with custom, user-defined tokens using the new [tokenization framework](#tokenization-framework).

## Tokenization Framework
2 changes: 1 addition & 1 deletion docs/build/introduction-docs/stardust/docs/welcome.md
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ image: /img/logo/preview.png

# Welcome

Stardust protocol is the successor to IOTA 1.5, also known as [Chrysalis](/introduction/welcome), that transforms IOTA into a multi-asset ledger and enables the operation of [IOTA Smart Contracts](/smart-contracts/overview). This page outlines the new concepts
Stardust protocol is the successor to IOTA 1.5, also known as [Chrysalis](/introduction/welcome), that transforms IOTA into a multi-asset ledger and enables the operation of [IOTA Smart Contracts](/learn/smart-contracts/introduction/). This page outlines the new concepts
and differences compared to Chrysalis, furthermore gives an overview of different components of the IOTA technology stack.

Stardust debuts on [Shimmer](https://shimmer.network/), the new staging network for IOTA, before being fully supported on the IOTA Mainnet.
2 changes: 1 addition & 1 deletion docs/build/wasp-evm/0.7.0/docs/how-tos/ERC721.md
Original file line number Diff line number Diff line change
@@ -144,7 +144,7 @@ task. If you are using hardhat or truffle, you should customize the config file
### Connect to the ISC Testnet

You can find instructions on this in
the [testnet endpoints section](/smart-contracts/testnet#endpoints).
the [testnet endpoints section](/build/networks-endpoints/#testnet-evm).

### Change the Environment to Injected Web3

Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ The Agent ID of the common account is `<hname=0>@<address zero (0x00000...)>`.

### Ethereum Address

An L2 account can also be owned by an Ethereum address. See [EVM](/smart-contracts/guide/evm/introduction) for more information.
An L2 account can also be owned by an Ethereum address. See [EVM](/wasp-evm/introduction/) for more information.
The Agent ID of an Ethereum address is just the address prefixed with `0x`,
e.g. `0xd36722adec3edcb29c8e7b5a47f352d701393462`.

Original file line number Diff line number Diff line change
@@ -20,11 +20,11 @@ keywords:
The `evm` contract is one of the [core contracts](overview.md) on each IOTA Smart Contracts chain.

The `evm` core contract provides the necessary infrastructure to accept Ethereum transactions and execute EVM code.
It also includes the implementation of the [ISC Magic contract](/smart-contracts/guide/evm/magic).
It also includes the implementation of the [ISC Magic contract](/wasp-evm/how-tos/magic-contract/magic).

:::note

For more information about how ISC supports EVM contracts, refer to the [EVM](/smart-contracts/guide/evm/introduction) section.
For more information about how ISC supports EVM contracts, refer to the [EVM](/wasp-evm/introduction/) section.

:::

6 changes: 3 additions & 3 deletions docs/build/wasp-wasm/0.7.0/docs/tutorials/fair_roulette.md
Original file line number Diff line number Diff line change
@@ -95,7 +95,7 @@ To interact with a smart contract, you will need:

The PoC consists of two projects residing in `contracts/wasm/fairroulette`.

One is the smart contract itself. Its boilerplate was generated using the new [Schema tool](/smart-contracts/guide/wasm_vm/intro) which is shipped with this beta release.
One is the smart contract itself. Its boilerplate was generated using the new [Schema tool](/wasp-wasm/introduction/) which is shipped with this beta release.
The contract logic is written in Rust, but the same implementation can be achieved
interchangeably with Golang and Assemblyscript which is demonstrated in the root folder
and `./src`.
@@ -232,13 +232,13 @@ This transaction also requires an address to send the request to, and also a var
For Wasp, the address to send funds to is the chainId.
:::

See: [Invoking](/smart-contracts/guide/solo/invoking-sc)
See: [Invoking](/wasp-wasm/how-tos/solo/invoking-sc)

##### CallView

The [callView](https://github.com/iotaledger/wasp/blob/7b3ddc54891ccf021c7aaa32db35d88361fade16/contracts/wasm/fairroulette/frontend/src/lib/fairroulette_client/fair_roulette_service.ts#L165) function is responsible for calling smart contract view functions.

See: [Calling a view](/smart-contracts/guide/solo/view-sc)
See: [Calling a view](/wasp-wasm/how-tos/solo/view-sc)

To give access to the smart contracts state, you can use view functions to return selected parts of the state.

2 changes: 1 addition & 1 deletion docs/maintain/wasp/0.7.0/docs/metrics.md
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ keywords:

# Exposed Metrics

You can see all exposed metrics at our [metrics endpoint](https://wasp.sc.iota.org/metrics). Refer to the [testnet endpoints description](/smart-contracts/testnet#endpoints) for access details.
Refer to the [testnet endpoints description](/build/networks-endpoints/#testnet-evm) for access details.

| Metric | Description |
| ------------------------------------------ | ----------------------------------------------------- |
2 changes: 1 addition & 1 deletion tutorials/pages/shimmerevm-dapp-voting.md
Original file line number Diff line number Diff line change
@@ -283,7 +283,7 @@ Please make a note of the ABI while you're compiling it. You will need it later.

Most of the front end is design work which is not the focus of this tutorial, so let's jump to the js part. You can use [this project](https://github.com/anistark/smart-contracts-demo/tree/main/voting) if you're looking for a ready design to get started. Feel free to make changes to the design to suit your needs.

We will also use [Metamask](/smart-contracts/guide/evm/tooling/#metamask) in this section, so please ensure you have installed and logged in to Metamask.
We will also use [Metamask](/wasp-evm/getting-started/compatible-tools) in this section, so please ensure you have installed and logged in to Metamask.
The first thing you need to do is check that Metamask is accessible from your dApp:

```javascript!
2 changes: 1 addition & 1 deletion tutorials/pages/shimmerevm-setup.md
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ In this tutorial, we will connect to Shimmer EVM Testnet, connect Metamask to it

## Connect to Shimmer EVM Testnet

First, let's setup our Metamask with the EVM. For this exercise, we will use the testnet EVM chain. You can find all endpoints [here](/smart-contracts/testnet).
First, let's setup our Metamask with the EVM. For this exercise, we will use the testnet EVM chain. You can find all endpoints [here](/build/networks-endpoints/#testnet-evm).

Add a new network on your Metamask, as shown below: