Skip to content

Commit

Permalink
Merge branch 'main' into amar-update-deps-3-to-5
Browse files Browse the repository at this point in the history
  • Loading branch information
4meta5 authored Feb 1, 2024
2 parents 32656c7 + c7f96fe commit 4dd5dd8
Show file tree
Hide file tree
Showing 3 changed files with 818 additions and 0 deletions.
1 change: 1 addition & 0 deletions docs/modules/ROOT/nav.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
** xref:pallets/aura_ext.adoc[cumulus_pallet_aura_ext]
** xref:pallets/parachain-system.adoc[cumulus_pallet_parachain_system]
** xref:pallets/xcmp-queue.adoc[cumulus_pallet_xcmp_queue]
** xref:pallets/assets.adoc[pallet_assets]
** xref:pallets/balances.adoc[pallet_balances]
** xref:pallets/message-queue.adoc[pallet_message_queue]
** xref:pallets/multisig.adoc[pallet_multisig]
Expand Down
16 changes: 16 additions & 0 deletions docs/modules/ROOT/pages/glossary.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ Asset Teleportation is a movement of an asset by destroying it on one side and c

A generic filter which returns whether or not XCM may pass and be executed. If they do not pass the barrier, they are not executed. The barrier is the final filter before XCM execution. It implements the `ShouldExecute` trait and therefore takes as input an XCM and returns a bool indicating whether it should be executed.

=== Burning

The process of destroying existing assets.

== C

=== Candidacy Bond
Expand Down Expand Up @@ -55,6 +59,10 @@ Delegator is an account that granted call execution rights with <<proxy>> creati

An asset where any unit of it worth the same. Opposite of <<nonfungible_asset>>

=== NonFungible Asset

An asset meaning that it is not interchangeable with other assets of the same type. For example, a non-fungible asset could be an NFT, while a fungible asset could be a currency token.

== H

=== Hold
Expand Down Expand Up @@ -93,6 +101,10 @@ Nearly the same as `<<Hold>>`, with 2 major differences:

== M

=== Minting

The process of creating new assets.

=== MultiAsset

Either an amount of a single fungible asset, or one non-fungible asset.
Expand Down Expand Up @@ -137,6 +149,10 @@ When consensus systems do not have a established layer of trust over which they

== T

=== Thawing

The process of unfreezing an asset after being frozen.

=== Tip

An optional tip. Tip increases the priority of the transaction, giving it a higher chance to be included by the transaction queue.
Expand Down
Loading

0 comments on commit 4dd5dd8

Please sign in to comment.