eosjs - npm Package Compare versions

Comparing version 6.1.6 to 6.1.7

lib/abi-cache.js

@@ -48,2 +48,3 @@ 'use strict';
   if (abi.types) {
+    // aliases
     abi.types.forEach(function (e) {
@@ -50,0 +51,0 @@ abiSchema[e.new_type_name] = e.type;

lib/structs.js

@@ -35,3 +35,39 @@ 'use strict';
     var abi = config.abiCache.abi(code);
-    return abi.structs[name];
+    var struct = abi.structs[name];
+    if (struct != null) {
+      return struct;
+    }
+    var _iteratorNormalCompletion = true;
+    var _didIteratorError = false;
+    var _iteratorError = undefined;
+
+    try {
+      for (var _iterator = abi.abi.actions[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+        var action = _step.value;
+        var action_name = action.action_name,
+            type = action.type;
+
+        if (action_name === name) {
+          var _struct = abi.structs[type];
+          if (_struct != null) {
+            return _struct;
+          }
+        }
+      }
+    } catch (err) {
+      _didIteratorError = true;
+      _iteratorError = err;
+    } finally {
+      try {
+        if (!_iteratorNormalCompletion && _iterator.return) {
+          _iterator.return();
+        }
+      } finally {
+        if (_didIteratorError) {
+          throw _iteratorError;
+        }
+      }
+    }
+
+    throw new Error('Missing ABI struct or action: ' + name);
   };
@@ -76,3 +112,3 @@
   if (errors.length !== 0) {
-    throw new Error(JSON.stringify(errors, null, 4));
+    throw new Error(JSON.stringify(errors, null, 4) + '\nin\n' + JSON.stringify(schema, null, 4));
   }
@@ -165,9 +201,9 @@
       var symbol = '';
-      var _iteratorNormalCompletion = true;
-      var _didIteratorError = false;
-      var _iteratorError = undefined;
+      var _iteratorNormalCompletion2 = true;
+      var _didIteratorError2 = false;
+      var _iteratorError2 = undefined;
 
       try {
-        for (var _iterator = bin.slice(1)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-          var code = _step.value;
+        for (var _iterator2 = bin.slice(1)[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+          var code = _step2.value;
 
@@ -180,12 +216,12 @@ if (code == '\0') {
       } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
+        _didIteratorError2 = true;
+        _iteratorError2 = err;
       } finally {
         try {
-          if (!_iteratorNormalCompletion && _iterator.return) {
-            _iterator.return();
+          if (!_iteratorNormalCompletion2 && _iterator2.return) {
+            _iterator2.return();
           }
         } finally {
-          if (_didIteratorError) {
-            throw _iteratorError;
+          if (_didIteratorError2) {
+            throw _iteratorError2;
           }
@@ -192,0 +228,0 @@ }

lib/write-api.js

@@ -200,5 +200,7 @@ 'use strict';
         var definition = schemaFields(cache.schema, type);
-        contractMerge[action_name] = genMethod(type, definition, contractMerge.transaction, code);
+        contractMerge[action_name] = genMethod(type, definition, contractMerge.transaction, code, action_name);
       });
 
+      contractMerge.fc = cache;
+
       return contractMerge;
@@ -210,2 +212,3 @@ });
     var code = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'eos';
+    var action_name = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : type;
 
@@ -281,3 +284,3 @@ return function () {
           code: code,
-          type: type,
+          type: action_name,
           data: params,
@@ -284,0 +287,0 @@ authorization: authorization

package.json

 {
   "name": "eosjs",
-  "version": "6.1.6",
+  "version": "6.1.7",
   "description": "General purpose library for the EOS blockchain.",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

test.js

@@ -6,31 +6,50 @@ /* eslint-env mocha */
 
+const keyProvider = [
+  '5JCMLHSyJcx6mUCfJpvVod8WMAycq8v3bewrJbvzhp5nhfiVYsk',
+  '5JGByospJ5mUkameanYCwLzeYW9QUKLvu8Qvr3PTnj3LV35oXA8',
+  '5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3',
+  '5JMJebgWSzY9aU7SRKk7r9J1r8znkUSdUA5kUNUtzUZnVwjFn7V'
+]
+
 describe('./test', async function() {
-  it('tic.tac.toe', async function() {
-    const keyProvider = [
-      // '5JCMLHSyJcx6mUCfJpvVod8WMAycq8v3bewrJbvzhp5nhfiVYsk',
-      // '5JGByospJ5mUkameanYCwLzeYW9QUKLvu8Qvr3PTnj3LV35oXA8',
-      '5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3',
-      // '5JMJebgWSzY9aU7SRKk7r9J1r8znkUSdUA5kUNUtzUZnVwjFn7V'
-    ]
-    eos = Eos.Localnet({keyProvider})
 
-    const game = await eos.contract('tic.tac.toe')
+  it('actions', async function() {
+    const msg = {
+      "buyer":{ "name": "inita", "number": "1516073924"},
+      "at_price":"5000000000000000",
+      "expiration":"2018-12-31T23:59:59",
+      "quantity": "100",
+      "fill_or_kill": 0
+    }
 
-    game.create()
+    const eos = Eos.Localnet({keyProvider})
+    const ex = await eos.contract('exchange')
+    const options = {scope: ['exchange'], authorization: ['inita@active']}
+    ex.buy(msg, options)
+  })
 
-    const create = await game.create(//'inita', 'initb',
-      {challenger: 'inita', host: 'initb'},
-      {
-        broadcast: true,
-        scope: ['inita', 'initb'],
-        authorization: ['initb@active']
-      }
-    )
 
-    console.log('create =', JSON.stringify(create))
-
-    // const close = await t.close('inita', 'initb', {broadcast: true, authorization: ['inita@active', 'initb@active']})
-
-
-  })
+  // it('tic.tac.toe', async function() {
+    
+  //   eos = Eos.Localnet({keyProvider})
+  // 
+  //   const game = await eos.contract('tic.tac.toe')
+  // 
+  //   game.create()
+  // 
+  //   const create = await game.create(//'inita', 'initb',
+  //     {challenger: 'inita', host: 'initb'},
+  //     {
+  //       broadcast: true,
+  //       scope: ['inita', 'initb'],
+  //       authorization: ['initb@active']
+  //     }
+  //   )
+  // 
+  //   console.log('create =', JSON.stringify(create))
+  // 
+  //   // const close = await t.close('inita', 'initb', {broadcast: true, authorization: ['inita@active', 'initb@active']})
+  // 
+  // 
+  // })
 })

No alert changes

Improved metrics

Total package byte prevSize

1924195

increased by0.09%

Lines of code

53015

increased by0.11%

No dependency changes