Skip to content

N
nebula
Commit 5b9728d3 authored by clabby's avatar clabby
Browse files
Options

Resolve conflicts

parent 5bd1f463
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
packages/contracts-bedrock/.gitignore
View file @ 5b9728d3
...@@ -11,3 +11,5 @@ tmp-artifacts ...@@ -11,3 +11,5 @@ tmp-artifacts
deployments/mainnet-forked deployments/mainnet-forked
deploy-config/mainnet-forked.json deploy-config/mainnet-forked.json
test-case-generator/fuzz test-case-generator/fuzz
.resource-metering.csv
scripts/differential-testing/differential-testing
packages/contracts-bedrock/scripts/differential-testing/differential-testing.go
View file @ 5b9728d3
...@@ -103,7 +103,7 @@ func main() { ...@@ -103,7 +103,7 @@ func main() {
checkOk(ok) checkOk(ok)
gasLimit, ok := new(big.Int).SetString(args[5], 10) gasLimit, ok := new(big.Int).SetString(args[5], 10)
checkOk(ok) checkOk(ok)
data := common.Hex2Bytes(args[6][2:]) data := common.FromHex(args[6])
// Encode cross domain message // Encode cross domain message
encoded, err := encodeCrossDomainMessage(nonce, sender, target, value, gasLimit, data) encoded, err := encodeCrossDomainMessage(nonce, sender, target, value, gasLimit, data)
...@@ -125,7 +125,7 @@ func main() { ...@@ -125,7 +125,7 @@ func main() {
checkOk(ok) checkOk(ok)
gasLimit, ok := new(big.Int).SetString(args[5], 10) gasLimit, ok := new(big.Int).SetString(args[5], 10)
checkOk(ok) checkOk(ok)
data := common.Hex2Bytes(args[6][2:]) data := common.FromHex(args[6])
// Encode cross domain message // Encode cross domain message
encoded, err := encodeCrossDomainMessage(nonce, sender, target, value, gasLimit, data) encoded, err := encodeCrossDomainMessage(nonce, sender, target, value, gasLimit, data)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment