dexorder/web
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfixes

Browse Source
This commit is contained in:
Tim Olson
2024-01-08 21:42:40 -04:00
parent 52a41c6f81
commit a65a1fffae
7 changed files with 122 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/blockchain/contract.js
View File

@@ -1,14 +1,12 @@
import {ethers} from "ethers";
import {factoryAbi, queryHelperAbi, vaultAbi} from "@/blockchain/abi.js";
import {useStore} from "@/store/store.js";
import {queryHelperAbi} from "@/blockchain/abi.js";
export function vaultAddress( owner, num=0) {
const s = useStore()
if( !owner || !s.factory || !s.vaultInitCodeHash )
export function vaultAddress( factory, vaultInitCodeHash, owner, num=0) {
if( !owner || !factory || !vaultInitCodeHash )
return null
const salt = ethers.solidityPackedKeccak256(['address','uint8'],[owner,num])
return ethers.getCreate2Address(s.factory, salt, s.vaultInitCodeHash)
return ethers.getCreate2Address(factory, salt, vaultInitCodeHash)
}
@@ -21,22 +19,7 @@ export function contractOrNull(addr,abi,provider) {
}
}
export async function factoryContract() {
const s = useStore()
return contractOrNull(s.factory, factoryAbi, s.provider)
export async function queryHelperContract(helper, provider) {
return contractOrNull(helper, queryHelperAbi, provider)
}
export async function queryHelperContract() {
const s = useStore()
return contractOrNull(s.helper, queryHelperAbi, s.provider)
}
export async function poolContract(addr) {
const s = useStore()
return contractOrNull(addr, uniswapV3PoolAbi, s.provider)
}
export async function vaultContract(owner, num, provider) {
const addr = vaultAddress(owner, num)
return new ethers.Contract(addr, vaultAbi, provider)
}