Skip to content

Commit

Permalink
Upgrade beacon version (#531)
Browse files Browse the repository at this point in the history
* Upgrade beacon version

Signed-off-by: Manank Patni <manank321@gmail.com>

* Upgrade beacon version

Signed-off-by: Manank Patni <manank321@gmail.com>

* Remove connect on originate and save beacon wallet instance

Signed-off-by: Manank Patni <manank321@gmail.com>

---------

Signed-off-by: Manank Patni <manank321@gmail.com>
  • Loading branch information
Man-Jain authored Apr 4, 2023
1 parent 6e663bb commit 6d3c5fb
Show file tree
Hide file tree
Showing 4 changed files with 267 additions and 190 deletions.
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "^4.0.0-alpha.57",
"@microsoft/signalr": "^5.0.9",
"@taquito/beacon-wallet": "13.0.1",
"@taquito/signer": "13.0.1",
"@taquito/taquito": "13.0.1",
"@taquito/tezbridge-signer": "13.0.1",
"@taquito/tezbridge-wallet": "13.0.1",
"@taquito/tzip12": "13.0.1",
"@taquito/tzip16": "13.0.1",
"@taquito/beacon-wallet": "^16.0.1",
"@taquito/signer": "^16.0.1",
"@taquito/taquito": "^16.0.1",
"@taquito/tezbridge-signer": "^14.2.0",
"@taquito/tezbridge-wallet": "^14.2.0",
"@taquito/tzip12": "^16.0.1",
"@taquito/tzip16": "^16.0.1",
"@types/mixpanel-browser": "^2.35.7",
"@types/prismjs": "^1.26.0",
"@types/react-router-hash-link": "^2.4.5",
Expand Down Expand Up @@ -112,4 +112,4 @@
"yarn lint:check"
]
}
}
}
19 changes: 13 additions & 6 deletions src/services/beacon/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,19 @@ export const getTezosNetwork = (): Network => {
return envNetwork
}

export const createWallet = (network: Network) =>
new BeaconWallet({
name: "Homebase",
iconUrl: "https://tezostaquito.io/img/favicon.png",
preferredNetwork: network as NetworkType
})
let beaconWallet: BeaconWallet

export const createWallet = (network: Network) => {
if (!beaconWallet) {
beaconWallet = new BeaconWallet({
name: "Homebase",
iconUrl: "https://tezostaquito.io/img/favicon.png",
preferredNetwork: network as NetworkType
})
}

return beaconWallet
}

export const createTezos = (network: Network) => {
const tezos = new TezosToolkit(rpcNodes[network])
Expand Down
10 changes: 2 additions & 8 deletions src/services/contracts/baseDAO/hooks/useOriginate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,6 @@ export const useOriginate = (template: DAOTemplate) => {
setActiveState(0)
setStates(updatedStates)

let tezosToolkit = tezos

if (!account) {
tezosToolkit = await connect()
}

mixpanel.track("Started DAO origination", {
contract: "MetadataCarrier",
daoName: params.orgSettings.name,
Expand All @@ -89,7 +83,7 @@ export const useOriginate = (template: DAOTemplate) => {

const metadata = await deployMetadataCarrier({
...metadataParams,
tezos: tezosToolkit,
tezos,
connect
})

Expand All @@ -116,7 +110,7 @@ export const useOriginate = (template: DAOTemplate) => {
})

const contract = await BaseDAO.baseDeploy(template, {
tezos: tezosToolkit,
tezos,
metadata,
params,
network
Expand Down
Loading

0 comments on commit 6d3c5fb

Please sign in to comment.