@reality.eth/reality-eth-lib 3.2.61 → 3.3.0

package/formatters/question.js

@@ -131,6 +131,9 @@ exports.bytes32ToString = function(bytes32str, qjson) {
         var bn = new BN(bytes32str, 16).fromTwos(256);
     } else if (qtype == 'uint' || qtype == 'datetime') {
         var bn = new BN(bytes32str, 16);
+    } else if (qtype == 'hash') {
+        var bn = new BN(bytes32str, 16);
+        return module.exports.padToBytes32(bn.toString('hex')).toLowerCase();
     } else {
         throw Error("Unrecognized answer type " + qtype);
     }
@@ -449,6 +452,9 @@ exports.getAnswerString = function(question_json, answer) {
         case 'int':
             label = module.exports.bytes32ToString(answer, question_json);
             break;
+        case 'hash':
+            label = module.exports.bytes32ToString(answer, question_json);
+            break;
         case 'bool':
             if (new BigNumber(answer).toNumber() === 1) {
                 label = 'Yes';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reality.eth/reality-eth-lib",
-  "version": "3.2.61",
+  "version": "3.3.0",
   "description": "Tools for handling questions in the reality.eth fact verification platform",
   "scripts": {
     "test": "env TZ='Asia/Kabul' mocha ./test"
@@ -16,7 +16,7 @@
   "author": "Edmund Edgar (https://reality.eth.link)",
   "license": "GPL-3.0",
   "dependencies": {
-    "@reality.eth/contracts": "^3.0.77",
+    "@reality.eth/contracts": "^3.0.78",
     "bignumber.js": "^7.2.1",
     "bn.js": "^5.2.1",
     "ethereumjs-abi": "^0.6.5",
@@ -39,5 +39,5 @@
     "url": "https://github.com/RealityETH/monorepo/issues"
   },
   "homepage": "https://reality.eth.link",
-  "gitHead": "e7c5a92f690104c2e66c03aac4adabd0d6ca70ae"
+  "gitHead": "1756284eb0ea7e8f51aed54b39d7c3a9caa61395"
 }

package/test/formatters.js

@@ -98,6 +98,19 @@ describe('Answer strings', function() {
     expect(rc_question.getAnswerString(q, '0x000000000000000000000000000000000000000000000000016345785D8A0000')).to.equal('0.1');
     expect(rc_question.getAnswerString(q, '0x0000000000000000000000000000000000000000000000001BC16D674EC80000')).to.equal('2');
   });
+
+  it('Leaves bytes32 strings unchanged except forced to lower case', function() {
+    // We don't have a built-in type for this yet so just switch out the uint one
+    var q = rc_question.populatedJSONForTemplate(rc_template.defaultTemplateForType('uint'), '');
+    q['type'] = 'hash';
+    expect(rc_question.getAnswerString(q, '0x0000000000000000000000000000000000000000000000000000000000000000')).to.equal('0x0000000000000000000000000000000000000000000000000000000000000000');
+    expect(rc_question.getAnswerString(q, '0x0000000000000000000000000000000000000000000000000DE0B6B3A7640000')).to.equal('0x0000000000000000000000000000000000000000000000000de0b6b3a7640000');
+    expect(rc_question.getAnswerString(q, '0x0000000000000000000000000000000000000000000000000de0b6b3a7640000')).to.equal('0x0000000000000000000000000000000000000000000000000de0b6b3a7640000');
+    expect(rc_question.getAnswerString(q, '0x0000000000000000000000000000000000000000000000001BC16D674EC80000')).to.equal('0x0000000000000000000000000000000000000000000000001BC16D674EC80000'.toLowerCase());
+    expect(rc_question.getAnswerString(q, '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff')).to.equal('Invalid');
+  });
+
+
 /*
   it('Handles ints as expected using 1 decimal', function() {
     var q = rc_question.populatedJSONForTemplate(rc_template.defaultTemplateForType('int'), '');