@wireio/opp-solidity-models 1.0.9 → 1.0.12

package/contracts/sysio/opp/Opp.sol

@@ -5,7 +5,7 @@ pragma solidity >=0.8.0 <0.9.0;
 // DO NOT EDIT
 
 import {ProtobufRuntime} from "../../ProtobufRuntime.sol";
-import {ChainId, ChainIdCodec, ChainSignature, ChainSignatureCodec, EncodingFlags, EncodingFlagsCodec} from "./types/Types.sol";
+import {AttestationType, AttestationTypeLib, ChainId, ChainIdCodec, ChainSignature, ChainSignatureCodec, EncodingFlags, EncodingFlagsCodec} from "./types/Types.sol";
 
 struct Endpoints {
     ChainId start;
@@ -29,7 +29,7 @@ struct MessagePayload {
 }
 
 struct AttestationEntry {
-    uint64 type_;
+    AttestationType type_;
     uint32 dataSize;
     bytes data;
 }
@@ -249,7 +249,7 @@ library AttestationEntryCodec {
 
     // field 1: type
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x8));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(attestationEntry.type_));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(uint64(AttestationType.unwrap(attestationEntry.type_))));
 
     // field 2: data_size
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x10));
@@ -271,7 +271,9 @@ library AttestationEntryCodec {
       (tag, pos) = ProtobufRuntime._decode_key(data, pos);
 
       if (tag == 8) {
-        (attestationEntry.type_, pos) = ProtobufRuntime._decode_varint(data, pos);
+        { uint64 _v;
+        (_v, pos) = ProtobufRuntime._decode_varint(data, pos);
+        attestationEntry.type_ = AttestationType.wrap(uint16(_v)); }
       } else if (tag == 16) {
         { uint64 _v;
         (_v, pos) = ProtobufRuntime._decode_varint(data, pos);

package/contracts/sysio/opp/attestations/Attestations.sol

@@ -5,11 +5,25 @@ pragma solidity >=0.8.0 <0.9.0;
 // DO NOT EDIT
 
 import {ProtobufRuntime} from "../../../ProtobufRuntime.sol";
-import {ChainAddress, ChainAddressCodec, ChainId, ChainIdCodec, ChainSignature, ChainSignatureCodec, TokenAmount, TokenAmountCodec} from "../types/Types.sol";
+import {ChainAddress, ChainAddressCodec, ChainId, ChainIdCodec, ChainKind, ChainKindLib, ChainSignature, ChainSignatureCodec, OperatorStatus, OperatorStatusLib, OperatorType, OperatorTypeLib, StakeStatus, StakeStatusLib, TokenAmount, TokenAmountCodec} from "../types/Types.sol";
 import {Message, MessageCodec} from "../Opp.sol";
 
+type ActionType is uint8;
+
+using {ActionTypeLib.isValid} for ActionType global;
+
+library ActionTypeLib {
+    ActionType constant ACTION_TYPE_UNKNOWN = ActionType.wrap(0);
+    ActionType constant ACTION_TYPE_DEPOSIT = ActionType.wrap(1);
+    ActionType constant ACTION_TYPE_WITHDRAW = ActionType.wrap(2);
+
+    function isValid(ActionType _v) internal pure returns (bool) {
+        return ActionType.unwrap(_v) <= ActionType.unwrap(ACTION_TYPE_WITHDRAW);
+    }
+}
+
 struct ChainReserveBalanceSheet {
-    uint64 kind;
+    ChainKind kind;
     TokenAmount[] amounts;
 }
 
@@ -35,7 +49,7 @@ struct PretokenYield {
 
 struct StakeUpdate {
     ChainAddress actor;
-    uint64 status;
+    StakeStatus status;
     TokenAmount amount;
 }
 
@@ -45,10 +59,10 @@ struct WireTokenPurchase {
 }
 
 struct OperatorAction {
-    uint64 actionType;
+    ActionType actionType;
     ChainAddress actor;
-    uint64 type_;
-    uint64 status;
+    OperatorType type_;
+    OperatorStatus status;
     TokenAmount amount;
 }
 
@@ -73,7 +87,7 @@ library ChainReserveBalanceSheetCodec {
 
     // field 1: kind
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x8));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(chainReserveBalanceSheet.kind));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(uint64(ChainKind.unwrap(chainReserveBalanceSheet.kind))));
 
     // field 2: amounts
     for (uint256 _i_amounts = 0; _i_amounts < chainReserveBalanceSheet.amounts.length; _i_amounts++) {
@@ -108,7 +122,9 @@ library ChainReserveBalanceSheetCodec {
       (tag, pos) = ProtobufRuntime._decode_key(data, pos);
 
       if (tag == 8) {
-        (chainReserveBalanceSheet.kind, pos) = ProtobufRuntime._decode_varint(data, pos);
+        { uint64 _v;
+        (_v, pos) = ProtobufRuntime._decode_varint(data, pos);
+        chainReserveBalanceSheet.kind = ChainKind.wrap(uint8(_v)); }
       } else if (tag == 18) {
         uint64 _len;
         (_len, pos) = ProtobufRuntime._decode_varint(data, pos);
@@ -316,7 +332,7 @@ library StakeUpdateCodec {
 
     // field 2: status
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x10));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(stakeUpdate.status));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(uint64(StakeStatus.unwrap(stakeUpdate.status))));
 
     // field 3: amount
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x1a));
@@ -342,7 +358,9 @@ library StakeUpdateCodec {
         stakeUpdate.actor = ChainAddressCodec.decode(_sub);
         pos += uint256(_len);
       } else if (tag == 16) {
-        (stakeUpdate.status, pos) = ProtobufRuntime._decode_varint(data, pos);
+        { uint64 _v;
+        (_v, pos) = ProtobufRuntime._decode_varint(data, pos);
+        stakeUpdate.status = StakeStatus.wrap(uint8(_v)); }
       } else if (tag == 26) {
         uint64 _len;
         (_len, pos) = ProtobufRuntime._decode_varint(data, pos);
@@ -425,7 +443,7 @@ library OperatorActionCodec {
 
     // field 1: action_type
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x8));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(operatorAction.actionType));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(uint64(ActionType.unwrap(operatorAction.actionType))));
 
     // field 2: actor
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x12));
@@ -435,11 +453,11 @@ library OperatorActionCodec {
 
     // field 3: type
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x18));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(operatorAction.type_));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(uint64(OperatorType.unwrap(operatorAction.type_))));
 
     // field 4: status
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x20));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(operatorAction.status));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(uint64(OperatorStatus.unwrap(operatorAction.status))));
 
     // field 10: amount
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x52));
@@ -459,7 +477,9 @@ library OperatorActionCodec {
       (tag, pos) = ProtobufRuntime._decode_key(data, pos);
 
       if (tag == 8) {
-        (operatorAction.actionType, pos) = ProtobufRuntime._decode_varint(data, pos);
+        { uint64 _v;
+        (_v, pos) = ProtobufRuntime._decode_varint(data, pos);
+        operatorAction.actionType = ActionType.wrap(uint8(_v)); }
       } else if (tag == 18) {
         uint64 _len;
         (_len, pos) = ProtobufRuntime._decode_varint(data, pos);
@@ -467,9 +487,13 @@ library OperatorActionCodec {
         operatorAction.actor = ChainAddressCodec.decode(_sub);
         pos += uint256(_len);
       } else if (tag == 24) {
-        (operatorAction.type_, pos) = ProtobufRuntime._decode_varint(data, pos);
+        { uint64 _v;
+        (_v, pos) = ProtobufRuntime._decode_varint(data, pos);
+        operatorAction.type_ = OperatorType.wrap(uint8(_v)); }
       } else if (tag == 32) {
-        (operatorAction.status, pos) = ProtobufRuntime._decode_varint(data, pos);
+        { uint64 _v;
+        (_v, pos) = ProtobufRuntime._decode_varint(data, pos);
+        operatorAction.status = OperatorStatus.wrap(uint8(_v)); }
       } else if (tag == 82) {
         uint64 _len;
         (_len, pos) = ProtobufRuntime._decode_varint(data, pos);

package/contracts/sysio/opp/types/Types.sol

@@ -6,31 +6,197 @@ pragma solidity >=0.8.0 <0.9.0;
 
 import {ProtobufRuntime} from "../../../ProtobufRuntime.sol";
 
+type ChainKind is uint8;
+
+using {ChainKindLib.isValid} for ChainKind global;
+
+library ChainKindLib {
+    ChainKind constant CHAIN_KIND_UNKNOWN = ChainKind.wrap(0);
+    ChainKind constant CHAIN_KIND_WIRE = ChainKind.wrap(1);
+    ChainKind constant CHAIN_KIND_ETHEREUM = ChainKind.wrap(2);
+    ChainKind constant CHAIN_KIND_SOLANA = ChainKind.wrap(3);
+    ChainKind constant CHAIN_KIND_SUI = ChainKind.wrap(4);
+
+    function isValid(ChainKind _v) internal pure returns (bool) {
+        return ChainKind.unwrap(_v) <= ChainKind.unwrap(CHAIN_KIND_SUI);
+    }
+}
+
+type ChainKeyType is uint8;
+
+using {ChainKeyTypeLib.isValid} for ChainKeyType global;
+
+library ChainKeyTypeLib {
+    ChainKeyType constant CHAIN_KEY_TYPE_UNKNOWN = ChainKeyType.wrap(0);
+    ChainKeyType constant CHAIN_KEY_TYPE_WIRE = ChainKeyType.wrap(1);
+    ChainKeyType constant CHAIN_KEY_TYPE_WIRE_BLS = ChainKeyType.wrap(2);
+    ChainKeyType constant CHAIN_KEY_TYPE_ETHEREUM = ChainKeyType.wrap(3);
+    ChainKeyType constant CHAIN_KEY_TYPE_SOLANA = ChainKeyType.wrap(4);
+    ChainKeyType constant CHAIN_KEY_TYPE_SUI = ChainKeyType.wrap(5);
+
+    function isValid(ChainKeyType _v) internal pure returns (bool) {
+        return ChainKeyType.unwrap(_v) <= ChainKeyType.unwrap(CHAIN_KEY_TYPE_SUI);
+    }
+}
+
+type TokenKind is uint16;
+
+using {TokenKindLib.isValid} for TokenKind global;
+
+library TokenKindLib {
+    TokenKind constant TOKEN_KIND_WIRE = TokenKind.wrap(0);
+    TokenKind constant TOKEN_KIND_ETH = TokenKind.wrap(256);
+    TokenKind constant TOKEN_KIND_ERC721 = TokenKind.wrap(257);
+    TokenKind constant TOKEN_KIND_ERC1155 = TokenKind.wrap(258);
+    TokenKind constant TOKTOKEN_KIND_LIQETH = TokenKind.wrap(496);
+    TokenKind constant TOKEN_KIND_SOL = TokenKind.wrap(512);
+    TokenKind constant TOKEN_KIND_LIQSOL = TokenKind.wrap(752);
+
+    function isValid(TokenKind _v) internal pure returns (bool) {
+        return TokenKind.unwrap(_v) <= TokenKind.unwrap(TOKEN_KIND_LIQSOL);
+    }
+}
+
+type Endianness is uint8;
+
+using {EndiannessLib.isValid} for Endianness global;
+
+library EndiannessLib {
+    Endianness constant ENDIANNESS_BIG = Endianness.wrap(0);
+    Endianness constant ENDIANNESS_LITTLE = Endianness.wrap(1);
+
+    function isValid(Endianness _v) internal pure returns (bool) {
+        return Endianness.unwrap(_v) <= Endianness.unwrap(ENDIANNESS_LITTLE);
+    }
+}
+
+type HashAlgorithm is uint8;
+
+using {HashAlgorithmLib.isValid} for HashAlgorithm global;
+
+library HashAlgorithmLib {
+    HashAlgorithm constant HASH_ALGORITHM_KECCAK256 = HashAlgorithm.wrap(0);
+    HashAlgorithm constant HASH_ALGORITHM_SHA256 = HashAlgorithm.wrap(1);
+    HashAlgorithm constant HASH_ALGORITHM_RESERVED_1 = HashAlgorithm.wrap(2);
+    HashAlgorithm constant HASH_ALGORITHM_RESERVED_2 = HashAlgorithm.wrap(3);
+
+    function isValid(HashAlgorithm _v) internal pure returns (bool) {
+        return HashAlgorithm.unwrap(_v) <= HashAlgorithm.unwrap(HASH_ALGORITHM_RESERVED_2);
+    }
+}
+
+type LengthEncoding is uint8;
+
+using {LengthEncodingLib.isValid} for LengthEncoding global;
+
+library LengthEncodingLib {
+    LengthEncoding constant LENGTH_ENCODING_VARUINT = LengthEncoding.wrap(0);
+    LengthEncoding constant LENGTH_ENCODING_UINT32 = LengthEncoding.wrap(1);
+
+    function isValid(LengthEncoding _v) internal pure returns (bool) {
+        return LengthEncoding.unwrap(_v) <= LengthEncoding.unwrap(LENGTH_ENCODING_UINT32);
+    }
+}
+
+type AttestationType is uint16;
+
+using {AttestationTypeLib.isValid} for AttestationType global;
+
+library AttestationTypeLib {
+    AttestationType constant ATTESTATION_TYPE_UNSPECIFIED = AttestationType.wrap(0);
+    AttestationType constant ATTESTATION_TYPE_OPERATOR_ACTION = AttestationType.wrap(2001);
+    AttestationType constant ATTESTATION_TYPE_STAKE = AttestationType.wrap(3001);
+    AttestationType constant ATTESTATION_TYPE_UNSTAKE = AttestationType.wrap(3002);
+    AttestationType constant ATTESTATION_TYPE_PRETOKEN_PURCHASE = AttestationType.wrap(3004);
+    AttestationType constant ATTESTATION_TYPE_PRETOKEN_YIELD = AttestationType.wrap(3006);
+    AttestationType constant ATTESTATION_TYPE_RESERVE_BALANCE_SHEET = AttestationType.wrap(43520);
+    AttestationType constant ATTESTATION_TYPE_STAKE_UPDATE = AttestationType.wrap(60928);
+    AttestationType constant ATTESTATION_TYPE_NATIVE_YIELD_REWARD = AttestationType.wrap(60929);
+    AttestationType constant ATTESTATION_TYPE_WIRE_TOKEN_PURCHASE = AttestationType.wrap(60930);
+    AttestationType constant ATTESTATION_TYPE_OPERATOR_REG_DEREG = AttestationType.wrap(60931);
+    AttestationType constant ATTESTATION_TYPE_CHALLENGE_RESPONSE = AttestationType.wrap(60932);
+    AttestationType constant ATTESTATION_TYPE_SLASH_OPERATOR = AttestationType.wrap(60933);
+
+    function isValid(AttestationType _v) internal pure returns (bool) {
+        return AttestationType.unwrap(_v) <= AttestationType.unwrap(ATTESTATION_TYPE_SLASH_OPERATOR);
+    }
+}
+
+type StakeStatus is uint8;
+
+using {StakeStatusLib.isValid} for StakeStatus global;
+
+library StakeStatusLib {
+    StakeStatus constant STAKE_STATUS_UNKNOWN = StakeStatus.wrap(0);
+    StakeStatus constant STAKE_STATUS_WARMUP = StakeStatus.wrap(1);
+    StakeStatus constant STAKE_STATUS_COOLDOWN = StakeStatus.wrap(2);
+    StakeStatus constant STAKE_STATUS_ACTIVE = StakeStatus.wrap(3);
+    StakeStatus constant STAKE_STATUS_TERMINATED = StakeStatus.wrap(240);
+    StakeStatus constant STAKE_STATUS_SLASHED = StakeStatus.wrap(241);
+
+    function isValid(StakeStatus _v) internal pure returns (bool) {
+        return StakeStatus.unwrap(_v) <= StakeStatus.unwrap(STAKE_STATUS_SLASHED);
+    }
+}
+
+type OperatorType is uint8;
+
+using {OperatorTypeLib.isValid} for OperatorType global;
+
+library OperatorTypeLib {
+    OperatorType constant OPERATOR_TYPE_UNKNOWN = OperatorType.wrap(0);
+    OperatorType constant OPERATOR_TYPE_PRODUCER = OperatorType.wrap(1);
+    OperatorType constant OPERATOR_TYPE_BATCH = OperatorType.wrap(2);
+    OperatorType constant OPERATOR_TYPE_UNDERWRITER = OperatorType.wrap(3);
+    OperatorType constant OPERATOR_TYPE_CHALLENGER = OperatorType.wrap(4);
+
+    function isValid(OperatorType _v) internal pure returns (bool) {
+        return OperatorType.unwrap(_v) <= OperatorType.unwrap(OPERATOR_TYPE_CHALLENGER);
+    }
+}
+
+type OperatorStatus is uint8;
+
+using {OperatorStatusLib.isValid} for OperatorStatus global;
+
+library OperatorStatusLib {
+    OperatorStatus constant OPERATOR_STATUS_UNKNOWN = OperatorStatus.wrap(0);
+    OperatorStatus constant OPERATOR_STATUS_WARMUP = OperatorStatus.wrap(1);
+    OperatorStatus constant OPERATOR_STATUS_COOLDOWN = OperatorStatus.wrap(2);
+    OperatorStatus constant OPERATOR_STATUS_ACTIVE = OperatorStatus.wrap(3);
+    OperatorStatus constant OPERATOR_STATUS_TERMINATED = OperatorStatus.wrap(240);
+    OperatorStatus constant OPERATOR_STATUS_SLASHED = OperatorStatus.wrap(241);
+
+    function isValid(OperatorStatus _v) internal pure returns (bool) {
+        return OperatorStatus.unwrap(_v) <= OperatorStatus.unwrap(OPERATOR_STATUS_SLASHED);
+    }
+}
+
 struct ChainId {
-    uint64 kind;
+    ChainKind kind;
     uint32 id;
 }
 
 struct ChainAddress {
-    uint64 kind;
+    ChainKind kind;
     bytes address_;
 }
 
 struct ChainSignature {
     ChainAddress actor;
-    uint64 keyType;
+    ChainKeyType keyType;
     bytes signature;
 }
 
 struct TokenAmount {
-    uint64 kind;
+    TokenKind kind;
     int64 amount;
 }
 
 struct EncodingFlags {
-    uint64 endianness;
-    uint64 hashAlgorithm;
-    uint64 lengthEncoding;
+    Endianness endianness;
+    HashAlgorithm hashAlgorithm;
+    LengthEncoding lengthEncoding;
 }
 
 library ChainIdCodec {
@@ -40,7 +206,7 @@ library ChainIdCodec {
 
     // field 1: kind
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x8));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(chainId.kind));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(uint64(ChainKind.unwrap(chainId.kind))));
 
     // field 2: id
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x10));
@@ -58,7 +224,9 @@ library ChainIdCodec {
       (tag, pos) = ProtobufRuntime._decode_key(data, pos);
 
       if (tag == 8) {
-        (chainId.kind, pos) = ProtobufRuntime._decode_varint(data, pos);
+        { uint64 _v;
+        (_v, pos) = ProtobufRuntime._decode_varint(data, pos);
+        chainId.kind = ChainKind.wrap(uint8(_v)); }
       } else if (tag == 16) {
         { uint64 _v;
         (_v, pos) = ProtobufRuntime._decode_varint(data, pos);
@@ -77,7 +245,7 @@ library ChainAddressCodec {
 
     // field 1: kind
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x8));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(chainAddress.kind));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(uint64(ChainKind.unwrap(chainAddress.kind))));
 
     // field 2: address
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x12));
@@ -95,7 +263,9 @@ library ChainAddressCodec {
       (tag, pos) = ProtobufRuntime._decode_key(data, pos);
 
       if (tag == 8) {
-        (chainAddress.kind, pos) = ProtobufRuntime._decode_varint(data, pos);
+        { uint64 _v;
+        (_v, pos) = ProtobufRuntime._decode_varint(data, pos);
+        chainAddress.kind = ChainKind.wrap(uint8(_v)); }
       } else if (tag == 18) {
         (chainAddress.address_, pos) = ProtobufRuntime._decode_bytes(data, pos);
       } else {
@@ -118,7 +288,7 @@ library ChainSignatureCodec {
 
     // field 2: key_type
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x10));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(chainSignature.keyType));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(uint64(ChainKeyType.unwrap(chainSignature.keyType))));
 
     // field 3: signature
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x1a));
@@ -142,7 +312,9 @@ library ChainSignatureCodec {
         chainSignature.actor = ChainAddressCodec.decode(_sub);
         pos += uint256(_len);
       } else if (tag == 16) {
-        (chainSignature.keyType, pos) = ProtobufRuntime._decode_varint(data, pos);
+        { uint64 _v;
+        (_v, pos) = ProtobufRuntime._decode_varint(data, pos);
+        chainSignature.keyType = ChainKeyType.wrap(uint8(_v)); }
       } else if (tag == 26) {
         (chainSignature.signature, pos) = ProtobufRuntime._decode_bytes(data, pos);
       } else {
@@ -159,7 +331,7 @@ library TokenAmountCodec {
 
     // field 1: kind
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x8));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(tokenAmount.kind));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(uint64(TokenKind.unwrap(tokenAmount.kind))));
 
     // field 2: amount
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x10));
@@ -177,7 +349,9 @@ library TokenAmountCodec {
       (tag, pos) = ProtobufRuntime._decode_key(data, pos);
 
       if (tag == 8) {
-        (tokenAmount.kind, pos) = ProtobufRuntime._decode_varint(data, pos);
+        { uint64 _v;
+        (_v, pos) = ProtobufRuntime._decode_varint(data, pos);
+        tokenAmount.kind = TokenKind.wrap(uint16(_v)); }
       } else if (tag == 16) {
         { uint64 _v;
         (_v, pos) = ProtobufRuntime._decode_varint(data, pos);
@@ -196,15 +370,15 @@ library EncodingFlagsCodec {
 
     // field 1: endianness
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x8));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(encodingFlags.endianness));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(uint64(Endianness.unwrap(encodingFlags.endianness))));
 
     // field 2: hash_algorithm
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x10));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(encodingFlags.hashAlgorithm));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(uint64(HashAlgorithm.unwrap(encodingFlags.hashAlgorithm))));
 
     // field 3: length_encoding
     buf = abi.encodePacked(buf, ProtobufRuntime._encode_key(0x18));
-    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(encodingFlags.lengthEncoding));
+    buf = abi.encodePacked(buf, ProtobufRuntime._encode_varint(uint64(LengthEncoding.unwrap(encodingFlags.lengthEncoding))));
 
     return buf;
   }
@@ -218,11 +392,17 @@ library EncodingFlagsCodec {
       (tag, pos) = ProtobufRuntime._decode_key(data, pos);
 
       if (tag == 8) {
-        (encodingFlags.endianness, pos) = ProtobufRuntime._decode_varint(data, pos);
+        { uint64 _v;
+        (_v, pos) = ProtobufRuntime._decode_varint(data, pos);
+        encodingFlags.endianness = Endianness.wrap(uint8(_v)); }
       } else if (tag == 16) {
-        (encodingFlags.hashAlgorithm, pos) = ProtobufRuntime._decode_varint(data, pos);
+        { uint64 _v;
+        (_v, pos) = ProtobufRuntime._decode_varint(data, pos);
+        encodingFlags.hashAlgorithm = HashAlgorithm.wrap(uint8(_v)); }
       } else if (tag == 24) {
-        (encodingFlags.lengthEncoding, pos) = ProtobufRuntime._decode_varint(data, pos);
+        { uint64 _v;
+        (_v, pos) = ProtobufRuntime._decode_varint(data, pos);
+        encodingFlags.lengthEncoding = LengthEncoding.wrap(uint8(_v)); }
       } else {
         pos = ProtobufRuntime._skip_field(data, pos, tag & 0x07);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wireio/opp-solidity-models",
-  "version": "1.0.9",
+  "version": "1.0.12",
   "description": "Auto-generated protobuf types for Solidity",
   "type": "module",
   "main": "index.js",

package/sysio/opp/types/types.d.ts

@@ -148,31 +148,43 @@ export declare enum TokenKind {
      *
      * @generated from protobuf enum value: TOKEN_KIND_WIRE = 0;
      */
-    WIRE = 0,
+    TOKEN_KIND_WIRE = 0,
     /**
      * 0x0100
      *
      * @generated from protobuf enum value: TOKEN_KIND_ETH = 256;
      */
-    ETH = 256,
+    TOKEN_KIND_ETH = 256,
+    /**
+     * 0x0101
+     *
+     * @generated from protobuf enum value: TOKEN_KIND_ERC721 = 257;
+     */
+    TOKEN_KIND_ERC721 = 257,
+    /**
+     * 0x0102
+     *
+     * @generated from protobuf enum value: TOKEN_KIND_ERC1155 = 258;
+     */
+    TOKEN_KIND_ERC1155 = 258,
     /**
      * 0x01F0
      *
-     * @generated from protobuf enum value: TOKEN_KIND_LIQETH = 496;
+     * @generated from protobuf enum value: TOKTOKEN_KIND_LIQETH = 496;
      */
-    LIQETH = 496,
+    TOKTOKEN_KIND_LIQETH = 496,
     /**
      * 0x0200
      *
      * @generated from protobuf enum value: TOKEN_KIND_SOL = 512;
      */
-    SOL = 512,
+    TOKEN_KIND_SOL = 512,
     /**
      * 0x02F0
      *
      * @generated from protobuf enum value: TOKEN_KIND_LIQSOL = 752;
      */
-    LIQSOL = 752
+    TOKEN_KIND_LIQSOL = 752
 }
 /**
  * @generated from protobuf enum sysio.opp.types.Endianness

package/sysio/opp/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAE3D,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD;;GAEG;AACH,MAAM,WAAW,OAAO;IACpB;;OAEG;IACH,IAAI,EAAE,SAAS,CAAC;IAChB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;CACd;AACD;;;;GAIG;AACH,MAAM,WAAW,YAAY;IACzB;;OAEG;IACH,IAAI,EAAE,SAAS,CAAC;IAChB;;OAEG;IACH,OAAO,EAAE,UAAU,CAAC;CACvB;AACD;;GAEG;AACH,MAAM,WAAW,cAAc;IAC3B;;OAEG;IACH,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB;;OAEG;IACH,OAAO,EAAE,YAAY,CAAC;IACtB;;OAEG;IACH,SAAS,EAAE,UAAU,CAAC;CACzB;AACD;;;;GAIG;AACH,MAAM,WAAW,WAAW;IACxB;;OAEG;IACH,IAAI,EAAE,SAAS,CAAC;IAChB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;CAClB;AACD;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC1B;;OAEG;IACH,UAAU,EAAE,UAAU,CAAC;IACvB;;OAEG;IACH,aAAa,EAAE,aAAa,CAAC;IAC7B;;OAEG;IACH,cAAc,EAAE,cAAc,CAAC;CAClC;AAKD;;GAEG;AACH,oBAAY,SAAS;IACjB;;OAEG;IACH,OAAO,IAAI;IACX;;OAEG;IACH,IAAI,IAAI;IACR;;OAEG;IACH,QAAQ,IAAI;IACZ;;OAEG;IACH,MAAM,IAAI;IACV;;OAEG;IACH,GAAG,IAAI;CACV;AACD;;GAEG;AACH,oBAAY,YAAY;IACpB;;OAEG;IACH,OAAO,IAAI;IACX;;OAEG;IACH,IAAI,IAAI;IACR;;OAEG;IACH,QAAQ,IAAI;IACZ;;OAEG;IACH,QAAQ,IAAI;IACZ;;OAEG;IACH,MAAM,IAAI;IACV;;OAEG;IACH,GAAG,IAAI;CACV;AACD;;;;GAIG;AACH,oBAAY,SAAS;IACjB;;;;OAIG;IACH,eAAe,IAAI;IACnB;;;;OAIG;IACH,cAAc,MAAM;IACpB;;;;OAIG;IACH,iBAAiB,MAAM;IACvB;;;;OAIG;IACH,kBAAkB,MAAM;IACxB;;;;OAIG;IACH,oBAAoB,MAAM;IAC1B;;;;OAIG;IACH,cAAc,MAAM;IACpB;;;;OAIG;IACH,iBAAiB,MAAM;CAC1B;AASD;;GAEG;AACH,oBAAY,UAAU;IAClB;;;;OAIG;IACH,GAAG,IAAI;IACP;;;;OAIG;IACH,MAAM,IAAI;CACb;AACD;;GAEG;AACH,oBAAY,aAAa;IACrB;;;;OAIG;IACH,SAAS,IAAI;IACb;;;;OAIG;IACH,MAAM,IAAI;IACV;;;;OAIG;IACH,UAAU,IAAI;IACd;;;;OAIG;IACH,UAAU,IAAI;CACjB;AACD;;GAEG;AACH,oBAAY,cAAc;IACtB;;;;OAIG;IACH,OAAO,IAAI;IACX;;;;OAIG;IACH,MAAM,IAAI;CACb;AAKD;;GAEG;AACH,oBAAY,eAAe;IACvB;;OAEG;IACH,WAAW,IAAI;IACf;;;;OAIG;IACH,eAAe,OAAO;IACtB;;;;OAIG;IACH,KAAK,OAAO;IACZ;;;;OAIG;IACH,OAAO,OAAO;IACd;;;;OAIG;IACH,iBAAiB,OAAO;IACxB;;;;OAIG;IACH,cAAc,OAAO;IACrB;;;;OAIG;IACH,qBAAqB,QAAQ;IAC7B;;;;OAIG;IACH,YAAY,QAAQ;IACpB;;;;OAIG;IACH,mBAAmB,QAAQ;IAC3B;;;;OAIG;IACH,mBAAmB,QAAQ;IAC3B;;;;OAIG;IACH,kBAAkB,QAAQ;IAC1B;;;;OAIG;IACH,kBAAkB,QAAQ;IAC1B;;;;OAIG;IACH,cAAc,QAAQ;CACzB;AAKD;;GAEG;AACH,oBAAY,WAAW;IACnB;;OAEG;IACH,OAAO,IAAI;IACX;;;;OAIG;IACH,MAAM,IAAI;IACV;;;;OAIG;IACH,QAAQ,IAAI;IACZ;;;;OAIG;IACH,MAAM,IAAI;IACV;;;;OAIG;IACH,UAAU,MAAM;IAChB;;;;OAIG;IACH,OAAO,MAAM;CAChB;AACD;;GAEG;AACH,oBAAY,YAAY;IACpB;;OAEG;IACH,OAAO,IAAI;IACX;;;;OAIG;IACH,QAAQ,IAAI;IACZ;;;;OAIG;IACH,KAAK,IAAI;IACT;;;;OAIG;IACH,WAAW,IAAI;IACf;;;;OAIG;IACH,UAAU,IAAI;CACjB;AACD;;GAEG;AACH,oBAAY,cAAc;IACtB;;OAEG;IACH,OAAO,IAAI;IACX;;;;OAIG;IACH,MAAM,IAAI;IACV;;;;OAIG;IACH,QAAQ,IAAI;IACZ;;;;OAIG;IACH,MAAM,IAAI;IACV;;;;OAIG;IACH,UAAU,MAAM;IAChB;;;;OAIG;IACH,OAAO,MAAM;CAChB;AAED,cAAM,YAAa,SAAQ,WAAW,CAAC,OAAO,CAAC;;IAO3C,MAAM,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG,OAAO;IAQhD,kBAAkB,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO;IAsBhH,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,kBAAkB,GAAG,aAAa;CAY3G;AACD;;GAEG;AACH,eAAO,MAAM,OAAO,cAAqB,CAAC;AAE1C,cAAM,iBAAkB,SAAQ,WAAW,CAAC,YAAY,CAAC;;IAOrD,MAAM,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC,YAAY,CAAC,GAAG,YAAY;IAQ1D,kBAAkB,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,YAAY,GAAG,YAAY;IAsB1H,mBAAmB,CAAC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,kBAAkB,GAAG,aAAa;CAYhH;AACD;;GAEG;AACH,eAAO,MAAM,YAAY,mBAA0B,CAAC;AAEpD,cAAM,mBAAoB,SAAQ,WAAW,CAAC,cAAc,CAAC;;IAQzD,MAAM,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,GAAG,cAAc;IAQ9D,kBAAkB,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,cAAc,GAAG,cAAc;IAyB9H,mBAAmB,CAAC,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,kBAAkB,GAAG,aAAa;CAelH;AACD;;GAEG;AACH,eAAO,MAAM,cAAc,qBAA4B,CAAC;AAExD,cAAM,gBAAiB,SAAQ,WAAW,CAAC,WAAW,CAAC;;IAOnD,MAAM,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC,WAAW,CAAC,GAAG,WAAW;IAQxD,kBAAkB,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,WAAW;IAsBxH,mBAAmB,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,kBAAkB,GAAG,aAAa;CAY/G;AACD;;GAEG;AACH,eAAO,MAAM,WAAW,kBAAyB,CAAC;AAElD,cAAM,kBAAmB,SAAQ,WAAW,CAAC,aAAa,CAAC;;IAQvD,MAAM,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC,aAAa,CAAC,GAAG,aAAa;IAS5D,kBAAkB,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,aAAa,GAAG,aAAa;IAyB5H,mBAAmB,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,kBAAkB,GAAG,aAAa;CAejH;AACD;;GAEG;AACH,eAAO,MAAM,aAAa,oBAA2B,CAAC"}

package/sysio/opp/types/types.js

@@ -73,31 +73,43 @@ export var TokenKind;
      *
      * @generated from protobuf enum value: TOKEN_KIND_WIRE = 0;
      */
-    TokenKind[TokenKind["WIRE"] = 0] = "WIRE";
+    TokenKind[TokenKind["TOKEN_KIND_WIRE"] = 0] = "TOKEN_KIND_WIRE";
     /**
      * 0x0100
      *
      * @generated from protobuf enum value: TOKEN_KIND_ETH = 256;
      */
-    TokenKind[TokenKind["ETH"] = 256] = "ETH";
+    TokenKind[TokenKind["TOKEN_KIND_ETH"] = 256] = "TOKEN_KIND_ETH";
+    /**
+     * 0x0101
+     *
+     * @generated from protobuf enum value: TOKEN_KIND_ERC721 = 257;
+     */
+    TokenKind[TokenKind["TOKEN_KIND_ERC721"] = 257] = "TOKEN_KIND_ERC721";
+    /**
+     * 0x0102
+     *
+     * @generated from protobuf enum value: TOKEN_KIND_ERC1155 = 258;
+     */
+    TokenKind[TokenKind["TOKEN_KIND_ERC1155"] = 258] = "TOKEN_KIND_ERC1155";
     /**
      * 0x01F0
      *
-     * @generated from protobuf enum value: TOKEN_KIND_LIQETH = 496;
+     * @generated from protobuf enum value: TOKTOKEN_KIND_LIQETH = 496;
      */
-    TokenKind[TokenKind["LIQETH"] = 496] = "LIQETH";
+    TokenKind[TokenKind["TOKTOKEN_KIND_LIQETH"] = 496] = "TOKTOKEN_KIND_LIQETH";
     /**
      * 0x0200
      *
      * @generated from protobuf enum value: TOKEN_KIND_SOL = 512;
      */
-    TokenKind[TokenKind["SOL"] = 512] = "SOL";
+    TokenKind[TokenKind["TOKEN_KIND_SOL"] = 512] = "TOKEN_KIND_SOL";
     /**
      * 0x02F0
      *
      * @generated from protobuf enum value: TOKEN_KIND_LIQSOL = 752;
      */
-    TokenKind[TokenKind["LIQSOL"] = 752] = "LIQSOL";
+    TokenKind[TokenKind["TOKEN_KIND_LIQSOL"] = 752] = "TOKEN_KIND_LIQSOL";
 })(TokenKind || (TokenKind = {}));
 // ---------------------------------------------------------------------------
 //  Encoding flags  (originally a single uint8 bitfield)
@@ -550,7 +562,7 @@ export const ChainSignature = new ChainSignature$Type();
 class TokenAmount$Type extends MessageType {
     constructor() {
         super("sysio.opp.types.TokenAmount", [
-            { no: 1, name: "kind", kind: "enum", T: () => ["sysio.opp.types.TokenKind", TokenKind, "TOKEN_KIND_"] },
+            { no: 1, name: "kind", kind: "enum", T: () => ["sysio.opp.types.TokenKind", TokenKind] },
             { no: 2, name: "amount", kind: "scalar", T: 3 /*ScalarType.INT64*/, L: 0 /*LongType.BIGINT*/ }
         ]);
     }

package/sysio/opp/types/types.ts

@@ -158,31 +158,43 @@ export enum TokenKind {
      *
      * @generated from protobuf enum value: TOKEN_KIND_WIRE = 0;
      */
-    WIRE = 0,
+    TOKEN_KIND_WIRE = 0,
     /**
      * 0x0100
      *
      * @generated from protobuf enum value: TOKEN_KIND_ETH = 256;
      */
-    ETH = 256,
+    TOKEN_KIND_ETH = 256,
+    /**
+     * 0x0101
+     *
+     * @generated from protobuf enum value: TOKEN_KIND_ERC721 = 257;
+     */
+    TOKEN_KIND_ERC721 = 257,
+    /**
+     * 0x0102
+     *
+     * @generated from protobuf enum value: TOKEN_KIND_ERC1155 = 258;
+     */
+    TOKEN_KIND_ERC1155 = 258,
     /**
      * 0x01F0
      *
-     * @generated from protobuf enum value: TOKEN_KIND_LIQETH = 496;
+     * @generated from protobuf enum value: TOKTOKEN_KIND_LIQETH = 496;
      */
-    LIQETH = 496,
+    TOKTOKEN_KIND_LIQETH = 496,
     /**
      * 0x0200
      *
      * @generated from protobuf enum value: TOKEN_KIND_SOL = 512;
      */
-    SOL = 512,
+    TOKEN_KIND_SOL = 512,
     /**
      * 0x02F0
      *
      * @generated from protobuf enum value: TOKEN_KIND_LIQSOL = 752;
      */
-    LIQSOL = 752
+    TOKEN_KIND_LIQSOL = 752
 }
 // ---------------------------------------------------------------------------
 //  Encoding flags  (originally a single uint8 bitfield)
@@ -631,7 +643,7 @@ export const ChainSignature = new ChainSignature$Type();
 class TokenAmount$Type extends MessageType<TokenAmount> {
     constructor() {
         super("sysio.opp.types.TokenAmount", [
-            { no: 1, name: "kind", kind: "enum", T: () => ["sysio.opp.types.TokenKind", TokenKind, "TOKEN_KIND_"] },
+            { no: 1, name: "kind", kind: "enum", T: () => ["sysio.opp.types.TokenKind", TokenKind] },
             { no: 2, name: "amount", kind: "scalar", T: 3 /*ScalarType.INT64*/, L: 0 /*LongType.BIGINT*/ }
         ]);
     }