From 36377c9484e74e6271c074ddda713e9f66ccca6a Mon Sep 17 00:00:00 2001 From: CoolDevFor Date: Wed, 24 Nov 2021 09:32:55 +0900 Subject: [PATCH 1/2] connect wallet --- package.json | 15 +- src/App.vue | 6 +- src/assets/icons/metamask.png | Bin 0 -> 27516 bytes src/components/global/Card.vue | 2 +- src/components/global/ConnectButton.vue | 40 ++- src/components/global/WalletBanance.vue | 37 +++ src/components/section/EthereumSource.vue | 87 ++++-- src/components/section/Navbar.vue | 115 ++++++- src/components/section/Swap.vue | 20 +- src/components/section/WalletState.vue | 14 +- src/config/mixins.js | 54 ++++ src/data/mock/mockDataProvider.js | 143 +++++++++ .../storage/ipfs/IPFSStorageNetwork.js | 83 +++++ src/data/network/storage/storageNetwork.js | 9 + .../network/web3/contracts/abi/Asset.json | 3 + .../network/web3/contracts/assetContract.js | 123 ++++++++ .../web3/contracts/platformContract.js | 22 ++ .../network/web3/ethereum/ethereumClient.js | 96 ++++++ src/data/schemas/assetSchema.json | 132 ++++++++ src/data/schemas/index.js | 48 +++ src/data/schemas/proposalSchema.json | 29 ++ src/main.js | 10 +- src/models/asset.js | 64 ++++ src/models/marketOrder.js | 29 ++ src/models/proposal.js | 34 +++ src/models/vote.js | 28 ++ src/models/walletState.js | 16 + src/services/constants.js | 0 src/services/dao/index.js | 146 +++++++++ src/services/provider.js | 28 ++ src/services/wallet/index.js | 44 +++ src/store/index.js | 12 + src/store/state.js | 284 ++++++++++++++++++ src/store/web3ModalStore.js | 81 +++++ src/utils/bignumber.js | 6 + src/utils/common.js | 40 +++ src/utils/helpers.js | 45 +++ src/utils/network.js | 71 +++++ src/utils/promiseRace.js | 26 ++ src/utils/web3.js | 14 + src/views/Bridge.vue | 9 +- 41 files changed, 2007 insertions(+), 58 deletions(-) create mode 100644 src/assets/icons/metamask.png create mode 100644 src/components/global/WalletBanance.vue create mode 100644 src/config/mixins.js create mode 100644 src/data/mock/mockDataProvider.js create mode 100644 src/data/network/storage/ipfs/IPFSStorageNetwork.js create mode 100644 src/data/network/storage/storageNetwork.js create mode 100644 src/data/network/web3/contracts/abi/Asset.json create mode 100644 src/data/network/web3/contracts/assetContract.js create mode 100644 src/data/network/web3/contracts/platformContract.js create mode 100644 src/data/network/web3/ethereum/ethereumClient.js create mode 100644 src/data/schemas/assetSchema.json create mode 100644 src/data/schemas/index.js create mode 100644 src/data/schemas/proposalSchema.json create mode 100644 src/models/asset.js create mode 100644 src/models/marketOrder.js create mode 100644 src/models/proposal.js create mode 100644 src/models/vote.js create mode 100644 src/models/walletState.js create mode 100644 src/services/constants.js create mode 100644 src/services/dao/index.js create mode 100644 src/services/provider.js create mode 100644 src/services/wallet/index.js create mode 100644 src/store/index.js create mode 100644 src/store/state.js create mode 100644 src/store/web3ModalStore.js create mode 100644 src/utils/bignumber.js create mode 100644 src/utils/common.js create mode 100644 src/utils/helpers.js create mode 100644 src/utils/network.js create mode 100644 src/utils/promiseRace.js create mode 100644 src/utils/web3.js diff --git a/package.json b/package.json index dc9d474..0b71d6e 100644 --- a/package.json +++ b/package.json @@ -8,10 +8,21 @@ "lint": "vue-cli-service lint" }, "dependencies": { + "@ocrv/vue-tailwind-modal": "^1.0.0", + "@walletconnect/web3-provider": "^1.6.6", + "audit": "^0.0.6", "core-js": "^3.6.5", + "ethers": "^5.5.1", + "iam-client-lib": "^3.2.0", "vue": "^3.0.0", - "vue-router": "^4.0.0-0", - "vuex": "^3.6.2" + "vue-router": "^4.0.12", + "vue-spinner": "^1.0.4", + "vuex": "^4.0.2", + "web3": "^1.6.1", + "web3-utils": "^1.6.1", + "web3connect": "^1.0.0-beta.33", + "web3modal": "^1.9.4", + "web3modal-vue": "^1.0.5" }, "devDependencies": { "@vue/cli-plugin-babel": "~4.5.0", diff --git a/src/App.vue b/src/App.vue index bbd03a8..138eed3 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,6 +1,8 @@ diff --git a/src/components/global/WalletBanance.vue b/src/components/global/WalletBanance.vue new file mode 100644 index 0000000..dbec2d2 --- /dev/null +++ b/src/components/global/WalletBanance.vue @@ -0,0 +1,37 @@ + + + + + + diff --git a/src/components/section/EthereumSource.vue b/src/components/section/EthereumSource.vue index 6d4dae5..3abdc4f 100644 --- a/src/components/section/EthereumSource.vue +++ b/src/components/section/EthereumSource.vue @@ -1,41 +1,88 @@ diff --git a/src/components/section/Navbar.vue b/src/components/section/Navbar.vue index cc03c70..38a80f8 100644 --- a/src/components/section/Navbar.vue +++ b/src/components/section/Navbar.vue @@ -1,26 +1,121 @@ diff --git a/src/components/section/Swap.vue b/src/components/section/Swap.vue index f3eb149..f6b5a41 100644 --- a/src/components/section/Swap.vue +++ b/src/components/section/Swap.vue @@ -1,6 +1,6 @@