Merge pull request #111 from lighthouse-web3/v0.3.3

ravish1729 · web-flow · commit fbd9195843bd · 2024-05-15T16:50:25.000+05:30
V0.3.3
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -1,6 +1,3 @@
-# This workflow will do a clean install of node dependencies, cache/restore them, build the source code and run tests across different versions of node
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
-
 name: Node CI
 
 on:
@@ -15,14 +12,16 @@ jobs:
     
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [20.x]
     steps:
-      - name: Use Node.js ${{ matrix.node-version }} 🛎️
+      - name: Checkout repository 🛎️
         uses: actions/checkout@v3
+
+      - name: Setup Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'npm'
-          persist-credentials: false
 
       - name: Install 🔧
         run: npm install
diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
       - run: npm ci
       - run: npm run build
       - run: npm test
@@ -30,7 +30,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
           registry-url: https://registry.npmjs.org/
       - run: npm ci
       - run: npm run build
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Lighthouse <img src="https://img.shields.io/badge/BETA-v0.3.2-green"/>
+# Lighthouse <img src="https://img.shields.io/badge/BETA-v0.3.3-green"/>
 
 Lighthouse is a permanent decentralized file storage protocol that allows the ability to pay once and store forever. While traditionally, users need to repeatedly keep track and pay for their storage after every fixed amount of time, Lighthouse manages this for them and makes sure that user files are stored forever. The aim is to move users from a rent-based cost model where they are renting their own files on cloud storage to a permanent ownership model. It is built on top of IPFS, Filecoin, and Polygon. It uses the existing miner network and storage capacity of the filecoin network.
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lighthouse-web3/sdk",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "NPM package and CLI tool to interact with lighthouse protocol",
   "main": "./dist/Lighthouse/index.js",
   "types": "./dist/Lighthouse/index.d.ts",
@@ -32,9 +32,9 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@lighthouse-web3/kavach": "^0.1.4",
+    "@lighthouse-web3/kavach": "^0.1.6",
     "@peculiar/webcrypto": "^1.4.0",
-    "axios": "^0.24.0",
+    "axios": "^1.6.8",
     "bls-eth-wasm": "^1.0.4",
     "cli-spinner": "^0.2.10",
     "commander": "^10.0.0",
diff --git a/src/Commands/index.ts b/src/Commands/index.ts
@@ -72,7 +72,7 @@ Command.prototype.helpInformation = function (context: any) {
 }
 
 widgets.addHelpText('before', 'Welcome to lighthouse-web3')
-widgets.version('0.3.2')
+widgets.version('0.3.3')
 
 widgets
   .command('wallet')
diff --git a/src/Commands/utils/auth.ts b/src/Commands/utils/auth.ts
@@ -7,6 +7,6 @@ export const sign_auth_message = async (privateKey: string) => {
   const messageRequested = (
     await lighthouse.getAuthMessage(signer.address.toLocaleLowerCase())
   ).data.message
-  const signedMessage = await signer.signMessage(messageRequested)
+  const signedMessage = await signer.signMessage(messageRequested as string)
   return signedMessage
 }
diff --git a/src/Lighthouse/encryption/applyAccessCondition.ts b/src/Lighthouse/encryption/applyAccessCondition.ts
@@ -1,4 +1,5 @@
-import { accessControl, ChainType } from '@lighthouse-web3/kavach'
+import { accessControl } from '@lighthouse-web3/kavach'
+import { ChainType } from '@lighthouse-web3/kavach/dist/types'
 
 export type accessControlResponse = {
   data: {
diff --git a/src/Lighthouse/encryption/getAuthMessage.ts b/src/Lighthouse/encryption/getAuthMessage.ts
@@ -3,7 +3,7 @@ import { getAuthMessage } from '@lighthouse-web3/kavach'
 
 export type authMessageResponse = {
   data: {
-    message: string
+    message: string | null
   }
 }
 
diff --git a/src/Lighthouse/tests/encryption.test.ts b/src/Lighthouse/tests/encryption.test.ts
@@ -6,7 +6,7 @@ const signAuthMessage = async (privateKey: string) => {
   const signer = new ethers.Wallet(privateKey, provider)
   const messageRequested = (await lighthouse.getAuthMessage(signer.address))
     .data.message
-  const signedMessage = await signer.signMessage(messageRequested)
+  const signedMessage = await signer.signMessage(messageRequested as string)
   return signedMessage
 }
 
@@ -43,7 +43,7 @@ describe('encryption', () => {
         signed_message
       )
       expect(typeof response.data.key).toBe('string')
-    }, 60000)
+    }, 80000)
 
     it('should not fetch encryption key when incorrect public-private key pair is provided', async () => {
       try {
diff --git a/src/Lighthouse/tests/uploadEncrypted.test.ts b/src/Lighthouse/tests/uploadEncrypted.test.ts
@@ -9,7 +9,7 @@ export const signAuthMessage = async (privateKey: string) => {
   const signer = new ethers.Wallet(privateKey, provider)
   const messageRequested = (await lighthouse.getAuthMessage(signer.address))
     .data.message
-  const signedMessage = await signer.signMessage(messageRequested)
+  const signedMessage = await signer.signMessage(messageRequested as string)
   return signedMessage
 }
 
diff --git a/src/Lighthouse/upload/files/browser.ts b/src/Lighthouse/upload/files/browser.ts
@@ -37,12 +37,14 @@ export default async <T extends boolean>(
         'X-Deal-Parameter': dealParameters?JSON.stringify(dealParameters):'null'
       },
       onUploadProgress: function (progressEvent) {
-        const _progress = Math.round(progressEvent.loaded / progressEvent.total)
-        uploadProgressCallback({
-          progress: _progress,
-          total: progressEvent.total,
-          uploaded: progressEvent.loaded,
-        })
+        if(progressEvent.total) {
+          const _progress = Math.round(progressEvent.loaded / progressEvent.total)
+          uploadProgressCallback({
+            progress: _progress,
+            total: progressEvent.total,
+            uploaded: progressEvent.loaded,
+          })
+        }
       },
     })
 
diff --git a/src/Lighthouse/uploadEncrypted/encrypt/file/browser.ts b/src/Lighthouse/uploadEncrypted/encrypt/file/browser.ts
@@ -89,12 +89,14 @@ export default async (
         Authorization: token,
       },
       onUploadProgress: function (progressEvent) {
-        const _progress = Math.round(progressEvent.loaded / progressEvent.total)
-        uploadProgressCallback({
-          progress: _progress,
-          total: progressEvent.total,
-          uploaded: progressEvent.loaded,
-        })
+        if(progressEvent.total) {
+          const _progress = Math.round(progressEvent.loaded / progressEvent.total)
+          uploadProgressCallback({
+            progress: _progress,
+            total: progressEvent.total,
+            uploaded: progressEvent.loaded,
+          })
+        }
       },
     })
     if (typeof response.data === 'string') {
diff --git a/src/lighthouse.config.ts b/src/lighthouse.config.ts
@@ -59,7 +59,7 @@ const defaultConfig = {
     rpc: 'https://api.node.glif.io',
     scan: 'https://filfox.info/en/message/',
     chain_id: '314',
-    lighthouse_contract_address: '0x9297A1eD441eA63257e933DCC335EE4D1E562C37',
+    lighthouse_contract_address: '0x1ed0f8B8736c7835a1ee54D791cda7ADA3cd5e94',
     usdc_contract_address: '0xEB466342C4d449BC9f53A865D5Cb90586f405215',
     usdc_contract_decimal: 6,
     native_decimal: 18,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Lighthouse <img src="https://img.shields.io/badge/BETA-v0.3.2-green"/>`
	`1`	`+# Lighthouse <img src="https://img.shields.io/badge/BETA-v0.3.3-green"/>`
`2`	`2`
`3`	`3`	Lighthouse is a permanent decentralized file storage protocol that allows the ability to pay once and store forever. While traditionally, users need to repeatedly keep track and pay for their storage after every fixed amount of time, Lighthouse manages this for them and makes sure that user files are stored forever. The aim is to move users from a rent-based cost model where they are renting their own files on cloud storage to a permanent ownership model. It is built on top of IPFS, Filecoin, and Polygon. It uses the existing miner network and storage capacity of the filecoin network.
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ Command.prototype.helpInformation = function (context: any) {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`widgets.addHelpText('before', 'Welcome to lighthouse-web3')`
`75`		`-widgets.version('0.3.2')`
	`75`	`+widgets.version('0.3.3')`
`76`	`76`
`77`	`77`	`widgets`
`78`	`78`	`.command('wallet')`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@ export const sign_auth_message = async (privateKey: string) => {`
`7`	`7`	`const messageRequested = (`
`8`	`8`	`await lighthouse.getAuthMessage(signer.address.toLocaleLowerCase())`
`9`	`9`	`).data.message`
`10`		`- const signedMessage = await signer.signMessage(messageRequested)`
	`10`	`+ const signedMessage = await signer.signMessage(messageRequested as string)`
`11`	`11`	`return signedMessage`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import { getAuthMessage } from '@lighthouse-web3/kavach'`
`3`	`3`
`4`	`4`	`export type authMessageResponse = {`
`5`	`5`	`data: {`
`6`		`- message: string`
	`6`	`+ message: string \| null`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`