w8 · tx · Cbv···8Ji

tx · Cbv5Xs8XHPw8UUVSKGqxyxdSepQosWmq2SkBZvABh8Ji

3MyDGEoKp1gF4LSRknk9vSuDEyrwuYXcQEQ:  -0.01000000 Waves

2022.05.12 12:02 [2048256] smart account 3MyDGEoKp1gF4LSRknk9vSuDEyrwuYXcQEQ > SELF 0.00000000 Waves

{
    "type": 13,
    "id": "Cbv5Xs8XHPw8UUVSKGqxyxdSepQosWmq2SkBZvABh8Ji",
    "fee": 1000000,
    "feeAssetId": null,
    "timestamp": 1652346147294,
    "version": 2,
    "chainId": 84,
    "sender": "3MyDGEoKp1gF4LSRknk9vSuDEyrwuYXcQEQ",
    "senderPublicKey": "BhRnrwd6wVHSkSaWXCjQRjaoXcpCdUW2hkJD6V7uVDxN",
    "proofs": [
        "EZKwrvPX8ffmPvP6EbecequyphEZi2EbnYWnLTVnDCWe4LEZ1ynY68srG3BfffRks7xem6UUFKgJJXjr2N85oop"
    ],
    "script": "base64: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",
    "height": 2048256,
    "applicationStatus": "succeeded",
    "spentComplexity": 0
}

View: original | compacted
Prev: 5A6T118BKsE1cgCirdCjgbpXvEQctyqoTynXcath5y4X
Next: 3QxT7VHwoqyP44YtTufoHN4FY8kUrCLhsQa8k6WZ77ha

Diff: 
Old New Differences
8 8  let assetsAddress = base58'3N8WDKbqGox5Eky326PHHT7rUyrby5MXdmb'
9 9  
10 10  let nationsAddress = base58'3MvyzDtzWWV5MZ1GP8JfQhhQqiGU4Nbifdy'
11 + 
12 + let marketplaceAddress = base58'3Mra7mjPipcQd5sJaRmXK8xgS4scb8gPF4A'
11 13  
12 14  func tryGetInteger (key) = match getInteger(this, key) {
13 15      case b: Int => 
53 55  func internalTransfer (fromAddress,toAddress,amount) = (internalPay(fromAddress, amount) ++ internalDeposit(toAddress, amount))
54 56  
55 57  
56 - func checkAdmin (caller) = if (if (if ((caller == adminAddress))
58 + func checkAdmin (caller) = if (if (if (if ((caller == adminAddress))
57 59      then true
58 60      else (caller == this))
59 61      then true
60 62      else (caller.bytes == nationsAddress))
61 63      then true
62 -     else (caller.bytes == assetsAddress)
64 +     else (caller.bytes == assetsAddress))
65 +     then true
66 +     else (caller.bytes == marketplaceAddress)
63 67  
64 68  
65 69  @Callable(i)
Full: 
Old New Differences
1 1  {-# STDLIB_VERSION 5 #-}
2 2  {-# SCRIPT_TYPE ACCOUNT #-}
3 3  {-# CONTENT_TYPE DAPP #-}
4 4  let shinywggid = base58'AFQS5E4ELtxex3iANtWtUU2V2oWJZSo8VVnK8z3VFmqf'
5 5  
6 6  let adminAddress = addressFromStringValue("3MpNtiPSRSq6NnaQYk38BfWSzZcgAYTyrQ9")
7 7  
8 8  let assetsAddress = base58'3N8WDKbqGox5Eky326PHHT7rUyrby5MXdmb'
9 9  
10 10  let nationsAddress = base58'3MvyzDtzWWV5MZ1GP8JfQhhQqiGU4Nbifdy'
11 + 
12 + let marketplaceAddress = base58'3Mra7mjPipcQd5sJaRmXK8xgS4scb8gPF4A'
11 13  
12 14  func tryGetInteger (key) = match getInteger(this, key) {
13 15      case b: Int => 
14 16          b
15 17      case _ => 
16 18          0
17 19  }
18 20  
19 21  
20 22  func tryGetBoolean (key) = match getBoolean(this, key) {
21 23      case b: Boolean => 
22 24          b
23 25      case _ => 
24 26          false
25 27  }
26 28  
27 29  
28 30  func getTreasuryKey (nationid) = (nationid + "_Treasury")
29 31  
30 32  
31 33  func internalDeposit (addressStr,amountIn) = {
32 34      let amount = tryGetInteger((addressStr + "_Deposit"))
33 35  [IntegerEntry((addressStr + "_Deposit"), (amount + amountIn))]
34 36      }
35 37  
36 38  
37 39  func internalPay (addressStr,amount) = {
38 40      let deposited = tryGetInteger((addressStr + "_Deposit"))
39 41      if ((0 > (deposited - amount)))
40 42          then throw("Not enough deposit.")
41 43          else if (((deposited - amount) == 0))
42 44              then [DeleteEntry((addressStr + "_Deposit"))]
43 45              else [IntegerEntry((addressStr + "_Deposit"), (deposited - amount))]
44 46      }
45 47  
46 48  
47 49  func internalReserve (addressStr,amount) = {
48 50      let reservedAmount = tryGetInteger((addressStr + "_Reserved"))
49 51  [IntegerEntry((addressStr + "_Reserved"), (reservedAmount + amount))]
50 52      }
51 53  
52 54  
53 55  func internalTransfer (fromAddress,toAddress,amount) = (internalPay(fromAddress, amount) ++ internalDeposit(toAddress, amount))
54 56  
55 57  
56 - func checkAdmin (caller) = if (if (if ((caller == adminAddress))
58 + func checkAdmin (caller) = if (if (if (if ((caller == adminAddress))
57 59      then true
58 60      else (caller == this))
59 61      then true
60 62      else (caller.bytes == nationsAddress))
61 63      then true
62 -     else (caller.bytes == assetsAddress)
64 +     else (caller.bytes == assetsAddress))
65 +     then true
66 +     else (caller.bytes == marketplaceAddress)
63 67  
64 68  
65 69  @Callable(i)
66 70  func Deposit () = {
67 71      let addressStr = toString(i.originCaller)
68 72      let pmt = i.payments[0]
69 73      if ((pmt == pmt))
70 74          then {
71 75              let amountIn = value(i.payments[0].amount)
72 76              if ((amountIn == amountIn))
73 77                  then {
74 78                      let assetIn = pmt.assetId
75 79                      if ((assetIn == assetIn))
76 80                          then if ((assetIn != shinywggid))
77 81                              then throw("Only $HEG payments allowed")
78 82                              else {
79 83                                  let amount = tryGetInteger((addressStr + "_Deposit"))
80 84                                  $Tuple2(internalDeposit(addressStr, (amount + amountIn)), (amount + amountIn))
81 85                                  }
82 86                          else throw("Strict value is not equal to itself.")
83 87                      }
84 88                  else throw("Strict value is not equal to itself.")
85 89              }
86 90          else throw("Strict value is not equal to itself.")
87 91      }
88 92  
89 93  
90 94  
91 95  @Callable(i)
92 96  func Pay (addressStr,amount) = if (!(checkAdmin(i.caller)))
93 97      then throw("you are not authorized to perform this operation")
94 98      else $Tuple2(internalPay(addressStr, amount), amount)
95 99  
96 100  
97 101  
98 102  @Callable(i)
99 103  func CallerPay (amount) = {
100 104      let callerAddr = toString(i.caller)
101 105      internalPay(callerAddr, amount)
102 106      }
103 107  
104 108  
105 109  
106 110  @Callable(i)
107 111  func transferCoins (fromAddress,toAddress,amount) = if (if ((i.caller != adminAddress))
108 112      then (i.caller.bytes != assetsAddress)
109 113      else false)
110 114      then throw("you are not authorized to perform this operation")
111 115      else $Tuple2(internalTransfer(fromAddress, toAddress, amount), amount)
112 116  
113 117  
114 118  
115 119  @Callable(i)
116 120  func callerTransferCoins (toAddress,amount) = internalTransfer(toString(i.caller), toAddress, amount)
117 121  
118 122  
119 123  
120 124  @Callable(i)
121 125  func arbitraryAddCoins (toAddress,amount) = if (if (if ((i.caller != adminAddress))
122 126      then (i.caller.bytes != assetsAddress)
123 127      else false)
124 128      then (i.caller.bytes != nationsAddress)
125 129      else false)
126 130      then throw("you are not authorized to perform this operation")
127 131      else $Tuple2(internalDeposit(toAddress, amount), amount)
128 132  
129 133  
130 134  
131 135  @Callable(i)
132 136  func Redeem () = {
133 137      let addressStr = toString(i.caller)
134 138      let reservedAmount = tryGetInteger((addressStr + "_Reserved"))
135 139      if ((reservedAmount == 0))
136 140          then throw("Nothing to redeem")
137 141          else [DeleteEntry((addressStr + "_Reserved")), ScriptTransfer(i.caller, reservedAmount, shinywggid)]
138 142      }
139 143  
140 144  
141 145  
142 146  @Callable(i)
143 147  func addReward (addressStr,amount) = if (!(checkAdmin(i.caller)))
144 148      then throw("you are not authorized to perform this operation")
145 149      else {
146 150          let reservedAmount = tryGetInteger((addressStr + "_Reserved"))
147 151          $Tuple2([IntegerEntry((addressStr + "_Reserved"), (reservedAmount + amount))], (reservedAmount + amount))
148 152          }
149 153  
150 154  
151 155  
152 156  @Callable(i)
153 157  func increaseNationWallet (NationKey,amount) = if (!(checkAdmin(i.caller)))
154 158      then throw("you are not authorized to perform this operation")
155 159      else {
156 160          let key = getTreasuryKey(NationKey)
157 161          let reservedAmount = tryGetInteger(key)
158 162          $Tuple2([IntegerEntry(key, (reservedAmount + amount))], (reservedAmount + amount))
159 163          }
160 164  
161 165  
162 166  
163 167  @Callable(i)
164 168  func decreaseNationWallet (NationKey,amount) = if (!(checkAdmin(i.caller)))
165 169      then throw("you are not authorized to perform this operation")
166 170      else {
167 171          let key = getTreasuryKey(NationKey)
168 172          let reservedAmount = tryGetInteger(key)
169 173          $Tuple2([IntegerEntry(key, (reservedAmount - amount))], amount)
170 174          }
171 175  
172 176

Old	New		Differences
8	8		let assetsAddress = base58'3N8WDKbqGox5Eky326PHHT7rUyrby5MXdmb'
9	9
10	10		let nationsAddress = base58'3MvyzDtzWWV5MZ1GP8JfQhhQqiGU4Nbifdy'
	11	+
	12	+	let marketplaceAddress = base58'3Mra7mjPipcQd5sJaRmXK8xgS4scb8gPF4A'
11	13
12	14		func tryGetInteger (key) = match getInteger(this, key) {
13	15		case b: Int =>

53	55		func internalTransfer (fromAddress,toAddress,amount) = (internalPay(fromAddress, amount) ++ internalDeposit(toAddress, amount))
54	56
55	57
56		-	func checkAdmin (caller) = if (if (if ((caller == adminAddress))
	58	+	func checkAdmin (caller) = if (if (if (if ((caller == adminAddress))
57	59		then true
58	60		else (caller == this))
59	61		then true
60	62		else (caller.bytes == nationsAddress))
61	63		then true
62		-	else (caller.bytes == assetsAddress)
	64	+	else (caller.bytes == assetsAddress))
	65	+	then true
	66	+	else (caller.bytes == marketplaceAddress)
63	67
64	68
65	69		@Callable(i)

Old	New		Differences
1	1		{-# STDLIB_VERSION 5 #-}
2	2		{-# SCRIPT_TYPE ACCOUNT #-}
3	3		{-# CONTENT_TYPE DAPP #-}
4	4		let shinywggid = base58'AFQS5E4ELtxex3iANtWtUU2V2oWJZSo8VVnK8z3VFmqf'
5	5
6	6		let adminAddress = addressFromStringValue("3MpNtiPSRSq6NnaQYk38BfWSzZcgAYTyrQ9")
7	7
8	8		let assetsAddress = base58'3N8WDKbqGox5Eky326PHHT7rUyrby5MXdmb'
9	9
10	10		let nationsAddress = base58'3MvyzDtzWWV5MZ1GP8JfQhhQqiGU4Nbifdy'
	11	+
	12	+	let marketplaceAddress = base58'3Mra7mjPipcQd5sJaRmXK8xgS4scb8gPF4A'
11	13
12	14		func tryGetInteger (key) = match getInteger(this, key) {
13	15		case b: Int =>
14	16		b
15	17		case _ =>
16	18		0
17	19		}
18	20
19	21
20	22		func tryGetBoolean (key) = match getBoolean(this, key) {
21	23		case b: Boolean =>
22	24		b
23	25		case _ =>
24	26		false
25	27		}
26	28
27	29
28	30		func getTreasuryKey (nationid) = (nationid + "_Treasury")
29	31
30	32
31	33		func internalDeposit (addressStr,amountIn) = {
32	34		let amount = tryGetInteger((addressStr + "_Deposit"))
33	35		[IntegerEntry((addressStr + "_Deposit"), (amount + amountIn))]
34	36		}
35	37
36	38
37	39		func internalPay (addressStr,amount) = {
38	40		let deposited = tryGetInteger((addressStr + "_Deposit"))
39	41		if ((0 > (deposited - amount)))
40	42		then throw("Not enough deposit.")
41	43		else if (((deposited - amount) == 0))
42	44		then [DeleteEntry((addressStr + "_Deposit"))]
43	45		else [IntegerEntry((addressStr + "_Deposit"), (deposited - amount))]
44	46		}
45	47
46	48
47	49		func internalReserve (addressStr,amount) = {
48	50		let reservedAmount = tryGetInteger((addressStr + "_Reserved"))
49	51		[IntegerEntry((addressStr + "_Reserved"), (reservedAmount + amount))]
50	52		}
51	53
52	54
53	55		func internalTransfer (fromAddress,toAddress,amount) = (internalPay(fromAddress, amount) ++ internalDeposit(toAddress, amount))
54	56
55	57
56		-	func checkAdmin (caller) = if (if (if ((caller == adminAddress))
	58	+	func checkAdmin (caller) = if (if (if (if ((caller == adminAddress))
57	59		then true
58	60		else (caller == this))
59	61		then true
60	62		else (caller.bytes == nationsAddress))
61	63		then true
62		-	else (caller.bytes == assetsAddress)
	64	+	else (caller.bytes == assetsAddress))
	65	+	then true
	66	+	else (caller.bytes == marketplaceAddress)
63	67
64	68
65	69		@Callable(i)
66	70		func Deposit () = {
67	71		let addressStr = toString(i.originCaller)
68	72		let pmt = i.payments[0]
69	73		if ((pmt == pmt))
70	74		then {
71	75		let amountIn = value(i.payments[0].amount)
72	76		if ((amountIn == amountIn))
73	77		then {
74	78		let assetIn = pmt.assetId
75	79		if ((assetIn == assetIn))
76	80		then if ((assetIn != shinywggid))
77	81		then throw("Only $HEG payments allowed")
78	82		else {
79	83		let amount = tryGetInteger((addressStr + "_Deposit"))
80	84		$Tuple2(internalDeposit(addressStr, (amount + amountIn)), (amount + amountIn))
81	85		}
82	86		else throw("Strict value is not equal to itself.")
83	87		}
84	88		else throw("Strict value is not equal to itself.")
85	89		}
86	90		else throw("Strict value is not equal to itself.")
87	91		}
88	92
89	93
90	94
91	95		@Callable(i)
92	96		func Pay (addressStr,amount) = if (!(checkAdmin(i.caller)))
93	97		then throw("you are not authorized to perform this operation")
94	98		else $Tuple2(internalPay(addressStr, amount), amount)
95	99
96	100
97	101
98	102		@Callable(i)
99	103		func CallerPay (amount) = {
100	104		let callerAddr = toString(i.caller)
101	105		internalPay(callerAddr, amount)
102	106		}
103	107
104	108
105	109
106	110		@Callable(i)
107	111		func transferCoins (fromAddress,toAddress,amount) = if (if ((i.caller != adminAddress))
108	112		then (i.caller.bytes != assetsAddress)
109	113		else false)
110	114		then throw("you are not authorized to perform this operation")
111	115		else $Tuple2(internalTransfer(fromAddress, toAddress, amount), amount)
112	116
113	117
114	118
115	119		@Callable(i)
116	120		func callerTransferCoins (toAddress,amount) = internalTransfer(toString(i.caller), toAddress, amount)
117	121
118	122
119	123
120	124		@Callable(i)
121	125		func arbitraryAddCoins (toAddress,amount) = if (if (if ((i.caller != adminAddress))
122	126		then (i.caller.bytes != assetsAddress)
123	127		else false)
124	128		then (i.caller.bytes != nationsAddress)
125	129		else false)
126	130		then throw("you are not authorized to perform this operation")
127	131		else $Tuple2(internalDeposit(toAddress, amount), amount)
128	132
129	133
130	134
131	135		@Callable(i)
132	136		func Redeem () = {
133	137		let addressStr = toString(i.caller)
134	138		let reservedAmount = tryGetInteger((addressStr + "_Reserved"))
135	139		if ((reservedAmount == 0))
136	140		then throw("Nothing to redeem")
137	141		else [DeleteEntry((addressStr + "_Reserved")), ScriptTransfer(i.caller, reservedAmount, shinywggid)]
138	142		}
139	143
140	144
141	145
142	146		@Callable(i)
143	147		func addReward (addressStr,amount) = if (!(checkAdmin(i.caller)))
144	148		then throw("you are not authorized to perform this operation")
145	149		else {
146	150		let reservedAmount = tryGetInteger((addressStr + "_Reserved"))
147	151		$Tuple2([IntegerEntry((addressStr + "_Reserved"), (reservedAmount + amount))], (reservedAmount + amount))
148	152		}
149	153
150	154
151	155
152	156		@Callable(i)
153	157		func increaseNationWallet (NationKey,amount) = if (!(checkAdmin(i.caller)))
154	158		then throw("you are not authorized to perform this operation")
155	159		else {
156	160		let key = getTreasuryKey(NationKey)
157	161		let reservedAmount = tryGetInteger(key)
158	162		$Tuple2([IntegerEntry(key, (reservedAmount + amount))], (reservedAmount + amount))
159	163		}
160	164
161	165
162	166
163	167		@Callable(i)
164	168		func decreaseNationWallet (NationKey,amount) = if (!(checkAdmin(i.caller)))
165	169		then throw("you are not authorized to perform this operation")
166	170		else {
167	171		let key = getTreasuryKey(NationKey)
168	172		let reservedAmount = tryGetInteger(key)
169	173		$Tuple2([IntegerEntry(key, (reservedAmount - amount))], amount)
170	174		}
171	175
172	176

github/deemru/w8io/169f3d6 
45.34 ms ◑