Skip to content

Commit b31275f

Browse files
author
Ho
committed
fmt
1 parent e97431b commit b31275f

File tree

2 files changed

+26
-22
lines changed

2 files changed

+26
-22
lines changed

contracts/FluiDex.sol

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ contract FluiDexDemo is AccessControl, IFluiDex, Ownable, ReentrancyGuard {
101101
/**
102102
* @param amount the deposit amount.
103103
*/
104-
function depositERC20(IERC20 token, uint256 amount)
104+
function depositERC20(IERC20 token, bytes32 to, uint256 amount)
105105
external
106106
override
107107
nonReentrant
@@ -170,24 +170,21 @@ contract FluiDexDemo is AccessControl, IFluiDex, Ownable, ReentrancyGuard {
170170
console.logBytes32(h);
171171

172172
uint256 h_lo = 0;
173-
for(uint i=0;i<16;i++){
174-
uint tmp = uint(uint8(h[i+16]))<<(120-8*i);
173+
for (uint256 i = 0; i < 16; i++) {
174+
uint256 tmp = uint256(uint8(h[i + 16])) << (120 - 8 * i);
175175
h_lo = h_lo + tmp;
176-
177176
}
178177
uint256 h_hi = 0;
179-
for(uint i=0;i<16;i++){
180-
uint tmp = uint(uint8(h[i]))<<(120-8*i);
178+
for (uint256 i = 0; i < 16; i++) {
179+
uint256 tmp = uint256(uint8(h[i])) << (120 - 8 * i);
181180
h_hi = h_hi + tmp;
182181
}
183182

184183
assert(_public_inputs[2] == h_hi);
185184
assert(_public_inputs[3] == h_lo);
186185

187-
return verifier.verify_serialized_proof(
188-
_public_inputs,
189-
_serialized_proof
190-
);
186+
return
187+
verifier.verify_serialized_proof(_public_inputs, _serialized_proof);
191188
}
192189

193190
/**
@@ -213,11 +210,7 @@ contract FluiDexDemo is AccessControl, IFluiDex, Ownable, ReentrancyGuard {
213210
assert(_public_inputs[0] == state_roots[_block_id - 1]);
214211
}
215212

216-
return verifyBlock(
217-
_public_inputs,
218-
_serialized_proof,
219-
_public_data
220-
);
213+
return verifyBlock(_public_inputs, _serialized_proof, _public_data);
221214
}
222215

223216
/**
@@ -230,20 +223,25 @@ contract FluiDexDemo is AccessControl, IFluiDex, Ownable, ReentrancyGuard {
230223
uint256[] memory _serialized_proof,
231224
bytes memory _public_data
232225
) external override returns (bool) {
233-
234-
require(block_states[_block_id] != BlockState.Verified, "Block must not be submitted twice");
226+
require(
227+
block_states[_block_id] != BlockState.Verified,
228+
"Block must not be submitted twice"
229+
);
235230
if (_block_id > 0) {
236-
require(block_states[_block_id - 1] == BlockState.Verified, "Previous block must be verified");
231+
require(
232+
block_states[_block_id - 1] == BlockState.Verified,
233+
"Previous block must be verified"
234+
);
237235
}
238236

239237
bool ret = verifySubmitting(
240238
_block_id,
241239
_public_inputs,
242240
_serialized_proof,
243241
_public_data
244-
);
245-
246-
if (!ret){
242+
);
243+
244+
if (!ret) {
247245
return ret;
248246
}
249247

contracts/FluiDexDelegate.sol

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,13 @@ contract FluiDexDelegate is
107107
uint256[] memory _serialized_proof,
108108
bytes memory _public_data
109109
) external override returns (bool) {
110-
return target.submitBlock(_block_id, _public_inputs, _serialized_proof, _public_data);
110+
return
111+
target.submitBlock(
112+
_block_id,
113+
_public_inputs,
114+
_serialized_proof,
115+
_public_data
116+
);
111117
}
112118

113119
/**

0 commit comments

Comments
 (0)