diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1528b9f25d..ba55616af0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -46,7 +46,7 @@ To maintain the quality of content on the developer portal, we use pull requests
Please follow these steps to have your contribution considered by the maintainers:
-1. Follow all instructions in [the template](PULL_REQUEST_TEMPLATE.md)
+1. Follow all instructions in [the template](.github/PULL_REQUEST_TEMPLATE.md)
2. Follow the [styleguides](https://developers.cardano.org/docs/portal-style-guide/)
3. After you submit your pull request, verify that all [status checks](https://help.github.com/articles/about-status-checks/) are passing What if the status checks are failing?
If a status check is failing, and you believe that the failure is unrelated to your change, please leave a comment on the pull request explaining why you believe the failure is unrelated. A maintainer will re-run the status check for you. If we conclude that the failure was a false positive, then we will open an issue to track and resolve that problem.
diff --git a/blog/2021-07-26-july.md b/blog/2021-07-26-july.md
index 14d1518652..0f424c7796 100644
--- a/blog/2021-07-26-july.md
+++ b/blog/2021-07-26-july.md
@@ -50,7 +50,7 @@ The NFT-MAKER is directly responsible for over ⅓ of all Token policies on Card
This makes me so proud because it shows that our approach of putting the user first and lowering the entry barriers is working. So many users' first “real” interaction with a dApp on Cardano was through the NFT-MAKER.
-**_What are your accomplishments so far, and what are you most proud of?_**
+**_Why should people choose to use NFT-MAKER? What are the advantages?_**
To this date, there is no easier way to create NFTs on Cardano. We’re committed to improving this experience even further and building the most accessible decentralized NFT marketplace, not only on Cardano but in the whole crypto space.
diff --git a/blog/2021-09-29-september.md b/blog/2021-09-29-september.md
new file mode 100644
index 0000000000..fb93f433e3
--- /dev/null
+++ b/blog/2021-09-29-september.md
@@ -0,0 +1,110 @@
+---
+slug: 2021-09-20-september
+title: "September Spotlight Interview"
+author: Cardano Foundation
+author_title: Developer Spotlight
+author_url: https://github.com/cardano-foundation
+author_image_url: https://avatars.githubusercontent.com/u/37078161?s=200&v=4
+tags: [payments, interview]
+description: "September Spotlight Interview"
+image: https://developers.cardano.org/img/og-developer-portal.png
+---
+
+![title image](/img/devblog/nowpayments.png)
+
+For the September edition of the Developer Spotlight article, we will interview Kate, the senior marketing manager at NOWPayments.
+
+
+**_Hey Kate! Happy to connect today and learn more about the NOWPayments project! Can you tell us more about the project and what is the problem that you were addressing?_**
+
+Hi, happy to answer your questions!
+
+[NOWPayments](https://nowpayments.io/) was founded in 2019 by the team behind [ChangeNOW](https://changenow.io/), a leading crypto exchange service. NOWPayments remains close partners with ChangeNOW but is fully independent and has its own team.
+
+The idea of NOWPayments was to help spread mass adoption by making it easy to use crypto daily. The challenges merchants face when deciding if they should accept crypto are:
+- Volatility.
+- Lack of knowledge about crypto basics.
+- Lack of means to accept on popular e-commerce platforms.
+- The need to withdraw to fiat.
+
+We try to help solve each of these by offering a fixed-rate option and supporting conversion to stablecoins. In addition, we continue developing plugins that can be integrated with major e-commerce platforms. We also have a fiat conversion option, although we hope it won’t be needed in the future if everyone can use crypto everywhere. That is why we are targeting all industries: e-commerce, services, traveling, gaming, tech, etc. Crypto is ubiquitous.
+
+
+
+
+
+
+
+
+**_What are the most important things about NOWPayments?_**
+
+With pleasure!
+
+One of the most important things is that we are a crypto-to-crypto payment gateway with a [fiat conversion](https://nowpayments.io/fiat). True mass adoption is about accepting and using crypto! Anyone can [accept Cardano payments](https://nowpayments.io/supported-coins/cardano-payments/) anywhere, and we hope that the merchants will hodl and use ada in the future.
+
+NOWPayments is non-custodial, so merchants receive ada in their wallets and are in full control. We do have a fiat conversion option, but we focus on crypto-to-crypto payment, as that’s where true adoption lies.
+
+We pride ourselves on our auto coin exchange feature. That means we process the exchanges ourselves without using third-party exchanges. So even if customers pay with some other crypto, merchants can still accept ada.
+
+Lastly, payments and donations are not the only use cases we contribute to the Cardano ecosystem. For example, we also support [mass payments](https://nowpayments.io/mass-payments), enabling an ada-powered payroll for companies.
+
+
+
+**_Going forward, how will NOWPayments make an impact in the crypto space or on the world?_**
+
+We have many ambitions and plans to make crypto even easier to use and as widespread as possible. Here are some of the things we are going to implement soon.
+
+**Subscriptions:** Selling subscriptions for crypto is a very popular in-demand feature, and we have developed a way to do this.
+
+**New e-commerce plugins:** Recently, we have released a new [Shopware plugin](https://nowpayments.io/payment-integration/shopware-plugin/), but we “never stop, never stopping.” Our plans include Ecwid, Bigcommerce, and many other plugins. We research which e-commerce platforms are popular and in-demand and start working on new plugins to help crypto payments become widespread.
+
+**PoS solutions:** We are helping offline stores explore the benefits of crypto payments. Besides developing ways to integrate with current PoS systems, we are working on an invoices system that merchants can use for their brick-and-mortar stores.
+
+**Mass payments:** We plan on making our [mass payments](https://nowpayments.io/mass-payments) feature even more user-friendly so that it won’t be even a question of whether to use it, but when to use it. People will be able to create mass payments requests right in their NOWPayments account so that the whole process is swift and there are no additional steps.
+
+**Donations:** We have created a way to make a customized [donation link](https://nowpayments.io/donation-tools) right in your account. We are going to perfect that. We are also working on a charity project - featuring charity projects with a donation button underneath them to make it easy to donate. A recent charity project we have partnered with is [Elongate](https://www.elongate.cc/). We also have partnered with [CoinSocialStory](https://coinsocialstory.com/charity) to create a page that would feature charities and an easy way to donate to them. There you can find a way to donate to the Rainforest Foundation.
+
+**More coins:** We are adding new and exciting cryptocurrencies every month. Stay tuned and accept any crypto you like!
+
+
+
+**_What are your accomplishments so far, and what are you most proud of?_**
+
+Two years, and we have 95+ [cryptocurrencies](https://nowpayments.io/supported-coins/), eight [plugins](https://nowpayments.io/payment-tools), 3 APIs, several [donation solutions](https://nowpayments.io/donation-tools), thousands of partners, and incredible friendships in the crypto space.
+
+
+
+**_Why should people choose to use NOWPayments? What are the advantages?_**
+
+- One of our key advantages is auto coin conversion, meaning you don’t have to have multiple wallets for different currencies. Instead, we can auto convert any currency into the ones you want to accept.
+- Pricing is always 0,5% per transaction and 0,5% per exchange if needed.
+- New coins are added every month.
+- Personal account manager.
+- Always ready to customize.
+
+
+
+
+**_What is the future of NOWPayments? For example, what new things to come, and what will it mean for the overall project?_**
+
+The future is bright with possibilities. Our vision of the perfect future is that every store, offline or online, accepts crypto with ease and pays their employee’s salaries in crypto. As a result, they can use it globally and spend it on everything they want. NOWPayments will be proud to have played a role in making that happen.
+
+
+
+**_Tell us about your team. Who are the people behind NOWPayments?_**
+
+Many amazing people are working at NOWPayments and making the dream of Mass Adoption come true. Here are some of them. [Xena Kash](https://www.linkedin.com/in/xena-kash-76b920187/) is our CEO, [Maria Key](https://www.linkedin.com/in/maria-key/) and [Yana Mar](https://www.linkedin.com/in/yanamar/) are our business developers, and I [Kate](https://www.linkedin.com/in/kate-lifshits-1267531b3/) am our senior marketing manager.
+
+
+
+**_Which partnerships have you engaged so far, and which ones are the most impactful?_**
+
+Hundreds of new partners sign up with us every month to start accepting crypto. Some notable partnerships include [Travala](https://travala.com/), a booking service, and [Elongate](https://www.elongate.cc/donate/), a crypto charity project. These two represent two of the most important use cases for crypto: payments and donations.
+
+
+
+**_Thank you for your time! Do you have anything else to add?_**
+
+Thank you for this amazing opportunity! We are thrilled to contribute to the Cardano ecosystem by bringing in more use cases for ada. If there is anything you think we can make easier in terms of payments or donations, please let us know!
+
+
diff --git a/docs/get-started/installing-cardano-wallet.md b/docs/get-started/installing-cardano-wallet.md
index f8cbed71b6..ed7e446c32 100644
--- a/docs/get-started/installing-cardano-wallet.md
+++ b/docs/get-started/installing-cardano-wallet.md
@@ -71,7 +71,7 @@ You can check the latest available version / tag by visiting the `cardano-wallet
We explicitly use the `ghc` version that we installed earlier. This avoids defaulting to a system version of `ghc` that might be newer or older than the one you have installed.
```bash
-cabal configure --with-compiler=ghc-8.10.4 --constraint="random<1.2"
+cabal configure --with-compiler=ghc-8.10.4
```
#### Building and installing the node
diff --git a/docs/get-started/running-cardano.md b/docs/get-started/running-cardano.md
index 8faaef5ddd..9037794363 100644
--- a/docs/get-started/running-cardano.md
+++ b/docs/get-started/running-cardano.md
@@ -24,6 +24,7 @@ The `cardano-node` application requires at least four configuration files to run
- **Main Config**: It contains general node settings such as **logging** and **versioning**. It also points to the **Byron Genesis** and the **Shelly Genesis** file.
- **Byron Genesis**: It contains the initial protocol parameters and instructs the `cardano-node` on how to bootstrap the **Byron Era** of the **Cardano** blockchain.
- **Shelly Genesis**: It contains the initial protocol parameters and instructs the `cardano-node` on how to bootstrap the **Shelly Era** of the **Cardano** blockchain.
+- **Alonzo Genesis**: It contains the initial protocol parameters and instructs the `cardano-node` on how to bootstrap the **Shelly Era** of the **Cardano** blockchain.
- **Topology**: It contains the list of network peers (**`IP Address` and `Port` of other nodes running the blockchain network**) that your node will connect to.
:::important
@@ -40,10 +41,11 @@ You can obtain the current **Cardano** blockchain network configuration files he
**NetworkMagic**: `764824073`
```
-https://hydra.iohk.io/build/7191656/download/1/mainnet-config.json
-https://hydra.iohk.io/build/7191656/download/1/mainnet-byron-genesis.json
-https://hydra.iohk.io/build/7191656/download/1/mainnet-shelley-genesis.json
-https://hydra.iohk.io/build/7191656/download/1/mainnet-topology.json
+https://hydra.iohk.io/build/7370192/download/1/mainnet-config.json
+https://hydra.iohk.io/build/7370192/download/1/mainnet-byron-genesis.json
+https://hydra.iohk.io/build/7370192/download/1/mainnet-shelley-genesis.json
+https://hydra.iohk.io/build/7370192/download/1/mainnet-alonzo-genesis.json
+https://hydra.iohk.io/build/7370192/download/1/mainnet-topology.json
```
#### Testnet / Sandbox
@@ -54,6 +56,7 @@ https://hydra.iohk.io/build/7191656/download/1/mainnet-topology.json
https://hydra.iohk.io/job/Cardano/cardano-node/cardano-deployment/latest-finished/download/1/testnet-config.json
https://hydra.iohk.io/job/Cardano/cardano-node/cardano-deployment/latest-finished/download/1/testnet-byron-genesis.json
https://hydra.iohk.io/job/Cardano/cardano-node/cardano-deployment/latest-finished/download/1/testnet-shelley-genesis.json
+https://hydra.iohk.io/job/Cardano/cardano-node/cardano-deployment/latest-finished/download/1/testnet-alonzo-genesis.json
https://hydra.iohk.io/job/Cardano/cardano-node/cardano-deployment/latest-finished/download/1/testnet-topology.json
```
@@ -147,6 +150,7 @@ We will focus on six key command-line parameters for running a node:
```
/home/user/cardano/
├── db
+├── testnet-alonzo-genesis.json
├── testnet-byron-genesis.json
├── testnet-config.json
├── testnet-shelley-genesis.json
@@ -195,7 +199,7 @@ We will focus on six key command-line parameters for running a node:
```
--config /home/user/cardano/testnet-config.json
```
-> Please make sure that the `byron-genesis.json` and `shelley-genesis.json` are in the same directory as the `config.json`.
+> Please make sure that the `alonzo-genesis.json`, `byron-genesis.json` and `shelley-genesis.json` are in the same directory as the `config.json`.
Here is a realistic example for running `cardano-node`:
diff --git a/docs/integrate-cardano/creating-wallet-faucet.md b/docs/integrate-cardano/creating-wallet-faucet.md
index d62721ae0c..39a6c2d510 100644
--- a/docs/integrate-cardano/creating-wallet-faucet.md
+++ b/docs/integrate-cardano/creating-wallet-faucet.md
@@ -175,15 +175,12 @@ Now that we have a **wallet address**, we can then query the **UTXO** of the add
```bash
cardano-cli query utxo \
---mary-era \
--testnet-magic 1097911063 \
--address $(cat /home/user/cardano/keys/payment1.addr)
```
- `cardano-cli query utxo` : Queries the wallet address **UTXO**.
-- `--mary-era` : Specifies that we want to query using the **Mary Era** rules.
-
- `--testnet-magic 1097911063` : Specifies that we want to query the `testnet` **Cardano** network.
- `--address $(cat /home/user/cardano/keys/payment1.addr)` : The **wallet address** string value that we want to query, In this case we read the contents of `/home/user/cardano/keys/payment1.addr` using the `cat` command and we pass that value to the `--address` flag. That means you could also directly paste the **wallet address** value like so:
@@ -265,7 +262,6 @@ Querying the **UTXO** for the second wallet `payment2.addr` should give you a fa
```bash
cardano-cli query utxo \
---mary-era \
--testnet-magic 1097911063 \
--address $(cat /home/user/cardano/keys/payment2.addr)
```
@@ -304,7 +300,6 @@ We start by storing the current on-chain protocol parameters to a **JSON** file:
```bash
cardano-cli query protocol-parameters \
--testnet-magic 1097911063 \
- --mary-era \
--out-file /home/user/cardano/protocol.json
```
This will produce a **JSON** file that looks something like this:
@@ -345,7 +340,6 @@ cardano-cli transaction build-raw \
--tx-in cf3cf4850c8862f2d698b2ece926578b3815795c9e38d2f907280f02f577cf85#0 \
--tx-out $(cat /home/user/cardano/keys/payment2.addr)+0 \
--tx-out $(cat /home/user/cardano/keys/payment1.addr)+0 \
---mary-era \
--fee 0 \
--out-file /home/user/cardano/tx.draft
```
@@ -394,7 +388,6 @@ cardano-cli transaction build-raw \
--tx-in cf3cf4850c8862f2d698b2ece926578b3815795c9e38d2f907280f02f577cf85#0 \
--tx-out $(cat /home/user/cardano/keys/payment2.addr)+250000000 \
--tx-out $(cat /home/user/cardano/keys/payment1.addr)+749825831 \
---mary-era \
--fee 174169 \
--out-file /home/user/cardano/tx.draft
```
@@ -466,14 +459,14 @@ Checking the balances of both wallets `payment1` and `payment2`:
```bash
# payment1 wallet UTXO
-❯ cardano-cli query utxo --mary-era --testnet-magic 1097911063 --address $(cat ~/cardano/keys/payment1.addr)
+❯ cardano-cli query utxo --testnet-magic 1097911063 --address $(cat ~/cardano/keys/payment1.addr)
TxHash TxIx Amount
--------------------------------------------------------------------------------------
63eeeb7e43171aeea0b3d53c5a36236cf9af92d5ee39e99bfadfe0237c46bd91 1 749825303 lovelace
# payment2 wallet UTXO
-❯ cardano-cli query utxo --mary-era --testnet-magic 1097911063 --address $(cat ~/cardano/keys/payment2.addr)
+❯ cardano-cli query utxo --testnet-magic 1097911063 --address $(cat ~/cardano/keys/payment2.addr)
TxHash TxIx Amount
--------------------------------------------------------------------------------------
63eeeb7e43171aeea0b3d53c5a36236cf9af92d5ee39e99bfadfe0237c46bd91 0 250000000 lovelace
diff --git a/searchconfig.json b/searchconfig.json
index f978f4d58b..9c20483948 100644
--- a/searchconfig.json
+++ b/searchconfig.json
@@ -5,6 +5,7 @@
"https://developers.cardano.org/docs/integrate-cardano/",
"https://developers.cardano.org/docs/transaction-metadata/",
"https://developers.cardano.org/docs/native-tokens/",
+ "https://developers.cardano.org/docs/smart-contracts/",
"https://developers.cardano.org/docs/fund-your-project/",
"https://developers.cardano.org/docs/operate-a-stake-pool/",
"https://developers.cardano.org/tools",
diff --git a/src/data/builder-tools.js b/src/data/builder-tools.js
index 05bdabea46..724b6159a2 100644
--- a/src/data/builder-tools.js
+++ b/src/data/builder-tools.js
@@ -49,6 +49,22 @@ export const Tags = {
icon: null,
},
+ // Marlowe
+ marlowe: {
+ label: "Marlowe",
+ description:
+ "Marlowe",
+ icon: null,
+ },
+
+ // Plutus
+ plutus: {
+ label: "Plutus",
+ description:
+ "Plutus",
+ icon: null,
+ },
+
// Stake Pool Operator Tools
operatortool: {
label: "Operator Tools",
@@ -178,6 +194,22 @@ const Showcases = [
getstarted: null,
tags: ["library", "api"],
},
+ {
+ title: "Plutus Playground",
+ description: "The Plutus Playground is a lightweight, web-based environment for exploratory Plutus development.",
+ preview: require("./builder-tools/plutus-playground.png"),
+ website: "https://playground.plutus.iohkdev.io",
+ getstarted: "/docs/smart-contracts/plutus#plutus-playground",
+ tags: ["featured", "getstarted", "plutus"],
+ },
+ {
+ title: "Marlowe Playground",
+ description: "In the browser-based Marlowe Playground you can write Marlowe contracts, in a variety of different ways.",
+ preview: require("./builder-tools/marlowe-playground.png"),
+ website: "https://alpha.marlowe.iohkdev.io/#/",
+ getstarted: "/docs/smart-contracts/marlowe#marlowe-playground",
+ tags: ["featured", "getstarted", "marlowe"],
+ },
];
diff --git a/static/img/devblog/nowpayments.png b/static/img/devblog/nowpayments.png
new file mode 100644
index 0000000000..53ee03205e
Binary files /dev/null and b/static/img/devblog/nowpayments.png differ
diff --git a/yarn.lock b/yarn.lock
index 5bf1fc6420..9bad5e97f0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2477,11 +2477,11 @@ autoprefixer@^10.2.0, autoprefixer@^10.2.5:
postcss-value-parser "^4.1.0"
axios@^0.21.1:
- version "0.21.1"
- resolved "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz"
- integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
+ version "0.21.4"
+ resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
+ integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
dependencies:
- follow-redirects "^1.10.0"
+ follow-redirects "^1.14.0"
babel-loader@^8.2.2:
version "8.2.2"
@@ -4407,10 +4407,10 @@ flux@^4.0.1:
fbemitter "^3.0.0"
fbjs "^3.0.0"
-follow-redirects@^1.0.0, follow-redirects@^1.10.0:
- version "1.13.2"
- resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz"
- integrity sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==
+follow-redirects@^1.0.0, follow-redirects@^1.14.0:
+ version "1.14.3"
+ resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.3.tgz#6ada78118d8d24caee595595accdc0ac6abd022e"
+ integrity sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw==
for-in@^1.0.2:
version "1.0.2"