diff --git a/package-lock.json b/package-lock.json index 95e7dfa..04540c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "dependencies": { "@ethersproject/experimental": "5.7.0", "@kredits/contracts": "^7.3.0", + "axios": "^1.7.9", "cors": "^2.8.5", "dotenv": "^16.3.1", "eth-provider": "^0.13.6", @@ -987,6 +988,21 @@ "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==" }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, + "node_modules/axios": { + "version": "1.7.9", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz", + "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/babel-code-frame": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", @@ -1351,6 +1367,17 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -1482,6 +1509,14 @@ "ms": "2.0.0" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -1892,6 +1927,25 @@ "node": ">= 0.8" } }, + "node_modules/follow-redirects": { + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, "node_modules/for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -1911,6 +1965,19 @@ "node": ">=0.10.0" } }, + "node_modules/form-data": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz", + "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -3000,6 +3067,11 @@ "node": ">= 0.10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/qs": { "version": "6.11.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", @@ -4279,6 +4351,21 @@ "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==" }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, + "axios": { + "version": "1.7.9", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz", + "integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==", + "requires": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "babel-code-frame": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", @@ -4598,6 +4685,14 @@ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "requires": { + "delayed-stream": "~1.0.0" + } + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -4702,6 +4797,11 @@ "ms": "2.0.0" } }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==" + }, "depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -5017,6 +5117,11 @@ "unpipe": "~1.0.0" } }, + "follow-redirects": { + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==" + }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -5030,6 +5135,16 @@ "for-in": "^1.0.1" } }, + "form-data": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz", + "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + } + }, "forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -5859,6 +5974,11 @@ "ipaddr.js": "1.9.1" } }, + "proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "qs": { "version": "6.11.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", diff --git a/package.json b/package.json index 19f29e9..d69aaeb 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "dependencies": { "@ethersproject/experimental": "5.7.0", "@kredits/contracts": "^7.3.0", + "axios": "^1.7.9", "cors": "^2.8.5", "dotenv": "^16.3.1", "eth-provider": "^0.13.6", diff --git a/scripts/lib/gitea-reviews.js b/scripts/lib/gitea-reviews.js index 014be12..6c4a15c 100644 --- a/scripts/lib/gitea-reviews.js +++ b/scripts/lib/gitea-reviews.js @@ -67,6 +67,8 @@ module.exports = class GiteaReviews { }); reviews.forEach(review => { + // console.debug(`Review from /repos/${repo}/pulls/${pr.number}`); + if (typeof reviewContributions[review.user.login] === 'undefined') { reviewContributions[review.user.login] = []; } diff --git a/scripts/lib/github-reviews.js b/scripts/lib/github-reviews.js index 708bb6f..d618df6 100644 --- a/scripts/lib/github-reviews.js +++ b/scripts/lib/github-reviews.js @@ -68,6 +68,8 @@ module.exports = class GithubReviews { }); reviews.forEach(review => { + // console.debug(`Review from /repos/${repo}/pulls/${pr.number}`); + if (typeof reviewContributions[review.user.login] === 'undefined') { reviewContributions[review.user.login] = []; } diff --git a/scripts/review-kredits.js b/scripts/review-kredits.js index 951acc0..785da5c 100755 --- a/scripts/review-kredits.js +++ b/scripts/review-kredits.js @@ -1,24 +1,29 @@ #!/usr/bin/env node require('dotenv').config(); + +const yargs = require('yargs/yargs'); +const { hideBin } = require('yargs/helpers'); +const util = require('util'); +const fs = require('fs'); + const GiteaReviews = require('./lib/gitea-reviews'); const GithubReviews = require('./lib/github-reviews'); const ethers = require('ethers'); -const Kredits = require('kredits-contracts'); -const util = require('util'); +const NonceManager = require('@ethersproject/experimental').NonceManager; +const Kredits = require('@kredits/contracts'); -const yargs = require('yargs/yargs'); -const { hideBin } = require('yargs/helpers'); - -const providerUrl = process.env.KREDITS_PROVIDER_URL; -const daoAddress = process.env.KREDITS_DAO_ADDRESS; +const walletPath = process.env.KREDITS_WALLET_PATH || './wallet.json'; +const walletJson = fs.readFileSync(walletPath); +const providerUrl = process.env.KREDITS_PROVIDER_URL || 'http://localhost:7545'; const ipfsConfig = { host: process.env.IPFS_API_HOST || 'localhost', port: process.env.IPFS_API_PORT || '5001', protocol: process.env.IPFS_API_PROTOCOL || 'http', }; +console.log('ipfsConfig:', ipfsConfig); const kreditsAmounts = { 'kredits-1': 100, @@ -95,33 +100,54 @@ async function getAllReviews(repos, startDate, endDate) { async function initializeKredits() { // - // Ethereum provider/node setup + // Wallet setup // - let ethProvider; - if (providerUrl) { - ethProvider = new ethers.providers.JsonRpcProvider(providerUrl); - } else { - ethProvider = new ethers.getDefaultProvider('rinkeby'); + let wallet; + try { + wallet = await ethers.Wallet.fromEncryptedJson(walletJson, process.env.KREDITS_WALLET_PASSWORD); + } catch(error) { + console.warn('Could not load wallet:', error); + process.exit(1); } + // + // Solidity VM provider/node setup + // + + console.log('Using blockchain node/API at', providerUrl); + + const ethProvider = new ethers.providers.JsonRpcProvider(providerUrl); + const signer = new NonceManager(wallet.connect(ethProvider)); + // // Kredits contracts setup // const opts = { ipfsConfig }; - if (daoAddress) { - opts.addresses = { Kernel: daoAddress }; - } let kredits; try { - kredits = await new Kredits(ethProvider, null, opts).init(); - } catch (error) { - console.log('Could not set up kredits:', error); + kredits = await new Kredits(signer.provider, signer, opts).init(); + } catch(error) { + console.warn('Could not set up kredits:', error); process.exit(1); } + console.log('Wallet address: ' + wallet.address); + + // + // Check robot's wallet balance and alert when it's broke + // + + ethProvider.getBalance(wallet.address).then(balance => { + console.log('Wallet balance: ' + ethers.utils.formatEther(balance) + ' RBTC'); + if (balance.lt(ethers.utils.parseEther('0.0001'))) { + console.warn(`I\'m broke! Please send some RBTC to ${wallet.address} first.`); + process.exit(1); + } + }); + return kredits; } @@ -162,7 +188,7 @@ async function generateContributionData(reviews, Contributor) { time, amount: kreditsAmount, kind: 'dev', - description: 'PR reviews', + description: `Pull request reviews (${argv.start} to ${argv.end})`, details: { pullRequests: urls, },