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

Rpcv03 declare txn #294

Merged
merged 6 commits into from
Sep 5, 2023
Merged

Rpcv03 declare txn #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9535312
Implement DeclareTxn rpcv04
rianhughes Aug 21, 2023
a1219a4
rpcv03_declareTxn
rianhughes Aug 22, 2023
6ddec9f
rpcv03 declare te comments
rianhughes Sep 4, 2023
11e72b5
rpcv03 declare tx comments
rianhughes Sep 4, 2023
2e168a1
merge main
rianhughes Sep 5, 2023
9e41d54
remove deploy transaction
cicr99 Sep 5, 2023
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
75 changes: 56 additions & 19 deletions rpc/block_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,34 +339,63 @@ func TestBlockWithTxsAndDeployOrDeclare(t *testing.T) {

// To do : re-add test for deploy account transaction

var fullBlockGoerli848634 = Block{
var fullBlockGoerli848622 = Block{
BlockHeader: BlockHeader{
BlockHash: utils.TestHexToFelt(t, "0x684f3d864e91543bc02e8f1cad53750faf91dae7a7d8a5337d3710cbf7afb3a"),
ParentHash: utils.TestHexToFelt(t, "0x1848e859df691858f9ef2a84d0060de81080f2a5873f76827002512c87eeb96"),
BlockHash: utils.TestHexToFelt(t, "0x32964e2e407bb9e71b2de8d9d9829b0537df7c4624e1816e6cece80781ab9cc"),
ParentHash: utils.TestHexToFelt(t, "0xecbed6cfe85c77f2f8acefe2effbda817f71ca7457f7ece8262d65cc87a9f7"),
SequencerAddress: utils.TestHexToFelt(t, "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8"),
BlockNumber: 848634,
NewRoot: utils.TestHexToFelt(t, "00edc1cee04b4c7d4ff301151be08aea818ab03edcfe871de824eb3e8b0a729f"),
Timestamp: 1692418503,
BlockNumber: 848622,
NewRoot: utils.TestHexToFelt(t, "07c4302f09f6a72129679378e9b8d6c67774c5c4e80b1fc186da114f71637b2e"),
Timestamp: 1692416283,
},
Status: "ACCEPTED_ON_L1",
Transactions: []Transaction{
DeclareTxn{
DeclareTxnV1{
CommonTransaction: CommonTransaction{
TransactionHash: utils.TestHexToFelt(t, "0x23ea110ef578b24c2c2e7f5a25ee2983e9d430dc801c01302c1191fd7bf5948"),
TransactionHash: utils.TestHexToFelt(t, "0x5ad2f85499ea92d33d4a44c8cd4640d1ee4e25c3ee6df0bdf0a76c12c052f0a"),
BroadcastedTxnCommonProperties: BroadcastedTxnCommonProperties{
Type: TransactionType_Declare,
MaxFee: utils.TestHexToFelt(t, "0x27a64c6eeca"),
MaxFee: utils.TestHexToFelt(t, "0x27a64c6e425"),
Version: TransactionV1,
Signature: []*felt.Felt{utils.TestHexToFelt(t, "0x63c588e0e543458fb66d9aee3e1acc8ecd9694502533234b0680c9148bab82c"), utils.TestHexToFelt(t, "0xc7b2e56f0e9990edbe4b86be9ea515c46ec831e0b32cf475f37beb00459ebe")},
Nonce: utils.TestHexToFelt(t, "0x350"),
Signature: []*felt.Felt{utils.TestHexToFelt(t, "0x1454ab28f0bf18f0fd8002bc92169e6443feba6c605728c86850c0dcc9f6f9a"), utils.TestHexToFelt(t, "0xf545949c899ff1d16c61629996e898db2697a2e3e7fa9071b016500ca5c1d1")},
Nonce: utils.TestHexToFelt(t, "0x333"),
},
},
ClassHash: utils.TestHexToFelt(t, "0x398f9b04d99ace4cf04d0739dd6649e5e73a3d089e59aef3711f8b079b38849"),
ClassHash: utils.TestHexToFelt(t, "0x681076f783aa2b3faec6ce80bb5485a260ed1672007925e1d502b003aff2232"),
SenderAddress: utils.TestHexToFelt(t, "0x45dba6ce6a4dc3d2f31aa6da5f51007f1e43e84a1e62c4481bac5454dea4e6d"),
},
},
}

var fullBlockGoerli849399 = Block{
BlockHeader: BlockHeader{
BlockHash: utils.TestHexToFelt(t, "0x6e5b26127400bac0cd1f3c2ab6e76850ec457c71b1f2fc7cda755bee8a1102a"),
ParentHash: utils.TestHexToFelt(t, "0x7cd085d4ab95b3307303cb836ab49c0fbc8d1f9befdcfdc65292d99c9466d05"),
SequencerAddress: utils.TestHexToFelt(t, "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8"),
BlockNumber: 849399,
NewRoot: utils.TestHexToFelt(t, "0x239a44410e78665f41f7a65ef3b5ed244ce411965498a83f80f904e22df1045"),
Timestamp: 1692560305,
},
Status: "ACCEPTED_ON_L1",
Transactions: []Transaction{
DeclareTxnV2{
CommonTransaction: CommonTransaction{
TransactionHash: utils.TestHexToFelt(t, "0x45d04652ba51685b7b82fc17b3d5741a7c43992369c0b0aebd60916fa23b9b2"),
BroadcastedTxnCommonProperties: BroadcastedTxnCommonProperties{
Type: TransactionType_Declare,
MaxFee: utils.TestHexToFelt(t, "0x50c8f30287c"),
Version: TransactionV2,
Signature: []*felt.Felt{utils.TestHexToFelt(t, "0x6be01a56087382337a29fd4577dd20fd82cc9f38f69b8d19e07fc101c3c5ad9"), utils.TestHexToFelt(t, "0x4c633a5582d3932fbfcea8abd45c7453e88a562f1a38877b9575d6a6b926ea2")},
Nonce: utils.TestHexToFelt(t, "0xd"),
},
},
ClassHash: utils.TestHexToFelt(t, "0x6fda8f6630f44571cd6b398795351b37daf27adacbf6fe9357bd23ad19b22f3"),
CompiledClassHash: utils.TestHexToFelt(t, "0x4380d7c6511f81668530570a8b07bd2148808f90e681bb769549ec4faafef65"),
SenderAddress: utils.TestHexToFelt(t, "0x6ef69146f56205e27624a9933f31d6009198c1ea480070a790f16a5d928be92"),
},
},
}

testSet := map[string][]testSetType{
"mock": {},
"testnet": {
Expand All @@ -375,11 +404,18 @@ func TestBlockWithTxsAndDeployOrDeclare(t *testing.T) {
ExpectedError: nil,
},
{
BlockID: WithBlockNumber(848634),
BlockID: WithBlockNumber(849399),
ExpectedError: nil,
LookupTxnPositionInOriginal: 71,
LookupTxnPositionInExpected: 0,
ExpectedBlockWithTxs: &fullBlockGoerli849399,
},
{
BlockID: WithBlockNumber(848622),
ExpectedError: nil,
LookupTxnPositionInOriginal: 0,
LookupTxnPositionInOriginal: 6,
LookupTxnPositionInExpected: 0,
ExpectedBlockWithTxs: &fullBlockGoerli848634,
ExpectedBlockWithTxs: &fullBlockGoerli848622,
},
},
"mainnet": {},
Expand Down Expand Up @@ -480,8 +516,8 @@ func TestCaptureUnsupportedBlockTxn(t *testing.T) {
"mock": {},
"testnet": {
{
StartBlock: 848634,
EndBlock: 848635,
StartBlock: 381000,
EndBlock: 381001,
},
},
"mainnet": {},
Expand All @@ -500,9 +536,10 @@ func TestCaptureUnsupportedBlockTxn(t *testing.T) {
_, okv1 := v.(InvokeTxnV1)
_, okv0 := v.(InvokeTxnV0)
_, okl1 := v.(L1HandlerTxn)
_, okdec := v.(DeclareTxn)
_, okdec1 := v.(DeclareTxnV1)
_, okdec2 := v.(DeclareTxnV2)
_, okdepac := v.(DeployAccountTxn)
if !okv0 && !okv1 && !okl1 && !okdec && !okdepac {
if !okv0 && !okv1 && !okl1 && !okdec1 && !okdec2 && !okdepac {
t.Fatalf("New Type Detected %T at Block(%d)/Txn(%d)", v, i, k)
}
}
Expand Down
16 changes: 13 additions & 3 deletions rpc/transaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,19 @@ func adaptTransaction(t TXN) (Transaction, error) {
json.Unmarshal(txMarshalled, &tx)
return tx, nil
case TransactionType_Declare:
var tx DeclareTxn
json.Unmarshal(txMarshalled, &tx)
return tx, nil
switch t.Version {
case new(felt.Felt).SetUint64(1):
var tx DeclareTxnV1
json.Unmarshal(txMarshalled, &tx)
return tx, nil
case new(felt.Felt).SetUint64(2):
var tx DeclareTxnV2
json.Unmarshal(txMarshalled, &tx)
return tx, nil
default:
return nil, errors.New("Internal error with adaptTransaction()")
}

case TransactionType_DeployAccount:
var tx DeployAccountTxn
json.Unmarshal(txMarshalled, &tx)
Expand Down
9 changes: 5 additions & 4 deletions rpc/types_contract.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,12 @@ type DeprecatedEntryPointsByType struct {
External []DeprecatedCairoEntryPoint `json:"EXTERNAL"`
L1Handler []DeprecatedCairoEntryPoint `json:"L1_HANDLER"`
}

type DeprecatedContractClass struct {
// Program A base64 representation of the compressed program code
Program string `json:"program"`

EntryPointsByType DeprecatedEntryPointsByType `json:"entry_points_by_type"`
DeprecatedEntryPointsByType DeprecatedEntryPointsByType `json:"entry_points_by_type"`

ABI *ABI `json:"abi,omitempty"`
}
Expand Down Expand Up @@ -65,11 +66,11 @@ func (c *DeprecatedContractClass) UnmarshalJSON(content []byte) error {
return fmt.Errorf("missing entry_points_by_type in json object")
}

entryPointsByType := DeprecatedEntryPointsByType{}
if err := json.Unmarshal(data, &entryPointsByType); err != nil {
depEntryPointsByType := DeprecatedEntryPointsByType{}
if err := json.Unmarshal(data, &depEntryPointsByType); err != nil {
return err
}
c.EntryPointsByType = entryPointsByType
c.DeprecatedEntryPointsByType = depEntryPointsByType

// process 'abi'
data, ok = v["abi"]
Expand Down
35 changes: 30 additions & 5 deletions rpc/types_transaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func (tx L1HandlerTxn) Hash() *felt.Felt {
return tx.TransactionHash
}

type DeclareTxn struct {
type DeclareTxnV1 struct {
CommonTransaction

// ClassHash the hash of the declared class
Expand All @@ -103,7 +103,21 @@ type DeclareTxn struct {
SenderAddress *felt.Felt `json:"sender_address"`
}

func (tx DeclareTxn) Hash() *felt.Felt {
type DeclareTxnV2 struct {
rianhughes marked this conversation as resolved.
Show resolved Hide resolved
CommonTransaction

ClassHash *felt.Felt `json:"class_hash,omitempty"`

// SenderAddress the address of the account contract sending the declaration transaction
SenderAddress *felt.Felt `json:"sender_address"`

CompiledClassHash *felt.Felt `json:"compiled_class_hash"`
}

func (tx DeclareTxnV1) Hash() *felt.Felt {
return tx.TransactionHash
}
func (tx DeclareTxnV2) Hash() *felt.Felt {
return tx.TransactionHash
}

Expand Down Expand Up @@ -182,9 +196,19 @@ func unmarshalTxn(t interface{}) (Transaction, error) {
case map[string]interface{}:
switch TransactionType(casted["type"].(string)) {
case TransactionType_Declare:
var txn DeclareTxn
remarshal(casted, &txn)
return txn, nil

switch TransactionType(casted["version"].(string)) {
case "0x1":
var txn DeclareTxnV1
remarshal(casted, &txn)
return txn, nil
case "0x2":
var txn DeclareTxnV2
remarshal(casted, &txn)
return txn, nil
default:
return nil, errors.New("Internal error with Declare transaction version and unmarshalTxn()")
}
case TransactionType_DeployAccount:
var txn DeployAccountTxn
remarshal(casted, &txn)
Expand Down Expand Up @@ -228,6 +252,7 @@ type TransactionVersion string
const (
TransactionV0 TransactionVersion = "0x0"
TransactionV1 TransactionVersion = "0x1"
TransactionV2 TransactionVersion = "0x2"
)

func (v *TransactionVersion) BigInt() (*big.Int, error) {
Expand Down
Loading