[Hackathon] Subscription service contract #98
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,58 +19,48 @@ | |
| */ | ||
| // @ts-check | ||
|
|
||
| import { Far, E } from '@endo/far'; | ||
| import { AmountMath, AssetKind } from '@agoric/ertp/src/amountMath.js'; | ||
| import { makeCopyBag, M } from '@endo/patterns'; | ||
| import { atomicRearrange } from '@agoric/zoe/src/contractSupport/atomicTransfer.js'; | ||
| import '@agoric/zoe/exported.js'; | ||
|
|
||
| /** | ||
| * In addition to the standard `issuers` and `brands` terms, | ||
| * this contract is parameterized by terms for price and, | ||
| * optionally, a maximum number of items sold for that price (default: 3). | ||
| * | ||
| * @typedef {{ | ||
| * timerService: any; | ||
| * subscriptionPrice: Amount; | ||
| * subscriptionPeriod?: string; | ||
| * servicesToAvail?: Array<string>; | ||
| * }} SubscriptionServiceTerms | ||
| */ | ||
|
|
||
| /** | ||
| * Start a contract that | ||
| * - creates a new non-fungible asset type for Items, and | ||
| * - handles offers to buy up to `maxItems` items at a time. | ||
| * | ||
| * @param {ZCF<SubscriptionServiceTerms>} zcf | ||
| */ | ||
| export const start = async zcf => { | ||
| const { | ||
| timerService, | ||
|
There was a problem hiding this comment. The timer service is sufficiently powerful that it should be closely held; i.e. passed in privateArgs rather than terms. See also: |
||
| subscriptionPrice, | ||
| subscriptionPeriod = 'MONTHLY', | ||
| servicesToAvail = ['Netflix', 'Amazon', 'HboMax', 'Disney'], | ||
| } = zcf.getTerms(); | ||
|
|
||
| const subscriptionResources = {}; | ||
|
|
||
| servicesToAvail.forEach(element => { | ||
| subscriptionResources[element] = [ | ||
| `${element}_Movie_1`, | ||
| `${element}_Movie_2`, | ||
| ]; | ||
| }); | ||
|
|
||
| /** | ||
| * a new ERTP mint for items, accessed thru the Zoe Contract Facet. | ||
|
|
@@ -81,7 +71,8 @@ | |
| * amounts such as: 3 potions and 1 map. | ||
| */ | ||
| const itemMint = await zcf.makeZCFMint('Item', AssetKind.COPY_BAG); | ||
|
|
||
| const { brand } = itemMint.getIssuerRecord(); | ||
|
|
||
| /** | ||
| * a pattern to constrain proposals given to {@link tradeHandler} | ||
|
|
@@ -90,36 +81,47 @@ | |
| * The `Items` amount must use the `Item` brand and a bag value. | ||
| */ | ||
| const proposalShape = harden({ | ||
| give: { Price: M.eq(subscriptionPrice) }, | ||
| want: { Items: { brand: M.any(), value: M.bag() } }, | ||
|
|
||
| exit: M.any(), | ||
| }); | ||
|
|
||
| /** a seat for allocating proceeds of sales */ | ||
| const proceeds = zcf.makeEmptySeatKit().zcfSeat; | ||
|
|
||
| const subscriptions = new Map(); | ||
|
|
||
| /** @type {OfferHandler} */ | ||
| const tradeHandler = async (buyerSeat, offerArgs) => { | ||
| // @ts-ignore | ||
| const userAddress = offerArgs.userAddress; | ||
|
There was a problem hiding this comment. what's the goal here? |
||
| // @ts-ignore | ||
| const serviceType = offerArgs.serviceType; | ||
| const currentTimeRecord = await E(timerService).getCurrentTimestamp(); | ||
|
|
||
| const amountObject = AmountMath.make( | ||
| brand, | ||
| makeCopyBag([[{ serviceStarted: currentTimeRecord, serviceType }, 1n]]), | ||
| ); | ||
| const want = { Items: amountObject }; | ||
|
|
||
| const newSubscription = itemMint.mintGains(want); | ||
|
|
||
| atomicRearrange( | ||
| zcf, | ||
| harden([ | ||
| // price from buyer to proceeds | ||
| [buyerSeat, proceeds, { Price: subscriptionPrice }], | ||
| // new items to buyer | ||
| [newSubscription, buyerSeat, want], | ||
| ]), | ||
| ); | ||
|
|
||
| subscriptions.set(userAddress, want.Items); | ||
|
|
||
| buyerSeat.exit(true); | ||
| newSubscription.exit(); | ||
| return 'Subscription Granted'; | ||
| }; | ||
|
|
||
| /** | ||
|
|
@@ -130,11 +132,42 @@ | |
| * - want: `Items` | ||
| */ | ||
| const makeTradeInvitation = () => | ||
| zcf.makeInvitation( | ||
| tradeHandler, | ||
| 'buy subscription', | ||
| undefined, | ||
| proposalShape, | ||
| ); | ||
|
|
||
| const isSubscriptionValid = userSubscription => { | ||
| if (!userSubscription || !userSubscription.value.payload) return false; | ||
|
|
||
| const serviceStarted = userSubscription.value.payload[0][0].serviceStarted; | ||
|
|
||
| // Here we'll check with current time from time service. | ||
| if (!serviceStarted || serviceStarted !== '123') return false; | ||
| return true; | ||
| // | ||
| }; | ||
|
|
||
| const getSubscriptionResources = userAddress => { | ||
| const userSubscription = subscriptions.get(userAddress); | ||
|
|
||
| const isValidSub = isSubscriptionValid(userSubscription); | ||
| if (isValidSub) { | ||
| // User has a valid subscription, return the resources | ||
| const serviceType = userSubscription.value.payload[0][0].serviceType; | ||
| return subscriptionResources[serviceType]; | ||
| } else { | ||
| // User doesn't have a valid subscription | ||
| return 'Access denied: You do not have a valid subscription.'; | ||
|
There was a problem hiding this comment. @samsiegart what was the hackathon project you worked on where services would look for NFTs in wallets (using vstorage queries) to gate access? Ah... right... https://github.com/agoric-labs/agoric-passport-express |
||
| } | ||
| }; | ||
|
|
||
| // Mark the publicFacet Far, i.e. reachable from outside the contract | ||
| const publicFacet = Far('Items Public Facet', { | ||
| makeTradeInvitation, | ||
| getSubscriptionResources, | ||
| }); | ||
| return harden({ publicFacet }); | ||
| }; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
dapp dependencies are, unfortunately, tremendously fragile. Mixing u12 and u16 is asking for trouble, IME.
We should probably have a better scoped issue, but the tale of woe is in...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tried rolling back to the u12 version of
@agoric/time(60e2308) but the symptoms remain.