Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@bezalel
bezalel committed May 21, 2019
2 parents 53dee36 + 35e9135 commit 99263e6
Show file tree
Hide file tree
Showing 9 changed files with 2,052 additions and 69 deletions.
1 change: 1 addition & 0 deletions contracts/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ add_subdirectory(yx.txfee)
add_subdirectory(yx.identity)
add_subdirectory(yosemitex.fiat.stable.token)
add_subdirectory(yosemitex.credit.token)
add_subdirectory(yosemite.card.ytoken)
add_subdirectory(yx.ntoken)
add_subdirectory(yx.token)
add_subdirectory(yx.dcontract)
Expand Down
19 changes: 19 additions & 0 deletions contracts/yosemite.card.ytoken/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
file(GLOB ABI_FILES "*.abi")
configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)

add_wast_executable(TARGET yosemite.card.ytoken
INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
LIBRARIES libc++ libc eosiolib
DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
)

if ($ENV{CLION_IDE})
set(CONTRACT_MODULE_NAME "yosemite.card.ytoken")
message( STATUS "CLION - contracts/${CONTRACT_MODULE_NAME}" )
file(GLOB HEADERS "*.hpp" "*.h")
file(GLOB SOURCES "*.cpp")
add_library( contracts_${CONTRACT_MODULE_NAME}
${SOURCES}
${HEADERS} )
target_include_directories(contracts_${CONTRACT_MODULE_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..")
endif ()
284 changes: 284 additions & 0 deletions contracts/yosemite.card.ytoken/yosemite.card.ytoken.abi
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,284 @@
{
"version": "eosio::abi/1.0",
"types": [{
"new_type_name": "account_name",
"type": "name"
}
],
"structs": [{
"name": "ytokenissue",
"base": "",
"fields": [
{"name":"merchant", "type":"account_name"},
{"name":"qty", "type":"asset"},
{"name":"paid", "type":"asset"},
{"name":"tag", "type":"string"}
]
},{
"name": "ytokenburn",
"base": "",
"fields": [
{"name":"merchant", "type":"account_name"},
{"name":"qty", "type":"asset"},
{"name":"tag", "type":"string"}
]
},{
"name": "ytokenredeem",
"base": "",
"fields": [
{"name":"account", "type":"account_name"},
{"name":"qty", "type":"asset"},
{"name":"redeemed", "type":"asset"},
{"name":"tag", "type":"string"}
]
},{
"name": "ytokenpay",
"base": "",
"fields": [
{"name":"merchant", "type":"account_name"},
{"name":"price", "type":"asset"},
{"name":"credit", "type":"asset"},
{"name":"ytoken", "type":"asset"},
{"name":"reward", "type":"asset"},
{"name":"tag", "type":"string"}
]
},{
"name": "usdytissue",
"base": "",
"fields": [
{"name":"qty", "type":"asset"},
{"name":"tag", "type":"string"}
]
},{
"name": "usdredeemto",
"base": "",
"fields": [
{"name":"to", "type":"account_name"},
{"name":"qty", "type":"asset"},
{"name":"tag", "type":"string"}
]
},{
"name": "yusdtransfer",
"base": "",
"fields": [
{"name":"from", "type":"account_name"},
{"name":"to", "type":"account_name"},
{"name":"qty", "type":"asset"},
{"name":"tag", "type":"string"}
]
},{
"name": "yusdredeemrq",
"base": "",
"fields": [
{"name":"account", "type":"account_name"},
{"name":"qty", "type":"asset"},
{"name":"tag", "type":"string"}
]
},{
"name": "cnclyusdrdrq",
"base": "",
"fields": [
{"name":"account", "type":"account_name"},
{"name":"qty", "type":"asset"},
{"name":"tag", "type":"string"}
]
},{
"name": "creditlimit",
"base": "",
"fields": [
{"name":"account", "type":"account_name"},
{"name":"credit_limit", "type":"asset"},
{"name":"tag", "type":"string"}
]
},{
"name": "creditissue",
"base": "",
"fields": [
{"name":"issuer", "type":"account_name"},
{"name":"to", "type":"account_name"},
{"name":"qty", "type":"asset"},
{"name":"tag", "type":"string"}
]
},{
"name": "credittxfer",
"base": "",
"fields": [
{"name":"from", "type":"account_name"},
{"name":"to", "type":"account_name"},
{"name":"qty", "type":"asset"},
{"name":"tag", "type":"string"}
]
},{
"name": "creditsettle",
"base": "",
"fields": [
{"name":"account", "type":"account_name"},
{"name":"qty", "type":"asset"},
{"name":"tag", "type":"string"}
]
},{
"name": "creditburn",
"base": "",
"fields": [
{"name":"qty", "type":"asset"},
{"name":"tag", "type":"string"}
]
},{
"name": "credit_offering_info",
"base": "",
"fields": [
{"name":"account", "type":"account_name"},
{"name":"credit_limit", "type":"int64"},
{"name":"credit_issued", "type":"int64"}
]
},{
"name": "credit_token_balance_info",
"base": "",
"fields": [
{"name":"account", "type":"account_name"},
{"name":"credit_token_balance", "type":"int64"}
]
},{
"name": "credit_token_stat",
"base": "",
"fields": [
{"name":"total_offered_credit_limit", "type":"asset"},
{"name":"total_credit_token_supply", "type":"asset"}
]
},{
"name": "yosemite_token_issue_info",
"base": "",
"fields": [
{"name":"account", "type":"account_name"},
{"name":"total_issued", "type":"int64"},
{"name":"total_consumed", "type":"int64"},
{"name":"total_burned", "type":"int64"},
{"name":"last_issued", "type":"int64"},
{"name":"available", "type":"int64"}
]
},{
"name": "yosemite_token_issue_stat",
"base": "",
"fields": [
{"name":"total_available", "type":"asset"}
]
},{
"name": "yusd_token_balance_info",
"base": "",
"fields": [
{"name":"account", "type":"account_name"},
{"name":"yusd_token_balance", "type":"int64"}
]
},{
"name": "yusd_token_stat",
"base": "",
"fields": [
{"name":"total_yusd_token_supply", "type":"asset"}
]
}
],
"actions": [{
"name": "ytokenissue",
"type": "ytokenissue",
"ricardian_contract": ""
},{
"name": "ytokenburn",
"type": "ytokenburn",
"ricardian_contract": ""
},{
"name": "ytokenredeem",
"type": "ytokenredeem",
"ricardian_contract": ""
},{
"name": "ytokenpay",
"type": "ytokenpay",
"ricardian_contract": ""
},{
"name": "usdytissue",
"type": "usdytissue",
"ricardian_contract": ""
},{
"name": "usdredeemto",
"type": "usdredeemto",
"ricardian_contract": ""
},{
"name": "yusdtransfer",
"type": "yusdtransfer",
"ricardian_contract": ""
},{
"name": "yusdredeemrq",
"type": "yusdredeemrq",
"ricardian_contract": ""
},{
"name": "cnclyusdrdrq",
"type": "cnclyusdrdrq",
"ricardian_contract": ""
},{
"name": "creditlimit",
"type": "creditlimit",
"ricardian_contract": ""
},{
"name": "creditissue",
"type": "creditissue",
"ricardian_contract": ""
},{
"name": "credittxfer",
"type": "credittxfer",
"ricardian_contract": ""
},{
"name": "creditsettle",
"type": "creditsettle",
"ricardian_contract": ""
},{
"name": "creditburn",
"type": "creditburn",
"ricardian_contract": ""
}
],
"tables": [{
"name": "creditoffer",
"type": "credit_offering_info",
"index_type": "i64",
"key_names" : ["account"],
"key_types" : ["uint64"]
},{
"name": "credittoken",
"type": "credit_token_balance_info",
"index_type": "i64",
"key_names" : ["account"],
"key_types" : ["uint64"]
},{
"name": "creditstat",
"type": "credit_token_stat",
"index_type": "i64",
"key_names" : [],
"key_types" : []
},{
"name": "ytokenissue",
"type": "yosemite_token_issue_info",
"index_type": "i64",
"key_names" : ["account"],
"key_types" : ["uint64"]
},{
"name": "ytokenstat",
"type": "yosemite_token_issue_stat",
"index_type": "i64",
"key_names" : [],
"key_types" : []
},{
"name": "yusdtoken",
"type": "yusd_token_balance_info",
"index_type": "i64",
"key_names" : ["account"],
"key_types" : ["uint64"]
},{
"name": "yusdstat",
"type": "yusd_token_stat",
"index_type": "i64",
"key_names" : [],
"key_types" : []
}
],
"ricardian_clauses": [],
"abi_extensions": []
}
Loading

0 comments on commit 99263e6

Please sign in to comment.