|
4 | 4 | pragma solidity >=0.8.0; |
5 | 5 |
|
6 | 6 | import {Hashing} from "./utils/Hashing.sol"; |
7 | | -import {Schnorr} from "./utils/Schnorr.sol"; |
| 7 | +import {Schnorr} from "../lib/frost-evm/sol/Schnorr.sol"; |
8 | 8 | import {BranchlessMath} from "./utils/BranchlessMath.sol"; |
9 | | -import {GasUtils} from "./utils/GasUtils.sol"; |
10 | | -import {UFloat9x56, UFloatMath} from "./utils/Float9x56.sol"; |
| 9 | +import {GasUtils} from "./GasUtils.sol"; |
11 | 10 | import {RouteStore} from "./storage/Routes.sol"; |
12 | 11 | import {ShardStore} from "./storage/Shards.sol"; |
13 | 12 | import {IGateway} from "./interfaces/IGateway.sol"; |
@@ -65,7 +64,6 @@ contract Gateway is IGateway, GatewayEIP712, UUPSUpgradeable, OwnableUpgradeable |
65 | 64 | using PrimitiveUtils for GmpCallback; |
66 | 65 | using PrimitiveUtils for address; |
67 | 66 | using BranchlessMath for uint256; |
68 | | - using UFloatMath for UFloat9x56; |
69 | 67 | using ShardStore for ShardStore.MainStorage; |
70 | 68 | using RouteStore for RouteStore.MainStorage; |
71 | 69 | using RouteStore for RouteStore.NetworkInfo; |
@@ -200,7 +198,7 @@ contract Gateway is IGateway, GatewayEIP712, UUPSUpgradeable, OwnableUpgradeable |
200 | 198 | _checkGmpMessage(gmp); |
201 | 199 | // Convert the `GmpMessage` into `GmpCallback`, which is a more efficient representation. |
202 | 200 | // see `src/Primitives.sol` for more details. |
203 | | - GmpCallback memory callback = gmp.intoCallback(); |
| 201 | + GmpCallback memory callback = gmp.toCallback(); |
204 | 202 | operationHash = callback.opHash; |
205 | 203 | _execute(callback); |
206 | 204 | } |
@@ -462,7 +460,7 @@ contract Gateway is IGateway, GatewayEIP712, UUPSUpgradeable, OwnableUpgradeable |
462 | 460 |
|
463 | 461 | // Convert the `GmpMessage` into `GmpCallback`, which is a more efficient representation. |
464 | 462 | // see `src/Primitives.sol` for more details. |
465 | | - GmpCallback memory callback = message.intoCallback(); |
| 463 | + GmpCallback memory callback = message.toCallback(); |
466 | 464 |
|
467 | 465 | // Verify the TSS Schnorr Signature |
468 | 466 | _verifySignature(signature, callback.opHash); |
|
0 commit comments