Skip to content

Commit

Permalink
Merge pull request #75 from echoprotocol/develop
Browse files Browse the repository at this point in the history
merge develop into master
  • Loading branch information
Nickolai Borsuk authored Dec 2, 2019
2 parents a72a032 + ea55536 commit dd97193
Show file tree
Hide file tree
Showing 113 changed files with 2,439 additions and 3,615 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
{
"SwitchCase": 1
}
]
],
"no-console": 0
}
}
2 changes: 1 addition & 1 deletion config/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"96": "images/96.png",
"128": "images/128.png"
},
"version": "1.14.0",
"version": "1.15.0",
"background": {
"scripts": [
"background.js"
Expand Down
1 change: 1 addition & 0 deletions examples/examples.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ tr.addOperation(window.echojslib.constants.OPERATIONS_IDS.ACCOUNT_CREATE, {
num_committee: 0,
votes: [],
extensions: [],
delegate_share: 0
},
}
);
Expand Down
13 changes: 7 additions & 6 deletions examples/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ <h4>Transfer</h4>
id="transfer-fromAddress"
name="transfer-fromAddress"
placeholder="from"
value="1.2.1204"
value="1.2.18"
/>
<input
type="text"
Expand Down Expand Up @@ -122,7 +122,7 @@ <h4>Contract</h4>
id="contract-registrar"
name="contract-registrar"
placeholder="registrar"
value="1.2.1204"
value="1.2.18"
/>
<input
type="text"
Expand Down Expand Up @@ -176,7 +176,7 @@ <h4>Create Contract</h4>
id="contactCreate-fromAddress"
name="transfer-fromAddress"
placeholder="from"
value="1.2.1204"
value="1.2.18"
/>
<input
type="number"
Expand Down Expand Up @@ -222,7 +222,7 @@ <h4>Create account</h4>
id="createAccount-registrar"
name="createAccount-registrar"
placeholder="registrar"
value="1.2.1204"
value="1.2.18"
/>
<input
type="text"
Expand Down Expand Up @@ -267,7 +267,7 @@ <h4>Update account</h4>
id="updateAccount-registrar"
name="createAccount-registrar"
placeholder="registrar"
value="1.2.1204"
value="1.2.18"
/>
<input
type="text"
Expand Down Expand Up @@ -305,7 +305,7 @@ <h4>Sign message</h4>
id="signMessage-account"
name="signMessage-account"
placeholder="account"
value="1.2.1204"
value="1.2.18"
/>
<button id="signMessage-click">sign message</button>
<div id="signMessage-info"></div>
Expand Down Expand Up @@ -594,6 +594,7 @@ <h4>Sign message</h4>
num_committee: 0,
votes: [],
extensions: [],
delegate_share: 0
}
};

Expand Down
2 changes: 2 additions & 0 deletions extension/SignTransaction.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* eslint-disable no-underscore-dangle */

import { serializers, Signature } from 'echojs-lib';

import { EXPIRATION_INFELICITY, GLOBAL_ID_1 } from '../src/constants/GlobalConstants';
Expand Down
Loading

0 comments on commit dd97193

Please sign in to comment.