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

Merge pull request #65 from 67P/feature/switch_to_infura

Browse Source 
Update contracts, Ethereum/IPFS configs
This commit was merged in pull request #65.
This commit is contained in:
bumi
2018-06-07 14:37:17 +00:00
committed by GitHub
parent eb5c87308a a0ee2f7bb8
commit d07c0d67bf
4 changed files with 4271 additions and 4228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/services/kredits.js
+3 -1
View File
@@ -60,7 +60,9 @@ export default Service.extend({
ethSigner = ethProvider.getSigner(); ethSigner = ethProvider.getSigner();
} }
let kredits = new Kredits(ethProvider, ethSigner); let kredits = new Kredits(ethProvider, ethSigner, {
ipfsConfig: config.ipfs
});
return kredits return kredits
.init() .init()
.then((kredits) => { .then((kredits) => {
config/environment.js
+3 -3
View File
@@ -37,7 +37,7 @@ module.exports = function(environment) {
contractMetadata: { networkId: '42' }, contractMetadata: { networkId: '42' },
web3ProviderUrl: 'https://parity.kosmos.org:8545', web3ProviderUrl: 'https://kovan.infura.io/keUVk6OMaAvpmRF3m57n',
ipfs: { ipfs: {
host: 'ipfs.kosmos.org', host: 'ipfs.kosmos.org',
@@ -52,8 +52,8 @@ module.exports = function(environment) {
// ENV.APP.LOG_TRANSITIONS = true; // ENV.APP.LOG_TRANSITIONS = true;
// ENV.APP.LOG_TRANSITIONS_INTERNAL = true; // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
// ENV.APP.LOG_VIEW_LOOKUPS = true; // ENV.APP.LOG_VIEW_LOOKUPS = true;
ENV.contractMetadata['networkId'] = '100'; ENV.contractMetadata['networkId'] = '42';
ENV.web3ProviderUrl = 'http://localhost:7545'; ENV.web3ProviderUrl = 'https://kovan.infura.io/keUVk6OMaAvpmRF3m57n';
ENV.ipfs = { ENV.ipfs = {
host: 'localhost', host: 'localhost',
package-lock.json
Generated
+4264 -4223
View File
File diff suppressed because it is too large Load Diff
package.json
+1 -1
View File
@@ -51,7 +51,7 @@
"eslint-plugin-ember": "^5.0.0", "eslint-plugin-ember": "^5.0.0",
"ethers": "3.0.15", "ethers": "3.0.15",
"kosmos-schemas": "^1.1.2", "kosmos-schemas": "^1.1.2",
"kredits-contracts": "github:67P/truffle-kredits", "kredits-contracts": "^3.x",
"loader.js": "^4.2.3", "loader.js": "^4.2.3",
"tv4": "^1.3.0" "tv4": "^1.3.0"
}, },