@realms-today/sowell-governance 0.2.10 → 0.2.11
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.
|
@@ -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;CAC9B;AAED,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,sBAAsB,GAC3B,sBAAsB,
|
|
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;CAC9B;AAED,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,sBAAsB,GAC3B,sBAAsB,CA6CxB"}
|
|
@@ -4,8 +4,10 @@ exports.executeTransactionInstruction = executeTransactionInstruction;
|
|
|
4
4
|
const web3_js_1 = require("@solana/web3.js");
|
|
5
5
|
const borsh_1 = require("../borsh");
|
|
6
6
|
const enums_1 = require("../enums");
|
|
7
|
+
const pda_1 = require("../pda");
|
|
7
8
|
function executeTransactionInstruction(args) {
|
|
8
9
|
const { programId, governance, proposal, proposalTransaction, instructionAccounts, bet, governanceLimits, } = args;
|
|
10
|
+
const nativeTreasury = (0, pda_1.getNativeTreasuryAddress)(programId, governance);
|
|
9
11
|
const keys = [
|
|
10
12
|
{ pubkey: governance, isSigner: false, isWritable: false },
|
|
11
13
|
{ pubkey: proposal, isSigner: false, isWritable: true },
|
|
@@ -17,7 +19,18 @@ function executeTransactionInstruction(args) {
|
|
|
17
19
|
if (governanceLimits) {
|
|
18
20
|
keys.push({ pubkey: governanceLimits, isSigner: false, isWritable: false });
|
|
19
21
|
}
|
|
20
|
-
|
|
22
|
+
const normalizedInstructionAccounts = instructionAccounts.map((account) => {
|
|
23
|
+
if (account.isSigner &&
|
|
24
|
+
(account.pubkey.equals(governance) || account.pubkey.equals(nativeTreasury))) {
|
|
25
|
+
return {
|
|
26
|
+
pubkey: account.pubkey,
|
|
27
|
+
isWritable: account.isWritable,
|
|
28
|
+
isSigner: false,
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
return account;
|
|
32
|
+
});
|
|
33
|
+
keys.push(...normalizedInstructionAccounts);
|
|
21
34
|
const w = new borsh_1.BorshWriter();
|
|
22
35
|
w.writeU8(enums_1.GovernanceInstruction.ExecuteTransaction);
|
|
23
36
|
return new web3_js_1.TransactionInstruction({ programId, keys, data: w.toBuffer() });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executeTransaction.js","sourceRoot":"","sources":["../../src/instructions/executeTransaction.ts"],"names":[],"mappings":";;AAyBA,
|
|
1
|
+
{"version":3,"file":"executeTransaction.js","sourceRoot":"","sources":["../../src/instructions/executeTransaction.ts"],"names":[],"mappings":";;AAyBA,sEA+CC;AAxED,6CAIyB;AACzB,oCAAuC;AACvC,oCAAiD;AACjD,gCAAkD;AAkBlD,SAAgB,6BAA6B,CAC3C,IAA4B;IAE5B,MAAM,EACJ,SAAS,EACT,UAAU,EACV,QAAQ,EACR,mBAAmB,EACnB,mBAAmB,EACnB,GAAG,EACH,gBAAgB,GACjB,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;IAC9E,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"}
|