Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More fixes #31

Merged
merged 10 commits into from
Sep 19, 2024
Merged

More fixes #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3bdeaec
Update config stuff
ezynda3 Sep 10, 2024
dbce4e2
Add more logging
ezynda3 Sep 11, 2024
55429a3
move hooks to only run on the server
ezynda3 Sep 18, 2024
7dc942d
move sqlite deps out of client
ezynda3 Sep 18, 2024
c88db47
use older version of bun...
ezynda3 Sep 18, 2024
7406242
bump version
ezynda3 Sep 18, 2024
f10cc1d
Add better handling for unknown selectors
ezynda3 Sep 19, 2024
896d073
Merge branch 'master' into dev
ezynda3 Sep 19, 2024
70ba19d
Allow removing of unknown selectors
ezynda3 Sep 19, 2024
e883c6d
Merge branch 'dev' of github.com:mark3labs/louper-v3 into dev
ezynda3 Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/lib/utils.server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,5 +84,5 @@ export const getFuncSigBySelector = async (selector: string): Promise<string> =>
return data.result.function[selector][0].name
}

return 'unknown()'
return `unknown_${selector}()`
}
1 change: 1 addition & 0 deletions src/routes/diamond/[address]/+page.server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ const buildFacet = async (

const fileredAbi: Abi = facet.abi.filter((item) => {
if (item.type !== 'function') return true
if (item.name.indexOf('unknown_') > -1) return true
if (!item.outputs) {
item.outputs = []
}
Expand Down
31 changes: 20 additions & 11 deletions src/routes/diamond/[address]/EditFacet.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
parseAbi,
zeroAddress,
type WriteContractReturnType,
type AbiItem,
type AbiFunction,
} from 'viem'
import type { Chain } from 'viem/chains'
import ConnectWallet from './ConnectWallet.svelte'
Expand Down Expand Up @@ -263,6 +265,13 @@
}
}
}

const getFunctionSelector = (m: AbiFunction) => {
if (m.name.indexOf('unknown_') > -1) {
return m.name.split('_')[1]
}
return toFunctionSelector(m)
}
</script>

<div class="flex flex-row items-center justify-between p-2 space-x-3">
Expand Down Expand Up @@ -364,23 +373,23 @@
<Table.Cell class="text-left">
<div>
<Checkbox
bind:this={checkboxes[f.address.slice(0, 5) + toFunctionSelector(m)]}
bind:this={checkboxes[f.address.slice(0, 5) + getFunctionSelector(m)]}
onCheckedChange={updateAdditionsAndReplacements(
f.address,
toFunctionSelector(m),
getFunctionSelector(m),
)}
/>
</div>
</Table.Cell>
<Table.Cell class="font-medium text-left w-full text-lg">
<div
class:bg-green-500={strategy.additions[f.address] &&
strategy.additions[f.address].includes(toFunctionSelector(m))}
strategy.additions[f.address].includes(getFunctionSelector(m))}
class:bg-yellow-500={strategy.replacements[f.address] &&
strategy.replacements[f.address].includes(toFunctionSelector(m))}
strategy.replacements[f.address].includes(getFunctionSelector(m))}
class="flex items-center p-1 rounded-md bg-opacity-90"
>
<Badge class="mr-2">{toFunctionSelector(m)}</Badge>
<Badge class="mr-2">{getFunctionSelector(m)}</Badge>
{m.name}
</div>
</Table.Cell>
Expand Down Expand Up @@ -423,23 +432,23 @@
<Table.Row class="border-none">
<Table.Cell class="text-left">
<Checkbox
bind:this={checkboxes[f.address.slice(0, 5) + toFunctionSelector(m)]}
onCheckedChange={updateRemovals(f.address, toFunctionSelector(m))}
bind:this={checkboxes[f.address.slice(0, 5) + getFunctionSelector(m)]}
onCheckedChange={updateRemovals(f.address, getFunctionSelector(m))}
disabled={Object.values(strategy.replacements).some((r) =>
r.includes(toFunctionSelector(m)),
r.includes(getFunctionSelector(m)),
)}
/>
</Table.Cell>
<Table.Cell class="font-medium text-left w-full text-lg">
<div
class:bg-red-500={strategy.removals[f.address] &&
strategy.removals[f.address].includes(toFunctionSelector(m))}
strategy.removals[f.address].includes(getFunctionSelector(m))}
class:bg-yellow-500={Object.values(strategy.replacements).some((r) =>
r.includes(toFunctionSelector(m)),
r.includes(getFunctionSelector(m)),
)}
class="flex items-center p-1 rounded-md bg-opacity-90"
>
<Badge class="mr-2">{toFunctionSelector(m)}</Badge>
<Badge class="mr-2">{getFunctionSelector(m)}</Badge>
{m.name}
</div>
</Table.Cell>
Expand Down
36 changes: 25 additions & 11 deletions src/routes/diamond/[address]/FacetsTable.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,31 @@
</code>
<Separator orientation="vertical" />

<code
class="rounded bg-muted px-[0.3rem] py-[0.2rem] font-mono text-sm font-semibold"
>
{toFunctionSelector(m)}
</code>
<Button
variant="ghost"
on:click={() => copyToClipboard(toFunctionSelector(m))}
>
<Copy />
</Button>
{#if m.name.indexOf('unknown_') > -1}
<code
class="rounded bg-muted px-[0.3rem] py-[0.2rem] font-mono text-sm font-semibold"
>
{m.name.split('_')[1]}
</code>
<Button
variant="ghost"
on:click={() => copyToClipboard(m.name.split('_')[1])}
>
<Copy />
</Button>
{:else}
<code
class="rounded bg-muted px-[0.3rem] py-[0.2rem] font-mono text-sm font-semibold"
>
{toFunctionSelector(m)}
</code>
<Button
variant="ghost"
on:click={() => copyToClipboard(toFunctionSelector(m))}
>
<Copy />
</Button>
{/if}
</div>
</li>
{/each}
Expand Down
5 changes: 5 additions & 0 deletions src/routes/diamond/[address]/json/+server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@ const buildFacet = async (

const fileredAbi: Abi = facet.abi.filter((item) => {
if (item.type !== 'function') return true
if (item.name.indexOf('unknown_') > -1) {
if (selectors.includes(item.name.split('_')[1])) {
return true
}
}
if (!item.outputs) {
item.outputs = []
}
Expand Down