only use address for account track

This commit is contained in:
liangping 2023-11-01 09:00:54 +08:00
parent 7618ea9ffd
commit 1318670d6d

View File

@ -17,6 +17,7 @@ const dashboard = useDashboard();
const chainStore = useBlockchain()
const format = useFormatter();
const sourceAddress = ref(''); //
const sourceHdPath = ref("m/44/118/0'/0/0"); //
const selectedSource = ref({} as LocalKey); //
const importStep = ref('step1')
@ -123,49 +124,9 @@ const totalChange = computed(() => {
})
// Adding Model Boxes
const sourceOptions = computed(() => {
// scan all connected wallet
const keys = scanLocalKeys();
// parser options from all existed keys
Object.values(conf.value).forEach((x) => {
const [first] = x;
if (first) {
const { data } = fromBech32(first.address);
const hex = toHex(data);
if (
keys.findIndex(
(k) => toHex(fromBech32(k.cosmosAddress).data) === hex
) === -1
) {
keys.push({
cosmosAddress: first.address,
hdPath: `m/44/${first.coinType}/0'/0/0`,
});
}
}
});
// parse options from an given address
if (sourceAddress.value) {
const { prefix, data } = fromBech32(sourceAddress.value);
const chain = Object.values(dashboard.chains).find(
(x) => x.bech32Prefix === prefix
);
if (chain) {
keys.push({
cosmosAddress: sourceAddress.value,
hdPath: `m/44/${chain.coinType}/0'/0/0`,
});
}
}
if (!selectedSource.value.cosmosAddress && keys.length > 0) {
selectedSource.value = keys[0];
}
return keys;
});
const availableAccount = computed(() => {
if (selectedSource.value.cosmosAddress) {
return scanCompatibleAccounts([selectedSource.value]).filter(
if (sourceAddress.value) {
return scanCompatibleAccounts([{cosmosAddress: sourceAddress.value, hdPath: sourceHdPath.value }]).filter(
(x) => !addresses.value.includes(x.address)
);
}
@ -351,9 +312,6 @@ async function loadBalances(endpoint: string, address: string) {
</svg>
Import Address
</a>
<RouterLink to="/wallet/keplr">
<span class="btn btn-link">Add chain to Keplr</span>
</RouterLink>
</div>
</div>
<!-- Put this part before </body> tag -->
@ -361,22 +319,10 @@ async function loadBalances(endpoint: string, address: string) {
<div class="modal-box">
<a href="#" class="btn btn-sm btn-circle btn-ghost absolute right-2 top-2"></a>
<h3 class="font-bold text-lg mb-2">Derive Account From Address</h3>
<div v-show="importStep === 'step1'">
<label class="hidden input-group input-group-sm w-full">
<span>Connected</span>
<select v-model="selectedSource" class="select select-bordered select-sm w-3/4">
<option v-for="source in sourceOptions" :value="source">
<span class="overflow-hidden">{{ source.cosmosAddress }}</span>
</option>
</select>
</label>
<ul class="menu">
<li v-for="source in sourceOptions" @click="selectedSource = source; importStep = 'step2'">
<a><label class="overflow-hidden flex flex-col"><div class=" font-bold">{{ source.cosmosAddress }} </div><div class="text-xs">{{ source.hdPath }}</div></label></a>
</li>
</ul>
<label class="my-2 p-2">
<div>
<label class="my-2">
<input v-model="sourceAddress" class="input input-bordered w-full input-sm" placeholder="Input an address" @change="importStep = 'step2'" />
<input v-model="sourceHdPath" class="input input-bordered w-full input-sm" placeholder="m/44/118/0'/0/0" />
</label>
</div>
<div v-show="importStep === 'step2'" class="py-4 max-h-72 overflow-y-auto">