@realms-today/sowell-governance 0.2.15 → 0.2.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/instructions/createProposalWithTransactions.d.ts.map +1 -1
- package/dist/instructions/createProposalWithTransactions.js +11 -0
- package/dist/instructions/createProposalWithTransactions.js.map +1 -1
- package/dist/instructions/executeTransaction.d.ts +5 -0
- package/dist/instructions/executeTransaction.d.ts.map +1 -1
- package/dist/instructions/executeTransaction.js +5 -1
- package/dist/instructions/executeTransaction.js.map +1 -1
- package/dist/tradeExecutor/instructions.d.ts +5 -1
- package/dist/tradeExecutor/instructions.d.ts.map +1 -1
- package/dist/tradeExecutor/instructions.js +1 -2
- package/dist/tradeExecutor/instructions.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createProposalWithTransactions.d.ts","sourceRoot":"","sources":["../../src/instructions/createProposalWithTransactions.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,SAAS,EAET,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EACL,wBAAwB,EACxB,qBAAqB,EAGtB,MAAM,UAAU,CAAC;AAYlB,OAAO,EAAE,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AAElE,MAAM,WAAW,kCAAkC;IACjD,SAAS,EAAE,SAAS,CAAC;IACrB,KAAK,EAAE,SAAS,CAAC;IACjB,UAAU,EAAE,SAAS,CAAC;IACtB,mBAAmB,EAAE,SAAS,CAAC;IAC/B,kBAAkB,EAAE,SAAS,CAAC;IAC9B,mBAAmB,EAAE,SAAS,CAAC;IAC/B,KAAK,EAAE,SAAS,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,SAAS,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,wBAAwB,EAAE,CAAC;IACzC,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;IACd,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B,oBAAoB,CAAC,EAAE,SAAS,CAAC;IACjC,+DAA+D;IAC/D,aAAa,CAAC,EAAE,qBAAqB,CAAC;IACtC,gDAAgD;IAChD,iBAAiB,CAAC,EAAE,8BAA8B,CAAC;CACpD;AAED,wBAAgB,yCAAyC,CACvD,IAAI,EAAE,kCAAkC,GACvC,sBAAsB,
|
|
1
|
+
{"version":3,"file":"createProposalWithTransactions.d.ts","sourceRoot":"","sources":["../../src/instructions/createProposalWithTransactions.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,SAAS,EAET,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AAOzB,OAAO,EACL,wBAAwB,EACxB,qBAAqB,EAGtB,MAAM,UAAU,CAAC;AAYlB,OAAO,EAAE,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AAElE,MAAM,WAAW,kCAAkC;IACjD,SAAS,EAAE,SAAS,CAAC;IACrB,KAAK,EAAE,SAAS,CAAC;IACjB,UAAU,EAAE,SAAS,CAAC;IACtB,mBAAmB,EAAE,SAAS,CAAC;IAC/B,kBAAkB,EAAE,SAAS,CAAC;IAC9B,mBAAmB,EAAE,SAAS,CAAC;IAC/B,KAAK,EAAE,SAAS,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,SAAS,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,wBAAwB,EAAE,CAAC;IACzC,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;IACd,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B,oBAAoB,CAAC,EAAE,SAAS,CAAC;IACjC,+DAA+D;IAC/D,aAAa,CAAC,EAAE,qBAAqB,CAAC;IACtC,gDAAgD;IAChD,iBAAiB,CAAC,EAAE,8BAA8B,CAAC;CACpD;AAED,wBAAgB,yCAAyC,CACvD,IAAI,EAAE,kCAAkC,GACvC,sBAAsB,CA+JxB"}
|
|
@@ -69,6 +69,17 @@ function createProposalWithTransactionsInstruction(args) {
|
|
|
69
69
|
const secondaryVault = (0, spl_token_1.getAssociatedTokenAddressSync)(governingTokenMint, secondary, true, sowellianAccounts.splTokenProgram);
|
|
70
70
|
keys.push({ pubkey: secondary, isSigner: false, isWritable: true }, { pubkey: secondaryVault, isSigner: false, isWritable: true });
|
|
71
71
|
}
|
|
72
|
+
// Trailing optional MaxVoterWeightRecord — consumed by the program when
|
|
73
|
+
// `finalize` is set so it can attempt to tip on the seeded creator bond.
|
|
74
|
+
// Only required when the realm has a max-voter-weight addin configured
|
|
75
|
+
// for the community mint.
|
|
76
|
+
if (finalize && maxVoterWeightRecord) {
|
|
77
|
+
keys.push({
|
|
78
|
+
pubkey: maxVoterWeightRecord,
|
|
79
|
+
isSigner: false,
|
|
80
|
+
isWritable: false,
|
|
81
|
+
});
|
|
82
|
+
}
|
|
72
83
|
}
|
|
73
84
|
const w = new borsh_1.BorshWriter();
|
|
74
85
|
w.writeU8(enums_1.GovernanceInstruction.CreateProposalWithTransactions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createProposalWithTransactions.js","sourceRoot":"","sources":["../../src/instructions/createProposalWithTransactions.ts"],"names":[],"mappings":";;AAsDA,
|
|
1
|
+
{"version":3,"file":"createProposalWithTransactions.js","sourceRoot":"","sources":["../../src/instructions/createProposalWithTransactions.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,11 @@ export interface ExecuteTransactionArgs {
|
|
|
13
13
|
/** GovernanceLimits PDA — must be supplied iff
|
|
14
14
|
* `governance.hasSpendingLimits`. Inserted at fixed positional slot 4. */
|
|
15
15
|
governanceLimits?: PublicKey;
|
|
16
|
+
/** Realm — must be supplied iff `governanceLimits` is supplied. Inserted
|
|
17
|
+
* at fixed positional slot 5. The program reads `realm.communityMint` to
|
|
18
|
+
* gate spending-limit enforcement to community-voted proposals only;
|
|
19
|
+
* council-voted proposals execute without limit enforcement. */
|
|
20
|
+
realm?: PublicKey;
|
|
16
21
|
}
|
|
17
22
|
export declare function executeTransactionInstruction(args: ExecuteTransactionArgs): TransactionInstruction;
|
|
18
23
|
//# sourceMappingURL=executeTransaction.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executeTransaction.d.ts","sourceRoot":"","sources":["../../src/instructions/executeTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,SAAS,EACT,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AAKzB,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,QAAQ,EAAE,SAAS,CAAC;IACpB,mBAAmB,EAAE,SAAS,CAAC;IAC/B;0CACsC;IACtC,mBAAmB,EAAE,WAAW,EAAE,CAAC;IACnC;iFAC6E;IAC7E,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB;+EAC2E;IAC3E,gBAAgB,CAAC,EAAE,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"executeTransaction.d.ts","sourceRoot":"","sources":["../../src/instructions/executeTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,SAAS,EACT,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AAKzB,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,QAAQ,EAAE,SAAS,CAAC;IACpB,mBAAmB,EAAE,SAAS,CAAC;IAC/B;0CACsC;IACtC,mBAAmB,EAAE,WAAW,EAAE,CAAC;IACnC;iFAC6E;IAC7E,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB;+EAC2E;IAC3E,gBAAgB,CAAC,EAAE,SAAS,CAAC;IAC7B;;;qEAGiE;IACjE,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB;AAED,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,sBAAsB,GAC3B,sBAAsB,CAoDxB"}
|
|
@@ -6,7 +6,7 @@ const borsh_1 = require("../borsh");
|
|
|
6
6
|
const enums_1 = require("../enums");
|
|
7
7
|
const pda_1 = require("../pda");
|
|
8
8
|
function executeTransactionInstruction(args) {
|
|
9
|
-
const { programId, governance, proposal, proposalTransaction, instructionAccounts, bet, governanceLimits, } = args;
|
|
9
|
+
const { programId, governance, proposal, proposalTransaction, instructionAccounts, bet, governanceLimits, realm, } = args;
|
|
10
10
|
const nativeTreasury = (0, pda_1.getNativeTreasuryAddress)(programId, governance);
|
|
11
11
|
const keys = [
|
|
12
12
|
{ pubkey: governance, isSigner: false, isWritable: false },
|
|
@@ -18,6 +18,10 @@ function executeTransactionInstruction(args) {
|
|
|
18
18
|
}
|
|
19
19
|
if (governanceLimits) {
|
|
20
20
|
keys.push({ pubkey: governanceLimits, isSigner: false, isWritable: false });
|
|
21
|
+
if (!realm) {
|
|
22
|
+
throw new Error("executeTransactionInstruction: `realm` must be supplied when `governanceLimits` is set");
|
|
23
|
+
}
|
|
24
|
+
keys.push({ pubkey: realm, isSigner: false, isWritable: false });
|
|
21
25
|
}
|
|
22
26
|
const normalizedInstructionAccounts = instructionAccounts.map((account) => {
|
|
23
27
|
if (account.isSigner &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executeTransaction.js","sourceRoot":"","sources":["../../src/instructions/executeTransaction.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"executeTransaction.js","sourceRoot":"","sources":["../../src/instructions/executeTransaction.ts"],"names":[],"mappings":";;AA8BA,sEAsDC;AApFD,6CAIyB;AACzB,oCAAuC;AACvC,oCAAiD;AACjD,gCAAkD;AAuBlD,SAAgB,6BAA6B,CAC3C,IAA4B;IAE5B,MAAM,EACJ,SAAS,EACT,UAAU,EACV,QAAQ,EACR,mBAAmB,EACnB,mBAAmB,EACnB,GAAG,EACH,gBAAgB,EAChB,KAAK,GACN,GAAG,IAAI,CAAC;IACT,MAAM,cAAc,GAAG,IAAA,8BAAwB,EAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAEvE,MAAM,IAAI,GAAkB;QAC1B,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE;QAC1D,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE;QACvD,EAAE,MAAM,EAAE,mBAAmB,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE;KACnE,CAAC;IAEF,IAAI,GAAG,EAAE,CAAC;QACR,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IAChE,CAAC;IACD,IAAI,gBAAgB,EAAE,CAAC;QACrB,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5E,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CACb,wFAAwF,CACzF,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;IACnE,CAAC;IAED,MAAM,6BAA6B,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QACxE,IACE,OAAO,CAAC,QAAQ;YAChB,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,EAC5E,CAAC;YACD,OAAO;gBACL,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,QAAQ,EAAE,KAAK;aAChB,CAAC;QACJ,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,IAAI,CAAC,GAAG,6BAA6B,CAAC,CAAC;IAE5C,MAAM,CAAC,GAAG,IAAI,mBAAW,EAAE,CAAC;IAC5B,CAAC,CAAC,OAAO,CAAC,6BAAqB,CAAC,kBAAkB,CAAC,CAAC;IAEpD,OAAO,IAAI,gCAAsB,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;AAC7E,CAAC"}
|
|
@@ -2,7 +2,11 @@ import { AccountMeta, PublicKey, TransactionInstruction } from "@solana/web3.js"
|
|
|
2
2
|
import { CreateIntentParams } from "./types";
|
|
3
3
|
export interface CreateIntentArgs {
|
|
4
4
|
payer: PublicKey;
|
|
5
|
-
|
|
5
|
+
/**
|
|
6
|
+
* Treasury — signer that funds the intent and is stored on the Intent
|
|
7
|
+
* account. In a governance context this is the native treasury PDA which
|
|
8
|
+
* signs via CPI when a proposal executes this instruction.
|
|
9
|
+
*/
|
|
6
10
|
treasury: PublicKey;
|
|
7
11
|
inputMint: PublicKey;
|
|
8
12
|
outputMint: PublicKey;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instructions.d.ts","sourceRoot":"","sources":["../../src/tradeExecutor/instructions.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,SAAS,EAET,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AAezB,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAwC7C,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,SAAS,CAAC;IACjB
|
|
1
|
+
{"version":3,"file":"instructions.d.ts","sourceRoot":"","sources":["../../src/tradeExecutor/instructions.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,SAAS,EAET,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AAezB,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAwC7C,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,SAAS,CAAC;IACjB;;;;OAIG;IACH,QAAQ,EAAE,SAAS,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,kBAAkB,EAAE,SAAS,CAAC;IAC9B,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,MAAM,EAAE,kBAAkB,CAAC;CAC5B;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,gBAAgB,GAAG,sBAAsB,CAgCtF;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,SAAS,CAAC;IACpB,MAAM,EAAE,SAAS,CAAC;IAClB,QAAQ,EAAE,SAAS,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,SAAS,CAAC;IACtB,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B,kBAAkB,CAAC,EAAE,SAAS,CAAC;IAC/B,sFAAsF;IACtF,gBAAgB,EAAE,SAAS,CAAC;IAC5B,4DAA4D;IAC5D,UAAU,EAAE,SAAS,CAAC;IACtB,WAAW,EAAE,SAAS,CAAC;IACvB,6EAA6E;IAC7E,iBAAiB,EAAE,WAAW,EAAE,CAAC;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,iBAAiB,GAAG,sBAAsB,CAyDxF;AAED,MAAM,WAAW,gBAAgB;IAC/B;;;;OAIG;IACH,QAAQ,EAAE,SAAS,CAAC;IACpB,MAAM,EAAE,SAAS,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;IACrB,gBAAgB,EAAE,SAAS,CAAC;IAC5B,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,gBAAgB,GAAG,sBAAsB,CA2BtF;AAED,MAAM,WAAW,kBAAkB;IACjC,qDAAqD;IACrD,MAAM,EAAE,SAAS,CAAC;IAClB,MAAM,EAAE,SAAS,CAAC;IAClB,QAAQ,EAAE,SAAS,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,gBAAgB,EAAE,SAAS,CAAC;IAC5B,iBAAiB,CAAC,EAAE,SAAS,CAAC;IAC9B,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,kBAAkB,GAAG,sBAAsB,CA4B1F;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,SAAS,CAAC;IAClB,OAAO,EAAE;QAAE,MAAM,EAAE,SAAS,CAAC;QAAC,QAAQ,EAAE,SAAS,CAAA;KAAE,EAAE,CAAC;IACtD,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,gBAAgB,GAAG,sBAAsB,CAgBtF"}
|
|
@@ -56,8 +56,7 @@ function createIntentInstruction(args) {
|
|
|
56
56
|
const vault = (0, spl_token_1.getAssociatedTokenAddressSync)(args.inputMint, vaultAuthority, true, tokenProgram);
|
|
57
57
|
const keys = [
|
|
58
58
|
{ pubkey: args.payer, isSigner: true, isWritable: true },
|
|
59
|
-
{ pubkey: args.
|
|
60
|
-
{ pubkey: args.treasury, isSigner: false, isWritable: false },
|
|
59
|
+
{ pubkey: args.treasury, isSigner: true, isWritable: true },
|
|
61
60
|
{ pubkey: intent, isSigner: false, isWritable: true },
|
|
62
61
|
{ pubkey: vault, isSigner: false, isWritable: true },
|
|
63
62
|
{ pubkey: vaultAuthority, isSigner: false, isWritable: false },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instructions.js","sourceRoot":"","sources":["../../src/tradeExecutor/instructions.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"instructions.js","sourceRoot":"","sources":["../../src/tradeExecutor/instructions.ts"],"names":[],"mappings":"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"}
|