Skip to content

Commit 684fda6

Browse files
committed
Merge remote-tracking branch 'origin/develop' into pileks/met-5-optimistic-governance
2 parents 56cf9eb + f1e5b94 commit 684fda6

File tree

10 files changed

+88
-2
lines changed

10 files changed

+88
-2
lines changed

Anchor.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ v07-close-launch = "yarn run tsx scripts/v0.7/closeLaunch.ts"
6464
v07-initialize-performance-package = "yarn run tsx scripts/v0.7/initializePerformancePackage.ts"
6565
v07-claim-launch-additional-tokens = "yarn run tsx scripts/v0.7/claimLaunchAdditionalTokens.ts"
6666
v07-remove-proposal = "yarn run tsx scripts/v0.7/removeProposal.ts"
67+
v07-audit-liquidity-position-authorities = "yarn run tsx scripts/v0.7/auditLiquidityPositionAuthorities.ts"
68+
v07-fix-position-authorities = "yarn run tsx scripts/v0.7/fixPositionAuthorities.ts"
6769

6870
[test]
6971
startup_wait = 5000

programs/futarchy/src/events.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,16 @@ pub struct CollectMeteoraDammFeesEvent {
222222
pub base_fees_collected: u64,
223223
}
224224

225+
#[event]
226+
pub struct AdminFixPositionAuthorityEvent {
227+
pub common: CommonFields,
228+
pub dao: Pubkey,
229+
pub admin: Pubkey,
230+
pub amm_position: Pubkey,
231+
pub old_authority: Pubkey,
232+
pub new_authority: Pubkey,
233+
}
234+
225235
#[event]
226236
pub struct InitiateVaultSpendOptimisticProposalEvent {
227237
pub common: CommonFields,

sdk/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metadaoproject/futarchy",
3-
"version": "0.7.0-alpha.10",
3+
"version": "0.7.0-alpha.12",
44
"type": "module",
55
"main": "dist/index.js",
66
"module": "dist/index.js",

sdk/src/v0.7/types/futarchy.ts

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3367,6 +3367,43 @@ export type Futarchy = {
33673367
},
33683368
];
33693369
},
3370+
{
3371+
name: "AdminFixPositionAuthorityEvent";
3372+
fields: [
3373+
{
3374+
name: "common";
3375+
type: {
3376+
defined: "CommonFields";
3377+
};
3378+
index: false;
3379+
},
3380+
{
3381+
name: "dao";
3382+
type: "publicKey";
3383+
index: false;
3384+
},
3385+
{
3386+
name: "admin";
3387+
type: "publicKey";
3388+
index: false;
3389+
},
3390+
{
3391+
name: "ammPosition";
3392+
type: "publicKey";
3393+
index: false;
3394+
},
3395+
{
3396+
name: "oldAuthority";
3397+
type: "publicKey";
3398+
index: false;
3399+
},
3400+
{
3401+
name: "newAuthority";
3402+
type: "publicKey";
3403+
index: false;
3404+
},
3405+
];
3406+
},
33703407
{
33713408
name: "InitiateVaultSpendOptimisticProposalEvent";
33723409
fields: [
@@ -7040,6 +7077,43 @@ export const IDL: Futarchy = {
70407077
},
70417078
],
70427079
},
7080+
{
7081+
name: "AdminFixPositionAuthorityEvent",
7082+
fields: [
7083+
{
7084+
name: "common",
7085+
type: {
7086+
defined: "CommonFields",
7087+
},
7088+
index: false,
7089+
},
7090+
{
7091+
name: "dao",
7092+
type: "publicKey",
7093+
index: false,
7094+
},
7095+
{
7096+
name: "admin",
7097+
type: "publicKey",
7098+
index: false,
7099+
},
7100+
{
7101+
name: "ammPosition",
7102+
type: "publicKey",
7103+
index: false,
7104+
},
7105+
{
7106+
name: "oldAuthority",
7107+
type: "publicKey",
7108+
index: false,
7109+
},
7110+
{
7111+
name: "newAuthority",
7112+
type: "publicKey",
7113+
index: false,
7114+
},
7115+
],
7116+
},
70437117
{
70447118
name: "InitiateVaultSpendOptimisticProposalEvent",
70457119
fields: [

verifiable-builds/bid_wall.so

2.76 KB
Binary file not shown.
1.61 KB
Binary file not shown.

verifiable-builds/futarchy.so

1.59 KB
Binary file not shown.

verifiable-builds/launchpad_v7.so

8.45 KB
Binary file not shown.
192 Bytes
Binary file not shown.

yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -975,7 +975,7 @@
975975
"@jridgewell/sourcemap-codec" "^1.4.10"
976976

977977
"@metadaoproject/futarchy@./sdk":
978-
version "0.7.0-alpha.10"
978+
version "0.7.0-alpha.12"
979979
dependencies:
980980
"@coral-xyz/anchor" "^0.29.0"
981981
"@metaplex-foundation/umi" "^0.9.2"

0 commit comments

Comments
 (0)