From 3c7bcf038e7490338a2fd993fcc48e43031fb3ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 26 Apr 2023 15:58:07 +0200 Subject: [PATCH 1/2] Upgrade @kredits/contracts --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4a6bfed..2d69451 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "2.1.0", "license": "MIT", "dependencies": { - "@kredits/contracts": "^7.0.0", + "@kredits/contracts": "^7.1.0", "cli-progress": "^3.11.2", "debug": "^4.3.4", "yargs": "^17.6.0" @@ -721,9 +721,9 @@ "integrity": "sha512-yOTK5WiXFDNAitPByMabE365aEEzFHgSUSgAssbJWt7BZ80HQSVu8XWrQiTbFbCkoIBmXwPP/RoxgXJQVgZTFQ==" }, "node_modules/@kredits/contracts": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@kredits/contracts/-/contracts-7.0.0.tgz", - "integrity": "sha512-UITEkP3njFNI2WS7v5ivGE3ruFwdWPWuJZrhBXBEAZbtmr1t/p1K7jkmmjyLDUeKXJ/udMlH6oQMCgh7P/aHNg==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@kredits/contracts/-/contracts-7.1.0.tgz", + "integrity": "sha512-RyZdKj6Ohr4UwoQ5Ne5CtShG/9j+v4EjDMvKmTwAU7uY1rbxpEWfMFo1xuYdAsT6ZVhiuMjVY3RG/8kPZVv9NQ==", "dependencies": { "@kosmos/schemas": "^3.1.0", "ethers": "^5.4.7", @@ -2245,9 +2245,9 @@ "integrity": "sha512-yOTK5WiXFDNAitPByMabE365aEEzFHgSUSgAssbJWt7BZ80HQSVu8XWrQiTbFbCkoIBmXwPP/RoxgXJQVgZTFQ==" }, "@kredits/contracts": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@kredits/contracts/-/contracts-7.0.0.tgz", - "integrity": "sha512-UITEkP3njFNI2WS7v5ivGE3ruFwdWPWuJZrhBXBEAZbtmr1t/p1K7jkmmjyLDUeKXJ/udMlH6oQMCgh7P/aHNg==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@kredits/contracts/-/contracts-7.1.0.tgz", + "integrity": "sha512-RyZdKj6Ohr4UwoQ5Ne5CtShG/9j+v4EjDMvKmTwAU7uY1rbxpEWfMFo1xuYdAsT6ZVhiuMjVY3RG/8kPZVv9NQ==", "requires": { "@kosmos/schemas": "^3.1.0", "ethers": "^5.4.7", diff --git a/package.json b/package.json index d6cbfde..9ca9e06 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ ], "license": "MIT", "dependencies": { - "@kredits/contracts": "^7.0.0", + "@kredits/contracts": "^7.1.0", "cli-progress": "^3.11.2", "debug": "^4.3.4", "yargs": "^17.6.0" From 83b3045afd871a3342dad56ed6d6f19ba9bff4e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A2u=20Cao?= Date: Wed, 26 Apr 2023 15:58:19 +0200 Subject: [PATCH 2/2] Pin reimbursements --- lib/ipfs-pinner.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/ipfs-pinner.js b/lib/ipfs-pinner.js index 9e0aebc..4762d42 100644 --- a/lib/ipfs-pinner.js +++ b/lib/ipfs-pinner.js @@ -29,8 +29,7 @@ class IpfsPinner { const contracts = [ this.kredits.Contributor, this.kredits.Contribution, - // TODO uncomment once we have data here - // this.kredits.Reimbursement + this.kredits.Reimbursement ] for (const contract of contracts) { @@ -72,6 +71,11 @@ class IpfsPinner { .then(data => { return this.ipfsApi.pin(data); }) .then(callback); }); + this.kredits.Reimbursement.on('ReimbursementAdded', (id) => { + this.kredits.Reimbursement.getData(id) + .then(data => { return this.ipfsApi.pin(data); }) + .then(callback); + }); } async _pinAllFromContract (contract, itemCount, progressBar) { @@ -91,7 +95,7 @@ class IpfsPinner { cid = await ipfsApi.pin(data); debug(`Pinned ${contract.constructor.name} #${id} at ${cid}`); } catch(e) { - debug(`Error while trying to load an pin ${contract.constructor.name} #${id}:`) + debug(`Error while trying to load and pin ${contract.constructor.name} #${id}:`) debug(e); debug(`\nTrying again...`); loadAndPin(id);