Create a 'Rip7560AbiVersion' global constant

This commit is contained in:
Alex Forshtat 2024-08-12 17:42:14 +02:00
parent 478edd1a6a
commit 2ce87f0003
2 changed files with 4 additions and 2 deletions

View file

@ -27,14 +27,14 @@ func abiEncodeValidateTransaction(tx *types.Rip7560AccountAbstractionTx, signing
} }
txAbiEncoding, err := tx.AbiEncode() txAbiEncoding, err := tx.AbiEncode()
validateTransactionData, err := jsonAbi.Pack("validateTransaction", big.NewInt(0), signingHash, txAbiEncoding) validateTransactionData, err := jsonAbi.Pack("validateTransaction", big.NewInt(Rip7560AbiVersion), signingHash, txAbiEncoding)
return validateTransactionData, err return validateTransactionData, err
} }
func abiEncodeValidatePaymasterTransaction(tx *types.Rip7560AccountAbstractionTx, signingHash common.Hash) ([]byte, error) { func abiEncodeValidatePaymasterTransaction(tx *types.Rip7560AccountAbstractionTx, signingHash common.Hash) ([]byte, error) {
jsonAbi, err := abi.JSON(strings.NewReader(ValidatePaymasterTransactionAbi)) jsonAbi, err := abi.JSON(strings.NewReader(ValidatePaymasterTransactionAbi))
txAbiEncoding, err := tx.AbiEncode() txAbiEncoding, err := tx.AbiEncode()
data, err := jsonAbi.Pack("validatePaymasterTransaction", big.NewInt(0), signingHash, txAbiEncoding) data, err := jsonAbi.Pack("validatePaymasterTransaction", big.NewInt(Rip7560AbiVersion), signingHash, txAbiEncoding)
return data, err return data, err
} }
@ -43,6 +43,7 @@ func abiEncodePostPaymasterTransaction(context []byte) ([]byte, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
// TODO: pass actual gas cost parameter here!
postOpData, err := jsonAbi.Pack("postPaymasterTransaction", true, big.NewInt(0), context) postOpData, err := jsonAbi.Pack("postPaymasterTransaction", true, big.NewInt(0), context)
return postOpData, err return postOpData, err
} }

View file

@ -4,6 +4,7 @@ const AcceptAccountMethodSig = uint64(0x1256ebd1) // acceptAccount(uint256,uin
const AcceptPaymasterMethodSig = uint64(0x03be8439) // acceptPaymaster(uint256,uint256,bytes) const AcceptPaymasterMethodSig = uint64(0x03be8439) // acceptPaymaster(uint256,uint256,bytes)
const SigFailAccountMethodSig = uint64(0x7715fac2) // sigFailAccount(uint256,uint256) const SigFailAccountMethodSig = uint64(0x7715fac2) // sigFailAccount(uint256,uint256)
const PaymasterMaxContextSize = 65536 const PaymasterMaxContextSize = 65536
const Rip7560AbiVersion = 0
const ValidateTransactionAbi = ` const ValidateTransactionAbi = `
[ [