7.4.0

Reviewed-on: #247

.gitignore

@@ -10,3 +10,4 @@ data
 cache
 artifacts
 .openzeppelin/unknown-1337.json
+.env

.openzeppelin/unknown-31.json

@@ -86,7 +86,7 @@
             "label": "contributionContract",
             "offset": 0,
             "slot": "1",
-            "type": "t_contract(IContributionBalance)2236",
+            "type": "t_contract(IContributionBalance)2238",
             "contract": "Contributor",
             "src": "contracts/Contributor.sol:16"
           },
@@ -94,7 +94,7 @@
             "label": "tokenContract",
             "offset": 0,
             "slot": "2",
-            "type": "t_contract(IToken)2219",
+            "type": "t_contract(IToken)2221",
             "contract": "Contributor",
             "src": "contracts/Contributor.sol:17"
           },
@@ -110,7 +110,7 @@
             "label": "contributors",
             "offset": 0,
             "slot": "4",
-            "type": "t_mapping(t_uint32,t_struct(Contributor)2259_storage)",
+            "type": "t_mapping(t_uint32,t_struct(Contributor)2261_storage)",
             "contract": "Contributor",
             "src": "contracts/Contributor.sol:29"
           },
@@ -144,11 +144,11 @@
             "label": "bytes32",
             "numberOfBytes": "32"
           },
-          "t_contract(IContributionBalance)2236": {
+          "t_contract(IContributionBalance)2238": {
             "label": "contract IContributionBalance",
             "numberOfBytes": "20"
           },
-          "t_contract(IToken)2219": {
+          "t_contract(IToken)2221": {
             "label": "contract IToken",
             "numberOfBytes": "20"
           },
@@ -156,11 +156,11 @@
             "label": "mapping(address => uint32)",
             "numberOfBytes": "32"
           },
-          "t_mapping(t_uint32,t_struct(Contributor)2259_storage)": {
+          "t_mapping(t_uint32,t_struct(Contributor)2261_storage)": {
             "label": "mapping(uint32 => struct Contributor.Contributor)",
             "numberOfBytes": "32"
           },
-          "t_struct(Contributor)2259_storage": {
+          "t_struct(Contributor)2261_storage": {
             "label": "struct Contributor.Contributor",
             "members": [
               {
@@ -717,6 +717,221 @@
           }
         }
       }
+    },
+    "27e6fdeedf4e7e81a2c2ecc839d0c13414aa8f5527d4d3573f469358c8aad652": {
+      "address": "0xfaeA425E6eDd4e9B31dAa3614c7c7862751D6782",
+      "txHash": "0xe7768586dbfb5d528db3c9d0c2a608a4fcb5d7f04eb9f89913ac21b8d20a72df",
+      "layout": {
+        "storage": [
+          {
+            "label": "_initialized",
+            "offset": 0,
+            "slot": "0",
+            "type": "t_uint8",
+            "contract": "Initializable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62",
+            "retypedFrom": "bool"
+          },
+          {
+            "label": "_initializing",
+            "offset": 1,
+            "slot": "0",
+            "type": "t_bool",
+            "contract": "Initializable",
+            "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67"
+          },
+          {
+            "label": "contributorContract",
+            "offset": 2,
+            "slot": "0",
+            "type": "t_contract(ContributorInterface)1546",
+            "contract": "Contribution",
+            "src": "contracts/Contribution.sol:14"
+          },
+          {
+            "label": "name_",
+            "offset": 0,
+            "slot": "1",
+            "type": "t_string_storage",
+            "contract": "Contribution",
+            "src": "contracts/Contribution.sol:28"
+          },
+          {
+            "label": "symbol_",
+            "offset": 0,
+            "slot": "2",
+            "type": "t_string_storage",
+            "contract": "Contribution",
+            "src": "contracts/Contribution.sol:29"
+          },
+          {
+            "label": "contributionOwner",
+            "offset": 0,
+            "slot": "3",
+            "type": "t_mapping(t_uint32,t_uint32)",
+            "contract": "Contribution",
+            "src": "contracts/Contribution.sol:32"
+          },
+          {
+            "label": "ownedContributions",
+            "offset": 0,
+            "slot": "4",
+            "type": "t_mapping(t_uint32,t_array(t_uint32)dyn_storage)",
+            "contract": "Contribution",
+            "src": "contracts/Contribution.sol:34"
+          },
+          {
+            "label": "contributions",
+            "offset": 0,
+            "slot": "5",
+            "type": "t_mapping(t_uint32,t_struct(ContributionData)1570_storage)",
+            "contract": "Contribution",
+            "src": "contracts/Contribution.sol:36"
+          },
+          {
+            "label": "contributionsCount",
+            "offset": 0,
+            "slot": "6",
+            "type": "t_uint32",
+            "contract": "Contribution",
+            "src": "contracts/Contribution.sol:37"
+          },
+          {
+            "label": "blocksToWait",
+            "offset": 4,
+            "slot": "6",
+            "type": "t_uint32",
+            "contract": "Contribution",
+            "src": "contracts/Contribution.sol:40"
+          },
+          {
+            "label": "deployer",
+            "offset": 8,
+            "slot": "6",
+            "type": "t_address",
+            "contract": "Contribution",
+            "src": "contracts/Contribution.sol:43"
+          },
+          {
+            "label": "migrationDone",
+            "offset": 28,
+            "slot": "6",
+            "type": "t_bool",
+            "contract": "Contribution",
+            "src": "contracts/Contribution.sol:46"
+          }
+        ],
+        "types": {
+          "t_address": {
+            "label": "address",
+            "numberOfBytes": "20"
+          },
+          "t_array(t_uint32)dyn_storage": {
+            "label": "uint32[]",
+            "numberOfBytes": "32"
+          },
+          "t_bool": {
+            "label": "bool",
+            "numberOfBytes": "1"
+          },
+          "t_bytes32": {
+            "label": "bytes32",
+            "numberOfBytes": "32"
+          },
+          "t_contract(ContributorInterface)1546": {
+            "label": "contract ContributorInterface",
+            "numberOfBytes": "20"
+          },
+          "t_mapping(t_uint32,t_array(t_uint32)dyn_storage)": {
+            "label": "mapping(uint32 => uint32[])",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_uint32,t_struct(ContributionData)1570_storage)": {
+            "label": "mapping(uint32 => struct Contribution.ContributionData)",
+            "numberOfBytes": "32"
+          },
+          "t_mapping(t_uint32,t_uint32)": {
+            "label": "mapping(uint32 => uint32)",
+            "numberOfBytes": "32"
+          },
+          "t_string_storage": {
+            "label": "string",
+            "numberOfBytes": "32"
+          },
+          "t_struct(ContributionData)1570_storage": {
+            "label": "struct Contribution.ContributionData",
+            "members": [
+              {
+                "label": "contributorId",
+                "type": "t_uint32",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "amount",
+                "type": "t_uint32",
+                "offset": 4,
+                "slot": "0"
+              },
+              {
+                "label": "hashDigest",
+                "type": "t_bytes32",
+                "offset": 0,
+                "slot": "1"
+              },
+              {
+                "label": "hashFunction",
+                "type": "t_uint8",
+                "offset": 0,
+                "slot": "2"
+              },
+              {
+                "label": "hashSize",
+                "type": "t_uint8",
+                "offset": 1,
+                "slot": "2"
+              },
+              {
+                "label": "tokenMetadataURL",
+                "type": "t_string_storage",
+                "offset": 0,
+                "slot": "3"
+              },
+              {
+                "label": "confirmedAtBlock",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "4"
+              },
+              {
+                "label": "vetoed",
+                "type": "t_bool",
+                "offset": 0,
+                "slot": "5"
+              },
+              {
+                "label": "exists",
+                "type": "t_bool",
+                "offset": 1,
+                "slot": "5"
+              }
+            ],
+            "numberOfBytes": "192"
+          },
+          "t_uint256": {
+            "label": "uint256",
+            "numberOfBytes": "32"
+          },
+          "t_uint32": {
+            "label": "uint32",
+            "numberOfBytes": "4"
+          },
+          "t_uint8": {
+            "label": "uint8",
+            "numberOfBytes": "1"
+          }
+        }
+      }
     }
   }
 }

.solhint.json

@@ -4,6 +4,6 @@
     "solhint:recommended"
   ],
   "rules": {
-    "indent": "2"
+    "max-line-length": "warn"
   }
 }

config/seeds.js

@@ -31,18 +31,55 @@ 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: '' }, { gasLimit: 350000 }]],
+  ['Contribution', 'add', [{
-  ['Contribution', 'add', [{ contributorId: 2, contributorIpfsHash: 'QmcHzEeAM26HV2zHTf5HnZrCtCtGdEccL5kUtDakAB7ozB', date: '2019-04-11', amount: 1500, kind: 'dev', description: '[67P/kredits-web] Reviewed stuff', url: '' }, { gasLimit: 350000 }]],
+    contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF',
-  ['Contribution', 'add', [{ contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF', date: '2019-04-11', amount: 5000, kind: 'dev', description: '[67P/kredits-contracts] Add tests', url: '' }, { gasLimit: 350000 }]],
+    date: '2019-04-11', amount: 500, kind: 'dev',
-  ['Contribution', 'add', [{ contributorId: 1, contributorIpfsHash: 'QmWKCYGr2rSf6abUPaTYqf98urvoZxGrb7dbspFZA6oyVF', date: '2019-04-11', amount: 1500, kind: 'dev', description: '[67P/kredits-contracts] Introduce contribution token', url: '' }, { gasLimit: 350000 }]],
+    description: '[67P/kredits-contracts] Test this thing',
-  ['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 }]],
+    url: '',
+    confirmedAtBlock: 1,
+  }, { gasLimit: 350000 }]],
 
-  ['Reimbursement', 'add', [{amount: 1116000, recipientId: 1, token: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599', expenses: [
+  ['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: [
     { 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' }
+    { title: 'Server rent', description: 'Dedicated server: centaurus.kosmos.org, April 2020', amount: 32, currency: 'EUR', date: '2020-05-28' },
-  ]}, { gasLimit: 300000 }]],
+  ], 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' }
+  ['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 }]],
 ];
 

contracts/Contribution.sol

@@ -95,13 +95,13 @@ contract Contribution is Initializable {
 
   // Balance is amount of ERC271 tokens, not amount of kredits
   function balanceOf(address owner) public view returns (uint256) {
-    require(owner != address(0));
+    require(owner != address(0), "Address invalid");
     uint32 contributorId = getContributorIdByAddress(owner);
     return ownedContributions[contributorId].length;
   }
 
   function ownerOf(uint32 contributionId) public view returns (address) {
-    require(exists(contributionId));
+    require(exists(contributionId), "Contribution does not exist");
     uint32 contributorId = contributions[contributionId].contributorId;
     return getContributorAddressById(contributorId);
   }
@@ -156,10 +156,8 @@ contract Contribution is Initializable {
   }
 
   function add(uint32 amount, uint32 contributorId, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, uint256 confirmedAtBlock, bool vetoed) public {
-    // require(canPerform(msg.sender, ADD_CONTRIBUTION_ROLE, new uint32[](0)), 'nope');
+    require((confirmedAtBlock == 0 && vetoed == false) || migrationDone == false, "Extra arguments not allowed");
-    // TODO hubot neither has kredits nor a core account
+    require(balanceOf(msg.sender) > 0 || contributorContract.addressIsCore(msg.sender), "Requires kredits or core status");
-    require((confirmedAtBlock == 0 && vetoed == false) || migrationDone == false, 'extra arguments during migration only');
-    require(balanceOf(msg.sender) > 0 || contributorContract.addressIsCore(msg.sender), 'requires kredits or core status');
 
     uint32 contributionId = contributionsCount + 1;
     ContributionData storage c = contributions[contributionId];
@@ -188,8 +186,8 @@ contract Contribution is Initializable {
 
   function veto(uint32 contributionId) public onlyCore {
     ContributionData storage c = contributions[contributionId];
-    require(c.exists, 'NOT_FOUND');
+    require(c.exists, "NOT_FOUND");
-    require(block.number < c.confirmedAtBlock, 'VETO_PERIOD_ENDED');
+    require(block.number < c.confirmedAtBlock, "VETO_PERIOD_ENDED");
     c.vetoed = true;
 
     emit ContributionVetoed(contributionId, msg.sender);

contracts/Contributor.sol

@@ -112,17 +112,17 @@ contract Contributor is Initializable {
     emit ContributorAdded(_id, account);
   }
 
-  function isCoreTeam(uint32 id) view public returns (bool) {
+  function isCoreTeam(uint32 id) public view returns (bool) {
     // TODO: for simplicity we simply define the first contributors as core
     // later this needs to be changed to something more dynamic
     return id > 0 && id < 7;
   }
 
-  function exists(uint32 id) view public returns (bool) {
+  function exists(uint32 id) public view returns (bool) {
     return contributors[id].exists;
   }
 
-  function addressIsCore(address account) view public returns (bool) {
+  function addressIsCore(address account) public view returns (bool) {
     // the deployer is always core
     if(account == deployer) {
       return true;
@@ -131,15 +131,15 @@ contract Contributor is Initializable {
     return isCoreTeam(id);
   }
 
-  function addressExists(address account) view public returns (bool) {
+  function addressExists(address account) public view returns (bool) {
     return getContributorByAddress(account).exists;
   }
 
-  function getContributorIdByAddress(address account) view public returns (uint32) {
+  function getContributorIdByAddress(address account) public view returns (uint32) {
     return contributorIds[account];
   }
 
-  function getContributorAddressById(uint32 id) view public returns (address) {
+  function getContributorAddressById(uint32 id) public view returns (address) {
     return contributors[id].account;
   }
 
@@ -148,7 +148,7 @@ contract Contributor is Initializable {
     return contributors[id];
   }
 
-  function getContributorById(uint32 _id) view public returns (uint32 id, address account, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, bool isCore, uint256 balance, uint32 totalKreditsEarned, uint256 contributionsCount, bool exists, uint256 kreditsWithdrawn) {
+  function getContributorById(uint32 _id) public view returns (uint32 id, address account, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, bool isCore, uint256 balance, uint32 totalKreditsEarned, uint256 contributionsCount, bool exists, uint256 kreditsWithdrawn) {
     id = _id;
     Contributor storage c = contributors[_id];
     account = c.account;

contracts/Reimbursement.sol

@@ -31,18 +31,35 @@ contract Reimbursement is Initializable {
 
   uint32 public blocksToWait;
 
+  // The address that deployed the contract
+  address public deployer;
+
+  // Data migration flag
+  bool public migrationDone;
+
   event ReimbursementAdded(uint32 id, address indexed addedByAccount, uint256 amount);
   event ReimbursementVetoed(uint32 id, address vetoedByAccount);
 
-  function initialize() public initializer {
-    blocksToWait = 40320; // 7 days; 15 seconds block time
-  }
-
   modifier onlyCore {
     require(contributorContract.addressIsCore(tx.origin), "Core only");
     _;
   }
 
+  modifier onlyDeployer {
+    require(msg.sender == deployer, "Deployer only");
+    _;
+  }
+
+  function initialize() public initializer {
+    deployer = msg.sender;
+    migrationDone = false;
+    blocksToWait = 40320; // 7 days; 15 seconds block time
+  }
+
+  function finishMigration() public onlyDeployer {
+    migrationDone = true;
+  }
+
   function setContributorContract(address contributor) public {
     require(address(contributorContract) == address(0) || contributorContract.addressIsCore(msg.sender), "Core only");
     contributorContract = ContributorInterface(contributor);
@@ -82,7 +99,8 @@ contract Reimbursement is Initializable {
     );
   }
 
-  function add(uint256 amount, address token, uint32 recipientId, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize) public onlyCore {
+  function add(uint256 amount, address token, uint32 recipientId, bytes32 hashDigest, uint8 hashFunction, uint8 hashSize, uint256 confirmedAtBlock, bool vetoed) public onlyCore {
+    require((confirmedAtBlock == 0 && vetoed == false) || migrationDone == false, "Extra arguments not allowed");
     uint32 reimbursementId = reimbursementsCount + 1;
     ReimbursementData storage r = reimbursements[reimbursementId];
     r.exists = true;
@@ -92,7 +110,14 @@ contract Reimbursement is Initializable {
     r.hashDigest = hashDigest;
     r.hashFunction = hashFunction;
     r.hashSize = hashSize;
-    r.confirmedAtBlock = block.number + blocksToWait;
+
+    if (confirmedAtBlock > 0) {
+      r.confirmedAtBlock = confirmedAtBlock;
+    } else {
+      r.confirmedAtBlock = block.number + 1 + blocksToWait;
+    }
+
+    if (vetoed) { r.vetoed = true; }
 
     reimbursementsCount++;
 
@@ -101,8 +126,8 @@ contract Reimbursement is Initializable {
 
   function veto(uint32 reimbursementId) public onlyCore {
     ReimbursementData storage r = reimbursements[reimbursementId];
-    require(r.exists, 'NOT_FOUND');
+    require(r.exists, "NOT_FOUND");
-    require(block.number < r.confirmedAtBlock, 'VETO_PERIOD_ENDED');
+    require(block.number < r.confirmedAtBlock, "VETO_PERIOD_ENDED");
     r.vetoed = true;
 
     emit ReimbursementVetoed(reimbursementId, msg.sender);

lib/abis/Reimbursement.json

@@ -1 +1 @@
-[{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint8","name":"version","type":"uint8"}],"name":"Initialized","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint32","name":"id","type":"uint32"},{"indexed":true,"internalType":"address","name":"addedByAccount","type":"address"},{"indexed":false,"internalType":"uint256","name":"amount","type":"uint256"}],"name":"ReimbursementAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint32","name":"id","type":"uint32"},{"indexed":false,"internalType":"address","name":"vetoedByAccount","type":"address"}],"name":"ReimbursementVetoed","type":"event"},{"inputs":[{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"token","type":"address"},{"internalType":"uint32","name":"recipientId","type":"uint32"},{"internalType":"bytes32","name":"hashDigest","type":"bytes32"},{"internalType":"uint8","name":"hashFunction","type":"uint8"},{"internalType":"uint8","name":"hashSize","type":"uint8"}],"name":"add","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"blocksToWait","outputs":[{"internalType":"uint32","name":"","type":"uint32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"contributorContract","outputs":[{"internalType":"contract ContributorInterface","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint32","name":"reimbursementId","type":"uint32"}],"name":"exists","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint32","name":"reimbursementId","type":"uint32"}],"name":"get","outputs":[{"internalType":"uint32","name":"id","type":"uint32"},{"internalType":"uint32","name":"recipientId","type":"uint32"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"token","type":"address"},{"internalType":"bytes32","name":"hashDigest","type":"bytes32"},{"internalType":"uint8","name":"hashFunction","type":"uint8"},{"internalType":"uint8","name":"hashSize","type":"uint8"},{"internalType":"uint256","name":"confirmedAtBlock","type":"uint256"},{"internalType":"bool","name":"exists","type":"bool"},{"internalType":"bool","name":"vetoed","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint32","name":"contributorId","type":"uint32"}],"name":"getContributorAddressById","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"contributorAccount","type":"address"}],"name":"getContributorIdByAddress","outputs":[{"internalType":"uint32","name":"","type":"uint32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"initialize","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint32","name":"","type":"uint32"}],"name":"reimbursements","outputs":[{"internalType":"uint32","name":"recipientId","type":"uint32"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"token","type":"address"},{"internalType":"bytes32","name":"hashDigest","type":"bytes32"},{"internalType":"uint8","name":"hashFunction","type":"uint8"},{"internalType":"uint8","name":"hashSize","type":"uint8"},{"internalType":"uint256","name":"confirmedAtBlock","type":"uint256"},{"internalType":"bool","name":"vetoed","type":"bool"},{"internalType":"bool","name":"exists","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"reimbursementsCount","outputs":[{"internalType":"uint32","name":"","type":"uint32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"contributor","type":"address"}],"name":"setContributorContract","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bool","name":"confirmedOnly","type":"bool"}],"name":"totalAmount","outputs":[{"internalType":"uint256","name":"amount","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint32","name":"reimbursementId","type":"uint32"}],"name":"veto","outputs":[],"stateMutability":"nonpayable","type":"function"}]
+[{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint8","name":"version","type":"uint8"}],"name":"Initialized","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint32","name":"id","type":"uint32"},{"indexed":true,"internalType":"address","name":"addedByAccount","type":"address"},{"indexed":false,"internalType":"uint256","name":"amount","type":"uint256"}],"name":"ReimbursementAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint32","name":"id","type":"uint32"},{"indexed":false,"internalType":"address","name":"vetoedByAccount","type":"address"}],"name":"ReimbursementVetoed","type":"event"},{"inputs":[{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"token","type":"address"},{"internalType":"uint32","name":"recipientId","type":"uint32"},{"internalType":"bytes32","name":"hashDigest","type":"bytes32"},{"internalType":"uint8","name":"hashFunction","type":"uint8"},{"internalType":"uint8","name":"hashSize","type":"uint8"},{"internalType":"uint256","name":"confirmedAtBlock","type":"uint256"},{"internalType":"bool","name":"vetoed","type":"bool"}],"name":"add","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"blocksToWait","outputs":[{"internalType":"uint32","name":"","type":"uint32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"contributorContract","outputs":[{"internalType":"contract ContributorInterface","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"deployer","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint32","name":"reimbursementId","type":"uint32"}],"name":"exists","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"finishMigration","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint32","name":"reimbursementId","type":"uint32"}],"name":"get","outputs":[{"internalType":"uint32","name":"id","type":"uint32"},{"internalType":"uint32","name":"recipientId","type":"uint32"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"token","type":"address"},{"internalType":"bytes32","name":"hashDigest","type":"bytes32"},{"internalType":"uint8","name":"hashFunction","type":"uint8"},{"internalType":"uint8","name":"hashSize","type":"uint8"},{"internalType":"uint256","name":"confirmedAtBlock","type":"uint256"},{"internalType":"bool","name":"exists","type":"bool"},{"internalType":"bool","name":"vetoed","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint32","name":"contributorId","type":"uint32"}],"name":"getContributorAddressById","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"contributorAccount","type":"address"}],"name":"getContributorIdByAddress","outputs":[{"internalType":"uint32","name":"","type":"uint32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"initialize","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"migrationDone","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint32","name":"","type":"uint32"}],"name":"reimbursements","outputs":[{"internalType":"uint32","name":"recipientId","type":"uint32"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"address","name":"token","type":"address"},{"internalType":"bytes32","name":"hashDigest","type":"bytes32"},{"internalType":"uint8","name":"hashFunction","type":"uint8"},{"internalType":"uint8","name":"hashSize","type":"uint8"},{"internalType":"uint256","name":"confirmedAtBlock","type":"uint256"},{"internalType":"bool","name":"vetoed","type":"bool"},{"internalType":"bool","name":"exists","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"reimbursementsCount","outputs":[{"internalType":"uint32","name":"","type":"uint32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"contributor","type":"address"}],"name":"setContributorContract","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bool","name":"confirmedOnly","type":"bool"}],"name":"totalAmount","outputs":[{"internalType":"uint256","name":"amount","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint32","name":"reimbursementId","type":"uint32"}],"name":"veto","outputs":[],"stateMutability":"nonpayable","type":"function"}]

lib/contracts/contribution.js

@@ -41,6 +41,8 @@ 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); }
@@ -56,9 +58,11 @@ class Contribution extends Record {
           ipfsHashAttr.hashDigest,
           ipfsHashAttr.hashFunction,
           ipfsHashAttr.hashSize,
+          confirmedAtBlock,
+          vetoed,
         ];
 
-        return this.contract.add(...contribution, 0, false, callOptions);
+        return this.contract.add(...contribution, callOptions);
       });
   }
 

lib/contracts/reimbursement.js

@@ -23,6 +23,8 @@ 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;
 
@@ -56,6 +58,8 @@ 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.2.0",
+  "version": "7.4.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@kredits/contracts",
-      "version": "7.2.0",
+      "version": "7.4.0",
       "license": "MIT",
       "dependencies": {
         "@kosmos/schemas": "^3.1.0",

package.json

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

scripts/export/reimbursements.js

@@ -0,0 +1,44 @@
+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 Reimbursement at: ${kredits.Reimbursement.contract.address}`);
+
+  const count = await kredits.Reimbursement.count;
+  const currentBlockHeight = await hre.ethers.provider.getBlockNumber();
+
+  const backup = {};
+  const promises = [];
+  for (let i = 1; i <= count; i++) {
+    promises.push(new Promise((resolve, reject) => {
+      setTimeout(async () => {
+        console.log(`Loading reimbursement #${i}`);
+        await kredits.Reimbursement.contract.get(i).then(contractData => {
+          backup[i] = {
+            recipientId: contractData.recipientId,
+            amount: contractData.amount,
+            token: contractData.token,
+            hashDigest: contractData.hashDigest,
+            hashFunction: contractData.hashFunction,
+            hashSize: contractData.hashSize,
+            confirmedAtBlock: contractData.confirmedAtBlock,
+            confirmed: contractData.confirmedAtBlock <= currentBlockHeight,
+            vetoed: contractData.vetoed,
+            id: contractData.id,
+          }
+          resolve();
+        });
+      }, 100 * i);
+    }));
+  }
+
+  await Promise.all(promises).then(() => {
+    fs.writeFileSync("./data/reimbursements.json", JSON.stringify(backup, null, 2));
+    console.log("Exported");
+  });
+}
+
+main();

scripts/import/contributions.js

@@ -14,13 +14,17 @@ async function main() {
     const contributions = JSON.parse(data);
     const ids = Object.keys(contributions)
       .map(k => parseInt(k))
-                      .sort(function(a, b){return a-b});
+      .sort(function(a, b) { return a - b });
 
     const currentBlockHeight = await kredits.provider.getBlockNumber();
     const confirmationPeriod = 40320 // blocks
     const unconfirmedHeight = currentBlockHeight + confirmationPeriod;
 
+    const startId = parseInt(process.env.START_AT || "0");
     for (const contributionId of ids) {
+      if (contributionId < startId) {
+        continue;
+      }
       const c = contributions[contributionId.toString()];
 
       const confirmedAtBlock = c.confirmed ? currentBlockHeight : unconfirmedHeight;
@@ -33,7 +37,7 @@ async function main() {
       console.log(`Adding contribution #${contributionId}: ${result.hash}`);
       await result.wait();
     };
-  } catch(e) {
+  } catch (e) {
     console.error(e);
   }
 }

scripts/import/reimbursements.js

@@ -0,0 +1,36 @@
+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 Reimbursement at: ${kredits.Reimbursement.contract.address}`);
+  const count = await kredits.Reimbursement.count;
+  console.log(`Currently ${count} entries`);
+  try {
+    const data = fs.readFileSync("./data/reimbursements.json");
+    const reimbursements = JSON.parse(data);
+    const ids = Object.keys(reimbursements)
+      .map(k => parseInt(k))
+      .sort(function(a, b) { return a - b });
+
+    for (const reimbursementId of ids) {
+      const reimbursement = reimbursements[reimbursementId.toString()];
+      const result = await kredits.Reimbursement.contract.add(
+        reimbursement.amount,
+        reimbursement.token,
+        reimbursement.recipientId,
+        reimbursement.hashDigest,
+        reimbursement.hashFunction,
+        reimbursement.hashSize,
+      );
+      console.log(`Adding reimbursement #${reimbursementId}: ${result.hash}`);
+      await result.wait();
+    };
+  } catch (e) {
+    console.error(e);
+  }
+}
+
+main();

test/contracts/Contribution.js

@@ -67,7 +67,7 @@ describe("Contribution contract", async function () {
         500, 1,
         "0xe794f010e617449719c64076546254129f63a6d16cf200031afa646aeb35777f",
         18, 32, 0, false
-      )).to.be.revertedWith("requires kredits or core status");
+      )).to.be.revertedWith("Requires kredits or core status");
       expect(await Contribution.contributionsCount()).to.equal(0);
     });
 
@@ -76,7 +76,7 @@ describe("Contribution contract", async function () {
         500, 1,
         "0xe794f010e617449719c64076546254129f63a6d16cf200031afa646aeb35777f",
         18, 32, 23000, true
-      )).to.be.revertedWith("extra arguments during migration only");
+      )).to.be.revertedWith("Extra arguments not allowed");
       expect(await Contribution.contributionsCount()).to.equal(0);
     });