@sly-rentals/core 5.0.0 → 5.2.0
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/api.json +10441 -7771
- package/dist/cjs/accounts/contract.js +60 -29
- package/dist/cjs/accounts/contract.js.map +1 -1
- package/dist/cjs/calculator/MinBidChart.js +45 -14
- package/dist/cjs/calculator/MinBidChart.js.map +1 -1
- package/dist/cjs/cost/estimate.js +18 -4
- package/dist/cjs/cost/estimate.js.map +1 -1
- package/dist/cjs/cost/estimate.test.js +11 -1
- package/dist/cjs/cost/estimate.test.js.map +1 -1
- package/dist/cjs/generated/codama/accounts/contractState.js +4 -4
- package/dist/cjs/generated/codama/accounts/contractState.js.map +1 -1
- package/dist/cjs/generated/codama/instructions/createContract.js +2 -2
- package/dist/cjs/generated/codama/instructions/createContract.js.map +1 -1
- package/dist/cjs/generated/codama/instructions/updateContract.js +2 -2
- package/dist/cjs/generated/codama/instructions/updateContract.js.map +1 -1
- package/dist/cjs/generated/codama/types/contractCreated.js +2 -2
- package/dist/cjs/generated/codama/types/contractCreated.js.map +1 -1
- package/dist/cjs/generated/codama/types/fleet.js +0 -14
- package/dist/cjs/generated/codama/types/fleet.js.map +1 -1
- package/dist/cjs/generated/codama/types/index.js +0 -1
- package/dist/cjs/generated/codama/types/index.js.map +1 -1
- package/dist/cjs/generated/codama/types/shipStats.js +0 -2
- package/dist/cjs/generated/codama/types/shipStats.js.map +1 -1
- package/dist/cjs/generated/codama/types/staleDecayApplied.js +2 -2
- package/dist/cjs/generated/codama/types/staleDecayApplied.js.map +1 -1
- package/dist/cjs/idl/srsly.json +23 -118
- package/dist/cjs/instructions/createContract.js +1 -1
- package/dist/cjs/instructions/createContract.js.map +1 -1
- package/dist/cjs/instructions/index.js +5 -1
- package/dist/cjs/instructions/index.js.map +1 -1
- package/dist/cjs/instructions/migrateConfig.js +41 -0
- package/dist/cjs/instructions/migrateConfig.js.map +1 -0
- package/dist/cjs/instructions/migrateContract.js +47 -0
- package/dist/cjs/instructions/migrateContract.js.map +1 -0
- package/dist/cjs/instructions/reserveRental.js +4 -3
- package/dist/cjs/instructions/reserveRental.js.map +1 -1
- package/dist/cjs/instructions/updateContract.js +2 -2
- package/dist/cjs/instructions/updateContract.js.map +1 -1
- package/dist/cjs/kit/index.js +6 -1
- package/dist/cjs/kit/index.js.map +1 -1
- package/dist/cjs/legacy/index.js +3 -1
- package/dist/cjs/legacy/index.js.map +1 -1
- package/dist/cjs/package.json +1 -2
- package/dist/cjs/params/index.js +1 -0
- package/dist/cjs/params/index.js.map +1 -1
- package/dist/cjs/params/points.js +110 -0
- package/dist/cjs/params/points.js.map +1 -0
- package/dist/cjs/utils/clock.js +42 -0
- package/dist/cjs/utils/clock.js.map +1 -0
- package/dist/cjs/utils/contestChain.js +20 -4
- package/dist/cjs/utils/contestChain.js.map +1 -1
- package/dist/cjs/utils/contractSnapshot.js +46 -5
- package/dist/cjs/utils/contractSnapshot.js.map +1 -1
- package/dist/cjs/utils/contractSnapshot.test.js +28 -3
- package/dist/cjs/utils/contractSnapshot.test.js.map +1 -1
- package/dist/cjs/utils/index.js +7 -1
- package/dist/cjs/utils/index.js.map +1 -1
- package/dist/cjs/utils/staleDecay.js +47 -0
- package/dist/cjs/utils/staleDecay.js.map +1 -0
- package/dist/cjs/utils/staleDecay.test.js +71 -0
- package/dist/cjs/utils/staleDecay.test.js.map +1 -0
- package/dist/cjs/version.js +1 -1
- package/dist/esm/accounts/contract.js +59 -29
- package/dist/esm/accounts/contract.js.map +1 -1
- package/dist/esm/calculator/MinBidChart.js +45 -14
- package/dist/esm/calculator/MinBidChart.js.map +1 -1
- package/dist/esm/cost/estimate.js +18 -4
- package/dist/esm/cost/estimate.js.map +1 -1
- package/dist/esm/cost/estimate.test.js +11 -1
- package/dist/esm/cost/estimate.test.js.map +1 -1
- package/dist/esm/generated/codama/accounts/contractState.js +4 -4
- package/dist/esm/generated/codama/accounts/contractState.js.map +1 -1
- package/dist/esm/generated/codama/instructions/createContract.js +2 -2
- package/dist/esm/generated/codama/instructions/createContract.js.map +1 -1
- package/dist/esm/generated/codama/instructions/updateContract.js +2 -2
- package/dist/esm/generated/codama/instructions/updateContract.js.map +1 -1
- package/dist/esm/generated/codama/types/contractCreated.js +2 -2
- package/dist/esm/generated/codama/types/contractCreated.js.map +1 -1
- package/dist/esm/generated/codama/types/fleet.js +1 -15
- package/dist/esm/generated/codama/types/fleet.js.map +1 -1
- package/dist/esm/generated/codama/types/index.js +0 -1
- package/dist/esm/generated/codama/types/index.js.map +1 -1
- package/dist/esm/generated/codama/types/shipStats.js +1 -3
- package/dist/esm/generated/codama/types/shipStats.js.map +1 -1
- package/dist/esm/generated/codama/types/staleDecayApplied.js +2 -2
- package/dist/esm/generated/codama/types/staleDecayApplied.js.map +1 -1
- package/dist/esm/idl/srsly.json +23 -118
- package/dist/esm/instructions/createContract.js +1 -1
- package/dist/esm/instructions/createContract.js.map +1 -1
- package/dist/esm/instructions/index.js +2 -0
- package/dist/esm/instructions/index.js.map +1 -1
- package/dist/esm/instructions/migrateConfig.js +38 -0
- package/dist/esm/instructions/migrateConfig.js.map +1 -0
- package/dist/esm/instructions/migrateContract.js +44 -0
- package/dist/esm/instructions/migrateContract.js.map +1 -0
- package/dist/esm/instructions/reserveRental.js +4 -3
- package/dist/esm/instructions/reserveRental.js.map +1 -1
- package/dist/esm/instructions/updateContract.js +2 -2
- package/dist/esm/instructions/updateContract.js.map +1 -1
- package/dist/esm/kit/index.js +4 -0
- package/dist/esm/kit/index.js.map +1 -1
- package/dist/esm/legacy/index.js +2 -0
- package/dist/esm/legacy/index.js.map +1 -1
- package/dist/esm/package.json +1 -2
- package/dist/esm/params/index.js +1 -0
- package/dist/esm/params/index.js.map +1 -1
- package/dist/esm/params/points.js +104 -0
- package/dist/esm/params/points.js.map +1 -0
- package/dist/esm/utils/clock.js +39 -0
- package/dist/esm/utils/clock.js.map +1 -0
- package/dist/esm/utils/contestChain.js +20 -4
- package/dist/esm/utils/contestChain.js.map +1 -1
- package/dist/esm/utils/contractSnapshot.js +46 -5
- package/dist/esm/utils/contractSnapshot.js.map +1 -1
- package/dist/esm/utils/contractSnapshot.test.js +28 -3
- package/dist/esm/utils/contractSnapshot.test.js.map +1 -1
- package/dist/esm/utils/index.js +4 -0
- package/dist/esm/utils/index.js.map +1 -1
- package/dist/esm/utils/staleDecay.js +44 -0
- package/dist/esm/utils/staleDecay.js.map +1 -0
- package/dist/esm/utils/staleDecay.test.js +69 -0
- package/dist/esm/utils/staleDecay.test.js.map +1 -0
- package/dist/esm/version.js +1 -1
- package/dist/idl/srsly.json +23 -118
- package/dist/types/accounts/contract.d.ts +11 -5
- package/dist/types/accounts/contract.d.ts.map +1 -1
- package/dist/types/calculator/MinBidChart.d.ts.map +1 -1
- package/dist/types/cost/estimate.d.ts +17 -2
- package/dist/types/cost/estimate.d.ts.map +1 -1
- package/dist/types/generated/codama/accounts/configState.d.ts +4 -4
- package/dist/types/generated/codama/accounts/contractState.d.ts +16 -16
- package/dist/types/generated/codama/accounts/contractState.d.ts.map +1 -1
- package/dist/types/generated/codama/instructions/createContract.d.ts +4 -4
- package/dist/types/generated/codama/instructions/createContract.d.ts.map +1 -1
- package/dist/types/generated/codama/instructions/updateConfig.d.ts +2 -2
- package/dist/types/generated/codama/instructions/updateContract.d.ts +14 -14
- package/dist/types/generated/codama/instructions/updateContract.d.ts.map +1 -1
- package/dist/types/generated/codama/types/contractCreated.d.ts +2 -2
- package/dist/types/generated/codama/types/contractCreated.d.ts.map +1 -1
- package/dist/types/generated/codama/types/fleet.d.ts +0 -14
- package/dist/types/generated/codama/types/fleet.d.ts.map +1 -1
- package/dist/types/generated/codama/types/index.d.ts +0 -1
- package/dist/types/generated/codama/types/index.d.ts.map +1 -1
- package/dist/types/generated/codama/types/shipStats.d.ts +1 -3
- package/dist/types/generated/codama/types/shipStats.d.ts.map +1 -1
- package/dist/types/generated/codama/types/staleDecayApplied.d.ts +4 -4
- package/dist/types/generated/codama/types/staleDecayApplied.d.ts.map +1 -1
- package/dist/types/instructions/createContract.d.ts +6 -6
- package/dist/types/instructions/createContract.d.ts.map +1 -1
- package/dist/types/instructions/index.d.ts +2 -0
- package/dist/types/instructions/index.d.ts.map +1 -1
- package/dist/types/instructions/migrateConfig.d.ts +39 -0
- package/dist/types/instructions/migrateConfig.d.ts.map +1 -0
- package/dist/types/instructions/migrateContract.d.ts +44 -0
- package/dist/types/instructions/migrateContract.d.ts.map +1 -0
- package/dist/types/instructions/reserveRental.d.ts +10 -2
- package/dist/types/instructions/reserveRental.d.ts.map +1 -1
- package/dist/types/instructions/updateConfig.d.ts +1 -1
- package/dist/types/instructions/updateContract.d.ts +5 -5
- package/dist/types/instructions/updateContract.d.ts.map +1 -1
- package/dist/types/kit/index.d.ts +1 -0
- package/dist/types/kit/index.d.ts.map +1 -1
- package/dist/types/legacy/index.d.ts +2 -0
- package/dist/types/legacy/index.d.ts.map +1 -1
- package/dist/types/params/index.d.ts +1 -0
- package/dist/types/params/index.d.ts.map +1 -1
- package/dist/types/params/points.d.ts +71 -0
- package/dist/types/params/points.d.ts.map +1 -0
- package/dist/types/utils/clock.d.ts +24 -0
- package/dist/types/utils/clock.d.ts.map +1 -0
- package/dist/types/utils/contestChain.d.ts.map +1 -1
- package/dist/types/utils/contractSnapshot.d.ts +24 -1
- package/dist/types/utils/contractSnapshot.d.ts.map +1 -1
- package/dist/types/utils/index.d.ts +2 -0
- package/dist/types/utils/index.d.ts.map +1 -1
- package/dist/types/utils/staleDecay.d.ts +21 -0
- package/dist/types/utils/staleDecay.d.ts.map +1 -0
- package/dist/types/utils/staleDecay.test.d.ts +2 -0
- package/dist/types/utils/staleDecay.test.d.ts.map +1 -0
- package/dist/types/version.d.ts +1 -1
- package/package.json +3 -4
- package/dist/cjs/generated/codama/types/combatStats.js +0 -49
- package/dist/cjs/generated/codama/types/combatStats.js.map +0 -1
- package/dist/esm/generated/codama/types/combatStats.js +0 -44
- package/dist/esm/generated/codama/types/combatStats.js.map +0 -1
- package/dist/types/generated/codama/types/combatStats.d.ts +0 -28
- package/dist/types/generated/codama/types/combatStats.d.ts.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reserveRental.js","sourceRoot":"","sources":["../../../src/instructions/reserveRental.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;
|
|
1
|
+
{"version":3,"file":"reserveRental.js","sourceRoot":"","sources":["../../../src/instructions/reserveRental.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,7 +59,7 @@ async function updateContract(params, config) {
|
|
|
59
59
|
params.reservationsDisabled === undefined &&
|
|
60
60
|
params.toClose === undefined &&
|
|
61
61
|
params.contestedThreshold === undefined &&
|
|
62
|
-
params.
|
|
62
|
+
params.staleDiscountMaxBps === undefined) {
|
|
63
63
|
throw new Error('At least one field must be provided to update');
|
|
64
64
|
}
|
|
65
65
|
// Convert authority to transaction signer
|
|
@@ -90,7 +90,7 @@ async function updateContract(params, config) {
|
|
|
90
90
|
reservationsDisabled: params.reservationsDisabled ?? null,
|
|
91
91
|
toClose: params.toClose ?? null,
|
|
92
92
|
contestedThreshold: params.contestedThreshold ?? null,
|
|
93
|
-
|
|
93
|
+
staleDiscountMaxBps: params.staleDiscountMaxBps ?? null,
|
|
94
94
|
}, { programAddress });
|
|
95
95
|
return (0, instructions_2.prepareInstructions)(kitInstruction, {
|
|
96
96
|
computeUnits: params.computeUnits,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateContract.js","sourceRoot":"","sources":["../../../src/instructions/updateContract.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAgIH,wCA6EC;AA3MD,qCAAoD;AACpD,mEAAqF;AACrF,4CAA4E;AAC5E,4CAA4E;AAC5E,6CAAmE;AACnE,iDAAyE;AACzE,wDAA4D;AA6F5D;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACI,KAAK,UAAU,cAAc,CAClC,MAA4B,EAC5B,MAA2B;IAE3B,eAAe;IACf,MAAM,WAAW,GAAG,IAAA,oBAAW,EAAC,MAAM,CAAC,CAAC;IAExC,2BAA2B;IAC3B,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAC3C,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IAED,qCAAqC;IACrC,IACE,MAAM,CAAC,IAAI,KAAK,SAAS;QACzB,MAAM,CAAC,WAAW,KAAK,SAAS;QAChC,MAAM,CAAC,WAAW,KAAK,SAAS;QAChC,MAAM,CAAC,cAAc,KAAK,SAAS;QACnC,MAAM,CAAC,oBAAoB,KAAK,SAAS;QACzC,MAAM,CAAC,OAAO,KAAK,SAAS;QAC5B,MAAM,CAAC,kBAAkB,KAAK,SAAS;QACvC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"updateContract.js","sourceRoot":"","sources":["../../../src/instructions/updateContract.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/kit/index.js
CHANGED
|
@@ -30,7 +30,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
30
30
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
31
31
|
};
|
|
32
32
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
33
|
-
exports.onSrslyEvent = exports.getEventsFromTx = exports.events = exports.closeSrslyEventListener = exports.claim = exports.VERSION = void 0;
|
|
33
|
+
exports.onSrslyEvent = exports.getEventsFromTx = exports.events = exports.closeSrslyEventListener = exports.claim = exports.RentalStatus = exports.VERSION = void 0;
|
|
34
34
|
var version_1 = require("../version");
|
|
35
35
|
Object.defineProperty(exports, "VERSION", { enumerable: true, get: function () { return version_1.VERSION; } });
|
|
36
36
|
__exportStar(require("../utils"), exports);
|
|
@@ -39,6 +39,11 @@ __exportStar(require("../accounts"), exports);
|
|
|
39
39
|
__exportStar(require("../params"), exports);
|
|
40
40
|
__exportStar(require("../pda"), exports);
|
|
41
41
|
__exportStar(require("../cost"), exports);
|
|
42
|
+
// Hand-picked codama enums that callers commonly need to compare against
|
|
43
|
+
// account state (e.g. `rental.status === RentalStatus.Cancelled`).
|
|
44
|
+
// Full codama surface stays at `@sly-rentals/core/codama`.
|
|
45
|
+
var types_1 = require("../generated/codama/types");
|
|
46
|
+
Object.defineProperty(exports, "RentalStatus", { enumerable: true, get: function () { return types_1.RentalStatus; } });
|
|
42
47
|
// External re-exports
|
|
43
48
|
var vault_1 = require("@sly-rentals/vault");
|
|
44
49
|
Object.defineProperty(exports, "claim", { enumerable: true, get: function () { return vault_1.claim; } });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/kit/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;;;;;;;;;;;;;;;AAEH,sCAAqC;AAA5B,kGAAA,OAAO,OAAA;AAChB,2CAAyB;AACzB,kDAAgC;AAChC,8CAA4B;AAC5B,4CAA0B;AAC1B,yCAAuB;AACvB,0CAAwB;AAExB,sBAAsB;AACtB,4CAA6D;AAApD,8FAAA,KAAK,OAAA;AAEd,0EAA0E;AAC1E,8EAA8E;AAC9E,wEAAwE;AACxE,4DAA4D;AAC5D,wEAAwE;AACxE,iEAAiE;AACjE,kCAA0F;AAAjF,gHAAA,uBAAuB,OAAA;AAAE,+FAAA,MAAM,OAAA;AAAE,wGAAA,eAAe,OAAA;AAAE,qGAAA,YAAY,OAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/kit/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;;;;;;;;;;;;;;;;AAEH,sCAAqC;AAA5B,kGAAA,OAAO,OAAA;AAChB,2CAAyB;AACzB,kDAAgC;AAChC,8CAA4B;AAC5B,4CAA0B;AAC1B,yCAAuB;AACvB,0CAAwB;AAExB,yEAAyE;AACzE,mEAAmE;AACnE,2DAA2D;AAC3D,mDAAyD;AAAhD,qGAAA,YAAY,OAAA;AAErB,sBAAsB;AACtB,4CAA6D;AAApD,8FAAA,KAAK,OAAA;AAEd,0EAA0E;AAC1E,8EAA8E;AAC9E,wEAAwE;AACxE,4DAA4D;AAC5D,wEAAwE;AACxE,iEAAiE;AACjE,kCAA0F;AAAjF,gHAAA,uBAAuB,OAAA;AAAE,+FAAA,MAAM,OAAA;AAAE,wGAAA,eAAe,OAAA;AAAE,qGAAA,YAAY,OAAA"}
|
package/dist/cjs/legacy/index.js
CHANGED
|
@@ -59,7 +59,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
59
59
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
60
60
|
};
|
|
61
61
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
62
|
-
exports.claim = exports.updateAffiliate = exports.removeAffiliate = exports.approveAffiliate = exports.createAffiliate = exports.deleteConfig = exports.updateConfig = exports.createConfig = exports.updateContractThread = exports.deleteContractThread = exports.closeContractThread = exports.createContractThread = exports.claimContract = exports.deleteBorrower = exports.createBorrower = exports.closeBorrower = exports.claimBorrower = exports.deleteRental = exports.reserveRental = exports.invalidateRental = exports.releaseRental = exports.closeRental = exports.cancelRental = exports.acceptRental = exports.setDelegate = exports.deleteContract = exports.closeContract = exports.updateContract = exports.createContract = exports.onSrslyEvent = exports.getEventsFromTx = exports.events = exports.closeSrslyEventListener = exports.VERSION = void 0;
|
|
62
|
+
exports.claim = exports.updateAffiliate = exports.removeAffiliate = exports.approveAffiliate = exports.createAffiliate = exports.migrateContract = exports.migrateConfig = exports.deleteConfig = exports.updateConfig = exports.createConfig = exports.updateContractThread = exports.deleteContractThread = exports.closeContractThread = exports.createContractThread = exports.claimContract = exports.deleteBorrower = exports.createBorrower = exports.closeBorrower = exports.claimBorrower = exports.deleteRental = exports.reserveRental = exports.invalidateRental = exports.releaseRental = exports.closeRental = exports.cancelRental = exports.acceptRental = exports.setDelegate = exports.deleteContract = exports.closeContract = exports.updateContract = exports.createContract = exports.onSrslyEvent = exports.getEventsFromTx = exports.events = exports.closeSrslyEventListener = exports.VERSION = void 0;
|
|
63
63
|
const utils_1 = require("../utils");
|
|
64
64
|
const kit = __importStar(require("../instructions"));
|
|
65
65
|
const vault_1 = require("@sly-rentals/vault");
|
|
@@ -123,6 +123,8 @@ exports.updateContractThread = w(kit.updateContractThread);
|
|
|
123
123
|
exports.createConfig = w(kit.createConfig);
|
|
124
124
|
exports.updateConfig = w(kit.updateConfig);
|
|
125
125
|
exports.deleteConfig = w(kit.deleteConfig);
|
|
126
|
+
exports.migrateConfig = w(kit.migrateConfig);
|
|
127
|
+
exports.migrateContract = w(kit.migrateContract);
|
|
126
128
|
exports.createAffiliate = w(kit.createAffiliate);
|
|
127
129
|
exports.approveAffiliate = w(kit.approveAffiliate);
|
|
128
130
|
exports.removeAffiliate = w(kit.removeAffiliate);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/legacy/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/legacy/index.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sly-rentals/core",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.2.0",
|
|
4
4
|
"description": "TypeScript SDK for SRSLY",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"publishConfig": {
|
|
@@ -60,7 +60,6 @@
|
|
|
60
60
|
"uplot": "^1.6.32"
|
|
61
61
|
},
|
|
62
62
|
"devDependencies": {
|
|
63
|
-
"@sly-rentals/programs": "workspace:*",
|
|
64
63
|
"@types/node": "^24.0.3",
|
|
65
64
|
"@types/react": "^18.2.0",
|
|
66
65
|
"codama": "^1.3.7",
|
package/dist/cjs/params/index.js
CHANGED
|
@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./amount"), exports);
|
|
18
18
|
__exportStar(require("./duration"), exports);
|
|
19
|
+
__exportStar(require("./points"), exports);
|
|
19
20
|
__exportStar(require("./schedule"), exports);
|
|
20
21
|
__exportStar(require("./sol"), exports);
|
|
21
22
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/params/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,6CAA2B;AAC3B,6CAA2B;AAC3B,wCAAsB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/params/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,6CAA2B;AAC3B,2CAAyB;AACzB,6CAA2B;AAC3B,wCAAsB"}
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @purpose Points parameter conversion utilities
|
|
4
|
+
*
|
|
5
|
+
* Converts user-friendly point amounts to dust (smallest unit) for use with Solana programs.
|
|
6
|
+
* 1 point = 100,000,000 dust (8 decimal places — same precision as ATLAS/stardust).
|
|
7
|
+
*/
|
|
8
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
exports.DUST_PER_POINT = void 0;
|
|
10
|
+
exports.convertPoints = convertPoints;
|
|
11
|
+
exports.dustToPoints = dustToPoints;
|
|
12
|
+
exports.formatPoints = formatPoints;
|
|
13
|
+
/**
|
|
14
|
+
* Dust per point (8 decimal places). Mirrors the on-chain precision —
|
|
15
|
+
* the `bid_points` u64 the SRSLY program sees is always dust-scaled.
|
|
16
|
+
*/
|
|
17
|
+
exports.DUST_PER_POINT = 100_000_000;
|
|
18
|
+
const MAX_U64 = 18446744073709551615n;
|
|
19
|
+
/**
|
|
20
|
+
* Convert points parameter to dust (smallest unit)
|
|
21
|
+
*
|
|
22
|
+
* @param amount - Amount in any supported format
|
|
23
|
+
* @returns Amount in dust (u64 for Solana program)
|
|
24
|
+
* @throws Error if amount is invalid, negative, or non-integer dust
|
|
25
|
+
*
|
|
26
|
+
* @example
|
|
27
|
+
* ```typescript
|
|
28
|
+
* convertPoints(100_000_000) // 100_000_000n dust (1 point)
|
|
29
|
+
* convertPoints({ points: 1 }) // 100_000_000n dust (1 point)
|
|
30
|
+
* convertPoints({ dust: 1_000_000 }) // 1_000_000n dust (0.01 points)
|
|
31
|
+
* ```
|
|
32
|
+
*/
|
|
33
|
+
function convertPoints(amount) {
|
|
34
|
+
if (typeof amount === 'number' || typeof amount === 'bigint') {
|
|
35
|
+
return toDustBigInt(amount, 'dust');
|
|
36
|
+
}
|
|
37
|
+
if (typeof amount !== 'object' || amount === null) {
|
|
38
|
+
throw new Error(`Invalid points type. Expected number, bigint, or object. Got: ${typeof amount}`);
|
|
39
|
+
}
|
|
40
|
+
if ('points' in amount && amount.points !== undefined) {
|
|
41
|
+
if (amount.points < 0) {
|
|
42
|
+
throw new Error(`Points must be non-negative, got ${amount.points}`);
|
|
43
|
+
}
|
|
44
|
+
return toDustBigInt(amount.points * exports.DUST_PER_POINT, 'points');
|
|
45
|
+
}
|
|
46
|
+
if ('dust' in amount && amount.dust !== undefined) {
|
|
47
|
+
return toDustBigInt(amount.dust, 'dust');
|
|
48
|
+
}
|
|
49
|
+
throw new Error(`Invalid points format. Expected number, bigint, { points: number }, or { dust: number | bigint }. ` +
|
|
50
|
+
`Got: ${JSON.stringify(amount)}`);
|
|
51
|
+
}
|
|
52
|
+
function toDustBigInt(raw, unit) {
|
|
53
|
+
if (typeof raw === 'bigint') {
|
|
54
|
+
if (raw < 0n)
|
|
55
|
+
throw new Error(`Points must be non-negative, got ${raw}`);
|
|
56
|
+
if (raw > MAX_U64)
|
|
57
|
+
throw new Error(`Points too large. Max u64: ${MAX_U64}, got: ${raw}`);
|
|
58
|
+
return raw;
|
|
59
|
+
}
|
|
60
|
+
if (!Number.isFinite(raw)) {
|
|
61
|
+
throw new Error(`Points must be a finite number, got ${raw}`);
|
|
62
|
+
}
|
|
63
|
+
if (raw < 0) {
|
|
64
|
+
throw new Error(`Points must be non-negative, got ${raw}`);
|
|
65
|
+
}
|
|
66
|
+
// `{ points: ... }` arrives here already multiplied by 1e8 — round to
|
|
67
|
+
// absorb floating-point drift (e.g. 1.5 * 1e8 → 150000000.00000003).
|
|
68
|
+
const value = unit === 'points' ? Math.round(raw) : raw;
|
|
69
|
+
if (!Number.isInteger(value)) {
|
|
70
|
+
throw new Error(`Dust must be a whole number, got ${raw}. ` +
|
|
71
|
+
`For sub-dust precision use \`{ points: ${raw / exports.DUST_PER_POINT} }\` instead.`);
|
|
72
|
+
}
|
|
73
|
+
const big = BigInt(value);
|
|
74
|
+
if (big > MAX_U64)
|
|
75
|
+
throw new Error(`Points too large. Max u64: ${MAX_U64}, got: ${big}`);
|
|
76
|
+
return big;
|
|
77
|
+
}
|
|
78
|
+
/**
|
|
79
|
+
* Convert dust to points for display
|
|
80
|
+
*
|
|
81
|
+
* @param dust - Amount in dust
|
|
82
|
+
* @returns Amount in points (decimal)
|
|
83
|
+
*
|
|
84
|
+
* @example
|
|
85
|
+
* ```typescript
|
|
86
|
+
* dustToPoints(100_000_000n) // 1.0
|
|
87
|
+
* dustToPoints(50_000_000n) // 0.5
|
|
88
|
+
* ```
|
|
89
|
+
*/
|
|
90
|
+
function dustToPoints(dust) {
|
|
91
|
+
const dustNum = typeof dust === 'bigint' ? Number(dust) : dust;
|
|
92
|
+
return dustNum / exports.DUST_PER_POINT;
|
|
93
|
+
}
|
|
94
|
+
/**
|
|
95
|
+
* Format dust amount for display
|
|
96
|
+
*
|
|
97
|
+
* @param dust - Amount in dust
|
|
98
|
+
* @param decimals - Number of decimal places (default: 8)
|
|
99
|
+
* @returns Formatted points string
|
|
100
|
+
*
|
|
101
|
+
* @example
|
|
102
|
+
* ```typescript
|
|
103
|
+
* formatPoints(100_000_000n) // "1.00000000 points"
|
|
104
|
+
* formatPoints(50_000_000n, 2) // "0.50 points"
|
|
105
|
+
* ```
|
|
106
|
+
*/
|
|
107
|
+
function formatPoints(dust, decimals = 8) {
|
|
108
|
+
return `${dustToPoints(dust).toFixed(decimals)} points`;
|
|
109
|
+
}
|
|
110
|
+
//# sourceMappingURL=points.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"points.js","sourceRoot":"","sources":["../../../src/params/points.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @purpose Read the on-chain Clock sysvar to get `unix_timestamp`.
|
|
4
|
+
*
|
|
5
|
+
* Use this instead of `Date.now()` whenever the SDK quotes a value the
|
|
6
|
+
* on-chain program would compute against `Clock::get()` — wall-clock skew
|
|
7
|
+
* between the client and the cluster can otherwise produce a stale or
|
|
8
|
+
* future-dated answer (matters for `rate_after_stale_decay` and any time
|
|
9
|
+
* projection that crosses the `stale_since` sentinel).
|
|
10
|
+
*
|
|
11
|
+
* Layout (offsets, little-endian):
|
|
12
|
+
* 0 slot u64
|
|
13
|
+
* 8 epoch_start_timestamp i64
|
|
14
|
+
* 16 epoch u64
|
|
15
|
+
* 24 leader_schedule_epoch u64
|
|
16
|
+
* 32 unix_timestamp i64 ← this is what callers want
|
|
17
|
+
*/
|
|
18
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
19
|
+
exports.fetchChainNowSeconds = fetchChainNowSeconds;
|
|
20
|
+
const kit_1 = require("@solana/kit");
|
|
21
|
+
const rpc_1 = require("./rpc");
|
|
22
|
+
const config_1 = require("./config");
|
|
23
|
+
const CLOCK_SYSVAR = (0, kit_1.address)('SysvarC1ock11111111111111111111111111111111');
|
|
24
|
+
/**
|
|
25
|
+
* Fetch the cluster's `Clock::unix_timestamp` as a JS `number` (seconds).
|
|
26
|
+
*
|
|
27
|
+
* One RPC round-trip (`getAccountInfo` on the sysvar). Safe to call in
|
|
28
|
+
* parallel with other fetches.
|
|
29
|
+
*/
|
|
30
|
+
async function fetchChainNowSeconds(rpcUrl) {
|
|
31
|
+
const rpc = (0, rpc_1.createRpc)(rpcUrl ?? (0, config_1.getRpcUrl)());
|
|
32
|
+
const response = await rpc.getAccountInfo(CLOCK_SYSVAR, { encoding: 'base64' }).send();
|
|
33
|
+
const info = response.value;
|
|
34
|
+
if (!info) {
|
|
35
|
+
throw new Error('Clock sysvar account not found');
|
|
36
|
+
}
|
|
37
|
+
const data = info.data[0];
|
|
38
|
+
const bytes = (0, kit_1.getBase64Encoder)().encode(data);
|
|
39
|
+
const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
|
|
40
|
+
return Number(view.getBigInt64(32, true));
|
|
41
|
+
}
|
|
42
|
+
//# sourceMappingURL=clock.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"clock.js","sourceRoot":"","sources":["../../../src/utils/clock.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;;AAcH,oDAWC;AAvBD,qCAAwD;AACxD,+BAAkC;AAClC,qCAAqC;AAErC,MAAM,YAAY,GAAG,IAAA,aAAO,EAAC,6CAA6C,CAAC,CAAC;AAE5E;;;;;GAKG;AACI,KAAK,UAAU,oBAAoB,CAAC,MAAe;IACxD,MAAM,GAAG,GAAG,IAAA,eAAS,EAAC,MAAM,IAAI,IAAA,kBAAS,GAAE,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,YAAY,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACvF,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC;IAC5B,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IACD,MAAM,IAAI,GAAI,IAAI,CAAC,IAAyB,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,KAAK,GAAG,IAAA,sBAAgB,GAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAC5E,OAAO,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;AAC5C,CAAC"}
|
|
@@ -126,10 +126,26 @@ function computeContestChain(args) {
|
|
|
126
126
|
const next = tmp[i + 1];
|
|
127
127
|
if (!next)
|
|
128
128
|
return 0;
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
//
|
|
132
|
-
|
|
129
|
+
// PREVIEW(option-b): anchor bonus closeness to time-available-since-reserve
|
|
130
|
+
// (active_end - reserve_time) rather than full active_duration. This is
|
|
131
|
+
// the proposed on-chain change in `rental_reserve.rs::bonus_closeness_bps`
|
|
132
|
+
// — calc mirrors it now so the visual matches what the eventual upgrade
|
|
133
|
+
// will produce. Effect: honest late-reservers who hold to the end reach
|
|
134
|
+
// closeness=1 (full bonus) instead of being capped by where they
|
|
135
|
+
// reserved relative to active_start. Pre-gamers who get sniped on
|
|
136
|
+
// reserve still hit closeness ≈ 0.
|
|
137
|
+
const availableSpan = Math.max(0.0001, safeSpan - tmp[i].atDay);
|
|
138
|
+
const closeness = clamp((next.atDay - tmp[i].atDay) / availableSpan, 0, 1);
|
|
139
|
+
const diff = Math.max(0, next.bidDisplay - tmp[i].bidDisplay);
|
|
140
|
+
const raw = diff * closeness * bonusMult;
|
|
141
|
+
// PREVIEW(option-a): cap bonus at `diff` instead of `challenger_bid`
|
|
142
|
+
// so contract escrow never goes negative when bonus_multiplier > 1.
|
|
143
|
+
// Same-currency knockoff funds the previous defender's refund (their
|
|
144
|
+
// own bid back) + bonus from the new challenger's bid; total
|
|
145
|
+
// outflow = defender_bid + bonus, inflow = challenger_bid, so
|
|
146
|
+
// bonus ≤ challenger_bid − defender_bid = diff keeps the segment
|
|
147
|
+
// solvent and per-segment owner-take ≥ 0.
|
|
148
|
+
return Math.min(diff, raw);
|
|
133
149
|
});
|
|
134
150
|
// Owner-take is realized only by the LAST contester in the chain — every
|
|
135
151
|
// earlier contester gets their bid back as refund when outbid, plus a
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contestChain.js","sourceRoot":"","sources":["../../../src/utils/contestChain.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;AAuFH,8CAUC;AAaD,
|
|
1
|
+
{"version":3,"file":"contestChain.js","sourceRoot":"","sources":["../../../src/utils/contestChain.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,8 @@ const rental_1 = require("../accounts/rental");
|
|
|
25
25
|
const srsly_1 = require("../pda/srsly");
|
|
26
26
|
const config_2 = require("./config");
|
|
27
27
|
const bidMath_1 = require("./bidMath");
|
|
28
|
+
const clock_1 = require("./clock");
|
|
29
|
+
const staleDecay_1 = require("./staleDecay");
|
|
28
30
|
const SYSTEM_PROGRAM_ID = '11111111111111111111111111111111';
|
|
29
31
|
/**
|
|
30
32
|
* Fetch a contract and every account directly attached to it in one shot,
|
|
@@ -52,9 +54,10 @@ const SYSTEM_PROGRAM_ID = '11111111111111111111111111111111';
|
|
|
52
54
|
*/
|
|
53
55
|
async function getContractSnapshot(args) {
|
|
54
56
|
const rpcUrl = args.rpcUrl ?? (0, config_2.getRpcUrl)();
|
|
55
|
-
const [config, contract] = await Promise.all([
|
|
57
|
+
const [config, contract, nowSeconds] = await Promise.all([
|
|
56
58
|
(0, config_1.fetchConfig)(rpcUrl),
|
|
57
59
|
(0, contract_1.fetchContract)(args.contractAddress, rpcUrl),
|
|
60
|
+
(0, clock_1.fetchChainNowSeconds)(rpcUrl),
|
|
58
61
|
]);
|
|
59
62
|
const contractData = contract.data;
|
|
60
63
|
const activePromise = contractData.activeRental && contractData.activeRental.toString() !== SYSTEM_PROGRAM_ID
|
|
@@ -68,9 +71,10 @@ async function getContractSnapshot(args) {
|
|
|
68
71
|
.catch(() => null)
|
|
69
72
|
: Promise.resolve(null);
|
|
70
73
|
const [activeRental, queuedRental] = await Promise.all([activePromise, queuedPromise]);
|
|
71
|
-
const partialSnap = { config, contract, activeRental, queuedRental };
|
|
74
|
+
const partialSnap = { config, contract, activeRental, queuedRental, nowSeconds };
|
|
72
75
|
const minimumBid = computeMinimumBidFromSnapshot(partialSnap);
|
|
73
|
-
|
|
76
|
+
const effectiveRate = (0, staleDecay_1.rateAfterStaleDecay)(contractData, config.data, nowSeconds);
|
|
77
|
+
return { ...partialSnap, minimumBid, effectiveRate };
|
|
74
78
|
}
|
|
75
79
|
/**
|
|
76
80
|
* Resolve a `ContractSnapshot` from caller-supplied data or fetch fresh.
|
|
@@ -123,6 +127,18 @@ function isSnapshotStale(snap) {
|
|
|
123
127
|
* projection (`delaySeconds` / `nowSeconds`) or with an overridden
|
|
124
128
|
* `atlasPerPoint` ratio. For the at-fetch-time floor, read
|
|
125
129
|
* `snap.minimumBid` directly.
|
|
130
|
+
*
|
|
131
|
+
* Both `.atlas` and `.points` are on-chain-ready bid values — callers
|
|
132
|
+
* can feed them straight into `reserveRental(...)` without further
|
|
133
|
+
* conversion or threshold-clamping:
|
|
134
|
+
*
|
|
135
|
+
* - First-reservation contracts (`current === null`): both fields are
|
|
136
|
+
* clamped up to `config.min_capture_threshold` (and its atlas
|
|
137
|
+
* equivalent) so a bid built from either field clears the
|
|
138
|
+
* `bid_threshold` check.
|
|
139
|
+
* - Contested contracts (`current !== null`): `.atlas` is the
|
|
140
|
+
* rate-derived ramp floor only; `.points` additionally clamps to
|
|
141
|
+
* `min_capture_threshold` (the ramp dominates atlas by design).
|
|
126
142
|
*/
|
|
127
143
|
function computeMinimumBidFromSnapshot(snap, opts = {}) {
|
|
128
144
|
const cfgData = snap.config.data;
|
|
@@ -149,7 +165,7 @@ function computeMinimumBidFromSnapshot(snap, opts = {}) {
|
|
|
149
165
|
}
|
|
150
166
|
const now = opts.nowSeconds !== undefined
|
|
151
167
|
? Math.floor(opts.nowSeconds)
|
|
152
|
-
:
|
|
168
|
+
: snap.nowSeconds + Math.max(0, opts.delaySeconds ?? 0);
|
|
153
169
|
let closeness = 0;
|
|
154
170
|
if (activeStart !== null && activeEnd !== null && activeEnd > activeStart) {
|
|
155
171
|
const span = activeEnd - activeStart;
|
|
@@ -176,9 +192,34 @@ function computeMinimumBidFromSnapshot(snap, opts = {}) {
|
|
|
176
192
|
const pointsBid = pointsDenom > 0n && minBidStardust > 0n
|
|
177
193
|
? (minBidStardust * 100000000n + pointsDenom - 1n) / pointsDenom
|
|
178
194
|
: 0n;
|
|
195
|
+
// Apply on-chain clamping by `config.min_capture_threshold`. The rule
|
|
196
|
+
// is asymmetric across the two reserve paths
|
|
197
|
+
// (`rust/programs/srsly/src/instructions/rental_reserve.rs`):
|
|
198
|
+
//
|
|
199
|
+
// - First reservation (no queued rental, `current === null`): both
|
|
200
|
+
// axes pass through `bid_threshold = max(rate / atlas_per_point,
|
|
201
|
+
// min_capture_threshold)` in dust. Atlas is checked transitively
|
|
202
|
+
// via `bid_atlas / atlas_per_point >= threshold` (`:222-225`), so
|
|
203
|
+
// the effective atlas floor is `threshold × atlas_per_point` stardust.
|
|
204
|
+
// - Contested reservation (`current !== null`): only points get the
|
|
205
|
+
// threshold clamp (`:456`). Atlas only needs to clear
|
|
206
|
+
// `floor_stardust` from the rate-derived ramp — the ramp already
|
|
207
|
+
// dominates the threshold by design.
|
|
208
|
+
const minCaptureThresholdDust = BigInt(cfgData.minCaptureThreshold);
|
|
209
|
+
if (current === null) {
|
|
210
|
+
const rateAsPointsDust = atlasPerPoint > 0n ? rateStardust / atlasPerPoint : 0n;
|
|
211
|
+
const thresholdDust = rateAsPointsDust > minCaptureThresholdDust ? rateAsPointsDust : minCaptureThresholdDust;
|
|
212
|
+
return {
|
|
213
|
+
atlas: thresholdDust * atlasPerPoint,
|
|
214
|
+
points: thresholdDust,
|
|
215
|
+
current,
|
|
216
|
+
now,
|
|
217
|
+
};
|
|
218
|
+
}
|
|
219
|
+
const clampedPoints = pointsBid > minCaptureThresholdDust ? pointsBid : minCaptureThresholdDust;
|
|
179
220
|
return {
|
|
180
221
|
atlas: minBidStardust,
|
|
181
|
-
points:
|
|
222
|
+
points: clampedPoints,
|
|
182
223
|
current,
|
|
183
224
|
now,
|
|
184
225
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contractSnapshot.js","sourceRoot":"","sources":["../../../src/utils/contractSnapshot.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;GAaG;;
|
|
1
|
+
{"version":3,"file":"contractSnapshot.js","sourceRoot":"","sources":["../../../src/utils/contractSnapshot.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,10 +17,14 @@ vitest_1.vi.mock('../pda/srsly', () => ({
|
|
|
17
17
|
vitest_1.vi.mock('./config', () => ({
|
|
18
18
|
getRpcUrl: () => 'http://localhost:8899',
|
|
19
19
|
}));
|
|
20
|
+
vitest_1.vi.mock('./clock', () => ({
|
|
21
|
+
fetchChainNowSeconds: vitest_1.vi.fn(),
|
|
22
|
+
}));
|
|
20
23
|
const config_1 = require("../accounts/config");
|
|
21
24
|
const contract_1 = require("../accounts/contract");
|
|
22
25
|
const rental_1 = require("../accounts/rental");
|
|
23
26
|
const srsly_1 = require("../pda/srsly");
|
|
27
|
+
const clock_1 = require("./clock");
|
|
24
28
|
const contractSnapshot_1 = require("./contractSnapshot");
|
|
25
29
|
const SYSTEM = '11111111111111111111111111111111';
|
|
26
30
|
// Real validated 32-byte base58 addresses for test fixtures.
|
|
@@ -34,6 +38,7 @@ const makeConfig = (overrides = {}) => ({
|
|
|
34
38
|
atlasPerPoint: 100n,
|
|
35
39
|
captureRateBps: 10500n,
|
|
36
40
|
contestedMultiplierMaxBps: 465,
|
|
41
|
+
minCaptureThreshold: 100000000n, // 1 point in dust — matches on-chain default
|
|
37
42
|
slyvault: VAULT_ADDR,
|
|
38
43
|
atlasMint: VAULT_ADDR,
|
|
39
44
|
...overrides,
|
|
@@ -45,6 +50,8 @@ const makeContract = (overrides = {}) => ({
|
|
|
45
50
|
fleet: VAULT_ADDR,
|
|
46
51
|
gameId: VAULT_ADDR,
|
|
47
52
|
thread: SYSTEM,
|
|
53
|
+
staleSince: 0n,
|
|
54
|
+
staleDiscountMaxBps: 0,
|
|
48
55
|
...overrides,
|
|
49
56
|
});
|
|
50
57
|
const makeRental = (overrides = {}) => ({
|
|
@@ -58,6 +65,7 @@ const makeRental = (overrides = {}) => ({
|
|
|
58
65
|
vitest_1.vi.clearAllMocks();
|
|
59
66
|
vitest_1.vi.mocked(srsly_1.deriveActiveRental).mockResolvedValue(ACTIVE_ADDR);
|
|
60
67
|
vitest_1.vi.mocked(srsly_1.deriveQueuedRental).mockResolvedValue(QUEUED_ADDR);
|
|
68
|
+
vitest_1.vi.mocked(clock_1.fetchChainNowSeconds).mockResolvedValue(1_700_000_000);
|
|
61
69
|
});
|
|
62
70
|
(0, vitest_1.describe)('getContractSnapshot', () => {
|
|
63
71
|
(0, vitest_1.it)('returns null rentals when contract pointers are SystemProgram', async () => {
|
|
@@ -101,6 +109,7 @@ const makeRental = (overrides = {}) => ({
|
|
|
101
109
|
});
|
|
102
110
|
(0, vitest_1.describe)('computeMinimumBidFromSnapshot', () => {
|
|
103
111
|
const buildSnap = (parts) => ({
|
|
112
|
+
nowSeconds: 1_700_000_000,
|
|
104
113
|
config: { data: makeConfig(), address: 'CFG' },
|
|
105
114
|
contract: {
|
|
106
115
|
data: makeContract({
|
|
@@ -131,12 +140,28 @@ const makeRental = (overrides = {}) => ({
|
|
|
131
140
|
}
|
|
132
141
|
: null,
|
|
133
142
|
});
|
|
134
|
-
(0, vitest_1.it)('no current reservation → floor
|
|
143
|
+
(0, vitest_1.it)('no current reservation → bid_threshold floor (mirrors first-reservation on-chain check)', async () => {
|
|
135
144
|
const snap = buildSnap({ rate: 100000000n });
|
|
136
145
|
const bid = (0, contractSnapshot_1.computeMinimumBidFromSnapshot)(snap);
|
|
137
146
|
(0, vitest_1.expect)(bid.current).toBeNull();
|
|
138
|
-
//
|
|
139
|
-
|
|
147
|
+
// First-reservation path uses `bid_threshold = max(rate / atlas_per_point,
|
|
148
|
+
// min_capture_threshold)` in dust, with the atlas check transitively
|
|
149
|
+
// requiring `bid_atlas >= threshold × atlas_per_point` stardust.
|
|
150
|
+
// With defaults (rate=100M stardust, atlas_per_point=100, min_capture=100M dust):
|
|
151
|
+
// threshold_dust = max(100M/100, 100M) = 100M dust = 1 point
|
|
152
|
+
// atlas_floor = 100M × 100 = 10_000_000_000 stardust = 100 ATLAS
|
|
153
|
+
(0, vitest_1.expect)(bid.atlas).toBe(10000000000n);
|
|
154
|
+
(0, vitest_1.expect)(bid.points).toBe(100000000n);
|
|
155
|
+
});
|
|
156
|
+
(0, vitest_1.it)('no current reservation, threshold dominated by rate → atlas floor = rate × atlas_per_point', async () => {
|
|
157
|
+
// Rate large enough that rate/atlas_per_point overruns min_capture_threshold.
|
|
158
|
+
// rate = 50 ATLAS = 5_000_000_000 stardust; rate/100 = 50_000_000 dust < 100M → still clamped.
|
|
159
|
+
// rate = 200 ATLAS = 20_000_000_000 stardust; rate/100 = 200M dust > 100M → rate-derived wins.
|
|
160
|
+
const snap = buildSnap({ rate: 20000000000n });
|
|
161
|
+
const bid = (0, contractSnapshot_1.computeMinimumBidFromSnapshot)(snap);
|
|
162
|
+
(0, vitest_1.expect)(bid.current).toBeNull();
|
|
163
|
+
(0, vitest_1.expect)(bid.points).toBe(200000000n); // 2 points
|
|
164
|
+
(0, vitest_1.expect)(bid.atlas).toBe(20000000000n); // 200 ATLAS
|
|
140
165
|
});
|
|
141
166
|
(0, vitest_1.it)('existing ATLAS bid raises floor above rate when bid > rate', async () => {
|
|
142
167
|
const snap = buildSnap({ rate: 100000000n, queuedBidAtlas: 200000000n });
|