@wireio/opp-solidity-models 1.0.0 → 1.0.7

package/README.md

@@ -1,11 +1,17 @@
-# @wireio/opp-solidity-models
-
-Auto-generated protobuf Solidity contracts.
-
-## Usage
-
-Import contracts from `@wireio/opp-solidity-models/contracts/`.
-
-## Generated from
-
-Proto source: `Wire-Network/wire-sysio/libraries/opp#feature/protobuf-support-for-opp`
+# @wireio/opp-solidity-models
+
+Auto-generated protobuf Solidity contracts and TypeScript types.
+
+## Usage
+
+Import contracts from `@wireio/opp-solidity-models/contracts/`.
+
+Import TypeScript types:
+
+```typescript
+import { ... } from "@wireio/opp-solidity-models";
+```
+
+## Generated from
+
+Proto source: `Wire-Network/wire-sysio/libraries/opp#feature/protobuf-support-for-opp`

package/contracts/sysio/opp/Opp.sol

@@ -4,7 +4,8 @@ pragma solidity >=0.8.0 <0.9.0;
 // Auto-generated by protoc-gen-solidity from sysio/opp/opp.proto
 // DO NOT EDIT
 
-import {ProtobufRuntime} from "./ProtobufRuntime.sol";
+import {ProtobufRuntime} from "../../ProtobufRuntime.sol";
+import {ChainId, ChainIdCodec, ChainSignature, ChainSignatureCodec, EncodingFlags, EncodingFlagsCodec} from "./types/Types.sol";
 
 struct Endpoints {
     ChainId start;
@@ -28,7 +29,7 @@ struct MessagePayload {
 }
 
 struct AttestationEntry {
-    uint64 type;
+    uint64 type_;
     uint32 dataSize;
     bytes data;
 }
@@ -53,25 +54,25 @@ struct Envelope {
 
 library EndpointsCodec {
 
-  function encode(Endpoints memory msg) internal pure returns (bytes memory) {
+  function encode(Endpoints memory endpoints) internal pure returns (bytes memory) {
     bytes memory buf = "";
 
     // field 1: start
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0xa));
-    bytes memory start_encoded = ChainIdCodec.encode(msg.start);
+    bytes memory start_encoded = ChainIdCodec.encode(endpoints.start);
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(uint64(start_encoded.length)));
     buf = abi.encodePacked(buf, start_encoded);
 
     // field 2: end
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x12));
-    bytes memory end_encoded = ChainIdCodec.encode(msg.end);
+    bytes memory end_encoded = ChainIdCodec.encode(endpoints.end);
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(uint64(end_encoded.length)));
     buf = abi.encodePacked(buf, end_encoded);
 
     return buf;
   }
 
-  function decode(bytes memory data) internal pure returns (Endpoints memory msg) {
+  function decode(bytes memory data) internal pure returns (Endpoints memory endpoints) {
     uint256 pos = 0;
     uint256 end = data.length;
 
@@ -79,29 +80,20 @@ library EndpointsCodec {
       uint64 tag;
       (tag, pos) = ProtobufRuntime._decode_key(data, pos);
 
-      // solhint-disable-next-line no-empty-blocks
-      switch (tag) {
-        case 10:
-          {
-            uint64 _len;
-            (_len, pos) = ProtobufRuntime._decode_varint(data, pos);
-            bytes memory _sub = ProtobufRuntime._slice(data, pos, pos + uint256(_len));
-            msg.start = ChainIdCodec.decode(_sub);
-            pos += uint256(_len);
-          }
-          break;
-        case 18:
-          {
-            uint64 _len;
-            (_len, pos) = ProtobufRuntime._decode_varint(data, pos);
-            bytes memory _sub = ProtobufRuntime._slice(data, pos, pos + uint256(_len));
-            msg.end = ChainIdCodec.decode(_sub);
-            pos += uint256(_len);
-          }
-          break;
-        default:
-          pos = ProtobufRuntime._skip_field(data, pos, tag & 0x07);
-          break;
+      if (tag == 10) {
+        uint64 _len;
+        (_len, pos) = ProtobufRuntime._decode_varint(data, pos);
+        bytes memory _sub = ProtobufRuntime._slice(data, pos, pos + uint256(_len));
+        endpoints.start = ChainIdCodec.decode(_sub);
+        pos += uint256(_len);
+      } else if (tag == 18) {
+        uint64 _len;
+        (_len, pos) = ProtobufRuntime._decode_varint(data, pos);
+        bytes memory _sub = ProtobufRuntime._slice(data, pos, pos + uint256(_len));
+        endpoints.end = ChainIdCodec.decode(_sub);
+        pos += uint256(_len);
+      } else {
+        pos = ProtobufRuntime._skip_field(data, pos, tag & 0x07);
       }
     }
   }
@@ -109,49 +101,49 @@ library EndpointsCodec {
 
 library MessageHeaderCodec {
 
-  function encode(MessageHeader memory msg) internal pure returns (bytes memory) {
+  function encode(MessageHeader memory messageHeader) internal pure returns (bytes memory) {
     bytes memory buf = "";
 
     // field 1: endpoints
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0xa));
-    bytes memory endpoints_encoded = EndpointsCodec.encode(msg.endpoints);
+    bytes memory endpoints_encoded = EndpointsCodec.encode(messageHeader.endpoints);
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(uint64(endpoints_encoded.length)));
     buf = abi.encodePacked(buf, endpoints_encoded);
 
     // field 2: message_id
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x12));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_bytes(msg.messageId));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_bytes(messageHeader.messageId));
 
     // field 3: previous_message_id
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x1a));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_bytes(msg.previousMessageId));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_bytes(messageHeader.previousMessageId));
 
     // field 4: encoding_flags
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x22));
-    bytes memory encodingFlags_encoded = EncodingFlagsCodec.encode(msg.encodingFlags);
+    bytes memory encodingFlags_encoded = EncodingFlagsCodec.encode(messageHeader.encodingFlags);
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(uint64(encodingFlags_encoded.length)));
     buf = abi.encodePacked(buf, encodingFlags_encoded);
 
     // field 5: payload_size
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x28));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(msg.payloadSize));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(messageHeader.payloadSize));
 
     // field 6: payload_checksum
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x32));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_bytes(msg.payloadChecksum));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_bytes(messageHeader.payloadChecksum));
 
     // field 7: timestamp
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x38));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(msg.timestamp));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(messageHeader.timestamp));
 
     // field 8: header_checksum
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x42));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_bytes(msg.headerChecksum));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_bytes(messageHeader.headerChecksum));
 
     return buf;
   }
 
-  function decode(bytes memory data) internal pure returns (MessageHeader memory msg) {
+  function decode(bytes memory data) internal pure returns (MessageHeader memory messageHeader) {
     uint256 pos = 0;
     uint256 end = data.length;
 
@@ -159,47 +151,34 @@ library MessageHeaderCodec {
       uint64 tag;
       (tag, pos) = ProtobufRuntime._decode_key(data, pos);
 
-      // solhint-disable-next-line no-empty-blocks
-      switch (tag) {
-        case 10:
-          {
-            uint64 _len;
-            (_len, pos) = ProtobufRuntime._decode_varint(data, pos);
-            bytes memory _sub = ProtobufRuntime._slice(data, pos, pos + uint256(_len));
-            msg.endpoints = EndpointsCodec.decode(_sub);
-            pos += uint256(_len);
-          }
-          break;
-        case 18:
-          (msg.messageId, pos) = ProtobufRuntime._decode_bytes(data, pos);
-          break;
-        case 26:
-          (msg.previousMessageId, pos) = ProtobufRuntime._decode_bytes(data, pos);
-          break;
-        case 34:
-          {
-            uint64 _len;
-            (_len, pos) = ProtobufRuntime._decode_varint(data, pos);
-            bytes memory _sub = ProtobufRuntime._slice(data, pos, pos + uint256(_len));
-            msg.encodingFlags = EncodingFlagsCodec.decode(_sub);
-            pos += uint256(_len);
-          }
-          break;
-        case 40:
-          (msg.payloadSize, pos) = ProtobufRuntime._decode_varint(data, pos);
-          break;
-        case 50:
-          (msg.payloadChecksum, pos) = ProtobufRuntime._decode_bytes(data, pos);
-          break;
-        case 56:
-          (msg.timestamp, pos) = ProtobufRuntime._decode_varint(data, pos);
-          break;
-        case 66:
-          (msg.headerChecksum, pos) = ProtobufRuntime._decode_bytes(data, pos);
-          break;
-        default:
-          pos = ProtobufRuntime._skip_field(data, pos, tag & 0x07);
-          break;
+      if (tag == 10) {
+        uint64 _len;
+        (_len, pos) = ProtobufRuntime._decode_varint(data, pos);
+        bytes memory _sub = ProtobufRuntime._slice(data, pos, pos + uint256(_len));
+        messageHeader.endpoints = EndpointsCodec.decode(_sub);
+        pos += uint256(_len);
+      } else if (tag == 18) {
+        (messageHeader.messageId, pos) = ProtobufRuntime._decode_bytes(data, pos);
+      } else if (tag == 26) {
+        (messageHeader.previousMessageId, pos) = ProtobufRuntime._decode_bytes(data, pos);
+      } else if (tag == 34) {
+        uint64 _len;
+        (_len, pos) = ProtobufRuntime._decode_varint(data, pos);
+        bytes memory _sub = ProtobufRuntime._slice(data, pos, pos + uint256(_len));
+        messageHeader.encodingFlags = EncodingFlagsCodec.decode(_sub);
+        pos += uint256(_len);
+      } else if (tag == 40) {
+        { uint64 _v;
+        (_v, pos) = ProtobufRuntime._decode_varint(data, pos);
+        messageHeader.payloadSize = uint32(_v); }
+      } else if (tag == 50) {
+        (messageHeader.payloadChecksum, pos) = ProtobufRuntime._decode_bytes(data, pos);
+      } else if (tag == 56) {
+        (messageHeader.timestamp, pos) = ProtobufRuntime._decode_varint(data, pos);
+      } else if (tag == 66) {
+        (messageHeader.headerChecksum, pos) = ProtobufRuntime._decode_bytes(data, pos);
+      } else {
+        pos = ProtobufRuntime._skip_field(data, pos, tag & 0x07);
       }
     }
   }
@@ -207,17 +186,17 @@ library MessageHeaderCodec {
 
 library MessagePayloadCodec {
 
-  function encode(MessagePayload memory msg) internal pure returns (bytes memory) {
+  function encode(MessagePayload memory messagePayload) internal pure returns (bytes memory) {
     bytes memory buf = "";
 
     // field 1: version
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x8));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(msg.version));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(messagePayload.version));
 
     // field 2: attestations
-    for (uint256 _i_attestations = 0; _i_attestations < msg.attestations.length; _i_attestations++) {
+    for (uint256 _i_attestations = 0; _i_attestations < messagePayload.attestations.length; _i_attestations++) {
       buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x12));
-      bytes memory _elem = AttestationEntryCodec.encode(msg.attestations[_i_attestations]);
+      bytes memory _elem = AttestationEntryCodec.encode(messagePayload.attestations[_i_attestations]);
       buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(uint64(_elem.length)));
       buf = abi.encodePacked(buf, _elem);
     }
@@ -225,31 +204,39 @@ library MessagePayloadCodec {
     return buf;
   }
 
-  function decode(bytes memory data) internal pure returns (MessagePayload memory msg) {
+  function decode(bytes memory data) internal pure returns (MessagePayload memory messagePayload) {
     uint256 pos = 0;
     uint256 end = data.length;
 
+    uint256 _count_attestations = 0;
+    {
+      uint256 _pos = 0;
+      while (_pos < end) {
+        uint64 _tag;
+        (_tag, _pos) = ProtobufRuntime._decode_key(data, _pos);
+        if (_tag == 18) { _count_attestations++; }
+        _pos = ProtobufRuntime._skip_field(data, _pos, _tag & 0x07);
+      }
+    }
+    messagePayload.attestations = new AttestationEntry[](_count_attestations);
+    uint256 _idx_attestations = 0;
+
     while (pos < end) {
       uint64 tag;
       (tag, pos) = ProtobufRuntime._decode_key(data, pos);
 
-      // solhint-disable-next-line no-empty-blocks
-      switch (tag) {
-        case 8:
-          (msg.version, pos) = ProtobufRuntime._decode_varint(data, pos);
-          break;
-        case 18:
-          {
-            uint64 _len;
-            (_len, pos) = ProtobufRuntime._decode_varint(data, pos);
-            bytes memory _sub = ProtobufRuntime._slice(data, pos, pos + uint256(_len));
-            msg.attestations.push(AttestationEntryCodec.decode(_sub));
-            pos += uint256(_len);
-          }
-          break;
-        default:
-          pos = ProtobufRuntime._skip_field(data, pos, tag & 0x07);
-          break;
+      if (tag == 8) {
+        { uint64 _v;
+        (_v, pos) = ProtobufRuntime._decode_varint(data, pos);
+        messagePayload.version = uint32(_v); }
+      } else if (tag == 18) {
+        uint64 _len;
+        (_len, pos) = ProtobufRuntime._decode_varint(data, pos);
+        bytes memory _sub = ProtobufRuntime._slice(data, pos, pos + uint256(_len));
+        messagePayload.attestations[_idx_attestations++] = AttestationEntryCodec.decode(_sub);
+        pos += uint256(_len);
+      } else {
+        pos = ProtobufRuntime._skip_field(data, pos, tag & 0x07);
       }
     }
   }
@@ -257,25 +244,25 @@ library MessagePayloadCodec {
 
 library AttestationEntryCodec {
 
-  function encode(AttestationEntry memory msg) internal pure returns (bytes memory) {
+  function encode(AttestationEntry memory attestationEntry) internal pure returns (bytes memory) {
     bytes memory buf = "";
 
     // field 1: type
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x8));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(msg.type));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(attestationEntry.type_));
 
     // field 2: data_size
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x10));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(msg.dataSize));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(attestationEntry.dataSize));
 
     // field 3: data
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x1a));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_bytes(msg.data));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_bytes(attestationEntry.data));
 
     return buf;
   }
 
-  function decode(bytes memory data) internal pure returns (AttestationEntry memory msg) {
+  function decode(bytes memory data) internal pure returns (AttestationEntry memory attestationEntry) {
     uint256 pos = 0;
     uint256 end = data.length;
 
@@ -283,20 +270,16 @@ library AttestationEntryCodec {
       uint64 tag;
       (tag, pos) = ProtobufRuntime._decode_key(data, pos);
 
-      // solhint-disable-next-line no-empty-blocks
-      switch (tag) {
-        case 8:
-          (msg.type, pos) = ProtobufRuntime._decode_varint(data, pos);
-          break;
-        case 16:
-          (msg.dataSize, pos) = ProtobufRuntime._decode_varint(data, pos);
-          break;
-        case 26:
-          (msg.data, pos) = ProtobufRuntime._decode_bytes(data, pos);
-          break;
-        default:
-          pos = ProtobufRuntime._skip_field(data, pos, tag & 0x07);
-          break;
+      if (tag == 8) {
+        (attestationEntry.type_, pos) = ProtobufRuntime._decode_varint(data, pos);
+      } else if (tag == 16) {
+        { uint64 _v;
+        (_v, pos) = ProtobufRuntime._decode_varint(data, pos);
+        attestationEntry.dataSize = uint32(_v); }
+      } else if (tag == 26) {
+        (attestationEntry.data, pos) = ProtobufRuntime._decode_bytes(data, pos);
+      } else {
+        pos = ProtobufRuntime._skip_field(data, pos, tag & 0x07);
       }
     }
   }
@@ -304,25 +287,25 @@ library AttestationEntryCodec {
 
 library MessageCodec {
 
-  function encode(Message memory msg) internal pure returns (bytes memory) {
+  function encode(Message memory message) internal pure returns (bytes memory) {
     bytes memory buf = "";
 
     // field 1: header
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0xa));
-    bytes memory header_encoded = MessageHeaderCodec.encode(msg.header);
+    bytes memory header_encoded = MessageHeaderCodec.encode(message.header);
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(uint64(header_encoded.length)));
     buf = abi.encodePacked(buf, header_encoded);
 
     // field 2: payload
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x12));
-    bytes memory payload_encoded = MessagePayloadCodec.encode(msg.payload);
+    bytes memory payload_encoded = MessagePayloadCodec.encode(message.payload);
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(uint64(payload_encoded.length)));
     buf = abi.encodePacked(buf, payload_encoded);
 
     return buf;
   }
 
-  function decode(bytes memory data) internal pure returns (Message memory msg) {
+  function decode(bytes memory data) internal pure returns (Message memory message) {
     uint256 pos = 0;
     uint256 end = data.length;
 
@@ -330,29 +313,20 @@ library MessageCodec {
       uint64 tag;
       (tag, pos) = ProtobufRuntime._decode_key(data, pos);
 
-      // solhint-disable-next-line no-empty-blocks
-      switch (tag) {
-        case 10:
-          {
-            uint64 _len;
-            (_len, pos) = ProtobufRuntime._decode_varint(data, pos);
-            bytes memory _sub = ProtobufRuntime._slice(data, pos, pos + uint256(_len));
-            msg.header = MessageHeaderCodec.decode(_sub);
-            pos += uint256(_len);
-          }
-          break;
-        case 18:
-          {
-            uint64 _len;
-            (_len, pos) = ProtobufRuntime._decode_varint(data, pos);
-            bytes memory _sub = ProtobufRuntime._slice(data, pos, pos + uint256(_len));
-            msg.payload = MessagePayloadCodec.decode(_sub);
-            pos += uint256(_len);
-          }
-          break;
-        default:
-          pos = ProtobufRuntime._skip_field(data, pos, tag & 0x07);
-          break;
+      if (tag == 10) {
+        uint64 _len;
+        (_len, pos) = ProtobufRuntime._decode_varint(data, pos);
+        bytes memory _sub = ProtobufRuntime._slice(data, pos, pos + uint256(_len));
+        message.header = MessageHeaderCodec.decode(_sub);
+        pos += uint256(_len);
+      } else if (tag == 18) {
+        uint64 _len;
+        (_len, pos) = ProtobufRuntime._decode_varint(data, pos);
+        bytes memory _sub = ProtobufRuntime._slice(data, pos, pos + uint256(_len));
+        message.payload = MessagePayloadCodec.decode(_sub);
+        pos += uint256(_len);
+      } else {
+        pos = ProtobufRuntime._skip_field(data, pos, tag & 0x07);
       }
     }
   }
@@ -360,51 +334,51 @@ library MessageCodec {
 
 library EnvelopeCodec {
 
-  function encode(Envelope memory msg) internal pure returns (bytes memory) {
+  function encode(Envelope memory envelope) internal pure returns (bytes memory) {
     bytes memory buf = "";
 
     // field 1: envelope_hash
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0xa));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_bytes(msg.envelopeHash));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_bytes(envelope.envelopeHash));
 
     // field 2: endpoints
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x12));
-    bytes memory endpoints_encoded = EndpointsCodec.encode(msg.endpoints);
+    bytes memory endpoints_encoded = EndpointsCodec.encode(envelope.endpoints);
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(uint64(endpoints_encoded.length)));
     buf = abi.encodePacked(buf, endpoints_encoded);
 
     // field 5: epoch_timestamp
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x28));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(msg.epochTimestamp));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(envelope.epochTimestamp));
 
     // field 6: epoch_index
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x30));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(msg.epochIndex));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(envelope.epochIndex));
 
     // field 7: epoch_envelope_index
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x38));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(msg.epochEnvelopeIndex));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(envelope.epochEnvelopeIndex));
 
     // field 15: merkle
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x7a));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_bytes(msg.merkle));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_bytes(envelope.merkle));
 
     // field 20: previous_envelope_hash
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0xa2));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_bytes(msg.previousEnvelopeHash));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_bytes(envelope.previousEnvelopeHash));
 
     // field 30: start_message_id
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0xf2));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_bytes(msg.startMessageId));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_bytes(envelope.startMessageId));
 
     // field 31: end_message_id
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0xfa));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_bytes(msg.endMessageId));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_bytes(envelope.endMessageId));
 
     // field 50: signatures
-    for (uint256 _i_signatures = 0; _i_signatures < msg.signatures.length; _i_signatures++) {
+    for (uint256 _i_signatures = 0; _i_signatures < envelope.signatures.length; _i_signatures++) {
       buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x192));
-      bytes memory _elem = ChainSignatureCodec.encode(msg.signatures[_i_signatures]);
+      bytes memory _elem = ChainSignatureCodec.encode(envelope.signatures[_i_signatures]);
       buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(uint64(_elem.length)));
       buf = abi.encodePacked(buf, _elem);
     }
@@ -412,61 +386,61 @@ library EnvelopeCodec {
     return buf;
   }
 
-  function decode(bytes memory data) internal pure returns (Envelope memory msg) {
+  function decode(bytes memory data) internal pure returns (Envelope memory envelope) {
     uint256 pos = 0;
     uint256 end = data.length;
 
+    uint256 _count_signatures = 0;
+    {
+      uint256 _pos = 0;
+      while (_pos < end) {
+        uint64 _tag;
+        (_tag, _pos) = ProtobufRuntime._decode_key(data, _pos);
+        if (_tag == 402) { _count_signatures++; }
+        _pos = ProtobufRuntime._skip_field(data, _pos, _tag & 0x07);
+      }
+    }
+    envelope.signatures = new ChainSignature[](_count_signatures);
+    uint256 _idx_signatures = 0;
+
     while (pos < end) {
       uint64 tag;
       (tag, pos) = ProtobufRuntime._decode_key(data, pos);
 
-      // solhint-disable-next-line no-empty-blocks
-      switch (tag) {
-        case 10:
-          (msg.envelopeHash, pos) = ProtobufRuntime._decode_bytes(data, pos);
-          break;
-        case 18:
-          {
-            uint64 _len;
-            (_len, pos) = ProtobufRuntime._decode_varint(data, pos);
-            bytes memory _sub = ProtobufRuntime._slice(data, pos, pos + uint256(_len));
-            msg.endpoints = EndpointsCodec.decode(_sub);
-            pos += uint256(_len);
-          }
-          break;
-        case 40:
-          (msg.epochTimestamp, pos) = ProtobufRuntime._decode_varint(data, pos);
-          break;
-        case 48:
-          (msg.epochIndex, pos) = ProtobufRuntime._decode_varint(data, pos);
-          break;
-        case 56:
-          (msg.epochEnvelopeIndex, pos) = ProtobufRuntime._decode_varint(data, pos);
-          break;
-        case 122:
-          (msg.merkle, pos) = ProtobufRuntime._decode_bytes(data, pos);
-          break;
-        case 162:
-          (msg.previousEnvelopeHash, pos) = ProtobufRuntime._decode_bytes(data, pos);
-          break;
-        case 242:
-          (msg.startMessageId, pos) = ProtobufRuntime._decode_bytes(data, pos);
-          break;
-        case 250:
-          (msg.endMessageId, pos) = ProtobufRuntime._decode_bytes(data, pos);
-          break;
-        case 402:
-          {
-            uint64 _len;
-            (_len, pos) = ProtobufRuntime._decode_varint(data, pos);
-            bytes memory _sub = ProtobufRuntime._slice(data, pos, pos + uint256(_len));
-            msg.signatures.push(ChainSignatureCodec.decode(_sub));
-            pos += uint256(_len);
-          }
-          break;
-        default:
-          pos = ProtobufRuntime._skip_field(data, pos, tag & 0x07);
-          break;
+      if (tag == 10) {
+        (envelope.envelopeHash, pos) = ProtobufRuntime._decode_bytes(data, pos);
+      } else if (tag == 18) {
+        uint64 _len;
+        (_len, pos) = ProtobufRuntime._decode_varint(data, pos);
+        bytes memory _sub = ProtobufRuntime._slice(data, pos, pos + uint256(_len));
+        envelope.endpoints = EndpointsCodec.decode(_sub);
+        pos += uint256(_len);
+      } else if (tag == 40) {
+        (envelope.epochTimestamp, pos) = ProtobufRuntime._decode_varint(data, pos);
+      } else if (tag == 48) {
+        { uint64 _v;
+        (_v, pos) = ProtobufRuntime._decode_varint(data, pos);
+        envelope.epochIndex = uint32(_v); }
+      } else if (tag == 56) {
+        { uint64 _v;
+        (_v, pos) = ProtobufRuntime._decode_varint(data, pos);
+        envelope.epochEnvelopeIndex = uint32(_v); }
+      } else if (tag == 122) {
+        (envelope.merkle, pos) = ProtobufRuntime._decode_bytes(data, pos);
+      } else if (tag == 162) {
+        (envelope.previousEnvelopeHash, pos) = ProtobufRuntime._decode_bytes(data, pos);
+      } else if (tag == 242) {
+        (envelope.startMessageId, pos) = ProtobufRuntime._decode_bytes(data, pos);
+      } else if (tag == 250) {
+        (envelope.endMessageId, pos) = ProtobufRuntime._decode_bytes(data, pos);
+      } else if (tag == 402) {
+        uint64 _len;
+        (_len, pos) = ProtobufRuntime._decode_varint(data, pos);
+        bytes memory _sub = ProtobufRuntime._slice(data, pos, pos + uint256(_len));
+        envelope.signatures[_idx_signatures++] = ChainSignatureCodec.decode(_sub);
+        pos += uint256(_len);
+      } else {
+        pos = ProtobufRuntime._skip_field(data, pos, tag & 0x07);
       }
     }
   }