Compare commits

..

9 Commits

Author SHA1 Message Date
Râu Cao
828f831c52 7.0.1
All checks were successful
continuous-integration/drone/push Build is passing
2022-11-02 19:07:56 +01:00
Râu Cao
500180c6da Update npm badge
Some checks are pending
continuous-integration/drone/push Build is running
2022-11-02 19:07:42 +01:00
Râu Cao
b63c68cd1c 7.0.0
All checks were successful
continuous-integration/drone/push Build is passing
2022-11-02 18:07:46 +01:00
c875e775b6 Merge pull request 'Improve import scripts, update testnet addresses' (#231) from deploy-rsk into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #231
2022-11-02 16:57:06 +00:00
Râu Cao
6e0ec8741e Use a dummy address for the read-only signer
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
Necessary for ethers not to fail with public RSK nodes
2022-11-01 15:03:58 +01:00
Râu Cao
a1a68092f6 Change npm module name(space), improve description
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2022-10-31 12:27:24 +01:00
c6168e59e8 Updated adresses
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
on those addresses the import for contributors and contributions was completed
2022-10-27 18:52:57 +02:00
e810424163 My latest deploy addresses
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2022-10-23 16:31:14 +02:00
f71ff4ce9a minor import script improvements
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
waiting for transactions and logging earlier for better debugging
2022-10-23 16:03:37 +02:00
9 changed files with 29 additions and 15 deletions

View File

@@ -1,4 +1,4 @@
[![npm](https://img.shields.io/npm/v/kredits-contracts.svg)](https://www.npmjs.com/package/kredits-contracts) [![npm](https://img.shields.io/npm/v/@kredits/contracts.svg)](https://www.npmjs.com/package/@kredits/contracts)
# Kredits Contracts # Kredits Contracts

View File

@@ -1,4 +1,10 @@
{ {
"31": {
"Contributor": "0xf1073Dab6e305583F95e451Cba449bB867a6e3Fd",
"Contribution": "0x1C531F824e339cD37D75B7F391cB8E42e0E0d4bd",
"Token": "0x56F64C3BB45e6a248F4C783f5a1633E53D6A2371",
"Reimbursement": "0x9C5fFBFba2570A9b31D60338453C5480Ce74B342"
},
"1337": { "1337": {
"Contributor": "0xCc66f9A3cA2670972938FAD91d0865c4a62DFB25", "Contributor": "0xCc66f9A3cA2670972938FAD91d0865c4a62DFB25",
"Contribution": "0x8999CaBc43E28202c5A2257f2a95A45b1F8A62BD", "Contribution": "0x8999CaBc43E28202c5A2257f2a95A45b1F8A62BD",

View File

@@ -69,7 +69,10 @@ class Kredits {
if (wallet) { if (wallet) {
signer = wallet.connect(ethProvider); signer = wallet.connect(ethProvider);
} else if (ethProvider.getSigner) { } else if (ethProvider.getSigner) {
signer = ethProvider.getSigner(); // Only useful for reading data, not writing. The (unused) address is
// necessary because without an address, ethers.js will try to look up
// the provider's account 0, which doesn't work on our public RSK nodes.
signer = ethProvider.getSigner('0xfa77675540E550b911a6AABF3805ac17C6641ec1');
} }
return new Kredits(ethProvider, signer, kreditsOptions); return new Kredits(ethProvider, signer, kreditsOptions);
} }

View File

@@ -5,7 +5,7 @@ const fetch = require('node-fetch');
class IPFS { class IPFS {
constructor (config) { constructor (config) {
if (!config) { if (!config) {
config = { host: 'ipfs.kosmos.org', port: '5444', protocol: 'https' }; config = { host: 'localhost', port: '5001', protocol: 'http' };
} }
this._config = config; this._config = config;
this._ipfsAPI = ipfsClient.create(config); this._ipfsAPI = ipfsClient.create(config);

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "kredits-contracts", "name": "kredits-contracts",
"version": "7.0.0-beta.0", "version": "7.0.1",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "kredits-contracts", "name": "kredits-contracts",
"version": "7.0.0-beta.0", "version": "7.0.1",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@kosmos/schemas": "^3.1.0", "@kosmos/schemas": "^3.1.0",

View File

@@ -1,7 +1,7 @@
{ {
"name": "kredits-contracts", "name": "@kredits/contracts",
"version": "7.0.0-beta.0", "version": "7.0.1",
"description": "Ethereum contracts and npm wrapper for Kredits", "description": "Smart contracts and JavaScript API for Kredits",
"main": "./lib/kredits.js", "main": "./lib/kredits.js",
"directories": { "directories": {
"test": "test" "test": "test"

View File

@@ -6,6 +6,8 @@ async function main() {
await kredits.init(); await kredits.init();
console.log(`Using Contribution at: ${kredits.Contribution.contract.address}`); console.log(`Using Contribution at: ${kredits.Contribution.contract.address}`);
const count = await kredits.Contribution.count;
console.log(`Currently ${count} entries`);
try { try {
const data = fs.readFileSync("./data/contributions.json"); const data = fs.readFileSync("./data/contributions.json");
@@ -28,11 +30,11 @@ async function main() {
c.hashDigest, c.hashFunction, c.hashSize, c.hashDigest, c.hashFunction, c.hashSize,
confirmedAtBlock, c.vetoed confirmedAtBlock, c.vetoed
); );
// await result.wait(); console.log(`Adding contribution #${contributionId}: ${result.hash}`);
console.log(`Added contribution #${contributionId}: ${result.hash}`); await result.wait();
}; };
} catch(e) { } catch(e) {
console.log(e); console.error(e);
} }
} }

View File

@@ -6,7 +6,8 @@ async function main() {
await kredits.init(); await kredits.init();
console.log(`Using Contributor at: ${kredits.Contributor.contract.address}`); console.log(`Using Contributor at: ${kredits.Contributor.contract.address}`);
const count = await kredits.Contributor.count;
console.log(`Currently ${count} entries`);
try { try {
const data = fs.readFileSync("./data/contributors.json"); const data = fs.readFileSync("./data/contributors.json");
const contributors = JSON.parse(data); const contributors = JSON.parse(data);
@@ -22,11 +23,11 @@ async function main() {
contributor.hashFunction, contributor.hashFunction,
contributor.hashSize, contributor.hashSize,
); );
// await result.wait(); console.log(`Adding contributor #${contributorId}: ${result.hash}`);
console.log(`Added contributor #${contributorId}: ${result.hash}`); await result.wait();
}; };
} catch(e) { } catch(e) {
console.log(e); console.error(e);
} }
} }

View File

@@ -6,6 +6,8 @@ async function main() {
await kredits.init(); await kredits.init();
console.log(`Using Contributor at: ${kredits.Contributor.contract.address}`); console.log(`Using Contributor at: ${kredits.Contributor.contract.address}`);
const count = await kredits.Contributors.count;
console.log(`Currently ${count} entries`);
const table = new Table({ const table = new Table({
head: ['ID', 'Account', 'Name', 'Core?', 'Balance', 'Kredits earned', 'Contributions count', 'IPFS'] head: ['ID', 'Account', 'Name', 'Core?', 'Balance', 'Kredits earned', 'Contributions count', 'IPFS']