Merge pull request #90 from 67P/update-kredits-contracts

Update kredits-contracts and ethers.js

app/services/kredits.js

@@ -11,7 +11,6 @@ import config from 'kredits-web/config/environment';
 import Contributor from 'kredits-web/models/contributor'
 import Proposal from 'kredits-web/models/proposal'
 
-
 export default Service.extend({
 
   currentUserAccounts: null, // default to not having an account. this is the wen web3 is loaded.
@@ -36,14 +35,9 @@ export default Service.extend({
   getEthProvider: function() {
     return new RSVP.Promise((resolve) => {
       let ethProvider;
-      let networkId;
       if (typeof window.web3 !== 'undefined') {
         console.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);
-        ethProvider = new ethers.providers.Web3Provider(
-          window.web3.currentProvider,
-          { chainId: networkId }
-        );
         ethProvider.listAccounts().then((accounts) => {
           this.set('currentUserAccounts', accounts);
           const ethSigner = accounts.length === 0 ? null : ethProvider.getSigner();
@@ -54,12 +48,8 @@ export default Service.extend({
         });
       } else {
         console.debug('[kredits] Creating new instance from npm module class');
-        networkId = parseInt(config.contractMetadata.networkId);
+        console.debug(`[kredits] providerURL: ${config.web3ProviderUrl}`);
-        console.debug(`[kredits] networkId=${networkId} providerURL: ${config.web3ProviderUrl}`);
+        ethProvider = new ethers.providers.JsonRpcProvider(config.web3ProviderUrl);
-        ethProvider = new ethers.providers.JsonRpcProvider(
-          config.web3ProviderUrl,
-          { chainId: networkId }
-        );
         resolve({
           ethProvider: ethProvider,
           ethSigner: null
@@ -72,6 +62,8 @@ export default Service.extend({
     return this.getEthProvider().then((providerAndSigner) => {
 
       let kredits = new Kredits(providerAndSigner.ethProvider, providerAndSigner.ethSigner, {
+        addresses: { Kernel: config.kreditsKernelAddress },
+        apm: config.kreditsApmDomain,
         ipfsConfig: config.ipfs
       });
       return kredits
@@ -121,7 +113,7 @@ export default Service.extend({
   addProposal(attributes) {
     console.debug('[kredits] add proposal', attributes);
 
-    return this.kredits.Operator.addProposal(attributes)
+    return this.kredits.Proposal.addProposal(attributes)
       .then((data) => {
         console.debug('[kredits] add proposal response', data);
         attributes.contributor = this.contributors.findBy('id', attributes.contributorId);
@@ -130,7 +122,7 @@ export default Service.extend({
   },
 
   getProposals() {
-    return this.kredits.Operator.all()
+    return this.kredits.Proposal.all()
       .then((proposals) => {
         return proposals.map((proposal) => {
           proposal.contributor = this.contributors.findBy('id', proposal.contributorId.toString());
@@ -142,7 +134,7 @@ export default Service.extend({
   vote(proposalId) {
     console.debug('[kredits] vote for', proposalId);
 
-    return this.kredits.Operator.functions.vote(proposalId)
+    return this.kredits.Proposal.functions.vote(proposalId)
       .then((data) => {
         console.debug('[kredits] vote response', data);
         return data;
@@ -172,8 +164,8 @@ export default Service.extend({
 
   // Contract events
   addContractEventHandlers() {
-    // Operator events
+    // Proposal events
-    this.kredits.Operator
+    this.kredits.Proposal
       .on('ProposalCreated', this.handleProposalCreated.bind(this))
       .on('ProposalVoted', this.handleProposalVoted.bind(this))
       .on('ProposalExecuted', this.handleProposalExecuted.bind(this));
@@ -191,7 +183,7 @@ export default Service.extend({
       return;
     }
 
-    this.kredits.Operator.getById(proposalId)
+    this.kredits.Proposal.getById(proposalId)
       .then((proposal) => {
         proposal.contributor = this.contributors.findBy('id', proposal.contributorId.toString());
         this.proposals.pushObject(Proposal.create(proposal));

config/environment.js

@@ -35,8 +35,6 @@ module.exports = function(environment) {
       ]
     },
 
-    contractMetadata: { networkId: '42' },
-
     web3ProviderUrl: 'https://kovan.infura.io/keUVk6OMaAvpmRF3m57n',
 
     ipfs: {
@@ -52,7 +50,6 @@ module.exports = function(environment) {
     // ENV.APP.LOG_TRANSITIONS = true;
     // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
     // ENV.APP.LOG_VIEW_LOOKUPS = true;
-    ENV.contractMetadata['networkId'] = '42';
     ENV.web3ProviderUrl = 'https://kovan.infura.io/keUVk6OMaAvpmRF3m57n';
 
     ENV.ipfs = {
@@ -78,12 +75,15 @@ module.exports = function(environment) {
     // here you can enable a production-specific feature
   }
 
-  if (process.env.NETWORK_ID) {
-    ENV.contractMetadata['networkId'] = process.env.NETWORK_ID;
-  }
   if (process.env.WEB3_PROVIDER_URL) {
     ENV.web3ProviderUrl = process.env.WEB3_PROVIDER_URL;
   }
+  if (process.env.KREDITS_KERNEL_ADDRESS) {
+    ENV.kreditsKernelAddress = process.env.KREDITS_KERNEL_ADDRESS;
+  }
+  if (process.env.KREDITS_APM_DOMAIN) {
+    ENV.kreditsApmDomain = process.env.KREDITS_APM_DOMAIN;
+  }
 
   return ENV;
 };

package.json

@@ -15,7 +15,7 @@
     "lint:js": "eslint .",
     "start": "ember serve",
     "test": "ember test",
-    "start:local": "NETWORK_ID=100 WEB3_PROVIDER_URL=http://localhost:7545 ember s",
+    "start:local": "WEB3_PROVIDER_URL=http://localhost:7545 ember s",
     "build": "ember build",
     "build-prod": "ember build --environment production",
     "update-version-file": "bash scripts/update-version-file.sh",
@@ -54,9 +54,9 @@
     "ember-source": "~3.8.0",
     "ember-truth-helpers": "github:jmurphyau/ember-truth-helpers#31a14373a31f1f82c77537720549b47a95c28e5f",
     "eslint-plugin-ember": "^5.2.0",
-    "ethers": "3.0.15",
+    "ethers": "^4.0.27",
     "kosmos-schemas": "^1.1.2",
-    "kredits-contracts": "^3.x",
+    "kredits-contracts": "github:67P/kredits-contracts#aragonos",
     "loader.js": "^4.7.0",
     "qunit-dom": "^0.8.0",
     "tv4": "^1.3.0"