Skip to content

chore: remove old pack/unpack code #1903

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

Merged
ceyonur merged 4 commits into from
Dec 4, 2025
Merged

chore: remove old pack/unpack code #1903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b44df9c
chore: remove old pack/unpack code
JonathanOppenheimer Dec 4, 2025
254f1cf
Merge branch 'master' into JonathanOppenheimer/remove-old-pack-unpack
JonathanOppenheimer Dec 4, 2025
31ca1e2
fix: revert bad merge changes
JonathanOppenheimer Dec 4, 2025
f670102
Merge branch 'master' into JonathanOppenheimer/remove-old-pack-unpack
JonathanOppenheimer Dec 4, 2025
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
116 changes: 0 additions & 116 deletions precompile/allowlist/unpack_pack_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,6 @@ func FuzzPackReadAllowlistTest(f *testing.F) {
})
}

func FuzzPackReadAllowlistTestSkipCheck(f *testing.F) {
f.Fuzz(func(t *testing.T, b []byte) {
require := require.New(t)
res, err := UnpackReadAllowListInput(b, true)
oldRes, oldErr := OldUnpackReadAllowList(b)
require.ErrorIs(err, oldErr)
require.Equal(oldRes, res)
})
}

func TestPackReadAllowlistTest(f *testing.T) {
testPackReadAllowlistTest(f, common.Address{})
}
Expand All @@ -69,38 +59,13 @@ func testPackReadAllowlistTest(t *testing.T, address common.Address) {
t.Helper()
t.Run(fmt.Sprintf("TestPackReadAllowlistTest, address %v", address), func(t *testing.T) {
require := require.New(t)
// use new Pack/Unpack methods
input, err := PackReadAllowList(address)
require.NoError(err)
// exclude 4 bytes for function selector
input = input[4:]
unpacked, err := UnpackReadAllowListInput(input, true)
require.NoError(err)
require.Equal(address, unpacked)

// use old Pack/Unpack methods
input = OldPackReadAllowList(address)
// exclude 4 bytes for function selector
input = input[4:]
require.NoError(err)
unpacked, err = OldUnpackReadAllowList(input)
require.NoError(err)
require.Equal(address, unpacked)

// now mix and match old and new methods
input, err = PackReadAllowList(address)
require.NoError(err)
// exclude 4 bytes for function selector
input = input[4:]
input2 := OldPackReadAllowList(address)
// exclude 4 bytes for function selector
input2 = input2[4:]
require.Equal(input, input2)
unpacked, err = UnpackReadAllowListInput(input2, true)
require.NoError(err)
unpacked2, err := OldUnpackReadAllowList(input)
require.NoError(err)
require.Equal(unpacked, unpacked2)
})
}

Expand All @@ -115,56 +80,17 @@ func FuzzPackModifyAllowListTest(f *testing.F) {
})
}

func FuzzPackModifyAllowlistTestSkipCheck(f *testing.F) {
f.Fuzz(func(t *testing.T, b []byte) {
require := require.New(t)
res, err := UnpackModifyAllowListInput(b, AdminRole, true)
oldRes, oldErr := OldUnpackModifyAllowList(b, AdminRole)
require.ErrorIs(err, oldErr)
require.Equal(oldRes, res)
})
}

func testPackModifyAllowListTest(t *testing.T, address common.Address, role Role) {
t.Helper()
t.Run(fmt.Sprintf("TestPackModifyAllowlistTest, address %v, role %s", address, role.String()), func(t *testing.T) {
require := require.New(t)
// use new Pack/Unpack methods
input, err := PackModifyAllowList(address, role)
require.NoError(err)
// exclude 4 bytes for function selector
input = input[4:]
unpacked, err := UnpackModifyAllowListInput(input, role, true)
require.NoError(err)
require.Equal(address, unpacked)

// use old Pack/Unpack methods
input, err = OldPackModifyAllowList(address, role)
require.NoError(err)
// exclude 4 bytes for function selector
input = input[4:]
require.NoError(err)

unpacked, err = OldUnpackModifyAllowList(input, role)
require.NoError(err)

require.Equal(address, unpacked)

// now mix and match new and old methods
input, err = PackModifyAllowList(address, role)
require.NoError(err)
// exclude 4 bytes for function selector
input = input[4:]
input2, err := OldPackModifyAllowList(address, role)
require.NoError(err)
// exclude 4 bytes for function selector
input2 = input2[4:]
require.Equal(input, input2)
unpacked, err = UnpackModifyAllowListInput(input2, role, true)
require.NoError(err)
unpacked2, err := OldUnpackModifyAllowList(input, role)
require.NoError(err)
require.Equal(unpacked, unpacked2)
})
}

Expand All @@ -177,48 +103,6 @@ func FuzzPackReadAllowListOutputTest(f *testing.F) {
})
}

func OldPackReadAllowList(address common.Address) []byte {
input := make([]byte, 0, contract.SelectorLen+common.HashLength)
input = append(input, readAllowListSignature...)
input = append(input, common.BytesToHash(address[:]).Bytes()...)
return input
}

func OldUnpackReadAllowList(input []byte) (common.Address, error) {
if len(input) != allowListInputLen {
return common.Address{}, fmt.Errorf("invalid input length for read allow list: %d", len(input))
}
return common.BytesToAddress(input), nil
}

func OldPackModifyAllowList(address common.Address, role Role) ([]byte, error) {
// function selector (4 bytes) + hash for address
input := make([]byte, 0, contract.SelectorLen+common.HashLength)

switch role {
case AdminRole:
input = append(input, setAdminSignature...)
case ManagerRole:
input = append(input, setManagerSignature...)
case EnabledRole:
input = append(input, setEnabledSignature...)
case NoRole:
input = append(input, setNoneSignature...)
default:
return nil, fmt.Errorf("cannot pack modify list input with invalid role: %s", role)
}

input = append(input, common.BytesToHash(address[:]).Bytes()...)
return input, nil
}

func OldUnpackModifyAllowList(input []byte, _ Role) (common.Address, error) {
if len(input) != allowListInputLen {
return common.Address{}, fmt.Errorf("invalid input length for modifying allow list: %d", len(input))
}
return common.BytesToAddress(input), nil
}

func getRole(roleIndex uint) Role {
index := roleIndex % 4
switch index {
Expand Down
Loading
Loading