Comparing version 4.0.2 to 5.0.0
@@ -22,11 +22,15 @@ 'use strict'; | ||
Fcbuffer: Fcbuffer | ||
}; | ||
// Eos.Mainnet = config => .. | ||
function development(Network) { | ||
return function (config) { | ||
var network = Network(Object.assign({}, { apiLog: consoleObjCallbackLog }, config)); | ||
var eosConfig = Object.assign({}, { transactionLog: consoleObjCallbackLog }, config); | ||
return createEos(eosConfig, Network, network); | ||
}; | ||
} | ||
};Eos.Testnet = function (config) { | ||
var Network = api.Testnet; | ||
var network = Network(Object.assign({}, { apiLog: consoleObjCallbackLog }, config)); | ||
var eosConfig = Object.assign({}, { transactionLog: consoleObjCallbackLog }, config); | ||
return createEos(eosConfig, Network, network); | ||
}; | ||
Eos.Testnet = development(api.Testnet); | ||
Eos.Localnet = development(api.Localnet); | ||
// Eos.Mainnet = config => .. | ||
@@ -33,0 +37,0 @@ function createEos(config, Network, network) { |
@@ -9,3 +9,2 @@ 'use strict'; | ||
var Eos = require('.'); | ||
var eos = void 0; | ||
@@ -18,3 +17,3 @@ // even transactions that don't broadcast require Api lookups | ||
it('testnet', function (done) { | ||
eos = Eos.Testnet(); | ||
var eos = Eos.Localnet(); | ||
eos.getBlock(1, function (err, block) { | ||
@@ -41,3 +40,3 @@ if (err) { | ||
it('usage', function () { | ||
eos = Eos.Testnet({ signProvider: signProvider }); | ||
var eos = Eos.Localnet({ signProvider: signProvider }); | ||
eos.transfer(); | ||
@@ -57,3 +56,3 @@ }); | ||
eos = Eos.Testnet({ keyProvider: keyProvider }); | ||
var eos = Eos.Localnet({ keyProvider: keyProvider }); | ||
@@ -82,3 +81,3 @@ return eos.transfer('inita', 'initb', 1, '', false).then(function (tr) { | ||
}; | ||
eos = Eos.Testnet({ signProvider: customSignProvider }); | ||
var eos = Eos.Localnet({ signProvider: customSignProvider }); | ||
return eos.transfer('inita', 'initb', 2, '', false); | ||
@@ -88,3 +87,3 @@ }); | ||
it('newaccount (broadcast)', function () { | ||
eos = Eos.Testnet({ signProvider: signProvider }); | ||
var eos = Eos.Localnet({ signProvider: signProvider }); | ||
var pubkey = 'EOS6MRyAjQq8ud7hVNYcfnVPJqcVpscN5So8BhtHuGYqET5GDW5CV'; | ||
@@ -105,3 +104,3 @@ // const auth = {threshold: 1, keys: [{key: pubkey, weight: 1}], accounts: []} | ||
it('transfer (broadcast)', function () { | ||
eos = Eos.Testnet({ signProvider: signProvider }); | ||
var eos = Eos.Localnet({ signProvider: signProvider }); | ||
return eos.transfer('inita', 'initb', 1, ''); | ||
@@ -111,3 +110,3 @@ }); | ||
it('transfer custom authorization (broadcast)', function () { | ||
eos = Eos.Testnet({ signProvider: signProvider }); | ||
var eos = Eos.Localnet({ signProvider: signProvider }); | ||
return eos.transfer('inita', 'initb', 1, '', { authorization: 'inita@owner' }); | ||
@@ -117,3 +116,3 @@ }); | ||
it('transfer custom authorization sorting (no broadcast)', function () { | ||
eos = Eos.Testnet({ signProvider: signProvider }); | ||
var eos = Eos.Localnet({ signProvider: signProvider }); | ||
return eos.transfer('inita', 'initb', 1, '', { authorization: ['initb@owner', 'inita@owner'], broadcast: false }).then(function (_ref4) { | ||
@@ -128,3 +127,3 @@ var transaction = _ref4.transaction; | ||
it('transfer custom scope (broadcast)', function () { | ||
eos = Eos.Testnet({ signProvider: signProvider }); | ||
var eos = Eos.Localnet({ signProvider: signProvider }); | ||
// To pass: initb, inita must get sorted to: inita, initb | ||
@@ -135,3 +134,3 @@ return eos.transfer('inita', 'initb', 2, '', { scope: ['initb', 'inita'] }); | ||
it('transfer custom scope array (no broadcast)', function () { | ||
eos = Eos.Testnet({ signProvider: signProvider }); | ||
var eos = Eos.Localnet({ signProvider: signProvider }); | ||
// To pass: scopes must get sorted | ||
@@ -146,3 +145,3 @@ return eos.transfer('inita', 'initb', 1, '', { scope: ['joe', 'billy'], broadcast: false }).then(function (_ref5) { | ||
it('transfer (no broadcast)', function () { | ||
eos = Eos.Testnet({ signProvider: signProvider }); | ||
var eos = Eos.Localnet({ signProvider: signProvider }); | ||
return eos.transfer('inita', 'initb', 1, '', { broadcast: false }); | ||
@@ -152,3 +151,3 @@ }); | ||
it('transfer (no broadcast, no sign)', function () { | ||
eos = Eos.Testnet({ signProvider: signProvider }); | ||
var eos = Eos.Localnet({ signProvider: signProvider }); | ||
var opts = { broadcast: false, sign: false }; | ||
@@ -161,3 +160,3 @@ return eos.transfer('inita', 'initb', 1, '', opts).then(function (tr) { | ||
it('transfer sign promise (no broadcast)', function () { | ||
eos = Eos.Testnet({ signProvider: promiseSigner }); | ||
var eos = Eos.Localnet({ signProvider: promiseSigner }); | ||
return eos.transfer('inita', 'initb', 1, '', false); | ||
@@ -168,3 +167,3 @@ }); | ||
var name = randomName(); | ||
return Eos.Testnet({ signProvider: signProvider }).contract(name).then(function () { | ||
return Eos.Localnet({ signProvider: signProvider }).contract(name).then(function () { | ||
throw 'expecting error'; | ||
@@ -180,3 +179,3 @@ }).catch(function (error) { | ||
var name = 'eos'; | ||
return Eos.Testnet({ signProvider: signProvider }).contract(name).then(function (contract) { | ||
return Eos.Localnet({ signProvider: signProvider }).contract(name).then(function (contract) { | ||
contract.transfer('inita', 'initd', 1, '') | ||
@@ -198,3 +197,3 @@ // transaction sent on each command | ||
var amt = 1; // for unique transactions | ||
var testnet = Eos.Testnet({ signProvider: signProvider }); | ||
var testnet = Eos.Localnet({ signProvider: signProvider }); | ||
@@ -223,3 +222,3 @@ var trTest = function trTest(eos) { | ||
it('message to contract (contract tr nesting)', function () { | ||
var tn = Eos.Testnet({ signProvider: signProvider }); | ||
var tn = Eos.Localnet({ signProvider: signProvider }); | ||
return tn.contract('eos').then(function (eos) { | ||
@@ -235,3 +234,3 @@ eos.transaction(function (tr) { | ||
it('multi-message transaction (broadcast)', function () { | ||
eos = Eos.Testnet({ signProvider: signProvider }); | ||
var eos = Eos.Localnet({ signProvider: signProvider }); | ||
return eos.transaction(function (tr) { | ||
@@ -246,3 +245,3 @@ assert(tr.transfer('inita', 'initb', 1, '') == null); | ||
it('multi-message transaction no inner callback', function () { | ||
eos = Eos.Testnet({ signProvider: signProvider }); | ||
var eos = Eos.Localnet({ signProvider: signProvider }); | ||
eos.transaction(function (tr) { | ||
@@ -258,3 +257,3 @@ tr.okproducer('inita', 'inita', 1, function (cb) {}); | ||
it('multi-message transaction error rollback', function () { | ||
eos = Eos.Testnet({ signProvider: signProvider }); | ||
var eos = Eos.Localnet({ signProvider: signProvider }); | ||
return eos.transaction(function (tr) { | ||
@@ -270,3 +269,3 @@ throw 'rollback'; | ||
it('multi-message transaction Promise.reject rollback', function () { | ||
eos = Eos.Testnet({ signProvider: signProvider }); | ||
var eos = Eos.Localnet({ signProvider: signProvider }); | ||
eos.transaction(function (tr) { | ||
@@ -282,3 +281,3 @@ return Promise.reject('rollback'); | ||
it('custom transfer', function () { | ||
eos = Eos.Testnet({ signProvider: signProvider }); | ||
var eos = Eos.Localnet({ signProvider: signProvider }); | ||
return eos.transaction({ | ||
@@ -285,0 +284,0 @@ scope: ['inita', 'initb'], |
@@ -12,3 +12,3 @@ 'use strict'; | ||
it('asset', function () { | ||
var eos = Eos.Testnet(); | ||
var eos = Eos.Localnet(); | ||
var types = eos.fc.types; | ||
@@ -28,3 +28,3 @@ | ||
it('authority', function () { | ||
var eos = Eos.Testnet(); | ||
var eos = Eos.Localnet(); | ||
var authority = eos.fc.structs.authority; | ||
@@ -41,3 +41,3 @@ | ||
it('public_key', function () { | ||
var eos = Eos.Testnet(); | ||
var eos = Eos.Localnet(); | ||
var _eos$fc = eos.fc, | ||
@@ -54,3 +54,3 @@ structs = _eos$fc.structs, | ||
it('asset_symbol', function () { | ||
var eos = Eos.Testnet(); | ||
var eos = Eos.Localnet(); | ||
var types = eos.fc.types; | ||
@@ -70,3 +70,3 @@ | ||
it('json', function () { | ||
var eos = Eos.Testnet({ forceMessageDataHex: false }); | ||
var eos = Eos.Localnet({ forceMessageDataHex: false }); | ||
var _eos$fc2 = eos.fc, | ||
@@ -91,3 +91,3 @@ structs = _eos$fc2.structs, | ||
it('hex', function () { | ||
var eos = Eos.Testnet({ forceMessageDataHex: false, debug: false }); | ||
var eos = Eos.Localnet({ forceMessageDataHex: false, debug: false }); | ||
var _eos$fc3 = eos.fc, | ||
@@ -120,3 +120,3 @@ structs = _eos$fc3.structs, | ||
it('force hex', function () { | ||
var eos = Eos.Testnet({ forceMessageDataHex: true }); | ||
var eos = Eos.Localnet({ forceMessageDataHex: true }); | ||
var _eos$fc4 = eos.fc, | ||
@@ -152,3 +152,3 @@ structs = _eos$fc4.structs, | ||
it('unknown type', function () { | ||
var eos = Eos.Testnet({ forceMessageDataHex: false }); | ||
var eos = Eos.Localnet({ forceMessageDataHex: false }); | ||
var _eos$fc5 = eos.fc, | ||
@@ -155,0 +155,0 @@ structs = _eos$fc5.structs, |
{ | ||
"name": "eosjs", | ||
"version": "4.0.2", | ||
"version": "5.0.0", | ||
"description": "General purpose library for the EOS blockchain.", | ||
"main": "lib/index.js", | ||
"scripts": { | ||
"test": "mocha src/*.test.js", | ||
"test": "mocha --use_strict src/*.test.js", | ||
"coverage": "istanbul cover _mocha -- -R spec src/*.test.js", | ||
"coveralls": "npm run coverage && cat ./coverage/lcov.info | ./node_modules/.bin/coveralls", | ||
"prepublish": "npm run prepublish_lib && npm run prepublish_test", | ||
"prepublish_lib": "node_modules/babel-cli/bin/babel.js src --out-dir lib", | ||
"prepublish_test": "mocha lib/*.test.js", | ||
"prepublish_lib": "babel src --out-dir lib", | ||
"prepublish_test": "mocha --use_strict lib/*.test.js", | ||
"browserify": "mkdir -p dist && browserify -o dist/eos.js -s Eos src/index.js", | ||
@@ -42,3 +42,3 @@ "build": "npm run prepublish && npm run browserify" | ||
"create-hash": "^1.1.3", | ||
"eosjs-api": "^2.0.1", | ||
"eosjs-api": "^3.0.0", | ||
"eosjs-ecc": "^1.6.1", | ||
@@ -45,0 +45,0 @@ "eosjs-json": "^2.0.2", |
@@ -11,6 +11,6 @@ [](https://travis-ci.org/EOSIO/eosjs) | ||
```javascript | ||
Eos = require('eosjs') // Or Eos = require('./src') | ||
Eos = require('eosjs') // Eos = require('./src') | ||
// API, note: testnet uses eosd at localhost (until there is a testnet) | ||
eos = Eos.Testnet() | ||
let eos = Eos.Testnet() | ||
@@ -45,3 +45,3 @@ // All API methods print help when called with no-arguments. | ||
```js | ||
Eos = require('eosjs') // Or Eos = require('./src') | ||
Eos = require('eosjs') // Eos = require('./src') | ||
@@ -56,3 +56,5 @@ config = { | ||
eos = Eos.Testnet(config) | ||
eos = Eos.Localnet(config) | ||
eos.getBlock(1) | ||
``` | ||
@@ -91,6 +93,8 @@ | ||
If you use the Testnet, you'll need to replace the private key in keyProvider. | ||
```javascript | ||
Eos = require('eosjs') // Or Eos = require('./src') | ||
Eos = require('eosjs') // Eos = require('./src') | ||
eos = Eos.Testnet({keyProvider: '5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3'}) | ||
eos = Eos.Localnet({keyProvider: '5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3'}) | ||
@@ -128,3 +132,3 @@ // Run with no arguments to print usage. | ||
```javascript | ||
Eos = require('eosjs') // Or Eos = require('./src') | ||
Eos = require('eosjs') // Eos = require('./src') | ||
@@ -135,3 +139,3 @@ initaPrivate = '5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3' | ||
eos = Eos.Testnet({keyProvider}) | ||
eos = Eos.Localnet({keyProvider}) | ||
@@ -152,3 +156,3 @@ eos.newaccount({ | ||
```javascript | ||
Eos = require('eosjs') // Or Eos = require('./src') | ||
Eos = require('eosjs') // Eos = require('./src') | ||
let {ecc} = Eos.modules | ||
@@ -165,3 +169,3 @@ | ||
eos = Eos.Testnet({keyProvider}) | ||
eos = Eos.Localnet({keyProvider}) | ||
@@ -187,3 +191,3 @@ eos.newaccount({ | ||
// Transfer is one of the actions in currency.abi | ||
currency.transfer('currency', 'inita', 10) | ||
currency.transfer('currency', 'inita', 100) | ||
}) | ||
@@ -198,3 +202,3 @@ | ||
```javascript | ||
Eos = require('eosjs') // Or Eos = require('./src') | ||
Eos = require('eosjs') // Eos = require('./src') | ||
@@ -206,3 +210,3 @@ keyProvider = [ | ||
testnet = Eos.Testnet({keyProvider}) | ||
testnet = Eos.Localnet({keyProvider}) | ||
@@ -250,5 +254,5 @@ // if either transfer fails, both will fail (1 transaction, 2 messages) | ||
```javascript | ||
Eos = require('eosjs') // Or Eos = require('./src') | ||
Eos = require('eosjs') // Eos = require('./src') | ||
eos = Eos.Testnet({keyProvider: '5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3'}) | ||
eos = Eos.Localnet({keyProvider: '5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3'}) | ||
@@ -255,0 +259,0 @@ eos.transaction({ |
Sorry, the diff of this file is too big to display
3587607
42904
339
+ Addedeosjs-api@3.0.4(transitive)
+ Addedis-browser@2.1.0(transitive)
- Removedeosjs-api@2.0.1(transitive)
Updatedeosjs-api@^3.0.0