@wuwei-labs/srsly 3.0.0-beta.21 → 3.0.0-beta.23

package/dist/esm/generated/codama/types/rentalAccepted.js

@@ -8,26 +8,18 @@
 import { combineCodec, getAddressDecoder, getAddressEncoder, getI64Decoder, getI64Encoder, getStructDecoder, getStructEncoder, getU64Decoder, getU64Encoder, } from "@solana/kit";
 export function getRentalAcceptedEncoder() {
     return getStructEncoder([
-        ["rentalState", getAddressEncoder()],
         ["contract", getAddressEncoder()],
         ["borrower", getAddressEncoder()],
-        ["fleet", getAddressEncoder()],
-        ["durationSeconds", getU64Encoder()],
-        ["escrowAmount", getU64Encoder()],
-        ["serviceFee", getU64Encoder()],
+        ["escrow", getU64Encoder()],
         ["startTime", getI64Encoder()],
         ["endTime", getI64Encoder()],
     ]);
 }
 export function getRentalAcceptedDecoder() {
     return getStructDecoder([
-        ["rentalState", getAddressDecoder()],
         ["contract", getAddressDecoder()],
         ["borrower", getAddressDecoder()],
-        ["fleet", getAddressDecoder()],
-        ["durationSeconds", getU64Decoder()],
-        ["escrowAmount", getU64Decoder()],
-        ["serviceFee", getU64Decoder()],
+        ["escrow", getU64Decoder()],
         ["startTime", getI64Decoder()],
         ["endTime", getI64Decoder()],
     ]);

package/dist/esm/generated/codama/types/rentalAccepted.js.map

@@ -1 +1 @@
-{"version":3,"file":"rentalAccepted.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/rentalAccepted.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,aAAa,GAKd,MAAM,aAAa,CAAC;AA0BrB,MAAM,UAAU,wBAAwB;IACtC,OAAO,gBAAgB,CAAC;QACtB,CAAC,aAAa,EAAE,iBAAiB,EAAE,CAAC;QACpC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,OAAO,EAAE,iBAAiB,EAAE,CAAC;QAC9B,CAAC,iBAAiB,EAAE,aAAa,EAAE,CAAC;QACpC,CAAC,cAAc,EAAE,aAAa,EAAE,CAAC;QACjC,CAAC,YAAY,EAAE,aAAa,EAAE,CAAC;QAC/B,CAAC,WAAW,EAAE,aAAa,EAAE,CAAC;QAC9B,CAAC,SAAS,EAAE,aAAa,EAAE,CAAC;KAC7B,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,wBAAwB;IACtC,OAAO,gBAAgB,CAAC;QACtB,CAAC,aAAa,EAAE,iBAAiB,EAAE,CAAC;QACpC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,OAAO,EAAE,iBAAiB,EAAE,CAAC;QAC9B,CAAC,iBAAiB,EAAE,aAAa,EAAE,CAAC;QACpC,CAAC,cAAc,EAAE,aAAa,EAAE,CAAC;QACjC,CAAC,YAAY,EAAE,aAAa,EAAE,CAAC;QAC/B,CAAC,WAAW,EAAE,aAAa,EAAE,CAAC;QAC9B,CAAC,SAAS,EAAE,aAAa,EAAE,CAAC;KAC7B,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,sBAAsB;IAIpC,OAAO,YAAY,CAAC,wBAAwB,EAAE,EAAE,wBAAwB,EAAE,CAAC,CAAC;AAC9E,CAAC"}
+{"version":3,"file":"rentalAccepted.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/rentalAccepted.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,aAAa,GAKd,MAAM,aAAa,CAAC;AAkBrB,MAAM,UAAU,wBAAwB;IACtC,OAAO,gBAAgB,CAAC;QACtB,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,QAAQ,EAAE,aAAa,EAAE,CAAC;QAC3B,CAAC,WAAW,EAAE,aAAa,EAAE,CAAC;QAC9B,CAAC,SAAS,EAAE,aAAa,EAAE,CAAC;KAC7B,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,wBAAwB;IACtC,OAAO,gBAAgB,CAAC;QACtB,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,QAAQ,EAAE,aAAa,EAAE,CAAC;QAC3B,CAAC,WAAW,EAAE,aAAa,EAAE,CAAC;QAC9B,CAAC,SAAS,EAAE,aAAa,EAAE,CAAC;KAC7B,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,sBAAsB;IAIpC,OAAO,YAAY,CAAC,wBAAwB,EAAE,EAAE,wBAAwB,EAAE,CAAC,CAAC;AAC9E,CAAC"}

package/dist/esm/generated/codama/types/rentalActivated.js

@@ -5,12 +5,13 @@
  *
  * @see https://github.com/codama-idl/codama
  */
-import { combineCodec, getAddressDecoder, getAddressEncoder, getStructDecoder, getStructEncoder, } from "@solana/kit";
+import { combineCodec, getAddressDecoder, getAddressEncoder, getStructDecoder, getStructEncoder, getU64Decoder, getU64Encoder, } from "@solana/kit";
 export function getRentalActivatedEncoder() {
     return getStructEncoder([
         ["rentalState", getAddressEncoder()],
         ["contract", getAddressEncoder()],
         ["borrower", getAddressEncoder()],
+        ["serviceFee", getU64Encoder()],
     ]);
 }
 export function getRentalActivatedDecoder() {
@@ -18,6 +19,7 @@ export function getRentalActivatedDecoder() {
         ["rentalState", getAddressDecoder()],
         ["contract", getAddressDecoder()],
         ["borrower", getAddressDecoder()],
+        ["serviceFee", getU64Decoder()],
     ]);
 }
 export function getRentalActivatedCodec() {

package/dist/esm/generated/codama/types/rentalActivated.js.map

@@ -1 +1 @@
-{"version":3,"file":"rentalActivated.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/rentalActivated.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,GAKjB,MAAM,aAAa,CAAC;AAUrB,MAAM,UAAU,yBAAyB;IACvC,OAAO,gBAAgB,CAAC;QACtB,CAAC,aAAa,EAAE,iBAAiB,EAAE,CAAC;QACpC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;KAClC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,yBAAyB;IACvC,OAAO,gBAAgB,CAAC;QACtB,CAAC,aAAa,EAAE,iBAAiB,EAAE,CAAC;QACpC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;KAClC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,uBAAuB;IAIrC,OAAO,YAAY,CAAC,yBAAyB,EAAE,EAAE,yBAAyB,EAAE,CAAC,CAAC;AAChF,CAAC"}
+{"version":3,"file":"rentalActivated.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/rentalActivated.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,aAAa,GAKd,MAAM,aAAa,CAAC;AAgBrB,MAAM,UAAU,yBAAyB;IACvC,OAAO,gBAAgB,CAAC;QACtB,CAAC,aAAa,EAAE,iBAAiB,EAAE,CAAC;QACpC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,YAAY,EAAE,aAAa,EAAE,CAAC;KAChC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,yBAAyB;IACvC,OAAO,gBAAgB,CAAC;QACtB,CAAC,aAAa,EAAE,iBAAiB,EAAE,CAAC;QACpC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,YAAY,EAAE,aAAa,EAAE,CAAC;KAChC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,uBAAuB;IAIrC,OAAO,YAAY,CAAC,yBAAyB,EAAE,EAAE,yBAAyB,EAAE,CAAC,CAAC;AAChF,CAAC"}

package/dist/esm/generated/codama/types/rentalExpiredInline.js

@@ -0,0 +1,26 @@
+/**
+ * This code was AUTOGENERATED using the Codama library.
+ * Please DO NOT EDIT THIS FILE, instead use visitors
+ * to add features, then rerun Codama to update it.
+ *
+ * @see https://github.com/codama-idl/codama
+ */
+import { combineCodec, getAddressDecoder, getAddressEncoder, getStructDecoder, getStructEncoder, } from "@solana/kit";
+export function getRentalExpiredInlineEncoder() {
+    return getStructEncoder([
+        ["contract", getAddressEncoder()],
+        ["expiredBorrower", getAddressEncoder()],
+        ["newBorrower", getAddressEncoder()],
+    ]);
+}
+export function getRentalExpiredInlineDecoder() {
+    return getStructDecoder([
+        ["contract", getAddressDecoder()],
+        ["expiredBorrower", getAddressDecoder()],
+        ["newBorrower", getAddressDecoder()],
+    ]);
+}
+export function getRentalExpiredInlineCodec() {
+    return combineCodec(getRentalExpiredInlineEncoder(), getRentalExpiredInlineDecoder());
+}
+//# sourceMappingURL=rentalExpiredInline.js.map

package/dist/esm/generated/codama/types/rentalExpiredInline.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rentalExpiredInline.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/rentalExpiredInline.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,GAKjB,MAAM,aAAa,CAAC;AAUrB,MAAM,UAAU,6BAA6B;IAC3C,OAAO,gBAAgB,CAAC;QACtB,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,CAAC;QACxC,CAAC,aAAa,EAAE,iBAAiB,EAAE,CAAC;KACrC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,6BAA6B;IAC3C,OAAO,gBAAgB,CAAC;QACtB,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,CAAC;QACxC,CAAC,aAAa,EAAE,iBAAiB,EAAE,CAAC;KACrC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,2BAA2B;IAIzC,OAAO,YAAY,CACjB,6BAA6B,EAAE,EAC/B,6BAA6B,EAAE,CAChC,CAAC;AACJ,CAAC"}

package/dist/esm/generated/codama/types/rentalStatus.js

@@ -9,9 +9,10 @@ import { combineCodec, getEnumDecoder, getEnumEncoder, } from "@solana/kit";
 /** Rental lifecycle status */
 export var RentalStatus;
 (function (RentalStatus) {
-    RentalStatus[RentalStatus["Pending"] = 0] = "Pending";
-    RentalStatus[RentalStatus["Active"] = 1] = "Active";
-    RentalStatus[RentalStatus["Completed"] = 2] = "Completed";
+    RentalStatus[RentalStatus["Available"] = 0] = "Available";
+    RentalStatus[RentalStatus["Queued"] = 1] = "Queued";
+    RentalStatus[RentalStatus["Active"] = 2] = "Active";
+    RentalStatus[RentalStatus["Cancelled"] = 3] = "Cancelled";
 })(RentalStatus || (RentalStatus = {}));
 export function getRentalStatusEncoder() {
     return getEnumEncoder(RentalStatus);

package/dist/esm/generated/codama/types/rentalStatus.js.map

@@ -1 +1 @@
-{"version":3,"file":"rentalStatus.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/rentalStatus.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,YAAY,EACZ,cAAc,EACd,cAAc,GAIf,MAAM,aAAa,CAAC;AAErB,8BAA8B;AAC9B,MAAM,CAAN,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,qDAAO,CAAA;IACP,mDAAM,CAAA;IACN,yDAAS,CAAA;AACX,CAAC,EAJW,YAAY,KAAZ,YAAY,QAIvB;AAID,MAAM,UAAU,sBAAsB;IACpC,OAAO,cAAc,CAAC,YAAY,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,sBAAsB;IACpC,OAAO,cAAc,CAAC,YAAY,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,oBAAoB;IAIlC,OAAO,YAAY,CAAC,sBAAsB,EAAE,EAAE,sBAAsB,EAAE,CAAC,CAAC;AAC1E,CAAC"}
+{"version":3,"file":"rentalStatus.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/rentalStatus.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,YAAY,EACZ,cAAc,EACd,cAAc,GAIf,MAAM,aAAa,CAAC;AAErB,8BAA8B;AAC9B,MAAM,CAAN,IAAY,YAKX;AALD,WAAY,YAAY;IACtB,yDAAS,CAAA;IACT,mDAAM,CAAA;IACN,mDAAM,CAAA;IACN,yDAAS,CAAA;AACX,CAAC,EALW,YAAY,KAAZ,YAAY,QAKvB;AAID,MAAM,UAAU,sBAAsB;IACpC,OAAO,cAAc,CAAC,YAAY,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,sBAAsB;IACpC,OAAO,cAAc,CAAC,YAAY,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,oBAAoB;IAIlC,OAAO,YAAY,CAAC,sBAAsB,EAAE,EAAE,sBAAsB,EAAE,CAAC,CAAC;AAC1E,CAAC"}

package/dist/esm/generated/codama/types/reservationCreated.js

@@ -5,14 +5,17 @@
  *
  * @see https://github.com/codama-idl/codama
  */
-import { combineCodec, getAddressDecoder, getAddressEncoder, getI64Decoder, getI64Encoder, getStructDecoder, getStructEncoder, getU64Decoder, getU64Encoder, getU8Decoder, getU8Encoder, } from "@solana/kit";
+import { combineCodec, getAddressDecoder, getAddressEncoder, getI64Decoder, getI64Encoder, getStructDecoder, getStructEncoder, getU64Decoder, getU64Encoder, } from "@solana/kit";
+import { getBidTypeDecoder, getBidTypeEncoder, } from ".";
 export function getReservationCreatedEncoder() {
     return getStructEncoder([
         ["contract", getAddressEncoder()],
         ["challenger", getAddressEncoder()],
         ["bidAmount", getU64Encoder()],
-        ["bidType", getU8Encoder()],
-        ["expiresAt", getI64Encoder()],
+        ["bidType", getBidTypeEncoder()],
+        ["escrowAmount", getU64Encoder()],
+        ["serviceFee", getU64Encoder()],
+        ["durationSeconds", getI64Encoder()],
     ]);
 }
 export function getReservationCreatedDecoder() {
@@ -20,8 +23,10 @@ export function getReservationCreatedDecoder() {
         ["contract", getAddressDecoder()],
         ["challenger", getAddressDecoder()],
         ["bidAmount", getU64Decoder()],
-        ["bidType", getU8Decoder()],
-        ["expiresAt", getI64Decoder()],
+        ["bidType", getBidTypeDecoder()],
+        ["escrowAmount", getU64Decoder()],
+        ["serviceFee", getU64Decoder()],
+        ["durationSeconds", getI64Decoder()],
     ]);
 }
 export function getReservationCreatedCodec() {

package/dist/esm/generated/codama/types/reservationCreated.js.map

@@ -1 +1 @@
-{"version":3,"file":"reservationCreated.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/reservationCreated.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,YAAY,EACZ,YAAY,GAKb,MAAM,aAAa,CAAC;AAkBrB,MAAM,UAAU,4BAA4B;IAC1C,OAAO,gBAAgB,CAAC;QACtB,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,YAAY,EAAE,iBAAiB,EAAE,CAAC;QACnC,CAAC,WAAW,EAAE,aAAa,EAAE,CAAC;QAC9B,CAAC,SAAS,EAAE,YAAY,EAAE,CAAC;QAC3B,CAAC,WAAW,EAAE,aAAa,EAAE,CAAC;KAC/B,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,4BAA4B;IAC1C,OAAO,gBAAgB,CAAC;QACtB,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,YAAY,EAAE,iBAAiB,EAAE,CAAC;QACnC,CAAC,WAAW,EAAE,aAAa,EAAE,CAAC;QAC9B,CAAC,SAAS,EAAE,YAAY,EAAE,CAAC;QAC3B,CAAC,WAAW,EAAE,aAAa,EAAE,CAAC;KAC/B,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,0BAA0B;IAIxC,OAAO,YAAY,CACjB,4BAA4B,EAAE,EAC9B,4BAA4B,EAAE,CAC/B,CAAC;AACJ,CAAC"}
+{"version":3,"file":"reservationCreated.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/reservationCreated.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,aAAa,GAKd,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,iBAAiB,EACjB,iBAAiB,GAGlB,MAAM,GAAG,CAAC;AAsBX,MAAM,UAAU,4BAA4B;IAC1C,OAAO,gBAAgB,CAAC;QACtB,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,YAAY,EAAE,iBAAiB,EAAE,CAAC;QACnC,CAAC,WAAW,EAAE,aAAa,EAAE,CAAC;QAC9B,CAAC,SAAS,EAAE,iBAAiB,EAAE,CAAC;QAChC,CAAC,cAAc,EAAE,aAAa,EAAE,CAAC;QACjC,CAAC,YAAY,EAAE,aAAa,EAAE,CAAC;QAC/B,CAAC,iBAAiB,EAAE,aAAa,EAAE,CAAC;KACrC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,4BAA4B;IAC1C,OAAO,gBAAgB,CAAC;QACtB,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,YAAY,EAAE,iBAAiB,EAAE,CAAC;QACnC,CAAC,WAAW,EAAE,aAAa,EAAE,CAAC;QAC9B,CAAC,SAAS,EAAE,iBAAiB,EAAE,CAAC;QAChC,CAAC,cAAc,EAAE,aAAa,EAAE,CAAC;QACjC,CAAC,YAAY,EAAE,aAAa,EAAE,CAAC;QAC/B,CAAC,iBAAiB,EAAE,aAAa,EAAE,CAAC;KACrC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,0BAA0B;IAIxC,OAAO,YAAY,CACjB,4BAA4B,EAAE,EAC9B,4BAA4B,EAAE,CAC/B,CAAC;AACJ,CAAC"}

package/dist/esm/generated/codama/types/signal.js

@@ -5,7 +5,7 @@
  *
  * @see https://github.com/codama-idl/codama
  */
-import { combineCodec, getDiscriminatedUnionDecoder, getDiscriminatedUnionEncoder, getStructDecoder, getStructEncoder, getU8Decoder, getU8Encoder, getUnitDecoder, getUnitEncoder, } from "@solana/kit";
+import { combineCodec, getBooleanDecoder, getBooleanEncoder, getDiscriminatedUnionDecoder, getDiscriminatedUnionEncoder, getOptionDecoder, getOptionEncoder, getStructDecoder, getStructEncoder, getU8Decoder, getU8Encoder, getUnitDecoder, getUnitEncoder, } from "@solana/kit";
 import { getTriggerDecoder, getTriggerEncoder, } from ".";
 export function getSignalEncoder() {
     return getDiscriminatedUnionEncoder([
@@ -14,7 +14,13 @@ export function getSignalEncoder() {
         ["Close", getUnitEncoder()],
         ["Repeat", getUnitEncoder()],
         ["Next", getStructEncoder([["index", getU8Encoder()]])],
-        ["UpdateTrigger", getStructEncoder([["trigger", getTriggerEncoder()]])],
+        [
+            "Update",
+            getStructEncoder([
+                ["paused", getOptionEncoder(getBooleanEncoder())],
+                ["trigger", getOptionEncoder(getTriggerEncoder())],
+            ]),
+        ],
     ]);
 }
 export function getSignalDecoder() {
@@ -24,7 +30,13 @@ export function getSignalDecoder() {
         ["Close", getUnitDecoder()],
         ["Repeat", getUnitDecoder()],
         ["Next", getStructDecoder([["index", getU8Decoder()]])],
-        ["UpdateTrigger", getStructDecoder([["trigger", getTriggerDecoder()]])],
+        [
+            "Update",
+            getStructDecoder([
+                ["paused", getOptionDecoder(getBooleanDecoder())],
+                ["trigger", getOptionDecoder(getTriggerDecoder())],
+            ]),
+        ],
     ]);
 }
 export function getSignalCodec() {

package/dist/esm/generated/codama/types/signal.js.map

@@ -1 +1 @@
-{"version":3,"file":"signal.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/signal.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,YAAY,EACZ,4BAA4B,EAC5B,4BAA4B,EAC5B,gBAAgB,EAChB,gBAAgB,EAChB,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,cAAc,GAMf,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,iBAAiB,EACjB,iBAAiB,GAGlB,MAAM,GAAG,CAAC;AAsBX,MAAM,UAAU,gBAAgB;IAC9B,OAAO,4BAA4B,CAAC;QAClC,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC;QAC1B,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC;QAC3B,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC;QAC3B,CAAC,QAAQ,EAAE,cAAc,EAAE,CAAC;QAC5B,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC;QACvD,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC,CAAC,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC;KACxE,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,OAAO,4BAA4B,CAAC;QAClC,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC;QAC1B,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC;QAC3B,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC;QAC3B,CAAC,QAAQ,EAAE,cAAc,EAAE,CAAC;QAC5B,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC;QACvD,CAAC,eAAe,EAAE,gBAAgB,CAAC,CAAC,CAAC,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC;KACxE,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,cAAc;IAC5B,OAAO,YAAY,CAAC,gBAAgB,EAAE,EAAE,gBAAgB,EAAE,CAAC,CAAC;AAC9D,CAAC;AA2BD,MAAM,UAAU,MAAM,CACpB,IAAO,EACP,IAAW;IAEX,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QACxB,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;QAChC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,QAAQ,CACtB,IAAO,EACP,KAAa;IAEb,OAAO,KAAK,CAAC,MAAM,KAAK,IAAI,CAAC;AAC/B,CAAC"}
+{"version":3,"file":"signal.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/signal.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,EACjB,4BAA4B,EAC5B,4BAA4B,EAC5B,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,YAAY,EACZ,YAAY,EACZ,cAAc,EACd,cAAc,GAQf,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,iBAAiB,EACjB,iBAAiB,GAGlB,MAAM,GAAG,CAAC;AA0BX,MAAM,UAAU,gBAAgB;IAC9B,OAAO,4BAA4B,CAAC;QAClC,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC;QAC1B,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC;QAC3B,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC;QAC3B,CAAC,QAAQ,EAAE,cAAc,EAAE,CAAC;QAC5B,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC;QACvD;YACE,QAAQ;YACR,gBAAgB,CAAC;gBACf,CAAC,QAAQ,EAAE,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,CAAC;gBACjD,CAAC,SAAS,EAAE,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,CAAC;aACnD,CAAC;SACH;KACF,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,OAAO,4BAA4B,CAAC;QAClC,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC;QAC1B,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC;QAC3B,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC;QAC3B,CAAC,QAAQ,EAAE,cAAc,EAAE,CAAC;QAC5B,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC;QACvD;YACE,QAAQ;YACR,gBAAgB,CAAC;gBACf,CAAC,QAAQ,EAAE,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,CAAC;gBACjD,CAAC,SAAS,EAAE,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,CAAC;aACnD,CAAC;SACH;KACF,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,cAAc;IAC5B,OAAO,YAAY,CAAC,gBAAgB,EAAE,EAAE,gBAAgB,EAAE,CAAC,CAAC;AAC9D,CAAC;AAuBD,MAAM,UAAU,MAAM,CACpB,IAAO,EACP,IAAW;IAEX,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QACxB,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;QAChC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,QAAQ,CACtB,IAAO,EACP,KAAa;IAEb,OAAO,KAAK,CAAC,MAAM,KAAK,IAAI,CAAC;AAC/B,CAAC"}

package/dist/esm/index.js

@@ -8,103 +8,5 @@
  *
  * @packageDocumentation
  */
-// SDK Version - auto-generated from package.json (single source of truth)
-export { VERSION } from './version';
-// ============================================================================
-// Utilities (Configuration, Addresses, Signers, Web3.js, Instructions)
-// ============================================================================
-export { 
-// Configuration
-setSdkConfig, getSdkConfig, clearSdkConfig, mergeConfig, getAddresses, getAffiliateConfig, 
-// Network Addresses
-getProgramAddresses, getNetworkAddresses, // deprecated
-isValidProgramSet, isValidNetwork, // deprecated
-MAINNET_ADDRESSES, ATLASNET_ADDRESSES, // deprecated
-// Signer Utilities
-toTransactionSigner, validateAddress, isWeb3jsSigner, isKitSigner, isAddressString, 
-// Web3.js Compatibility
-toWeb3Instruction, toAddress, 
-// Instruction Utilities
-prepareInstructions, 
-// Instruction Result (for native @solana/kit compatibility)
-InstructionResult, 
-// RPC Utilities
-createRpc, setRpcDebug, isRpcDebugEnabled, 
-// Address Lookup Table Utilities
-fetchLookupTable, getLookupTableAddress, 
-// Discount Authorization Utilities
-createDiscount, serializeDiscountAuth, deserializeDiscountAuth, isSerializedDiscountAuth } from './utils';
-// ============================================================================
-// Instructions
-// ============================================================================
-export { createContract } from './instructions/createContract';
-export { updateContract } from './instructions/updateContract';
-export { setDelegate } from './instructions/setDelegate';
-export { deleteRental } from './instructions/deleteRental';
-export { deleteContract } from './instructions/deleteContract';
-export { closeContract } from './instructions/closeContract';
-export { acceptRental } from './instructions/acceptRental';
-export { claimRental } from './instructions/claimRental';
-export { closeRental } from './instructions/closeRental';
-export { cancelRental } from './instructions/cancelRental';
-export { claimBorrower } from './instructions/claimBorrower';
-export { updateBorrower } from './instructions/updateBorrower';
-export { createConfig } from './instructions/createConfig';
-export { updateConfig } from './instructions/updateConfig';
-export { deleteConfig } from './instructions/deleteConfig';
-export { releaseRental } from './instructions/releaseRental';
-export { invalidateRental } from './instructions/invalidateRental';
-export { reserveRental } from './instructions/reserveRental';
-// ============================================================================
-// Owner Instructions
-// ============================================================================
-export { ownerClaim } from './instructions/ownerClaim';
-export { ownerUpdate } from './instructions/ownerUpdate';
-// ============================================================================
-// Affiliate Instructions (SLYvault)
-// ============================================================================
-export { createDiscountAuth, claim } from '@wuwei-labs/slyvault';
-export { createAffiliate } from './instructions/createAffiliate';
-export { approveAffiliate } from './instructions/approveAffiliate';
-export { removeAffiliate } from './instructions/removeAffiliate';
-export { updateAffiliate } from './instructions/updateAffiliate';
-// ============================================================================
-// Parameter Types and Converters
-// ============================================================================
-export { convertAmount, stardustToAtlas, formatAmount, validateAmount } from './params/amount';
-export { convertDuration, validateDuration, formatDuration } from './params/duration';
-export { normalizeSchedule, validateScheduleFormat, formatSchedule, isScheduleShortcut, SCHEDULE_SHORTCUTS } from './params/schedule';
-// ============================================================================
-// Account Utilities
-// ============================================================================
-export { fetchFleet } from './accounts/fleet';
-export { fetchContract, fetchAllContracts } from './accounts/contract';
-export { fetchRental, fetchAllRentals } from './accounts/rental';
-export { fetchBorrower, fetchAllBorrowers } from './accounts/borrower';
-export { fetchOwner, fetchAllOwners } from './accounts/owner';
-export { fetchConfig, fetchAllConfigs } from './accounts/config';
-export { fetchMember, fetchAllMembers, fetchVault, deriveMember } from './accounts/member';
-// ============================================================================
-// PDA Derivation Utilities
-// ============================================================================
-export { 
-// Constants
-FACTION_COORDINATES, FACTION_MAPPING, STARBASE_SEED, STARBASE_PLAYER_SEED, SAGE_PLAYER_PROFILE_SEED, PROFILE_FACTION_SEED, CONTRACT_SEED, RENTAL_SEED, RENTAL_AUTHORITY_SEED, BORROWER_STATE_SEED, OWNER_STATE_SEED, CONFIG_SEED, THREAD_SEED, isValidFactionName, getFactionName, getFactionCoordinates, 
-// SRSLY PDAs
-deriveContract, deriveRental, deriveRentalAuthority, deriveBorrowerState, deriveOwnerState, deriveConfig, 
-// SAGE PDAs
-deriveProfileFaction, deriveSagePlayerProfile, deriveStarbase, deriveStarbasePlayer, deriveGameAccounts, 
-// Thread PDAs
-deriveRentalThread, 
-// Token utilities
-deriveAssociatedTokenAccount, 
-// Slyvault PDAs
-deriveVault, 
-// Address Lookup Table utilities
-deriveLookupTable, } from './pda';
-// ============================================================================
-// Re-export Codama-generated types (for advanced users)
-// ============================================================================
-// Re-export the generated index for users who need direct access
-export * as codama from './generated/codama';
+export * from './kit';
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,cAAc,OAAO,CAAC"}

package/dist/esm/instructions/acceptRental.js

@@ -4,9 +4,8 @@
  * Thin convenience wrapper around Codama-generated acceptRental instruction.
  * Accepts a rental contract and begins the rental period.
  */
-import { address } from '@solana/kit';
-import { createRpc } from '../utils/rpc';
-import { getAcceptRentalInstructionAsync, getScheduleRentalInstructionAsync } from '../generated/codama/instructions';
+import { AccountRole, address } from '@solana/kit';
+import { getAcceptRentalInstructionAsync } from '../generated/codama/instructions';
 import { mergeConfig, getAddresses } from '../utils/config';
 import { toTransactionSigner } from '../utils/signer';
 import { convertAmount } from '../params/amount';
@@ -14,11 +13,11 @@ import { convertDuration } from '../params/duration';
 import { fetchFleet } from '../accounts/fleet';
 import { fetchContract } from '../accounts/contract';
 import { fetchConfig } from '../accounts/config';
-import { fetchBorrowerState } from '../generated/codama/accounts';
+import { fetchBorrower } from '../accounts/borrower';
 import { deriveGameAccounts } from '../pda/sage';
-import { deriveRental, deriveRentalAuthority, deriveBorrowerState } from '../pda/srsly';
+import { deriveActiveRental, deriveRentalAuthority } from '../pda/srsly';
 import { deriveAssociatedTokenAccount } from '../pda/token';
-import { deriveRentalThread } from '../pda/thread';
+import { deriveContractThread, deriveFiber } from '../pda/thread';
 import { prepareInstructions } from '../utils/instructions';
 import { deserializeDiscountAuth } from '../utils/discountAuth';
 /**
@@ -30,13 +29,13 @@ import { deserializeDiscountAuth } from '../utils/discountAuth';
  *
  * This function automatically fetches the contract and config to get required
  * data (fleet, vault, gameId), then derives all SAGE accounts (profile faction,
- * starbase, starbase player) and the rental thread for automated payments.
+ * starbase, starbase player) and the contract thread for automated payments.
  *
  * @param params - Rental acceptance parameters
  * @param config - Optional SDK configuration overrides
  * @returns Array of instructions (Kit format or web3.js if PublicKey in config)
  *
- * @demo
+ * @example
  * ```typescript
  * // Accept a 7-day rental (borrowerProfile auto-fetched)
  * const ixs = await acceptRental({
@@ -46,27 +45,6 @@ import { deserializeDiscountAuth } from '../utils/discountAuth';
  *   computeUnits: 400_000
  * });
  * ```
- *
- * @example
- * ```typescript
- * // Accept a 7-day rental (fleet and vault auto-fetched)
- * const ixs = await acceptRental({
- *   borrower: wallet,
- *   borrowerProfile: borrowerProfileAddress,
- *   contract: contractAddress,
- *   duration: { days: 7 }
- * });
- *
- * // With referrer and compute budget
- * const ixs2 = await acceptRental({
- *   borrower: wallet,
- *   borrowerProfile: borrowerProfileAddress,
- *   contract: contractAddress,
- *   referrer: referrerAddress,
- *   duration: { weeks: 2 },
- *   computeUnits: 400_000
- * });
- * ```
  */
 export async function acceptRental(params, config) {
     // Merge config
@@ -83,26 +61,13 @@ export async function acceptRental(params, config) {
     }
     // Convert borrower to transaction signer
     const borrowerSigner = toTransactionSigner(params.borrower);
-    // Try to fetch borrowerProfile from existing borrower_state, fallback to param
+    // Get borrowerProfile from borrower_state (always has it) or fallback to param
     let borrowerProfile;
     try {
-        const borrowerStateAddress = await deriveBorrowerState(borrowerSigner.address);
-        const rpc = createRpc(finalConfig.rpcUrl || 'https://api.devnet.solana.com');
-        const borrowerState = await fetchBorrowerState(rpc, borrowerStateAddress);
-        const profileOption = borrowerState.data.borrowerProfile;
-        if (profileOption && typeof profileOption === 'object' && '__option' in profileOption && profileOption.__option === 'Some') {
-            // borrower_state exists and has profile set - use it
-            borrowerProfile = profileOption.value;
-        }
-        else if (params.borrowerProfile) {
-            // borrower_state exists but no profile - use provided param
-            borrowerProfile = address(params.borrowerProfile);
-        }
-        else {
-            throw new Error('borrowerProfile is required when not set in borrower_state');
-        }
+        const borrowerAccount = await fetchBorrower(borrowerSigner.address, finalConfig.rpcUrl);
+        borrowerProfile = borrowerAccount.data.borrowerProfile;
     }
-    catch (e) {
+    catch {
         // borrower_state doesn't exist yet - require param for first-time borrowers
         if (params.borrowerProfile) {
             borrowerProfile = address(params.borrowerProfile);
@@ -114,7 +79,7 @@ export async function acceptRental(params, config) {
     // Fetch config to get vault
     const configAccount = await fetchConfig(finalConfig.rpcUrl);
     const vault = configAccount.data.slyvault;
-    // Fetch contract to get fleet, gameId, ownerProfile
+    // Fetch contract to get fleet, gameId
     const contractAccount = await fetchContract(params.contract, finalConfig.rpcUrl);
     const fleet = contractAccount.data.fleet;
     const gameId = contractAccount.data.gameId;
@@ -131,17 +96,15 @@ export async function acceptRental(params, config) {
     const faction = fleetState.faction;
     // Derive all SAGE game accounts (profile faction, starbase, starbase player)
     const gameAccounts = await deriveGameAccounts(borrowerProfile, faction, gameId);
-    // Derive rental and rental authority PDAs
-    // accept_rental always uses slot 0 since both slots must be empty
-    const rentalSlot = 0;
-    const rental = await deriveRental(params.contract, rentalSlot);
+    // Derive active rental PDA (no more slot logic)
+    const rentalState = await deriveActiveRental(params.contract);
+    // Derive rental authority PDA
     const rentalAuthority = await deriveRentalAuthority();
-    // Derive rental thread for automated payments
-    const rentalThread = await deriveRentalThread(rental, rentalAuthority);
-    // Derive queued thread for the other slot (slot 1)
-    // This is used by rental_schedule to know the thread for the queued rental
-    const otherSlotRental = await deriveRental(params.contract, 1);
-    const queuedThread = await deriveRentalThread(otherSlotRental, rentalAuthority);
+    // Derive contract thread and close_rental fiber (fiber index 1) — only if thread configured
+    const thread = address(contractAccount.data.thread);
+    const hasThread = thread !== '11111111111111111111111111111111';
+    const contractThread = hasThread ? await deriveContractThread(params.contract, rentalAuthority) : undefined;
+    const closeRentalFiber = hasThread && contractThread ? await deriveFiber(contractThread, 1) : undefined;
     // Convert duration parameter
     const durationSeconds = convertDuration(params.duration);
     // Get network-specific addresses (atlasMint sourced from on-chain config)
@@ -155,51 +118,40 @@ export async function acceptRental(params, config) {
         discountAuth = deserializeDiscountAuth(params.discountAuth);
     }
     const referrer = params.referrer ? address(params.referrer) : undefined;
-    // Determine if we need to include scheduleRental
-    // Either explicitly requested or contract requires automation
-    const shouldSchedule = params.automate || contractAccount.data.automationRequired;
     // Derive vault token account (ATA)
     const vaultTokenAccount = await deriveAssociatedTokenAccount(vault, atlasMint);
+    // Derive contract token account (ATA of contract PDA)
+    const contractAddress = address(params.contract);
+    const contractTokenAccount = await deriveAssociatedTokenAccount(contractAddress, atlasMint);
+    // Derive borrower token account (ATA)
+    const borrowerTokenAccount = await deriveAssociatedTokenAccount(borrowerSigner.address, atlasMint);
     // Call Codama-generated acceptRental instruction
     const acceptRentalIx = await getAcceptRentalInstructionAsync({
         borrower: borrowerSigner,
-        borrowerProfile,
-        borrowerProfileFaction: gameAccounts.profileFaction,
+        borrowerTokenAccount,
         fleet: address(fleet),
-        contract: address(params.contract),
-        rentalState: rental,
-        gameId: address(gameId),
-        starbase: gameAccounts.starbase,
-        starbasePlayer: gameAccounts.starbasePlayer,
+        contract: contractAddress,
+        rentalState,
         vault: address(vault),
         vaultTokenAccount,
+        contractTokenAccount,
+        ...(contractThread && { contractThread }),
+        ...(closeRentalFiber && { closeRentalFiber }),
         referrer,
-        mint: atlasMint,
         sageProgram,
         duration: BigInt(durationSeconds),
         discountAuth
     }, { programAddress });
-    // If auto-schedule is enabled, bundle scheduleRental instruction
-    if (shouldSchedule) {
-        const scheduleRentalIx = await getScheduleRentalInstructionAsync({
-            payer: borrowerSigner,
-            mint: atlasMint,
-            contract: address(params.contract),
-            fleet: address(fleet),
-            rentalState: rental,
-            rentalThread,
-            queuedThread,
-            borrowerProfileFaction: gameAccounts.profileFaction,
-            sageProgram,
-            rentalSlot,
-        }, { programAddress });
-        // Return both instructions as array
-        return prepareInstructions([acceptRentalIx, scheduleRentalIx], {
-            computeUnits: params.computeUnits,
-            PublicKey: finalConfig.PublicKey
-        });
-    }
-    // Prepare single instruction with optional compute budget and web3.js conversion
+    // Append SAGE pass-through accounts as remaining accounts
+    const sageRemainingAccounts = [
+        { address: borrowerProfile, role: AccountRole.READONLY },
+        { address: gameAccounts.profileFaction, role: AccountRole.READONLY },
+        { address: address(gameId), role: AccountRole.READONLY },
+        { address: gameAccounts.starbase, role: AccountRole.READONLY },
+        { address: gameAccounts.starbasePlayer, role: AccountRole.WRITABLE },
+    ];
+    acceptRentalIx.accounts.push(...sageRemainingAccounts);
+    // Prepare instruction with optional compute budget
     return prepareInstructions(acceptRentalIx, {
         computeUnits: params.computeUnits,
         PublicKey: finalConfig.PublicKey

package/dist/esm/instructions/acceptRental.js.map

@@ -1 +1 @@
-{"version":3,"file":"acceptRental.js","sourceRoot":"","sources":["../../../src/instructions/acceptRental.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"acceptRental.js","sourceRoot":"","sources":["../../../src/instructions/acceptRental.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,WAAW,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,+BAA+B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAwB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAoB,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAE,eAAe,EAAsB,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACzE,OAAO,EAAE,4BAA4B,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAElE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAA+B,MAAM,uBAAuB,CAAC;AAqE7F;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAA0B,EAC1B,MAA2B;IAE3B,eAAe;IACf,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IAExC,2BAA2B;IAC3B,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IAED,yCAAyC;IACzC,MAAM,cAAc,GAAG,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE5D,+EAA+E;IAC/E,IAAI,eAAwB,CAAC;IAC7B,IAAI,CAAC;QACH,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,cAAc,CAAC,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;QACxF,eAAe,GAAG,eAAe,CAAC,IAAI,CAAC,eAAe,CAAC;IACzD,CAAC;IAAC,MAAM,CAAC;QACP,4EAA4E;QAC5E,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;YAC3B,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,eAA0B,CAAC,CAAC;QAC/D,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;QAC1E,CAAC;IACH,CAAC;IAED,4BAA4B;IAC5B,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC5D,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC;IAE1C,sCAAsC;IACtC,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACjF,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC;IACzC,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC;IAE3C,gCAAgC;IAChC,IAAI,MAAM,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;QACxB,MAAM,YAAY,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAChD,MAAM,YAAY,GAAG,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvD,IAAI,YAAY,KAAK,YAAY,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CACb,oCAAoC,YAAY,8BAA8B,YAAY,iEAAiE,CAC5J,CAAC;QACJ,CAAC;IACH,CAAC;IAED,gEAAgE;IAChE,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC/D,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;IAEnC,6EAA6E;IAC7E,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAC3C,eAAe,EACf,OAAO,EACP,MAAM,CACP,CAAC;IAEF,gDAAgD;IAChD,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE9D,8BAA8B;IAC9B,MAAM,eAAe,GAAG,MAAM,qBAAqB,EAAE,CAAC;IAEtD,4FAA4F;IAC5F,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,MAAiB,CAAC,CAAC;IAC/D,MAAM,SAAS,GAAG,MAAM,KAAK,kCAAkC,CAAC;IAChE,MAAM,cAAc,GAAG,SAAS,CAAC,CAAC,CAAC,MAAM,oBAAoB,CAAC,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5G,MAAM,gBAAgB,GAAG,SAAS,IAAI,cAAc,CAAC,CAAC,CAAC,MAAM,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAExG,6BAA6B;IAC7B,MAAM,eAAe,GAAG,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAEzD,0EAA0E;IAC1E,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC;IAC/C,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,IAAe,CAAC,CAAC;IACvD,MAAM,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,wCAAwC;IACxC,IAAI,YAAY,GAAqC,IAAI,CAAC;IAC1D,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;QACxB,YAAY,GAAG,uBAAuB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAC9D,CAAC;IACD,MAAM,QAAQ,GAAwB,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,QAAmB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAExG,mCAAmC;IACnC,MAAM,iBAAiB,GAAG,MAAM,4BAA4B,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAE/E,sDAAsD;IACtD,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,QAAmB,CAAC,CAAC;IAC5D,MAAM,oBAAoB,GAAG,MAAM,4BAA4B,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAE5F,sCAAsC;IACtC,MAAM,oBAAoB,GAAG,MAAM,4BAA4B,CAAC,cAAc,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAEnG,iDAAiD;IACjD,MAAM,cAAc,GAAG,MAAM,+BAA+B,CAC1D;QACE,QAAQ,EAAE,cAAc;QACxB,oBAAoB;QACpB,KAAK,EAAE,OAAO,CAAC,KAAgB,CAAC;QAChC,QAAQ,EAAE,eAAe;QACzB,WAAW;QACX,KAAK,EAAE,OAAO,CAAC,KAAgB,CAAC;QAChC,iBAAiB;QACjB,oBAAoB;QACpB,GAAG,CAAC,cAAc,IAAI,EAAE,cAAc,EAAE,CAAC;QACzC,GAAG,CAAC,gBAAgB,IAAI,EAAE,gBAAgB,EAAE,CAAC;QAC7C,QAAQ;QACR,WAAW;QACX,QAAQ,EAAE,MAAM,CAAC,eAAe,CAAC;QACjC,YAAY;KACb,EACD,EAAE,cAAc,EAAE,CACnB,CAAC;IAEF,0DAA0D;IAC1D,MAAM,qBAAqB,GAAG;QAC5B,EAAE,OAAO,EAAE,eAAe,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,EAAE;QACxD,EAAE,OAAO,EAAE,YAAY,CAAC,cAAc,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,EAAE;QACpE,EAAE,OAAO,EAAE,OAAO,CAAC,MAAiB,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,EAAE;QACnE,EAAE,OAAO,EAAE,YAAY,CAAC,QAAQ,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,EAAE;QAC9D,EAAE,OAAO,EAAE,YAAY,CAAC,cAAc,EAAE,IAAI,EAAE,WAAW,CAAC,QAAQ,EAAE;KACrE,CAAC;IACD,cAAc,CAAC,QAAyC,CAAC,IAAI,CAAC,GAAG,qBAAqB,CAAC,CAAC;IAEzF,mDAAmD;IACnD,OAAO,mBAAmB,CAAC,cAAc,EAAE;QACzC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,SAAS,EAAE,WAAW,CAAC,SAAS;KACjC,CAAC,CAAC;AACL,CAAC"}