Skip to content

Commit 99263e6

Browse files
committed
Merge branch 'develop'
2 parents 53dee36 + 35e9135 commit 99263e6

File tree

9 files changed

+2052
-69
lines changed

9 files changed

+2052
-69
lines changed

contracts/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ add_subdirectory(yx.txfee)
3939
add_subdirectory(yx.identity)
4040
add_subdirectory(yosemitex.fiat.stable.token)
4141
add_subdirectory(yosemitex.credit.token)
42+
add_subdirectory(yosemite.card.ytoken)
4243
add_subdirectory(yx.ntoken)
4344
add_subdirectory(yx.token)
4445
add_subdirectory(yx.dcontract)
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
file(GLOB ABI_FILES "*.abi")
2+
configure_file("${ABI_FILES}" "${CMAKE_CURRENT_BINARY_DIR}" COPYONLY)
3+
4+
add_wast_executable(TARGET yosemite.card.ytoken
5+
INCLUDE_FOLDERS "${STANDARD_INCLUDE_FOLDERS}"
6+
LIBRARIES libc++ libc eosiolib
7+
DESTINATION_FOLDER ${CMAKE_CURRENT_BINARY_DIR}
8+
)
9+
10+
if ($ENV{CLION_IDE})
11+
set(CONTRACT_MODULE_NAME "yosemite.card.ytoken")
12+
message( STATUS "CLION - contracts/${CONTRACT_MODULE_NAME}" )
13+
file(GLOB HEADERS "*.hpp" "*.h")
14+
file(GLOB SOURCES "*.cpp")
15+
add_library( contracts_${CONTRACT_MODULE_NAME}
16+
${SOURCES}
17+
${HEADERS} )
18+
target_include_directories(contracts_${CONTRACT_MODULE_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/..")
19+
endif ()
Lines changed: 284 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,284 @@
1+
{
2+
"version": "eosio::abi/1.0",
3+
"types": [{
4+
"new_type_name": "account_name",
5+
"type": "name"
6+
}
7+
],
8+
"structs": [{
9+
"name": "ytokenissue",
10+
"base": "",
11+
"fields": [
12+
{"name":"merchant", "type":"account_name"},
13+
{"name":"qty", "type":"asset"},
14+
{"name":"paid", "type":"asset"},
15+
{"name":"tag", "type":"string"}
16+
]
17+
},{
18+
"name": "ytokenburn",
19+
"base": "",
20+
"fields": [
21+
{"name":"merchant", "type":"account_name"},
22+
{"name":"qty", "type":"asset"},
23+
{"name":"tag", "type":"string"}
24+
]
25+
},{
26+
"name": "ytokenredeem",
27+
"base": "",
28+
"fields": [
29+
{"name":"account", "type":"account_name"},
30+
{"name":"qty", "type":"asset"},
31+
{"name":"redeemed", "type":"asset"},
32+
{"name":"tag", "type":"string"}
33+
]
34+
},{
35+
"name": "ytokenpay",
36+
"base": "",
37+
"fields": [
38+
{"name":"merchant", "type":"account_name"},
39+
{"name":"price", "type":"asset"},
40+
{"name":"credit", "type":"asset"},
41+
{"name":"ytoken", "type":"asset"},
42+
{"name":"reward", "type":"asset"},
43+
{"name":"tag", "type":"string"}
44+
]
45+
},{
46+
"name": "usdytissue",
47+
"base": "",
48+
"fields": [
49+
{"name":"qty", "type":"asset"},
50+
{"name":"tag", "type":"string"}
51+
]
52+
},{
53+
"name": "usdredeemto",
54+
"base": "",
55+
"fields": [
56+
{"name":"to", "type":"account_name"},
57+
{"name":"qty", "type":"asset"},
58+
{"name":"tag", "type":"string"}
59+
]
60+
},{
61+
"name": "yusdtransfer",
62+
"base": "",
63+
"fields": [
64+
{"name":"from", "type":"account_name"},
65+
{"name":"to", "type":"account_name"},
66+
{"name":"qty", "type":"asset"},
67+
{"name":"tag", "type":"string"}
68+
]
69+
},{
70+
"name": "yusdredeemrq",
71+
"base": "",
72+
"fields": [
73+
{"name":"account", "type":"account_name"},
74+
{"name":"qty", "type":"asset"},
75+
{"name":"tag", "type":"string"}
76+
]
77+
},{
78+
"name": "cnclyusdrdrq",
79+
"base": "",
80+
"fields": [
81+
{"name":"account", "type":"account_name"},
82+
{"name":"qty", "type":"asset"},
83+
{"name":"tag", "type":"string"}
84+
]
85+
},{
86+
"name": "creditlimit",
87+
"base": "",
88+
"fields": [
89+
{"name":"account", "type":"account_name"},
90+
{"name":"credit_limit", "type":"asset"},
91+
{"name":"tag", "type":"string"}
92+
]
93+
},{
94+
"name": "creditissue",
95+
"base": "",
96+
"fields": [
97+
{"name":"issuer", "type":"account_name"},
98+
{"name":"to", "type":"account_name"},
99+
{"name":"qty", "type":"asset"},
100+
{"name":"tag", "type":"string"}
101+
]
102+
},{
103+
"name": "credittxfer",
104+
"base": "",
105+
"fields": [
106+
{"name":"from", "type":"account_name"},
107+
{"name":"to", "type":"account_name"},
108+
{"name":"qty", "type":"asset"},
109+
{"name":"tag", "type":"string"}
110+
]
111+
},{
112+
"name": "creditsettle",
113+
"base": "",
114+
"fields": [
115+
{"name":"account", "type":"account_name"},
116+
{"name":"qty", "type":"asset"},
117+
{"name":"tag", "type":"string"}
118+
]
119+
},{
120+
"name": "creditburn",
121+
"base": "",
122+
"fields": [
123+
{"name":"qty", "type":"asset"},
124+
{"name":"tag", "type":"string"}
125+
]
126+
},{
127+
"name": "credit_offering_info",
128+
"base": "",
129+
"fields": [
130+
{"name":"account", "type":"account_name"},
131+
{"name":"credit_limit", "type":"int64"},
132+
{"name":"credit_issued", "type":"int64"}
133+
]
134+
},{
135+
"name": "credit_token_balance_info",
136+
"base": "",
137+
"fields": [
138+
{"name":"account", "type":"account_name"},
139+
{"name":"credit_token_balance", "type":"int64"}
140+
]
141+
},{
142+
"name": "credit_token_stat",
143+
"base": "",
144+
"fields": [
145+
{"name":"total_offered_credit_limit", "type":"asset"},
146+
{"name":"total_credit_token_supply", "type":"asset"}
147+
]
148+
},{
149+
"name": "yosemite_token_issue_info",
150+
"base": "",
151+
"fields": [
152+
{"name":"account", "type":"account_name"},
153+
{"name":"total_issued", "type":"int64"},
154+
{"name":"total_consumed", "type":"int64"},
155+
{"name":"total_burned", "type":"int64"},
156+
{"name":"last_issued", "type":"int64"},
157+
{"name":"available", "type":"int64"}
158+
]
159+
},{
160+
"name": "yosemite_token_issue_stat",
161+
"base": "",
162+
"fields": [
163+
{"name":"total_available", "type":"asset"}
164+
]
165+
},{
166+
"name": "yusd_token_balance_info",
167+
"base": "",
168+
"fields": [
169+
{"name":"account", "type":"account_name"},
170+
{"name":"yusd_token_balance", "type":"int64"}
171+
]
172+
},{
173+
"name": "yusd_token_stat",
174+
"base": "",
175+
"fields": [
176+
{"name":"total_yusd_token_supply", "type":"asset"}
177+
]
178+
}
179+
],
180+
"actions": [{
181+
"name": "ytokenissue",
182+
"type": "ytokenissue",
183+
"ricardian_contract": ""
184+
},{
185+
"name": "ytokenburn",
186+
"type": "ytokenburn",
187+
"ricardian_contract": ""
188+
},{
189+
"name": "ytokenredeem",
190+
"type": "ytokenredeem",
191+
"ricardian_contract": ""
192+
},{
193+
"name": "ytokenpay",
194+
"type": "ytokenpay",
195+
"ricardian_contract": ""
196+
},{
197+
"name": "usdytissue",
198+
"type": "usdytissue",
199+
"ricardian_contract": ""
200+
},{
201+
"name": "usdredeemto",
202+
"type": "usdredeemto",
203+
"ricardian_contract": ""
204+
},{
205+
"name": "yusdtransfer",
206+
"type": "yusdtransfer",
207+
"ricardian_contract": ""
208+
},{
209+
"name": "yusdredeemrq",
210+
"type": "yusdredeemrq",
211+
"ricardian_contract": ""
212+
},{
213+
"name": "cnclyusdrdrq",
214+
"type": "cnclyusdrdrq",
215+
"ricardian_contract": ""
216+
},{
217+
"name": "creditlimit",
218+
"type": "creditlimit",
219+
"ricardian_contract": ""
220+
},{
221+
"name": "creditissue",
222+
"type": "creditissue",
223+
"ricardian_contract": ""
224+
},{
225+
"name": "credittxfer",
226+
"type": "credittxfer",
227+
"ricardian_contract": ""
228+
},{
229+
"name": "creditsettle",
230+
"type": "creditsettle",
231+
"ricardian_contract": ""
232+
},{
233+
"name": "creditburn",
234+
"type": "creditburn",
235+
"ricardian_contract": ""
236+
}
237+
],
238+
"tables": [{
239+
"name": "creditoffer",
240+
"type": "credit_offering_info",
241+
"index_type": "i64",
242+
"key_names" : ["account"],
243+
"key_types" : ["uint64"]
244+
},{
245+
"name": "credittoken",
246+
"type": "credit_token_balance_info",
247+
"index_type": "i64",
248+
"key_names" : ["account"],
249+
"key_types" : ["uint64"]
250+
},{
251+
"name": "creditstat",
252+
"type": "credit_token_stat",
253+
"index_type": "i64",
254+
"key_names" : [],
255+
"key_types" : []
256+
},{
257+
"name": "ytokenissue",
258+
"type": "yosemite_token_issue_info",
259+
"index_type": "i64",
260+
"key_names" : ["account"],
261+
"key_types" : ["uint64"]
262+
},{
263+
"name": "ytokenstat",
264+
"type": "yosemite_token_issue_stat",
265+
"index_type": "i64",
266+
"key_names" : [],
267+
"key_types" : []
268+
},{
269+
"name": "yusdtoken",
270+
"type": "yusd_token_balance_info",
271+
"index_type": "i64",
272+
"key_names" : ["account"],
273+
"key_types" : ["uint64"]
274+
},{
275+
"name": "yusdstat",
276+
"type": "yusd_token_stat",
277+
"index_type": "i64",
278+
"key_names" : [],
279+
"key_types" : []
280+
}
281+
],
282+
"ricardian_clauses": [],
283+
"abi_extensions": []
284+
}

0 commit comments

Comments
 (0)