Skip to content

Commit 1aae614

Browse files
alyn509alyn509
authored
Merge pull request #1944 from multiversx/digital-cash-refactoring
Digital cash refactoring
2 parents 6e7a567 + 2d08ac8 commit 1aae614

21 files changed

+357
-297
lines changed

‎contracts/examples/digital-cash/scenarios/claim-egld.scen.json‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,9 @@
132132
"storage": {
133133
"str:deposit|0x487bd4010b50c24a02018345fe5171edf4182e6294325382c75ef4c4409f01bd": {
134134
"0-depositor_address": "address:acc2",
135-
"1-esdt_funds": "u32:1|nested:str:CASHTOKEN-123456|u64:0|biguint:50",
136-
"2-egld_funds": "biguint:0",
137-
"3-valability": "u64:100",
138-
"4-expiration_round": "u64:16",
135+
"1-funds": "u32:1|nested:str:CASHTOKEN-123456|u64:0|biguint:50",
136+
"2-valability": "u64:100",
137+
"3-expiration_round": "u64:16",
139138
"5-fees": {
140139
"0-num_token_to_transfer": "u32:1",
141140
"1-value": {
@@ -147,11 +146,10 @@
147146
},
148147
"str:deposit|0x885532043a061e0c779e4064b85193f72cffd22c5bcc208c209128e60f21bf0d": {
149148
"0-depositor_address": "address:acc3",
150-
"1-esdt_funds": "u32:3|nested:str:CASHTOKEN-112233|u64:0|biguint:50|nested:str:CASHTOKEN-445566|u64:0|biguint:50|nested:str:CASHTOKEN-778899|u64:0|biguint:50",
151-
"2-egld_funds": "biguint:0",
152-
"3-valability": "u64:100",
153-
"4-expiration_round": "u64:16",
154-
"5-fees": {
149+
"1-funds": "u32:3|nested:str:CASHTOKEN-112233|u64:0|biguint:50|nested:str:CASHTOKEN-445566|u64:0|biguint:50|nested:str:CASHTOKEN-778899|u64:0|biguint:50",
150+
"2-valability": "u64:100",
151+
"3-expiration_round": "u64:16",
152+
"4-fees": {
155153
"0-num_token_to_transfer": "u32:3",
156154
"1-value": {
157155
"0-tokenIdentifier": "nested:str:EGLD",

‎contracts/examples/digital-cash/scenarios/claim-esdt.scen.json‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,10 @@
131131
"storage": {
132132
"str:deposit|0xdb474a3a065d3f0c0a62ae680ef6435e48eb482899d2ae30ff7a3a4b0ef19c60": {
133133
"0-depositor_address": "address:acc1",
134-
"1-esdt_funds": "u32:0",
135-
"2-egld_funds": "biguint:1,000",
136-
"3-valability": "u64:60",
137-
"4-expiration_round": "u64:10",
138-
"5-fees": {
134+
"1-funds": "u32:1|nested:str:EGLD|u64:0|biguint:1,000",
135+
"2-valability": "u64:60",
136+
"3-expiration_round": "u64:10",
137+
"4-fees": {
139138
"0-num_token_to_transfer": "u32:1",
140139
"1-value": {
141140
"0-tokenIdentifier": "nested:str:EGLD",
@@ -147,10 +146,9 @@
147146
"str:deposit|0x885532043a061e0c779e4064b85193f72cffd22c5bcc208c209128e60f21bf0d": {
148147
"0-depositor_address": "address:acc3",
149148
"1-esdt_funds": "u32:3|nested:str:CASHTOKEN-112233|u64:0|biguint:50|nested:str:CASHTOKEN-445566|u64:0|biguint:50|nested:str:CASHTOKEN-778899|u64:0|biguint:50",
150-
"2-egld_funds": "biguint:0",
151-
"3-valability": "u64:100",
152-
"4-expiration_round": "u64:16",
153-
"5-fees": {
149+
"2-valability": "u64:100",
150+
"3-expiration_round": "u64:16",
151+
"4-fees": {
154152
"0-num_token_to_transfer": "u32:3",
155153
"1-value": {
156154
"0-tokenIdentifier": "nested:str:EGLD",

‎contracts/examples/digital-cash/scenarios/claim-fees.scen.json‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,10 @@
6969
"storage": {
7070
"str:deposit|0x487bd4010b50c24a02018345fe5171edf4182e6294325382c75ef4c4409f01bd": {
7171
"0-depositor_address": "address:acc2",
72-
"1-esdt_funds": "u32:1|nested:str:CASHTOKEN-123456|u64:0|biguint:50",
73-
"2-egld_funds": "biguint:0",
74-
"3-valability": "u64:100",
75-
"4-expiration_round": "u64:16",
76-
"5-fees": {
72+
"1-funds": "u32:1|nested:str:CASHTOKEN-123456|u64:0|biguint:50",
73+
"2-valability": "u64:100",
74+
"3-expiration_round": "u64:16",
75+
"4-fees": {
7776
"0-num_token_to_transfer": "u32:1",
7877
"1-value": {
7978
"0-tokenIdentifier": "nested:str:EGLD",
@@ -84,11 +83,10 @@
8483
},
8584
"str:deposit|0x885532043a061e0c779e4064b85193f72cffd22c5bcc208c209128e60f21bf0d": {
8685
"0-depositor_address": "address:acc3",
87-
"1-esdt_funds": "u32:3|nested:str:CASHTOKEN-112233|u64:0|biguint:50|nested:str:CASHTOKEN-445566|u64:0|biguint:50|nested:str:CASHTOKEN-778899|u64:0|biguint:50",
88-
"2-egld_funds": "biguint:0",
89-
"3-valability": "u64:100",
90-
"4-expiration_round": "u64:16",
91-
"5-fees": {
86+
"1-funds": "u32:3|nested:str:CASHTOKEN-112233|u64:0|biguint:50|nested:str:CASHTOKEN-445566|u64:0|biguint:50|nested:str:CASHTOKEN-778899|u64:0|biguint:50",
87+
"2-valability": "u64:100",
88+
"3-expiration_round": "u64:16",
89+
"4-fees": {
9290
"0-num_token_to_transfer": "u32:3",
9391
"1-value": {
9492
"0-tokenIdentifier": "nested:str:EGLD",

‎contracts/examples/digital-cash/scenarios/claim-multi-esdt.scen.json‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,10 @@
129129
"storage": {
130130
"str:deposit|0xdb474a3a065d3f0c0a62ae680ef6435e48eb482899d2ae30ff7a3a4b0ef19c60": {
131131
"0-depositor_address": "address:acc1",
132-
"1-esdt_funds": "u32:0",
133-
"2-egld_funds": "biguint:1,000",
134-
"3-valability": "u64:60",
135-
"4-expiration_round": "u64:10",
136-
"5-fees": {
132+
"1-funds": "u32:1|nested:str:EGLD|u64:0|biguint:1,000",
133+
"2-valability": "u64:60",
134+
"3-expiration_round": "u64:10",
135+
"4-fees": {
137136
"0-num_token_to_transfer": "u32:1",
138137
"1-value": {
139138
"0-tokenIdentifier": "nested:str:EGLD",
@@ -144,11 +143,10 @@
144143
},
145144
"str:deposit|0x487bd4010b50c24a02018345fe5171edf4182e6294325382c75ef4c4409f01bd": {
146145
"0-depositor_address": "address:acc2",
147-
"1-esdt_funds": "u32:1|nested:str:CASHTOKEN-123456|u64:0|biguint:50",
148-
"2-egld_funds": "biguint:0",
149-
"3-valability": "u64:100",
150-
"4-expiration_round": "u64:16",
151-
"5-fees": {
146+
"1-funds": "u32:1|nested:str:CASHTOKEN-123456|u64:0|biguint:50",
147+
"2-valability": "u64:100",
148+
"3-expiration_round": "u64:16",
149+
"4-fees": {
152150
"0-num_token_to_transfer": "u32:1",
153151
"1-value": {
154152
"0-tokenIdentifier": "nested:str:EGLD",

‎contracts/examples/digital-cash/scenarios/forward.scen.json‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,10 @@
162162
"storage": {
163163
"str:deposit|0xa40e72cdac3580e7203a4c2565c932f7691c35e624bcfd82718d7f559c88f440": {
164164
"0-depositor_address": "address:acc2",
165-
"1-esdt_funds": "u32:0",
166-
"2-egld_funds": "biguint:1,000",
167-
"3-valability": "u64:60",
168-
"4-expiration_round": "u64:10",
169-
"5-fees": {
165+
"1-funds": "u32:1|nested:str:EGLD|u64:0|biguint:1,000",
166+
"2-valability": "u64:60",
167+
"3-expiration_round": "u64:10",
168+
"4-fees": {
170169
"0-num_token_to_transfer": "u32:1",
171170
"1-value": {
172171
"0-tokenIdentifier": "nested:str:EGLD",
@@ -177,11 +176,10 @@
177176
},
178177
"str:deposit|0x487bd4010b50c24a02018345fe5171edf4182e6294325382c75ef4c4409f01bd": {
179178
"0-depositor_address": "address:acc2",
180-
"1-esdt_funds": "u32:1|nested:str:CASHTOKEN-123456|u64:0|biguint:50",
181-
"2-egld_funds": "biguint:0",
182-
"3-valability": "u64:100",
183-
"4-expiration_round": "u64:16",
184-
"5-fees": {
179+
"1-funds": "u32:1|nested:str:CASHTOKEN-123456|u64:0|biguint:50",
180+
"2-valability": "u64:100",
181+
"3-expiration_round": "u64:16",
182+
"4-fees": {
185183
"0-num_token_to_transfer": "u32:1",
186184
"1-value": {
187185
"0-tokenIdentifier": "nested:str:EGLD",
@@ -192,11 +190,10 @@
192190
},
193191
"str:deposit|0x8dc17613990e9b7476401a36d112d1a4d31190dec21e7e9a3c933872a27613ee": {
194192
"0-depositor_address": "address:acc2",
195-
"1-esdt_funds": "u32:3|nested:str:CASHTOKEN-112233|u64:0|biguint:50|nested:str:CASHTOKEN-445566|u64:0|biguint:50|nested:str:CASHTOKEN-778899|u64:0|biguint:50",
196-
"2-egld_funds": "biguint:0",
197-
"3-valability": "u64:100",
198-
"4-expiration_round": "u64:16",
199-
"5-fees": {
193+
"1-funds": "u32:3|nested:str:CASHTOKEN-112233|u64:0|biguint:50|nested:str:CASHTOKEN-445566|u64:0|biguint:50|nested:str:CASHTOKEN-778899|u64:0|biguint:50",
194+
"2-valability": "u64:100",
195+
"3-expiration_round": "u64:16",
196+
"4-fees": {
200197
"0-num_token_to_transfer": "u32:3",
201198
"1-value": {
202199
"0-tokenIdentifier": "nested:str:EGLD",

‎contracts/examples/digital-cash/scenarios/fund-egld-and-esdt.scen.json‎

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,10 @@
8585
"storage": {
8686
"str:deposit|0xdb474a3a065d3f0c0a62ae680ef6435e48eb482899d2ae30ff7a3a4b0ef19c60": {
8787
"0-depositor_address": "address:acc1",
88-
"1-esdt_funds": "u32:0",
89-
"2-egld_funds": "biguint:1,000",
90-
"3-valability": "u64:60",
91-
"4-expiration_round": "u64:10",
92-
"5-fees": {
88+
"1-funds": "u32:1|nested:str:EGLD|u64:0|biguint:1000",
89+
"2-valability": "u64:60",
90+
"3-expiration_round": "u64:10",
91+
"4-fees": {
9392
"0-num_token_to_transfer": "u32:1",
9493
"1-value": {
9594
"0-tokenIdentifier": "nested:str:EGLD",
@@ -201,11 +200,10 @@
201200
"storage": {
202201
"str:deposit|0xdb474a3a065d3f0c0a62ae680ef6435e48eb482899d2ae30ff7a3a4b0ef19c60": {
203202
"0-depositor_address": "address:acc1",
204-
"1-esdt_funds": "u32:0",
205-
"2-egld_funds": "biguint:1,000",
206-
"3-valability": "u64:60",
207-
"4-expiration_round": "u64:10",
208-
"5-fees": {
203+
"1-funds": "u32:1|nested:str:EGLD|u64:0|biguint:1000",
204+
"2-valability": "u64:60",
205+
"3-expiration_round": "u64:10",
206+
"4-fees": {
209207
"0-num_token_to_transfer": "u32:1",
210208
"1-value": {
211209
"0-tokenIdentifier": "nested:str:EGLD",
@@ -216,8 +214,7 @@
216214
},
217215
"str:deposit|0x487bd4010b50c24a02018345fe5171edf4182e6294325382c75ef4c4409f01bd": {
218216
"0-depositor_address": "address:acc2",
219-
"1-esdt_funds": "u32:1|nested:str:CASHTOKEN-123456|u64:0|biguint:50",
220-
"2-egld_funds": "biguint:0",
217+
"1-funds": "u32:1|nested:str:CASHTOKEN-123456|u64:0|biguint:50",
221218
"3-valability": "u64:100",
222219
"4-expiration_round": "u64:16",
223220
"5-fees": {
@@ -407,11 +404,10 @@
407404
"storage": {
408405
"str:deposit|0xdb474a3a065d3f0c0a62ae680ef6435e48eb482899d2ae30ff7a3a4b0ef19c60": {
409406
"0-depositor_address": "address:acc1",
410-
"1-esdt_funds": "u32:0",
411-
"2-egld_funds": "biguint:1,000",
412-
"3-valability": "u64:60",
413-
"4-expiration_round": "u64:10",
414-
"5-fees": {
407+
"1-funds": "u32:1|nested:str:EGLD|u64:0|biguint:1,000",
408+
"2-valability": "u64:60",
409+
"3-expiration_round": "u64:10",
410+
"4-fees": {
415411
"0-num_token_to_transfer": "u32:1",
416412
"1-value": {
417413
"0-tokenIdentifier": "nested:str:EGLD",
@@ -422,11 +418,10 @@
422418
},
423419
"str:deposit|0x487bd4010b50c24a02018345fe5171edf4182e6294325382c75ef4c4409f01bd": {
424420
"0-depositor_address": "address:acc2",
425-
"1-esdt_funds": "u32:1|nested:str:CASHTOKEN-123456|u64:0|biguint:50",
426-
"2-egld_funds": "biguint:0",
427-
"3-valability": "u64:100",
428-
"4-expiration_round": "u64:16",
429-
"5-fees": {
421+
"1-funds": "u32:1|nested:str:CASHTOKEN-123456|u64:0|biguint:50",
422+
"2-valability": "u64:100",
423+
"3-expiration_round": "u64:16",
424+
"4-fees": {
430425
"0-num_token_to_transfer": "u32:1",
431426
"1-value": {
432427
"0-tokenIdentifier": "nested:str:EGLD",
@@ -437,11 +432,10 @@
437432
},
438433
"str:deposit|0x885532043a061e0c779e4064b85193f72cffd22c5bcc208c209128e60f21bf0d": {
439434
"0-depositor_address": "address:acc3",
440-
"1-esdt_funds": "u32:3|nested:str:CASHTOKEN-112233|u64:0|biguint:50|nested:str:CASHTOKEN-445566|u64:0|biguint:50|nested:str:CASHTOKEN-778899|u64:0|biguint:50",
441-
"2-egld_funds": "biguint:0",
442-
"3-valability": "u64:100",
443-
"4-expiration_round": "u64:16",
444-
"5-fees": {
435+
"1-funds": "u32:3|nested:str:CASHTOKEN-112233|u64:0|biguint:50|nested:str:CASHTOKEN-445566|u64:0|biguint:50|nested:str:CASHTOKEN-778899|u64:0|biguint:50",
436+
"2-valability": "u64:100",
437+
"3-expiration_round": "u64:16",
438+
"4-fees": {
445439
"0-num_token_to_transfer": "u32:3",
446440
"1-value": {
447441
"0-tokenIdentifier": "nested:str:EGLD",

‎contracts/examples/digital-cash/scenarios/pay-fee-and-fund-egld.scen.json‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"from": "address:acc3",
1313
"to": "sc:the_digital_cash_contract",
1414
"egldValue": "10",
15-
"function": "payFeeAndFundEGLD",
15+
"function": "payFeeAndFund",
1616
"arguments": [
1717
"0xdb474a3a065d3f0c0a62ae680ef6435e48eb482899d2ae30ff7a3a4b0ef19c60",
1818
"u64:100"
@@ -36,7 +36,7 @@
3636
"from": "address:acc3",
3737
"to": "sc:the_digital_cash_contract",
3838
"egldValue": "1,000",
39-
"function": "payFeeAndFundEGLD",
39+
"function": "payFeeAndFund",
4040
"arguments": [
4141
"0xdb474a3a065d3f0c0a62ae680ef6435e48eb482899d2ae30ff7a3a4b0ef19c60",
4242
"u64:100"
@@ -62,11 +62,10 @@
6262
"storage": {
6363
"str:deposit|0xdb474a3a065d3f0c0a62ae680ef6435e48eb482899d2ae30ff7a3a4b0ef19c60": {
6464
"0-depositor_address": "address:acc3",
65-
"1-esdt_funds": "u32:0",
66-
"2-egld_funds": "biguint:990",
67-
"3-valability": "u64:100",
68-
"4-expiration_round": "u64:16",
69-
"5-fees": {
65+
"1-funds": "u32:1|nested:str:EGLD|u64:0|biguint:990",
66+
"2-valability": "u64:100",
67+
"3-expiration_round": "u64:16",
68+
"4-fees": {
7069
"0-num_token_to_transfer": "u32:1",
7170
"1-value": {
7271
"0-tokenIdentifier": "nested:str:EGLD",

0 commit comments

Comments
 (0)