@metadaoproject/futarchy 0.3.0-alpha.16 → 0.3.0-alpha.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/AutocratClient.d.ts +17 -9
- package/dist/AutocratClient.js +48 -141
- package/dist/AutocratClient.js.map +1 -1
- package/dist/ConditionalVaultClient.d.ts +117 -120
- package/dist/ConditionalVaultClient.js +111 -178
- package/dist/ConditionalVaultClient.js.map +1 -1
- package/dist/index.d.ts +0 -1
- package/dist/index.js +0 -3
- package/dist/index.js.map +1 -1
- package/dist/types/autocrat.d.ts +6 -10
- package/dist/types/autocrat.js +6 -10
- package/dist/types/autocrat.js.map +1 -1
- package/dist/types/conditional_vault.d.ts +166 -226
- package/dist/types/conditional_vault.js +161 -221
- package/dist/types/conditional_vault.js.map +1 -1
- package/dist/utils/cu.js +1 -1
- package/dist/utils/pda.d.ts +1 -3
- package/dist/utils/pda.js +3 -27
- package/dist/utils/pda.js.map +1 -1
- package/dist/utils/priceMath.js +10 -3
- package/dist/utils/priceMath.js.map +1 -1
- package/package.json +1 -2
package/dist/utils/pda.js
CHANGED
|
@@ -1,41 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.getAmmLpMintAddr = exports.getAmmAddr = exports.getProposalAddr = exports.getDaoTreasuryAddr = exports.getVaultRevertMintAddr = exports.getMetadataAddr = exports.getVaultFinalizeMintAddr = exports.
|
|
3
|
+
exports.getAmmLpMintAddr = exports.getAmmAddr = exports.getProposalAddr = exports.getDaoTreasuryAddr = exports.getVaultRevertMintAddr = exports.getMetadataAddr = exports.getVaultFinalizeMintAddr = exports.getVaultAddr = void 0;
|
|
7
4
|
const web3_js_1 = require("@solana/web3.js");
|
|
8
5
|
const anchor_1 = require("@coral-xyz/anchor");
|
|
9
|
-
const bn_js_1 = __importDefault(require("bn.js"));
|
|
10
6
|
const constants_1 = require("../constants");
|
|
11
|
-
const
|
|
12
|
-
if (questionId.length != 32) {
|
|
13
|
-
throw new Error("questionId must be 32 bytes");
|
|
14
|
-
}
|
|
15
|
-
return web3_js_1.PublicKey.findProgramAddressSync([
|
|
16
|
-
anchor_1.utils.bytes.utf8.encode("question"),
|
|
17
|
-
Buffer.from(questionId),
|
|
18
|
-
oracle.toBuffer(),
|
|
19
|
-
new bn_js_1.default(numConditions).toBuffer("le", 1),
|
|
20
|
-
], programId);
|
|
21
|
-
};
|
|
22
|
-
exports.getQuestionAddr = getQuestionAddr;
|
|
23
|
-
const getVaultAddr = (programId, question, underlyingTokenMint) => {
|
|
7
|
+
const getVaultAddr = (programId, settlementAuthority, underlyingTokenMint) => {
|
|
24
8
|
return web3_js_1.PublicKey.findProgramAddressSync([
|
|
25
9
|
anchor_1.utils.bytes.utf8.encode("conditional_vault"),
|
|
26
|
-
|
|
10
|
+
settlementAuthority.toBuffer(),
|
|
27
11
|
underlyingTokenMint.toBuffer(),
|
|
28
12
|
], programId);
|
|
29
13
|
};
|
|
30
14
|
exports.getVaultAddr = getVaultAddr;
|
|
31
|
-
const getConditionalTokenMintAddr = (programId, vault, index) => {
|
|
32
|
-
return web3_js_1.PublicKey.findProgramAddressSync([
|
|
33
|
-
anchor_1.utils.bytes.utf8.encode("conditional_token"),
|
|
34
|
-
vault.toBuffer(),
|
|
35
|
-
new bn_js_1.default(index).toBuffer("le", 1),
|
|
36
|
-
], programId);
|
|
37
|
-
};
|
|
38
|
-
exports.getConditionalTokenMintAddr = getConditionalTokenMintAddr;
|
|
39
15
|
const getVaultFinalizeMintAddr = (programId, vault) => {
|
|
40
16
|
return getVaultMintAddr(programId, vault, "conditional_on_finalize_mint");
|
|
41
17
|
};
|
package/dist/utils/pda.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pda.js","sourceRoot":"","sources":["../../src/utils/pda.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pda.js","sourceRoot":"","sources":["../../src/utils/pda.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/priceMath.js
CHANGED
|
@@ -26,11 +26,18 @@ class PriceMath {
|
|
|
26
26
|
return chainAmount.toNumber() / 10 ** decimals;
|
|
27
27
|
}
|
|
28
28
|
static getHumanPrice(ammPrice, baseDecimals, quoteDecimals) {
|
|
29
|
-
|
|
30
|
-
|
|
29
|
+
const decimalScalar = BN_TEN.pow(new bn_js_1.default(quoteDecimals - baseDecimals).abs());
|
|
30
|
+
const price1e12 = quoteDecimals > baseDecimals
|
|
31
31
|
? ammPrice.div(decimalScalar)
|
|
32
32
|
: ammPrice.mul(decimalScalar);
|
|
33
|
-
|
|
33
|
+
// in case the BN is too large to cast to number, we try
|
|
34
|
+
try {
|
|
35
|
+
return price1e12.toNumber() / 1e12;
|
|
36
|
+
}
|
|
37
|
+
catch (e) {
|
|
38
|
+
// BN tried to cast into number larger than 53 bits so we we do division via BN methods first, then cast to number(so it is smaller before the cast)
|
|
39
|
+
return price1e12.div(new bn_js_1.default(1e12)).toNumber();
|
|
40
|
+
}
|
|
34
41
|
}
|
|
35
42
|
static getAmmPrice(humanPrice, baseDecimals, quoteDecimals) {
|
|
36
43
|
let price1e12 = new bn_js_1.default(humanPrice * PRICE_SCALE_NUMBER);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"priceMath.js","sourceRoot":"","sources":["../../src/utils/priceMath.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAuB;AAEvB,MAAM,MAAM,GAAG,IAAI,eAAE,CAAC,EAAE,CAAC,CAAC;AAC1B,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAC3C,MAAM,kBAAkB,GAAG,IAAI,CAAC;AAEhC,MAAa,SAAS;IACb,MAAM,CAAC,uBAAuB,CACnC,YAAgB,EAChB,aAAiB;QAEjB,OAAO,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC1D,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,WAAmB,EAAE,QAAgB;QAChE,wEAAwE;QACxE,4BAA4B;QAC5B,MAAM,CAAC,WAAW,EAAE,cAAc,GAAG,EAAE,CAAC,GAAG,WAAW;aACnD,QAAQ,EAAE;aACV,KAAK,CAAC,GAAG,CAAC,CAAC;QACd,OAAO,IAAI,eAAE,CAAC,WAAW,GAAG,cAAc,CAAC;aACxC,GAAG,CAAC,IAAI,eAAE,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;aACrC,GAAG,CAAC,IAAI,eAAE,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,eAAE,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC;IAEM,MAAM,CAAC,cAAc,CAAC,WAAe,EAAE,QAAgB;QAC5D,OAAO,WAAW,CAAC,QAAQ,EAAE,GAAG,EAAE,IAAI,QAAQ,CAAC;IACjD,CAAC;IAEM,MAAM,CAAC,aAAa,CACzB,QAAY,EACZ,YAAoB,EACpB,aAAqB;QAErB,
|
|
1
|
+
{"version":3,"file":"priceMath.js","sourceRoot":"","sources":["../../src/utils/priceMath.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@metadaoproject/futarchy",
|
|
3
|
-
"version": "0.3.0-alpha.
|
|
3
|
+
"version": "0.3.0-alpha.17",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"types": "dist/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -13,7 +13,6 @@
|
|
|
13
13
|
},
|
|
14
14
|
"dependencies": {
|
|
15
15
|
"@coral-xyz/anchor": "^0.29.0",
|
|
16
|
-
"@noble/hashes": "^1.4.0",
|
|
17
16
|
"@solana/spl-token": "^0.3.7",
|
|
18
17
|
"@solana/web3.js": "^1.74.0",
|
|
19
18
|
"bn.js": "^5.2.1",
|