@powerhousedao/contributor-billing 0.0.8 → 0.0.9

package/dist/scripts/invoice/gnosisTransactionBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gnosisTransactionBuilder.d.ts","sourceRoot":"","sources":["../../../scripts/invoice/gnosisTransactionBuilder.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,SAAS,CAAC;IACjB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,IAAI,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,aAAa,EAAE,CAAC;CACjC;AAGD,iBAAe,uBAAuB,CACpC,WAAW,EAAE,WAAW,EACxB,mBAAmB,EAAE,aAAa,GAAG,aAAa,EAAE,GACnD,OAAO,CAAC,cAAc,CAAC,CAkFzB;AAED,OAAO,EAAE,uBAAuB,EAAE,CAAA"}
+{"version":3,"file":"gnosisTransactionBuilder.d.ts","sourceRoot":"","sources":["../../../scripts/invoice/gnosisTransactionBuilder.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,SAAS,CAAC;IACjB,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,IAAI,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,aAAa,EAAE,CAAC;CACjC;AA6BD,iBAAe,uBAAuB,CACpC,SAAS,EAAE,MAAM,EACjB,mBAAmB,EAAE,aAAa,GAAG,aAAa,EAAE,GACnD,OAAO,CAAC,cAAc,CAAC,CAqFzB;AAED,OAAO,EAAE,uBAAuB,EAAE,CAAA"}

package/dist/scripts/invoice/gnosisTransactionBuilder.js

@@ -4,8 +4,33 @@ import { OperationType } from '@safe-global/types-kit';
 import { ethers, AbiCoder } from 'ethers';
 import dotenv from 'dotenv';
 dotenv.config();
+const safeAddress = process.env.DEV_STAGING_SAFE_ADDRESS;
+if (!safeAddress) {
+    throw new Error('Missing SAFE_ADDRESS in .env');
+}
+const payerWallets = {
+    BASE: {
+        rpc: "https://base.llamarpc.com",
+        chainName: "Base",
+        chainId: "8453",
+        address: safeAddress, // Safe address
+    },
+    ETHEREUM: {
+        rpc: "https://eth.llamarpc.com",
+        chainName: "Ethereum",
+        chainId: "1",
+        address: safeAddress, // Safe address
+    },
+    "ARBITRUM ONE": {
+        rpc: "https://arb1.arbitrum.io/rpc",
+        chainName: "Arbitrum One",
+        chainId: "42161",
+        address: safeAddress, // Safe address
+    },
+};
 // --- Implementation ---
-async function executeTransferProposal(payerWallet, paymentDetailsInput) {
+async function executeTransferProposal(chainName, paymentDetailsInput) {
+    const payerWallet = payerWallets[chainName.toUpperCase()];
     const paymentDetails = Array.isArray(paymentDetailsInput)
         ? paymentDetailsInput
         : [paymentDetailsInput];

package/dist/style.css

@@ -406,6 +406,9 @@
   .flex-1 {
     flex: 1;
   }
+  .table-fixed {
+    table-layout: fixed;
+  }
   .border-collapse {
     border-collapse: collapse;
   }
@@ -448,6 +451,9 @@
   .justify-center {
     justify-content: center;
   }
+  .justify-end {
+    justify-content: flex-end;
+  }
   .gap-2 {
     gap: calc(var(--spacing) * 2);
   }
@@ -607,6 +613,9 @@
   .bg-yellow-100 {
     background-color: var(--color-yellow-100);
   }
+  .p-2 {
+    padding: calc(var(--spacing) * 2);
+  }
   .p-3 {
     padding: calc(var(--spacing) * 3);
   }
@@ -655,6 +664,10 @@
   .font-mono {
     font-family: var(--font-mono);
   }
+  .text-2xl {
+    font-size: var(--text-2xl);
+    line-height: var(--tw-leading, var(--text-2xl--line-height));
+  }
   .text-3xl {
     font-size: var(--text-3xl);
     line-height: var(--tw-leading, var(--text-3xl--line-height));

package/dist/subgraphs/invoice/customResolvers.d.ts

@@ -1,6 +1,6 @@
 declare let pendingTransactions: Record<string, {
     invoiceNo: string;
-    payerWallet: any;
+    chainName: string;
     paymentDetails: any;
     timestamp: number;
 }>;

package/dist/subgraphs/invoice/customResolvers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"customResolvers.d.ts","sourceRoot":"","sources":["../../../subgraphs/invoice/customResolvers.ts"],"names":[],"mappings":"AAOA,QAAA,IAAI,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,GAAG,CAAC;IACjB,cAAc,EAAE,GAAG,CAAC;IACpB,SAAS,EAAE,MAAM,CAAA;CACpB,CAAM,CAAC;AAyBR,eAAO,MAAM,4BAA4B,GAAU,GAAG,GAAG,EAAE,MAAM,GAAG;;;;;;;;EA8CnE,CAAC;AAEF,eAAO,MAAM,mCAAmC,GAAU,GAAG,GAAG,EAAE,MAAM,GAAG;;;;;;;;;;;EAkC1E,CAAA;AAED,eAAO,MAAM,6BAA6B,GAAU,GAAG,GAAG,EAAE,MAAM,GAAG;;;;;;;;;;;;;;;;;EAsDpE,CAAA;AAGD,eAAO,MAAM,UAAU,GAAI,iBAAiB,GAAG,SAE9C,CAAC;AAGF,OAAO,EAAE,mBAAmB,EAAE,CAAC;AAG/B,eAAO,MAAM,6BAA6B,YAyBzC,CAAA;AAwCD,eAAO,MAAM,aAAa,GAAU,KAAK,GAAG,EAAE,KAAK,GAAG,iBAkJrD,CAAA"}
+{"version":3,"file":"customResolvers.d.ts","sourceRoot":"","sources":["../../../subgraphs/invoice/customResolvers.ts"],"names":[],"mappings":"AAOA,QAAA,IAAI,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,GAAG,CAAC;IACpB,SAAS,EAAE,MAAM,CAAA;CACpB,CAAM,CAAC;AAyBR,eAAO,MAAM,4BAA4B,GAAU,GAAG,GAAG,EAAE,MAAM,GAAG;;;;;;;;EA8CnE,CAAC;AAEF,eAAO,MAAM,mCAAmC,GAAU,GAAG,GAAG,EAAE,MAAM,GAAG;;;;;;;;;;;EAkC1E,CAAA;AAED,eAAO,MAAM,6BAA6B,GAAU,GAAG,GAAG,EAAE,MAAM,GAAG;;;;;;;;;;;;;;;;;EAsDpE,CAAA;AAGD,eAAO,MAAM,UAAU,GAAI,iBAAiB,GAAG,SAE9C,CAAC;AAGF,OAAO,EAAE,mBAAmB,EAAE,CAAC;AAG/B,eAAO,MAAM,6BAA6B,YAyBzC,CAAA;AAwCD,eAAO,MAAM,aAAa,GAAU,KAAK,GAAG,EAAE,KAAK,GAAG,iBAkJrD,CAAA"}

package/dist/subgraphs/invoice/customResolvers.js

@@ -12,16 +12,15 @@ const fileChunksMap = new Map();
 let reactor;
 export const Invoice_processGnosisPayment = async (_, args) => {
     try {
-        const { payerWallet, paymentDetails, invoiceNo } = args;
+        const { chainName, paymentDetails, invoiceNo } = args;
         // Cast payerWallet to any to access its properties
-        const typedPayerWallet = payerWallet;
         console.log("Processing gnosis payment:", {
-            payerWallet,
+            chainName,
             invoiceNo,
             paymentDetails
         });
         // Import and call the executeTransferProposal function
-        const result = await executeTransferProposal(payerWallet, paymentDetails);
+        const result = await executeTransferProposal(chainName, paymentDetails);
         console.log("Token transfer result:", result);
         // Store the transaction information for later matching with webhook
         if (result.success && result.txHash) {
@@ -30,7 +29,7 @@ export const Invoice_processGnosisPayment = async (_, args) => {
             // Store the transaction with all the details needed for matching
             pendingTransactions[transactionId] = {
                 invoiceNo,
-                payerWallet,
+                chainName,
                 paymentDetails,
                 timestamp: Date.now()
             };

package/dist/subgraphs/invoice/resolvers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolvers.d.ts","sourceRoot":"","sources":["../../../subgraphs/invoice/resolvers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAQ3D,eAAO,MAAM,YAAY,GAAI,UAAU,QAAQ,KAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CA6SnE,CAAC"}
+{"version":3,"file":"resolvers.d.ts","sourceRoot":"","sources":["../../../subgraphs/invoice/resolvers.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAQ3D,eAAO,MAAM,YAAY,GAAI,UAAU,QAAQ,KAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAyUnE,CAAC"}

package/dist/subgraphs/invoice/resolvers.js

@@ -99,11 +99,25 @@ export const getResolvers = (subgraph) => {
                 await reactor.addAction(driveId, docId, actions.deleteRef({ ...args.input }));
                 return doc.revision.global + 1;
             },
-            Invoice_setPaymentAccount: async (_, args) => {
+            Invoice_addPaymentAccount: async (_, args) => {
                 const driveId = args.driveId || DEFAULT_DRIVE_ID;
                 const docId = args.docId || "";
                 const doc = await reactor.getDocument(driveId, docId);
-                await reactor.addAction(driveId, docId, actions.setPaymentAccount({ ...args.input }));
+                await reactor.addAction(driveId, docId, actions.addPaymentAccount({ ...args.input }));
+                return doc.revision.global + 1;
+            },
+            Invoice_editPaymentAccount: async (_, args) => {
+                const driveId = args.driveId || DEFAULT_DRIVE_ID;
+                const docId = args.docId || "";
+                const doc = await reactor.getDocument(driveId, docId);
+                await reactor.addAction(driveId, docId, actions.editPaymentAccount({ ...args.input }));
+                return doc.revision.global + 1;
+            },
+            Invoice_deletePaymentAccount: async (_, args) => {
+                const driveId = args.driveId || DEFAULT_DRIVE_ID;
+                const docId = args.docId || "";
+                const doc = await reactor.getDocument(driveId, docId);
+                await reactor.addAction(driveId, docId, actions.deletePaymentAccount({ ...args.input }));
                 return doc.revision.global + 1;
             },
             Invoice_editIssuer: async (_, args) => {

package/dist/subgraphs/invoice/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../subgraphs/invoice/schema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,eAAO,MAAM,MAAM,EAAE,YA0cpB,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../subgraphs/invoice/schema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,eAAO,MAAM,MAAM,EAAE,YA2dpB,CAAC"}

package/dist/subgraphs/invoice/schema.js

@@ -16,7 +16,7 @@ export const schema = gql `
     lineItems: [InvoiceLineItem!]!
     totalPriceTaxExcl: Float!
     totalPriceTaxIncl: Float!
-    paymentAccount: String
+    paymentAccounts: [String!]
   }
 
   type Ref {
@@ -102,7 +102,7 @@ export const schema = gql `
     unitPriceTaxIncl: Float!
     totalPriceTaxExcl: Float!
     totalPriceTaxIncl: Float!
-    lineItemTag: [InvoiceLineItemTag!]!
+    lineItemTag: [InvoiceLineItemTag!]
   }
 
   type InvoiceLineItemTag {
@@ -191,10 +191,20 @@ export const schema = gql `
       docId: PHID
       input: Invoice_DeleteRefInput
     ): Int
-    Invoice_setPaymentAccount(
+    Invoice_addPaymentAccount(
       driveId: String
       docId: PHID
-      input: Invoice_SetPaymentAccountInput
+      input: Invoice_AddPaymentAccountInput
+    ): Int
+    Invoice_editPaymentAccount(
+      driveId: String
+      docId: PHID
+      input: Invoice_EditPaymentAccountInput
+    ): Int
+    Invoice_deletePaymentAccount(
+      driveId: String
+      docId: PHID
+      input: Invoice_DeletePaymentAccountInput
     ): Int
     Invoice_editIssuer(
       driveId: String
@@ -257,7 +267,7 @@ export const schema = gql `
       paymentData: JSON!
     ): CreateRequestFinancePaymentResult!
     Invoice_processGnosisPayment(
-      payerWallet: JSON!
+      chainName: String!
       paymentDetails: JSON!
       invoiceNo: String!
     ): ProcessGnosisPaymentResult
@@ -316,7 +326,14 @@ export const schema = gql `
   input Invoice_DeleteRefInput {
     id: OID!
   }
-  input Invoice_SetPaymentAccountInput {
+  input Invoice_AddPaymentAccountInput {
+    paymentAccount: String!
+  }
+  input Invoice_EditPaymentAccountInput {
+    existingPaymentAccount: String!
+    newPaymentAccount: String!
+  }
+  input Invoice_DeletePaymentAccountInput {
     paymentAccount: String!
   }
 
@@ -452,7 +469,7 @@ export const schema = gql `
     id: OID!
   }
   input Invoice_SetLineItemTagInput {
-    id: OID!
+    lineItemId: OID!
     dimension: String!
     value: String!
     label: String

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@powerhousedao/contributor-billing",
   "description": "Document models that help contributors of open organisations get paid anonymously for their work on a monthly basis.",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "license": "AGPL-3.0-only",
   "type": "module",
   "files": [