Skip to content

Commit 45bd1ff

Browse files
authored
Merge pull request #13 from flare-foundation/0.1.43
Update version to 0.1.43
2 parents 75aedd6 + 7bd8788 commit 45bd1ff

12 files changed

+8
-292
lines changed

coston2/ICustomInstructionsFacet.sol

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

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
@@ -173,18 +172,6 @@ interface IInstructionsFacet {
173172
uint256 amount
174173
);
175174

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

250-
/**
251-
* @notice Reverts if the provided custom instruction hash is invalid (not registered).
252-
*/
253-
error InvalidCustomInstructionHash();
254-
255237
/**
256238
* @notice Reserve collateral for minting operation.
257239
* @param _xrplAddress The XRPL address requesting the collateral reservation.

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
{}

coston2/IPersonalAccount.sol

Lines changed: 0 additions & 18 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.
@@ -131,14 +129,6 @@ interface IPersonalAccount {
131129
uint256 amountOut
132130
);
133131

134-
/**
135-
* @notice Emitted when a custom instruction is executed.
136-
* @param customInstruction The custom instruction.
137-
*/
138-
event CustomInstructionExecuted(
139-
ICustomInstructionsFacet.CustomCall[] indexed customInstruction
140-
);
141-
142132
/**
143133
* @notice Reverts if the sent value is insufficient for collateral reservation.
144134
* @param collateralReservationFee The required collateral reservation fee.
@@ -185,14 +175,6 @@ interface IPersonalAccount {
185175
*/
186176
error ApprovalFailed();
187177

188-
/**
189-
* @notice Reverts if the custom call fails.
190-
* @param customCall The custom call that failed.
191-
*/
192-
error CustomInstructionCallFailed(
193-
ICustomInstructionsFacet.CustomCall customCall
194-
);
195-
196178
/**
197179
* @notice Returns the XRPL owner address associated with this personal account.
198180
* @return The XRPL owner address

coston2/IVaultsFacet.sol

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

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

flare/ICustomInstructionsFacet.sol

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

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
@@ -173,18 +172,6 @@ interface IInstructionsFacet {
173172
uint256 amount
174173
);
175174

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

250-
/**
251-
* @notice Reverts if the provided custom instruction hash is invalid (not registered).
252-
*/
253-
error InvalidCustomInstructionHash();
254-
255237
/**
256238
* @notice Reserve collateral for minting operation.
257239
* @param _xrplAddress The XRPL address requesting the collateral reservation.

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
{}

flare/IPersonalAccount.sol

Lines changed: 0 additions & 18 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.
@@ -131,14 +129,6 @@ interface IPersonalAccount {
131129
uint256 amountOut
132130
);
133131

134-
/**
135-
* @notice Emitted when a custom instruction is executed.
136-
* @param customInstruction The custom instruction.
137-
*/
138-
event CustomInstructionExecuted(
139-
ICustomInstructionsFacet.CustomCall[] indexed customInstruction
140-
);
141-
142132
/**
143133
* @notice Reverts if the sent value is insufficient for collateral reservation.
144134
* @param collateralReservationFee The required collateral reservation fee.
@@ -185,14 +175,6 @@ interface IPersonalAccount {
185175
*/
186176
error ApprovalFailed();
187177

188-
/**
189-
* @notice Reverts if the custom call fails.
190-
* @param customCall The custom call that failed.
191-
*/
192-
error CustomInstructionCallFailed(
193-
ICustomInstructionsFacet.CustomCall customCall
194-
);
195-
196178
/**
197179
* @notice Returns the XRPL owner address associated with this personal account.
198180
* @return The XRPL owner address

0 commit comments

Comments
 (0)