@wuwei-labs/srsly 4.1.3 → 4.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/cjs/demos.js +13 -26
- package/dist/cjs/demos.js.map +1 -1
- package/dist/cjs/generated/codama/accounts/configState.js +3 -1
- package/dist/cjs/generated/codama/accounts/configState.js.map +1 -1
- package/dist/cjs/generated/codama/accounts/contractState.js +2 -0
- package/dist/cjs/generated/codama/accounts/contractState.js.map +1 -1
- package/dist/cjs/generated/codama/accounts/rentalState.js +4 -2
- package/dist/cjs/generated/codama/accounts/rentalState.js.map +1 -1
- package/dist/cjs/generated/codama/errors/srsly.js +4 -1
- package/dist/cjs/generated/codama/errors/srsly.js.map +1 -1
- package/dist/cjs/generated/codama/instructions/acceptRental.js +40 -14
- package/dist/cjs/generated/codama/instructions/acceptRental.js.map +1 -1
- package/dist/cjs/generated/codama/instructions/activateRental.js +1 -75
- package/dist/cjs/generated/codama/instructions/activateRental.js.map +1 -1
- package/dist/cjs/generated/codama/instructions/closeRental.js +170 -25
- package/dist/cjs/generated/codama/instructions/closeRental.js.map +1 -1
- package/dist/cjs/generated/codama/instructions/createConfig.js +4 -12
- package/dist/cjs/generated/codama/instructions/createConfig.js.map +1 -1
- package/dist/cjs/generated/codama/instructions/deleteBorrower.js.map +1 -1
- package/dist/cjs/generated/codama/instructions/deleteConfig.js +4 -4
- package/dist/cjs/generated/codama/instructions/deleteConfig.js.map +1 -1
- package/dist/cjs/generated/codama/instructions/deleteContract.js.map +1 -1
- package/dist/cjs/generated/codama/instructions/deleteContractThread.js +175 -0
- package/dist/cjs/generated/codama/instructions/deleteContractThread.js.map +1 -0
- package/dist/cjs/generated/codama/instructions/deleteRental.js.map +1 -1
- package/dist/cjs/generated/codama/instructions/index.js +1 -1
- package/dist/cjs/generated/codama/instructions/index.js.map +1 -1
- package/dist/cjs/generated/codama/instructions/reserveRental.js +8 -32
- package/dist/cjs/generated/codama/instructions/reserveRental.js.map +1 -1
- package/dist/cjs/generated/codama/instructions/updateConfig.js +2 -0
- package/dist/cjs/generated/codama/instructions/updateConfig.js.map +1 -1
- package/dist/cjs/generated/codama/programs/srsly.js +19 -19
- package/dist/cjs/generated/codama/programs/srsly.js.map +1 -1
- package/dist/cjs/generated/codama/types/fleet.js +14 -0
- package/dist/cjs/generated/codama/types/fleet.js.map +1 -1
- package/dist/cjs/generated/codama/types/index.js +1 -1
- package/dist/cjs/generated/codama/types/index.js.map +1 -1
- package/dist/cjs/generated/codama/types/rentalClosed.js +2 -0
- package/dist/cjs/generated/codama/types/rentalClosed.js.map +1 -1
- package/dist/cjs/generated/codama/types/reservationCreated.js +2 -0
- package/dist/cjs/generated/codama/types/reservationCreated.js.map +1 -1
- package/dist/cjs/generated/codama/types/shipStats.js +2 -0
- package/dist/cjs/generated/codama/types/shipStats.js.map +1 -1
- package/dist/cjs/instructions/acceptRental.js +15 -18
- package/dist/cjs/instructions/acceptRental.js.map +1 -1
- package/dist/cjs/instructions/activateRental.js +0 -8
- package/dist/cjs/instructions/activateRental.js.map +1 -1
- package/dist/cjs/instructions/closeContract.js +79 -27
- package/dist/cjs/instructions/closeContract.js.map +1 -1
- package/dist/cjs/instructions/closeRental.js +25 -20
- package/dist/cjs/instructions/closeRental.js.map +1 -1
- package/dist/cjs/instructions/createConfig.js +1 -4
- package/dist/cjs/instructions/createConfig.js.map +1 -1
- package/dist/cjs/instructions/deleteContractThread.js +65 -0
- package/dist/cjs/instructions/deleteContractThread.js.map +1 -0
- package/dist/cjs/instructions/index.js +1 -1
- package/dist/cjs/instructions/index.js.map +1 -1
- package/dist/cjs/instructions/invalidateRental.js +10 -7
- package/dist/cjs/instructions/invalidateRental.js.map +1 -1
- package/dist/cjs/instructions/releaseRental.js +10 -7
- package/dist/cjs/instructions/releaseRental.js.map +1 -1
- package/dist/cjs/instructions/reserveRental.js +8 -10
- package/dist/cjs/instructions/reserveRental.js.map +1 -1
- package/dist/cjs/instructions/updateConfig.js +1 -0
- package/dist/cjs/instructions/updateConfig.js.map +1 -1
- package/dist/cjs/kit/index.js.map +1 -1
- package/dist/cjs/legacy/index.js +1 -2
- package/dist/cjs/legacy/index.js.map +1 -1
- package/dist/cjs/package.json +1 -1
- package/dist/cjs/utils/index.js +1 -4
- package/dist/cjs/utils/index.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/esm/demos.js +12 -25
- package/dist/esm/demos.js.map +1 -1
- package/dist/esm/generated/codama/accounts/configState.js +3 -1
- package/dist/esm/generated/codama/accounts/configState.js.map +1 -1
- package/dist/esm/generated/codama/accounts/contractState.js +2 -0
- package/dist/esm/generated/codama/accounts/contractState.js.map +1 -1
- package/dist/esm/generated/codama/accounts/rentalState.js +5 -3
- package/dist/esm/generated/codama/accounts/rentalState.js.map +1 -1
- package/dist/esm/generated/codama/errors/srsly.js +3 -0
- package/dist/esm/generated/codama/errors/srsly.js.map +1 -1
- package/dist/esm/generated/codama/instructions/acceptRental.js +41 -15
- package/dist/esm/generated/codama/instructions/acceptRental.js.map +1 -1
- package/dist/esm/generated/codama/instructions/activateRental.js +1 -75
- package/dist/esm/generated/codama/instructions/activateRental.js.map +1 -1
- package/dist/esm/generated/codama/instructions/closeRental.js +170 -25
- package/dist/esm/generated/codama/instructions/closeRental.js.map +1 -1
- package/dist/esm/generated/codama/instructions/createConfig.js +4 -12
- package/dist/esm/generated/codama/instructions/createConfig.js.map +1 -1
- package/dist/esm/generated/codama/instructions/deleteBorrower.js.map +1 -1
- package/dist/esm/generated/codama/instructions/deleteConfig.js +4 -4
- package/dist/esm/generated/codama/instructions/deleteConfig.js.map +1 -1
- package/dist/esm/generated/codama/instructions/deleteContract.js.map +1 -1
- package/dist/esm/generated/codama/instructions/deleteContractThread.js +165 -0
- package/dist/esm/generated/codama/instructions/deleteContractThread.js.map +1 -0
- package/dist/esm/generated/codama/instructions/deleteRental.js.map +1 -1
- package/dist/esm/generated/codama/instructions/index.js +1 -1
- package/dist/esm/generated/codama/instructions/index.js.map +1 -1
- package/dist/esm/generated/codama/instructions/reserveRental.js +8 -32
- package/dist/esm/generated/codama/instructions/reserveRental.js.map +1 -1
- package/dist/esm/generated/codama/instructions/updateConfig.js +2 -0
- package/dist/esm/generated/codama/instructions/updateConfig.js.map +1 -1
- package/dist/esm/generated/codama/programs/srsly.js +19 -19
- package/dist/esm/generated/codama/programs/srsly.js.map +1 -1
- package/dist/esm/generated/codama/types/fleet.js +15 -1
- package/dist/esm/generated/codama/types/fleet.js.map +1 -1
- package/dist/esm/generated/codama/types/index.js +1 -1
- package/dist/esm/generated/codama/types/index.js.map +1 -1
- package/dist/esm/generated/codama/types/rentalClosed.js +3 -1
- package/dist/esm/generated/codama/types/rentalClosed.js.map +1 -1
- package/dist/esm/generated/codama/types/reservationCreated.js +3 -1
- package/dist/esm/generated/codama/types/reservationCreated.js.map +1 -1
- package/dist/esm/generated/codama/types/shipStats.js +3 -1
- package/dist/esm/generated/codama/types/shipStats.js.map +1 -1
- package/dist/esm/instructions/acceptRental.js +15 -18
- package/dist/esm/instructions/acceptRental.js.map +1 -1
- package/dist/esm/instructions/activateRental.js +0 -8
- package/dist/esm/instructions/activateRental.js.map +1 -1
- package/dist/esm/instructions/closeContract.js +79 -27
- package/dist/esm/instructions/closeContract.js.map +1 -1
- package/dist/esm/instructions/closeRental.js +25 -20
- package/dist/esm/instructions/closeRental.js.map +1 -1
- package/dist/esm/instructions/createConfig.js +1 -4
- package/dist/esm/instructions/createConfig.js.map +1 -1
- package/dist/esm/instructions/deleteContractThread.js +62 -0
- package/dist/esm/instructions/deleteContractThread.js.map +1 -0
- package/dist/esm/instructions/index.js +1 -1
- package/dist/esm/instructions/index.js.map +1 -1
- package/dist/esm/instructions/invalidateRental.js +10 -7
- package/dist/esm/instructions/invalidateRental.js.map +1 -1
- package/dist/esm/instructions/releaseRental.js +10 -7
- package/dist/esm/instructions/releaseRental.js.map +1 -1
- package/dist/esm/instructions/reserveRental.js +8 -10
- package/dist/esm/instructions/reserveRental.js.map +1 -1
- package/dist/esm/instructions/updateConfig.js +1 -0
- package/dist/esm/instructions/updateConfig.js.map +1 -1
- package/dist/esm/kit/index.js.map +1 -1
- package/dist/esm/legacy/index.js +0 -1
- package/dist/esm/legacy/index.js.map +1 -1
- package/dist/esm/package.json +1 -1
- package/dist/esm/utils/index.js +0 -2
- package/dist/esm/utils/index.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/idl/srsly.json +429 -412
- package/dist/types/demos.d.ts +0 -2
- package/dist/types/demos.d.ts.map +1 -1
- package/dist/types/generated/codama/accounts/configState.d.ts +4 -0
- package/dist/types/generated/codama/accounts/configState.d.ts.map +1 -1
- package/dist/types/generated/codama/accounts/contractState.d.ts +4 -0
- package/dist/types/generated/codama/accounts/contractState.d.ts.map +1 -1
- package/dist/types/generated/codama/accounts/rentalState.d.ts +12 -8
- package/dist/types/generated/codama/accounts/rentalState.d.ts.map +1 -1
- package/dist/types/generated/codama/errors/srsly.d.ts +3 -1
- package/dist/types/generated/codama/errors/srsly.d.ts.map +1 -1
- package/dist/types/generated/codama/instructions/acceptRental.d.ts +49 -30
- package/dist/types/generated/codama/instructions/acceptRental.d.ts.map +1 -1
- package/dist/types/generated/codama/instructions/activateRental.d.ts +18 -56
- package/dist/types/generated/codama/instructions/activateRental.d.ts.map +1 -1
- package/dist/types/generated/codama/instructions/closeRental.d.ts +83 -28
- package/dist/types/generated/codama/instructions/closeRental.d.ts.map +1 -1
- package/dist/types/generated/codama/instructions/createConfig.d.ts +3 -3
- package/dist/types/generated/codama/instructions/createConfig.d.ts.map +1 -1
- package/dist/types/generated/codama/instructions/deleteBorrower.d.ts +3 -0
- package/dist/types/generated/codama/instructions/deleteBorrower.d.ts.map +1 -1
- package/dist/types/generated/codama/instructions/deleteConfig.d.ts +1 -1
- package/dist/types/generated/codama/instructions/deleteConfig.d.ts.map +1 -1
- package/dist/types/generated/codama/instructions/deleteContract.d.ts +3 -0
- package/dist/types/generated/codama/instructions/deleteContract.d.ts.map +1 -1
- package/dist/types/generated/codama/instructions/deleteContractThread.d.ts +70 -0
- package/dist/types/generated/codama/instructions/deleteContractThread.d.ts.map +1 -0
- package/dist/types/generated/codama/instructions/deleteRental.d.ts +3 -0
- package/dist/types/generated/codama/instructions/deleteRental.d.ts.map +1 -1
- package/dist/types/generated/codama/instructions/index.d.ts +1 -1
- package/dist/types/generated/codama/instructions/index.d.ts.map +1 -1
- package/dist/types/generated/codama/instructions/reserveRental.d.ts +18 -29
- package/dist/types/generated/codama/instructions/reserveRental.d.ts.map +1 -1
- package/dist/types/generated/codama/instructions/updateConfig.d.ts +6 -0
- package/dist/types/generated/codama/instructions/updateConfig.d.ts.map +1 -1
- package/dist/types/generated/codama/programs/srsly.d.ts +20 -20
- package/dist/types/generated/codama/programs/srsly.d.ts.map +1 -1
- package/dist/types/generated/codama/types/fleet.d.ts +14 -0
- package/dist/types/generated/codama/types/fleet.d.ts.map +1 -1
- package/dist/types/generated/codama/types/index.d.ts +1 -1
- package/dist/types/generated/codama/types/index.d.ts.map +1 -1
- package/dist/types/generated/codama/types/rentalClosed.d.ts +8 -1
- package/dist/types/generated/codama/types/rentalClosed.d.ts.map +1 -1
- package/dist/types/generated/codama/types/reservationCreated.d.ts +2 -0
- package/dist/types/generated/codama/types/reservationCreated.d.ts.map +1 -1
- package/dist/types/generated/codama/types/shipStats.d.ts +3 -1
- package/dist/types/generated/codama/types/shipStats.d.ts.map +1 -1
- package/dist/types/instructions/acceptRental.d.ts +3 -12
- package/dist/types/instructions/acceptRental.d.ts.map +1 -1
- package/dist/types/instructions/activateRental.d.ts.map +1 -1
- package/dist/types/instructions/closeContract.d.ts +5 -0
- package/dist/types/instructions/closeContract.d.ts.map +1 -1
- package/dist/types/instructions/closeRental.d.ts.map +1 -1
- package/dist/types/instructions/createConfig.d.ts +4 -4
- package/dist/types/instructions/createConfig.d.ts.map +1 -1
- package/dist/types/instructions/deleteContractThread.d.ts +42 -0
- package/dist/types/instructions/deleteContractThread.d.ts.map +1 -0
- package/dist/types/instructions/index.d.ts +1 -1
- package/dist/types/instructions/index.d.ts.map +1 -1
- package/dist/types/instructions/invalidateRental.d.ts +4 -3
- package/dist/types/instructions/invalidateRental.d.ts.map +1 -1
- package/dist/types/instructions/releaseRental.d.ts +4 -3
- package/dist/types/instructions/releaseRental.d.ts.map +1 -1
- package/dist/types/instructions/reserveRental.d.ts +0 -7
- package/dist/types/instructions/reserveRental.d.ts.map +1 -1
- package/dist/types/instructions/updateConfig.d.ts +4 -4
- package/dist/types/instructions/updateConfig.d.ts.map +1 -1
- package/dist/types/kit/index.d.ts +1 -1
- package/dist/types/kit/index.d.ts.map +1 -1
- package/dist/types/legacy/index.d.ts +1 -2
- package/dist/types/legacy/index.d.ts.map +1 -1
- package/dist/types/utils/index.d.ts +0 -1
- package/dist/types/utils/index.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/package.json +3 -3
|
@@ -11,7 +11,7 @@ exports.SrslyInstruction = exports.SrslyAccount = exports.SRSLY_PROGRAM_ADDRESS
|
|
|
11
11
|
exports.identifySrslyAccount = identifySrslyAccount;
|
|
12
12
|
exports.identifySrslyInstruction = identifySrslyInstruction;
|
|
13
13
|
const kit_1 = require("@solana/kit");
|
|
14
|
-
exports.SRSLY_PROGRAM_ADDRESS = "
|
|
14
|
+
exports.SRSLY_PROGRAM_ADDRESS = "SRSLYxcFnjd5jG2DpJw4as6UEyjwJQK1U4J1TD1hvZH";
|
|
15
15
|
var SrslyAccount;
|
|
16
16
|
(function (SrslyAccount) {
|
|
17
17
|
SrslyAccount[SrslyAccount["BorrowerState"] = 0] = "BorrowerState";
|
|
@@ -38,21 +38,21 @@ function identifySrslyAccount(account) {
|
|
|
38
38
|
var SrslyInstruction;
|
|
39
39
|
(function (SrslyInstruction) {
|
|
40
40
|
SrslyInstruction[SrslyInstruction["AcceptRental"] = 0] = "AcceptRental";
|
|
41
|
-
SrslyInstruction[SrslyInstruction["
|
|
42
|
-
SrslyInstruction[SrslyInstruction["
|
|
43
|
-
SrslyInstruction[SrslyInstruction["
|
|
44
|
-
SrslyInstruction[SrslyInstruction["
|
|
45
|
-
SrslyInstruction[SrslyInstruction["
|
|
46
|
-
SrslyInstruction[SrslyInstruction["
|
|
47
|
-
SrslyInstruction[SrslyInstruction["
|
|
48
|
-
SrslyInstruction[SrslyInstruction["
|
|
49
|
-
SrslyInstruction[SrslyInstruction["
|
|
50
|
-
SrslyInstruction[SrslyInstruction["
|
|
51
|
-
SrslyInstruction[SrslyInstruction["
|
|
52
|
-
SrslyInstruction[SrslyInstruction["
|
|
53
|
-
SrslyInstruction[SrslyInstruction["
|
|
54
|
-
SrslyInstruction[SrslyInstruction["
|
|
55
|
-
SrslyInstruction[SrslyInstruction["
|
|
41
|
+
SrslyInstruction[SrslyInstruction["CancelRental"] = 1] = "CancelRental";
|
|
42
|
+
SrslyInstruction[SrslyInstruction["ClaimBorrower"] = 2] = "ClaimBorrower";
|
|
43
|
+
SrslyInstruction[SrslyInstruction["ClaimContract"] = 3] = "ClaimContract";
|
|
44
|
+
SrslyInstruction[SrslyInstruction["CloseBorrower"] = 4] = "CloseBorrower";
|
|
45
|
+
SrslyInstruction[SrslyInstruction["CloseContract"] = 5] = "CloseContract";
|
|
46
|
+
SrslyInstruction[SrslyInstruction["CloseContractThread"] = 6] = "CloseContractThread";
|
|
47
|
+
SrslyInstruction[SrslyInstruction["CloseRental"] = 7] = "CloseRental";
|
|
48
|
+
SrslyInstruction[SrslyInstruction["CreateBorrower"] = 8] = "CreateBorrower";
|
|
49
|
+
SrslyInstruction[SrslyInstruction["CreateConfig"] = 9] = "CreateConfig";
|
|
50
|
+
SrslyInstruction[SrslyInstruction["CreateContract"] = 10] = "CreateContract";
|
|
51
|
+
SrslyInstruction[SrslyInstruction["CreateContractThread"] = 11] = "CreateContractThread";
|
|
52
|
+
SrslyInstruction[SrslyInstruction["DeleteBorrower"] = 12] = "DeleteBorrower";
|
|
53
|
+
SrslyInstruction[SrslyInstruction["DeleteConfig"] = 13] = "DeleteConfig";
|
|
54
|
+
SrslyInstruction[SrslyInstruction["DeleteContract"] = 14] = "DeleteContract";
|
|
55
|
+
SrslyInstruction[SrslyInstruction["DeleteContractThread"] = 15] = "DeleteContractThread";
|
|
56
56
|
SrslyInstruction[SrslyInstruction["DeleteRental"] = 16] = "DeleteRental";
|
|
57
57
|
SrslyInstruction[SrslyInstruction["InvalidateRental"] = 17] = "InvalidateRental";
|
|
58
58
|
SrslyInstruction[SrslyInstruction["ProcessContract"] = 18] = "ProcessContract";
|
|
@@ -68,9 +68,6 @@ function identifySrslyInstruction(instruction) {
|
|
|
68
68
|
if ((0, kit_1.containsBytes)(data, (0, kit_1.fixEncoderSize)((0, kit_1.getBytesEncoder)(), 8).encode(new Uint8Array([192, 221, 241, 212, 141, 161, 36, 146])), 0)) {
|
|
69
69
|
return SrslyInstruction.AcceptRental;
|
|
70
70
|
}
|
|
71
|
-
if ((0, kit_1.containsBytes)(data, (0, kit_1.fixEncoderSize)((0, kit_1.getBytesEncoder)(), 8).encode(new Uint8Array([180, 101, 147, 128, 92, 153, 230, 127])), 0)) {
|
|
72
|
-
return SrslyInstruction.ActivateRental;
|
|
73
|
-
}
|
|
74
71
|
if ((0, kit_1.containsBytes)(data, (0, kit_1.fixEncoderSize)((0, kit_1.getBytesEncoder)(), 8).encode(new Uint8Array([97, 204, 63, 8, 84, 34, 28, 43])), 0)) {
|
|
75
72
|
return SrslyInstruction.CancelRental;
|
|
76
73
|
}
|
|
@@ -113,6 +110,9 @@ function identifySrslyInstruction(instruction) {
|
|
|
113
110
|
if ((0, kit_1.containsBytes)(data, (0, kit_1.fixEncoderSize)((0, kit_1.getBytesEncoder)(), 8).encode(new Uint8Array([189, 115, 12, 22, 241, 49, 35, 6])), 0)) {
|
|
114
111
|
return SrslyInstruction.DeleteContract;
|
|
115
112
|
}
|
|
113
|
+
if ((0, kit_1.containsBytes)(data, (0, kit_1.fixEncoderSize)((0, kit_1.getBytesEncoder)(), 8).encode(new Uint8Array([113, 179, 247, 242, 60, 125, 240, 68])), 0)) {
|
|
114
|
+
return SrslyInstruction.DeleteContractThread;
|
|
115
|
+
}
|
|
116
116
|
if ((0, kit_1.containsBytes)(data, (0, kit_1.fixEncoderSize)((0, kit_1.getBytesEncoder)(), 8).encode(new Uint8Array([252, 24, 115, 220, 135, 174, 69, 172])), 0)) {
|
|
117
117
|
return SrslyInstruction.DeleteRental;
|
|
118
118
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"srsly.js","sourceRoot":"","sources":["../../../../../src/generated/codama/programs/srsly.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AA+CH,oDAmDC;AA8BD,4DA0RC;AAxZD,qCAMqB;AA6BR,QAAA,qBAAqB,GAChC,
|
|
1
|
+
{"version":3,"file":"srsly.js","sourceRoot":"","sources":["../../../../../src/generated/codama/programs/srsly.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,6 +29,13 @@ function getFleetEncoder() {
|
|
|
29
29
|
["cargoHold", (0, kit_1.getAddressEncoder)()],
|
|
30
30
|
["fuelTank", (0, kit_1.getAddressEncoder)()],
|
|
31
31
|
["ammoBank", (0, kit_1.getAddressEncoder)()],
|
|
32
|
+
["ap", (0, kit_1.getU32Encoder)()],
|
|
33
|
+
["sp", (0, kit_1.getU32Encoder)()],
|
|
34
|
+
["hp", (0, kit_1.getU32Encoder)()],
|
|
35
|
+
["pendingHp", (0, kit_1.getU32Encoder)()],
|
|
36
|
+
["apReloadExpiresAt", (0, kit_1.getI64Encoder)()],
|
|
37
|
+
["shieldBreakDelayExpiresAt", (0, kit_1.getI64Encoder)()],
|
|
38
|
+
["lastCombatUpdate", (0, kit_1.getI64Encoder)()],
|
|
32
39
|
["updateId", (0, kit_1.getU64Encoder)()],
|
|
33
40
|
["bump", (0, kit_1.getU8Encoder)()],
|
|
34
41
|
]);
|
|
@@ -50,6 +57,13 @@ function getFleetDecoder() {
|
|
|
50
57
|
["cargoHold", (0, kit_1.getAddressDecoder)()],
|
|
51
58
|
["fuelTank", (0, kit_1.getAddressDecoder)()],
|
|
52
59
|
["ammoBank", (0, kit_1.getAddressDecoder)()],
|
|
60
|
+
["ap", (0, kit_1.getU32Decoder)()],
|
|
61
|
+
["sp", (0, kit_1.getU32Decoder)()],
|
|
62
|
+
["hp", (0, kit_1.getU32Decoder)()],
|
|
63
|
+
["pendingHp", (0, kit_1.getU32Decoder)()],
|
|
64
|
+
["apReloadExpiresAt", (0, kit_1.getI64Decoder)()],
|
|
65
|
+
["shieldBreakDelayExpiresAt", (0, kit_1.getI64Decoder)()],
|
|
66
|
+
["lastCombatUpdate", (0, kit_1.getI64Decoder)()],
|
|
53
67
|
["updateId", (0, kit_1.getU64Decoder)()],
|
|
54
68
|
["bump", (0, kit_1.getU8Decoder)()],
|
|
55
69
|
]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fleet.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/fleet.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;
|
|
1
|
+
{"version":3,"file":"fleet.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/fleet.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
24
24
|
__exportStar(require("./atlasClaimed"), exports);
|
|
25
25
|
__exportStar(require("./borrowerInitialized"), exports);
|
|
26
26
|
__exportStar(require("./cargoStats"), exports);
|
|
27
|
+
__exportStar(require("./combatStats"), exports);
|
|
27
28
|
__exportStar(require("./contractClosed"), exports);
|
|
28
29
|
__exportStar(require("./contractCreated"), exports);
|
|
29
30
|
__exportStar(require("./contractDelegateSet"), exports);
|
|
@@ -33,7 +34,6 @@ __exportStar(require("./contractThreadClosed"), exports);
|
|
|
33
34
|
__exportStar(require("./contractThreadCreated"), exports);
|
|
34
35
|
__exportStar(require("./contractThreadUpdated"), exports);
|
|
35
36
|
__exportStar(require("./contractUpdated"), exports);
|
|
36
|
-
__exportStar(require("./discount"), exports);
|
|
37
37
|
__exportStar(require("./fieldUpdate"), exports);
|
|
38
38
|
__exportStar(require("./fleet"), exports);
|
|
39
39
|
__exportStar(require("./miscStats"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/index.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;AAEH,iDAA+B;AAC/B,wDAAsC;AACtC,+CAA6B;AAC7B,mDAAiC;AACjC,oDAAkC;AAClC,wDAAsC;AACtC,yDAAuC;AACvC,sDAAoC;AACpC,yDAAuC;AACvC,0DAAwC;AACxC,0DAAwC;AACxC,oDAAkC;AAClC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/index.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;AAEH,iDAA+B;AAC/B,wDAAsC;AACtC,+CAA6B;AAC7B,gDAA8B;AAC9B,mDAAiC;AACjC,oDAAkC;AAClC,wDAAsC;AACtC,yDAAuC;AACvC,sDAAoC;AACpC,yDAAuC;AACvC,0DAAwC;AACxC,0DAAwC;AACxC,oDAAkC;AAClC,gDAA8B;AAC9B,0CAAwB;AACxB,8CAA4B;AAC5B,kDAAgC;AAChC,4DAA0C;AAC1C,yDAAuC;AACvC,mDAAiC;AACjC,oDAAkC;AAClC,oDAAkC;AAClC,iDAA+B;AAC/B,kDAAgC;AAChC,iDAA+B;AAC/B,uDAAqC;AACrC,wDAAsC;AACtC,6CAA2B;AAC3B,+CAA6B;AAC7B,8CAA4B;AAC5B,2CAAyB;AACzB,2CAAyB;AACzB,4CAA0B"}
|
|
@@ -17,6 +17,7 @@ function getRentalClosedEncoder() {
|
|
|
17
17
|
["contract", (0, kit_1.getAddressEncoder)()],
|
|
18
18
|
["borrower", (0, kit_1.getAddressEncoder)()],
|
|
19
19
|
["pointsAwarded", (0, kit_1.getU32Encoder)()],
|
|
20
|
+
["feeFlushed", (0, kit_1.getU64Encoder)()],
|
|
20
21
|
]);
|
|
21
22
|
}
|
|
22
23
|
function getRentalClosedDecoder() {
|
|
@@ -25,6 +26,7 @@ function getRentalClosedDecoder() {
|
|
|
25
26
|
["contract", (0, kit_1.getAddressDecoder)()],
|
|
26
27
|
["borrower", (0, kit_1.getAddressDecoder)()],
|
|
27
28
|
["pointsAwarded", (0, kit_1.getU32Decoder)()],
|
|
29
|
+
["feeFlushed", (0, kit_1.getU64Decoder)()],
|
|
28
30
|
]);
|
|
29
31
|
}
|
|
30
32
|
function getRentalClosedCodec() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rentalClosed.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/rentalClosed.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;
|
|
1
|
+
{"version":3,"file":"rentalClosed.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/rentalClosed.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAkCH,wDAQC;AAED,wDAQC;AAED,oDAKC;AAzDD,qCAcqB;AAkBrB,SAAgB,sBAAsB;IACpC,OAAO,IAAA,sBAAgB,EAAC;QACtB,CAAC,aAAa,EAAE,IAAA,uBAAiB,GAAE,CAAC;QACpC,CAAC,UAAU,EAAE,IAAA,uBAAiB,GAAE,CAAC;QACjC,CAAC,UAAU,EAAE,IAAA,uBAAiB,GAAE,CAAC;QACjC,CAAC,eAAe,EAAE,IAAA,mBAAa,GAAE,CAAC;QAClC,CAAC,YAAY,EAAE,IAAA,mBAAa,GAAE,CAAC;KAChC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,sBAAsB;IACpC,OAAO,IAAA,sBAAgB,EAAC;QACtB,CAAC,aAAa,EAAE,IAAA,uBAAiB,GAAE,CAAC;QACpC,CAAC,UAAU,EAAE,IAAA,uBAAiB,GAAE,CAAC;QACjC,CAAC,UAAU,EAAE,IAAA,uBAAiB,GAAE,CAAC;QACjC,CAAC,eAAe,EAAE,IAAA,mBAAa,GAAE,CAAC;QAClC,CAAC,YAAY,EAAE,IAAA,mBAAa,GAAE,CAAC;KAChC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,oBAAoB;IAIlC,OAAO,IAAA,kBAAY,EAAC,sBAAsB,EAAE,EAAE,sBAAsB,EAAE,CAAC,CAAC;AAC1E,CAAC"}
|
|
@@ -19,6 +19,7 @@ function getReservationCreatedEncoder() {
|
|
|
19
19
|
["bidAtlas", (0, kit_1.getU64Encoder)()],
|
|
20
20
|
["escrowAmount", (0, kit_1.getU64Encoder)()],
|
|
21
21
|
["serviceFee", (0, kit_1.getU64Encoder)()],
|
|
22
|
+
["feeBps", (0, kit_1.getU16Encoder)()],
|
|
22
23
|
["durationSeconds", (0, kit_1.getI64Encoder)()],
|
|
23
24
|
]);
|
|
24
25
|
}
|
|
@@ -30,6 +31,7 @@ function getReservationCreatedDecoder() {
|
|
|
30
31
|
["bidAtlas", (0, kit_1.getU64Decoder)()],
|
|
31
32
|
["escrowAmount", (0, kit_1.getU64Decoder)()],
|
|
32
33
|
["serviceFee", (0, kit_1.getU64Decoder)()],
|
|
34
|
+
["feeBps", (0, kit_1.getU16Decoder)()],
|
|
33
35
|
["durationSeconds", (0, kit_1.getI64Decoder)()],
|
|
34
36
|
]);
|
|
35
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reservationCreated.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/reservationCreated.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;
|
|
1
|
+
{"version":3,"file":"reservationCreated.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/reservationCreated.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AA4CH,oEAWC;AAED,oEAWC;AAED,gEAQC;AA5ED,qCAkBqB;AAwBrB,SAAgB,4BAA4B;IAC1C,OAAO,IAAA,sBAAgB,EAAC;QACtB,CAAC,UAAU,EAAE,IAAA,uBAAiB,GAAE,CAAC;QACjC,CAAC,YAAY,EAAE,IAAA,uBAAiB,GAAE,CAAC;QACnC,CAAC,WAAW,EAAE,IAAA,mBAAa,GAAE,CAAC;QAC9B,CAAC,UAAU,EAAE,IAAA,mBAAa,GAAE,CAAC;QAC7B,CAAC,cAAc,EAAE,IAAA,mBAAa,GAAE,CAAC;QACjC,CAAC,YAAY,EAAE,IAAA,mBAAa,GAAE,CAAC;QAC/B,CAAC,QAAQ,EAAE,IAAA,mBAAa,GAAE,CAAC;QAC3B,CAAC,iBAAiB,EAAE,IAAA,mBAAa,GAAE,CAAC;KACrC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,4BAA4B;IAC1C,OAAO,IAAA,sBAAgB,EAAC;QACtB,CAAC,UAAU,EAAE,IAAA,uBAAiB,GAAE,CAAC;QACjC,CAAC,YAAY,EAAE,IAAA,uBAAiB,GAAE,CAAC;QACnC,CAAC,WAAW,EAAE,IAAA,mBAAa,GAAE,CAAC;QAC9B,CAAC,UAAU,EAAE,IAAA,mBAAa,GAAE,CAAC;QAC7B,CAAC,cAAc,EAAE,IAAA,mBAAa,GAAE,CAAC;QACjC,CAAC,YAAY,EAAE,IAAA,mBAAa,GAAE,CAAC;QAC/B,CAAC,QAAQ,EAAE,IAAA,mBAAa,GAAE,CAAC;QAC3B,CAAC,iBAAiB,EAAE,IAAA,mBAAa,GAAE,CAAC;KACrC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,0BAA0B;IAIxC,OAAO,IAAA,kBAAY,EACjB,4BAA4B,EAAE,EAC9B,4BAA4B,EAAE,CAC/B,CAAC;AACJ,CAAC"}
|
|
@@ -16,6 +16,7 @@ function getShipStatsEncoder() {
|
|
|
16
16
|
return (0, kit_1.getStructEncoder)([
|
|
17
17
|
["movementStats", (0, _1.getMovementStatsEncoder)()],
|
|
18
18
|
["cargoStats", (0, _1.getCargoStatsEncoder)()],
|
|
19
|
+
["combatStats", (0, _1.getCombatStatsEncoder)()],
|
|
19
20
|
["miscStats", (0, _1.getMiscStatsEncoder)()],
|
|
20
21
|
]);
|
|
21
22
|
}
|
|
@@ -23,6 +24,7 @@ function getShipStatsDecoder() {
|
|
|
23
24
|
return (0, kit_1.getStructDecoder)([
|
|
24
25
|
["movementStats", (0, _1.getMovementStatsDecoder)()],
|
|
25
26
|
["cargoStats", (0, _1.getCargoStatsDecoder)()],
|
|
27
|
+
["combatStats", (0, _1.getCombatStatsDecoder)()],
|
|
26
28
|
["miscStats", (0, _1.getMiscStatsDecoder)()],
|
|
27
29
|
]);
|
|
28
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shipStats.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/shipStats.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;
|
|
1
|
+
{"version":3,"file":"shipStats.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/shipStats.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AA4CH,kDAOC;AAED,kDAOC;AAED,8CAEC;AA9DD,qCAOqB;AACrB,wBAiBW;AAiBX,SAAgB,mBAAmB;IACjC,OAAO,IAAA,sBAAgB,EAAC;QACtB,CAAC,eAAe,EAAE,IAAA,0BAAuB,GAAE,CAAC;QAC5C,CAAC,YAAY,EAAE,IAAA,uBAAoB,GAAE,CAAC;QACtC,CAAC,aAAa,EAAE,IAAA,wBAAqB,GAAE,CAAC;QACxC,CAAC,WAAW,EAAE,IAAA,sBAAmB,GAAE,CAAC;KACrC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,mBAAmB;IACjC,OAAO,IAAA,sBAAgB,EAAC;QACtB,CAAC,eAAe,EAAE,IAAA,0BAAuB,GAAE,CAAC;QAC5C,CAAC,YAAY,EAAE,IAAA,uBAAoB,GAAE,CAAC;QACtC,CAAC,aAAa,EAAE,IAAA,wBAAqB,GAAE,CAAC;QACxC,CAAC,WAAW,EAAE,IAAA,sBAAmB,GAAE,CAAC;KACrC,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,iBAAiB;IAC/B,OAAO,IAAA,kBAAY,EAAC,mBAAmB,EAAE,EAAE,mBAAmB,EAAE,CAAC,CAAC;AACpE,CAAC"}
|
|
@@ -40,9 +40,9 @@ const types_1 = require("../generated/codama/types");
|
|
|
40
40
|
*
|
|
41
41
|
* @example
|
|
42
42
|
* ```typescript
|
|
43
|
-
* // Accept a 7-day rental (borrowerProfile auto-fetched)
|
|
44
43
|
* const ixs = await acceptRental({
|
|
45
44
|
* borrower: wallet,
|
|
45
|
+
* borrowerProfile: "BORROWER_PROFILE_ADDRESS",
|
|
46
46
|
* contract: "CONTRACT_ADDRESS",
|
|
47
47
|
* duration: { days: 7 },
|
|
48
48
|
* computeUnits: 400_000
|
|
@@ -62,11 +62,13 @@ async function acceptRental(params, config) {
|
|
|
62
62
|
if (!params.duration) {
|
|
63
63
|
throw new Error('duration is required');
|
|
64
64
|
}
|
|
65
|
+
if (!params.borrowerProfile) {
|
|
66
|
+
throw new Error('borrowerProfile is required');
|
|
67
|
+
}
|
|
65
68
|
// Convert borrower to transaction signer
|
|
66
69
|
const borrowerSigner = (0, signer_1.toTransactionSigner)(params.borrower);
|
|
67
|
-
// Fetch config
|
|
70
|
+
// Fetch config
|
|
68
71
|
const configAccount = await (0, config_2.fetchConfig)(finalConfig.rpcUrl);
|
|
69
|
-
const vault = configAccount.data.slyvault;
|
|
70
72
|
// Fetch contract to get fleet, gameId
|
|
71
73
|
const contractAccount = await (0, contract_1.fetchContract)(params.contract, finalConfig.rpcUrl);
|
|
72
74
|
const fleet = contractAccount.data.fleet;
|
|
@@ -82,14 +84,7 @@ async function acceptRental(params, config) {
|
|
|
82
84
|
// Fetch fleet data for faction (needed to derive SAGE accounts)
|
|
83
85
|
const fleetState = await (0, fleet_1.fetchFleet)(fleet, finalConfig.rpcUrl);
|
|
84
86
|
const faction = fleetState.faction;
|
|
85
|
-
|
|
86
|
-
let borrowerProfile;
|
|
87
|
-
if (params.borrowerProfile) {
|
|
88
|
-
borrowerProfile = (0, kit_1.address)(params.borrowerProfile);
|
|
89
|
-
}
|
|
90
|
-
else {
|
|
91
|
-
borrowerProfile = fleetState.subProfile.key;
|
|
92
|
-
}
|
|
87
|
+
const borrowerProfile = (0, kit_1.address)(params.borrowerProfile);
|
|
93
88
|
// Derive all SAGE game accounts (profile faction, starbase, starbase player)
|
|
94
89
|
const gameAccounts = await (0, sage_1.deriveGameAccounts)(borrowerProfile, faction, gameId);
|
|
95
90
|
// Derive active rental PDA (no more slot logic)
|
|
@@ -134,13 +129,13 @@ async function acceptRental(params, config) {
|
|
|
134
129
|
const addresses = (0, config_1.getAddresses)(config);
|
|
135
130
|
const sageProgram = (0, kit_1.address)(addresses.sage);
|
|
136
131
|
const programAddress = (0, kit_1.address)(addresses.srsly);
|
|
137
|
-
const discount = params.discount ? (0, kit_1.address)(params.discount) : undefined;
|
|
138
132
|
const referrer = params.referrer ? (0, kit_1.address)(params.referrer) : undefined;
|
|
139
|
-
// Derive vault token account (ATA)
|
|
140
|
-
const vaultTokenAccount = await (0, token_1.deriveAssociatedTokenAccount)(vault, atlasMint);
|
|
141
133
|
// Derive contract token account (ATA of contract PDA)
|
|
142
134
|
const contractAddress = (0, kit_1.address)(params.contract);
|
|
143
135
|
const contractTokenAccount = await (0, token_1.deriveAssociatedTokenAccount)(contractAddress, atlasMint);
|
|
136
|
+
// Derive vault accounts for fee flush
|
|
137
|
+
const vaultAddress = (0, kit_1.address)(configAccount.data.slyvault);
|
|
138
|
+
const vaultTokenAccount = await (0, token_1.deriveAssociatedTokenAccount)(vaultAddress, atlasMint);
|
|
144
139
|
// Derive borrower token account (ATA)
|
|
145
140
|
const borrowerTokenAccount = await (0, token_1.deriveAssociatedTokenAccount)(borrowerSigner.address, atlasMint);
|
|
146
141
|
// Call Codama-generated acceptRental instruction
|
|
@@ -150,16 +145,18 @@ async function acceptRental(params, config) {
|
|
|
150
145
|
fleet: (0, kit_1.address)(fleet),
|
|
151
146
|
expiredBorrowerState,
|
|
152
147
|
contract: contractAddress,
|
|
153
|
-
rentalState,
|
|
154
|
-
vault: (0, kit_1.address)(vault),
|
|
155
|
-
vaultTokenAccount,
|
|
156
148
|
contractTokenAccount,
|
|
149
|
+
vault: vaultAddress,
|
|
150
|
+
vaultTokenAccount,
|
|
157
151
|
...(contractThread && { contractThread }),
|
|
158
152
|
...(closeRentalFiber && { closeRentalFiber }),
|
|
159
153
|
referrer,
|
|
160
|
-
discount,
|
|
161
154
|
sageProgram,
|
|
162
155
|
duration: BigInt(durationSeconds),
|
|
156
|
+
discountSignature: null,
|
|
157
|
+
discountMemberNonce: null,
|
|
158
|
+
discountBps: null,
|
|
159
|
+
discountExpiresAt: null,
|
|
163
160
|
}, { programAddress });
|
|
164
161
|
// Append SAGE pass-through accounts as remaining accounts
|
|
165
162
|
const sageRemainingAccounts = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"acceptRental.js","sourceRoot":"","sources":["../../../src/instructions/acceptRental.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;
|
|
1
|
+
{"version":3,"file":"acceptRental.js","sourceRoot":"","sources":["../../../src/instructions/acceptRental.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,6 @@ const rental_1 = require("../accounts/rental");
|
|
|
19
19
|
const sage_1 = require("../pda/sage");
|
|
20
20
|
const srsly_1 = require("../pda/srsly");
|
|
21
21
|
const thread_1 = require("../pda/thread");
|
|
22
|
-
const token_1 = require("../pda/token");
|
|
23
22
|
/**
|
|
24
23
|
* Manually activate a queued rental
|
|
25
24
|
*
|
|
@@ -66,22 +65,15 @@ async function activateRental(params, config) {
|
|
|
66
65
|
const borrowerProfileAddr = (0, kit_1.address)(params.borrowerProfile);
|
|
67
66
|
const fleetState = await (0, fleet_1.fetchFleet)(contractAccount.data.fleet, finalConfig.rpcUrl);
|
|
68
67
|
const gameAccounts = await (0, sage_1.deriveGameAccounts)(borrowerProfileAddr, fleetState.faction, contractAccount.data.gameId);
|
|
69
|
-
// Get vault from config and derive vault token account
|
|
70
|
-
const vault = configAccount.data.slyvault;
|
|
71
|
-
const vaultTokenAccount = await (0, token_1.deriveAssociatedTokenAccount)(vault, atlasMint);
|
|
72
68
|
const kitInstruction = await (0, instructions_1.getActivateRentalInstructionAsync)({
|
|
73
69
|
payer: payerSigner,
|
|
74
70
|
contract: contractAddress,
|
|
75
|
-
contractTokenAccount: contractAccount.data.managedTokenAccount,
|
|
76
|
-
mint: atlasMint,
|
|
77
71
|
borrowerProfile: borrowerProfileAddr,
|
|
78
72
|
borrowerProfileFaction: gameAccounts.profileFaction,
|
|
79
73
|
fleet: contractAccount.data.fleet,
|
|
80
74
|
gameId: contractAccount.data.gameId,
|
|
81
75
|
...(contractThread && { contractThread }),
|
|
82
76
|
...(closeRentalFiber && { closeRentalFiber }),
|
|
83
|
-
vault,
|
|
84
|
-
vaultTokenAccount,
|
|
85
77
|
sageProgram: (0, kit_1.address)(addresses.sage),
|
|
86
78
|
}, { programAddress });
|
|
87
79
|
// Append starbase + starbasePlayer as remaining accounts (for fiber 1 building)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activateRental.js","sourceRoot":"","sources":["../../../src/instructions/activateRental.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAsDH,
|
|
1
|
+
{"version":3,"file":"activateRental.js","sourceRoot":"","sources":["../../../src/instructions/activateRental.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,6 +46,7 @@ const config_1 = require("../utils/config");
|
|
|
46
46
|
const signer_1 = require("../utils/signer");
|
|
47
47
|
const contract_1 = require("../accounts/contract");
|
|
48
48
|
const config_2 = require("../accounts/config");
|
|
49
|
+
const rental_1 = require("../accounts/rental");
|
|
49
50
|
const thread_1 = require("../accounts/thread");
|
|
50
51
|
const token_1 = require("../pda/token");
|
|
51
52
|
const srsly_1 = require("../pda/srsly");
|
|
@@ -141,51 +142,102 @@ async function closeContract(params, config) {
|
|
|
141
142
|
: (0, kit_1.address)(addresses.sage);
|
|
142
143
|
// Derive contract token account (ATA of contract PDA for ATLAS)
|
|
143
144
|
const contractTokenAccount = await (0, token_1.deriveAssociatedTokenAccount)(contractAddress, atlasMint);
|
|
144
|
-
// Check
|
|
145
|
+
// Check contract state
|
|
145
146
|
const SYSTEM_PROGRAM_ID = '11111111111111111111111111111111';
|
|
146
147
|
const hasThread = contractAccount.data.thread !== SYSTEM_PROGRAM_ID;
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
//
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
const
|
|
153
|
-
const activeRental = await fetchRental(contractAccount.data.activeRental, finalConfig.rpcUrl);
|
|
148
|
+
const hasActiveSlot = contractAccount.data.activeRental !== SYSTEM_PROGRAM_ID;
|
|
149
|
+
const hasQueuedSlot = contractAccount.data.queuedRental !== SYSTEM_PROGRAM_ID;
|
|
150
|
+
// Check if active rental is expired
|
|
151
|
+
let activeExpired = false;
|
|
152
|
+
if (hasActiveSlot) {
|
|
153
|
+
const activeRental = await (0, rental_1.fetchRental)(contractAccount.data.activeRental, finalConfig.rpcUrl);
|
|
154
154
|
const now = Math.floor(Date.now() / 1000);
|
|
155
155
|
if (activeRental.data.endTime <= BigInt(now)) {
|
|
156
|
-
|
|
156
|
+
activeExpired = true;
|
|
157
157
|
}
|
|
158
158
|
}
|
|
159
|
-
|
|
160
|
-
|
|
159
|
+
// Resolve queued borrower accounts when a queued rental exists
|
|
160
|
+
let queuedBorrowerState;
|
|
161
|
+
let queuedBorrowerTokenAccount;
|
|
162
|
+
if (hasQueuedSlot) {
|
|
163
|
+
let queuedBorrower;
|
|
164
|
+
if (params.queuedBorrower) {
|
|
165
|
+
queuedBorrower = (0, kit_1.address)(params.queuedBorrower);
|
|
166
|
+
}
|
|
167
|
+
else {
|
|
168
|
+
const queuedRental = await (0, rental_1.fetchRental)(contractAccount.data.queuedRental, finalConfig.rpcUrl);
|
|
169
|
+
queuedBorrower = queuedRental.data.borrower;
|
|
170
|
+
}
|
|
171
|
+
queuedBorrowerState = await (0, srsly_1.deriveBorrowerState)(queuedBorrower);
|
|
172
|
+
queuedBorrowerTokenAccount = await (0, token_1.deriveAssociatedTokenAccount)(queuedBorrower, atlasMint);
|
|
173
|
+
}
|
|
174
|
+
// Helper: build a closeContractThread instruction
|
|
175
|
+
const buildThreadCloseIx = async () => {
|
|
161
176
|
const rentalAuthority = await (0, srsly_1.deriveRentalAuthority)();
|
|
162
177
|
const contractThread = await (0, thread_2.deriveContractThread)(contractAddress, rentalAuthority);
|
|
163
|
-
// Fetch thread to get fiber IDs for remaining accounts
|
|
164
178
|
const threadAccount = await (0, thread_1.fetchThread)(contractThread, finalConfig.rpcUrl);
|
|
165
179
|
const fiberIds = Array.from(threadAccount.data.fiberIds);
|
|
166
|
-
// Derive fiber PDAs
|
|
167
180
|
const fiberAccounts = await Promise.all(fiberIds.map(async (id) => ({
|
|
168
181
|
address: await (0, thread_2.deriveFiber)(contractThread, id),
|
|
169
182
|
role: kit_1.AccountRole.WRITABLE,
|
|
170
183
|
})));
|
|
171
|
-
|
|
184
|
+
const ix = await (0, instructions_1.getCloseContractThreadInstructionAsync)({ owner: ownerSigner, contract: contractAddress, thread: contractThread }, { programAddress });
|
|
185
|
+
ix.accounts.push(...fiberAccounts);
|
|
186
|
+
return ix;
|
|
187
|
+
};
|
|
188
|
+
// Helper: build a closeContract instruction with optional queued borrower accounts
|
|
189
|
+
const buildCloseContractIx = async (includeQueued) => {
|
|
190
|
+
return (0, instructions_1.getCloseContractInstructionAsync)({
|
|
172
191
|
owner: ownerSigner,
|
|
173
192
|
contract: contractAddress,
|
|
174
|
-
|
|
193
|
+
mint: atlasMint,
|
|
194
|
+
fleet: fleetAddress,
|
|
195
|
+
contractTokenAccount: contractTokenAccount,
|
|
196
|
+
sageProgram,
|
|
197
|
+
...(includeQueued && queuedBorrowerState && queuedBorrowerTokenAccount
|
|
198
|
+
? { queuedBorrowerState, queuedBorrowerTokenAccount }
|
|
199
|
+
: {}),
|
|
175
200
|
}, { programAddress });
|
|
176
|
-
|
|
201
|
+
};
|
|
202
|
+
// Compose instructions based on scenario
|
|
203
|
+
const ixs = [];
|
|
204
|
+
if (activeExpired && hasQueuedSlot) {
|
|
205
|
+
// Expired active + queued: multi-instruction composition
|
|
206
|
+
// 1. closeRental — settles expired active
|
|
207
|
+
const { closeRental } = await Promise.resolve().then(() => __importStar(require('./closeRental')));
|
|
208
|
+
const closeRentalResult = await closeRental({ payer: params.owner, contract: contractAddress }, config);
|
|
209
|
+
ixs.push(...closeRentalResult.instructions);
|
|
210
|
+
// 2. closeContractThread (if thread exists)
|
|
211
|
+
if (hasThread) {
|
|
212
|
+
ixs.push(await buildThreadCloseIx());
|
|
213
|
+
}
|
|
214
|
+
// 3. closeContract — force-closes queued, sets to_close
|
|
215
|
+
ixs.push(await buildCloseContractIx(true));
|
|
216
|
+
// 4. closeContract — final close (no active, no queued, no thread)
|
|
217
|
+
ixs.push(await buildCloseContractIx(false));
|
|
218
|
+
}
|
|
219
|
+
else if (activeExpired && !hasQueuedSlot) {
|
|
220
|
+
// Expired active only, no queued — settle then close
|
|
221
|
+
const { closeRental } = await Promise.resolve().then(() => __importStar(require('./closeRental')));
|
|
222
|
+
const closeRentalResult = await closeRental({ payer: params.owner, contract: contractAddress }, config);
|
|
223
|
+
ixs.push(...closeRentalResult.instructions);
|
|
224
|
+
if (hasThread) {
|
|
225
|
+
ixs.push(await buildThreadCloseIx());
|
|
226
|
+
}
|
|
227
|
+
ixs.push(await buildCloseContractIx(false));
|
|
228
|
+
}
|
|
229
|
+
else if (!activeExpired && hasQueuedSlot) {
|
|
230
|
+
// Non-expired active + queued — deferred close with queued borrower accounts
|
|
231
|
+
ixs.push(await buildCloseContractIx(true));
|
|
232
|
+
}
|
|
233
|
+
else {
|
|
234
|
+
// No active rental (or no rental at all) — simple close
|
|
235
|
+
if (hasThread) {
|
|
236
|
+
ixs.push(await buildThreadCloseIx());
|
|
237
|
+
}
|
|
238
|
+
ixs.push(await buildCloseContractIx(false));
|
|
177
239
|
}
|
|
178
|
-
|
|
179
|
-
const kitInstruction = await (0, instructions_1.getCloseContractInstructionAsync)({
|
|
180
|
-
owner: ownerSigner,
|
|
181
|
-
contract: contractAddress,
|
|
182
|
-
mint: atlasMint,
|
|
183
|
-
fleet: fleetAddress,
|
|
184
|
-
contractTokenAccount: contractTokenAccount,
|
|
185
|
-
sageProgram,
|
|
186
|
-
}, { programAddress });
|
|
187
|
-
const instructions = threadCloseIx ? [threadCloseIx, kitInstruction] : kitInstruction;
|
|
188
|
-
return (0, instructions_2.prepareInstructions)(instructions, {
|
|
240
|
+
return (0, instructions_2.prepareInstructions)(ixs, {
|
|
189
241
|
computeUnits: params.computeUnits,
|
|
190
242
|
PublicKey: finalConfig.PublicKey
|
|
191
243
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"closeContract.js","sourceRoot":"","sources":["../../../src/instructions/closeContract.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"closeContract.js","sourceRoot":"","sources":["../../../src/instructions/closeContract.ts"],"names":[],"mappings":"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"}
|