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

chore(taiko-client): cleanup some unused variables in bindings package #18752

Merged
merged 1 commit into from
Jan 12, 2025
Merged

chore(taiko-client): cleanup some unused variables in bindings package #18752

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
135 changes: 7 additions & 128 deletions packages/taiko-client/bindings/encoding/input.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,64 +13,6 @@ import (

// ABI arguments marshaling components.
var (
blockMetadataComponents = []abi.ArgumentMarshaling{
{
Name: "l1Hash",
Type: "bytes32",
},
{
Name: "difficulty",
Type: "bytes32",
},
{
Name: "blobHash",
Type: "bytes32",
},
{
Name: "extraData",
Type: "bytes32",
},
{
Name: "depositsHash",
Type: "bytes32",
},
{
Name: "coinbase",
Type: "address",
},
{
Name: "id",
Type: "uint64",
},
{
Name: "gasLimit",
Type: "uint32",
},
{
Name: "timestamp",
Type: "uint64",
},
{
Name: "l1Height",
Type: "uint64",
},
{
Name: "minTier",
Type: "uint16",
},
{
Name: "blobUsed",
Type: "bool",
},
{
Name: "parentMetaHash",
Type: "bytes32",
},
{
Name: "sender",
Type: "address",
},
}
blockMetadataV2Components = []abi.ArgumentMarshaling{
{
Name: "anchorBlockHash",
Expand Down Expand Up @@ -203,42 +145,6 @@ var (
Type: "bytes",
},
}
blockParamsComponents = []abi.ArgumentMarshaling{
{
Name: "assignedProver",
Type: "address",
},
{
Name: "coinbase",
Type: "address",
},
{
Name: "extraData",
Type: "bytes32",
},
{
Name: "parentMetaHash",
Type: "bytes32",
},
{
Name: "hookCalls",
Type: "tuple[]",
Components: []abi.ArgumentMarshaling{
{
Name: "hook",
Type: "address",
},
{
Name: "data",
Type: "bytes",
},
},
},
{
Name: "signature",
Type: "bytes",
},
}
blockParamsV2Components = []abi.ArgumentMarshaling{
{
Name: "proposer",
Expand Down Expand Up @@ -276,20 +182,12 @@ var (
)

var (
blockParamsComponentsType, _ = abi.NewType("tuple", "TaikoData.BlockParams", blockParamsComponents)
blockParamsComponentsArgs = abi.Arguments{{Name: "TaikoData.BlockParams", Type: blockParamsComponentsType}}
blockParamsV2ComponentsType, _ = abi.NewType("tuple", "TaikoData.BlockParamsV2", blockParamsV2Components)
blockParamsV2ComponentsArgs = abi.Arguments{{Name: "TaikoData.BlockParamsV2", Type: blockParamsV2ComponentsType}}
blockMetadataComponentsType, _ = abi.NewType("tuple", "TaikoData.BlockMetadata", blockMetadataComponents)
blockMetadataV2ComponentsType, _ = abi.NewType("tuple", "TaikoData.BlockMetadataV2", blockMetadataV2Components)
transitionComponentsType, _ = abi.NewType("tuple", "TaikoData.Transition", transitionComponents)
tierProofComponentsType, _ = abi.NewType("tuple", "TaikoData.TierProof", tierProofComponents)
proveBlockInputArgs = abi.Arguments{
{Name: "TaikoData.BlockMetadata", Type: blockMetadataComponentsType},
{Name: "TaikoData.Transition", Type: transitionComponentsType},
{Name: "TaikoData.TierProof", Type: tierProofComponentsType},
}
proveOntakeBlockInputArgs = abi.Arguments{
proveOntakeBlockInputArgs = abi.Arguments{
{Name: "TaikoData.BlockMetadataV2", Type: blockMetadataV2ComponentsType},
{Name: "TaikoData.Transition", Type: transitionComponentsType},
{Name: "TaikoData.TierProof", Type: tierProofComponentsType},
Expand Down Expand Up @@ -381,15 +279,6 @@ func init() {
}
}

// EncodeBlockParams performs the solidity `abi.encode` for the given blockParams.
func EncodeBlockParams(params *BlockParams) ([]byte, error) {
b, err := blockParamsComponentsArgs.Pack(params)
if err != nil {
return nil, fmt.Errorf("failed to abi.encode block params, %w", err)
}
return b, nil
}

// EncodeBlockParamsOntake performs the solidity `abi.encode` for the given ontake blockParams.
func EncodeBlockParamsOntake(params *BlockParamsV2) ([]byte, error) {
b, err := blockParamsV2ComponentsArgs.Pack(params)
Expand All @@ -409,22 +298,12 @@ func EncodeProveBlockInput(
b []byte
err error
)
if meta.IsOntakeBlock() {
if b, err = proveOntakeBlockInputArgs.Pack(
meta.(*metadata.TaikoDataBlockMetadataOntake).InnerMetadata(),
transition,
tierProof,
); err != nil {
return nil, fmt.Errorf("failed to abi.encode TakoL1.proveBlock input after ontake fork, %w", err)
}
} else {
if b, err = proveBlockInputArgs.Pack(
meta.(*metadata.TaikoDataBlockMetadataLegacy).InnerMetadata(),
transition,
tierProof,
); err != nil {
return nil, fmt.Errorf("failed to abi.encode TakoL1.proveBlock input, %w", err)
}
if b, err = proveOntakeBlockInputArgs.Pack(
meta.(*metadata.TaikoDataBlockMetadataOntake).InnerMetadata(),
transition,
tierProof,
); err != nil {
return nil, fmt.Errorf("failed to abi.encode TakoL1.proveBlock input after ontake fork, %w", err)
}

return b, nil
Expand Down
Loading