Update Go Contracts (#119)

Co-authored-by: Trajan0x <[email protected]>

.codecov.yml

@@ -12,4 +12,5 @@ ignore:
 # solidity test files
   - '*/test/*.sol'
   - '*/lib/*.sol'
-  - 'packages/contracts/libs/*.sol'
+  - 'packages/contracts/contracts/libs/*.sol'
+  - 'packages/contracts/test/*.sol'

core/types/encoder.go

@@ -179,9 +179,8 @@ func EncodeHeader(header Header) ([]byte, error) {
 // messageEncoder contains the binary structore of the message.
 type messageEncoder struct {
 	Version      uint16
-	HeaderOffset uint16
-	TipsOffset   uint16
-	BodyOffset   uint16
+	HeaderLength uint16
+	TipsLength   uint16
 }
 
 // EncodeMessage encodes a message.
@@ -196,16 +195,10 @@ func EncodeMessage(m Message) ([]byte, error) {
 		return []byte{}, fmt.Errorf("could not encode tips: %w", err)
 	}
 
-	tipsOffset := headerOffset + uint16(len(encodedHeader))
-	bodyOffset := tipsOffset + uint16(len(encodedTips))
-
-	// payload := append(append(encodedHeader, encodedTips...), m.Body()...)
-
 	newMessage := messageEncoder{
 		Version:      m.Version(),
-		HeaderOffset: headerOffset,
-		TipsOffset:   tipsOffset,
-		BodyOffset:   bodyOffset,
+		HeaderLength: uint16(len(encodedHeader)),
+		TipsLength:   uint16(len(encodedTips)),
 	}
 
 	buf := new(bytes.Buffer)

core/types/message.go

@@ -49,7 +49,7 @@ type messageImpl struct {
 
 const messageVersion uint16 = 1
 
-const headerOffset uint16 = 8
+const headerOffset uint16 = 6
 
 // NewMessage creates a new message from fields passed in.
 func NewMessage(header Header, tips Tips, body []byte) Message {
@@ -80,14 +80,14 @@ func DecodeMessage(message []byte) (Message, error) {
 		return nil, fmt.Errorf("could not parse encoded: %w", err)
 	}
 
-	rawHeader := message[encoded.HeaderOffset:encoded.TipsOffset]
+	rawHeader := message[headerOffset : encoded.HeaderLength+headerOffset]
 
 	header, err := DecodeHeader(rawHeader)
 	if err != nil {
 		return nil, fmt.Errorf("could not decode header: %w", err)
 	}
 
-	rawTips := message[encoded.TipsOffset:encoded.BodyOffset]
+	rawTips := message[headerOffset+encoded.HeaderLength : headerOffset+encoded.HeaderLength+encoded.TipsLength]
 	unmarshalledTips, err := DecodeTips(rawTips)
 	if err != nil {
 		return nil, fmt.Errorf("could not decode unmarshalledTips: %w", err)
@@ -100,7 +100,7 @@ func DecodeMessage(message []byte) (Message, error) {
 		return nil, fmt.Errorf("message too small, expected at least %d, got %d", dataSize, len(message))
 	}
 
-	rawBody := message[encoded.BodyOffset:]
+	rawBody := message[headerOffset+encoded.HeaderLength+encoded.TipsLength:]
 
 	decoded := messageImpl{
 		version: encoded.Version,

core/types/parity_test.go

@@ -142,9 +142,9 @@ func TestMessageEncodeParity(t *testing.T) {
 	Nil(t, err)
 	Equal(t, version, types.MessageVersion)
 
-	headerOffset, err := messageContract.HeaderOffset(&bind.CallOpts{Context: ctx})
+	headerOffset, err := messageContract.OffsetHeader(&bind.CallOpts{Context: ctx})
 	Nil(t, err)
-	Equal(t, headerOffset, types.HeaderOffset)
+	Equal(t, headerOffset, big.NewInt(int64(types.HeaderOffset)))
 
 	// generate some fake data
 	origin := gofakeit.Uint32()
@@ -160,7 +160,7 @@ func TestMessageEncodeParity(t *testing.T) {
 	proverTip := randomUint96BigInt(t)
 	executorTip := randomUint96BigInt(t)
 
-	formattedMessage, err := messageContract.FormatMessage(&bind.CallOpts{Context: ctx}, origin, sender, nonce, destination, recipient, optimisticSeconds, notaryTip, broadcasterTip, proverTip, executorTip, body)
+	formattedMessage, err := messageContract.FormatMessage0(&bind.CallOpts{Context: ctx}, origin, sender, nonce, destination, recipient, optimisticSeconds, notaryTip, broadcasterTip, proverTip, executorTip, body)
 	Nil(t, err)
 
 	decodedMessage, err := types.DecodeMessage(formattedMessage)

packages/contracts/package.json

@@ -4,7 +4,7 @@
   "description": "",
   "scripts": {
     "build": "yarn build:contracts && yarn build:typescript && yarn build:go",
-    "build:go": "rimraf ./flattened/* && yarn sol-merger \"./contracts/**.sol\" ./flattened --export-plugin SPDXLicenseRemovePlugin & yarn sol-merger \"./test/harnesses/**.sol\" ./flattened --export-plugin SPDXLicenseRemovePlugin",
+    "build:go": "rimraf ./flattened/* && yarn sol-merger \"./contracts/**.sol\" ./flattened --export-plugin SPDXLicenseRemovePlugin && yarn sol-merger \"./test/harnesses/**.sol\" ./flattened --export-plugin SPDXLicenseRemovePlugin && yarn sol-merger \"./test/harnesses/libs/**.sol\" ./flattened --export-plugin SPDXLicenseRemovePlugin",
     "build:contracts": "forge build",
     "build:slither": "hardhat compile",
     "build:typescript": "typechain --target ethers-v5 'artifacts/**/*json'",