Skip to content

Commit 9da21f6

Browse files
committed
fix: Fix test genesis constructor args and VM serialization
1 parent 265add5 commit 9da21f6

2 files changed

Lines changed: 15 additions & 11 deletions

File tree

genesis/genesis_prefund_accounts.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,19 @@
3737
"0x101": {
3838
"class_hash": "0x61dac032f228abef9c6626f995015233097ae253a7f72d68552db02f2971b8f",
3939
"constructor_args": [
40-
"0x16d03d341717ab11083a481f53278d8e54f610af815cbdab4035b2df283fcc0",
41-
"0x0"
40+
"0x16d03d341717ab11083a481f53278d8e54f610af815cbdab4035b2df283fcc0"
4241
]
4342
},
4443
"0x102": {
4544
"class_hash": "0x61dac032f228abef9c6626f995015233097ae253a7f72d68552db02f2971b8f",
4645
"constructor_args": [
47-
"0x3bc7ab4ca475e24a0053db47c3e5a2a53264a30639d8b2bd0a08407da3ca0c",
48-
"0x0"
46+
"0x3bc7ab4ca475e24a0053db47c3e5a2a53264a30639d8b2bd0a08407da3ca0c"
4947
]
5048
},
5149
"0x406a8f52e741619b17410fc90774e4b36f968e1a71ae06baacfe1f55d987923": {
5250
"class_hash": "0x61dac032f228abef9c6626f995015233097ae253a7f72d68552db02f2971b8f",
5351
"constructor_args": [
54-
"0x441973b4517116d46800d35eca3bbcd455e034045c39852e46a74376d6881f",
55-
"0x0"
52+
"0x441973b4517116d46800d35eca3bbcd455e034045c39852e46a74376d6881f"
5653
]
5754
}
5855
},

vm/transaction.go

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ func adaptTransaction(txn core.Transaction) *Transaction {
133133
if tx.Version.Uint64() == 3 {
134134
tx.ResourceBounds = utils.HeapPtr(adaptResourceBounds(t.ResourceBounds))
135135
tx.Tip = new(felt.Felt).SetUint64(t.Tip)
136-
tx.PaymasterData = &t.PaymasterData
137-
tx.AccountDeploymentData = &t.AccountDeploymentData
136+
tx.PaymasterData = nilToZero(t.PaymasterData)
137+
tx.AccountDeploymentData = nilToZero(t.AccountDeploymentData)
138138
tx.NonceDAMode = utils.HeapPtr(DataAvailabilityMode(t.NonceDAMode))
139139
tx.FeeDAMode = utils.HeapPtr(DataAvailabilityMode(t.FeeDAMode))
140140
}
@@ -153,8 +153,8 @@ func adaptTransaction(txn core.Transaction) *Transaction {
153153
if t.Version.Is(3) {
154154
tx.ResourceBounds = utils.HeapPtr(adaptResourceBounds(t.ResourceBounds))
155155
tx.Tip = new(felt.Felt).SetUint64(t.Tip)
156-
tx.PaymasterData = &t.PaymasterData
157-
tx.AccountDeploymentData = &t.AccountDeploymentData
156+
tx.PaymasterData = nilToZero(t.PaymasterData)
157+
tx.AccountDeploymentData = nilToZero(t.AccountDeploymentData)
158158
tx.NonceDAMode = utils.HeapPtr(DataAvailabilityMode(t.NonceDAMode))
159159
tx.FeeDAMode = utils.HeapPtr(DataAvailabilityMode(t.FeeDAMode))
160160
}
@@ -188,7 +188,7 @@ func adaptTransaction(txn core.Transaction) *Transaction {
188188
if tx.Version.Uint64() == 3 {
189189
tx.ResourceBounds = utils.HeapPtr(adaptResourceBounds(t.ResourceBounds))
190190
tx.Tip = new(felt.Felt).SetUint64(t.Tip)
191-
tx.PaymasterData = &t.PaymasterData
191+
tx.PaymasterData = nilToZero(t.PaymasterData)
192192
tx.NonceDAMode = utils.HeapPtr(DataAvailabilityMode(t.NonceDAMode))
193193
tx.FeeDAMode = utils.HeapPtr(DataAvailabilityMode(t.FeeDAMode))
194194
}
@@ -208,3 +208,10 @@ func adaptResourceBounds(rb map[core.Resource]core.ResourceBounds) map[Resource]
208208
}
209209
return rpcResourceBounds
210210
}
211+
212+
func nilToZero(v []*felt.Felt) *[]*felt.Felt {
213+
if v == nil {
214+
return &[]*felt.Felt{}
215+
}
216+
return &v
217+
}

0 commit comments

Comments
 (0)