Skip to content

Commit 1bcfaad

Browse files
authored
Merge pull request #13 from flare-foundation:0.1.42
Update version to 0.1.42; add MasterAccountController ABI
2 parents 59cfb7d + e3789dd commit 1bcfaad

File tree

23 files changed

+5235
-191
lines changed

23 files changed

+5235
-191
lines changed

coston2/abis.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,13 @@ export const products: {
560560
abi: interfaceAbis.IJsonApiVerification,
561561
getAddress: async (provider: Provider) => await nameToAddress("JsonApiVerification", provider),
562562
},
563+
MasterAccountController: {
564+
name: "MasterAccountController",
565+
interface: "IMasterAccountController",
566+
registry: "MasterAccountController",
567+
abi: interfaceAbis.IMasterAccountController,
568+
getAddress: async (provider: Provider) => await nameToAddress("MasterAccountController", provider),
569+
},
563570
PriceSubmitter: {
564571
name: "PriceSubmitter",
565572
interface: "IPriceSubmitter",

flare/abis.ts

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import IAddressValidityVerification from "./artifacts/contracts/IAddressValidity
1313
import IAgentAlwaysAllowedMinters from "./artifacts/contracts/IAgentAlwaysAllowedMinters.sol/IAgentAlwaysAllowedMinters.json";
1414
import IAgentOwnerRegistry from "./artifacts/contracts/IAgentOwnerRegistry.sol/IAgentOwnerRegistry.json";
1515
import IAgentPing from "./artifacts/contracts/IAgentPing.sol/IAgentPing.json";
16+
import IAgentVaultsFacet from "./artifacts/contracts/IAgentVaultsFacet.sol/IAgentVaultsFacet.json";
1617
import IAssetManager from "./artifacts/contracts/IAssetManager.sol/IAssetManager.json";
1718
import IAssetManagerController from "./artifacts/contracts/IAssetManagerController.sol/IAssetManagerController.json";
1819
import IAssetManagerEvents from "./artifacts/contracts/IAssetManagerEvents.sol/IAssetManagerEvents.json";
@@ -26,12 +27,18 @@ import IConfirmedBlockHeightExists from "./artifacts/contracts/IConfirmedBlockHe
2627
import IConfirmedBlockHeightExistsVerification from "./artifacts/contracts/IConfirmedBlockHeightExistsVerification.sol/IConfirmedBlockHeightExistsVerification.json";
2728
import ICoreVaultClient from "./artifacts/contracts/ICoreVaultClient.sol/ICoreVaultClient.json";
2829
import ICoreVaultClientSettings from "./artifacts/contracts/ICoreVaultClientSettings.sol/ICoreVaultClientSettings.json";
30+
import ICustomInstructionsFacet from "./artifacts/contracts/ICustomInstructionsFacet.sol/ICustomInstructionsFacet.json";
2931
import IDelegationAccount from "./artifacts/contracts/IDelegationAccount.sol/IDelegationAccount.json";
32+
import IDiamond from "./artifacts/contracts/diamond/interfaces/IDiamond.sol/IDiamond.json";
33+
import IDiamondCut from "./artifacts/contracts/diamond/interfaces/IDiamondCut.sol/IDiamondCut.json";
3034
import IDiamondLoupe from "./artifacts/contracts/diamond/interfaces/IDiamondLoupe.sol/IDiamondLoupe.json";
3135
import IDistributionToDelegators from "./artifacts/contracts/IDistributionToDelegators.sol/IDistributionToDelegators.json";
36+
import IERC165 from "./artifacts/contracts/diamond/interfaces/IERC165.sol/IERC165.json";
37+
import IERC173 from "./artifacts/contracts/diamond/interfaces/IERC173.sol/IERC173.json";
3238
import IEVMTransaction from "./artifacts/contracts/IEVMTransaction.sol/IEVMTransaction.json";
3339
import IEVMTransactionVerification from "./artifacts/contracts/IEVMTransactionVerification.sol/IEVMTransactionVerification.json";
3440
import IEntityManager from "./artifacts/contracts/IEntityManager.sol/IEntityManager.json";
41+
import IExecutorsFacet from "./artifacts/contracts/IExecutorsFacet.sol/IExecutorsFacet.json";
3542
import IFAsset from "./artifacts/contracts/IFAsset.sol/IFAsset.json";
3643
import IFastUpdateIncentiveManager from "./artifacts/contracts/IFastUpdateIncentiveManager.sol/IFastUpdateIncentiveManager.json";
3744
import IFastUpdater from "./artifacts/contracts/IFastUpdater.sol/IFastUpdater.json";
@@ -117,14 +124,20 @@ import IIVoterRegistry from "./artifacts/contracts/protocol/interfaces/IIVoterRe
117124
import IIVoterWhitelister from "./artifacts/contracts/utils/interfaces/IIVoterWhitelister.sol/IIVoterWhitelister.json";
118125
import IIncreaseManager from "./artifacts/contracts/IIncreaseManager.sol/IIncreaseManager.json";
119126
import IInflationGenesis from "./artifacts/contracts/genesis/interfaces/IInflationGenesis.sol/IInflationGenesis.json";
127+
import IInstructionFeesFacet from "./artifacts/contracts/IInstructionFeesFacet.sol/IInstructionFeesFacet.json";
128+
import IInstructionsFacet from "./artifacts/contracts/IInstructionsFacet.sol/IInstructionsFacet.json";
120129
import IJsonApi from "./artifacts/contracts/IJsonApi.sol/IJsonApi.json";
121130
import IJsonApiVerification from "./artifacts/contracts/IJsonApiVerification.sol/IJsonApiVerification.json";
131+
import IMasterAccountController from "./artifacts/contracts/IMasterAccountController.sol/IMasterAccountController.json";
122132
import IPChainStakeMirror from "./artifacts/contracts/IPChainStakeMirror.sol/IPChainStakeMirror.json";
123133
import IPChainStakeMirrorMultiSigVoting from "./artifacts/contracts/IPChainStakeMirrorMultiSigVoting.sol/IPChainStakeMirrorMultiSigVoting.json";
124134
import IPChainStakeMirrorVerifier from "./artifacts/contracts/IPChainStakeMirrorVerifier.sol/IPChainStakeMirrorVerifier.json";
125135
import IPChainVotePower from "./artifacts/contracts/IPChainVotePower.sol/IPChainVotePower.json";
126136
import IPayment from "./artifacts/contracts/IPayment.sol/IPayment.json";
137+
import IPaymentProofsFacet from "./artifacts/contracts/IPaymentProofsFacet.sol/IPaymentProofsFacet.json";
127138
import IPaymentVerification from "./artifacts/contracts/IPaymentVerification.sol/IPaymentVerification.json";
139+
import IPersonalAccount from "./artifacts/contracts/IPersonalAccount.sol/IPersonalAccount.json";
140+
import IPersonalAccountsFacet from "./artifacts/contracts/IPersonalAccountsFacet.sol/IPersonalAccountsFacet.json";
128141
import IPollingFtso from "./artifacts/contracts/IPollingFtso.sol/IPollingFtso.json";
129142
import IPollingManagementGroup from "./artifacts/contracts/IPollingManagementGroup.sol/IPollingManagementGroup.json";
130143
import IPriceSubmitter from "./artifacts/contracts/IPriceSubmitter.sol/IPriceSubmitter.json";
@@ -137,20 +150,24 @@ import IReferencedPaymentNonexistenceVerification from "./artifacts/contracts/IR
137150
import IRelay from "./artifacts/contracts/IRelay.sol/IRelay.json";
138151
import IRewardManager from "./artifacts/contracts/IRewardManager.sol/IRewardManager.json";
139152
import ISubmission from "./artifacts/contracts/ISubmission.sol/ISubmission.json";
153+
import ISwapFacet from "./artifacts/contracts/ISwapFacet.sol/ISwapFacet.json";
154+
import ITimelockFacet from "./artifacts/contracts/ITimelockFacet.sol/ITimelockFacet.json";
140155
import ITypeTemplate from "./artifacts/contracts/fdc/interfaces/ITypeTemplate.sol/ITypeTemplate.json";
141156
import ITypeTemplateVerification from "./artifacts/contracts/fdc/interfaces/ITypeTemplateVerification.sol/ITypeTemplateVerification.json";
142157
import IUpdateValidators from "./artifacts/contracts/utils/interfaces/IUpdateValidators.sol/IUpdateValidators.json";
143158
import IVPContractEvents from "./artifacts/contracts/IVPContractEvents.sol/IVPContractEvents.json";
144159
import IVPToken from "./artifacts/contracts/IVPToken.sol/IVPToken.json";
145160
import IValidatorRegistry from "./artifacts/contracts/IValidatorRegistry.sol/IValidatorRegistry.json";
146161
import IValidatorRewardOffersManager from "./artifacts/contracts/IValidatorRewardOffersManager.sol/IValidatorRewardOffersManager.json";
162+
import IVaultsFacet from "./artifacts/contracts/IVaultsFacet.sol/IVaultsFacet.json";
147163
import IVoterPreRegistry from "./artifacts/contracts/IVoterPreRegistry.sol/IVoterPreRegistry.json";
148164
import IVoterRegistry from "./artifacts/contracts/IVoterRegistry.sol/IVoterRegistry.json";
149165
import IVoterWhitelister from "./artifacts/contracts/IVoterWhitelister.sol/IVoterWhitelister.json";
150166
import IWNat from "./artifacts/contracts/IWNat.sol/IWNat.json";
151167
import IWNatDelegationFee from "./artifacts/contracts/IWNatDelegationFee.sol/IWNatDelegationFee.json";
152168
import IWeb2Json from "./artifacts/contracts/IWeb2Json.sol/IWeb2Json.json";
153169
import IWeb2JsonVerification from "./artifacts/contracts/IWeb2JsonVerification.sol/IWeb2JsonVerification.json";
170+
import IXrplProviderWalletsFacet from "./artifacts/contracts/IXrplProviderWalletsFacet.sol/IXrplProviderWalletsFacet.json";
154171
import ProtocolsV2Interface from "./artifacts/contracts/ProtocolsV2Interface.sol/ProtocolsV2Interface.json";
155172
import RandomNumberV2Interface from "./artifacts/contracts/RandomNumberV2Interface.sol/RandomNumberV2Interface.json";
156173
import RedemptionRequestInfo from "./artifacts/contracts/data/RedemptionRequestInfo.sol/RedemptionRequestInfo.json";
@@ -182,6 +199,7 @@ export const interfaceAbis: { [key: string]: any } = {
182199
IAgentAlwaysAllowedMinters: IAgentAlwaysAllowedMinters,
183200
IAgentOwnerRegistry: IAgentOwnerRegistry,
184201
IAgentPing: IAgentPing,
202+
IAgentVaultsFacet: IAgentVaultsFacet,
185203
IAssetManager: IAssetManager,
186204
IAssetManagerController: IAssetManagerController,
187205
IAssetManagerEvents: IAssetManagerEvents,
@@ -195,12 +213,18 @@ export const interfaceAbis: { [key: string]: any } = {
195213
IConfirmedBlockHeightExistsVerification: IConfirmedBlockHeightExistsVerification,
196214
ICoreVaultClient: ICoreVaultClient,
197215
ICoreVaultClientSettings: ICoreVaultClientSettings,
216+
ICustomInstructionsFacet: ICustomInstructionsFacet,
198217
IDelegationAccount: IDelegationAccount,
218+
IDiamond: IDiamond,
219+
IDiamondCut: IDiamondCut,
199220
IDiamondLoupe: IDiamondLoupe,
200221
IDistributionToDelegators: IDistributionToDelegators,
222+
IERC165: IERC165,
223+
IERC173: IERC173,
201224
IEVMTransaction: IEVMTransaction,
202225
IEVMTransactionVerification: IEVMTransactionVerification,
203226
IEntityManager: IEntityManager,
227+
IExecutorsFacet: IExecutorsFacet,
204228
IFAsset: IFAsset,
205229
IFastUpdateIncentiveManager: IFastUpdateIncentiveManager,
206230
IFastUpdater: IFastUpdater,
@@ -286,14 +310,20 @@ export const interfaceAbis: { [key: string]: any } = {
286310
IIVoterWhitelister: IIVoterWhitelister,
287311
IIncreaseManager: IIncreaseManager,
288312
IInflationGenesis: IInflationGenesis,
313+
IInstructionFeesFacet: IInstructionFeesFacet,
314+
IInstructionsFacet: IInstructionsFacet,
289315
IJsonApi: IJsonApi,
290316
IJsonApiVerification: IJsonApiVerification,
317+
IMasterAccountController: IMasterAccountController,
291318
IPChainStakeMirror: IPChainStakeMirror,
292319
IPChainStakeMirrorMultiSigVoting: IPChainStakeMirrorMultiSigVoting,
293320
IPChainStakeMirrorVerifier: IPChainStakeMirrorVerifier,
294321
IPChainVotePower: IPChainVotePower,
295322
IPayment: IPayment,
323+
IPaymentProofsFacet: IPaymentProofsFacet,
296324
IPaymentVerification: IPaymentVerification,
325+
IPersonalAccount: IPersonalAccount,
326+
IPersonalAccountsFacet: IPersonalAccountsFacet,
297327
IPollingFtso: IPollingFtso,
298328
IPollingManagementGroup: IPollingManagementGroup,
299329
IPriceSubmitter: IPriceSubmitter,
@@ -306,20 +336,24 @@ export const interfaceAbis: { [key: string]: any } = {
306336
IRelay: IRelay,
307337
IRewardManager: IRewardManager,
308338
ISubmission: ISubmission,
339+
ISwapFacet: ISwapFacet,
340+
ITimelockFacet: ITimelockFacet,
309341
ITypeTemplate: ITypeTemplate,
310342
ITypeTemplateVerification: ITypeTemplateVerification,
311343
IUpdateValidators: IUpdateValidators,
312344
IVPContractEvents: IVPContractEvents,
313345
IVPToken: IVPToken,
314346
IValidatorRegistry: IValidatorRegistry,
315347
IValidatorRewardOffersManager: IValidatorRewardOffersManager,
348+
IVaultsFacet: IVaultsFacet,
316349
IVoterPreRegistry: IVoterPreRegistry,
317350
IVoterRegistry: IVoterRegistry,
318351
IVoterWhitelister: IVoterWhitelister,
319352
IWNat: IWNat,
320353
IWNatDelegationFee: IWNatDelegationFee,
321354
IWeb2Json: IWeb2Json,
322355
IWeb2JsonVerification: IWeb2JsonVerification,
356+
IXrplProviderWalletsFacet: IXrplProviderWalletsFacet,
323357
ProtocolsV2Interface: ProtocolsV2Interface,
324358
RandomNumberV2Interface: RandomNumberV2Interface,
325359
RedemptionRequestInfo: RedemptionRequestInfo,
@@ -519,6 +553,13 @@ export const products: {
519553
abi: interfaceAbis.IGovernanceVotePower,
520554
getAddress: async (provider: Provider) => await nameToAddress("GovernanceVotePower", provider),
521555
},
556+
MasterAccountController: {
557+
name: "MasterAccountController",
558+
interface: "IMasterAccountController",
559+
registry: "MasterAccountController",
560+
abi: interfaceAbis.IMasterAccountController,
561+
getAddress: async (provider: Provider) => await nameToAddress("MasterAccountController", provider),
562+
},
522563
PriceSubmitter: {
523564
name: "PriceSubmitter",
524565
interface: "IPriceSubmitter",
Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
[
2+
{
3+
"inputs": [
4+
{
5+
"internalType": "address",
6+
"name": "agentVault",
7+
"type": "address"
8+
}
9+
],
10+
"name": "AgentNotAvailable",
11+
"type": "error"
12+
},
13+
{
14+
"inputs": [
15+
{
16+
"internalType": "address",
17+
"name": "agentVaultAddress",
18+
"type": "address"
19+
}
20+
],
21+
"name": "AgentVaultAddressAlreadyAdded",
22+
"type": "error"
23+
},
24+
{
25+
"inputs": [
26+
{
27+
"internalType": "uint256",
28+
"name": "index",
29+
"type": "uint256"
30+
}
31+
],
32+
"name": "AgentVaultAddressZero",
33+
"type": "error"
34+
},
35+
{
36+
"inputs": [
37+
{
38+
"internalType": "uint256",
39+
"name": "agentVaultId",
40+
"type": "uint256"
41+
}
42+
],
43+
"name": "AgentVaultIdAlreadyAdded",
44+
"type": "error"
45+
},
46+
{
47+
"inputs": [
48+
{
49+
"internalType": "uint256",
50+
"name": "index",
51+
"type": "uint256"
52+
}
53+
],
54+
"name": "AgentVaultIdZero",
55+
"type": "error"
56+
},
57+
{
58+
"inputs": [],
59+
"name": "AgentsVaultsLengthsMismatch",
60+
"type": "error"
61+
},
62+
{
63+
"inputs": [
64+
{
65+
"internalType": "uint256",
66+
"name": "agentVaultId",
67+
"type": "uint256"
68+
}
69+
],
70+
"name": "InvalidAgentVault",
71+
"type": "error"
72+
},
73+
{
74+
"anonymous": false,
75+
"inputs": [
76+
{
77+
"indexed": true,
78+
"internalType": "uint256",
79+
"name": "agentVaultId",
80+
"type": "uint256"
81+
},
82+
{
83+
"indexed": true,
84+
"internalType": "address",
85+
"name": "agentVaultAddress",
86+
"type": "address"
87+
}
88+
],
89+
"name": "AgentVaultAdded",
90+
"type": "event"
91+
},
92+
{
93+
"anonymous": false,
94+
"inputs": [
95+
{
96+
"indexed": true,
97+
"internalType": "uint256",
98+
"name": "agentVaultId",
99+
"type": "uint256"
100+
},
101+
{
102+
"indexed": true,
103+
"internalType": "address",
104+
"name": "agentVaultAddress",
105+
"type": "address"
106+
}
107+
],
108+
"name": "AgentVaultRemoved",
109+
"type": "event"
110+
},
111+
{
112+
"inputs": [],
113+
"name": "getAgentVaults",
114+
"outputs": [
115+
{
116+
"internalType": "uint256[]",
117+
"name": "_agentVaultIds",
118+
"type": "uint256[]"
119+
},
120+
{
121+
"internalType": "address[]",
122+
"name": "_agentVaultAddresses",
123+
"type": "address[]"
124+
}
125+
],
126+
"stateMutability": "view",
127+
"type": "function"
128+
}
129+
]

0 commit comments

Comments
 (0)