Skip to content

Commit 6872107

Browse files
authored
Merge pull request #132 from vechain/fix-veworld-in-local
fix: veworld support, pin connex versions
2 parents 89ae755 + d58b21a commit 6872107

File tree

4 files changed

+935
-957
lines changed

4 files changed

+935
-957
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"dependencies": {
1111
"@fortawesome/fontawesome-free": "5.5.0",
1212
"@vechain/connex": "2.0.14",
13+
"@vechain/connex-types": "2.0.12",
1314
"@vechain/picasso": "^2.1.1",
1415
"bignumber.js": "8.0.2",
1516
"buefy": "^0.8.20",
@@ -42,7 +43,7 @@
4243
"vue-template-compiler": "^2.6.11"
4344
},
4445
"engines": {
45-
"node": "16.20.2",
46+
"node": "^16.20.0",
4647
"yarn": "^1.22"
4748
}
4849
}

src/create-connex.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,25 +41,27 @@ const soloGenesis = {
4141
transactions: [],
4242
};
4343

44+
export const isVeWorldAvailable = !!window.vechain
45+
4446
export function createConnex(net?: "main" | "test" | "solo") {
4547
if (net) {
4648
// net specified
4749
const url = nodeUrls[net];
4850
if (net == "solo") {
49-
return new Connex({ node: url, network: soloGenesis });
51+
return new Connex({ node: url, network: soloGenesis, noExtension: !isVeWorldAvailable })
5052
}
51-
return new Connex({ node: url, network: net });
53+
return new Connex({ node: url, network: net, noExtension: !isVeWorldAvailable })
5254
} else {
5355
const injected = (window as any).connex;
5456
// net unspecified
5557
if (injected) {
56-
return new Connex({ node: "", network: injected.thor.genesis });
58+
return new Connex({ node: "", network: injected.thor.genesis, noExtension: !isVeWorldAvailable });
5759
} else {
5860
// defaults to main net, or soloUrl if solo is provided
5961
if (isSoloNode) {
60-
return new Connex({ node: nodeUrls.solo, network: soloGenesis });
62+
return new Connex({ node: nodeUrls.solo, network: soloGenesis, noExtension: !isVeWorldAvailable });
6163
}
62-
return new Connex({ node: nodeUrls.main });
64+
return new Connex({ node: nodeUrls.main, noExtension: !isVeWorldAvailable })
6365
}
6466
}
6567
}

src/main.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import router from './Router'
1313
import './overwrite.css'
1414
import VueAnalytics from 'vue-analytics'
1515
import Connex from '@vechain/connex'
16-
import { createConnex, isSoloNode } from './create-connex'
16+
import { createConnex, isSoloNode, isVeWorldAvailable } from './create-connex'
1717
import { prePopulate } from '@/pre-populate'
1818
declare module 'vue/types/vue' {
1919
interface Vue {
@@ -55,7 +55,8 @@ if (window.connex) {
5555
//@ts-ignore
5656
network: window.connex.thor.genesis,
5757
node: '',
58-
noV1Compat: false
58+
noV1Compat: false,
59+
noExtension: !isVeWorldAvailable
5960
})
6061
setExplorerUrl('')
6162
} else {

0 commit comments

Comments
 (0)