app/services/kredits.js

@@ -73,13 +73,12 @@ export default Service.extend({
       }
 
       async function instantiateWithAccount (web3Provider, context) {
-        console.debug('[kredits] Using user-provided instance, e.g. from Mist browser or Metamask');
+        console.debug('[kredits] Using user-provided Web3 instance, e.g. from Metamask');
         ethProvider = new ethers.providers.Web3Provider(web3Provider);
 
         const network = await ethProvider.getNetwork();
         if (isPresent(config.web3RequiredNetwork) &&
-            network.name !== config.web3RequiredNetwork) {
-          window.alert(`Please switch your Ethereum wallet to the "${config.web3RequiredNetwork}" network before connecting your account.`);
+            network.chainId !== config.web3RequiredChainId) {
           return instantiateWithoutAccount();
         }
 
@@ -112,12 +111,14 @@ export default Service.extend({
   },
 
   async setup () {
-    const kredits = await this.getEthProvider().then((providerAndSigner) => {
+    const kredits = await this.getEthProvider().then(providerAndSigner => {
       return new Kredits(providerAndSigner.ethProvider, providerAndSigner.ethSigner, {
         ipfsConfig: config.ipfs
-      }).init();
+      });
     });
 
+    await kredits.init();
+
     this.set('kredits', kredits);
     this.set('currentBlock', await kredits.provider.getBlockNumber());
 

config/environment.js

@@ -25,8 +25,9 @@ module.exports = function(environment) {
       // when it is created
     },
 
-    web3ProviderUrl: 'https://rinkeby.infura.io/v3/d4f788b7a6584f7db2fc3c268d4d09e9',
-    web3RequiredNetwork: 'rinkeby',
+    web3ProviderUrl: 'https://rsk-testnet.kosmos.org',
+    web3RequiredChainId: 31,
+    web3RequiredNetworkName: 'RSK Testnet',
 
     githubConnectUrl: 'https://hal8000.chat.kosmos.org/kredits/signup/connect/github',
     githubSignupUrl: 'https://hal8000.chat.kosmos.org/kredits/signup/github',
@@ -55,7 +56,6 @@ module.exports = function(environment) {
     // ENV.APP.LOG_TRANSITIONS = true;
     // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
     // ENV.APP.LOG_VIEW_LOOKUPS = true;
-    ENV.web3ProviderUrl = 'https://rinkeby.infura.io/v3/d4f788b7a6584f7db2fc3c268d4d09e9';
 
     ENV.githubConnectUrl = 'http://localhost:8888/kredits/signup/connect/github';
     ENV.githubSignupUrl = 'http://localhost:8888/kredits/signup/github';

package.json

@@ -66,7 +66,7 @@
     "eslint-plugin-node": "^11.1.0",
     "ethers": "^5.4.7",
     "fetch-mock": "^9.10.7",
-    "kredits-contracts": "github:67P/kredits-contracts#hardhat",
+    "kredits-contracts": "git+https://gitea.kosmos.org/kredits/contracts#addresses/rsk-testnet-raucao-1",
     "loader.js": "^4.7.0",
     "localforage": "^1.7.3",
     "ndjson": "github:hugomrdias/ndjson#feat/readable-stream3",