ups

config/seeds.js

@@ -31,55 +31,18 @@ const contractCalls = [
     wiki_username: 'Manuel',
   }, { gasLimit: 200000 }]],
 
-  ['Contribution', 'add', [{
-    contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF',
-    date: '2019-04-11', amount: 500, kind: 'dev',
-    description: '[67P/kredits-contracts] Test this thing',
-    url: '',
-    confirmedAtBlock: 1,
-  }, { gasLimit: 350000 }]],
+  ['Contribution', 'add', [{ contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF', date: '2019-04-11', amount: 500, kind: 'dev', description: '[67P/kredits-contracts] Test this thing', url: '' }, { gasLimit: 350000 }]],
+  ['Contribution', 'add', [{ contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-11', amount: 1500, kind: 'dev', description: '[67P/kredits-web] Reviewed stuff', url: '' }, { gasLimit: 350000 }]],
+  ['Contribution', 'add', [{ contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF', date: '2019-04-11', amount: 5000, kind: 'dev', description: '[67P/kredits-contracts] Add tests', url: '' }, { gasLimit: 350000 }]],
+  ['Contribution', 'add', [{ contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF', date: '2019-04-11', amount: 1500, kind: 'dev', description: '[67P/kredits-contracts] Introduce contribution token', url: '' }, { gasLimit: 350000 }]],
+  ['Contribution', 'add', [{ contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-11', amount: 5000, kind: 'dev', description: '[67P/kredits-web] Expense UI, first draft', url: '' }, { gasLimit: 350000 }]],
 
-  ['Contribution', 'add', [{
-    contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB',
-    date: '2019-04-11', amount: 1500, kind: 'dev',
-    description: '[67P/kredits-web] Reviewed stuff',
-    url: '',
-    confirmedAtBlock: 1,
-  }, { gasLimit: 350000 }]],
-
-  ['Contribution', 'add', [{
-    contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF',
-    date: '2019-04-11', amount: 5000, kind: 'dev',
-    description: '[67P/kredits-contracts] Add tests',
-    url: '',
-    confirmedAtBlock: 1,
-  }, { gasLimit: 350000 }]],
-
-  ['Contribution', 'add', [{
-    contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF',
-    date: '2019-04-11', amount: 1500, kind: 'dev',
-    description: '[67P/kredits-contracts] Introduce contribution token',
-    url: '',
-  }, { gasLimit: 350000 }]],
-
-  ['Contribution', 'add', [{
-    contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB',
-    date: '2019-04-11', amount: 1500, kind: 'design',
-    description: '[67P/kredits-web] Expense UI, first draft',
-    url: '',
-  }, { gasLimit: 350000 }]],
-
-  ['Reimbursement', 'add', [{ amount: 346800, recipientId: 2, token: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599', expenses: [
-    { title: 'Domain kosmos.social', description: 'Yearly registration fee for domain kosmos.social', amount: 69.00, currency: 'EUR', date: '2020-04-30' },
-  ], confirmedAtBlock: 1 }, { gasLimit: 300000 }]],
-
-  ['Reimbursement', 'add', [{ amount: 1116000, recipientId: 1, token: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599', expenses: [
+  ['Reimbursement', 'add', [{amount: 1116000, recipientId: 1, token: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599', expenses: [
     { title: 'Server rent', description: 'Dedicated server: andromeda.kosmos.org, April 2020', amount: 61, currency: 'EUR', date: '2020-05-28' },
-    { title: 'Server rent', description: 'Dedicated server: centaurus.kosmos.org, April 2020', amount: 32, currency: 'EUR', date: '2020-05-28' },
-  ], confirmedAtBlock: 1 }, { gasLimit: 300000 }]],
-
-  ['Reimbursement', 'add', [{ amount: 166800, recipientId: 2, token: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599', expenses: [
-    { title: 'Domain kosmos.chat', description: 'Yearly registration fee for domain kosmos.chat', amount: 13.90, currency: 'EUR', date: '2020-05-30' },
+    { title: 'Server rent', description: 'Dedicated server: centaurus.kosmos.org, April 2020', amount: 32, currency: 'EUR', date: '2020-05-28' }
+  ]}, { gasLimit: 300000 }]],
+  ['Reimbursement', 'add', [{amount: 166800, recipientId: 2, token: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599', expenses: [
+    { title: 'Domain kosmos.chat', description: 'Yearly registration fee for domain kosmos.chat', amount: 13.90, currency: 'EUR', date: '2020-05-30' }
   ]}, { gasLimit: 300000 }]],
 ];
 

hardhat.config.js

@@ -62,7 +62,7 @@ task("create-wallet", "Creates a new wallet json", async () => {
  */
 module.exports = {
   solidity: "0.8.2",
-  defaultNetwork: "localhost",
+  defaultNetwork: "hardhat",
   networks: {
     hardhat: {
       chainId: 1337,

lib/contracts/contribution.js

@@ -41,8 +41,6 @@ class Contribution extends Record {
 
   async add (contributionAttr, callOptions = {}) {
     const contribution = new ContributionSerializer(contributionAttr);
-    const confirmedAtBlock = contributionAttr.confirmedAtBlock || 0;
-    const vetoed = contributionAttr.vetoed || false;
 
     try { await contribution.validate(); }
     catch (error) { return Promise.reject(error); }
@@ -58,11 +56,9 @@ class Contribution extends Record {
           ipfsHashAttr.hashDigest,
           ipfsHashAttr.hashFunction,
           ipfsHashAttr.hashSize,
-          confirmedAtBlock,
-          vetoed,
         ];
 
-        return this.contract.add(...contribution, callOptions);
+        return this.contract.add(...contribution, 0, false, callOptions);
       });
   }
 

lib/contracts/reimbursement.js

@@ -23,8 +23,6 @@ class Reimbursement extends Record {
     const amount = parseInt(attrs.amount);
     const token = attrs.token;
     const recipientId = attrs.recipientId;
-    const confirmedAtBlock = attrs.confirmedAtBlock || 0;
-    const vetoed = attrs.vetoed || false;
     const expenses = attrs.expenses.map((e) => new ExpenseSerializer(e));
     let errorMessage;
 
@@ -58,8 +56,6 @@ class Reimbursement extends Record {
           ipfsHashAttr.hashDigest,
           ipfsHashAttr.hashFunction,
           ipfsHashAttr.hashSize,
-          confirmedAtBlock,
-          vetoed,
         ];
 
         return this.contract.add(...reimbursement, callOptions);

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@kredits/contracts",
-  "version": "7.3.0",
+  "version": "7.2.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@kredits/contracts",
-      "version": "7.3.0",
+      "version": "7.2.0",
       "license": "MIT",
       "dependencies": {
         "@kosmos/schemas": "^3.1.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kredits/contracts",
-  "version": "7.3.0",
+  "version": "7.2.0",
   "description": "Smart contracts and JavaScript API for Kredits",
   "main": "./lib/kredits.js",
   "directories": {
@@ -22,9 +22,11 @@
     "lint:contract-tests": "eslint apps/*/test",
     "lint:wrapper": "eslint lib/",
     "test": "hardhat test",
-    "setup-git-hooks": "sh scripts/git-hooks/install",
-    "preversion": "npm test && npm run build",
-    "version": "git add lib/abis"
+    "test:token": "cd apps/token && npm run test",
+    "test:contributor": "cd apps/contributor && npm run test",
+    "test:contribution": "cd apps/contribution && npm run test",
+    "test:proposal": "cd apps/proposal && npm run test",
+    "setup-git-hooks": "sh scripts/git-hooks/install"
   },
   "repository": {
     "type": "git",