Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: set allowance per provider #2776

Merged
merged 7 commits into from
Oct 3, 2023
Merged

feat: set allowance per provider #2776

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b92cd70
feat: set allowance per provider
pavanjoshi914 Sep 25, 2023
5693a46
feat: setup array properly
pavanjoshi914 Sep 27, 2023
6c019b8
feat: resolve test errors
pavanjoshi914 Sep 27, 2023
0b17f69
feat: just assign set value directly to the enabledFor object
pavanjoshi914 Sep 29, 2023
d2f81e6
chore: use shorthand syntax
pavanjoshi914 Sep 29, 2023
3a89af9
chore: remove unnecessary checks
rolznz Oct 3, 2023
2d7389a
Merge branch 'master' into allowance-per-provider
rolznz Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/extension/background-script/actions/alby/enable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ const enable = async (message: MessageAllowanceEnable, sender: Sender) => {
.equalsIgnoreCase(host)
.first();

if (isUnlocked && allowance && allowance.enabled) {
const enabledFor = new Set(allowance?.enabledFor);

if (isUnlocked && allowance && allowance.enabled && enabledFor.has("alby")) {
return {
data: { enabled: true },
};
Expand All @@ -38,8 +40,14 @@ const enable = async (message: MessageAllowanceEnable, sender: Sender) => {
if (!allowance.id) {
return { data: { error: "id is missing" } };
}

if (!enabledFor.has("alby")) {
pavanjoshi914 marked this conversation as resolved.
Show resolved Hide resolved
enabledFor.add("alby");
}

await db.allowances.update(allowance.id, {
enabled: true,
enabledFor: enabledFor,
name: message.origin.name,
imageURL: message.origin.icon,
});
Expand All @@ -49,6 +57,7 @@ const enable = async (message: MessageAllowanceEnable, sender: Sender) => {
name: message.origin.name,
imageURL: message.origin.icon,
enabled: true,
enabledFor: ["alby"],
lastPaymentAt: 0,
totalBudget: 0,
remainingBudget: 0,
Expand Down
1 change: 1 addition & 0 deletions src/extension/background-script/actions/allowances/__tests__/delete.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ describe("delete allowance", () => {
id: 1,
imageURL: "https://pro.kollider.xyz/favicon.ico",
lastPaymentAt: 0,
enabledFor: ["webln"],
lnurlAuth: true,
name: "pro kollider",
remainingBudget: 500,
Expand Down
16 changes: 15 additions & 1 deletion src/extension/background-script/actions/liquid/enable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,15 @@ const enable = async (message: MessageAllowanceEnable, sender: Sender) => {
.equalsIgnoreCase(host)
.first();

if (isUnlocked && allowance && allowance.enabled && account?.mnemonic) {
const enabledFor = new Set(allowance?.enabledFor);

if (
isUnlocked &&
allowance &&
allowance.enabled &&
account?.mnemonic &&
enabledFor.has("liquid")
) {
return {
data: { enabled: true },
};
Expand All @@ -39,8 +47,13 @@ const enable = async (message: MessageAllowanceEnable, sender: Sender) => {
if (!allowance.id) {
return { data: { error: "id is missing" } };
}

if (!enabledFor.has("liquid")) {
enabledFor.add("liquid");
}
await db.allowances.update(allowance.id, {
enabled: true,
enabledFor: enabledFor,
name: message.origin.name,
imageURL: message.origin.icon,
});
Expand All @@ -50,6 +63,7 @@ const enable = async (message: MessageAllowanceEnable, sender: Sender) => {
name: message.origin.name,
imageURL: message.origin.icon,
enabled: true,
enabledFor: ["liquid"],
lastPaymentAt: 0,
totalBudget: 0,
remainingBudget: 0,
Expand Down
11 changes: 10 additions & 1 deletion src/extension/background-script/actions/nostr/enable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,14 @@ const enable = async (message: MessageAllowanceEnable, sender: Sender) => {
.equalsIgnoreCase(host)
.first();

const enabledFor = new Set(allowance?.enabledFor);

if (
isUnlocked &&
allowance &&
allowance.enabled &&
account?.nostrPrivateKey
account?.nostrPrivateKey &&
enabledFor.has("nostr")
) {
return {
data: { enabled: true },
Expand All @@ -45,8 +48,13 @@ const enable = async (message: MessageAllowanceEnable, sender: Sender) => {
if (!allowance.id) {
return { data: { error: "id is missing" } };
}

if (!enabledFor.has("nostr")) {
enabledFor.add("nostr");
}
await db.allowances.update(allowance.id, {
enabled: true,
enabledFor: enabledFor,
name: message.origin.name,
imageURL: message.origin.icon,
});
Expand All @@ -55,6 +63,7 @@ const enable = async (message: MessageAllowanceEnable, sender: Sender) => {
host: host,
name: message.origin.name,
imageURL: message.origin.icon,
enabledFor: ["nostr"],
enabled: true,
lastPaymentAt: 0,
totalBudget: 0,
Expand Down
16 changes: 15 additions & 1 deletion src/extension/background-script/actions/webbtc/enable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,15 @@ const enable = async (message: MessageAllowanceEnable, sender: Sender) => {
.equalsIgnoreCase(host)
.first();

if (isUnlocked && allowance && allowance.enabled && account?.mnemonic) {
const enabledFor = new Set(allowance?.enabledFor);

if (
isUnlocked &&
allowance &&
allowance.enabled &&
account?.mnemonic &&
enabledFor.has("webbtc")
) {
return {
data: { enabled: true },
};
Expand All @@ -39,8 +47,13 @@ const enable = async (message: MessageAllowanceEnable, sender: Sender) => {
if (!allowance.id) {
return { data: { error: "id is missing" } };
}

if (!enabledFor.has("webbtc")) {
enabledFor.add("webbtc");
}
await db.allowances.update(allowance.id, {
enabled: true,
enabledFor: enabledFor,
name: message.origin.name,
imageURL: message.origin.icon,
});
Expand All @@ -50,6 +63,7 @@ const enable = async (message: MessageAllowanceEnable, sender: Sender) => {
name: message.origin.name,
imageURL: message.origin.icon,
enabled: true,
enabledFor: ["webbtc"],
lastPaymentAt: 0,
totalBudget: 0,
remainingBudget: 0,
Expand Down
10 changes: 9 additions & 1 deletion src/extension/background-script/actions/webln/enable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ const enable = async (message: MessageAllowanceEnable, sender: Sender) => {
.equalsIgnoreCase(host)
.first();

if (isUnlocked && allowance && allowance.enabled) {
const enabledFor = new Set(allowance?.enabledFor);

if (isUnlocked && allowance && allowance.enabled && enabledFor.has("webln")) {
return {
data: { enabled: true },
};
Expand All @@ -38,8 +40,13 @@ const enable = async (message: MessageAllowanceEnable, sender: Sender) => {
if (!allowance.id) {
return { data: { error: "id is missing" } };
}

if (!enabledFor.has("webln")) {
enabledFor.add("webln");
}
await db.allowances.update(allowance.id, {
enabled: true,
enabledFor: enabledFor,
name: message.origin.name,
imageURL: message.origin.icon,
});
Expand All @@ -49,6 +56,7 @@ const enable = async (message: MessageAllowanceEnable, sender: Sender) => {
name: message.origin.name,
imageURL: message.origin.icon,
enabled: true,
enabledFor: ["webln"],
lastPaymentAt: 0,
totalBudget: 0,
remainingBudget: 0,
Expand Down
5 changes: 5 additions & 0 deletions src/extension/background-script/db.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ export class DB extends Dexie {
payments:
"++id,accountId,allowanceId,host,location,name,description,totalAmount,totalFees,preimage,paymentRequest,paymentHash,destination,createdAt",
});
this.version(6).stores({
allowances:
"++id,&host,name,imageURL,tag,enabled,*enabledFor,totalBudget,remainingBudget,lastPaymentAt,lnurlAuth,createdAt",
});

this.on("ready", this.loadFromStorage.bind(this));
this.allowances = this.table("allowances");
this.payments = this.table("payments");
Expand Down
1 change: 1 addition & 0 deletions src/fixtures/allowances.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export const allowanceFixture: DbAllowance[] = [
id: 1,
imageURL: "https://pro.kollider.xyz/favicon.ico",
lastPaymentAt: 0,
enabledFor: ["webln"],
lnurlAuth: true,
name: "pro kollider",
remainingBudget: 500,
Expand Down
1 change: 1 addition & 0 deletions src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,6 +806,7 @@ export interface Blocklist extends DbBlocklist {}

export interface DbAllowance {
createdAt: string;
enabledFor?: string[];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what about providers? is there any downside of this name? I feel like it's more specific

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

allowance are set not just by provider. but also during the payments. for eg. while doing a lnurl-pay to the website, in future we might add some other entries there as well, isn't it good to keep it generalized. so that it can hold any kind of entries

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bumi @reneaaron do you have any thoughts here? currently we have enable screens for providers

enabled: boolean;
host: string;
id?: number;
Expand Down
Loading