Skip to content

Commit deb71d2

Browse files
authored
Merge pull request #9 from flare-foundation:0.1.43
Update version to 0.1.43 and remove ICustomInstructionsFacet interface from the project.
2 parents a15544e + 0cbaade commit deb71d2

11 files changed

+3
-269
lines changed

foundry.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "flare-periphery"
3-
version = "0.1.42"
3+
version = "0.1.43"
44

55
[profile.default]
66
src = "src"

src/coston2/ICustomInstructionsFacet.sol

Lines changed: 0 additions & 85 deletions
This file was deleted.

src/coston2/IInstructionsFacet.sol

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
pragma solidity >=0.8.4 <0.9;
33

44
import {IPayment} from "./IPayment.sol";
5-
import {ICustomInstructionsFacet} from "./ICustomInstructionsFacet.sol";
65

76
/**
87
* @title IInstructionsFacet
@@ -174,18 +173,6 @@ interface IInstructionsFacet {
174173
uint256 amount
175174
);
176175

177-
/**
178-
* @notice Emitted when a custom instruction is executed.
179-
* @param personalAccount The personal account address.
180-
* @param callHash The call hash of the custom instruction.
181-
* @param customInstruction The custom instruction.
182-
*/
183-
event CustomInstructionExecuted(
184-
address indexed personalAccount,
185-
bytes32 indexed callHash,
186-
ICustomInstructionsFacet.CustomCall[] customInstruction
187-
);
188-
189176
/**
190177
* @notice Reverts if the payment amount is invalid.
191178
* @param requiredAmount The required payment amount.
@@ -252,11 +239,6 @@ interface IInstructionsFacet {
252239
*/
253240
error InvalidMinter();
254241

255-
/**
256-
* @notice Reverts if the provided custom instruction hash is invalid (not registered).
257-
*/
258-
error InvalidCustomInstructionHash();
259-
260242
/**
261243
* @notice Reserve collateral for minting operation.
262244
* @param _xrplAddress The XRPL address requesting the collateral reservation.

src/coston2/IMasterAccountController.sol

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import {ISwapFacet} from "./ISwapFacet.sol";
1616
import {ITimelockFacet} from "./ITimelockFacet.sol";
1717
import {IVaultsFacet} from "./IVaultsFacet.sol";
1818
import {IXrplProviderWalletsFacet} from "./IXrplProviderWalletsFacet.sol";
19-
import {ICustomInstructionsFacet} from "./ICustomInstructionsFacet.sol";
2019

2120
/**
2221
* @title IMasterAccountController
@@ -37,6 +36,5 @@ interface IMasterAccountController is
3736
ISwapFacet,
3837
ITimelockFacet,
3938
IVaultsFacet,
40-
IXrplProviderWalletsFacet,
41-
ICustomInstructionsFacet
39+
IXrplProviderWalletsFacet
4240
{}

src/coston2/IPersonalAccount.sol

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity >=0.8.4 <0.9;
33

4-
import {ICustomInstructionsFacet} from "./ICustomInstructionsFacet.sol";
5-
64
/**
75
* @title IPersonalAccount
86
* @notice Interface for PersonalAccount contract.
@@ -146,14 +144,6 @@ interface IPersonalAccount {
146144
uint256 amountOut
147145
);
148146

149-
/**
150-
* @notice Emitted when a custom instruction is executed.
151-
* @param customInstruction The custom instruction.
152-
*/
153-
event CustomInstructionExecuted(
154-
ICustomInstructionsFacet.CustomCall[] indexed customInstruction
155-
);
156-
157147
/**
158148
* @notice Reverts if the sent value is insufficient for collateral reservation.
159149
* @param collateralReservationFee The required collateral reservation fee.
@@ -202,12 +192,6 @@ interface IPersonalAccount {
202192
*/
203193
error ApprovalFailed();
204194

205-
/**
206-
* @notice Reverts if the custom call fails.
207-
* @param customCall The custom call that failed.
208-
*/
209-
error CustomInstructionCallFailed(ICustomInstructionsFacet.CustomCall customCall);
210-
211195
/**
212196
* @notice Returns the XRPL owner address associated with this personal account.
213197
* @return The XRPL owner address

src/coston2/IVaultsFacet.sol

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,6 @@ interface IVaultsFacet {
1919
uint8 indexed vaultType
2020
);
2121

22-
/**
23-
* @notice Emitted when a vault is removed.
24-
* @param vaultId The vault ID.
25-
* @param vaultAddress The vault address.
26-
* @param vaultType The vault type (e.g., 1 = Firelight, 2 = Upshift).
27-
*/
28-
event VaultRemoved(
29-
uint256 indexed vaultId,
30-
address indexed vaultAddress,
31-
uint8 indexed vaultType
32-
);
33-
3422
/**
3523
* @notice Reverts if array lengths do not match.
3624
*/

src/flare/ICustomInstructionsFacet.sol

Lines changed: 0 additions & 85 deletions
This file was deleted.

src/flare/IInstructionsFacet.sol

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
pragma solidity >=0.8.4 <0.9;
33

44
import {IPayment} from "./IPayment.sol";
5-
import {ICustomInstructionsFacet} from "./ICustomInstructionsFacet.sol";
65

76
/**
87
* @title IInstructionsFacet
@@ -174,18 +173,6 @@ interface IInstructionsFacet {
174173
uint256 amount
175174
);
176175

177-
/**
178-
* @notice Emitted when a custom instruction is executed.
179-
* @param personalAccount The personal account address.
180-
* @param callHash The call hash of the custom instruction.
181-
* @param customInstruction The custom instruction.
182-
*/
183-
event CustomInstructionExecuted(
184-
address indexed personalAccount,
185-
bytes32 indexed callHash,
186-
ICustomInstructionsFacet.CustomCall[] customInstruction
187-
);
188-
189176
/**
190177
* @notice Reverts if the payment amount is invalid.
191178
* @param requiredAmount The required payment amount.
@@ -252,11 +239,6 @@ interface IInstructionsFacet {
252239
*/
253240
error InvalidMinter();
254241

255-
/**
256-
* @notice Reverts if the provided custom instruction hash is invalid (not registered).
257-
*/
258-
error InvalidCustomInstructionHash();
259-
260242
/**
261243
* @notice Reserve collateral for minting operation.
262244
* @param _xrplAddress The XRPL address requesting the collateral reservation.

src/flare/IMasterAccountController.sol

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import {ISwapFacet} from "./ISwapFacet.sol";
1616
import {ITimelockFacet} from "./ITimelockFacet.sol";
1717
import {IVaultsFacet} from "./IVaultsFacet.sol";
1818
import {IXrplProviderWalletsFacet} from "./IXrplProviderWalletsFacet.sol";
19-
import {ICustomInstructionsFacet} from "./ICustomInstructionsFacet.sol";
2019

2120
/**
2221
* @title IMasterAccountController
@@ -37,6 +36,5 @@ interface IMasterAccountController is
3736
ISwapFacet,
3837
ITimelockFacet,
3938
IVaultsFacet,
40-
IXrplProviderWalletsFacet,
41-
ICustomInstructionsFacet
39+
IXrplProviderWalletsFacet
4240
{}

src/flare/IPersonalAccount.sol

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// SPDX-License-Identifier: MIT
22
pragma solidity >=0.8.4 <0.9;
33

4-
import {ICustomInstructionsFacet} from "./ICustomInstructionsFacet.sol";
5-
64
/**
75
* @title IPersonalAccount
86
* @notice Interface for PersonalAccount contract.
@@ -146,14 +144,6 @@ interface IPersonalAccount {
146144
uint256 amountOut
147145
);
148146

149-
/**
150-
* @notice Emitted when a custom instruction is executed.
151-
* @param customInstruction The custom instruction.
152-
*/
153-
event CustomInstructionExecuted(
154-
ICustomInstructionsFacet.CustomCall[] indexed customInstruction
155-
);
156-
157147
/**
158148
* @notice Reverts if the sent value is insufficient for collateral reservation.
159149
* @param collateralReservationFee The required collateral reservation fee.
@@ -202,12 +192,6 @@ interface IPersonalAccount {
202192
*/
203193
error ApprovalFailed();
204194

205-
/**
206-
* @notice Reverts if the custom call fails.
207-
* @param customCall The custom call that failed.
208-
*/
209-
error CustomInstructionCallFailed(ICustomInstructionsFacet.CustomCall customCall);
210-
211195
/**
212196
* @notice Returns the XRPL owner address associated with this personal account.
213197
* @return The XRPL owner address

0 commit comments

Comments
 (0)