@wuwei-labs/srsly 3.0.0-beta.19 → 3.0.0-beta.20
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/accounts/member.js +2 -1
- package/dist/cjs/accounts/member.js.map +1 -1
- package/dist/cjs/accounts/owner.js +105 -0
- package/dist/cjs/accounts/owner.js.map +1 -0
- package/dist/cjs/demos.js +85 -9
- package/dist/cjs/demos.js.map +1 -1
- package/dist/cjs/generated/codama/accounts/borrowerState.js +0 -4
- package/dist/cjs/generated/codama/accounts/borrowerState.js.map +1 -1
- package/dist/cjs/generated/codama/accounts/configState.js +0 -2
- package/dist/cjs/generated/codama/accounts/configState.js.map +1 -1
- package/dist/cjs/generated/codama/accounts/contractState.js +4 -2
- package/dist/cjs/generated/codama/accounts/contractState.js.map +1 -1
- package/dist/cjs/generated/codama/accounts/index.js +1 -0
- package/dist/cjs/generated/codama/accounts/index.js.map +1 -1
- package/dist/cjs/generated/codama/accounts/ownerState.js +86 -0
- package/dist/cjs/generated/codama/accounts/ownerState.js.map +1 -0
- package/dist/cjs/generated/codama/errors/srsly.js +26 -29
- package/dist/cjs/generated/codama/errors/srsly.js.map +1 -1
- package/dist/cjs/generated/codama/instructions/claimBorrower.js +24 -11
- package/dist/cjs/generated/codama/instructions/claimBorrower.js.map +1 -1
- package/dist/cjs/generated/codama/instructions/{claimContractPayments.js → claimOwner.js} +58 -44
- package/dist/cjs/generated/codama/instructions/claimOwner.js.map +1 -0
- package/dist/cjs/generated/codama/instructions/closeContract.js +10 -78
- package/dist/cjs/generated/codama/instructions/closeContract.js.map +1 -1
- package/dist/cjs/generated/codama/instructions/closeRental.js +15 -15
- package/dist/cjs/generated/codama/instructions/closeRental.js.map +1 -1
- package/dist/cjs/generated/codama/instructions/createContract.js +25 -11
- package/dist/cjs/generated/codama/instructions/createContract.js.map +1 -1
- package/dist/cjs/generated/codama/instructions/index.js +2 -4
- package/dist/cjs/generated/codama/instructions/index.js.map +1 -1
- package/dist/cjs/generated/codama/instructions/payRental.js +12 -12
- package/dist/cjs/generated/codama/instructions/payRental.js.map +1 -1
- package/dist/cjs/generated/codama/instructions/reserveRental.js +27 -8
- package/dist/cjs/generated/codama/instructions/reserveRental.js.map +1 -1
- package/dist/cjs/generated/codama/instructions/updateConfig.js +0 -2
- package/dist/cjs/generated/codama/instructions/updateConfig.js.map +1 -1
- package/dist/cjs/generated/codama/instructions/updateOwner.js +79 -0
- package/dist/cjs/generated/codama/instructions/updateOwner.js.map +1 -0
- package/dist/cjs/generated/codama/programs/srsly.js +29 -33
- package/dist/cjs/generated/codama/programs/srsly.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/index.js +17 -11
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/instructions/acceptRental.js +2 -2
- package/dist/cjs/instructions/acceptRental.js.map +1 -1
- package/dist/cjs/instructions/cancelRental.js +4 -2
- package/dist/cjs/instructions/cancelRental.js.map +1 -1
- package/dist/cjs/instructions/claimBorrower.js +7 -3
- package/dist/cjs/instructions/claimBorrower.js.map +1 -1
- package/dist/cjs/instructions/claimRental.js +2 -2
- package/dist/cjs/instructions/claimRental.js.map +1 -1
- package/dist/cjs/instructions/closeContract.js +4 -3
- package/dist/cjs/instructions/closeContract.js.map +1 -1
- package/dist/cjs/instructions/closeRental.js +8 -4
- package/dist/cjs/instructions/closeRental.js.map +1 -1
- package/dist/cjs/instructions/createContract.js +4 -2
- package/dist/cjs/instructions/createContract.js.map +1 -1
- package/dist/cjs/instructions/deleteConfig.js +15 -4
- package/dist/cjs/instructions/deleteConfig.js.map +1 -1
- package/dist/cjs/instructions/index.js +5 -9
- package/dist/cjs/instructions/index.js.map +1 -1
- package/dist/cjs/instructions/ownerClaim.js +110 -0
- package/dist/cjs/instructions/ownerClaim.js.map +1 -0
- package/dist/cjs/instructions/ownerUpdate.js +68 -0
- package/dist/cjs/instructions/ownerUpdate.js.map +1 -0
- package/dist/cjs/instructions/reserveRental.js +6 -5
- package/dist/cjs/instructions/reserveRental.js.map +1 -1
- package/dist/cjs/instructions/updateBorrower.js +4 -2
- package/dist/cjs/instructions/updateBorrower.js.map +1 -1
- package/dist/cjs/instructions/updateConfig.js +0 -1
- package/dist/cjs/instructions/updateConfig.js.map +1 -1
- package/dist/cjs/legacy/index.js +6 -5
- package/dist/cjs/legacy/index.js.map +1 -1
- package/dist/cjs/package.json +3 -2
- package/dist/cjs/pda/constants.js +2 -1
- package/dist/cjs/pda/constants.js.map +1 -1
- package/dist/cjs/pda/index.js +3 -1
- package/dist/cjs/pda/index.js.map +1 -1
- package/dist/cjs/pda/srsly.js +21 -0
- package/dist/cjs/pda/srsly.js.map +1 -1
- package/dist/cjs/utils/addresses.js +1 -1
- package/dist/cjs/utils/addresses.js.map +1 -1
- package/dist/cjs/utils/signer.js +8 -8
- package/dist/cjs/utils/signer.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/esm/accounts/member.js +1 -1
- package/dist/esm/accounts/member.js.map +1 -1
- package/dist/esm/accounts/owner.js +101 -0
- package/dist/esm/accounts/owner.js.map +1 -0
- package/dist/esm/demos.js +84 -8
- package/dist/esm/demos.js.map +1 -1
- package/dist/esm/generated/codama/accounts/borrowerState.js +0 -4
- package/dist/esm/generated/codama/accounts/borrowerState.js.map +1 -1
- package/dist/esm/generated/codama/accounts/configState.js +0 -2
- package/dist/esm/generated/codama/accounts/configState.js.map +1 -1
- package/dist/esm/generated/codama/accounts/contractState.js +4 -2
- package/dist/esm/generated/codama/accounts/contractState.js.map +1 -1
- package/dist/esm/generated/codama/accounts/index.js +1 -0
- package/dist/esm/generated/codama/accounts/index.js.map +1 -1
- package/dist/esm/generated/codama/accounts/ownerState.js +73 -0
- package/dist/esm/generated/codama/accounts/ownerState.js.map +1 -0
- package/dist/esm/generated/codama/errors/srsly.js +25 -28
- package/dist/esm/generated/codama/errors/srsly.js.map +1 -1
- package/dist/esm/generated/codama/instructions/claimBorrower.js +25 -12
- package/dist/esm/generated/codama/instructions/claimBorrower.js.map +1 -1
- package/dist/esm/generated/codama/instructions/{claimContractPayments.js → claimOwner.js} +51 -37
- package/dist/esm/generated/codama/instructions/claimOwner.js.map +1 -0
- package/dist/esm/generated/codama/instructions/closeContract.js +10 -78
- package/dist/esm/generated/codama/instructions/closeContract.js.map +1 -1
- package/dist/esm/generated/codama/instructions/closeRental.js +15 -15
- package/dist/esm/generated/codama/instructions/closeRental.js.map +1 -1
- package/dist/esm/generated/codama/instructions/createContract.js +25 -11
- package/dist/esm/generated/codama/instructions/createContract.js.map +1 -1
- package/dist/esm/generated/codama/instructions/index.js +2 -4
- package/dist/esm/generated/codama/instructions/index.js.map +1 -1
- package/dist/esm/generated/codama/instructions/payRental.js +12 -12
- package/dist/esm/generated/codama/instructions/payRental.js.map +1 -1
- package/dist/esm/generated/codama/instructions/reserveRental.js +27 -8
- package/dist/esm/generated/codama/instructions/reserveRental.js.map +1 -1
- package/dist/esm/generated/codama/instructions/updateConfig.js +0 -2
- package/dist/esm/generated/codama/instructions/updateConfig.js.map +1 -1
- package/dist/esm/generated/codama/instructions/updateOwner.js +70 -0
- package/dist/esm/generated/codama/instructions/updateOwner.js.map +1 -0
- package/dist/esm/generated/codama/programs/srsly.js +29 -33
- package/dist/esm/generated/codama/programs/srsly.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/index.js +10 -8
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/instructions/acceptRental.js +2 -2
- package/dist/esm/instructions/acceptRental.js.map +1 -1
- package/dist/esm/instructions/cancelRental.js +4 -2
- package/dist/esm/instructions/cancelRental.js.map +1 -1
- package/dist/esm/instructions/claimBorrower.js +8 -4
- package/dist/esm/instructions/claimBorrower.js.map +1 -1
- package/dist/esm/instructions/claimRental.js +2 -2
- package/dist/esm/instructions/claimRental.js.map +1 -1
- package/dist/esm/instructions/closeContract.js +4 -3
- package/dist/esm/instructions/closeContract.js.map +1 -1
- package/dist/esm/instructions/closeRental.js +9 -5
- package/dist/esm/instructions/closeRental.js.map +1 -1
- package/dist/esm/instructions/createContract.js +4 -2
- package/dist/esm/instructions/createContract.js.map +1 -1
- package/dist/esm/instructions/deleteConfig.js +15 -4
- package/dist/esm/instructions/deleteConfig.js.map +1 -1
- package/dist/esm/instructions/index.js +2 -4
- package/dist/esm/instructions/index.js.map +1 -1
- package/dist/esm/instructions/ownerClaim.js +107 -0
- package/dist/esm/instructions/ownerClaim.js.map +1 -0
- package/dist/esm/instructions/ownerUpdate.js +65 -0
- package/dist/esm/instructions/ownerUpdate.js.map +1 -0
- package/dist/esm/instructions/reserveRental.js +7 -6
- package/dist/esm/instructions/reserveRental.js.map +1 -1
- package/dist/esm/instructions/updateBorrower.js +4 -2
- package/dist/esm/instructions/updateBorrower.js.map +1 -1
- package/dist/esm/instructions/updateConfig.js +0 -1
- package/dist/esm/instructions/updateConfig.js.map +1 -1
- package/dist/esm/legacy/index.js +5 -4
- package/dist/esm/legacy/index.js.map +1 -1
- package/dist/esm/package.json +3 -2
- package/dist/esm/pda/constants.js +1 -0
- package/dist/esm/pda/constants.js.map +1 -1
- package/dist/esm/pda/index.js +2 -2
- package/dist/esm/pda/index.js.map +1 -1
- package/dist/esm/pda/srsly.js +21 -1
- package/dist/esm/pda/srsly.js.map +1 -1
- package/dist/esm/utils/addresses.js +1 -1
- package/dist/esm/utils/addresses.js.map +1 -1
- package/dist/esm/utils/signer.js +8 -8
- package/dist/esm/utils/signer.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/idl/srsly.json +662 -806
- package/dist/types/accounts/member.d.ts +1 -1
- package/dist/types/accounts/member.d.ts.map +1 -1
- package/dist/types/accounts/owner.d.ts +52 -0
- package/dist/types/accounts/owner.d.ts.map +1 -0
- package/dist/types/demos.d.ts +14 -2
- package/dist/types/demos.d.ts.map +1 -1
- package/dist/types/generated/codama/accounts/borrowerState.d.ts +0 -8
- package/dist/types/generated/codama/accounts/borrowerState.d.ts.map +1 -1
- package/dist/types/generated/codama/accounts/configState.d.ts +0 -4
- package/dist/types/generated/codama/accounts/configState.d.ts.map +1 -1
- package/dist/types/generated/codama/accounts/contractState.d.ts +8 -4
- package/dist/types/generated/codama/accounts/contractState.d.ts.map +1 -1
- package/dist/types/generated/codama/accounts/index.d.ts +1 -0
- package/dist/types/generated/codama/accounts/index.d.ts.map +1 -1
- package/dist/types/generated/codama/accounts/ownerState.d.ts +65 -0
- package/dist/types/generated/codama/accounts/ownerState.d.ts.map +1 -0
- package/dist/types/generated/codama/errors/srsly.d.ts +26 -28
- package/dist/types/generated/codama/errors/srsly.d.ts.map +1 -1
- package/dist/types/generated/codama/instructions/claimBorrower.d.ts +31 -19
- package/dist/types/generated/codama/instructions/claimBorrower.d.ts.map +1 -1
- package/dist/types/generated/codama/instructions/claimOwner.d.ts +91 -0
- package/dist/types/generated/codama/instructions/claimOwner.d.ts.map +1 -0
- package/dist/types/generated/codama/instructions/closeContract.d.ts +15 -27
- package/dist/types/generated/codama/instructions/closeContract.d.ts.map +1 -1
- package/dist/types/generated/codama/instructions/closeRental.d.ts +18 -15
- package/dist/types/generated/codama/instructions/closeRental.d.ts.map +1 -1
- package/dist/types/generated/codama/instructions/createContract.d.ts +20 -16
- package/dist/types/generated/codama/instructions/createContract.d.ts.map +1 -1
- package/dist/types/generated/codama/instructions/index.d.ts +2 -4
- package/dist/types/generated/codama/instructions/index.d.ts.map +1 -1
- package/dist/types/generated/codama/instructions/payRental.d.ts +22 -22
- package/dist/types/generated/codama/instructions/payRental.d.ts.map +1 -1
- package/dist/types/generated/codama/instructions/reserveRental.d.ts +21 -17
- package/dist/types/generated/codama/instructions/reserveRental.d.ts.map +1 -1
- package/dist/types/generated/codama/instructions/updateConfig.d.ts +0 -6
- package/dist/types/generated/codama/instructions/updateConfig.d.ts.map +1 -1
- package/dist/types/generated/codama/instructions/updateOwner.d.ts +44 -0
- package/dist/types/generated/codama/instructions/updateOwner.d.ts.map +1 -0
- package/dist/types/generated/codama/programs/srsly.d.ts +27 -32
- package/dist/types/generated/codama/programs/srsly.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/index.d.ts +6 -7
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/instructions/cancelRental.d.ts.map +1 -1
- package/dist/types/instructions/claimBorrower.d.ts +6 -0
- package/dist/types/instructions/claimBorrower.d.ts.map +1 -1
- package/dist/types/instructions/closeContract.d.ts.map +1 -1
- package/dist/types/instructions/closeRental.d.ts.map +1 -1
- package/dist/types/instructions/createContract.d.ts.map +1 -1
- package/dist/types/instructions/deleteConfig.d.ts +4 -2
- package/dist/types/instructions/deleteConfig.d.ts.map +1 -1
- package/dist/types/instructions/index.d.ts +2 -4
- package/dist/types/instructions/index.d.ts.map +1 -1
- package/dist/types/instructions/ownerClaim.d.ts +72 -0
- package/dist/types/instructions/ownerClaim.d.ts.map +1 -0
- package/dist/types/instructions/ownerUpdate.d.ts +57 -0
- package/dist/types/instructions/ownerUpdate.d.ts.map +1 -0
- package/dist/types/instructions/reserveRental.d.ts.map +1 -1
- package/dist/types/instructions/updateBorrower.d.ts.map +1 -1
- package/dist/types/instructions/updateConfig.d.ts.map +1 -1
- package/dist/types/legacy/index.d.ts +7 -8
- package/dist/types/legacy/index.d.ts.map +1 -1
- package/dist/types/pda/constants.d.ts +1 -0
- package/dist/types/pda/constants.d.ts.map +1 -1
- package/dist/types/pda/index.d.ts +2 -2
- package/dist/types/pda/index.d.ts.map +1 -1
- package/dist/types/pda/srsly.d.ts +7 -0
- package/dist/types/pda/srsly.d.ts.map +1 -1
- package/dist/types/utils/addresses.d.ts +5 -1
- package/dist/types/utils/addresses.d.ts.map +1 -1
- package/dist/types/utils/signer.d.ts +2 -2
- package/dist/types/utils/signer.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/package.json +25 -19
- package/dist/cjs/generated/codama/instructions/claimContractPayments.js.map +0 -1
- package/dist/cjs/generated/codama/instructions/closeBorrower.js +0 -84
- package/dist/cjs/generated/codama/instructions/closeBorrower.js.map +0 -1
- package/dist/cjs/generated/codama/instructions/deleteBorrower.js +0 -126
- package/dist/cjs/generated/codama/instructions/deleteBorrower.js.map +0 -1
- package/dist/cjs/generated/codama/instructions/discountBorrower.js +0 -118
- package/dist/cjs/generated/codama/instructions/discountBorrower.js.map +0 -1
- package/dist/cjs/generated/codama/types/borrowerDiscountSet.js +0 -29
- package/dist/cjs/generated/codama/types/borrowerDiscountSet.js.map +0 -1
- package/dist/cjs/instructions/claimContractPayments.js +0 -79
- package/dist/cjs/instructions/claimContractPayments.js.map +0 -1
- package/dist/cjs/instructions/closeBorrower.js +0 -60
- package/dist/cjs/instructions/closeBorrower.js.map +0 -1
- package/dist/cjs/instructions/deleteBorrower.js +0 -60
- package/dist/cjs/instructions/deleteBorrower.js.map +0 -1
- package/dist/cjs/instructions/discountBorrower.js +0 -76
- package/dist/cjs/instructions/discountBorrower.js.map +0 -1
- package/dist/esm/generated/codama/instructions/claimContractPayments.js.map +0 -1
- package/dist/esm/generated/codama/instructions/closeBorrower.js +0 -75
- package/dist/esm/generated/codama/instructions/closeBorrower.js.map +0 -1
- package/dist/esm/generated/codama/instructions/deleteBorrower.js +0 -116
- package/dist/esm/generated/codama/instructions/deleteBorrower.js.map +0 -1
- package/dist/esm/generated/codama/instructions/discountBorrower.js +0 -108
- package/dist/esm/generated/codama/instructions/discountBorrower.js.map +0 -1
- package/dist/esm/generated/codama/types/borrowerDiscountSet.js +0 -24
- package/dist/esm/generated/codama/types/borrowerDiscountSet.js.map +0 -1
- package/dist/esm/instructions/claimContractPayments.js +0 -76
- package/dist/esm/instructions/claimContractPayments.js.map +0 -1
- package/dist/esm/instructions/closeBorrower.js +0 -57
- package/dist/esm/instructions/closeBorrower.js.map +0 -1
- package/dist/esm/instructions/deleteBorrower.js +0 -57
- package/dist/esm/instructions/deleteBorrower.js.map +0 -1
- package/dist/esm/instructions/discountBorrower.js +0 -73
- package/dist/esm/instructions/discountBorrower.js.map +0 -1
- package/dist/types/generated/codama/instructions/claimContractPayments.d.ts +0 -98
- package/dist/types/generated/codama/instructions/claimContractPayments.d.ts.map +0 -1
- package/dist/types/generated/codama/instructions/closeBorrower.d.ts +0 -43
- package/dist/types/generated/codama/instructions/closeBorrower.d.ts.map +0 -1
- package/dist/types/generated/codama/instructions/deleteBorrower.d.ts +0 -55
- package/dist/types/generated/codama/instructions/deleteBorrower.d.ts.map +0 -1
- package/dist/types/generated/codama/instructions/discountBorrower.d.ts +0 -56
- package/dist/types/generated/codama/instructions/discountBorrower.d.ts.map +0 -1
- package/dist/types/generated/codama/types/borrowerDiscountSet.d.ts +0 -20
- package/dist/types/generated/codama/types/borrowerDiscountSet.d.ts.map +0 -1
- package/dist/types/instructions/claimContractPayments.d.ts +0 -78
- package/dist/types/instructions/claimContractPayments.d.ts.map +0 -1
- package/dist/types/instructions/closeBorrower.d.ts +0 -45
- package/dist/types/instructions/closeBorrower.d.ts.map +0 -1
- package/dist/types/instructions/deleteBorrower.d.ts +0 -53
- package/dist/types/instructions/deleteBorrower.d.ts.map +0 -1
- package/dist/types/instructions/discountBorrower.d.ts +0 -64
- package/dist/types/instructions/discountBorrower.d.ts.map +0 -1
package/dist/cjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,0EAA0E;AAC1E,qCAAoC;AAA3B,kGAAA,OAAO,OAAA;AAEhB,+EAA+E;AAC/E,uEAAuE;AACvE,+EAA+E;AAE/E,iCAwDiB;AAvDf,gBAAgB;AAChB,qGAAA,YAAY,OAAA;AACZ,qGAAA,YAAY,OAAA;AACZ,uGAAA,cAAc,OAAA;AACd,oGAAA,WAAW,OAAA;AACX,qGAAA,YAAY,OAAA;AACZ,2GAAA,kBAAkB,OAAA;AAIlB,oBAAoB;AACpB,4GAAA,mBAAmB,OAAA;AACnB,4GAAA,mBAAmB,OAAA;AACnB,0GAAA,iBAAiB,OAAA;AACjB,uGAAA,cAAc,OAAA;AACd,0GAAA,iBAAiB,OAAA;AACjB,2GAAA,kBAAkB,OAAA;AAIlB,mBAAmB;AACnB,4GAAA,mBAAmB,OAAA;AACnB,wGAAA,eAAe,OAAA;AACf,uGAAA,cAAc,OAAA;AACd,oGAAA,WAAW,OAAA;AACX,wGAAA,eAAe,OAAA;AAEf,wBAAwB;AACxB,0GAAA,iBAAiB,OAAA;AACjB,kGAAA,SAAS,OAAA;AAIT,wBAAwB;AACxB,4GAAA,mBAAmB,OAAA;AAEnB,4DAA4D;AAC5D,0GAAA,iBAAiB,OAAA;AAEjB,gBAAgB;AAChB,kGAAA,SAAS,OAAA;AACT,oGAAA,WAAW,OAAA;AACX,0GAAA,iBAAiB,OAAA;AACjB,iCAAiC;AACjC,yGAAA,gBAAgB,OAAA;AAChB,8GAAA,qBAAqB,OAAA;AAErB,mCAAmC;AACnC,uGAAA,cAAc,OAAA;AACd,8GAAA,qBAAqB,OAAA;AACrB,gHAAA,uBAAuB,OAAA;AACvB,iHAAA,wBAAwB,OAAA;AAM1B,+EAA+E;AAC/E,eAAe;AACf,+EAA+E;AAE/E,gEAGuC;AAFrC,gHAAA,cAAc,OAAA;AAIhB,gEAGuC;AAFrC,gHAAA,cAAc,OAAA;AAIhB,0DAGoC;AAFlC,0GAAA,WAAW,OAAA;AAIb,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,0EAA0E;AAC1E,qCAAoC;AAA3B,kGAAA,OAAO,OAAA;AAEhB,+EAA+E;AAC/E,uEAAuE;AACvE,+EAA+E;AAE/E,iCAwDiB;AAvDf,gBAAgB;AAChB,qGAAA,YAAY,OAAA;AACZ,qGAAA,YAAY,OAAA;AACZ,uGAAA,cAAc,OAAA;AACd,oGAAA,WAAW,OAAA;AACX,qGAAA,YAAY,OAAA;AACZ,2GAAA,kBAAkB,OAAA;AAIlB,oBAAoB;AACpB,4GAAA,mBAAmB,OAAA;AACnB,4GAAA,mBAAmB,OAAA;AACnB,0GAAA,iBAAiB,OAAA;AACjB,uGAAA,cAAc,OAAA;AACd,0GAAA,iBAAiB,OAAA;AACjB,2GAAA,kBAAkB,OAAA;AAIlB,mBAAmB;AACnB,4GAAA,mBAAmB,OAAA;AACnB,wGAAA,eAAe,OAAA;AACf,uGAAA,cAAc,OAAA;AACd,oGAAA,WAAW,OAAA;AACX,wGAAA,eAAe,OAAA;AAEf,wBAAwB;AACxB,0GAAA,iBAAiB,OAAA;AACjB,kGAAA,SAAS,OAAA;AAIT,wBAAwB;AACxB,4GAAA,mBAAmB,OAAA;AAEnB,4DAA4D;AAC5D,0GAAA,iBAAiB,OAAA;AAEjB,gBAAgB;AAChB,kGAAA,SAAS,OAAA;AACT,oGAAA,WAAW,OAAA;AACX,0GAAA,iBAAiB,OAAA;AACjB,iCAAiC;AACjC,yGAAA,gBAAgB,OAAA;AAChB,8GAAA,qBAAqB,OAAA;AAErB,mCAAmC;AACnC,uGAAA,cAAc,OAAA;AACd,8GAAA,qBAAqB,OAAA;AACrB,gHAAA,uBAAuB,OAAA;AACvB,iHAAA,wBAAwB,OAAA;AAM1B,+EAA+E;AAC/E,eAAe;AACf,+EAA+E;AAE/E,gEAGuC;AAFrC,gHAAA,cAAc,OAAA;AAIhB,gEAGuC;AAFrC,gHAAA,cAAc,OAAA;AAIhB,0DAGoC;AAFlC,0GAAA,WAAW,OAAA;AAIb,4DAGqC;AAFnC,4GAAA,YAAY,OAAA;AAId,gEAGuC;AAFrC,gHAAA,cAAc,OAAA;AAIhB,8DAGsC;AAFpC,8GAAA,aAAa,OAAA;AAIf,4DAGqC;AAFnC,4GAAA,YAAY,OAAA;AAId,0DAGoC;AAFlC,0GAAA,WAAW,OAAA;AAIb,0DAGoC;AAFlC,0GAAA,WAAW,OAAA;AAIb,4DAGqC;AAFnC,4GAAA,YAAY,OAAA;AAId,8DAGsC;AAFpC,8GAAA,aAAa,OAAA;AAIf,gEAGuC;AAFrC,gHAAA,cAAc,OAAA;AAIhB,4DAGqC;AAFnC,4GAAA,YAAY,OAAA;AAId,4DAGqC;AAFnC,4GAAA,YAAY,OAAA;AAId,4DAGqC;AAFnC,4GAAA,YAAY,OAAA;AAId,8DAGsC;AAFpC,8GAAA,aAAa,OAAA;AAIf,oEAGyC;AAFvC,oHAAA,gBAAgB,OAAA;AAIlB,8DAGsC;AAFpC,8GAAA,aAAa,OAAA;AAIf,+EAA+E;AAC/E,qBAAqB;AACrB,+EAA+E;AAE/E,wDAGmC;AAFjC,wGAAA,UAAU,OAAA;AAIZ,0DAGoC;AAFlC,0GAAA,WAAW,OAAA;AAIb,+EAA+E;AAC/E,oCAAoC;AACpC,+EAA+E;AAE/E,iDAM8B;AAL5B,8GAAA,kBAAkB,OAAA;AAGlB,iGAAA,KAAK,OAAA;AAIP,kEAGwC;AAFtC,kHAAA,eAAe,OAAA;AAIjB,oEAGyC;AAFvC,oHAAA,gBAAgB,OAAA;AAIlB,kEAGwC;AAFtC,kHAAA,eAAe,OAAA;AAIjB,kEAGwC;AAFtC,kHAAA,eAAe,OAAA;AAIjB,+EAA+E;AAC/E,iCAAiC;AACjC,+EAA+E;AAE/E,0CAMyB;AALvB,uGAAA,aAAa,OAAA;AACb,yGAAA,eAAe,OAAA;AACf,sGAAA,YAAY,OAAA;AACZ,wGAAA,cAAc,OAAA;AAIhB,8CAK2B;AAJzB,2GAAA,eAAe,OAAA;AACf,4GAAA,gBAAgB,OAAA;AAChB,0GAAA,cAAc,OAAA;AAIhB,8CAO2B;AANzB,6GAAA,iBAAiB,OAAA;AACjB,kHAAA,sBAAsB,OAAA;AACtB,0GAAA,cAAc,OAAA;AACd,8GAAA,kBAAkB,OAAA;AAClB,8GAAA,kBAAkB,OAAA;AAIpB,+EAA+E;AAC/E,oBAAoB;AACpB,+EAA+E;AAE/E,0CAG0B;AAFxB,mGAAA,UAAU,OAAA;AAIZ,gDAAuE;AAA9D,yGAAA,aAAa,OAAA;AAAE,6GAAA,iBAAiB,OAAA;AAEzC,4CAAiE;AAAxD,qGAAA,WAAW,OAAA;AAAE,yGAAA,eAAe,OAAA;AAErC,gDAAuE;AAA9D,yGAAA,aAAa,OAAA;AAAE,6GAAA,iBAAiB,OAAA;AAEzC,0CAA8D;AAArD,mGAAA,UAAU,OAAA;AAAE,uGAAA,cAAc,OAAA;AAEnC,4CAAiE;AAAxD,qGAAA,WAAW,OAAA;AAAE,yGAAA,eAAe,OAAA;AAErC,4CAO2B;AANzB,qGAAA,WAAW,OAAA;AACX,yGAAA,eAAe,OAAA;AACf,oGAAA,UAAU,OAAA;AACV,sGAAA,YAAY,OAAA;AAKd,+EAA+E;AAC/E,2BAA2B;AAC3B,+EAA+E;AAE/E,6BAuCe;AAtCb,YAAY;AACZ,0GAAA,mBAAmB,OAAA;AACnB,sGAAA,eAAe,OAAA;AACf,oGAAA,aAAa,OAAA;AACb,2GAAA,oBAAoB,OAAA;AACpB,+GAAA,wBAAwB,OAAA;AACxB,2GAAA,oBAAoB,OAAA;AACpB,oGAAA,aAAa,OAAA;AACb,kGAAA,WAAW,OAAA;AACX,4GAAA,qBAAqB,OAAA;AACrB,0GAAA,mBAAmB,OAAA;AACnB,uGAAA,gBAAgB,OAAA;AAChB,kGAAA,WAAW,OAAA;AACX,kGAAA,WAAW,OAAA;AACX,yGAAA,kBAAkB,OAAA;AAClB,qGAAA,cAAc,OAAA;AACd,4GAAA,qBAAqB,OAAA;AACrB,aAAa;AACb,qGAAA,cAAc,OAAA;AACd,mGAAA,YAAY,OAAA;AACZ,4GAAA,qBAAqB,OAAA;AACrB,0GAAA,mBAAmB,OAAA;AACnB,uGAAA,gBAAgB,OAAA;AAChB,mGAAA,YAAY,OAAA;AACZ,YAAY;AACZ,2GAAA,oBAAoB,OAAA;AACpB,8GAAA,uBAAuB,OAAA;AACvB,qGAAA,cAAc,OAAA;AACd,2GAAA,oBAAoB,OAAA;AACpB,yGAAA,kBAAkB,OAAA;AAClB,cAAc;AACd,yGAAA,kBAAkB,OAAA;AAClB,kBAAkB;AAClB,mHAAA,4BAA4B,OAAA;AAC5B,gBAAgB;AAChB,kGAAA,WAAW,OAAA;AACX,iCAAiC;AACjC,wGAAA,iBAAiB,OAAA;AAGnB,+EAA+E;AAC/E,wDAAwD;AACxD,+EAA+E;AAE/E,iEAAiE;AACjE,6DAA6C"}
|
|
@@ -147,9 +147,9 @@ async function acceptRental(params, config) {
|
|
|
147
147
|
const queuedThread = await (0, thread_1.deriveRentalThread)(otherSlotRental, rentalAuthority);
|
|
148
148
|
// Convert duration parameter
|
|
149
149
|
const durationSeconds = (0, duration_1.convertDuration)(params.duration);
|
|
150
|
-
// Get network-specific addresses
|
|
150
|
+
// Get network-specific addresses (atlasMint sourced from on-chain config)
|
|
151
|
+
const atlasMint = configAccount.data.atlasMint;
|
|
151
152
|
const addresses = (0, config_1.getAddresses)(config);
|
|
152
|
-
const atlasMint = (0, kit_1.address)(addresses.atlasMint);
|
|
153
153
|
const sageProgram = (0, kit_1.address)(addresses.sage);
|
|
154
154
|
const programAddress = (0, kit_1.address)(addresses.srsly);
|
|
155
155
|
// Deserialize discount auth if provided
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"acceptRental.js","sourceRoot":"","sources":["../../../src/instructions/acceptRental.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAgJH,oCAwKC;AAtTD,qCAAoD;AACpD,sCAAyC;AACzC,mEAAsH;AACtH,4CAA4E;AAC5E,4CAA4E;AAE5E,6CAAmE;AACnE,iDAAyE;AACzE,6CAA+C;AAC/C,mDAAqD;AACrD,+CAAiD;AACjD,2DAAkE;AAClE,sCAAiD;AACjD,wCAAwF;AACxF,wCAA4D;AAC5D,0CAAmD;AACnD,wDAA4D;AAC5D,wDAA6F;AA8E7F;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AACI,KAAK,UAAU,YAAY,CAChC,MAA0B,EAC1B,MAA2B;IAE3B,eAAe;IACf,MAAM,WAAW,GAAG,IAAA,oBAAW,EAAC,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,IAAA,4BAAmB,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE5D,+EAA+E;IAC/E,IAAI,eAAwB,CAAC;IAC7B,IAAI,CAAC;QACH,MAAM,oBAAoB,GAAG,MAAM,IAAA,2BAAmB,EAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC/E,MAAM,GAAG,GAAG,IAAA,eAAS,EAAC,WAAW,CAAC,MAAM,IAAI,+BAA+B,CAAC,CAAC;QAC7E,MAAM,aAAa,GAAG,MAAM,IAAA,6BAAkB,EAAC,GAAG,EAAE,oBAAoB,CAAC,CAAC;QAC1E,MAAM,aAAa,GAAG,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC;QAEzD,IAAI,aAAa,IAAI,OAAO,aAAa,KAAK,QAAQ,IAAI,UAAU,IAAI,aAAa,IAAI,aAAa,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;YAC3H,qDAAqD;YACrD,eAAe,GAAG,aAAa,CAAC,KAAK,CAAC;QACxC,CAAC;aAAM,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;YAClC,4DAA4D;YAC5D,eAAe,GAAG,IAAA,aAAO,EAAC,MAAM,CAAC,eAA0B,CAAC,CAAC;QAC/D,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;QAChF,CAAC;IACH,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,4EAA4E;QAC5E,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC;YAC3B,eAAe,GAAG,IAAA,aAAO,EAAC,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,IAAA,oBAAW,EAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC5D,MAAM,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC;IAE1C,oDAAoD;IACpD,MAAM,eAAe,GAAG,MAAM,IAAA,wBAAa,EAAC,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,IAAA,sBAAa,EAAC,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,IAAA,kBAAU,EAAC,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC/D,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;IAEnC,6EAA6E;IAC7E,MAAM,YAAY,GAAG,MAAM,IAAA,yBAAkB,EAC3C,eAAe,EACf,OAAO,EACP,MAAM,CACP,CAAC;IAEF,0CAA0C;IAC1C,kEAAkE;IAClE,MAAM,UAAU,GAAG,CAAC,CAAC;IACrB,MAAM,MAAM,GAAG,MAAM,IAAA,oBAAY,EAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC/D,MAAM,eAAe,GAAG,MAAM,IAAA,6BAAqB,GAAE,CAAC;IAEtD,8CAA8C;IAC9C,MAAM,YAAY,GAAG,MAAM,IAAA,2BAAkB,EAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAEvE,mDAAmD;IACnD,2EAA2E;IAC3E,MAAM,eAAe,GAAG,MAAM,IAAA,oBAAY,EAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IAC/D,MAAM,YAAY,GAAG,MAAM,IAAA,2BAAkB,EAAC,eAAe,EAAE,eAAe,CAAC,CAAC;IAEhF,6BAA6B;IAC7B,MAAM,eAAe,GAAG,IAAA,0BAAe,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAEzD,
|
|
1
|
+
{"version":3,"file":"acceptRental.js","sourceRoot":"","sources":["../../../src/instructions/acceptRental.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ const thread_1 = require("../pda/thread");
|
|
|
16
16
|
const instructions_2 = require("../utils/instructions");
|
|
17
17
|
const duration_1 = require("../params/duration");
|
|
18
18
|
const rental_1 = require("../utils/rental");
|
|
19
|
+
const config_2 = require("../accounts/config");
|
|
19
20
|
/**
|
|
20
21
|
* Cancel a rental
|
|
21
22
|
*
|
|
@@ -70,9 +71,10 @@ async function cancelRental(params, config) {
|
|
|
70
71
|
}
|
|
71
72
|
// Convert borrower to transaction signer
|
|
72
73
|
const borrowerSigner = (0, signer_1.toTransactionSigner)(params.borrower);
|
|
73
|
-
// Get
|
|
74
|
+
// Get atlasMint from on-chain config
|
|
75
|
+
const configAccount = await (0, config_2.fetchConfig)(finalConfig.rpcUrl);
|
|
76
|
+
const atlasMint = configAccount.data.atlasMint;
|
|
74
77
|
const addresses = (0, config_1.getAddresses)(config);
|
|
75
|
-
const atlasMint = (0, kit_1.address)(addresses.atlasMint);
|
|
76
78
|
const programAddress = (0, kit_1.address)(addresses.srsly);
|
|
77
79
|
// Auto-detect rental slot if not provided
|
|
78
80
|
const rentalSlot = params.rentalSlot ?? await (0, rental_1.requireBorrowerRentalSlot)(params.contract, borrowerSigner.address, finalConfig.rpcUrl || 'https://api.devnet.solana.com');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cancelRental.js","sourceRoot":"","sources":["../../../src/instructions/cancelRental.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;
|
|
1
|
+
{"version":3,"file":"cancelRental.js","sourceRoot":"","sources":["../../../src/instructions/cancelRental.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAoGH,oCA8DC;AAhKD,qCAAoD;AACpD,mEAAmF;AACnF,4CAA4E;AAC5E,4CAA4E;AAC5E,wCAAmE;AACnE,0CAAmD;AACnD,wDAA4D;AAC5D,iDAAyE;AACzE,4CAA4D;AAC5D,+CAAiD;AA+CjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACI,KAAK,UAAU,YAAY,CAChC,MAA0B,EAC1B,MAA2B;IAE3B,eAAe;IACf,MAAM,WAAW,GAAG,IAAA,oBAAW,EAAC,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;IAED,yCAAyC;IACzC,MAAM,cAAc,GAAG,IAAA,4BAAmB,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE5D,qCAAqC;IACrC,MAAM,aAAa,GAAG,MAAM,IAAA,oBAAW,EAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC5D,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC;IAC/C,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,MAAM,CAAC,CAAC;IACvC,MAAM,cAAc,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,0CAA0C;IAC1C,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,MAAM,IAAA,kCAAyB,EACrE,MAAM,CAAC,QAAQ,EACf,cAAc,CAAC,OAAO,EACtB,WAAW,CAAC,MAAM,IAAI,+BAA+B,CACtD,CAAC;IAEF,iCAAiC;IACjC,MAAM,WAAW,GAAG,MAAM,IAAA,oBAAY,EAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IACpE,MAAM,eAAe,GAAG,MAAM,IAAA,6BAAqB,GAAE,CAAC;IACtD,MAAM,YAAY,GAAG,MAAM,IAAA,2BAAkB,EAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IAE5E,yEAAyE;IACzE,qFAAqF;IACrF,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,KAAK,SAAS;QAClD,CAAC,CAAC,MAAM,CAAC,IAAA,0BAAe,EAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC7C,CAAC,CAAC,MAAM,CAAC,IAAA,0BAAe,EAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAE1C,oCAAoC;IACpC,yEAAyE;IACzE,oEAAoE;IACpE,MAAM,cAAc,GAAG,MAAM,IAAA,8CAA+B,EAC1D;QACE,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,cAAc;QACxB,WAAW;QACX,YAAY;QACZ,QAAQ,EAAE,IAAA,aAAO,EAAC,MAAM,CAAC,QAAmB,CAAC;QAC7C,WAAW;QACX,UAAU;KACX,EACD,EAAE,cAAc,EAAE,CACnB,CAAC;IAEF,OAAO,IAAA,kCAAmB,EAAC,cAAc,EAAE;QACzC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,SAAS,EAAE,WAAW,CAAC,SAAS;KACjC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -12,6 +12,7 @@ const instructions_1 = require("../generated/codama/instructions");
|
|
|
12
12
|
const config_1 = require("../utils/config");
|
|
13
13
|
const signer_1 = require("../utils/signer");
|
|
14
14
|
const instructions_2 = require("../utils/instructions");
|
|
15
|
+
const config_2 = require("../accounts/config");
|
|
15
16
|
/**
|
|
16
17
|
* Claim borrower ATLAS refunds
|
|
17
18
|
*
|
|
@@ -48,15 +49,18 @@ async function claimBorrower(params, config) {
|
|
|
48
49
|
}
|
|
49
50
|
// Convert borrower to transaction signer
|
|
50
51
|
const borrowerSigner = (0, signer_1.toTransactionSigner)(params.borrower);
|
|
51
|
-
// Get
|
|
52
|
+
// Get atlasMint from on-chain config
|
|
53
|
+
const configAccount = await (0, config_2.fetchConfig)(finalConfig.rpcUrl);
|
|
54
|
+
const atlasMint = configAccount.data.atlasMint;
|
|
52
55
|
const addresses = (0, config_1.getAddresses)(config);
|
|
53
|
-
const atlasMint = (0, kit_1.address)(addresses.atlasMint);
|
|
54
56
|
const programAddress = (0, kit_1.address)(addresses.srsly);
|
|
55
57
|
// Call Codama-generated instruction
|
|
56
58
|
// Most accounts are auto-derived (config, borrowerState, managed account, destination)
|
|
57
59
|
const kitInstruction = await (0, instructions_1.getClaimBorrowerInstructionAsync)({
|
|
58
|
-
|
|
60
|
+
payer: borrowerSigner,
|
|
61
|
+
borrower: (0, signer_1.getSignerAddress)(borrowerSigner),
|
|
59
62
|
mint: atlasMint,
|
|
63
|
+
close: params.close ?? false,
|
|
60
64
|
}, { programAddress });
|
|
61
65
|
return (0, instructions_2.prepareInstructions)(kitInstruction, {
|
|
62
66
|
computeUnits: params.computeUnits,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claimBorrower.js","sourceRoot":"","sources":["../../../src/instructions/claimBorrower.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;
|
|
1
|
+
{"version":3,"file":"claimBorrower.js","sourceRoot":"","sources":["../../../src/instructions/claimBorrower.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AA4DH,sCAqCC;AA/FD,qCAAoD;AACpD,mEAAoF;AACpF,4CAA4E;AAC5E,4CAA8F;AAC9F,wDAA4D;AAC5D,+CAAiD;AA0BjD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACI,KAAK,UAAU,aAAa,CACjC,MAA2B,EAC3B,MAA2B;IAE3B,eAAe;IACf,MAAM,WAAW,GAAG,IAAA,oBAAW,EAAC,MAAM,CAAC,CAAC;IAExC,2BAA2B;IAC3B,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IAED,yCAAyC;IACzC,MAAM,cAAc,GAAG,IAAA,4BAAmB,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE5D,qCAAqC;IACrC,MAAM,aAAa,GAAG,MAAM,IAAA,oBAAW,EAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC5D,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC;IAC/C,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,MAAM,CAAC,CAAC;IACvC,MAAM,cAAc,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,oCAAoC;IACpC,uFAAuF;IACvF,MAAM,cAAc,GAAG,MAAM,IAAA,+CAAgC,EAC3D;QACE,KAAK,EAAE,cAAc;QACrB,QAAQ,EAAE,IAAA,yBAAgB,EAAC,cAAc,CAAC;QAC1C,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,KAAK;KAC7B,EACD,EAAE,cAAc,EAAE,CACnB,CAAC;IAEF,OAAO,IAAA,kCAAmB,EAAC,cAAc,EAAE;QACzC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,SAAS,EAAE,WAAW,CAAC,SAAS;KACjC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -139,9 +139,9 @@ async function claimRental(params, config) {
|
|
|
139
139
|
const queuedThread = await (0, thread_1.deriveRentalThread)(otherSlotRental, rentalAuthority);
|
|
140
140
|
// Convert duration parameter
|
|
141
141
|
const durationSeconds = (0, duration_1.convertDuration)(params.duration);
|
|
142
|
-
// Get network-specific addresses
|
|
142
|
+
// Get network-specific addresses (atlasMint sourced from on-chain config)
|
|
143
|
+
const atlasMint = configAccount.data.atlasMint;
|
|
143
144
|
const addresses = (0, config_1.getAddresses)(config);
|
|
144
|
-
const atlasMint = (0, kit_1.address)(addresses.atlasMint);
|
|
145
145
|
const sageProgram = (0, kit_1.address)(addresses.sage);
|
|
146
146
|
const programAddress = (0, kit_1.address)(addresses.srsly);
|
|
147
147
|
// Deserialize discount auth if provided
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claimRental.js","sourceRoot":"","sources":["../../../src/instructions/claimRental.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"claimRental.js","sourceRoot":"","sources":["../../../src/instructions/claimRental.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ const instructions_1 = require("../generated/codama/instructions");
|
|
|
12
12
|
const config_1 = require("../utils/config");
|
|
13
13
|
const signer_1 = require("../utils/signer");
|
|
14
14
|
const contract_1 = require("../accounts/contract");
|
|
15
|
+
const config_2 = require("../accounts/config");
|
|
15
16
|
const instructions_2 = require("../utils/instructions");
|
|
16
17
|
/**
|
|
17
18
|
* Close a rental contract
|
|
@@ -68,9 +69,10 @@ async function closeContract(params, config) {
|
|
|
68
69
|
}
|
|
69
70
|
// Convert owner to transaction signer
|
|
70
71
|
const ownerSigner = (0, signer_1.toTransactionSigner)(params.owner);
|
|
71
|
-
// Get
|
|
72
|
+
// Get atlasMint from on-chain config
|
|
73
|
+
const configAccount = await (0, config_2.fetchConfig)(finalConfig.rpcUrl);
|
|
74
|
+
const atlasMint = configAccount.data.atlasMint;
|
|
72
75
|
const addresses = (0, config_1.getAddresses)(config);
|
|
73
|
-
const atlasMint = (0, kit_1.address)(addresses.atlasMint);
|
|
74
76
|
const programAddress = (0, kit_1.address)(addresses.srsly);
|
|
75
77
|
// Resolve fleet and contract addresses
|
|
76
78
|
let fleetAddress;
|
|
@@ -108,7 +110,6 @@ async function closeContract(params, config) {
|
|
|
108
110
|
owner: ownerSigner,
|
|
109
111
|
contract: contractAddress,
|
|
110
112
|
mint: atlasMint,
|
|
111
|
-
destinationTokenAccount,
|
|
112
113
|
fleet: fleetAddress,
|
|
113
114
|
sageProgram,
|
|
114
115
|
}, { programAddress });
|
|
@@ -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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"}
|
|
@@ -13,6 +13,7 @@ const accounts_1 = require("../generated/codama/accounts");
|
|
|
13
13
|
const config_1 = require("../utils/config");
|
|
14
14
|
const signer_1 = require("../utils/signer");
|
|
15
15
|
const contract_1 = require("../accounts/contract");
|
|
16
|
+
const config_2 = require("../accounts/config");
|
|
16
17
|
const fleet_1 = require("../accounts/fleet");
|
|
17
18
|
const sage_1 = require("../pda/sage");
|
|
18
19
|
const srsly_1 = require("../pda/srsly");
|
|
@@ -96,22 +97,25 @@ async function closeRental(params, config) {
|
|
|
96
97
|
const borrowerState = await (0, srsly_1.deriveBorrowerState)(borrower);
|
|
97
98
|
// Derive rental thread for automated payments
|
|
98
99
|
const rentalThread = await (0, thread_1.deriveRentalThread)(rental, rentalAuthority);
|
|
99
|
-
// Get
|
|
100
|
+
// Get atlasMint from on-chain config
|
|
101
|
+
const configAccount = await (0, config_2.fetchConfig)(finalConfig.rpcUrl);
|
|
102
|
+
const atlasMint = configAccount.data.atlasMint;
|
|
100
103
|
const addresses = (0, config_1.getAddresses)(config);
|
|
101
|
-
const atlasMint = (0, kit_1.address)(addresses.atlasMint);
|
|
102
104
|
const sageProgram = (0, kit_1.address)(addresses.sage);
|
|
103
105
|
const programAddress = (0, kit_1.address)(addresses.srsly);
|
|
104
106
|
// Derive queuedThread from the other slot's rental
|
|
105
107
|
const otherSlotRental = await (0, srsly_1.deriveRental)(params.contract, otherSlot);
|
|
106
108
|
const queuedThread = await (0, thread_1.deriveRentalThread)(otherSlotRental, rentalAuthority);
|
|
109
|
+
// Derive ownerState PDA from owner address
|
|
110
|
+
const ownerState = await (0, srsly_1.deriveOwnerState)(owner);
|
|
107
111
|
// Call Codama-generated instruction
|
|
108
|
-
// Note:
|
|
112
|
+
// Note: ownerTokenAccount is auto-derived by Codama as ATA for ownerState + mint
|
|
109
113
|
const kitInstruction = await (0, instructions_1.getCloseRentalInstructionAsync)({
|
|
110
114
|
payer: payerSigner,
|
|
111
115
|
mint: atlasMint,
|
|
112
116
|
borrower: (0, kit_1.address)(borrower),
|
|
113
117
|
borrowerState,
|
|
114
|
-
|
|
118
|
+
ownerState,
|
|
115
119
|
contract: (0, kit_1.address)(params.contract),
|
|
116
120
|
rentalState: rental,
|
|
117
121
|
rentalThread,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"closeRental.js","sourceRoot":"","sources":["../../../src/instructions/closeRental.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;
|
|
1
|
+
{"version":3,"file":"closeRental.js","sourceRoot":"","sources":["../../../src/instructions/closeRental.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ const amount_1 = require("../params/amount");
|
|
|
15
15
|
const duration_1 = require("../params/duration");
|
|
16
16
|
const schedule_1 = require("../params/schedule");
|
|
17
17
|
const fleet_1 = require("../accounts/fleet");
|
|
18
|
+
const config_2 = require("../accounts/config");
|
|
18
19
|
const instructions_2 = require("../utils/instructions");
|
|
19
20
|
/**
|
|
20
21
|
* Create a rental contract for a Star Atlas fleet
|
|
@@ -102,9 +103,10 @@ async function createContract(params, config) {
|
|
|
102
103
|
if (durationMaxSeconds < durationMinSeconds) {
|
|
103
104
|
throw new Error(`durationMax (${durationMaxSeconds}s) must be >= durationMin (${durationMinSeconds}s)`);
|
|
104
105
|
}
|
|
105
|
-
// Get
|
|
106
|
+
// Get atlasMint from on-chain config
|
|
107
|
+
const configAccount = await (0, config_2.fetchConfig)(finalConfig.rpcUrl);
|
|
108
|
+
const atlasMint = configAccount.data.atlasMint;
|
|
106
109
|
const addresses = (0, config_1.getAddresses)(config);
|
|
107
|
-
const atlasMint = (0, kit_1.address)(addresses.atlasMint);
|
|
108
110
|
const sageProgram = (0, kit_1.address)(addresses.sage);
|
|
109
111
|
const programAddress = (0, kit_1.address)(addresses.srsly);
|
|
110
112
|
// Convert cancelDelayMin duration to seconds
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createContract.js","sourceRoot":"","sources":["../../../src/instructions/createContract.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;
|
|
1
|
+
{"version":3,"file":"createContract.js","sourceRoot":"","sources":["../../../src/instructions/createContract.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ const instructions_1 = require("../generated/codama/instructions");
|
|
|
15
15
|
const config_1 = require("../utils/config");
|
|
16
16
|
const signer_1 = require("../utils/signer");
|
|
17
17
|
const instructions_2 = require("../utils/instructions");
|
|
18
|
+
const config_2 = require("../accounts/config");
|
|
18
19
|
const slyvault_1 = require("../pda/slyvault");
|
|
19
20
|
/**
|
|
20
21
|
* Delete program configuration
|
|
@@ -53,11 +54,21 @@ async function deleteConfig(params, config) {
|
|
|
53
54
|
if (!addresses.srsly || addresses.srsly === 'undefined') {
|
|
54
55
|
throw new Error(`Invalid SRSLY program address: ${addresses.srsly}. SDK config may not be initialized properly.`);
|
|
55
56
|
}
|
|
56
|
-
if (!params.mint) {
|
|
57
|
-
throw new Error('mint is required for vault derivation');
|
|
58
|
-
}
|
|
59
57
|
const programAddress = (0, kit_1.address)(addresses.srsly);
|
|
60
|
-
|
|
58
|
+
// Resolve mint: explicit param > on-chain config > hardcoded fallback
|
|
59
|
+
let mintAddress;
|
|
60
|
+
if (params.mint) {
|
|
61
|
+
mintAddress = (0, kit_1.address)(params.mint);
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
64
|
+
try {
|
|
65
|
+
const configAccount = await (0, config_2.fetchConfig)(finalConfig.rpcUrl);
|
|
66
|
+
mintAddress = configAccount.data.atlasMint;
|
|
67
|
+
}
|
|
68
|
+
catch {
|
|
69
|
+
mintAddress = (0, kit_1.address)(addresses.atlasMint);
|
|
70
|
+
}
|
|
71
|
+
}
|
|
61
72
|
// Convert authority to TransactionSigner if provided
|
|
62
73
|
const authoritySigner = params.authority
|
|
63
74
|
? (0, signer_1.toTransactionSigner)(params.authority)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deleteConfig.js","sourceRoot":"","sources":["../../../src/instructions/deleteConfig.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;
|
|
1
|
+
{"version":3,"file":"deleteConfig.js","sourceRoot":"","sources":["../../../src/instructions/deleteConfig.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;AAgEH,oCAuDC;AArHD,qCAAoD;AACpD,mEAAmF;AACnF,4CAA4E;AAC5E,4CAA4E;AAC5E,wDAA4D;AAC5D,+CAAiD;AACjD,8CAA8C;AA2B9C;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACI,KAAK,UAAU,YAAY,CAChC,MAA0B,EAC1B,MAA2B;IAE3B,eAAe;IACf,MAAM,WAAW,GAAG,IAAA,oBAAW,EAAC,MAAM,CAAC,CAAC;IAExC,iCAAiC;IACjC,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,MAAM,CAAC,CAAC;IAEvC,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC,KAAK,KAAK,WAAW,EAAE,CAAC;QACxD,MAAM,IAAI,KAAK,CAAC,kCAAkC,SAAS,CAAC,KAAK,+CAA+C,CAAC,CAAC;IACpH,CAAC;IAED,MAAM,cAAc,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,sEAAsE;IACtE,IAAI,WAAoB,CAAC;IACzB,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAChB,WAAW,GAAG,IAAA,aAAO,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YACH,MAAM,aAAa,GAAG,MAAM,IAAA,oBAAW,EAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YAC5D,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC;QAC7C,CAAC;QAAC,MAAM,CAAC;YACP,WAAW,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,SAAoB,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;IAED,qDAAqD;IACrD,MAAM,eAAe,GAAG,MAAM,CAAC,SAAS;QACtC,CAAC,CAAC,IAAA,4BAAmB,EAAC,MAAM,CAAC,SAAS,CAAC;QACvC,CAAC,CAAC,SAAS,CAAC;IAEd,6CAA6C;IAC7C,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,GAAG,MAAM,IAAA,sBAAW,EACpD,cAAc,EACd,WAAW,CACZ,CAAC;IAEF,oCAAoC;IACpC,MAAM,cAAc,GAAG,MAAM,IAAA,8CAA+B,EAC1D;QACE,SAAS,EAAE,eAAe;QAC1B,KAAK;QACL,iBAAiB;QACjB,IAAI,EAAE,WAAW;KAClB,EACD,EAAE,cAAc,EAAE,CACnB,CAAC;IAEF,OAAO,IAAA,kCAAmB,EAAC,cAAc,EAAE;QACzC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,SAAS,EAAE,WAAW,CAAC,SAAS;KACjC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* @module instructions
|
|
5
5
|
*/
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
-
exports.updateAffiliate = exports.removeAffiliate = exports.approveAffiliate = exports.createAffiliate = exports.deleteConfig = exports.updateConfig = exports.createConfig = exports.
|
|
7
|
+
exports.updateAffiliate = exports.removeAffiliate = exports.approveAffiliate = exports.createAffiliate = exports.deleteConfig = exports.updateConfig = exports.createConfig = exports.ownerUpdate = exports.ownerClaim = exports.updateBorrower = exports.claimBorrower = exports.claimRental = exports.deleteRental = exports.reserveRental = exports.invalidateRental = exports.releaseRental = exports.closeRental = exports.cancelRental = exports.acceptRental = exports.setDelegate = exports.deleteContract = exports.closeContract = exports.updateContract = exports.createContract = void 0;
|
|
8
8
|
var createContract_1 = require("./createContract");
|
|
9
9
|
Object.defineProperty(exports, "createContract", { enumerable: true, get: function () { return createContract_1.createContract; } });
|
|
10
10
|
var updateContract_1 = require("./updateContract");
|
|
@@ -31,18 +31,14 @@ var deleteRental_1 = require("./deleteRental");
|
|
|
31
31
|
Object.defineProperty(exports, "deleteRental", { enumerable: true, get: function () { return deleteRental_1.deleteRental; } });
|
|
32
32
|
var claimRental_1 = require("./claimRental");
|
|
33
33
|
Object.defineProperty(exports, "claimRental", { enumerable: true, get: function () { return claimRental_1.claimRental; } });
|
|
34
|
-
var claimContractPayments_1 = require("./claimContractPayments");
|
|
35
|
-
Object.defineProperty(exports, "claimContractPayments", { enumerable: true, get: function () { return claimContractPayments_1.claimContractPayments; } });
|
|
36
34
|
var claimBorrower_1 = require("./claimBorrower");
|
|
37
35
|
Object.defineProperty(exports, "claimBorrower", { enumerable: true, get: function () { return claimBorrower_1.claimBorrower; } });
|
|
38
|
-
var closeBorrower_1 = require("./closeBorrower");
|
|
39
|
-
Object.defineProperty(exports, "closeBorrower", { enumerable: true, get: function () { return closeBorrower_1.closeBorrower; } });
|
|
40
36
|
var updateBorrower_1 = require("./updateBorrower");
|
|
41
37
|
Object.defineProperty(exports, "updateBorrower", { enumerable: true, get: function () { return updateBorrower_1.updateBorrower; } });
|
|
42
|
-
var
|
|
43
|
-
Object.defineProperty(exports, "
|
|
44
|
-
var
|
|
45
|
-
Object.defineProperty(exports, "
|
|
38
|
+
var ownerClaim_1 = require("./ownerClaim");
|
|
39
|
+
Object.defineProperty(exports, "ownerClaim", { enumerable: true, get: function () { return ownerClaim_1.ownerClaim; } });
|
|
40
|
+
var ownerUpdate_1 = require("./ownerUpdate");
|
|
41
|
+
Object.defineProperty(exports, "ownerUpdate", { enumerable: true, get: function () { return ownerUpdate_1.ownerUpdate; } });
|
|
46
42
|
var createConfig_1 = require("./createConfig");
|
|
47
43
|
Object.defineProperty(exports, "createConfig", { enumerable: true, get: function () { return createConfig_1.createConfig; } });
|
|
48
44
|
var updateConfig_1 = require("./updateConfig");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/instructions/index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,mDAA6E;AAApE,gHAAA,cAAc,OAAA;AACvB,mDAA6E;AAApE,gHAAA,cAAc,OAAA;AACvB,iDAA0E;AAAjE,8GAAA,aAAa,OAAA;AACtB,mDAA6E;AAApE,gHAAA,cAAc,OAAA;AACvB,6CAAoE;AAA3D,0GAAA,WAAW,OAAA;AACpB,+CAAuE;AAA9D,4GAAA,YAAY,OAAA;AACrB,+CAAuE;AAA9D,4GAAA,YAAY,OAAA;AACrB,6CAAoE;AAA3D,0GAAA,WAAW,OAAA;AACpB,iDAA0E;AAAjE,8GAAA,aAAa,OAAA;AACtB,uDAAmF;AAA1E,oHAAA,gBAAgB,OAAA;AACzB,iDAA0E;AAAjE,8GAAA,aAAa,OAAA;AACtB,+CAAuE;AAA9D,4GAAA,YAAY,OAAA;AACrB,6CAAoE;AAA3D,0GAAA,WAAW,OAAA;AACpB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/instructions/index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAEH,mDAA6E;AAApE,gHAAA,cAAc,OAAA;AACvB,mDAA6E;AAApE,gHAAA,cAAc,OAAA;AACvB,iDAA0E;AAAjE,8GAAA,aAAa,OAAA;AACtB,mDAA6E;AAApE,gHAAA,cAAc,OAAA;AACvB,6CAAoE;AAA3D,0GAAA,WAAW,OAAA;AACpB,+CAAuE;AAA9D,4GAAA,YAAY,OAAA;AACrB,+CAAuE;AAA9D,4GAAA,YAAY,OAAA;AACrB,6CAAoE;AAA3D,0GAAA,WAAW,OAAA;AACpB,iDAA0E;AAAjE,8GAAA,aAAa,OAAA;AACtB,uDAAmF;AAA1E,oHAAA,gBAAgB,OAAA;AACzB,iDAA0E;AAAjE,8GAAA,aAAa,OAAA;AACtB,+CAAuE;AAA9D,4GAAA,YAAY,OAAA;AACrB,6CAAoE;AAA3D,0GAAA,WAAW,OAAA;AACpB,iDAA0E;AAAjE,8GAAA,aAAa,OAAA;AACtB,mDAA6E;AAApE,gHAAA,cAAc,OAAA;AACvB,2CAAiE;AAAxD,wGAAA,UAAU,OAAA;AACnB,6CAAoE;AAA3D,0GAAA,WAAW,OAAA;AACpB,+CAAuE;AAA9D,4GAAA,YAAY,OAAA;AACrB,+CAAuE;AAA9D,4GAAA,YAAY,OAAA;AACrB,+CAAuE;AAA9D,4GAAA,YAAY,OAAA;AACrB,qDAAgF;AAAvE,kHAAA,eAAe,OAAA;AACxB,uDAAmF;AAA1E,oHAAA,gBAAgB,OAAA;AACzB,qDAAgF;AAAvE,kHAAA,eAAe,OAAA;AACxB,qDAAgF;AAAvE,kHAAA,eAAe,OAAA"}
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @purpose Simplified ownerClaim instruction wrapper
|
|
4
|
+
*
|
|
5
|
+
* Thin convenience wrapper around Codama-generated claimOwner instruction.
|
|
6
|
+
* Allows owners to claim accumulated ATLAS from their managed token account.
|
|
7
|
+
*/
|
|
8
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
exports.ownerClaim = ownerClaim;
|
|
10
|
+
const kit_1 = require("@solana/kit");
|
|
11
|
+
const instructions_1 = require("../generated/codama/instructions");
|
|
12
|
+
const config_1 = require("../utils/config");
|
|
13
|
+
const signer_1 = require("../utils/signer");
|
|
14
|
+
const instructions_2 = require("../utils/instructions");
|
|
15
|
+
const config_2 = require("../accounts/config");
|
|
16
|
+
const contract_1 = require("../accounts/contract");
|
|
17
|
+
/**
|
|
18
|
+
* Claim owner ATLAS earnings
|
|
19
|
+
*
|
|
20
|
+
* Owners accumulate ATLAS in their managed token account (ATA with ownerState as authority)
|
|
21
|
+
* from rental payments. This instruction transfers claimable ATLAS (balance minus reserved
|
|
22
|
+
* amounts across all contracts) to the owner's personal wallet.
|
|
23
|
+
*
|
|
24
|
+
* Automatically fetches all owner contracts to provide as remaining_accounts
|
|
25
|
+
* for accurate reserved_atlas calculation.
|
|
26
|
+
*
|
|
27
|
+
* @param params - Owner claim parameters
|
|
28
|
+
* @param config - Optional SDK configuration overrides
|
|
29
|
+
* @returns Kit instruction (or web3.js if PublicKey in config)
|
|
30
|
+
*
|
|
31
|
+
* @example
|
|
32
|
+
* ```typescript
|
|
33
|
+
* // Claim accumulated ATLAS
|
|
34
|
+
* const ix = await ownerClaim({
|
|
35
|
+
* owner: ownerWallet
|
|
36
|
+
* });
|
|
37
|
+
*
|
|
38
|
+
* // Claim and close OwnerState (no active contracts)
|
|
39
|
+
* const ix2 = await ownerClaim({
|
|
40
|
+
* owner: ownerWallet,
|
|
41
|
+
* close: true
|
|
42
|
+
* });
|
|
43
|
+
* ```
|
|
44
|
+
*/
|
|
45
|
+
async function ownerClaim(params, config) {
|
|
46
|
+
// Merge config
|
|
47
|
+
const finalConfig = (0, config_1.mergeConfig)(config);
|
|
48
|
+
// Validate required params
|
|
49
|
+
if (!params.owner) {
|
|
50
|
+
throw new Error('owner is required');
|
|
51
|
+
}
|
|
52
|
+
// Convert owner to transaction signer (payer)
|
|
53
|
+
const payerSigner = (0, signer_1.toTransactionSigner)(params.owner);
|
|
54
|
+
// Determine the owner address (may differ from payer for operator pattern)
|
|
55
|
+
const ownerAddr = params.ownerAddress
|
|
56
|
+
? (0, kit_1.address)(params.ownerAddress)
|
|
57
|
+
: (0, signer_1.getSignerAddress)(params.owner);
|
|
58
|
+
// Get atlasMint from on-chain config
|
|
59
|
+
const configAccount = await (0, config_2.fetchConfig)(finalConfig.rpcUrl);
|
|
60
|
+
const atlasMint = configAccount.data.atlasMint;
|
|
61
|
+
const addresses = (0, config_1.getAddresses)(config);
|
|
62
|
+
const programAddress = (0, kit_1.address)(addresses.srsly);
|
|
63
|
+
// Build remaining accounts (contracts for reserved_atlas calculation)
|
|
64
|
+
let remainingAccounts = [];
|
|
65
|
+
if (params.close) {
|
|
66
|
+
// When closing, pass no remaining_accounts (asserts no contracts exist)
|
|
67
|
+
remainingAccounts = [];
|
|
68
|
+
}
|
|
69
|
+
else if (params.contracts) {
|
|
70
|
+
// Use explicitly provided contracts
|
|
71
|
+
remainingAccounts = params.contracts.map(c => ({
|
|
72
|
+
address: (0, kit_1.address)(c),
|
|
73
|
+
role: 0, // ReadonlyAccount
|
|
74
|
+
}));
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
// Auto-fetch all contracts owned by this owner
|
|
78
|
+
try {
|
|
79
|
+
const allContracts = await (0, contract_1.fetchAllContracts)(finalConfig.rpcUrl);
|
|
80
|
+
remainingAccounts = allContracts
|
|
81
|
+
.filter(c => c.data.owner === ownerAddr)
|
|
82
|
+
.map(c => ({
|
|
83
|
+
address: c.address,
|
|
84
|
+
role: 0, // ReadonlyAccount
|
|
85
|
+
}));
|
|
86
|
+
}
|
|
87
|
+
catch {
|
|
88
|
+
// If fetch fails, proceed without remaining accounts
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
// Call Codama-generated instruction
|
|
92
|
+
const kitInstruction = await (0, instructions_1.getClaimOwnerInstructionAsync)({
|
|
93
|
+
payer: payerSigner,
|
|
94
|
+
owner: ownerAddr,
|
|
95
|
+
mint: atlasMint,
|
|
96
|
+
close: params.close ?? false,
|
|
97
|
+
}, { programAddress });
|
|
98
|
+
// Append remaining accounts (contract states for reserved_atlas)
|
|
99
|
+
if (remainingAccounts.length > 0) {
|
|
100
|
+
kitInstruction.accounts = [
|
|
101
|
+
...kitInstruction.accounts,
|
|
102
|
+
...remainingAccounts,
|
|
103
|
+
];
|
|
104
|
+
}
|
|
105
|
+
return (0, instructions_2.prepareInstructions)(kitInstruction, {
|
|
106
|
+
computeUnits: params.computeUnits,
|
|
107
|
+
PublicKey: finalConfig.PublicKey
|
|
108
|
+
});
|
|
109
|
+
}
|
|
110
|
+
//# sourceMappingURL=ownerClaim.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ownerClaim.js","sourceRoot":"","sources":["../../../src/instructions/ownerClaim.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @purpose Simplified ownerUpdate instruction wrapper
|
|
4
|
+
*
|
|
5
|
+
* Thin convenience wrapper around Codama-generated updateOwner instruction.
|
|
6
|
+
* Updates OwnerState authority (owner/operator transfer).
|
|
7
|
+
*/
|
|
8
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
exports.ownerUpdate = ownerUpdate;
|
|
10
|
+
const kit_1 = require("@solana/kit");
|
|
11
|
+
const instructions_1 = require("../generated/codama/instructions");
|
|
12
|
+
const config_1 = require("../utils/config");
|
|
13
|
+
const signer_1 = require("../utils/signer");
|
|
14
|
+
const instructions_2 = require("../utils/instructions");
|
|
15
|
+
const srsly_1 = require("../pda/srsly");
|
|
16
|
+
/**
|
|
17
|
+
* Update OwnerState authority
|
|
18
|
+
*
|
|
19
|
+
* Transfers the OwnerState authority to a new address. This enables the
|
|
20
|
+
* owner vs. operator pattern where the owner can delegate claim operations
|
|
21
|
+
* to an operator without giving up ownership.
|
|
22
|
+
*
|
|
23
|
+
* @param params - Owner update parameters
|
|
24
|
+
* @param config - Optional SDK configuration overrides
|
|
25
|
+
* @returns Kit instruction (or web3.js if PublicKey in config)
|
|
26
|
+
*
|
|
27
|
+
* @example
|
|
28
|
+
* ```typescript
|
|
29
|
+
* // Transfer authority to operator
|
|
30
|
+
* const ix = await ownerUpdate({
|
|
31
|
+
* authority: ownerWallet,
|
|
32
|
+
* owner: ownerWallet.address,
|
|
33
|
+
* newAuthority: "OPERATOR_ADDRESS"
|
|
34
|
+
* });
|
|
35
|
+
* ```
|
|
36
|
+
*/
|
|
37
|
+
async function ownerUpdate(params, config) {
|
|
38
|
+
// Merge config
|
|
39
|
+
const finalConfig = (0, config_1.mergeConfig)(config);
|
|
40
|
+
// Validate required params
|
|
41
|
+
if (!params.authority) {
|
|
42
|
+
throw new Error('authority is required');
|
|
43
|
+
}
|
|
44
|
+
if (!params.owner) {
|
|
45
|
+
throw new Error('owner is required');
|
|
46
|
+
}
|
|
47
|
+
if (!params.newAuthority) {
|
|
48
|
+
throw new Error('newAuthority is required');
|
|
49
|
+
}
|
|
50
|
+
// Convert authority to transaction signer
|
|
51
|
+
const authoritySigner = (0, signer_1.toTransactionSigner)(params.authority);
|
|
52
|
+
// Get network-specific addresses
|
|
53
|
+
const addresses = (0, config_1.getAddresses)(config);
|
|
54
|
+
const programAddress = (0, kit_1.address)(addresses.srsly);
|
|
55
|
+
// Derive ownerState PDA from owner address
|
|
56
|
+
const ownerState = await (0, srsly_1.deriveOwnerState)(params.owner);
|
|
57
|
+
// Call Codama-generated instruction (sync - no PDA derivation needed)
|
|
58
|
+
const kitInstruction = (0, instructions_1.getUpdateOwnerInstruction)({
|
|
59
|
+
authority: authoritySigner,
|
|
60
|
+
ownerState,
|
|
61
|
+
newAuthority: (0, kit_1.address)(params.newAuthority),
|
|
62
|
+
}, { programAddress });
|
|
63
|
+
return (0, instructions_2.prepareInstructions)(kitInstruction, {
|
|
64
|
+
computeUnits: params.computeUnits,
|
|
65
|
+
PublicKey: finalConfig.PublicKey
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
//# sourceMappingURL=ownerUpdate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ownerUpdate.js","sourceRoot":"","sources":["../../../src/instructions/ownerUpdate.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AA0DH,kCA0CC;AAlGD,qCAAoD;AACpD,mEAA6E;AAC7E,4CAA4E;AAC5E,4CAA8F;AAC9F,wDAA4D;AAC5D,wCAAgD;AA8BhD;;;;;;;;;;;;;;;;;;;;GAoBG;AACI,KAAK,UAAU,WAAW,CAC/B,MAAyB,EACzB,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,KAAK,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC9C,CAAC;IAED,0CAA0C;IAC1C,MAAM,eAAe,GAAG,IAAA,4BAAmB,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAE9D,iCAAiC;IACjC,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,MAAM,CAAC,CAAC;IACvC,MAAM,cAAc,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,2CAA2C;IAC3C,MAAM,UAAU,GAAG,MAAM,IAAA,wBAAgB,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAExD,sEAAsE;IACtE,MAAM,cAAc,GAAG,IAAA,wCAAyB,EAC9C;QACE,SAAS,EAAE,eAAe;QAC1B,UAAU;QACV,YAAY,EAAE,IAAA,aAAO,EAAC,MAAM,CAAC,YAAuB,CAAC;KACtD,EACD,EAAE,cAAc,EAAE,CACnB,CAAC;IAEF,OAAO,IAAA,kCAAmB,EAAC,cAAc,EAAE;QACzC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,SAAS,EAAE,WAAW,CAAC,SAAS;KACjC,CAAC,CAAC;AACL,CAAC"}
|