kredits/kredits-web
9
0
Fork 0
Code Issues 22 Pull Requests 1 Actions Releases 18 Activity

Merge pull request #29 from 67P/ethers

Browse Source 
Use ethers.js instead of the old web3
This commit was merged in pull request #29.
This commit is contained in:
fsmanuel
2018-04-04 14:20:55 +02:00
committed by GitHub
parent f00ecfd9ab e2d02d357c
commit 1a58099413
9 changed files with 776 additions and 725 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/components/add-contributor/component.js
+3 -3
View File
@@ -18,9 +18,9 @@ export default Component.extend({
inProgress: false,
isValidAddress: function() {
return this.get('kredits.web3')
.isAddress(this.get('newContributor.address'));
}.property('kredits.web3', 'newContributor.address'),
// TODO: add proper address validation
return this.get('newContributor.address') !== '';
}.property('kredits.ethProvider', 'newContributor.address'),
isValidName: function() {
return isPresent(this.get('newContributor.name'));
app/components/add-proposal/component.js
+2 -1
View File
@@ -18,7 +18,8 @@ export default Component.extend({
inProgress: false,
isValidRecipient: computed('proposal.recipientAddress', function() {
return this.get('kredits.web3').isAddress(this.get('proposal.recipientAddress'));
// TODO: add proper address validation
return this.get('proposal.recipientAddress') !== '';
}),
isValidAmount: computed('proposal.amount', function() {
app/controllers/index.js
+25 -41
View File
@@ -12,7 +12,7 @@ export default Ember.Controller.extend({
kredits: service(),
contractInteractionEnabled: computed.alias('kredits.web3Provided'),
contractInteractionEnabled: computed.alias('kredits.hasAccounts'),
proposalsOpen: function() {
let proposals = this.get('model.proposals')
@@ -47,78 +47,62 @@ export default Ember.Controller.extend({
contributorsSorting: ['balance:desc'],
contributorsSorted: Ember.computed.sort('contributorsWithKredits', 'contributorsSorting'),
watchContractEvents: function() {
init() {
this._super(...arguments);
this.get('kredits.kreditsContract')
.then((contract) => {
let events = contract.get('content').allEvents();
events.watch((error, data) => {
Ember.Logger.debug('[index] Received contract event', data);
switch (data.event) {
case 'ProposalCreated':
this._handleProposalCreated(data);
break;
case 'ProposalExecuted':
this._handleProposalExecuted(data);
break;
case 'ProposalVoted':
this._handleProposalVoted(data);
break;
case 'Transfer':
this._handleTransfer(data);
break;
}
});
contract.onproposalvoted = this._handleProposalVoted.bind(this);
contract.onproposalcreated = this._handleProposalCreated.bind(this);
contract.onproposalexecuted = this._handleProposalExecuted.bind(this);
// TODO: transfer on the token contract
});
}.on('init'),
},
_handleProposalCreated(data) {
_handleProposalCreated(proposalId, creatorAddress, recipientAddress, amount) {
if (Ember.isPresent(this.get('model.proposals')
.findBy('id', data.args.id.toNumber()))) {
.findBy('id', proposalId.toNumber()))) {
Ember.Logger.debug('[index] proposal exists, not adding from event');
return false;
}
let proposal = Proposal.create({
id: data.args.id.toNumber(),
creatorAddress: data.args.creator,
recipientAddress: data.args.recipient,
id: proposalId.toNumber(),
creatorAddress: creatorAddress,
recipientAddress: recipientAddress,
recipientName: null,
votesCount: 0,
votesNeeded: 2,
amount: data.args.amount.toNumber(),
executed: false,
url: data.args.url,
ipfsHash: data.args.ipfsHash
amount: amount.toNumber(),
executed: false
});
this.get('model.proposals').pushObject(proposal);
},
_handleProposalExecuted(data) {
_handleProposalExecuted(proposalId, recipientId, amount) {
if (this.get('model.proposals')
.findBy('id', data.args.id.toNumber())
.findBy('id', recipientId.toNumber())
.get('executed')) {
Ember.Logger.debug('[index] proposal already executed, not adding from event');
return false;
}
this.get('model.proposals')
.findBy('id', data.args.id.toNumber())
.findBy('id', recipientId.toNumber())
.setProperties({
'executed': true,
'votesCount': 2 // TODO use real count
});
this.get('model.contributors')
.findBy('address', data.args.recipient)
.incrementProperty('balance', data.args.amount.toNumber());
.findBy('id', recipientId)
.incrementProperty('balance', amount.toNumber());
},
_handleProposalVoted(data) {
_handleProposalVoted(proposalId, voter, totalVotes) {
this.get('model.proposals')
.findBy('id', data.args.id.toNumber())
.incrementProperty('votesCount', 1);
.findBy('id', proposalId.toNumber())
.setProperties({ 'votesCount': totalVotes });
},
_handleTransfer(data) {
@@ -134,8 +118,8 @@ export default Ember.Controller.extend({
actions: {
confirmProposal(proposalId) {
this.get('kredits').vote(proposalId).then(transactionId => {
window.confirm('Vote submitted to Ethereum blockhain: '+transactionId);
this.get('kredits').vote(proposalId).then(transaction => {
window.confirm('Vote submitted to Ethereum blockhain: '+transaction.hash);
});
}
app/routes/index.js
+7 -10
View File
@@ -6,16 +6,13 @@ export default Ember.Route.extend({
beforeModel(transition) {
const kredits = this.get('kredits');
if (kredits.get('web3') && kredits.get('web3Provided')) {
kredits.get('web3').eth.getAccounts((error, accounts) => {
if (error || accounts.length === 0) {
if (confirm('It looks like you have an Ethereum wallet available. Please unlock your account.')) {
transition.retry();
}
return kredits.initEthProvider().then(() => {
if (kredits.get('accountNeedsUnlock')) {
if (confirm('It looks like you have an Ethereum wallet available. Please unlock your account.')) {
transition.retry();
}
});
}
}
});
},
model() {
@@ -24,7 +21,7 @@ export default Ember.Route.extend({
let kredits = this.get('kredits');
let totalSupply = kredits.get('tokenContract')
.then((contract) => contract.invoke('totalSupply'));
.then((contract) => contract.totalSupply());
return Ember.RSVP.hash({
contributors: kredits.getContributors(),
app/services/kredits.js
+65 -88
View File
@@ -1,4 +1,4 @@
import Web3 from 'npm:web3';
import ethers from 'npm:ethers';
import bs58 from 'npm:bs58';
import NpmBuffer from 'npm:buffer';
@@ -24,92 +24,77 @@ const {
const Buffer = NpmBuffer.Buffer;
function contractProxy(object) {
let proxy = Ember.ObjectProxy.extend({
invoke(contractMethod, ...args) {
debug('[kredits] invoke', contractMethod, ...args);
let contract = this.get('content');
return RSVP.denodeify(contract[contractMethod])(...args);
}
});
return proxy.create({ content: object });
}
export default Service.extend({
ipfs: injectService(),
web3Instance: null,
web3Provided: false, // Web3 provided (using Mist Browser, Metamask et al.)
ethProvider: null,
currentUserAccounts: null, // default to not having an account. this is the wen web3 is loaded.
web3: function() {
if (this.get('web3Instance')) {
return this.get('web3Instance');
}
// this is called called in the routes beforeModel(). So it is initialized before everything else
// and we can rely on the ethProvider and the potential currentUserAccounts to be available
initEthProvider: function() {
return new Ember.RSVP.Promise((resolve) => {
let ethProvider;
let networkId;
if (typeof window.web3 !== 'undefined') {
debug('[kredits] Using user-provided instance, e.g. from Mist browser or Metamask');
networkId = parseInt(window.web3.version.network);
ethProvider = new ethers.providers.Web3Provider(window.web3.currentProvider, {chainId: networkId});
ethProvider.listAccounts().then((accounts) => {
this.set('currentUserAccounts', accounts);
this.set('ethProvider', ethProvider);
resolve(ethProvider);
});
} else {
debug('[kredits] Creating new instance from npm module class');
let providerUrl = localStorage.getItem('config:web3ProviderUrl') || config.web3ProviderUrl;
networkId = parseInt(config.contractMetadata.networkId);
ethProvider = new ethers.providers.JsonRpcProvider(providerUrl, {chainId: networkId});
this.set('ethProvider', ethProvider);
resolve(ethProvider);
}
window.ethProvider = ethProvider;
});
},
let web3Instance;
if (typeof window.web3 !== 'undefined') {
debug('[kredits] Using user-provided instance, e.g. from Mist browser or Metamask');
web3Instance = new Web3(window.web3.currentProvider);
this.set('web3Provided', true);
} else {
debug('[kredits] Creating new instance from npm module class');
let providerUrl = localStorage.getItem('config:web3ProviderUrl') || config.web3ProviderUrl;
let provider = new Web3.providers.HttpProvider(providerUrl);
web3Instance = new Web3(provider);
}
this.set('web3Instance', web3Instance);
window.web3 = web3Instance;
return web3Instance;
}.property('web3Instance'),
currentUserAccounts: function() {
return (this.get('web3Provided') && this.get('web3').eth.accounts) || [];
}.property('web3Provided', 'web3'),
registryContract: computed('web3', function() {
let networkId = this.get('web3').version.network;
let contract = this.get('web3')
.eth
.contract(abis['Registry'])
.at(addresses['Registry'][networkId]);
return RSVP.resolve(contractProxy(contract));
accountNeedsUnlock: computed('currentUserAccounts', function() {
return this.get('currentUserAccounts') && Ember.isEmpty(this.get('currentUserAccounts'));
}),
contributorsContract: computed('web3', function() {
hasAccounts: computed('currentUserAccounts', function() {
return !Ember.isEmpty(this.get('currentUserAccounts'));
}),
registryContract: computed('ethProvider', function() {
let networkId = this.get('ethProvider').chainId;
let registry = new ethers.Contract(addresses['Registry'][networkId], abis['Registry'], this.get('ethProvider'));
return registry;
}),
contributorsContract: computed('ethProvider', function() {
return this.contractFor('Contributors');
}),
kreditsContract: computed('web3', function() {
kreditsContract: computed('ethProvider', function() {
return this.contractFor('Operator');
}),
tokenContract: computed('web3', function() {
tokenContract: computed('ethProvider', function() {
return this.contractFor('Token');
}),
contractFor(name) {
return this.get('registryContract')
.then((contract) => contract.invoke('getProxyFor', name))
return this.get('registryContract').functions.getProxyFor(name)
.then((address) => {
debug('[kredits] get contract', name, address);
let contract = this.get('web3')
.eth
.contract(abis[name])
.at(address);
return contractProxy(contract);
return new ethers.Contract(address, abis[name], this.get('ethProvider').getSigner());
});
},
getContributorData(id) {
return this.get('contributorsContract')
.then((contract) => contract.invoke('contributors', id))
.then((contract) => contract.contributors(id))
.then((data) => {
debug('[kredits] contributor', data);
@@ -117,12 +102,11 @@ export default Service.extend({
let isCurrentUser = this.get('currentUserAccounts').includes(address);
let profileHash = this.getMultihashFromBytes32({
digest,
hashFunction: hashFunction.toNumber(),
size: size.toNumber()
hashFunction: hashFunction,
size: size
});
return this.get('tokenContract')
.then((contract) => contract.invoke('balanceOf', address))
.then((contract) => contract.balanceOf(address))
.then((balance) => {
balance = balance.toNumber();
@@ -144,7 +128,7 @@ export default Service.extend({
getContributors() {
return this.get('contributorsContract')
.then((contract) => contract.invoke('contributorsCount'))
.then((contract) => contract.contributorsCount())
.then(contributorsCount => {
debug('[kredits] contributorsCount:', contributorsCount.toNumber());
let contributors = [];
@@ -159,24 +143,19 @@ export default Service.extend({
getProposalData(i) {
return this.get('kreditsContract')
.then((contract) => contract.invoke('proposals', i))
.then((contract) => contract.proposals(i))
.then(p => {
let ipfsHash = this.getMultihashFromBytes32({
digest: p[6],
hashFunction: p[7].toNumber(),
size: p[8].toNumber()
});
let contributionIpfsHash = this.getMultihashFromBytes32({ digest: p.ipfsHash, hashFunction: p.hashFunction, size: p.hashSize });
let proposal = Proposal.create({
id : i,
creatorAddress : p[0],
recipientId : p[1].toNumber(),
votesCount : p[2].toNumber(),
votesNeeded : p[3].toNumber(),
amount : p[4].toNumber(),
executed : p[5],
ipfsHash : ipfsHash
creatorAddress : p.creator,
recipientId : p.recipientId.toNumber(),
votesCount : p.votesCount.toNumber(),
votesNeeded : p.votesNeeded.toNumber(),
amount : p.amount.toNumber(),
executed : p.executed,
ipfsHash : contributionIpfsHash
});
if (proposal.get('ipfsHash')) {
@@ -193,7 +172,7 @@ export default Service.extend({
getProposals() {
return this.get('kreditsContract')
.then((contract) => contract.invoke('proposalsCount'))
.then((contract) => contract.proposalsCount())
.then(proposalsCount => {
let proposals = [];
@@ -209,7 +188,7 @@ export default Service.extend({
debug('[kredits] vote for', proposalId);
return this.get('kreditsContract')
.then((contract) => contract.invoke('vote', proposalId))
.then((contract) => contract.vote(proposalId))
.then((data) => {
debug('[kredits] vote response', data);
return data;
@@ -252,7 +231,7 @@ export default Service.extend({
.then(profileHash => {
contributor.setProperties({
profileHash: profileHash,
kredits: 0,
balance: 0,
isCurrentUser: this.get('currentUserAccounts').includes(contributor.address)
});
@@ -262,8 +241,7 @@ export default Service.extend({
return this.get('kreditsContract')
.then((contract) => {
return contract.invoke(
'addContributor',
return contract.addContributor(
contributor.address,
digest,
hashFunction,
@@ -290,8 +268,7 @@ export default Service.extend({
.then(ipfsHash => {
return this.get('kreditsContract')
.then((contract) => {
return contract.invoke(
'addProposal',
return contract.addProposal(
recipientAddress,
amount,
url,
config/environment.js
+1 -1
View File
@@ -43,7 +43,7 @@ module.exports = function(environment) {
}
};
ENV.contractMetadata['networkId'] = "17";
ENV.contractMetadata['networkId'] = "42";
if (process.env.OPERATOR_CONTRACT_ADDR) {
ENV.contractMetadata['Operator'] = {
package-lock.json
Generated
+663 -577
View File
File diff suppressed because it is too large Load Diff
package.json
+4 -3
View File
@@ -55,12 +55,12 @@
"ember-parachute": "0.1.0",
"ember-resolver": "^2.0.3",
"ember-truth-helpers": "1.3.0",
"ethers": "^3.0.8",
"ipfs-api": "^19.0.0",
"kosmos-schemas": "^1.1.2",
"kredits-contracts": "github:67P/truffle-kredits#master",
"loader.js": "^4.0.10",
"tv4": "^1.3.0",
"web3": "^0.18.2"
"tv4": "^1.3.0"
},
"engines": {
"node": ">= 0.12.0"
@@ -70,5 +70,6 @@
"paths": [
"lib/contracts"
]
}
},
"dependencies": {}
}
tests/unit/controllers/index-test.js
+6 -1
View File
@@ -28,7 +28,12 @@ let addFixtures = function(controller) {
};
test('doesn\'t contain people with 0 balance', function(assert) {
let controller = this.subject();
// This is a bit strange... we do not want the controller to call the init function defined in the controller that
// initializes the event handlers on the contracts. Main reason is that we do not have proper contracts in test mode.
// this seems to work. but probably kills some controller stuff, which is fine in this test
let controller = this.subject({
init: function() { }
});
addFixtures(controller);
let contributorsSorted = controller.get('contributorsSorted');