Skip to content

Commit

Permalink
v1.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@ansigroup
ansigroup committed Sep 26, 2019
1 parent 5b24990 commit 891c3bc
Show file tree
Hide file tree
Showing 9 changed files with 1,184 additions and 492 deletions.
26 changes: 26 additions & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,32 @@ if(EOSIO_CDT_ROOT STREQUAL "" OR NOT EOSIO_CDT_ROOT)
find_package(eosio.cdt)
endif()

set(ICON_BASE_URL "https://cryptolions.io/assets/images/sa-icons-256")

set(ATTACH_ICON_URI "attach.png#0b039adbbe1011a494959963917df4765dbae378004e00911464f865e58ef452")
set(ATTACHF_ICON_URI "attachf.png#2d190203c6ae474e01cd70963c82a54cb542d95e29174e7572acb8c7653d8a8c")
set(AUTHORUPDATE_ICON_URI "authorupdate.png#0b11c9c4e41b6ba1b00bd907c671f7ddc9e2f9caf26580f0b2e7c73e02f36ff3")
set(BURN_ICON_URI "burn.png#76954820d84563187e968b461a706ab089a9c00f5332df96a4e5bb2e69ed5e84")
set(CANCELOFFER_ICON_URI "canceloffer.png#83328bae49f18f0aeca6d04c2e3003e49637a462b44a492d3439a9c44724a654")
set(CANCELOFFERF_ICON_URI "cancelofferf.png#9c35f488e2c53464f430e0e31e5a4b3bd2e914fe3b6db126722166a8a408fa83")
set(CLAIMF_ICON_URI "claimf.png#80086207646470fa9cbaf4638ba0dedec96ea0e84d5059b567adc9e4b8543c30")
set(CREATE_ICON_URI "create.png#db2bc53cef5dbbce5247543a91234373ec4bd1baf743301a0d92a35b053eeb70")
set(CREATEF_ICON_URI "createf.png#5fb6788f19b8fb08ce46e765a9b0ae8758cba7e4da9895f840d34d143912fd3d")
set(DELEGATE_ICON_URI "delegate.png#f8d91c1b9c0f376464e69aadf41142a17492af1e75d394601872b6a992b420bc")
set(DELEGATE_MORE_ICON_URI "delegate_more.png#6d1f7319569e3780e25cfb717d83f4ad58c91c0890ab234f106d1593956dfd10")
set(DETACH_ICON_URI "detach.png#a075de69e2cf8eed78306834cc5688b64ce6ed660c0db762ae20c7c7a1d19a6b")
set(DETACHF_ICON_URI "detachf.png#2476bc6b7c02a4ec7e0e307b60f44a02486b4bebb4d91714817e5816063198e8")
set(ISSUEF_ICON_URI "issuef.png#a40d77b2162d646cd3ce0488dfeab1cdfae8801fcc1d0c6ef1f16f2547b16551")
set(OFFER_ICON_URI "offer.png#4aea6612c87df6cde081689f861b55ddba2c277cc553f4faeb65a4cb26656c66")
set(OFFERF_ICON_URI "offerf.png#a34462918e536372610a523225e5221cd2685eff3c329499ded7298907f8524b")
set(REGAUTHOR_ICON_URI "regauthor.png#c6a539be8e7dfd1a4c466ba9cabfd13571cd77d5c988c652d2e8f87096f3548e")
set(TRANSFER_ICON_URI "transfer.png#23227a4901414db5cd0973d1cc5df13f9b82375b21c6315fd3402cb4acd50cbf")
set(UPDATE_ICON_URI "update.png#305b640fe614876c6e6f5fed5ac21f8157c80f7bee39f3db26228986c1fc5e0e")
set(UPDATEF_ICON_URI "updatef.png#f5d5af2ed6af508777f9f0b3c3a8e24b61eeca2ea623cfec6f6d0e9ea2c4d1a7")
set(CLAIM_ICON_URI "claim.png#8c3fdf140ea14a3cb9762a0f6ec0f0d73f8c2eeeec3ea2f109f394a9f35f472d")

configure_file( ${CMAKE_SOURCE_DIR}/ricardian/SimpleAssets.contracts.md.in ${CMAKE_SOURCE_DIR}/ricardian/SimpleAssets.contracts.md @ONLY )

ExternalProject_Add(
SimpleAssets_project
SOURCE_DIR ${CMAKE_SOURCE_DIR}/src
Expand Down
56 changes: 46 additions & 10 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@ Use Simple Assets by making calls to the Simple Assets contract. It's like a Da
Jungle Testnet: **simpleassets**

EOS Mainnet: **simpleassets**
WAX Mainnet: **simpleassets**
MEETONE Mainnet: **smplassets.m**
TELOS Mainnet: **simpleassets**


Simple Assets is a separate contract which other Dapps can call to manage their digital assets. This serves as an additional guarantee to users of the Dapp that the ownership of assets is managed by a reputable outside authority, and that once created, the Dapp can only manage the asset's mdata. All the ownership-related functionality exists outside the game.

Expand All @@ -52,14 +54,18 @@ Each symbol in imdata and mdata is +1 byte.
1. [Contract actions](#contract-actions)
2. [Data Structures](#data-structures)
3. [EXAMPLES: how to use Simple Assets in smart contracts](#examples-how-to-use-simple-assets-in-smart-contracts)
4. [ChangeLog](#change-log-v112)
4. [ChangeLog](#change-log-v113)
---------------------------

# Contract actions
A description of each parameter can be found here:
https://github.com/CryptoLions/SimpleAssets/blob/master/include/SimpleAssets.hpp

```
regauthor (name author, data, stemplate, string imgpriority)
authorupdate (author, data, stemplate, string imgpriority)
# -- For Non-Fungible Tokens ---
create (author, category, owner, idata, mdata, requireсlaim)
Expand All @@ -71,9 +77,6 @@ https://github.com/CryptoLions/SimpleAssets/blob/master/include/SimpleAssets.hpp
canceloffer (owner, [assetid1,..,assetidn])
claim (claimer, [assetid1,..,assetidn])
regauthor (name author, data, stemplate, string imgpriorit)
authorupdate (author, data, stemplate, string imgpriorit)
delegate (owner, to, [assetid1,..,assetidn], period, memo)
undelegate (owner, from, [assetid1,..,assetidn])
delegatemore (owner, assetid, period)
Expand Down Expand Up @@ -116,7 +119,10 @@ sasset {
account[] containerf; // FTs attached to this asset
}
```
// Please include in idata or mdata info about asset name img desc which will be used by Markets
// To help third party asset explorers, we recommend including the following fields in `idata` or `mdata`:
// `name` (text)
// `img` (url to image file)
// and maybe `desc` (text description)

## Offers
```
Expand All @@ -132,12 +138,36 @@ offers {
```
authors {
name author; // assets author, who will be able to create and update assets;
string data; // author’s data (json) will be used by markets for better display;
// recommendations: logo, info, url;
string stemplate; // data (json) schema for third-party markets.
// key: state values, where key is the key from mdata or idata;
// recommended values: txt, img, url, hide, webgl, mp3, video, timestamp;
string imgpriority; // Image priority to use for by 3d-party tools for better displaying assets.
string stemplate; // data (json) schema to tell third-party markets how to display each NFT field.
// key: state values, where key is the key from mdata or idata;
// recommended values:
// txt | default type
// url | show as clickable URL
// img | link to img file
// webgl | link to webgl file
// mp3 | link to mp3 file
// video | link to video file
// hide | do not show
// imgb | image as string in binary format
// webglb | webgl binary
// mp3b | mp3 binary
// videob | video binary
string imgpriority; // Specifies primary image field for categories of NFTs.
//
// This is used when you want your NFTs primary image to be something other
// than a URL to an image field specified in the field img. It also allows you to
// create categories of NFTs with different primary image fields.
//
// data is a strigified json.
// key: NFT categories.
// value: a field from idata or mdata to be used as the primary image for
// all NFTs of that category.
}
```

Expand Down Expand Up @@ -421,10 +451,16 @@ saRes1.send();


-----------------
## Change Log v1.1.3
- ricardian contracts updated.
- fungible token offer issue fix


## Change Log v1.1.2
- added `string imgpriority` field in sauthor table and to `regauthor` and `authorupdate` actions.
- added `string imgpriority` field in `sauthor` table and to `regauthor` and `authorupdate` actions
- IMPORTANT: Self-deployed instances of Simple Assets may need to migrate the regauthor table (if used).


## Change Log v1.1.1
- optimized claim/transfer/burn functionality
- Memo field added to delegates table. (This allows lenders/games to create different classes of borrowed assets - eg. high risk / low risk.) On delegete action, the memo from action parmeter is stored to this new field. max 64 chars length.
Expand Down
Loading

0 comments on commit 891c3bc

Please sign in to comment.