Skip to content
This repository has been archived by the owner on Apr 8, 2022. It is now read-only.

The new version of Tokens #82

Merged
merged 61 commits into from
Nov 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
89effd9
Removed the old header.rs, now TxOutputHeader turn into Enum
sinitcin Sep 30, 2021
f42ac62
Added possibility to create a NFT, and removed old TxHeader
sinitcin Oct 4, 2021
aad0bc3
RPC for reading a NFT has been added
sinitcin Oct 4, 2021
9a10db2
Fixed compilation error
sinitcin Oct 4, 2021
7e0cd95
Fixed test
sinitcin Oct 4, 2021
9441a76
Added serialization of fields that related to NFT
sinitcin Oct 5, 2021
b3d4247
Removed unwraps from sr25519_sign fn
sinitcin Oct 5, 2021
847bf4d
Removed RPC calls `tokens_list` and `nft_read`. TokenList now turned …
sinitcin Oct 5, 2021
7e3afd1
Merge remote-tracking branch 'origin/staging' into nft
sinitcin Oct 19, 2021
fa89a24
Merge remote-tracking branch 'origin/staging' into nft
sinitcin Oct 19, 2021
1a77c9c
Added the new data field
sinitcin Oct 21, 2021
717600c
I've been making refactoring, removed TokenList, added a new storage …
sinitcin Oct 21, 2021
216a5ee
Added draft of TransactionVerifier. Value in the PointerToIssueToken …
sinitcin Oct 24, 2021
e0e22e4
We need to make an approach to verification
sinitcin Oct 25, 2021
eb2d6d3
Added the first test for tokens - checking_tokens_issuance
sinitcin Oct 25, 2021
dfecda3
Added checking for signature and for tokens amount.
sinitcin Oct 25, 2021
7a6d68b
Added a couple a token creation tests. Added calculating_reward amd c…
sinitcin Oct 25, 2021
8fb97b7
Added a few new tests for token creation, transferring, and minting nft
sinitcin Oct 28, 2021
958573a
Changed std::convert::TryFrom to sp_std.
sinitcin Oct 28, 2021
edd65e3
Merge remote-tracking branch 'origin/timelock' into nft
sinitcin Oct 28, 2021
4abe164
Fixed conflicts after merge
sinitcin Oct 28, 2021
af752d0
Merge remote-tracking branch 'origin/staging' into nft
sinitcin Oct 28, 2021
96f73fb
Cleaned up comments
sinitcin Oct 28, 2021
1340d71
Removed unnecessary enumerate() functions and fixed misprints
sinitcin Oct 28, 2021
b1cdc5e
Deleted AssetId
sinitcin Oct 28, 2021
ae9e26f
Fixed names, comments, and removed impl ss58Codec
sinitcin Oct 29, 2021
89be57b
Added base58Check functions and then created the lib base58_nostd in …
sinitcin Nov 1, 2021
008f7a3
Removed verifier and TokenId::mlt(), changed names, split tests for t…
sinitcin Nov 2, 2021
6f858ab
On build server installed rust 1.55.0-nightly where `edition=2021` is…
sinitcin Nov 2, 2021
a4d1274
Changed b58 to b58check for the string representation of TokenID
sinitcin Nov 2, 2021
3f6982e
Changed in comments `Spend` to `Submit` in tests.rs
sinitcin Nov 2, 2021
4447723
Added additional checks for the token_id in issuance.
sinitcin Nov 2, 2021
9ae9766
Changed type from u128 to Value in the OutputData enum
sinitcin Nov 2, 2021
8b54149
Added cases into test_token_transfer
sinitcin Nov 2, 2021
9d66a29
Added additional checks for the data_hash of NFT
sinitcin Nov 2, 2021
ca84123
Removed - test "Creation a token with a pre-existing ID or re-creatio…
sinitcin Nov 4, 2021
090bace
Fixed unit tests
sinitcin Nov 5, 2021
b632df1
Merge remote-tracking branch 'origin/staging' into nft
sinitcin Nov 5, 2021
cea04cc
Fixed conflict after merge
sinitcin Nov 5, 2021
7af916b
Fixed conflict after merge
sinitcin Nov 5, 2021
4290624
Changed links from facebook.com to mintlayer.org
sinitcin Nov 5, 2021
26a5251
Fixed existing functional tests due to changes in the TransactionOutp…
sinitcin Nov 6, 2021
4842067
Added more tests for b58 include external data and data generated fro…
sinitcin Nov 7, 2021
fd3f582
Returned lost comment about race conditions
sinitcin Nov 7, 2021
806f42e
Added a new test: test_transfer_and_issuance_in_one_tx.
sinitcin Nov 7, 2021
ead1b52
Fixed types for the UI in utxo Readme.
sinitcin Nov 7, 2021
4048d12
Added a new test: test_transfer_for_multiple_tokens. Changed custom-t…
sinitcin Nov 7, 2021
4fd736f
Merge remote-tracking branch 'origin/staging' into nft
sinitcin Nov 7, 2021
00aa8c5
Fixed tests, now position of checks in validation function do not aff…
sinitcin Nov 8, 2021
8c74ab2
Merge remote-tracking branch 'origin/staging' into nft
sinitcin Nov 8, 2021
4af552b
Fixed after merg with Carla's code
sinitcin Nov 8, 2021
953a1c7
rewards_and_staking: fix `non_mlt_staking()` test case
b-yap Nov 8, 2021
b109e27
Merge pull request #97 from mintlayer/mft_fix_staking_test
TheQuantumPhysicist Nov 8, 2021
4803ffa
Fixed test_reward
sinitcin Nov 8, 2021
9ecbb44
Fixed unit tests after increasing genesis value for accounts
sinitcin Nov 8, 2021
0ca12d9
Fixed Carla's functional tests
sinitcin Nov 8, 2021
bd41c31
Fixed a few more functional tests
sinitcin Nov 8, 2021
4985d7b
Fixed one more functional test
sinitcin Nov 8, 2021
d7e2e7a
Stuck on broken test feature_staking_first_time.py
sinitcin Nov 8, 2021
4d258e6
rewards_staking: fix the issue of exceeding u64 value of transaction fee
b-yap Nov 9, 2021
5d38367
Merge pull request #100 from mintlayer/nft_fix_functional_test
TheQuantumPhysicist Nov 9, 2021
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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
# Intellij IDEA
.idea/
*.iml
/customSpec.json

# VSCode
.vscode/
Expand All @@ -27,3 +28,6 @@ test/config.ini

# direnv cache
.direnv

# Python compiled files
*.pyc
28 changes: 12 additions & 16 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions libs/base58_nostd/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
[package]
name = "base58_nostd"
version = "0.1.0"
edition = "2018"
authors = ["Anton Sinitsyn <[email protected]>"]
description = "Encodes and decodes the Bech32 format"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies.frame-support]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
version = '4.0.0-dev'
branch = "master"

[dependencies.sp-std]
default-features = false
git = 'https://github.com/paritytech/substrate.git'
version = '4.0.0-dev'
branch = "master"

[features]
default = ['std']
testcontext = []
std = [
"sp-std/std",
"frame-support/std",
]
Loading