Skip to content

Commit 5526cd6

Browse files
committed
Merge branch 'master' into 0xlucca/merge-master
2 parents 13c471c + 6347bfe commit 5526cd6

File tree

16 files changed

+1856
-136
lines changed

16 files changed

+1856
-136
lines changed

.snippets/code/Cargo.lock

Lines changed: 1742 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<div id="termynal" data-termynal>
2+
<span data-ty="input"><span class="file-path"></span>polkadot</span>
3+
<span data-ty>2021-06-17 03:07:07 Idle (0 peers), best: #0 (0x3fd7...5baf), finalized #0 (0x3fd7...5baf), ⬇ 2.9kiB/s ⬆ 3.7kiB/s</span>
4+
<span data-ty>2021-06-17 03:07:12 Idle (0 peers), best: #0 (0x3fd7...5baf), finalized #0 (0x3fd7...5baf), ⬇ 1.7kiB/s ⬆ 2.0kiB/s</span>
5+
<span data-ty>2021-06-17 03:07:17 Idle (0 peers), best: #0 (0x3fd7...5baf), finalized #0 (0x3fd7...5baf), ⬇ 0.9kiB/s ⬆ 1.2kiB/s</span>
6+
<span data-ty>2021-06-17 03:07:19 Libp2p => Random Kademlia query has yielded empty results</span>
7+
<span data-ty>2021-06-17 03:08:00 Idle (0 peers), best: #0 (0x3fd7...5baf), finalized #0 (0x3fd7...5baf), ⬇ 1.6kiB/s ⬆ 1.9kiB/s</span>
8+
<span data-ty>2021-06-17 03:08:05 Idle (0 peers), best: #0 (0x3fd7...5baf), finalized #0 (0x3fd7...5baf), ⬇ 0.6kiB/s ⬆ 0.9kiB/s</span>
9+
<span data-ty>...</span>
10+
</div>

.snippets/code/tutorials/polkadot-sdk/parachains/zero-to-hero/pallets/custom-pallet/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,10 @@ mod benchmarking;
3333
pub mod weights;
3434
use crate::weights::WeightInfo;
3535

36-
3736
#[frame::pallet]
3837
pub mod pallet {
3938
use super::*;
4039
use frame::prelude::*;
41-
4240
#[pallet::pallet]
4341
pub struct Pallet<T>(_);
4442

.snippets/code/tutorials/polkadot-sdk/parachains/zero-to-hero/pallets/template/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
## Release
44

5-
Polkadot SDK Stable 2412
5+
Polkadot SDK Stable 2412

.snippets/code/tutorials/polkadot-sdk/parachains/zero-to-hero/runtime/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ pub mod opaque {
145145
generic,
146146
traits::{BlakeTwo256, Hash as HashT},
147147
};
148-
aster
149148
/// Opaque block header type.
150149
pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
151150
/// Opaque block type.

develop/smart-contracts/index.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,19 @@ Follow this step-by-step process to develop and deploy smart contracts in the Po
3535

3636
[:octicons-arrow-right-24: Reference](https://use.ink/){target=\_blank}
3737

38+
<div class="subsection-wrapper">
39+
<div class="card">
40+
<a href="https://use.ink/" target="_blank">
41+
<h2 class="title">View the Official ink! Documentation</h2>
42+
<hr>
43+
<p class="description">Learn everything you need to know about developing smart contracts with ink!.</p>
44+
</a>
45+
</div>
46+
<!-- This content is temporarily hidden and has been commented out to ensure it is preserved. -->
47+
<!-- <div class="card">
48+
<a href="https://contracts.polkadot.io/" target="_blank">
49+
<h2 class="title">View the Official Asset Hub Contracts Documentation</h2>
50+
<p class="description">Learn everything you need about developing smart contracts on Asset Hub using the PolkaVM.</p>
51+
</a>
52+
</div> -->
3853
</div>

develop/toolkit/api-libraries/.pages

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ nav:
66
- 'Dedot': dedot.md
77
- 'Sidecar Rest API': sidecar.md
88
- 'Python Substrate Interface': py-substrate-interface.md
9-
- 'Subxt': subxt.md
9+
- 'Subxt': subxt.md

develop/toolkit/interoperability/asset-transfer-api/reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ Fetch estimated fee information for an extrinsic.
260260
```
261261

262262
For more information on the underlying types and fields of `RuntimeDispatchInfoV1`, check the [`RuntimeDispatchInfoV1`](https://github.com/polkadot-js/api/blob/{{dependencies.javascript_packages.asset_transfer_api.polkadot_js_api_version}}/packages/types/src/interfaces/payment/types.ts#L28){target=\_blank} source code.
263-
263+
264264
??? interface "Example"
265265

266266
***Request***
-32.1 KB
Loading
20.5 KB
Loading

0 commit comments

Comments
 (0)