Compare commits

...

8 Commits

Author SHA1 Message Date
077b6fb1c1 Default to kosmos IPFS
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
we always had issues with IPFS not finding data from other peers
2022-10-22 15:21:38 +00:00
1c097f37a6 Merge pull request 'Add export/import functionality' (#224) from feature/export-import into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #224
2022-09-02 20:31:27 +00:00
Râu Cao
d3fb1010d5 Merge branch 'master' into feature/export-import
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2022-09-02 09:53:58 +02:00
f390b5dff5 Merge pull request 'Make Kredits undivisible' (#227) from feature/undivisible into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #227
2022-09-02 07:49:23 +00:00
hueso
1e4f7be5cf make KS undivisible
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2022-09-01 22:37:21 -03:00
Râu Cao
258c1cc755 Use ethers from correct parent object
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2022-08-31 09:55:26 +02:00
Râu Cao
f29054bc0b Add script for importing contributions
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2022-08-30 12:18:45 +02:00
fd012d5359 Merge pull request 'Remove claims, add withdrawals' (#225) from feature/184-remove_kredits_claims into feature/export-import
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
Reviewed-on: #225
2022-08-30 08:53:54 +00:00
6 changed files with 49 additions and 7 deletions

View File

@@ -18,7 +18,11 @@ contract Token is Initializable, ERC20Upgradeable {
event KreditsMinted(address indexed recipient, uint256 amount);
function initialize() public virtual initializer {
__ERC20_init('Kredits', 'KS');
__ERC20_init("Kredits", "KS");
}
function decimals() public view virtual override returns (uint8) {
return 0;
}
function setContributorContract(address contributor) public {
@@ -31,8 +35,7 @@ contract Token is Initializable, ERC20Upgradeable {
require(contributorContractAddress == msg.sender, "Only Contributor");
require(amount > 0, "INVALID_AMOUNT");
uint256 amountInWei = amount.mul(1 ether);
_mint(contributorAccount, amountInWei);
_mint(contributorAccount, amount);
emit KreditsMinted(contributorAccount, amount);
}
}

File diff suppressed because one or more lines are too long

View File

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

View File

@@ -7,7 +7,7 @@ async function main() {
console.log(`Using Contribution at: ${kredits.Contribution.contract.address}`);
const count = await kredits.Contribution.count;
const currentBlockHeight = await XMLHttpRequest.ethers.provider.getBlockNumber();
const currentBlockHeight = await hre.ethers.provider.getBlockNumber();
const backup = {};
const promises = [];

View File

@@ -0,0 +1,39 @@
const fs = require('fs');
const Kredits = require('../../lib/kredits');
async function main() {
kredits = new Kredits(hre.ethers.provider, hre.ethers.provider.getSigner())
await kredits.init();
console.log(`Using Contribution at: ${kredits.Contribution.contract.address}`);
try {
const data = fs.readFileSync("./data/contributions.json");
const contributions = JSON.parse(data);
const ids = Object.keys(contributions)
.map(k => parseInt(k))
.sort(function(a, b){return a-b});
const currentBlockHeight = await kredits.provider.getBlockNumber();
const confirmationPeriod = 40320 // blocks
const unconfirmedHeight = currentBlockHeight + confirmationPeriod;
for (const contributionId of ids) {
const c = contributions[contributionId.toString()];
const confirmedAtBlock = c.confirmed ? currentBlockHeight : unconfirmedHeight;
const result = await kredits.Contribution.contract.add(
c.amount, c.contributorId,
c.hashDigest, c.hashFunction, c.hashSize,
confirmedAtBlock, c.vetoed
);
// await result.wait();
console.log(`Added contribution #${contributionId}: ${result.hash}`);
};
} catch(e) {
console.log(e);
}
}
main();

View File

@@ -95,7 +95,7 @@ describe("Contributor contract", async function () {
expect(c['balance']).to.equal(0);
await Contributor.connect(addr1).withdraw();
c = await Contributor.getContributorById(2);
expect(c['balance'].toString()).to.equal("6500000000000000000000");
expect(c['balance']).to.equal(6500);
expect(c['kreditsWithdrawn']).to.equal(6500);
});