@shipload/sdk 2.0.0-rc1 → 2.0.0-rc2

package/lib/shipload.m.js

@@ -1,5 +1,5 @@
 import { __decorate } from 'tslib';
-import { Blob, ABI, Struct, Name, UInt64, Checksum256, UInt32, TimePointSec, UInt16, Int64, UInt8, TimePoint, Bytes, Checksum512, APIClient } from '@wharfkit/antelope';
+import { Blob, ABI, Struct, Name, UInt64, Checksum256, UInt32, TimePointSec, UInt16, UInt8, TimePoint, Int64, Bytes, Checksum512, APIClient } from '@wharfkit/antelope';
 import ContractKit, { Contract as Contract$2 } from '@wharfkit/contract';
 
 const abiBlob$1 = Blob.from('DmVvc2lvOjphYmkvMS4yAA0KY2xlYXJ0YWJsZQADCnRhYmxlX25hbWUEbmFtZQVzY29wZQVuYW1lPwhtYXhfcm93cwd1aW50NjQ/C2NvbXBhbnlfcm93AAIHYWNjb3VudARuYW1lBG5hbWUGc3RyaW5nBmVuYWJsZQABB2VuYWJsZWQEYm9vbAplbmFibGVnYW1lAAIIY29udHJhY3QEbmFtZQdlbmFibGVkBGJvb2wMZm91bmRjb21wYW55AAIHYWNjb3VudARuYW1lBG5hbWUGc3RyaW5nC2dhbWVfY29uZmlnAAQEc2VlZAtjaGVja3N1bTI1NgllcG9jaHRpbWUGdWludDMyBXN0YXJ0DnRpbWVfcG9pbnRfc2VjA2VuZA50aW1lX3BvaW50X3NlYwlnYW1lX21ldGEABARuYW1lBnN0cmluZwtkZXNjcmlwdGlvbgZzdHJpbmcDdXJsBnN0cmluZwd2ZXJzaW9uBnN0cmluZwhnYW1lX3JvdwAECGNvbnRyYWN0BG5hbWUGY29uZmlnC2dhbWVfY29uZmlnBG1ldGEJZ2FtZV9tZXRhBXN0YXRlCmdhbWVfc3RhdGUKZ2FtZV9zdGF0ZQABB2VuYWJsZWQEYm9vbAlzdGFydGdhbWUABAhjb250cmFjdARuYW1lBmNvbmZpZwtnYW1lX2NvbmZpZwRtZXRhCWdhbWVfbWV0YQVzdGF0ZQpnYW1lX3N0YXRlCXN0YXRlX3JvdwABB2VuYWJsZWQEYm9vbAp1cGRhdGVnYW1lAAIIY29udHJhY3QEbmFtZQRtZXRhCWdhbWVfbWV0YQR3aXBlAAAHAICKx+RrVEQKY2xlYXJ0YWJsZb4BLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IGNsZWFydGFibGUKc3VtbWFyeTogJ0RFQlVHOiBjbGVhcnRhYmxlIGFjdGlvbicKaWNvbjogaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91LzE0NzI5Mjg2MT9zPTQwMCZ1PTNiMWFmNjZlOTBkZDg1MWY0ZDdjMDk2ZWQ2YTJmYmI0YjllMTkwZGEKCi0tLQAAAACoeMxUBmVuYWJsZfMBLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IGVuYWJsZQpzdW1tYXJ5OiAnRW5hYmxlL2Rpc2FibGUgcGxhdGZvcm0nCmljb246IGh0dHBzOi8vYXZhdGFycy5naXRodWJ1c2VyY29udGVudC5jb20vdS8xNTgxMTM3ODIjZDNiZjI5MGZkZGVkZGJiN2QzMmFhODk3ZTlmN2U5ZTEzYTJhZTQ0OTU2MTQyZTIzZWI0N2I3NzA5NmEyZWE4ZAoKLS0tCgpFbmFibGUgb3IgZGlzYWJsZSB0aGUgcGxhdGZvcm0gY29udHJhY3QuAICShql4zFQKZW5hYmxlZ2FtZfwBLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IGVuYWJsZWdhbWUKc3VtbWFyeTogJ0VuYWJsZS9kaXNiYWJsZSBhIGdhbWUnCmljb246IGh0dHBzOi8vYXZhdGFycy5naXRodWJ1c2VyY29udGVudC5jb20vdS8xNTgxMTM3ODIjZDNiZjI5MGZkZGVkZGJiN2QzMmFhODk3ZTlmN2U5ZTEzYTJhZTQ0OTU2MTQyZTIzZWI0N2I3NzA5NmEyZWE4ZAoKLS0tCgpFbmFibGUgb3IgZGlzYWJsZSB0aGUgc3BlY2lmaWVkIGdhbWUgY29udHJhY3Qu4KepkqI0NV0MZm91bmRjb21wYW55gwItLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogZm91bmRjb21wYW55CnN1bW1hcnk6ICdGb3VuZCBhIG5ldyBjb21wYW55JwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTU4MTEzNzgyI2QzYmYyOTBmZGRlZGRiYjdkMzJhYTg5N2U5ZjdlOWUxM2EyYWU0NDk1NjE0MmUyM2ViNDdiNzcwOTZhMmVhOGQKCi0tLQoKRm91bmQgYSBuZXcgY29tcGFueSBpbiB0aGUgU2hpcGxvYWQgcGxhdGZvcm0gY29udHJhY3QuAABQ0rB8TcYJc3RhcnRnYW1l/wEtLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogc3RhcnRnYW1lCnN1bW1hcnk6ICdTdGFydCBhIG5ldyBnYW1lJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTU4MTEzNzgyI2QzYmYyOTBmZGRlZGRiYjdkMzJhYTg5N2U5ZjdlOWUxM2EyYWU0NDk1NjE0MmUyM2ViNDdiNzcwOTZhMmVhOGQKCi0tLQoKU3RhcnQgYSBuZXcgZ2FtZSBvZiBTaGlwbG9hZCBkZXBsb3llZCB0byBhIG5ldyBjb250cmFjdC4AgJKGqWxS1Qp1cGRhdGVnYW1ljQItLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogdXBkYXRlZ2FtZQpzdW1tYXJ5OiAnVXBkYXRlIGdhbWUgaW5mb3JtYXRpb24nCmljb246IGh0dHBzOi8vYXZhdGFycy5naXRodWJ1c2VyY29udGVudC5jb20vdS8xNTgxMTM3ODIjZDNiZjI5MGZkZGVkZGJiN2QzMmFhODk3ZTlmN2U5ZTEzYTJhZTQ0OTU2MTQyZTIzZWI0N2I3NzA5NmEyZWE4ZAoKLS0tCgpVcGRhdGUgdGhlIGluZm9ybWF0aW9uIGFib3V0IHRoZSBzcGVjaWZpZWQgZ2FtZSBjb250cmFjdC4KCi0tLQAAAAAAoKrjBHdpcGWyAS0tLQoKc3BlY192ZXJzaW9uOiAiMC4yLjAiCnRpdGxlOiB3aXBlCnN1bW1hcnk6ICdERUJVRzogd2lwZSBhY3Rpb24nCmljb246IGh0dHBzOi8vYXZhdGFycy5naXRodWJ1c2VyY29udGVudC5jb20vdS8xNDcyOTI4NjE/cz00MDAmdT0zYjFhZjY2ZTkwZGQ4NTFmNGQ3YzA5NmVkNmEyZmJiNGI5ZTE5MGRhCgotLS0DAAAAwE9TJUUDaTY0AAALY29tcGFueV9yb3cAAAAAAKykYQNpNjQAAAhnYW1lX3JvdwAAAAAAlU3GA2k2NAAACXN0YXRlX3JvdwETU2hpcGxvYWQgKFBsYXRmb3JtKRNTaGlwbG9hZCAoUGxhdGZvcm0pAAAAAA==');
@@ -205,7 +205,7 @@ var platform = /*#__PURE__*/Object.freeze({
     Contract: Contract$1
 });
 
-const abiBlob = Blob.from('DmVvc2lvOjphYmkvMS4yAEEHYWR2YW5jZQACBnJldmVhbAZzdHJpbmcGY29tbWl0C2NoZWNrc3VtMjU2CGJ1eWdvb2RzAAMHc2hpcF9pZAZ1aW50NjQHZ29vZF9pZAZ1aW50MTYIcXVhbnRpdHkGdWludDMyB2J1eXNoaXAAAgdhY2NvdW50BG5hbWUEbmFtZQZzdHJpbmcMYnV5d2FyZWhvdXNlAAMHYWNjb3VudARuYW1lB3NoaXBfaWQGdWludDY0BG5hbWUGc3RyaW5nBmNhbmNlbAADC2VudGl0eV90eXBlBG5hbWUCaWQGdWludDY0BWNvdW50BnVpbnQ2NApjYW5jZWxfbG9nAAYFb3duZXIEbmFtZQtlbnRpdHlfdHlwZQRuYW1lCWVudGl0eV9pZAZ1aW50NjQKdGFza19pbmRleAV1aW50OAR0YXNrBHRhc2sKc3RhcnRlZF9hdAp0aW1lX3BvaW50DmNhbmNlbF9yZXN1bHRzAAQJZW50aXR5X2lkBnVpbnQ2NAtlbnRpdHlfdHlwZQRuYW1lD2NhbmNlbGxlZF9jb3VudAV1aW50OBBzY2hlZHVsZV9zdGFydGVkC3RpbWVfcG9pbnQ/CmNhcmdvX2l0ZW0AAwdnb29kX2lkBnVpbnQxNghxdWFudGl0eQZ1aW50MzIJdW5pdF9jb3N0BnVpbnQ2NAljYXJnb19yb3cABQJpZAZ1aW50NjQJZW50aXR5X2lkBnVpbnQ2NAdnb29kX2lkBnVpbnQ2NAhxdWFudGl0eQZ1aW50NjQJdW5pdF9jb3N0BnVpbnQ2NApjbGVhcnRhYmxlAAMKdGFibGVfbmFtZQRuYW1lBXNjb3BlBW5hbWU/CG1heF9yb3dzB3VpbnQ2ND8GY29tbWl0AAEGY29tbWl0C2NoZWNrc3VtMjU2C2Nvb3JkaW5hdGVzAAMBeAVpbnQ2NAF5BWludDY0AXoHdWludDE2PwZlbmFibGUAAQdlbmFibGVkBGJvb2wMZW5lcmd5X3N0YXRzAAIIY2FwYWNpdHkGdWludDE2CHJlY2hhcmdlBnVpbnQxNgtlbnRpdHlfaW5mbwAUBHR5cGUEbmFtZQJpZAZ1aW50NjQFb3duZXIEbmFtZQtlbnRpdHlfbmFtZQZzdHJpbmcIbG9jYXRpb24LY29vcmRpbmF0ZXMJY2FyZ29tYXNzBnVpbnQzMgVjYXJnbwxjYXJnb19pdGVtW10HbG9hZGVycw1sb2FkZXJfc3RhdHM/BmVuZXJneQd1aW50MTY/BG1hc3MHdWludDMyPwdlbmdpbmVzD21vdmVtZW50X3N0YXRzPwlnZW5lcmF0b3INZW5lcmd5X3N0YXRzPwhjYXBhY2l0eQd1aW50MzI/B2lzX2lkbGUEYm9vbAxjdXJyZW50X3Rhc2sFdGFzaz8UY3VycmVudF90YXNrX2VsYXBzZWQGdWludDMyFmN1cnJlbnRfdGFza19yZW1haW5pbmcGdWludDMyDXBlbmRpbmdfdGFza3MGdGFza1tdB2lkbGVfYXQLdGltZV9wb2ludD8Ic2NoZWR1bGUJc2NoZWR1bGU/DGVudGl0eV9zdGF0ZQACCGxvY2F0aW9uC2Nvb3JkaW5hdGVzBmVuZXJneQZ1aW50MTYOZW50aXR5X3N1bW1hcnkACAR0eXBlBG5hbWUCaWQGdWludDY0BW93bmVyBG5hbWULZW50aXR5X25hbWUGc3RyaW5nCGxvY2F0aW9uC2Nvb3JkaW5hdGVzB2lzX2lkbGUEYm9vbA5yZXNvbHZlZF9jb3VudAZ1aW50MzINcGVuZGluZ19jb3VudAZ1aW50MzIQZW50aXR5X3Rhc2tfaW5mbwAECWVudGl0eV9pZAZ1aW50NjQLZW50aXR5X3R5cGUEbmFtZQp0YXNrX2NvdW50BXVpbnQ4EHNjaGVkdWxlX3N0YXJ0ZWQKdGltZV9wb2ludAtnZXRlbnRpdGllcwACBW93bmVyBG5hbWULZW50aXR5X3R5cGUFbmFtZT8JZ2V0ZW50aXR5AAILZW50aXR5X3R5cGUEbmFtZQllbnRpdHlfaWQGdWludDY0CGdldGdvb2RzAAALZ2V0bG9jYXRpb24AAgF4BWludDY0AXkFaW50NjQJZ2V0bmVhcmJ5AAMLZW50aXR5X3R5cGUEbmFtZQllbnRpdHlfaWQGdWludDY0CHJlY2hhcmdlBGJvb2wJZ2V0cGxheWVyAAEHYWNjb3VudARuYW1lDGdldHN1bW1hcmllcwACBW93bmVyBG5hbWULZW50aXR5X3R5cGUFbmFtZT8EZ29vZAADAmlkBnVpbnQxNgpiYXNlX3ByaWNlBnVpbnQzMgRtYXNzBnVpbnQzMgpnb29kc19pbmZvAAEFZ29vZHMGZ29vZFtdBGhhc2gAAQV2YWx1ZQZzdHJpbmcHaGFzaDUxMgABBXZhbHVlBnN0cmluZwRpbml0AAEEc2VlZAtjaGVja3N1bTI1NgRqb2luAAEHYWNjb3VudARuYW1lDGxvYWRlcl9zdGF0cwADBG1hc3MGdWludDMyBnRocnVzdAZ1aW50MTYIcXVhbnRpdHkFdWludDgNbG9jYXRpb25fZ29vZAAFAmlkBnVpbnQxNgVwcmljZQZ1aW50MzIGc3VwcGx5BnVpbnQxNhFyYXJpdHlfbXVsdGlwbGllcgZ1aW50MzITbG9jYXRpb25fbXVsdGlwbGllcgZ1aW50MzINbG9jYXRpb25faW5mbwADBmNvb3Jkcwtjb29yZGluYXRlcwlpc19zeXN0ZW0EYm9vbAVnb29kcw9sb2NhdGlvbl9nb29kW10MbG9jYXRpb25fcm93AAUCaWQGdWludDY0C2Nvb3JkaW5hdGVzC2Nvb3JkaW5hdGVzBWVwb2NoBnVpbnQ2NAdnb29kX2lkBnVpbnQxNgZzdXBwbHkGdWludDE2CWxvZ2NhbmNlbAABA2xvZwpjYW5jZWxfbG9nCmxvZ3Jlc29sdmUAAQNsb2cLcmVzb2x2ZV9sb2cObW92ZW1lbnRfc3RhdHMAAgZ0aHJ1c3QGdWludDMyBWRyYWluBnVpbnQxNgtuZWFyYnlfaW5mbwAFCmNhbl90cmF2ZWwEYm9vbAdjdXJyZW50DGVudGl0eV9zdGF0ZQlwcm9qZWN0ZWQMZW50aXR5X3N0YXRlCm1heF9lbmVyZ3kGdWludDE2B3N5c3RlbXMPbmVhcmJ5X3N5c3RlbVtdDW5lYXJieV9zeXN0ZW0ABAhkaXN0YW5jZQZ1aW50NjQLZW5lcmd5X2Nvc3QGdWludDY0C2ZsaWdodF90aW1lBnVpbnQzMghsb2NhdGlvbg1sb2NhdGlvbl9pbmZvB3BheWxvYW4AAgdhY2NvdW50BG5hbWUGYW1vdW50BnVpbnQ2NAtwbGF5ZXJfaW5mbwALBW93bmVyBG5hbWUJaXNfcGxheWVyBGJvb2wMY29tcGFueV9uYW1lBnN0cmluZwdiYWxhbmNlBnVpbnQ2NARkZWJ0BnVpbnQzMghuZXR3b3J0aAVpbnQ2NA5hdmFpbGFibGVfbG9hbgZ1aW50NjQPbmV4dF9zaGlwX3ByaWNlBnVpbnQ2NBRuZXh0X3dhcmVob3VzZV9wcmljZQZ1aW50NjQKc2hpcF9jb3VudAZ1aW50NjQPd2FyZWhvdXNlX2NvdW50BnVpbnQ2NApwbGF5ZXJfcm93AAQFb3duZXIEbmFtZQdiYWxhbmNlBnVpbnQ2NARkZWJ0BnVpbnQzMghuZXR3b3J0aAVpbnQ2NAtwdXJnZXN1cHBseQABCG1heF9yb3dzB3VpbnQ2ND8IcmVjaGFyZ2UAAgtlbnRpdHlfdHlwZQRuYW1lAmlkBnVpbnQ2NAdyZXNvbHZlAAILZW50aXR5X3R5cGUEbmFtZQJpZAZ1aW50NjQLcmVzb2x2ZV9sb2cADQVvd25lcgRuYW1lC2VudGl0eV90eXBlBG5hbWUJZW50aXR5X2lkBnVpbnQ2NAp0YXNrX2luZGV4BXVpbnQ4BHRhc2sEdGFzawpzdGFydGVkX2F0CnRpbWVfcG9pbnQMY29tcGxldGVkX2F0CnRpbWVfcG9pbnQKbmV3X2VuZXJneQd1aW50MTY/DG5ld19sb2NhdGlvbgxjb29yZGluYXRlcz8PY2FyZ29tYXNzX2RlbHRhBWludDY0C2NhcmdvX2FkZGVkDGNhcmdvX2l0ZW1bXQ1jYXJnb19yZW1vdmVkDGNhcmdvX2l0ZW1bXQdjcmVkaXRzBmludDY0Pw9yZXNvbHZlX3Jlc3VsdHMABAllbnRpdHlfaWQGdWludDY0C2VudGl0eV90eXBlBG5hbWUOcmVzb2x2ZWRfY291bnQFdWludDgUbmV3X3NjaGVkdWxlX3N0YXJ0ZWQLdGltZV9wb2ludD8Ec2FsdAABBHNhbHQGdWludDY0CHNjaGVkdWxlAAIHc3RhcnRlZAp0aW1lX3BvaW50BXRhc2tzBnRhc2tbXQlzZWxsZ29vZHMAAwdzaGlwX2lkBnVpbnQ2NAdnb29kX2lkBnVpbnQxNghxdWFudGl0eQZ1aW50MzIMc2VxdWVuY2Vfcm93AAIDa2V5BG5hbWUFdmFsdWUGdWludDY0CHNoaXBfcm93AAsCaWQGdWludDY0BW93bmVyBG5hbWUEbmFtZQZzdHJpbmcIbG9jYXRpb24LY29vcmRpbmF0ZXMEbWFzcwZ1aW50MzIIY2FwYWNpdHkGdWludDMyBmVuZXJneQZ1aW50MTYHZW5naW5lcw5tb3ZlbWVudF9zdGF0cwlnZW5lcmF0b3IMZW5lcmd5X3N0YXRzB2xvYWRlcnMMbG9hZGVyX3N0YXRzCHNjaGVkdWxlCXNjaGVkdWxlPwlzdGF0ZV9yb3cABgdlbmFibGVkBGJvb2wFZXBvY2gGdWludDMyBHNhbHQGdWludDY0BXNoaXBzBnVpbnQzMgRzZWVkC2NoZWNrc3VtMjU2BmNvbW1pdAtjaGVja3N1bTI1Ngh0YWtlbG9hbgACB2FjY291bnQEbmFtZQZhbW91bnQGdWludDY0BHRhc2sABwR0eXBlBXVpbnQ4CGR1cmF0aW9uBnVpbnQzMgpjYW5jZWxhYmxlBXVpbnQ4CGxvY2F0aW9uDGNvb3JkaW5hdGVzPwVjYXJnbwxjYXJnb19pdGVtW10GZW50aXR5B3VpbnQ2ND8HY3JlZGl0cwZpbnQ2ND8MdGFza19yZXN1bHRzAAEIZW50aXRpZXMSZW50aXR5X3Rhc2tfaW5mb1tdCHRyYW5zZmVyAAYLc291cmNlX3R5cGUEbmFtZQlzb3VyY2VfaWQGdWludDY0CWRlc3RfdHlwZQRuYW1lB2Rlc3RfaWQGdWludDY0B2dvb2RfaWQGdWludDE2CHF1YW50aXR5BnVpbnQzMgZ0cmF2ZWwABQtlbnRpdHlfdHlwZQRuYW1lAmlkBnVpbnQ2NAF4BWludDY0AXkFaW50NjQIcmVjaGFyZ2UEYm9vbAl0eXBlc19yb3cAAgJpZAZ1aW50NjQTZW50aXR5X3N1bW1hcnlfdHlwZQ5lbnRpdHlfc3VtbWFyeQx1cGRhdGVjcmVkaXQAAgdhY2NvdW50BG5hbWUGYW1vdW50BWludDY0CnVwZGF0ZWRlYnQAAgdhY2NvdW50BG5hbWUGYW1vdW50BWludDY0DXdhcmVob3VzZV9yb3cABwJpZAZ1aW50NjQFb3duZXIEbmFtZQRuYW1lBnN0cmluZwhsb2NhdGlvbgtjb29yZGluYXRlcwhjYXBhY2l0eQZ1aW50MzIHbG9hZGVycwxsb2FkZXJfc3RhdHMIc2NoZWR1bGUJc2NoZWR1bGU/BHdpcGUAAAx3aXBlc2VxdWVuY2UAACIAAABAoWl2MgdhZHZhbmNl0wEtLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogYWR2YW5jZQpzdW1tYXJ5OiAnQWR2YW5jZSB0dXJuJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpBZHZhbmNlIHRoZSBnYW1lIHRvIHRoZSBuZXh0IHR1cm4uAAAAOFHKvD4IYnV5Z29vZHPdAS0tLQoKc3BlY192ZXJzaW9uOiAiMC4yLjAiCnRpdGxlOiBidXlnb29kcwpzdW1tYXJ5OiAnQnV5IGdvb2RzJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpQdXJjaGFzZSBnb29kcyBhbmQgYWRkIHRoZW0gdG8gYSBzaGlwJ3MgY2FyZ28uAAAAoLqGvT4HYnV5c2hpcMYBLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IGJ1eXNoaXAKc3VtbWFyeTogJ0J1eSBhIG5ldyBzaGlwJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpQdXJjaGFzZSBhIG5ldyBzaGlwoLCmTV3DvT4MYnV5d2FyZWhvdXNlzAItLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogYnV5d2FyZWhvdXNlCnN1bW1hcnk6ICdCdXkgYSBuZXcgd2FyZWhvdXNlJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpQdXJjaGFzZSBhIG5ldyB3YXJlaG91c2UgYXQgdGhlIGxvY2F0aW9uIG9mIGFuIGlkbGUgc2hpcC4gV2FyZWhvdXNlcyBwcm92aWRlIGNhcmdvIHN0b3JhZ2Ugd2l0aCBsb2FkaW5nL3VubG9hZGluZyBjYXBhYmlsaXRpZXMgYnV0IGNhbm5vdCBtb3ZlLgAAAABEhaZBBmNhbmNlbMcCLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IGNhbmNlbApzdW1tYXJ5OiAnQ2FuY2VsIHNjaGVkdWxlZCB0YXNrcycKaWNvbjogaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91LzE0NzI5Mjg2MT9zPTQwMCZ1PTNiMWFmNjZlOTBkZDg1MWY0ZDdjMDk2ZWQ2YTJmYmI0YjllMTkwZGEKCi0tLQoKQ2FuY2VsIHRoZSBzcGVjaWZpZWQgbnVtYmVyIG9mIHRhc2tzIGZyb20gdGhlIGVuZCBvZiBhbiBlbnRpdHkncyBzY2hlZHVsZS4gVGFza3MgdGhhdCBhcmUgaW1tdXRhYmxlIGFuZCBpbiBwcm9ncmVzcyBjYW5ub3QgYmUgY2FuY2VsbGVkLgoKLS0tAICKx+RrVEQKY2xlYXJ0YWJsZb4BLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IGNsZWFydGFibGUKc3VtbWFyeTogJ0RFQlVHOiBjbGVhcnRhYmxlIGFjdGlvbicKaWNvbjogaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91LzE0NzI5Mjg2MT9zPTQwMCZ1PTNiMWFmNjZlOTBkZDg1MWY0ZDdjMDk2ZWQ2YTJmYmI0YjllMTkwZGEKCi0tLQAAAABkJyVFBmNvbW1pdPEBLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IGNvbW1pdApzdW1tYXJ5OiAnU2V0IGNvbW1pdCB2YWx1ZScKaWNvbjogaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91LzE0NzI5Mjg2MT9zPTQwMCZ1PTNiMWFmNjZlOTBkZDg1MWY0ZDdjMDk2ZWQ2YTJmYmI0YjllMTkwZGEKCi0tLQoKU2V0IHRoZSBpbml0aWFsIGNvbW1pdCB2YWx1ZSBkdXJpbmcgZ2FtZSBpbml0aWFsaXphdGlvbi4KCi0tLQAAAACoeMxUBmVuYWJsZeIBLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IGVuYWJsZQpzdW1tYXJ5OiAnU2V0IGVuYWJsZWQgc3RhdGUnCmljb246IGh0dHBzOi8vYXZhdGFycy5naXRodWJ1c2VyY29udGVudC5jb20vdS8xNDcyOTI4NjE/cz00MDAmdT0zYjFhZjY2ZTkwZGQ4NTFmNGQ3YzA5NmVkNmEyZmJiNGI5ZTE5MGRhCgotLS0KCkVuYWJsZSBvciBkaXNhYmxlIHRoaXMgZ2FtZSBvZiBTaGlwbG9hZC4KCi0tLQCwctnlqbJiC2dldGVudGl0aWVzpAItLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogZ2V0ZW50aXRpZXMKc3VtbWFyeTogJ0dldCBhbGwgZW50aXRpZXMgZm9yIGEgcGxheWVyJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpSZXR1cm5zIGZ1bGwgZW50aXR5IGluZm8gZm9yIGFsbCBlbnRpdGllcyBvd25lZCBieSBhIHBsYXllci4gT3B0aW9uYWxseSBmaWx0ZXIgYnkgZW50aXR5IHR5cGUuAADw2eWpsmIJZ2V0ZW50aXR5ogItLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogZ2V0ZW50aXR5CnN1bW1hcnk6ICdHZXQgZW50aXR5IHN0YXRlJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpSZXR1cm5zIHRoZSBjdXJyZW50IHN0YXRlIG9mIGFuIGVudGl0eSBpbmNsdWRpbmcgaWRlbnRpdHksIGNhcmdvLCBzY2hlZHVsZSBzdGF0ZSwgYW5kIHR5cGUtc3BlY2lmaWMgZmllbGRzLgAAADhRyrJiCGdldGdvb2RzqgItLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogZ2V0Z29vZHMKc3VtbWFyeTogJ0dldCBhbGwgYXZhaWxhYmxlIGdvb2RzJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpUaGlzIGFjdGlvbiByZXR1cm5zIGEgbGlzdCBvZiBhbGwgdHJhZGVhYmxlIGdvb2RzIGluIHRoZSBnYW1lIGluY2x1ZGluZyB0aGVpciBpZCwgbmFtZSwgYmFzZSBwcmljZSwgYW5kIG1hc3MuACZ12SAas2ILZ2V0bG9jYXRpb27iAi0tLQoKc3BlY192ZXJzaW9uOiAiMC4yLjAiCnRpdGxlOiBnZXRsb2NhdGlvbgpzdW1tYXJ5OiAnR2V0IGxvY2F0aW9uIGluZm9ybWF0aW9uJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpUaGlzIGFjdGlvbiByZXR1cm5zIGluZm9ybWF0aW9uIGFib3V0IGEgbG9jYXRpb24gaW5jbHVkaW5nIHdoZXRoZXIgYSBzeXN0ZW0gZXhpc3RzLCBhbmQgZm9yIGVhY2ggZ29vZDogcHJpY2UsIHN1cHBseSwgcmFyaXR5IG11bHRpcGxpZXIsIGFuZCBsb2NhdGlvbiBtdWx0aXBsaWVyLgAA8OcaNbNiCWdldG5lYXJied4DLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IGdldG5lYXJieQpzdW1tYXJ5OiAnR2V0IG5lYXJieSByZWFjaGFibGUgc3lzdGVtcycKaWNvbjogaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91LzE0NzI5Mjg2MT9zPTQwMCZ1PTNiMWFmNjZlOTBkZDg1MWY0ZDdjMDk2ZWQ2YTJmYmI0YjllMTkwZGEKCi0tLQoKVGhpcyBhY3Rpb24gcmV0dXJucyBuZWFyYnkgc3lzdGVtcyByZWFjaGFibGUgYnkgYW4gZW50aXR5IGZyb20gaXRzIHByb2plY3RlZCBsb2NhdGlvbi4gUmV0dXJucyBjdXJyZW50IHN0YXRlICh3aXRoIGNvbXBsZXRlZCB0YXNrcyByZXNvbHZlZCksIHByb2plY3RlZCBzdGF0ZSAoYWZ0ZXIgYWxsIHNjaGVkdWxlZCB0YXNrcyksIGFuZCBhIGxpc3Qgb2YgcmVhY2hhYmxlIHN5c3RlbXMgd2l0aCBkaXN0YW5jZSwgZW5lcmd5IGNvc3QsIGZsaWdodCB0aW1lLCBhbmQgbWFya2V0IGluZm9ybWF0aW9uLgAAuMqbWLNiCWdldHBsYXllcv0CLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IGdldHBsYXllcgpzdW1tYXJ5OiAnR2V0IHBsYXllciBpbmZvcm1hdGlvbicKaWNvbjogaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91LzE0NzI5Mjg2MT9zPTQwMCZ1PTNiMWFmNjZlOTBkZDg1MWY0ZDdjMDk2ZWQ2YTJmYmI0YjllMTkwZGEKCi0tLQoKVGhpcyBhY3Rpb24gcmV0dXJucyBpbmZvcm1hdGlvbiBhYm91dCBhIHBsYXllciBpbmNsdWRpbmcgYmFsYW5jZSwgZGVidCwgbmV0d29ydGgsIGVudGl0eSBjb3VudHMsIGFuZCBwcmljaW5nIGZvciBuZXh0IHB1cmNoYXNlcy4gUmV0dXJucyBpc19wbGF5ZXI9ZmFsc2UgaWYgdGhlIGFjY291bnQgaGFzIG5vdCBqb2luZWQgdGhlIGdhbWUugJW7RkqNs2IMZ2V0c3VtbWFyaWVz6AItLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogZ2V0c3VtbWFyaWVzCnN1bW1hcnk6ICdHZXQgZW50aXR5IHN1bW1hcmllcyBmb3IgYSBwbGF5ZXInCmljb246IGh0dHBzOi8vYXZhdGFycy5naXRodWJ1c2VyY29udGVudC5jb20vdS8xNDcyOTI4NjE/cz00MDAmdT0zYjFhZjY2ZTkwZGQ4NTFmNGQ3YzA5NmVkNmEyZmJiNGI5ZTE5MGRhCgotLS0KClJldHVybnMgbGlnaHR3ZWlnaHQgc3VtbWFyaWVzIG9mIGFsbCBlbnRpdGllcyBvd25lZCBieSBhIHBsYXllciBpbmNsdWRpbmcgdHlwZSwgaWQsIG93bmVyLCBuYW1lLCBsb2NhdGlvbiwgYW5kIGlkbGUgc3RhdHVzLiBPcHRpb25hbGx5IGZpbHRlciBieSBlbnRpdHkgdHlwZS4AAAAAANCwaQRoYXNo/QEtLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogaGFzaApzdW1tYXJ5OiAnQ2FsY3VsYXRlIHNoYTI1NiBoYXNoJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpDYWxjdWxhdGVzIHRoZSBzaGEyNTYgaGFzaCBvZiBhIHN0cmluZyBiYXNlZCB1c2luZyB0aGUgZ2FtZSBzZWVkLgoKLS0tAAAAQITSsGkHaGFzaDUxMvsBLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IGhhc2g1MTIKc3VtbWFyeTogJ0NhbGN1bGF0ZSBzaGE1MTIgaGFzaCcKaWNvbjogaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91LzE0NzI5Mjg2MT9zPTQwMCZ1PTNiMWFmNjZlOTBkZDg1MWY0ZDdjMDk2ZWQ2YTJmYmI0YjllMTkwZGEKCi0tLQoKQ2FsY3VsYXRlcyB0aGUgc2hhNTEyIGhhc2ggb2YgYSBzdHJpbmcgYmFzZWQgdXNpbmcgdGhlIGdhbWUgc2VlZC4AAAAAAJDddARpbml0+gEtLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogaW5pdApzdW1tYXJ5OiAnSW5pdGlhbGl6ZSBnYW1lIHNlZWQnCmljb246IGh0dHBzOi8vYXZhdGFycy5naXRodWJ1c2VyY29udGVudC5jb20vdS8xNDcyOTI4NjE/cz00MDAmdT0zYjFhZjY2ZTkwZGQ4NTFmNGQ3YzA5NmVkNmEyZmJiNGI5ZTE5MGRhCgotLS0KCkluaXRpYWxpemUgYSB0aGUgZ2FtZXMgc2VlZCBhbmQgc2VlZCB2YWx1ZXMgdG8gYm9vdHN0cmFwIGdhbWUgc3RhdGUuAAAAAAAwHX0Eam9pbskBLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IGpvaW4Kc3VtbWFyeTogJ0pvaW4gYSBnYW1lJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpKb2luIGEgZ2FtZSBvZiBTaGlwbG9hZAoKLS0tAACICk2DGI0JbG9nY2FuY2VsAACA2pFidRmNCmxvZ3Jlc29sdmUAAAAAYBoavakHcGF5bG9hbq8BLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IHBheWxvYW4Kc3VtbWFyeTogJ0xvYW4gUGF5bWVudCcKaWNvbjogaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91LzE0NzI5Mjg2MT9zPTQwMCZ1PTNiMWFmNjZlOTBkZDg1MWY0ZDdjMDk2ZWQ2YTJmYmI0YjllMTkwZGEKCi0tLQB8rFVjxa6uC3B1cmdlc3VwcGx56QEtLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogcHVyZ2VzdXBwbHkKc3VtbWFyeTogJ1VwZGF0ZSBHYW1lJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpQdXJnZSBvbGQgc3VwcGx5IHJlY29yZHMgYW5kIGhlbHAgY2xlYW51cCBnYW1lIHN0YXRlLgAAAIpd05C6CHJlY2hhcmdl0gItLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogcmVjaGFyZ2UKc3VtbWFyeTogJ1JlY2hhcmdlIHNoaXAgZW5lcmd5JwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpTY2hlZHVsZSBhIHJlY2hhcmdlIHRhc2sgZm9yIGFuIGVudGl0eSB0byByZXN0b3JlIGVuZXJneSB0byBmdWxsIGNhcGFjaXR5LiBUaGUgcmVjaGFyZ2UgZHVyYXRpb24gZGVwZW5kcyBvbiBjdXJyZW50IGVuZXJneSBsZXZlbCBhbmQgcmVjaGFyZ2UgcmF0ZS4KCi0tLQAAAEDtSLG6B3Jlc29sdmXEAi0tLQoKc3BlY192ZXJzaW9uOiAiMC4yLjAiCnRpdGxlOiByZXNvbHZlCnN1bW1hcnk6ICdDb21wbGV0ZSBzY2hlZHVsZWQgdGFza3MnCmljb246IGh0dHBzOi8vYXZhdGFycy5naXRodWJ1c2VyY29udGVudC5jb20vdS8xNDcyOTI4NjE/cz00MDAmdT0zYjFhZjY2ZTkwZGQ4NTFmNGQ3YzA5NmVkNmEyZmJiNGI5ZTE5MGRhCgotLS0KClJlc29sdmUgYWxsIGNvbXBsZXRlZCB0YXNrcyBpbiBhbiBlbnRpdHkncyBzY2hlZHVsZSwgYXBwbHlpbmcgdGhlaXIgZWZmZWN0cyAocmVjaGFyZ2UgZW5lcmd5LCB1cGRhdGUgbG9jYXRpb24sIGxvYWQvdW5sb2FkIGNhcmdvKS4KCi0tLQAAAAAAkKPBBHNhbHTdAS0tLQoKc3BlY192ZXJzaW9uOiAiMC4yLjAiCnRpdGxlOiBzYWx0CnN1bW1hcnk6ICdBcHBlbmQgU2FsdCcKaWNvbjogaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91LzE0NzI5Mjg2MT9zPTQwMCZ1PTNiMWFmNjZlOTBkZDg1MWY0ZDdjMDk2ZWQ2YTJmYmI0YjllMTkwZGEKCi0tLQoKQWRkIGFkZGl0aW9uYWwgc2FsdCB0byB0aGUgbmV4dCBlcG9jaCBzZWVkLgoKLS0tAADAiVIWo8IJc2VsbGdvb2Rz1QEtLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogc2VsbGdvb2RzCnN1bW1hcnk6ICdTZWxsIGdvb2RzJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpTZWxsIGdvb2RzIGZyb20gYSBzaGlwJ3MgY2FyZ28uCgotLS0AAADT0KigyQh0YWtlbG9hbuoBLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IHRha2Vsb2FuCnN1bW1hcnk6ICdDcmVkaXQgTG9hbicKaWNvbjogaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91LzE0NzI5Mjg2MT9zPTQwMCZ1PTNiMWFmNjZlOTBkZDg1MWY0ZDdjMDk2ZWQ2YTJmYmI0YjllMTkwZGEKCi0tLQoKQm9ycm93IGNyZWRpdHMgZnJvbSB0aGUgYmFuayB0aGF0IHdpbGwgbmVlZCB0byBiZSByZXBhaWQuAAAAVy08zc0IdHJhbnNmZXLIAy0tLQoKc3BlY192ZXJzaW9uOiAiMC4yLjAiCnRpdGxlOiB0cmFuc2ZlcgpzdW1tYXJ5OiAnVHJhbnNmZXIgY2FyZ28gYmV0d2VlbiBlbnRpdGllcycKaWNvbjogaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91LzE0NzI5Mjg2MT9zPTQwMCZ1PTNiMWFmNjZlOTBkZDg1MWY0ZDdjMDk2ZWQ2YTJmYmI0YjllMTkwZGEKCi0tLQoKVHJhbnNmZXIgY2FyZ28gYmV0d2VlbiB0d28gZW50aXRpZXMgYXQgdGhlIHNhbWUgbG9jYXRpb24uIEJvdGggZW50aXRpZXMgbXVzdCBiZSBvd25lZCBieSB0aGUgY2FsbGVyIGFuZCBhdCBsZWFzdCBvbmUgbXVzdCBoYXZlIGxvYWRlcnMuIENyZWF0ZXMgbG9hZCBhbmQgdW5sb2FkIHRhc2tzIG9uIGJvdGggZW50aXRpZXMgd2l0aCBkdXJhdGlvbiBiYXNlZCBvbiBjb21iaW5lZCBsb2FkZXIgY2FwYWNpdHkgYW5kIFotZGlzdGFuY2UgYmV0d2VlbiB0aGVtLgAAAABEtc3NBnRyYXZlbMsCLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IHRyYXZlbApzdW1tYXJ5OiAnTW92ZSBhIHNoaXAnCmljb246IGh0dHBzOi8vYXZhdGFycy5naXRodWJ1c2VyY29udGVudC5jb20vdS8xNDcyOTI4NjE/cz00MDAmdT0zYjFhZjY2ZTkwZGQ4NTFmNGQ3YzA5NmVkNmEyZmJiNGI5ZTE5MGRhCgotLS0KCkluaXRpYXRlIHRyYXZlbCBvZiBhbiBlbnRpdHkgZnJvbSBpdHMgY3VycmVudCBsb2NhdGlvbiB0byBhIG5ldyBkZXN0aW5hdGlvbi4KCi0tLQoKVGhpcyBhY3Rpb24gZGV0ZXJtaW5lcyB0aGUgbWFya2V0IHByaWNlIG9mIGFsbCBnb29kcyBhdCBhIGdpdmVuIGxvY2F0aW9uLpBdUhepbFLVDHVwZGF0ZWNyZWRpdMIBLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IHVwZGF0ZWNyZWRpdApzdW1tYXJ5OiAnREVCVUc6IHVwZGF0ZWNyZWRpdCBhY3Rpb24nCmljb246IGh0dHBzOi8vYXZhdGFycy5naXRodWJ1c2VyY29udGVudC5jb20vdS8xNDcyOTI4NjE/cz00MDAmdT0zYjFhZjY2ZTkwZGQ4NTFmNGQ3YzA5NmVkNmEyZmJiNGI5ZTE5MGRhCgotLS0AQD4qqWxS1Qp1cGRhdGVkZWJ0vgEtLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogdXBkYXRlZGVidApzdW1tYXJ5OiAnREVCVUc6IHVwZGF0ZWRlYnQgYWN0aW9uJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tAAAAAACgquMEd2lwZbIBLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IHdpcGUKc3VtbWFyeTogJ0RFQlVHOiB3aXBlIGFjdGlvbicKaWNvbjogaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91LzE0NzI5Mjg2MT9zPTQwMCZ1PTNiMWFmNjZlOTBkZDg1MWY0ZDdjMDk2ZWQ2YTJmYmI0YjllMTkwZGEKCi0tLaDQVNoqrKrjDHdpcGVzZXF1ZW5jZcIBLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IHdpcGVzZXF1ZW5jZQpzdW1tYXJ5OiAnREVCVUc6IHdpcGVzZXF1ZW5jZSBhY3Rpb24nCmljb246IGh0dHBzOi8vYXZhdGFycy5naXRodWJ1c2VyY29udGVudC5jb20vdS8xNDcyOTI4NjE/cz00MDAmdT0zYjFhZjY2ZTkwZGQ4NTFmNGQ3YzA5NmVkNmEyZmJiNGI5ZTE5MGRhCgotLS0IAAAAAADKrkEDaTY0AAAJY2FyZ29fcm93AAAAk7psEI0DaTY0AAAMbG9jYXRpb25fcm93AAAAAFzlTawDaTY0AAAKcGxheWVyX3JvdwAAAApNpa3CA2k2NAAADHNlcXVlbmNlX3JvdwAAAAAAUF3DA2k2NAAACHNoaXBfcm93AAAAAACVTcYDaTY0AAAJc3RhdGVfcm93AAAAAACsqs8DaTY0AAAJdHlwZXNfcm93AABQWNOmruEDaTY0AAANd2FyZWhvdXNlX3JvdwERU2hpcGxvYWQgKFNlcnZlcikRU2hpcGxvYWQgKFNlcnZlcikAAAAQAAAAOFHKvD4MdGFza19yZXN1bHRzAAAAAESFpkEOY2FuY2VsX3Jlc3VsdHMAsHLZ5amyYg1lbnRpdHlfaW5mb1tdAADw2eWpsmILZW50aXR5X2luZm8AAAA4UcqyYgpnb29kc19pbmZvACZ12SAas2INbG9jYXRpb25faW5mbwAA8OcaNbNiC25lYXJieV9pbmZvAAC4yptYs2ILcGxheWVyX2luZm+AlbtGSo2zYhBlbnRpdHlfc3VtbWFyeVtdAAAAAADQsGkLY2hlY2tzdW0yNTYAAABAhNKwaQtjaGVja3N1bTUxMgAAAIpd05C6DHRhc2tfcmVzdWx0cwAAAEDtSLG6D3Jlc29sdmVfcmVzdWx0cwAAwIlSFqPCDHRhc2tfcmVzdWx0cwAAAFctPM3NDHRhc2tfcmVzdWx0cwAAAABEtc3NDHRhc2tfcmVzdWx0cw==');
+const abiBlob = Blob.from('DmVvc2lvOjphYmkvMS4yAhVCX3ZlY3Rvcl9lbnRpdHlfcmVmX0UMZW50aXR5X3JlZltdDWxvY2F0aW9uX3R5cGUFdWludDhQB2FkdmFuY2UAAgZyZXZlYWwGc3RyaW5nBmNvbW1pdAtjaGVja3N1bTI1NgxidXljb250YWluZXIAAwdhY2NvdW50BG5hbWUHc2hpcF9pZAZ1aW50NjQEbmFtZQZzdHJpbmcIYnV5Z29vZHMABAtlbnRpdHlfdHlwZQRuYW1lAmlkBnVpbnQ2NAdnb29kX2lkBnVpbnQxNghxdWFudGl0eQZ1aW50MzIHYnV5c2hpcAACB2FjY291bnQEbmFtZQRuYW1lBnN0cmluZwxidXl3YXJlaG91c2UAAwdhY2NvdW50BG5hbWUHc2hpcF9pZAZ1aW50NjQEbmFtZQZzdHJpbmcGY2FuY2VsAAMLZW50aXR5X3R5cGUEbmFtZQJpZAZ1aW50NjQFY291bnQGdWludDY0DmNhbmNlbF9yZXN1bHRzAAYJZW50aXR5X2lkBnVpbnQ2NAtlbnRpdHlfdHlwZQRuYW1lD2NhbmNlbGxlZF9jb3VudAV1aW50OBBzY2hlZHVsZV9zdGFydGVkC3RpbWVfcG9pbnQ/C2VudGl0eWdyb3VwB3VpbnQ2ND8NZ3JvdXBfbWVtYmVycxZCX3ZlY3Rvcl9lbnRpdHlfcmVmX0U/CmNhcmdvX2l0ZW0ABAdnb29kX2lkBnVpbnQxNghxdWFudGl0eQZ1aW50MzIJdW5pdF9jb3N0BnVpbnQ2NAdtaXh0dXJlDW1peHR1cmVfaW5mbz8JY2FyZ29fcm93AAUCaWQGdWludDY0CWVudGl0eV9pZAZ1aW50NjQHZ29vZF9pZAZ1aW50NjQIcXVhbnRpdHkGdWludDY0CXVuaXRfY29zdAZ1aW50NjQKY2xlYXJ0YWJsZQADCnRhYmxlX25hbWUEbmFtZQVzY29wZQVuYW1lPwhtYXhfcm93cwd1aW50NjQ/BmNvbW1pdAABBmNvbW1pdAtjaGVja3N1bTI1Ng1jb250YWluZXJfcm93AAgCaWQGdWludDY0BW93bmVyBG5hbWUEbmFtZQZzdHJpbmcLY29vcmRpbmF0ZXMLY29vcmRpbmF0ZXMIaHVsbG1hc3MGdWludDMyCGNhcGFjaXR5BnVpbnQzMgljYXJnb21hc3MGdWludDMyCHNjaGVkdWxlCXNjaGVkdWxlPwtjb29yZGluYXRlcwADAXgFaW50NjQBeQVpbnQ2NAF6B3VpbnQxNj8GZW5hYmxlAAEHZW5hYmxlZARib29sDGVuZXJneV9zdGF0cwACCGNhcGFjaXR5BnVpbnQxNghyZWNoYXJnZQZ1aW50MTYUZW50aXR5X2N1cnJlbnRfc3RhdGUAAgtjb29yZGluYXRlcwtjb29yZGluYXRlcwZlbmVyZ3kGdWludDE2C2VudGl0eV9pbmZvABUEdHlwZQRuYW1lAmlkBnVpbnQ2NAVvd25lcgRuYW1lC2VudGl0eV9uYW1lBnN0cmluZwtjb29yZGluYXRlcwtjb29yZGluYXRlcwljYXJnb21hc3MGdWludDMyBWNhcmdvDGNhcmdvX2l0ZW1bXQdsb2FkZXJzDWxvYWRlcl9zdGF0cz8GZW5lcmd5B3VpbnQxNj8IaHVsbG1hc3MHdWludDMyPwdlbmdpbmVzD21vdmVtZW50X3N0YXRzPwlnZW5lcmF0b3INZW5lcmd5X3N0YXRzPwhjYXBhY2l0eQd1aW50MzI/CWV4dHJhY3RvchBleHRyYWN0b3Jfc3RhdHM/B2lzX2lkbGUEYm9vbAxjdXJyZW50X3Rhc2sFdGFzaz8UY3VycmVudF90YXNrX2VsYXBzZWQGdWludDMyFmN1cnJlbnRfdGFza19yZW1haW5pbmcGdWludDMyDXBlbmRpbmdfdGFza3MGdGFza1tdB2lkbGVfYXQLdGltZV9wb2ludD8Ic2NoZWR1bGUJc2NoZWR1bGU/CmVudGl0eV9yZWYAAgtlbnRpdHlfdHlwZQRuYW1lCWVudGl0eV9pZAZ1aW50NjQOZW50aXR5X3N1bW1hcnkACAR0eXBlBG5hbWUCaWQGdWludDY0BW93bmVyBG5hbWULZW50aXR5X25hbWUGc3RyaW5nC2Nvb3JkaW5hdGVzC2Nvb3JkaW5hdGVzB2lzX2lkbGUEYm9vbA5yZXNvbHZlZF9jb3VudAZ1aW50MzINcGVuZGluZ19jb3VudAZ1aW50MzIQZW50aXR5X3Rhc2tfaW5mbwAECWVudGl0eV9pZAZ1aW50NjQLZW50aXR5X3R5cGUEbmFtZQp0YXNrX2NvdW50BXVpbnQ4EHNjaGVkdWxlX3N0YXJ0ZWQKdGltZV9wb2ludA9lbnRpdHlncm91cF9yb3cAAgJpZAZ1aW50NjQMcGFydGljaXBhbnRzDGVudGl0eV9yZWZbXQdleHRyYWN0AAEHc2hpcF9pZAZ1aW50NjQPZXh0cmFjdG9yX3N0YXRzAAMEcmF0ZQZ1aW50MTYFZHJhaW4GdWludDE2CmVmZmljaWVuY3kGdWludDE2C2dldGVudGl0aWVzAAIFb3duZXIEbmFtZQtlbnRpdHlfdHlwZQVuYW1lPwlnZXRlbnRpdHkAAgtlbnRpdHlfdHlwZQRuYW1lCWVudGl0eV9pZAZ1aW50NjQIZ2V0Z29vZHMAAAtnZXRsb2NhdGlvbgACAXgFaW50NjQBeQVpbnQ2NApnZXRsb2NkYXRhAAIBeAVpbnQ2NAF5BWludDY0CWdldG5lYXJieQADC2VudGl0eV90eXBlBG5hbWUJZW50aXR5X2lkBnVpbnQ2NAhyZWNoYXJnZQRib29sCWdldHBsYXllcgABB2FjY291bnQEbmFtZQpnZXRzdGFydGVyAAAMZ2V0c3VtbWFyaWVzAAIFb3duZXIEbmFtZQtlbnRpdHlfdHlwZQVuYW1lPwRnb29kAAMCaWQGdWludDE2CmJhc2VfcHJpY2UGdWludDMyBG1hc3MGdWludDMyCmdvb2RzX2luZm8AAQVnb29kcwZnb29kW10LZ3JvdXB0cmF2ZWwABAhlbnRpdGllcwxlbnRpdHlfcmVmW10BeAVpbnQ2NAF5BWludDY0CHJlY2hhcmdlBGJvb2wEaGFzaAABBXZhbHVlBnN0cmluZwdoYXNoNTEyAAEFdmFsdWUGc3RyaW5nBGluaXQAAQRzZWVkC2NoZWNrc3VtMjU2BGpvaW4AAQdhY2NvdW50BG5hbWUMbG9hZGVyX3N0YXRzAAMEbWFzcwZ1aW50MzIGdGhydXN0BnVpbnQxNghxdWFudGl0eQV1aW50OBBsb2NhdGlvbl9kZXJpdmVkAAIMc3RhdGljX3Byb3BzD2xvY2F0aW9uX3N0YXRpYwtlcG9jaF9wcm9wcw5sb2NhdGlvbl9lcG9jaA5sb2NhdGlvbl9lcG9jaAADBmFjdGl2ZQRib29sBXNlZWQwBXVpbnQ4BXNlZWQxBXVpbnQ4DWxvY2F0aW9uX2dvb2QABQJpZAZ1aW50MTYFcHJpY2UGdWludDMyBnN1cHBseQZ1aW50MTYRcmFyaXR5X211bHRpcGxpZXIGdWludDMyE2xvY2F0aW9uX211bHRpcGxpZXIGdWludDMyDWxvY2F0aW9uX2luZm8AAwZjb29yZHMLY29vcmRpbmF0ZXMJaXNfc3lzdGVtBGJvb2wFZ29vZHMPbG9jYXRpb25fZ29vZFtdDGxvY2F0aW9uX3JvdwAGAmlkBnVpbnQ2NAVvd25lcgRuYW1lC2Nvb3JkaW5hdGVzC2Nvb3JkaW5hdGVzCWNhcmdvbWFzcwZ1aW50MzIFY2FyZ28MY2FyZ29faXRlbVtdCHNjaGVkdWxlCXNjaGVkdWxlPw9sb2NhdGlvbl9zdGF0aWMABQZjb29yZHMLY29vcmRpbmF0ZXMEdHlwZQ1sb2NhdGlvbl90eXBlB3N1YnR5cGUFdWludDgFc2VlZDAFdWludDgFc2VlZDEFdWludDgRbWl4dHVyZV9jb21wb25lbnQAAgdnb29kX2lkBnVpbnQxNgZwdXJpdHkGdWludDE2DG1peHR1cmVfaW5mbwABCmNvbXBvbmVudHMTbWl4dHVyZV9jb21wb25lbnRbXQ5tb3ZlbWVudF9zdGF0cwACBnRocnVzdAZ1aW50MzIFZHJhaW4GdWludDE2C25lYXJieV9pbmZvAAUKY2FuX3RyYXZlbARib29sB2N1cnJlbnQUZW50aXR5X2N1cnJlbnRfc3RhdGUJcHJvamVjdGVkFGVudGl0eV9jdXJyZW50X3N0YXRlCm1heF9lbmVyZ3kGdWludDE2B3N5c3RlbXMPbmVhcmJ5X3N5c3RlbVtdDW5lYXJieV9zeXN0ZW0ABAhkaXN0YW5jZQZ1aW50NjQLZW5lcmd5X2Nvc3QGdWludDY0C2ZsaWdodF90aW1lBnVpbnQzMghsb2NhdGlvbg1sb2NhdGlvbl9pbmZvBm5vdGlmeQABBWV2ZW50CnRhc2tfZXZlbnQHcGF5bG9hbgACB2FjY291bnQEbmFtZQZhbW91bnQGdWludDY0C3BsYXllcl9pbmZvAA0Fb3duZXIEbmFtZQlpc19wbGF5ZXIEYm9vbAxjb21wYW55X25hbWUGc3RyaW5nB2JhbGFuY2UGdWludDY0BGRlYnQGdWludDMyCG5ldHdvcnRoBWludDY0DmF2YWlsYWJsZV9sb2FuBnVpbnQ2NA9uZXh0X3NoaXBfcHJpY2UGdWludDY0FG5leHRfd2FyZWhvdXNlX3ByaWNlBnVpbnQ2NBRuZXh0X2NvbnRhaW5lcl9wcmljZQZ1aW50NjQKc2hpcF9jb3VudAZ1aW50NjQPd2FyZWhvdXNlX2NvdW50BnVpbnQ2NA9jb250YWluZXJfY291bnQGdWludDY0CnBsYXllcl9yb3cABAVvd25lcgRuYW1lB2JhbGFuY2UGdWludDY0BGRlYnQGdWludDMyCG5ldHdvcnRoBWludDY0C3B1cmdlc3VwcGx5AAEIbWF4X3Jvd3MHdWludDY0PwhyZWNoYXJnZQACC2VudGl0eV90eXBlBG5hbWUCaWQGdWludDY0B3Jlc29sdmUAAwtlbnRpdHlfdHlwZQRuYW1lAmlkBnVpbnQ2NAVjb3VudAd1aW50NjQ/D3Jlc29sdmVfcmVzdWx0cwAGCWVudGl0eV9pZAZ1aW50NjQLZW50aXR5X3R5cGUEbmFtZQ5yZXNvbHZlZF9jb3VudAV1aW50OBRuZXdfc2NoZWR1bGVfc3RhcnRlZAt0aW1lX3BvaW50PwtlbnRpdHlncm91cAd1aW50NjQ/DWdyb3VwX21lbWJlcnMWQl92ZWN0b3JfZW50aXR5X3JlZl9FPwRzYWx0AAEEc2FsdAZ1aW50NjQIc2NoZWR1bGUAAgdzdGFydGVkCnRpbWVfcG9pbnQFdGFza3MGdGFza1tdCXNlbGxnb29kcwAEC2VudGl0eV90eXBlBG5hbWUCaWQGdWludDY0B2dvb2RfaWQGdWludDE2CHF1YW50aXR5BnVpbnQzMgxzZXF1ZW5jZV9yb3cAAgNrZXkEbmFtZQV2YWx1ZQZ1aW50NjQIc2hpcF9yb3cADgJpZAZ1aW50NjQFb3duZXIEbmFtZQRuYW1lBnN0cmluZwtjb29yZGluYXRlcwtjb29yZGluYXRlcwhodWxsbWFzcwZ1aW50MzIIY2FwYWNpdHkGdWludDMyBmVuZXJneQZ1aW50MTYJY2FyZ29tYXNzBnVpbnQzMgdlbmdpbmVzDm1vdmVtZW50X3N0YXRzCWdlbmVyYXRvcgxlbmVyZ3lfc3RhdHMHbG9hZGVycwxsb2FkZXJfc3RhdHMFdHJhZGUMdHJhZGVfc3RhdHM/CWV4dHJhY3RvchBleHRyYWN0b3Jfc3RhdHM/CHNjaGVkdWxlCXNjaGVkdWxlPwxzdGFydGVyX2luZm8AAwdiYWxhbmNlBnVpbnQ2NARkZWJ0BnVpbnQ2NARzaGlwC2VudGl0eV9pbmZvCXN0YXRlX3JvdwAGB2VuYWJsZWQEYm9vbAVlcG9jaAZ1aW50MzIEc2FsdAZ1aW50NjQFc2hpcHMGdWludDMyBHNlZWQLY2hlY2tzdW0yNTYGY29tbWl0C2NoZWNrc3VtMjU2CnN1cHBseV9yb3cABQJpZAZ1aW50NjQLY29vcmRpbmF0ZXMLY29vcmRpbmF0ZXMFZXBvY2gGdWludDY0B2dvb2RfaWQGdWludDE2BnN1cHBseQZ1aW50MTYIdGFrZWxvYW4AAgdhY2NvdW50BG5hbWUGYW1vdW50BnVpbnQ2NAR0YXNrAAkEdHlwZQV1aW50OAhkdXJhdGlvbgZ1aW50MzIKY2FuY2VsYWJsZQV1aW50OAtjb29yZGluYXRlcwxjb29yZGluYXRlcz8FY2FyZ28MY2FyZ29faXRlbVtdDGVudGl0eXRhcmdldAtlbnRpdHlfcmVmPwtlbnRpdHlncm91cAd1aW50NjQ/B2NyZWRpdHMGaW50NjQ/C2VuZXJneV9jb3N0B3VpbnQxNj8KdGFza19ldmVudAAOCmV2ZW50X3R5cGUFdWludDgFb3duZXIEbmFtZQtlbnRpdHlfdHlwZQRuYW1lCWVudGl0eV9pZAZ1aW50NjQKdGFza19pbmRleAV1aW50OAR0YXNrBHRhc2sJc3RhcnRzX2F0CnRpbWVfcG9pbnQMY29tcGxldGVzX2F0CnRpbWVfcG9pbnQKbmV3X2VuZXJneQd1aW50MTY/D25ld19jb29yZGluYXRlcwxjb29yZGluYXRlcz8PY2FyZ29tYXNzX2RlbHRhBWludDY0C2NhcmdvX2FkZGVkDGNhcmdvX2l0ZW1bXQ1jYXJnb19yZW1vdmVkDGNhcmdvX2l0ZW1bXQdjcmVkaXRzBmludDY0Pwx0YXNrX3Jlc3VsdHMAAQhlbnRpdGllcxJlbnRpdHlfdGFza19pbmZvW10LdHJhZGVfc3RhdHMAAQZtYXJnaW4GdWludDE2CHRyYW5zZmVyAAYLc291cmNlX3R5cGUEbmFtZQlzb3VyY2VfaWQGdWludDY0CWRlc3RfdHlwZQRuYW1lB2Rlc3RfaWQGdWludDY0B2dvb2RfaWQGdWludDE2CHF1YW50aXR5BnVpbnQzMgZ0cmF2ZWwABQtlbnRpdHlfdHlwZQRuYW1lAmlkBnVpbnQ2NAF4BWludDY0AXkFaW50NjQIcmVjaGFyZ2UEYm9vbAl0eXBlc19yb3cAAwJpZAZ1aW50NjQTZW50aXR5X3N1bW1hcnlfdHlwZQ5lbnRpdHlfc3VtbWFyeRFzdGFydGVyX2luZm9fdHlwZQxzdGFydGVyX2luZm8MdXBkYXRlY3JlZGl0AAIHYWNjb3VudARuYW1lBmFtb3VudAVpbnQ2NAp1cGRhdGVkZWJ0AAIHYWNjb3VudARuYW1lBmFtb3VudAVpbnQ2NA13YXJlaG91c2Vfcm93AAgCaWQGdWludDY0BW93bmVyBG5hbWUEbmFtZQZzdHJpbmcLY29vcmRpbmF0ZXMLY29vcmRpbmF0ZXMIY2FwYWNpdHkGdWludDMyCWNhcmdvbWFzcwZ1aW50MzIHbG9hZGVycwxsb2FkZXJfc3RhdHMIc2NoZWR1bGUJc2NoZWR1bGU/BHdpcGUAAAx3aXBlc2VxdWVuY2UAACYAAABAoWl2MgdhZHZhbmNl0wEtLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogYWR2YW5jZQpzdW1tYXJ5OiAnQWR2YW5jZSB0dXJuJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpBZHZhbmNlIHRoZSBnYW1lIHRvIHRoZSBuZXh0IHR1cm4ucNV0Jk+KvD4MYnV5Y29udGFpbmVyygItLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogYnV5Y29udGFpbmVyCnN1bW1hcnk6ICdCdXkgYSBuZXcgY29udGFpbmVyJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpQdXJjaGFzZSBhIG5ldyBjb250YWluZXIgYXQgdGhlIGxvY2F0aW9uIG9mIGFuIGlkbGUgc2hpcC4gQ29udGFpbmVycyBwcm92aWRlIGNhcmdvIHN0b3JhZ2UgYnV0IGhhdmUgbm8gbG9hZGVycyBhbmQgY2Fubm90IG1vdmUgaW5kZXBlbmRlbnRseS4AAAA4Ucq8PghidXlnb29kc90BLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IGJ1eWdvb2RzCnN1bW1hcnk6ICdCdXkgZ29vZHMnCmljb246IGh0dHBzOi8vYXZhdGFycy5naXRodWJ1c2VyY29udGVudC5jb20vdS8xNDcyOTI4NjE/cz00MDAmdT0zYjFhZjY2ZTkwZGQ4NTFmNGQ3YzA5NmVkNmEyZmJiNGI5ZTE5MGRhCgotLS0KClB1cmNoYXNlIGdvb2RzIGFuZCBhZGQgdGhlbSB0byBhIHNoaXAncyBjYXJnby4AAACguoa9PgdidXlzaGlwxgEtLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogYnV5c2hpcApzdW1tYXJ5OiAnQnV5IGEgbmV3IHNoaXAnCmljb246IGh0dHBzOi8vYXZhdGFycy5naXRodWJ1c2VyY29udGVudC5jb20vdS8xNDcyOTI4NjE/cz00MDAmdT0zYjFhZjY2ZTkwZGQ4NTFmNGQ3YzA5NmVkNmEyZmJiNGI5ZTE5MGRhCgotLS0KClB1cmNoYXNlIGEgbmV3IHNoaXCgsKZNXcO9PgxidXl3YXJlaG91c2XMAi0tLQoKc3BlY192ZXJzaW9uOiAiMC4yLjAiCnRpdGxlOiBidXl3YXJlaG91c2UKc3VtbWFyeTogJ0J1eSBhIG5ldyB3YXJlaG91c2UnCmljb246IGh0dHBzOi8vYXZhdGFycy5naXRodWJ1c2VyY29udGVudC5jb20vdS8xNDcyOTI4NjE/cz00MDAmdT0zYjFhZjY2ZTkwZGQ4NTFmNGQ3YzA5NmVkNmEyZmJiNGI5ZTE5MGRhCgotLS0KClB1cmNoYXNlIGEgbmV3IHdhcmVob3VzZSBhdCB0aGUgbG9jYXRpb24gb2YgYW4gaWRsZSBzaGlwLiBXYXJlaG91c2VzIHByb3ZpZGUgY2FyZ28gc3RvcmFnZSB3aXRoIGxvYWRpbmcvdW5sb2FkaW5nIGNhcGFiaWxpdGllcyBidXQgY2Fubm90IG1vdmUuAAAAAESFpkEGY2FuY2VsxwItLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogY2FuY2VsCnN1bW1hcnk6ICdDYW5jZWwgc2NoZWR1bGVkIHRhc2tzJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpDYW5jZWwgdGhlIHNwZWNpZmllZCBudW1iZXIgb2YgdGFza3MgZnJvbSB0aGUgZW5kIG9mIGFuIGVudGl0eSdzIHNjaGVkdWxlLiBUYXNrcyB0aGF0IGFyZSBpbW11dGFibGUgYW5kIGluIHByb2dyZXNzIGNhbm5vdCBiZSBjYW5jZWxsZWQuCgotLS0AgIrH5GtURApjbGVhcnRhYmxlvgEtLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogY2xlYXJ0YWJsZQpzdW1tYXJ5OiAnREVCVUc6IGNsZWFydGFibGUgYWN0aW9uJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tAAAAAGQnJUUGY29tbWl08QEtLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogY29tbWl0CnN1bW1hcnk6ICdTZXQgY29tbWl0IHZhbHVlJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpTZXQgdGhlIGluaXRpYWwgY29tbWl0IHZhbHVlIGR1cmluZyBnYW1lIGluaXRpYWxpemF0aW9uLgoKLS0tAAAAAKh4zFQGZW5hYmxl4gEtLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogZW5hYmxlCnN1bW1hcnk6ICdTZXQgZW5hYmxlZCBzdGF0ZScKaWNvbjogaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91LzE0NzI5Mjg2MT9zPTQwMCZ1PTNiMWFmNjZlOTBkZDg1MWY0ZDdjMDk2ZWQ2YTJmYmI0YjllMTkwZGEKCi0tLQoKRW5hYmxlIG9yIGRpc2FibGUgdGhpcyBnYW1lIG9mIFNoaXBsb2FkLgoKLS0tAAAAICNzc1cHZXh0cmFjdKADLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IGV4dHJhY3QKc3VtbWFyeTogJ0V4dHJhY3QgcmVzb3VyY2VzJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpFeHRyYWN0IHJlc291cmNlcyBhdCB0aGUgc2hpcCdzIGN1cnJlbnQgbG9jYXRpb24uIE9ubHkgd29ya3MgYXQgZXh0cmFjdGFibGUgbG9jYXRpb24gdHlwZXMuIFNjaGVkdWxlcyBhbiBleHRyYWN0aW9uIHRhc2sgdGhhdCBjb25zdW1lcyBlbmVyZ3kgYW5kIHlpZWxkcyBjYXJnbyBiYXNlZCBvbiB0aGUgc2hpcCdzIGV4dHJhY3RvciBzdGF0cyBhbmQgdGhlIGxvY2F0aW9uJ3MgbWl4dHVyZSBjb21wb3NpdGlvbi4AsHLZ5amyYgtnZXRlbnRpdGllc6QCLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IGdldGVudGl0aWVzCnN1bW1hcnk6ICdHZXQgYWxsIGVudGl0aWVzIGZvciBhIHBsYXllcicKaWNvbjogaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91LzE0NzI5Mjg2MT9zPTQwMCZ1PTNiMWFmNjZlOTBkZDg1MWY0ZDdjMDk2ZWQ2YTJmYmI0YjllMTkwZGEKCi0tLQoKUmV0dXJucyBmdWxsIGVudGl0eSBpbmZvIGZvciBhbGwgZW50aXRpZXMgb3duZWQgYnkgYSBwbGF5ZXIuIE9wdGlvbmFsbHkgZmlsdGVyIGJ5IGVudGl0eSB0eXBlLgAA8NnlqbJiCWdldGVudGl0eaICLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IGdldGVudGl0eQpzdW1tYXJ5OiAnR2V0IGVudGl0eSBzdGF0ZScKaWNvbjogaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91LzE0NzI5Mjg2MT9zPTQwMCZ1PTNiMWFmNjZlOTBkZDg1MWY0ZDdjMDk2ZWQ2YTJmYmI0YjllMTkwZGEKCi0tLQoKUmV0dXJucyB0aGUgY3VycmVudCBzdGF0ZSBvZiBhbiBlbnRpdHkgaW5jbHVkaW5nIGlkZW50aXR5LCBjYXJnbywgc2NoZWR1bGUgc3RhdGUsIGFuZCB0eXBlLXNwZWNpZmljIGZpZWxkcy4AAAA4UcqyYghnZXRnb29kc6oCLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IGdldGdvb2RzCnN1bW1hcnk6ICdHZXQgYWxsIGF2YWlsYWJsZSBnb29kcycKaWNvbjogaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91LzE0NzI5Mjg2MT9zPTQwMCZ1PTNiMWFmNjZlOTBkZDg1MWY0ZDdjMDk2ZWQ2YTJmYmI0YjllMTkwZGEKCi0tLQoKVGhpcyBhY3Rpb24gcmV0dXJucyBhIGxpc3Qgb2YgYWxsIHRyYWRlYWJsZSBnb29kcyBpbiB0aGUgZ2FtZSBpbmNsdWRpbmcgdGhlaXIgaWQsIG5hbWUsIGJhc2UgcHJpY2UsIGFuZCBtYXNzLgAmddkgGrNiC2dldGxvY2F0aW9u4gItLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogZ2V0bG9jYXRpb24Kc3VtbWFyeTogJ0dldCBsb2NhdGlvbiBpbmZvcm1hdGlvbicKaWNvbjogaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91LzE0NzI5Mjg2MT9zPTQwMCZ1PTNiMWFmNjZlOTBkZDg1MWY0ZDdjMDk2ZWQ2YTJmYmI0YjllMTkwZGEKCi0tLQoKVGhpcyBhY3Rpb24gcmV0dXJucyBpbmZvcm1hdGlvbiBhYm91dCBhIGxvY2F0aW9uIGluY2x1ZGluZyB3aGV0aGVyIGEgc3lzdGVtIGV4aXN0cywgYW5kIGZvciBlYWNoIGdvb2Q6IHByaWNlLCBzdXBwbHksIHJhcml0eSBtdWx0aXBsaWVyLCBhbmQgbG9jYXRpb24gbXVsdGlwbGllci4AgMkmIRqzYgpnZXRsb2NkYXRh/gItLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogZ2V0bG9jZGF0YQpzdW1tYXJ5OiAnR2V0IGRlcml2ZWQgbG9jYXRpb24gZGF0YScKaWNvbjogaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91LzE0NzI5Mjg2MT9zPTQwMCZ1PTNiMWFmNjZlOTBkZDg1MWY0ZDdjMDk2ZWQ2YTJmYmI0YjllMTkwZGEKCi0tLQoKVGhpcyBhY3Rpb24gcmV0dXJucyBkZXJpdmVkIGxvY2F0aW9uIGRhdGEgaW5jbHVkaW5nIHN0YXRpYyBwcm9wZXJ0aWVzICh0eXBlLCBkaWZmaWN1bHR5LCBzZWVkcykgZnJvbSB0aGUgZ2FtZSBzZWVkIGFuZCBlcG9jaC1zcGVjaWZpYyBwcm9wZXJ0aWVzIChhY3RpdmUsIHNlZWRzKSBmcm9tIHRoZSBjdXJyZW50IGVwb2NoIHNlZWQuAADw5xo1s2IJZ2V0bmVhcmJ53gMtLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogZ2V0bmVhcmJ5CnN1bW1hcnk6ICdHZXQgbmVhcmJ5IHJlYWNoYWJsZSBzeXN0ZW1zJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpUaGlzIGFjdGlvbiByZXR1cm5zIG5lYXJieSBzeXN0ZW1zIHJlYWNoYWJsZSBieSBhbiBlbnRpdHkgZnJvbSBpdHMgcHJvamVjdGVkIGxvY2F0aW9uLiBSZXR1cm5zIGN1cnJlbnQgc3RhdGUgKHdpdGggY29tcGxldGVkIHRhc2tzIHJlc29sdmVkKSwgcHJvamVjdGVkIHN0YXRlIChhZnRlciBhbGwgc2NoZWR1bGVkIHRhc2tzKSwgYW5kIGEgbGlzdCBvZiByZWFjaGFibGUgc3lzdGVtcyB3aXRoIGRpc3RhbmNlLCBlbmVyZ3kgY29zdCwgZmxpZ2h0IHRpbWUsIGFuZCBtYXJrZXQgaW5mb3JtYXRpb24uAAC4yptYs2IJZ2V0cGxheWVy/QItLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogZ2V0cGxheWVyCnN1bW1hcnk6ICdHZXQgcGxheWVyIGluZm9ybWF0aW9uJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpUaGlzIGFjdGlvbiByZXR1cm5zIGluZm9ybWF0aW9uIGFib3V0IGEgcGxheWVyIGluY2x1ZGluZyBiYWxhbmNlLCBkZWJ0LCBuZXR3b3J0aCwgZW50aXR5IGNvdW50cywgYW5kIHByaWNpbmcgZm9yIG5leHQgcHVyY2hhc2VzLiBSZXR1cm5zIGlzX3BsYXllcj1mYWxzZSBpZiB0aGUgYWNjb3VudCBoYXMgbm90IGpvaW5lZCB0aGUgZ2FtZS4AwFX5moyzYgpnZXRzdGFydGVyhQMtLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogZ2V0c3RhcnRlcgpzdW1tYXJ5OiAnR2V0IHN0YXJ0ZXIgc2hpcCBhbmQgYmFsYW5jZSBpbmZvcm1hdGlvbicKaWNvbjogaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91LzE0NzI5Mjg2MT9zPTQwMCZ1PTNiMWFmNjZlOTBkZDg1MWY0ZDdjMDk2ZWQ2YTJmYmI0YjllMTkwZGEKCi0tLQoKVGhpcyBhY3Rpb24gcmV0dXJucyB0aGUgc3RhcnRlciBzaGlwIHN0YXRzIGFuZCBpbml0aWFsIGJhbGFuY2UgYSBuZXcgcGxheWVyIHdvdWxkIHJlY2VpdmUgdXBvbiBqb2luaW5nLiBVc2VkIGZvciBvbmJvYXJkaW5nIFVJIHRvIGRpc3BsYXkgd2hhdCBwbGF5ZXJzIHdpbGwgZ2V0IGJlZm9yZSB0aGV5IHJlZ2lzdGVyLoCVu0ZKjbNiDGdldHN1bW1hcmllc+gCLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IGdldHN1bW1hcmllcwpzdW1tYXJ5OiAnR2V0IGVudGl0eSBzdW1tYXJpZXMgZm9yIGEgcGxheWVyJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpSZXR1cm5zIGxpZ2h0d2VpZ2h0IHN1bW1hcmllcyBvZiBhbGwgZW50aXRpZXMgb3duZWQgYnkgYSBwbGF5ZXIgaW5jbHVkaW5nIHR5cGUsIGlkLCBvd25lciwgbmFtZSwgbG9jYXRpb24sIGFuZCBpZGxlIHN0YXR1cy4gT3B0aW9uYWxseSBmaWx0ZXIgYnkgZW50aXR5IHR5cGUuAKLa5uaq6WULZ3JvdXB0cmF2ZWyaBC0tLQoKc3BlY192ZXJzaW9uOiAiMC4yLjAiCnRpdGxlOiBncm91cHRyYXZlbApzdW1tYXJ5OiAnTW92ZSBtdWx0aXBsZSBlbnRpdGllcyB0b2dldGhlcicKaWNvbjogaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91LzE0NzI5Mjg2MT9zPTQwMCZ1PTNiMWFmNjZlOTBkZDg1MWY0ZDdjMDk2ZWQ2YTJmYmI0YjllMTkwZGEKCi0tLQoKSW5pdGlhdGUgZ3JvdXAgdHJhdmVsIGZvciBtdWx0aXBsZSBlbnRpdGllcyB0byBhIGRlc3RpbmF0aW9uLiBBbGwgZW50aXRpZXMgbXVzdCBiZSBhdCB0aGUgc2FtZSBsb2NhdGlvbiBhbmQgb3duZWQgYnkgdGhlIGNhbGxlci4gQXQgbGVhc3Qgb25lIGVudGl0eSB3aXRoIGVuZ2luZXMgaXMgcmVxdWlyZWQgdG8gcHJvdmlkZSB0aHJ1c3QuIEZsaWdodCBkdXJhdGlvbiBpcyBjYWxjdWxhdGVkIGZyb20gY29tYmluZWQgdGhydXN0IGFuZCB0b3RhbCBtYXNzIG9mIGFsbCBlbnRpdGllcy4gQ3JlYXRlcyBhbiBlbnRpdHlncm91cCBmb3IgYXRvbWljIHJlc29sdXRpb24gYW5kIGNhbmNlbGxhdGlvbi4AAAAAANCwaQRoYXNo/QEtLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogaGFzaApzdW1tYXJ5OiAnQ2FsY3VsYXRlIHNoYTI1NiBoYXNoJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpDYWxjdWxhdGVzIHRoZSBzaGEyNTYgaGFzaCBvZiBhIHN0cmluZyBiYXNlZCB1c2luZyB0aGUgZ2FtZSBzZWVkLgoKLS0tAAAAQITSsGkHaGFzaDUxMvsBLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IGhhc2g1MTIKc3VtbWFyeTogJ0NhbGN1bGF0ZSBzaGE1MTIgaGFzaCcKaWNvbjogaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91LzE0NzI5Mjg2MT9zPTQwMCZ1PTNiMWFmNjZlOTBkZDg1MWY0ZDdjMDk2ZWQ2YTJmYmI0YjllMTkwZGEKCi0tLQoKQ2FsY3VsYXRlcyB0aGUgc2hhNTEyIGhhc2ggb2YgYSBzdHJpbmcgYmFzZWQgdXNpbmcgdGhlIGdhbWUgc2VlZC4AAAAAAJDddARpbml0+gEtLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogaW5pdApzdW1tYXJ5OiAnSW5pdGlhbGl6ZSBnYW1lIHNlZWQnCmljb246IGh0dHBzOi8vYXZhdGFycy5naXRodWJ1c2VyY29udGVudC5jb20vdS8xNDcyOTI4NjE/cz00MDAmdT0zYjFhZjY2ZTkwZGQ4NTFmNGQ3YzA5NmVkNmEyZmJiNGI5ZTE5MGRhCgotLS0KCkluaXRpYWxpemUgYSB0aGUgZ2FtZXMgc2VlZCBhbmQgc2VlZCB2YWx1ZXMgdG8gYm9vdHN0cmFwIGdhbWUgc3RhdGUuAAAAAAAwHX0Eam9pbskBLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IGpvaW4Kc3VtbWFyeTogJ0pvaW4gYSBnYW1lJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpKb2luIGEgZ2FtZSBvZiBTaGlwbG9hZAoKLS0tAAAAAPjlMp0Gbm90aWZ5igMtLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogbm90aWZ5CnN1bW1hcnk6ICdUYXNrIGxpZmVjeWNsZSBub3RpZmljYXRpb24nCmljb246IGh0dHBzOi8vYXZhdGFycy5naXRodWJ1c2VyY29udGVudC5jb20vdS8xNDcyOTI4NjE/cz00MDAmdT0zYjFhZjY2ZTkwZGQ4NTFmNGQ3YzA5NmVkNmEyZmJiNGI5ZTE5MGRhCgotLS0KCkludGVybmFsIGFjdGlvbiB0aGF0IG5vdGlmaWVzIGVudGl0eSBvd25lcnMgb2YgdGFzayBsaWZlY3ljbGUgZXZlbnRzIChyZXNvbHZlZCwgY2FuY2VsbGVkKS4gQ2FsbGVkIGlubGluZSB3aGVuIHRhc2tzIGNoYW5nZSBzdGF0ZS4gVXNlcyByZXF1aXJlX3JlY2lwaWVudCB0byBlbmFibGUgb2ZmLWNoYWluIG1vbml0b3JpbmcgdmlhIGFjdGlvbiB0cmFjZXMuAAAAYBoavakHcGF5bG9hbq8BLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IHBheWxvYW4Kc3VtbWFyeTogJ0xvYW4gUGF5bWVudCcKaWNvbjogaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91LzE0NzI5Mjg2MT9zPTQwMCZ1PTNiMWFmNjZlOTBkZDg1MWY0ZDdjMDk2ZWQ2YTJmYmI0YjllMTkwZGEKCi0tLQB8rFVjxa6uC3B1cmdlc3VwcGx56QEtLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogcHVyZ2VzdXBwbHkKc3VtbWFyeTogJ1VwZGF0ZSBHYW1lJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpQdXJnZSBvbGQgc3VwcGx5IHJlY29yZHMgYW5kIGhlbHAgY2xlYW51cCBnYW1lIHN0YXRlLgAAAIpd05C6CHJlY2hhcmdl0gItLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogcmVjaGFyZ2UKc3VtbWFyeTogJ1JlY2hhcmdlIHNoaXAgZW5lcmd5JwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpTY2hlZHVsZSBhIHJlY2hhcmdlIHRhc2sgZm9yIGFuIGVudGl0eSB0byByZXN0b3JlIGVuZXJneSB0byBmdWxsIGNhcGFjaXR5LiBUaGUgcmVjaGFyZ2UgZHVyYXRpb24gZGVwZW5kcyBvbiBjdXJyZW50IGVuZXJneSBsZXZlbCBhbmQgcmVjaGFyZ2UgcmF0ZS4KCi0tLQAAAEDtSLG6B3Jlc29sdmXVAy0tLQoKc3BlY192ZXJzaW9uOiAiMC4yLjAiCnRpdGxlOiByZXNvbHZlCnN1bW1hcnk6ICdDb21wbGV0ZSBzY2hlZHVsZWQgdGFza3MnCmljb246IGh0dHBzOi8vYXZhdGFycy5naXRodWJ1c2VyY29udGVudC5jb20vdS8xNDcyOTI4NjE/cz00MDAmdT0zYjFhZjY2ZTkwZGQ4NTFmNGQ3YzA5NmVkNmEyZmJiNGI5ZTE5MGRhCgotLS0KClJlc29sdmUgY29tcGxldGVkIHRhc2tzIGluIGFuIGVudGl0eSdzIHNjaGVkdWxlLCBhcHBseWluZyB0aGVpciBlZmZlY3RzIChyZWNoYXJnZSBlbmVyZ3ksIHVwZGF0ZSBsb2NhdGlvbiwgbG9hZC91bmxvYWQgY2FyZ28pLiBJZiBjb3VudCBpcyBzcGVjaWZpZWQsIHJlc29sdmUgZXhhY3RseSB0aGF0IG1hbnkgdGFza3M7IG90aGVyd2lzZSByZXNvbHZlIGFsbCBjb21wbGV0ZWQgdGFza3MuIEZhaWxzIGlmIGNvdW50IGV4Y2VlZHMgdGhlIG51bWJlciBvZiBjb21wbGV0ZWQgdGFza3MuCgotLS0AAAAAAJCjwQRzYWx03QEtLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogc2FsdApzdW1tYXJ5OiAnQXBwZW5kIFNhbHQnCmljb246IGh0dHBzOi8vYXZhdGFycy5naXRodWJ1c2VyY29udGVudC5jb20vdS8xNDcyOTI4NjE/cz00MDAmdT0zYjFhZjY2ZTkwZGQ4NTFmNGQ3YzA5NmVkNmEyZmJiNGI5ZTE5MGRhCgotLS0KCkFkZCBhZGRpdGlvbmFsIHNhbHQgdG8gdGhlIG5leHQgZXBvY2ggc2VlZC4KCi0tLQAAwIlSFqPCCXNlbGxnb29kc9UBLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IHNlbGxnb29kcwpzdW1tYXJ5OiAnU2VsbCBnb29kcycKaWNvbjogaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91LzE0NzI5Mjg2MT9zPTQwMCZ1PTNiMWFmNjZlOTBkZDg1MWY0ZDdjMDk2ZWQ2YTJmYmI0YjllMTkwZGEKCi0tLQoKU2VsbCBnb29kcyBmcm9tIGEgc2hpcCdzIGNhcmdvLgoKLS0tAAAA09CooMkIdGFrZWxvYW7qAS0tLQoKc3BlY192ZXJzaW9uOiAiMC4yLjAiCnRpdGxlOiB0YWtlbG9hbgpzdW1tYXJ5OiAnQ3JlZGl0IExvYW4nCmljb246IGh0dHBzOi8vYXZhdGFycy5naXRodWJ1c2VyY29udGVudC5jb20vdS8xNDcyOTI4NjE/cz00MDAmdT0zYjFhZjY2ZTkwZGQ4NTFmNGQ3YzA5NmVkNmEyZmJiNGI5ZTE5MGRhCgotLS0KCkJvcnJvdyBjcmVkaXRzIGZyb20gdGhlIGJhbmsgdGhhdCB3aWxsIG5lZWQgdG8gYmUgcmVwYWlkLgAAAFctPM3NCHRyYW5zZmVyyAMtLS0KCnNwZWNfdmVyc2lvbjogIjAuMi4wIgp0aXRsZTogdHJhbnNmZXIKc3VtbWFyeTogJ1RyYW5zZmVyIGNhcmdvIGJldHdlZW4gZW50aXRpZXMnCmljb246IGh0dHBzOi8vYXZhdGFycy5naXRodWJ1c2VyY29udGVudC5jb20vdS8xNDcyOTI4NjE/cz00MDAmdT0zYjFhZjY2ZTkwZGQ4NTFmNGQ3YzA5NmVkNmEyZmJiNGI5ZTE5MGRhCgotLS0KClRyYW5zZmVyIGNhcmdvIGJldHdlZW4gdHdvIGVudGl0aWVzIGF0IHRoZSBzYW1lIGxvY2F0aW9uLiBCb3RoIGVudGl0aWVzIG11c3QgYmUgb3duZWQgYnkgdGhlIGNhbGxlciBhbmQgYXQgbGVhc3Qgb25lIG11c3QgaGF2ZSBsb2FkZXJzLiBDcmVhdGVzIGxvYWQgYW5kIHVubG9hZCB0YXNrcyBvbiBib3RoIGVudGl0aWVzIHdpdGggZHVyYXRpb24gYmFzZWQgb24gY29tYmluZWQgbG9hZGVyIGNhcGFjaXR5IGFuZCBaLWRpc3RhbmNlIGJldHdlZW4gdGhlbS4AAAAARLXNzQZ0cmF2ZWzLAi0tLQoKc3BlY192ZXJzaW9uOiAiMC4yLjAiCnRpdGxlOiB0cmF2ZWwKc3VtbWFyeTogJ01vdmUgYSBzaGlwJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCgpJbml0aWF0ZSB0cmF2ZWwgb2YgYW4gZW50aXR5IGZyb20gaXRzIGN1cnJlbnQgbG9jYXRpb24gdG8gYSBuZXcgZGVzdGluYXRpb24uCgotLS0KClRoaXMgYWN0aW9uIGRldGVybWluZXMgdGhlIG1hcmtldCBwcmljZSBvZiBhbGwgZ29vZHMgYXQgYSBnaXZlbiBsb2NhdGlvbi6QXVIXqWxS1Qx1cGRhdGVjcmVkaXTCAS0tLQoKc3BlY192ZXJzaW9uOiAiMC4yLjAiCnRpdGxlOiB1cGRhdGVjcmVkaXQKc3VtbWFyeTogJ0RFQlVHOiB1cGRhdGVjcmVkaXQgYWN0aW9uJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tAEA+KqlsUtUKdXBkYXRlZGVidL4BLS0tCgpzcGVjX3ZlcnNpb246ICIwLjIuMCIKdGl0bGU6IHVwZGF0ZWRlYnQKc3VtbWFyeTogJ0RFQlVHOiB1cGRhdGVkZWJ0IGFjdGlvbicKaWNvbjogaHR0cHM6Ly9hdmF0YXJzLmdpdGh1YnVzZXJjb250ZW50LmNvbS91LzE0NzI5Mjg2MT9zPTQwMCZ1PTNiMWFmNjZlOTBkZDg1MWY0ZDdjMDk2ZWQ2YTJmYmI0YjllMTkwZGEKCi0tLQAAAAAAoKrjBHdpcGWyAS0tLQoKc3BlY192ZXJzaW9uOiAiMC4yLjAiCnRpdGxlOiB3aXBlCnN1bW1hcnk6ICdERUJVRzogd2lwZSBhY3Rpb24nCmljb246IGh0dHBzOi8vYXZhdGFycy5naXRodWJ1c2VyY29udGVudC5jb20vdS8xNDcyOTI4NjE/cz00MDAmdT0zYjFhZjY2ZTkwZGQ4NTFmNGQ3YzA5NmVkNmEyZmJiNGI5ZTE5MGRhCgotLS2g0FTaKqyq4wx3aXBlc2VxdWVuY2XCAS0tLQoKc3BlY192ZXJzaW9uOiAiMC4yLjAiCnRpdGxlOiB3aXBlc2VxdWVuY2UKc3VtbWFyeTogJ0RFQlVHOiB3aXBlc2VxdWVuY2UgYWN0aW9uJwppY29uOiBodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTQ3MjkyODYxP3M9NDAwJnU9M2IxYWY2NmU5MGRkODUxZjRkN2MwOTZlZDZhMmZiYjRiOWUxOTBkYQoKLS0tCwAAAAAAyq5BA2k2NAAACWNhcmdvX3JvdwAAuGo6kydFA2k2NAAADWNvbnRhaW5lcl9yb3cAqqaX+ezyVANpNjQAAA9lbnRpdHlncm91cF9yb3cAAACTumwQjQNpNjQAAAxsb2NhdGlvbl9yb3cAAAAAXOVNrANpNjQAAApwbGF5ZXJfcm93AAAACk2lrcIDaTY0AAAMc2VxdWVuY2Vfcm93AAAAAABQXcMDaTY0AAAIc2hpcF9yb3cAAAAAAJVNxgNpNjQAAAlzdGF0ZV9yb3cAAAAA+FirxgNpNjQAAApzdXBwbHlfcm93AAAAAACsqs8DaTY0AAAJdHlwZXNfcm93AABQWNOmruEDaTY0AAANd2FyZWhvdXNlX3JvdwERU2hpcGxvYWQgKFNlcnZlcikRU2hpcGxvYWQgKFNlcnZlcikAAAAUAAAAOFHKvD4MdGFza19yZXN1bHRzAAAAAESFpkEOY2FuY2VsX3Jlc3VsdHMAAAAgI3NzVwx0YXNrX3Jlc3VsdHMAsHLZ5amyYg1lbnRpdHlfaW5mb1tdAADw2eWpsmILZW50aXR5X2luZm8AAAA4UcqyYgpnb29kc19pbmZvACZ12SAas2INbG9jYXRpb25faW5mbwCAySYhGrNiEGxvY2F0aW9uX2Rlcml2ZWQAAPDnGjWzYgtuZWFyYnlfaW5mbwAAuMqbWLNiC3BsYXllcl9pbmZvAMBV+ZqMs2IMc3RhcnRlcl9pbmZvgJW7RkqNs2IQZW50aXR5X3N1bW1hcnlbXQCi2ubmqullDHRhc2tfcmVzdWx0cwAAAAAA0LBpC2NoZWNrc3VtMjU2AAAAQITSsGkLY2hlY2tzdW01MTIAAACKXdOQugx0YXNrX3Jlc3VsdHMAAABA7Uixug9yZXNvbHZlX3Jlc3VsdHMAAMCJUhajwgx0YXNrX3Jlc3VsdHMAAABXLTzNzQx0YXNrX3Jlc3VsdHMAAAAARLXNzQx0YXNrX3Jlc3VsdHM=');
 const abi = ABI.from(abiBlob);
 var Types;
 (function (Types) {
@@ -221,11 +221,29 @@ var Types;
         Struct.type('advance')
     ], advance);
     Types.advance = advance;
+    let buycontainer = class buycontainer extends Struct {
+    };
+    __decorate([
+        Struct.field(Name)
+    ], buycontainer.prototype, "account", void 0);
+    __decorate([
+        Struct.field(UInt64)
+    ], buycontainer.prototype, "ship_id", void 0);
+    __decorate([
+        Struct.field('string')
+    ], buycontainer.prototype, "name", void 0);
+    buycontainer = __decorate([
+        Struct.type('buycontainer')
+    ], buycontainer);
+    Types.buycontainer = buycontainer;
     let buygoods = class buygoods extends Struct {
     };
+    __decorate([
+        Struct.field(Name)
+    ], buygoods.prototype, "entity_type", void 0);
     __decorate([
         Struct.field(UInt64)
-    ], buygoods.prototype, "ship_id", void 0);
+    ], buygoods.prototype, "id", void 0);
     __decorate([
         Struct.field(UInt16)
     ], buygoods.prototype, "good_id", void 0);
@@ -278,87 +296,18 @@ var Types;
         Struct.type('cancel')
     ], cancel);
     Types.cancel = cancel;
-    let coordinates = class coordinates extends Struct {
-    };
-    __decorate([
-        Struct.field(Int64)
-    ], coordinates.prototype, "x", void 0);
-    __decorate([
-        Struct.field(Int64)
-    ], coordinates.prototype, "y", void 0);
-    __decorate([
-        Struct.field(UInt16, { optional: true })
-    ], coordinates.prototype, "z", void 0);
-    coordinates = __decorate([
-        Struct.type('coordinates')
-    ], coordinates);
-    Types.coordinates = coordinates;
-    let cargo_item = class cargo_item extends Struct {
-    };
-    __decorate([
-        Struct.field(UInt16)
-    ], cargo_item.prototype, "good_id", void 0);
-    __decorate([
-        Struct.field(UInt32)
-    ], cargo_item.prototype, "quantity", void 0);
-    __decorate([
-        Struct.field(UInt64)
-    ], cargo_item.prototype, "unit_cost", void 0);
-    cargo_item = __decorate([
-        Struct.type('cargo_item')
-    ], cargo_item);
-    Types.cargo_item = cargo_item;
-    let task = class task extends Struct {
-    };
-    __decorate([
-        Struct.field(UInt8)
-    ], task.prototype, "type", void 0);
-    __decorate([
-        Struct.field(UInt32)
-    ], task.prototype, "duration", void 0);
-    __decorate([
-        Struct.field(UInt8)
-    ], task.prototype, "cancelable", void 0);
-    __decorate([
-        Struct.field(coordinates, { optional: true })
-    ], task.prototype, "location", void 0);
-    __decorate([
-        Struct.field(cargo_item, { array: true })
-    ], task.prototype, "cargo", void 0);
-    __decorate([
-        Struct.field(UInt64, { optional: true })
-    ], task.prototype, "entity", void 0);
-    __decorate([
-        Struct.field(Int64, { optional: true })
-    ], task.prototype, "credits", void 0);
-    task = __decorate([
-        Struct.type('task')
-    ], task);
-    Types.task = task;
-    let cancel_log = class cancel_log extends Struct {
+    let entity_ref = class entity_ref extends Struct {
     };
     __decorate([
         Struct.field(Name)
-    ], cancel_log.prototype, "owner", void 0);
-    __decorate([
-        Struct.field(Name)
-    ], cancel_log.prototype, "entity_type", void 0);
+    ], entity_ref.prototype, "entity_type", void 0);
     __decorate([
         Struct.field(UInt64)
-    ], cancel_log.prototype, "entity_id", void 0);
-    __decorate([
-        Struct.field(UInt8)
-    ], cancel_log.prototype, "task_index", void 0);
-    __decorate([
-        Struct.field(task)
-    ], cancel_log.prototype, "task", void 0);
-    __decorate([
-        Struct.field(TimePoint)
-    ], cancel_log.prototype, "started_at", void 0);
-    cancel_log = __decorate([
-        Struct.type('cancel_log')
-    ], cancel_log);
-    Types.cancel_log = cancel_log;
+    ], entity_ref.prototype, "entity_id", void 0);
+    entity_ref = __decorate([
+        Struct.type('entity_ref')
+    ], entity_ref);
+    Types.entity_ref = entity_ref;
     let cancel_results = class cancel_results extends Struct {
     };
     __decorate([
@@ -373,10 +322,55 @@ var Types;
     __decorate([
         Struct.field(TimePoint, { optional: true })
     ], cancel_results.prototype, "schedule_started", void 0);
+    __decorate([
+        Struct.field(UInt64, { optional: true })
+    ], cancel_results.prototype, "entitygroup", void 0);
+    __decorate([
+        Struct.field(entity_ref, { array: true, optional: true })
+    ], cancel_results.prototype, "group_members", void 0);
     cancel_results = __decorate([
         Struct.type('cancel_results')
     ], cancel_results);
     Types.cancel_results = cancel_results;
+    let mixture_component = class mixture_component extends Struct {
+    };
+    __decorate([
+        Struct.field(UInt16)
+    ], mixture_component.prototype, "good_id", void 0);
+    __decorate([
+        Struct.field(UInt16)
+    ], mixture_component.prototype, "purity", void 0);
+    mixture_component = __decorate([
+        Struct.type('mixture_component')
+    ], mixture_component);
+    Types.mixture_component = mixture_component;
+    let mixture_info = class mixture_info extends Struct {
+    };
+    __decorate([
+        Struct.field(mixture_component, { array: true })
+    ], mixture_info.prototype, "components", void 0);
+    mixture_info = __decorate([
+        Struct.type('mixture_info')
+    ], mixture_info);
+    Types.mixture_info = mixture_info;
+    let cargo_item = class cargo_item extends Struct {
+    };
+    __decorate([
+        Struct.field(UInt16)
+    ], cargo_item.prototype, "good_id", void 0);
+    __decorate([
+        Struct.field(UInt32)
+    ], cargo_item.prototype, "quantity", void 0);
+    __decorate([
+        Struct.field(UInt64)
+    ], cargo_item.prototype, "unit_cost", void 0);
+    __decorate([
+        Struct.field(mixture_info, { optional: true })
+    ], cargo_item.prototype, "mixture", void 0);
+    cargo_item = __decorate([
+        Struct.type('cargo_item')
+    ], cargo_item);
+    Types.cargo_item = cargo_item;
     let cargo_row = class cargo_row extends Struct {
     };
     __decorate([
@@ -422,6 +416,96 @@ var Types;
         Struct.type('commit')
     ], commit);
     Types.commit = commit;
+    let coordinates = class coordinates extends Struct {
+    };
+    __decorate([
+        Struct.field(Int64)
+    ], coordinates.prototype, "x", void 0);
+    __decorate([
+        Struct.field(Int64)
+    ], coordinates.prototype, "y", void 0);
+    __decorate([
+        Struct.field(UInt16, { optional: true })
+    ], coordinates.prototype, "z", void 0);
+    coordinates = __decorate([
+        Struct.type('coordinates')
+    ], coordinates);
+    Types.coordinates = coordinates;
+    let task = class task extends Struct {
+    };
+    __decorate([
+        Struct.field(UInt8)
+    ], task.prototype, "type", void 0);
+    __decorate([
+        Struct.field(UInt32)
+    ], task.prototype, "duration", void 0);
+    __decorate([
+        Struct.field(UInt8)
+    ], task.prototype, "cancelable", void 0);
+    __decorate([
+        Struct.field(coordinates, { optional: true })
+    ], task.prototype, "coordinates", void 0);
+    __decorate([
+        Struct.field(cargo_item, { array: true })
+    ], task.prototype, "cargo", void 0);
+    __decorate([
+        Struct.field(entity_ref, { optional: true })
+    ], task.prototype, "entitytarget", void 0);
+    __decorate([
+        Struct.field(UInt64, { optional: true })
+    ], task.prototype, "entitygroup", void 0);
+    __decorate([
+        Struct.field(Int64, { optional: true })
+    ], task.prototype, "credits", void 0);
+    __decorate([
+        Struct.field(UInt16, { optional: true })
+    ], task.prototype, "energy_cost", void 0);
+    task = __decorate([
+        Struct.type('task')
+    ], task);
+    Types.task = task;
+    let schedule = class schedule extends Struct {
+    };
+    __decorate([
+        Struct.field(TimePoint)
+    ], schedule.prototype, "started", void 0);
+    __decorate([
+        Struct.field(task, { array: true })
+    ], schedule.prototype, "tasks", void 0);
+    schedule = __decorate([
+        Struct.type('schedule')
+    ], schedule);
+    Types.schedule = schedule;
+    let container_row = class container_row extends Struct {
+    };
+    __decorate([
+        Struct.field(UInt64)
+    ], container_row.prototype, "id", void 0);
+    __decorate([
+        Struct.field(Name)
+    ], container_row.prototype, "owner", void 0);
+    __decorate([
+        Struct.field('string')
+    ], container_row.prototype, "name", void 0);
+    __decorate([
+        Struct.field(coordinates)
+    ], container_row.prototype, "coordinates", void 0);
+    __decorate([
+        Struct.field(UInt32)
+    ], container_row.prototype, "hullmass", void 0);
+    __decorate([
+        Struct.field(UInt32)
+    ], container_row.prototype, "capacity", void 0);
+    __decorate([
+        Struct.field(UInt32)
+    ], container_row.prototype, "cargomass", void 0);
+    __decorate([
+        Struct.field(schedule, { optional: true })
+    ], container_row.prototype, "schedule", void 0);
+    container_row = __decorate([
+        Struct.type('container_row')
+    ], container_row);
+    Types.container_row = container_row;
     let enable = class enable extends Struct {
     };
     __decorate([
@@ -443,6 +527,18 @@ var Types;
         Struct.type('energy_stats')
     ], energy_stats);
     Types.energy_stats = energy_stats;
+    let entity_current_state = class entity_current_state extends Struct {
+    };
+    __decorate([
+        Struct.field(coordinates)
+    ], entity_current_state.prototype, "coordinates", void 0);
+    __decorate([
+        Struct.field(UInt16)
+    ], entity_current_state.prototype, "energy", void 0);
+    entity_current_state = __decorate([
+        Struct.type('entity_current_state')
+    ], entity_current_state);
+    Types.entity_current_state = entity_current_state;
     let loader_stats = class loader_stats extends Struct {
     };
     __decorate([
@@ -470,18 +566,21 @@ var Types;
         Struct.type('movement_stats')
     ], movement_stats);
     Types.movement_stats = movement_stats;
-    let schedule = class schedule extends Struct {
+    let extractor_stats = class extractor_stats extends Struct {
     };
     __decorate([
-        Struct.field(TimePoint)
-    ], schedule.prototype, "started", void 0);
+        Struct.field(UInt16)
+    ], extractor_stats.prototype, "rate", void 0);
     __decorate([
-        Struct.field(task, { array: true })
-    ], schedule.prototype, "tasks", void 0);
-    schedule = __decorate([
-        Struct.type('schedule')
-    ], schedule);
-    Types.schedule = schedule;
+        Struct.field(UInt16)
+    ], extractor_stats.prototype, "drain", void 0);
+    __decorate([
+        Struct.field(UInt16)
+    ], extractor_stats.prototype, "efficiency", void 0);
+    extractor_stats = __decorate([
+        Struct.type('extractor_stats')
+    ], extractor_stats);
+    Types.extractor_stats = extractor_stats;
     let entity_info = class entity_info extends Struct {
     };
     __decorate([
@@ -498,7 +597,7 @@ var Types;
     ], entity_info.prototype, "entity_name", void 0);
     __decorate([
         Struct.field(coordinates)
-    ], entity_info.prototype, "location", void 0);
+    ], entity_info.prototype, "coordinates", void 0);
     __decorate([
         Struct.field(UInt32)
     ], entity_info.prototype, "cargomass", void 0);
@@ -513,7 +612,7 @@ var Types;
     ], entity_info.prototype, "energy", void 0);
     __decorate([
         Struct.field(UInt32, { optional: true })
-    ], entity_info.prototype, "mass", void 0);
+    ], entity_info.prototype, "hullmass", void 0);
     __decorate([
         Struct.field(movement_stats, { optional: true })
     ], entity_info.prototype, "engines", void 0);
@@ -523,6 +622,9 @@ var Types;
     __decorate([
         Struct.field(UInt32, { optional: true })
     ], entity_info.prototype, "capacity", void 0);
+    __decorate([
+        Struct.field(extractor_stats, { optional: true })
+    ], entity_info.prototype, "extractor", void 0);
     __decorate([
         Struct.field('bool')
     ], entity_info.prototype, "is_idle", void 0);
@@ -548,18 +650,6 @@ var Types;
         Struct.type('entity_info')
     ], entity_info);
     Types.entity_info = entity_info;
-    let entity_state = class entity_state extends Struct {
-    };
-    __decorate([
-        Struct.field(coordinates)
-    ], entity_state.prototype, "location", void 0);
-    __decorate([
-        Struct.field(UInt16)
-    ], entity_state.prototype, "energy", void 0);
-    entity_state = __decorate([
-        Struct.type('entity_state')
-    ], entity_state);
-    Types.entity_state = entity_state;
     let entity_summary = class entity_summary extends Struct {
     };
     __decorate([
@@ -576,7 +666,7 @@ var Types;
     ], entity_summary.prototype, "entity_name", void 0);
     __decorate([
         Struct.field(coordinates)
-    ], entity_summary.prototype, "location", void 0);
+    ], entity_summary.prototype, "coordinates", void 0);
     __decorate([
         Struct.field('bool')
     ], entity_summary.prototype, "is_idle", void 0);
@@ -608,6 +698,27 @@ var Types;
         Struct.type('entity_task_info')
     ], entity_task_info);
     Types.entity_task_info = entity_task_info;
+    let entitygroup_row = class entitygroup_row extends Struct {
+    };
+    __decorate([
+        Struct.field(UInt64)
+    ], entitygroup_row.prototype, "id", void 0);
+    __decorate([
+        Struct.field(entity_ref, { array: true })
+    ], entitygroup_row.prototype, "participants", void 0);
+    entitygroup_row = __decorate([
+        Struct.type('entitygroup_row')
+    ], entitygroup_row);
+    Types.entitygroup_row = entitygroup_row;
+    let extract = class extract extends Struct {
+    };
+    __decorate([
+        Struct.field(UInt64)
+    ], extract.prototype, "ship_id", void 0);
+    extract = __decorate([
+        Struct.type('extract')
+    ], extract);
+    Types.extract = extract;
     let getentities = class getentities extends Struct {
     };
     __decorate([
@@ -650,6 +761,18 @@ var Types;
         Struct.type('getlocation')
     ], getlocation);
     Types.getlocation = getlocation;
+    let getlocdata = class getlocdata extends Struct {
+    };
+    __decorate([
+        Struct.field(Int64)
+    ], getlocdata.prototype, "x", void 0);
+    __decorate([
+        Struct.field(Int64)
+    ], getlocdata.prototype, "y", void 0);
+    getlocdata = __decorate([
+        Struct.type('getlocdata')
+    ], getlocdata);
+    Types.getlocdata = getlocdata;
     let getnearby = class getnearby extends Struct {
     };
     __decorate([
@@ -674,6 +797,12 @@ var Types;
         Struct.type('getplayer')
     ], getplayer);
     Types.getplayer = getplayer;
+    let getstarter = class getstarter extends Struct {
+    };
+    getstarter = __decorate([
+        Struct.type('getstarter')
+    ], getstarter);
+    Types.getstarter = getstarter;
     let getsummaries = class getsummaries extends Struct {
     };
     __decorate([
@@ -710,6 +839,24 @@ var Types;
         Struct.type('goods_info')
     ], goods_info);
     Types.goods_info = goods_info;
+    let grouptravel = class grouptravel extends Struct {
+    };
+    __decorate([
+        Struct.field(entity_ref, { array: true })
+    ], grouptravel.prototype, "entities", void 0);
+    __decorate([
+        Struct.field(Int64)
+    ], grouptravel.prototype, "x", void 0);
+    __decorate([
+        Struct.field(Int64)
+    ], grouptravel.prototype, "y", void 0);
+    __decorate([
+        Struct.field('bool')
+    ], grouptravel.prototype, "recharge", void 0);
+    grouptravel = __decorate([
+        Struct.type('grouptravel')
+    ], grouptravel);
+    Types.grouptravel = grouptravel;
     let hash = class hash extends Struct {
     };
     __decorate([
@@ -746,6 +893,54 @@ var Types;
         Struct.type('join')
     ], join);
     Types.join = join;
+    let location_static = class location_static extends Struct {
+    };
+    __decorate([
+        Struct.field(coordinates)
+    ], location_static.prototype, "coords", void 0);
+    __decorate([
+        Struct.field(UInt8)
+    ], location_static.prototype, "type", void 0);
+    __decorate([
+        Struct.field(UInt8)
+    ], location_static.prototype, "subtype", void 0);
+    __decorate([
+        Struct.field(UInt8)
+    ], location_static.prototype, "seed0", void 0);
+    __decorate([
+        Struct.field(UInt8)
+    ], location_static.prototype, "seed1", void 0);
+    location_static = __decorate([
+        Struct.type('location_static')
+    ], location_static);
+    Types.location_static = location_static;
+    let location_epoch = class location_epoch extends Struct {
+    };
+    __decorate([
+        Struct.field('bool')
+    ], location_epoch.prototype, "active", void 0);
+    __decorate([
+        Struct.field(UInt8)
+    ], location_epoch.prototype, "seed0", void 0);
+    __decorate([
+        Struct.field(UInt8)
+    ], location_epoch.prototype, "seed1", void 0);
+    location_epoch = __decorate([
+        Struct.type('location_epoch')
+    ], location_epoch);
+    Types.location_epoch = location_epoch;
+    let location_derived = class location_derived extends Struct {
+    };
+    __decorate([
+        Struct.field(location_static)
+    ], location_derived.prototype, "static_props", void 0);
+    __decorate([
+        Struct.field(location_epoch)
+    ], location_derived.prototype, "epoch_props", void 0);
+    location_derived = __decorate([
+        Struct.type('location_derived')
+    ], location_derived);
+    Types.location_derived = location_derived;
     let location_good = class location_good extends Struct {
     };
     __decorate([
@@ -787,96 +982,36 @@ var Types;
     __decorate([
         Struct.field(UInt64)
     ], location_row.prototype, "id", void 0);
+    __decorate([
+        Struct.field(Name)
+    ], location_row.prototype, "owner", void 0);
     __decorate([
         Struct.field(coordinates)
     ], location_row.prototype, "coordinates", void 0);
     __decorate([
-        Struct.field(UInt64)
-    ], location_row.prototype, "epoch", void 0);
+        Struct.field(UInt32)
+    ], location_row.prototype, "cargomass", void 0);
     __decorate([
-        Struct.field(UInt16)
-    ], location_row.prototype, "good_id", void 0);
+        Struct.field(cargo_item, { array: true })
+    ], location_row.prototype, "cargo", void 0);
     __decorate([
-        Struct.field(UInt16)
-    ], location_row.prototype, "supply", void 0);
+        Struct.field(schedule, { optional: true })
+    ], location_row.prototype, "schedule", void 0);
     location_row = __decorate([
         Struct.type('location_row')
     ], location_row);
     Types.location_row = location_row;
-    let logcancel = class logcancel extends Struct {
-    };
-    __decorate([
-        Struct.field(cancel_log)
-    ], logcancel.prototype, "log", void 0);
-    logcancel = __decorate([
-        Struct.type('logcancel')
-    ], logcancel);
-    Types.logcancel = logcancel;
-    let resolve_log = class resolve_log extends Struct {
+    let nearby_system = class nearby_system extends Struct {
     };
     __decorate([
-        Struct.field(Name)
-    ], resolve_log.prototype, "owner", void 0);
-    __decorate([
-        Struct.field(Name)
-    ], resolve_log.prototype, "entity_type", void 0);
+        Struct.field(UInt64)
+    ], nearby_system.prototype, "distance", void 0);
     __decorate([
         Struct.field(UInt64)
-    ], resolve_log.prototype, "entity_id", void 0);
+    ], nearby_system.prototype, "energy_cost", void 0);
     __decorate([
-        Struct.field(UInt8)
-    ], resolve_log.prototype, "task_index", void 0);
-    __decorate([
-        Struct.field(task)
-    ], resolve_log.prototype, "task", void 0);
-    __decorate([
-        Struct.field(TimePoint)
-    ], resolve_log.prototype, "started_at", void 0);
-    __decorate([
-        Struct.field(TimePoint)
-    ], resolve_log.prototype, "completed_at", void 0);
-    __decorate([
-        Struct.field(UInt16, { optional: true })
-    ], resolve_log.prototype, "new_energy", void 0);
-    __decorate([
-        Struct.field(coordinates, { optional: true })
-    ], resolve_log.prototype, "new_location", void 0);
-    __decorate([
-        Struct.field(Int64)
-    ], resolve_log.prototype, "cargomass_delta", void 0);
-    __decorate([
-        Struct.field(cargo_item, { array: true })
-    ], resolve_log.prototype, "cargo_added", void 0);
-    __decorate([
-        Struct.field(cargo_item, { array: true })
-    ], resolve_log.prototype, "cargo_removed", void 0);
-    __decorate([
-        Struct.field(Int64, { optional: true })
-    ], resolve_log.prototype, "credits", void 0);
-    resolve_log = __decorate([
-        Struct.type('resolve_log')
-    ], resolve_log);
-    Types.resolve_log = resolve_log;
-    let logresolve = class logresolve extends Struct {
-    };
-    __decorate([
-        Struct.field(resolve_log)
-    ], logresolve.prototype, "log", void 0);
-    logresolve = __decorate([
-        Struct.type('logresolve')
-    ], logresolve);
-    Types.logresolve = logresolve;
-    let nearby_system = class nearby_system extends Struct {
-    };
-    __decorate([
-        Struct.field(UInt64)
-    ], nearby_system.prototype, "distance", void 0);
-    __decorate([
-        Struct.field(UInt64)
-    ], nearby_system.prototype, "energy_cost", void 0);
-    __decorate([
-        Struct.field(UInt32)
-    ], nearby_system.prototype, "flight_time", void 0);
+        Struct.field(UInt32)
+    ], nearby_system.prototype, "flight_time", void 0);
     __decorate([
         Struct.field(location_info)
     ], nearby_system.prototype, "location", void 0);
@@ -890,10 +1025,10 @@ var Types;
         Struct.field('bool')
     ], nearby_info.prototype, "can_travel", void 0);
     __decorate([
-        Struct.field(entity_state)
+        Struct.field(entity_current_state)
     ], nearby_info.prototype, "current", void 0);
     __decorate([
-        Struct.field(entity_state)
+        Struct.field(entity_current_state)
     ], nearby_info.prototype, "projected", void 0);
     __decorate([
         Struct.field(UInt16)
@@ -905,6 +1040,63 @@ var Types;
         Struct.type('nearby_info')
     ], nearby_info);
     Types.nearby_info = nearby_info;
+    let task_event = class task_event extends Struct {
+    };
+    __decorate([
+        Struct.field(UInt8)
+    ], task_event.prototype, "event_type", void 0);
+    __decorate([
+        Struct.field(Name)
+    ], task_event.prototype, "owner", void 0);
+    __decorate([
+        Struct.field(Name)
+    ], task_event.prototype, "entity_type", void 0);
+    __decorate([
+        Struct.field(UInt64)
+    ], task_event.prototype, "entity_id", void 0);
+    __decorate([
+        Struct.field(UInt8)
+    ], task_event.prototype, "task_index", void 0);
+    __decorate([
+        Struct.field(task)
+    ], task_event.prototype, "task", void 0);
+    __decorate([
+        Struct.field(TimePoint)
+    ], task_event.prototype, "starts_at", void 0);
+    __decorate([
+        Struct.field(TimePoint)
+    ], task_event.prototype, "completes_at", void 0);
+    __decorate([
+        Struct.field(UInt16, { optional: true })
+    ], task_event.prototype, "new_energy", void 0);
+    __decorate([
+        Struct.field(coordinates, { optional: true })
+    ], task_event.prototype, "new_coordinates", void 0);
+    __decorate([
+        Struct.field(Int64)
+    ], task_event.prototype, "cargomass_delta", void 0);
+    __decorate([
+        Struct.field(cargo_item, { array: true })
+    ], task_event.prototype, "cargo_added", void 0);
+    __decorate([
+        Struct.field(cargo_item, { array: true })
+    ], task_event.prototype, "cargo_removed", void 0);
+    __decorate([
+        Struct.field(Int64, { optional: true })
+    ], task_event.prototype, "credits", void 0);
+    task_event = __decorate([
+        Struct.type('task_event')
+    ], task_event);
+    Types.task_event = task_event;
+    let notify = class notify extends Struct {
+    };
+    __decorate([
+        Struct.field(task_event)
+    ], notify.prototype, "event", void 0);
+    notify = __decorate([
+        Struct.type('notify')
+    ], notify);
+    Types.notify = notify;
     let payloan = class payloan extends Struct {
     };
     __decorate([
@@ -946,12 +1138,18 @@ var Types;
     __decorate([
         Struct.field(UInt64)
     ], player_info.prototype, "next_warehouse_price", void 0);
+    __decorate([
+        Struct.field(UInt64)
+    ], player_info.prototype, "next_container_price", void 0);
     __decorate([
         Struct.field(UInt64)
     ], player_info.prototype, "ship_count", void 0);
     __decorate([
         Struct.field(UInt64)
     ], player_info.prototype, "warehouse_count", void 0);
+    __decorate([
+        Struct.field(UInt64)
+    ], player_info.prototype, "container_count", void 0);
     player_info = __decorate([
         Struct.type('player_info')
     ], player_info);
@@ -1003,6 +1201,9 @@ var Types;
     __decorate([
         Struct.field(UInt64)
     ], resolve.prototype, "id", void 0);
+    __decorate([
+        Struct.field(UInt64, { optional: true })
+    ], resolve.prototype, "count", void 0);
     resolve = __decorate([
         Struct.type('resolve')
     ], resolve);
@@ -1021,6 +1222,12 @@ var Types;
     __decorate([
         Struct.field(TimePoint, { optional: true })
     ], resolve_results.prototype, "new_schedule_started", void 0);
+    __decorate([
+        Struct.field(UInt64, { optional: true })
+    ], resolve_results.prototype, "entitygroup", void 0);
+    __decorate([
+        Struct.field(entity_ref, { array: true, optional: true })
+    ], resolve_results.prototype, "group_members", void 0);
     resolve_results = __decorate([
         Struct.type('resolve_results')
     ], resolve_results);
@@ -1036,9 +1243,12 @@ var Types;
     Types.salt = salt;
     let sellgoods = class sellgoods extends Struct {
     };
+    __decorate([
+        Struct.field(Name)
+    ], sellgoods.prototype, "entity_type", void 0);
     __decorate([
         Struct.field(UInt64)
-    ], sellgoods.prototype, "ship_id", void 0);
+    ], sellgoods.prototype, "id", void 0);
     __decorate([
         Struct.field(UInt16)
     ], sellgoods.prototype, "good_id", void 0);
@@ -1061,6 +1271,15 @@ var Types;
         Struct.type('sequence_row')
     ], sequence_row);
     Types.sequence_row = sequence_row;
+    let trade_stats = class trade_stats extends Struct {
+    };
+    __decorate([
+        Struct.field(UInt16)
+    ], trade_stats.prototype, "margin", void 0);
+    trade_stats = __decorate([
+        Struct.type('trade_stats')
+    ], trade_stats);
+    Types.trade_stats = trade_stats;
     let ship_row = class ship_row extends Struct {
     };
     __decorate([
@@ -1074,16 +1293,19 @@ var Types;
     ], ship_row.prototype, "name", void 0);
     __decorate([
         Struct.field(coordinates)
-    ], ship_row.prototype, "location", void 0);
+    ], ship_row.prototype, "coordinates", void 0);
     __decorate([
         Struct.field(UInt32)
-    ], ship_row.prototype, "mass", void 0);
+    ], ship_row.prototype, "hullmass", void 0);
     __decorate([
         Struct.field(UInt32)
     ], ship_row.prototype, "capacity", void 0);
     __decorate([
         Struct.field(UInt16)
     ], ship_row.prototype, "energy", void 0);
+    __decorate([
+        Struct.field(UInt32)
+    ], ship_row.prototype, "cargomass", void 0);
     __decorate([
         Struct.field(movement_stats)
     ], ship_row.prototype, "engines", void 0);
@@ -1093,6 +1315,12 @@ var Types;
     __decorate([
         Struct.field(loader_stats)
     ], ship_row.prototype, "loaders", void 0);
+    __decorate([
+        Struct.field(trade_stats, { optional: true })
+    ], ship_row.prototype, "trade", void 0);
+    __decorate([
+        Struct.field(extractor_stats, { optional: true })
+    ], ship_row.prototype, "extractor", void 0);
     __decorate([
         Struct.field(schedule, { optional: true })
     ], ship_row.prototype, "schedule", void 0);
@@ -1100,6 +1328,21 @@ var Types;
         Struct.type('ship_row')
     ], ship_row);
     Types.ship_row = ship_row;
+    let starter_info = class starter_info extends Struct {
+    };
+    __decorate([
+        Struct.field(UInt64)
+    ], starter_info.prototype, "balance", void 0);
+    __decorate([
+        Struct.field(UInt64)
+    ], starter_info.prototype, "debt", void 0);
+    __decorate([
+        Struct.field(entity_info)
+    ], starter_info.prototype, "ship", void 0);
+    starter_info = __decorate([
+        Struct.type('starter_info')
+    ], starter_info);
+    Types.starter_info = starter_info;
     let state_row = class state_row extends Struct {
     };
     __decorate([
@@ -1124,6 +1367,27 @@ var Types;
         Struct.type('state_row')
     ], state_row);
     Types.state_row = state_row;
+    let supply_row = class supply_row extends Struct {
+    };
+    __decorate([
+        Struct.field(UInt64)
+    ], supply_row.prototype, "id", void 0);
+    __decorate([
+        Struct.field(coordinates)
+    ], supply_row.prototype, "coordinates", void 0);
+    __decorate([
+        Struct.field(UInt64)
+    ], supply_row.prototype, "epoch", void 0);
+    __decorate([
+        Struct.field(UInt16)
+    ], supply_row.prototype, "good_id", void 0);
+    __decorate([
+        Struct.field(UInt16)
+    ], supply_row.prototype, "supply", void 0);
+    supply_row = __decorate([
+        Struct.type('supply_row')
+    ], supply_row);
+    Types.supply_row = supply_row;
     let takeloan = class takeloan extends Struct {
     };
     __decorate([
@@ -1198,6 +1462,9 @@ var Types;
     __decorate([
         Struct.field(entity_summary)
     ], types_row.prototype, "entity_summary_type", void 0);
+    __decorate([
+        Struct.field(starter_info)
+    ], types_row.prototype, "starter_info_type", void 0);
     types_row = __decorate([
         Struct.type('types_row')
     ], types_row);
@@ -1239,10 +1506,13 @@ var Types;
     ], warehouse_row.prototype, "name", void 0);
     __decorate([
         Struct.field(coordinates)
-    ], warehouse_row.prototype, "location", void 0);
+    ], warehouse_row.prototype, "coordinates", void 0);
     __decorate([
         Struct.field(UInt32)
     ], warehouse_row.prototype, "capacity", void 0);
+    __decorate([
+        Struct.field(UInt32)
+    ], warehouse_row.prototype, "cargomass", void 0);
     __decorate([
         Struct.field(loader_stats)
     ], warehouse_row.prototype, "loaders", void 0);
@@ -1268,11 +1538,14 @@ var Types;
 })(Types || (Types = {}));
 const TableMap = {
     cargo: Types.cargo_row,
+    container: Types.container_row,
+    entitygroup: Types.entitygroup_row,
     location: Types.location_row,
     player: Types.player_row,
     sequence: Types.sequence_row,
     ship: Types.ship_row,
     state: Types.state_row,
+    supply: Types.supply_row,
     types: Types.types_row,
     warehouse: Types.warehouse_row,
 };
@@ -1349,16 +1622,45 @@ const WAREHOUSE_ALREADY_AT_LOCATION = 'Warehouse already exists at this location
 const WAREHOUSE_CAPACITY_EXCEEDED = 'Warehouse capacity would be exceeded.';
 
 const PRECISION = 10000;
-const INITIAL_SHIP_MASS = 500000;
+const INITIAL_SHIP_GENERATOR_CAPACITY = 350;
+const INITIAL_SHIP_DRAIN = 25;
+const INITIAL_SHIP_ENERGY = 350;
+const INITIAL_SHIP_HULLMASS = 100000;
+const INITIAL_SHIP_CAPACITY = 500000;
+const INITIAL_SHIP_Z = 800;
+const INITIAL_SHIP_RECHARGE = 10;
+const INITIAL_SHIP_THRUST = 250;
+const INITIAL_LOADER_MASS = 1000;
+const INITIAL_LOADER_QUANTITY = 1;
+const INITIAL_LOADER_THRUST = 1;
+const WAREHOUSE_Z = 500;
+const INITIAL_WAREHOUSE_CAPACITY = 10000000;
+const CONTAINER_Z = 300;
+const INITIAL_CONTAINER_HULLMASS = 50000;
+const INITIAL_CONTAINER_CAPACITY = 2000000;
+const TRAVEL_MAX_DURATION = 86400;
 const MIN_ORBITAL_ALTITUDE = 800;
 const MAX_ORBITAL_ALTITUDE = 3000;
+const INITIAL_SHIP_MASS = 500000;
+const INITIAL_EXTRACTOR_RATE = 700;
+const INITIAL_EXTRACTOR_DRAIN = 2500;
+const INITIAL_EXTRACTOR_EFFICIENCY = 5000;
 var TaskType;
 (function (TaskType) {
-    TaskType[TaskType["RECHARGE"] = 0] = "RECHARGE";
-    TaskType[TaskType["LOAD"] = 1] = "LOAD";
-    TaskType[TaskType["UNLOAD"] = 2] = "UNLOAD";
-    TaskType[TaskType["FLIGHT"] = 3] = "FLIGHT";
+    TaskType[TaskType["IDLE"] = 0] = "IDLE";
+    TaskType[TaskType["TRAVEL"] = 1] = "TRAVEL";
+    TaskType[TaskType["RECHARGE"] = 2] = "RECHARGE";
+    TaskType[TaskType["LOAD"] = 3] = "LOAD";
+    TaskType[TaskType["UNLOAD"] = 4] = "UNLOAD";
+    TaskType[TaskType["EXTRACT"] = 5] = "EXTRACT";
 })(TaskType || (TaskType = {}));
+var LocationType;
+(function (LocationType) {
+    LocationType[LocationType["EMPTY"] = 0] = "EMPTY";
+    LocationType[LocationType["PLANET"] = 1] = "PLANET";
+    LocationType[LocationType["ASTEROID"] = 2] = "ASTEROID";
+    LocationType[LocationType["NEBULA"] = 3] = "NEBULA";
+})(LocationType || (LocationType = {}));
 var TaskCancelable;
 (function (TaskCancelable) {
     TaskCancelable[TaskCancelable["NEVER"] = 0] = "NEVER";
@@ -1368,6 +1670,7 @@ var TaskCancelable;
 const EntityType = {
     SHIP: Name.from('ship'),
     WAREHOUSE: Name.from('warehouse'),
+    CONTAINER: Name.from('container'),
 };
 class Coordinates extends Types.coordinates {
     static from(value) {
@@ -1377,6 +1680,17 @@ class Coordinates extends Types.coordinates {
         const coords = Coordinates.from(other);
         return this.x.equals(coords.x) && this.y.equals(coords.y);
     }
+    toLocationId() {
+        return coordsToLocationId(this);
+    }
+}
+function coordsToLocationId(coords) {
+    const c = Coordinates.from(coords);
+    const mask = BigInt(0xffffffff);
+    const x = BigInt(c.x.toNumber()) & mask;
+    const y = BigInt(c.y.toNumber()) & mask;
+    const id = (x << BigInt(32)) | y;
+    return UInt64.from(id);
 }
 let Good = class Good extends Struct {
 };
@@ -2628,6 +2942,26 @@ var syllables = [
 	"Zyn"
 ];
 
+const LOCATION_EXISTS_THRESHOLD = 0x10;
+const LOCATION_ACTIVE_THRESHOLD = 0x80;
+function getLocationType(gameSeed, coordinates) {
+    const seed = Checksum256.from(gameSeed);
+    const str = ['system', coordinates.x, coordinates.y].join('-');
+    const hashResult = hash512(seed, str);
+    if (hashResult.array[0] >= LOCATION_EXISTS_THRESHOLD) {
+        return LocationType.EMPTY;
+    }
+    if (hashResult.array[1] < 96) {
+        return LocationType.PLANET;
+    }
+    else if (hashResult.array[1] < 176) {
+        return LocationType.ASTEROID;
+    }
+    return LocationType.NEBULA;
+}
+function isExtractableLocation(locationType) {
+    return locationType === LocationType.ASTEROID || locationType === LocationType.NEBULA;
+}
 function getSystemName(gameSeed, location) {
     const seed = Checksum256.from(gameSeed);
     if (!hasSystem(seed, location)) {
@@ -2645,9 +2979,82 @@ function getSystemName(gameSeed, location) {
     return name.join('');
 }
 function hasSystem(gameSeed, coordinates) {
+    return getLocationType(gameSeed, coordinates) !== LocationType.EMPTY;
+}
+function deriveLocationStatic(gameSeed, coordinates) {
     const seed = Checksum256.from(gameSeed);
-    const str = ['system', coordinates.x, coordinates.y].join('-');
-    return String(hash512(seed, str)).slice(0, 2) === '00';
+    const coords = Coordinates.from(coordinates);
+    const str = `system-${coords.x}-${coords.y}`;
+    const hashResult = hash512(seed, str);
+    const loc = Types.location_static.from({
+        coords: coords,
+        type: LocationType.EMPTY,
+        subtype: 0,
+        seed0: 0,
+        seed1: 0,
+    });
+    if (hashResult.array[0] >= LOCATION_EXISTS_THRESHOLD) {
+        return loc;
+    }
+    if (hashResult.array[1] < 96) {
+        loc.type = UInt8.from(LocationType.PLANET);
+    }
+    else if (hashResult.array[1] < 176) {
+        loc.type = UInt8.from(LocationType.ASTEROID);
+    }
+    else {
+        loc.type = UInt8.from(LocationType.NEBULA);
+    }
+    loc.subtype = UInt8.from(hashResult.array[2]);
+    loc.seed0 = UInt8.from(hashResult.array[3]);
+    loc.seed1 = UInt8.from(hashResult.array[4]);
+    return loc;
+}
+function deriveLocationEpoch(epochSeed, coordinates) {
+    const seed = Checksum256.from(epochSeed);
+    const coords = Coordinates.from(coordinates);
+    const str = `system-epoch-${coords.x}-${coords.y}`;
+    const hashResult = hash512(seed, str);
+    return Types.location_epoch.from({
+        active: hashResult.array[0] < LOCATION_ACTIVE_THRESHOLD,
+        seed0: hashResult.array[1],
+        seed1: hashResult.array[2],
+    });
+}
+function deriveLocation(gameSeed, epochSeed, coordinates) {
+    return Types.location_derived.from({
+        static_props: deriveLocationStatic(gameSeed, coordinates),
+        epoch_props: deriveLocationEpoch(epochSeed, coordinates),
+    });
+}
+function deriveLocationMixture(location, epochSeed) {
+    const locationType = location.static_props.type.toNumber();
+    if (locationType === LocationType.NEBULA) {
+        return Types.mixture_info.from({
+            components: [{ good_id: 1, purity: PRECISION }],
+        });
+    }
+    if (locationType === LocationType.ASTEROID) {
+        const seed = Checksum256.from(epochSeed);
+        const coords = location.static_props.coords;
+        const str = `mixture-${coords.x}-${coords.y}`;
+        const hashResult = hash512(seed, str);
+        const ironPrimary = location.static_props.subtype.toNumber() % 2 === 0;
+        const purityRange = 0.3;
+        const purityRoll = hashResult.array[0] / 255;
+        const primaryPurity = 0.5 + purityRoll * purityRange;
+        const primaryId = ironPrimary ? 26 : 29;
+        const secondaryId = ironPrimary ? 29 : 26;
+        const primaryAmt = Math.floor(primaryPurity * PRECISION);
+        const secondaryAmt = PRECISION - primaryAmt;
+        return Types.mixture_info.from({
+            components: [
+                { good_id: primaryId, purity: primaryAmt },
+                { good_id: secondaryId, purity: secondaryAmt },
+            ],
+        });
+    }
+    return Types.mixture_info.from({ components: [] });
 }
 
 class GameState extends Types.state_row {
@@ -2752,14 +3159,14 @@ var goodsData = [
 		mass: 15000
 	},
 	{
-		id: 2,
+		id: 26,
 		name: "Iron",
 		description: "A versatile metal used in construction and manufacturing.",
 		base_price: 125,
 		mass: 40000
 	},
 	{
-		id: 3,
+		id: 29,
 		name: "Copper",
 		description: "A conductive metal vital for electronics and wiring.",
 		base_price: 200,
@@ -2850,7 +3257,7 @@ function calc_flighttime(distance, acceleration) {
     return UInt32.from(2 * Math.sqrt(Number(distance) / acceleration));
 }
 function calc_loader_flighttime(ship, mass, altitude) {
-    const z = altitude ?? ship.location.z?.toNumber() ?? calc_orbital_altitude(Number(mass));
+    const z = altitude ?? ship.coordinates.z?.toNumber() ?? calc_orbital_altitude(Number(mass));
     return calc_flighttime(z, calc_loader_acceleration(ship, mass));
 }
 function calc_loader_acceleration(ship, mass) {
@@ -2868,7 +3275,7 @@ function calc_acceleration(thrust, mass) {
 }
 function calc_ship_mass(ship, cargos) {
     const mass = UInt64.from(0);
-    mass.add(ship.mass);
+    mass.add(ship.hullmass);
     if (ship.loaders.quantity.gt(UInt32.zero)) {
         mass.add(ship.loaders.mass.multiplying(ship.loaders.quantity));
     }
@@ -2972,17 +3379,56 @@ function estimateTravelTime(ship, travelMass, distance, options = {}) {
     };
 }
 function estimateDealTravelTime(ship, shipMass, distance, loadMass) {
-    const needsRecharge = !hasEnergyForDistance(ship, distance);
+    const needsRecharge = !hasEnergyForDistance$1(ship, distance);
     const estimate = estimateTravelTime(ship, shipMass, distance, {
         needsRecharge,
         loadMass,
     });
     return estimate.total;
 }
-function hasEnergyForDistance(ship, distance) {
+function hasEnergyForDistance$1(ship, distance) {
     const energyNeeded = UInt64.from(distance).dividing(PRECISION).multiplying(ship.engines.drain);
     return UInt64.from(ship.energy).gte(energyNeeded);
 }
+function getFlightOrigin(entity, flightTaskIndex) {
+    if (!entity.schedule)
+        return entity.coordinates;
+    let origin = entity.coordinates;
+    for (let i = 0; i < flightTaskIndex && i < entity.schedule.tasks.length; i++) {
+        const task = entity.schedule.tasks[i];
+        if (task.type.equals(TaskType.TRAVEL) && task.coordinates) {
+            origin = task.coordinates;
+        }
+    }
+    return origin;
+}
+function getDestinationLocation(entity) {
+    if (!entity.schedule)
+        return undefined;
+    for (let i = entity.schedule.tasks.length - 1; i >= 0; i--) {
+        const task = entity.schedule.tasks[i];
+        if (task.type.equals(TaskType.TRAVEL) && task.coordinates) {
+            return task.coordinates;
+        }
+    }
+    return undefined;
+}
+function getPositionAt(entity, taskIndex, taskProgress) {
+    if (!entity.schedule || entity.schedule.tasks.length === 0 || taskIndex < 0) {
+        return entity.coordinates;
+    }
+    const task = entity.schedule.tasks[taskIndex];
+    if (!task.type.equals(TaskType.TRAVEL) || !task.coordinates) {
+        return getFlightOrigin(entity, taskIndex);
+    }
+    const origin = getFlightOrigin(entity, taskIndex);
+    const destination = task.coordinates;
+    const interpolated = lerp(origin, destination, taskProgress);
+    return {
+        x: Math.round(interpolated.x),
+        y: Math.round(interpolated.y),
+    };
+}
 function calc_transfer_duration(source, dest, cargoMass) {
     if (cargoMass === 0) {
         return 0;
@@ -3030,194 +3476,128 @@ function calc_transfer_duration(source, dest, cargoMass) {
     return Math.floor(flightTime / totalQuantity);
 }
 
-class Location {
-    constructor(coordinates) {
-        this.coordinates = Coordinates.from(coordinates);
+function capsHasMovement(caps) {
+    return caps.engines !== undefined && caps.generator !== undefined;
+}
+function capsHasStorage(caps) {
+    return caps.capacity !== undefined;
+}
+function capsHasLoaders(caps) {
+    return caps.loaders !== undefined;
+}
+function capsHasTrade(caps) {
+    return caps.trade !== undefined;
+}
+function capsHasExtractor(caps) {
+    return caps.extractor !== undefined;
+}
+function capsHasMass(caps) {
+    return caps.hullmass !== undefined;
+}
+
+function calcCargoMass(entity) {
+    let mass = UInt64.from(0);
+    for (const item of entity.cargo) {
+        const good = getGood(item.good_id);
+        mass = mass.adding(good.mass.multiplying(item.quantity));
     }
-    static from(coordinates) {
-        return new Location(Coordinates.from(coordinates));
+    return mass;
+}
+function calcCargoValue(entity) {
+    let value = UInt64.from(0);
+    for (const item of entity.cargo) {
+        value = value.adding(item.unit_cost.multiplying(item.quantity));
     }
-    hasSystemAt(gameSeed) {
-        const seed = Checksum256.from(gameSeed);
-        if (this._hasSystem === undefined || !this._gameSeed?.equals(seed)) {
-            this._gameSeed = seed;
-            this._hasSystem = hasSystem(seed, this.coordinates);
+    return value;
+}
+function availableCapacity$1(entity) {
+    const cargoMass = calcCargoMass(entity);
+    return entity.capacity.gt(cargoMass)
+        ? UInt64.from(entity.capacity).subtracting(cargoMass)
+        : UInt64.from(0);
+}
+function availableCapacityFromMass(capacity, cargoMass) {
+    const cap = UInt64.from(capacity);
+    const mass = UInt64.from(cargoMass);
+    return cap.gt(mass) ? cap.subtracting(mass) : UInt64.from(0);
+}
+function hasSpace$1(entity, goodMass, quantity) {
+    const additional = goodMass.multiplying(quantity);
+    return availableCapacity$1(entity).gte(additional);
+}
+function hasSpaceForMass(capacity, currentMass, additionalMass) {
+    return UInt64.from(currentMass).adding(additionalMass).lte(capacity);
+}
+function isFull$1(entity) {
+    return UInt64.from(entity.cargomass).gte(entity.capacity);
+}
+function isFullFromMass(capacity, cargoMass) {
+    return UInt64.from(cargoMass).gte(capacity);
+}
+
+function hasSchedule$1(entity) {
+    return !!entity.schedule && entity.schedule.tasks.length > 0;
+}
+function isIdle(entity) {
+    return !hasSchedule$1(entity);
+}
+function getTasks(entity) {
+    return entity.schedule?.tasks || [];
+}
+function scheduleDuration(entity) {
+    if (!entity.schedule)
+        return 0;
+    return entity.schedule.tasks.reduce((sum, task) => sum + task.duration.toNumber(), 0);
+}
+function scheduleElapsed(entity, now) {
+    if (!entity.schedule)
+        return 0;
+    const started = entity.schedule.started.toDate();
+    const elapsed = Math.floor((now.getTime() - started.getTime()) / 1000);
+    return Math.max(0, elapsed);
+}
+function scheduleRemaining(entity, now) {
+    if (!entity.schedule)
+        return 0;
+    const duration = scheduleDuration(entity);
+    const elapsed = scheduleElapsed(entity, now);
+    return Math.max(0, duration - elapsed);
+}
+function scheduleComplete(entity, now) {
+    return hasSchedule$1(entity) && scheduleRemaining(entity, now) === 0;
+}
+function currentTaskIndex(entity, now) {
+    if (!entity.schedule || entity.schedule.tasks.length === 0)
+        return -1;
+    const elapsed = scheduleElapsed(entity, now);
+    let timeAccum = 0;
+    for (let i = 0; i < entity.schedule.tasks.length; i++) {
+        const taskDuration = entity.schedule.tasks[i].duration.toNumber();
+        if (elapsed < timeAccum + taskDuration) {
+            return i;
         }
-        return this._hasSystem;
-    }
-    setMarketPrices(prices) {
-        this._marketPrices = prices;
-    }
-    get marketPrices() {
-        return this._marketPrices;
-    }
-    getPrice(goodId) {
-        if (!this._marketPrices)
-            return undefined;
-        return this._marketPrices.find((p) => p.id.equals(goodId));
-    }
-    findNearby(gameSeed, maxDistance = 20) {
-        return findNearbyPlanets(Checksum256.from(gameSeed), this.coordinates, maxDistance);
-    }
-    equals(other) {
-        const otherCoords = other instanceof Location ? other.coordinates : Coordinates.from(other);
-        return this.coordinates.equals(otherCoords);
-    }
-    setLocationRows(rows, epoch) {
-        this._locationRows = rows;
-        this._epoch = epoch;
+        timeAccum += taskDuration;
     }
-    get locationRows() {
-        return this._locationRows;
-    }
-    getSupply(goodId) {
-        if (!this._locationRows)
-            return undefined;
-        const row = this._locationRows.find((r) => r.good_id.equals(goodId) && this._epoch && r.epoch.equals(this._epoch));
-        return row ? row.supply : undefined;
-    }
-    get availableGoods() {
-        if (!this._locationRows)
-            return undefined;
-        return this._locationRows.filter((r) => this._epoch && r.epoch.equals(this._epoch) && r.supply.gt(UInt16.from(0)));
-    }
-    hasGood(goodId) {
-        const supply = this.getSupply(goodId);
-        return supply !== undefined && supply.gt(UInt16.from(0));
-    }
-    get epoch() {
-        return this._epoch;
-    }
-    get hasCachedData() {
-        return this._marketPrices !== undefined || this._locationRows !== undefined;
-    }
-    get hasSupplyData() {
-        return this._locationRows !== undefined;
-    }
-    clearCache() {
-        this._marketPrices = undefined;
-        this._locationRows = undefined;
-        this._epoch = undefined;
-    }
-    withUpdatedSupply(goodId, quantityDelta) {
-        const newLocation = Location.from(this.coordinates);
-        if (this._marketPrices) {
-            newLocation._marketPrices = this._marketPrices.map((price) => {
-                if (price.id.equals(goodId)) {
-                    const currentSupply = UInt16.from(price.supply);
-                    const delta = UInt16.from(Math.abs(quantityDelta));
-                    const newSupply = quantityDelta < 0
-                        ? currentSupply.gte(delta)
-                            ? currentSupply.subtracting(delta)
-                            : UInt16.from(0)
-                        : currentSupply.adding(quantityDelta);
-                    return GoodPrice.from({
-                        id: price.id,
-                        good: price.good,
-                        price: price.price,
-                        supply: newSupply,
-                    });
-                }
-                return price;
-            });
-        }
-        if (this._locationRows && this._epoch) {
-            newLocation._locationRows = this._locationRows.map((row) => {
-                if (row.good_id.equals(goodId) && row.epoch.equals(this._epoch)) {
-                    const currentSupply = UInt16.from(row.supply);
-                    const delta = UInt16.from(Math.abs(quantityDelta));
-                    const newSupply = quantityDelta < 0
-                        ? currentSupply.gte(delta)
-                            ? currentSupply.subtracting(delta)
-                            : UInt16.from(0)
-                        : currentSupply.adding(quantityDelta);
-                    return Types.location_row.from({
-                        id: row.id,
-                        coordinates: row.coordinates,
-                        epoch: row.epoch,
-                        good_id: row.good_id,
-                        supply: newSupply,
-                    });
-                }
-                return row;
-            });
-            newLocation._epoch = this._epoch;
-        }
-        newLocation._gameSeed = this._gameSeed;
-        newLocation._hasSystem = this._hasSystem;
-        return newLocation;
-    }
-}
-function toLocation(coords) {
-    if (coords instanceof Location) {
-        return coords;
-    }
-    return Location.from(coords);
-}
-
-function hasSchedule(entity) {
-    return !!entity.schedule && entity.schedule.tasks.length > 0;
-}
-function isIdle(entity) {
-    return !hasSchedule(entity);
-}
-function getTasks(entity) {
-    return entity.schedule?.tasks || [];
-}
-function scheduleDuration(entity) {
-    if (!entity.schedule)
-        return 0;
-    return entity.schedule.tasks.reduce((sum, task) => sum + task.duration.toNumber(), 0);
-}
-function scheduleElapsed(entity, now) {
-    if (!entity.schedule)
-        return 0;
-    const started = entity.schedule.started.toDate();
-    const elapsed = Math.floor((now.getTime() - started.getTime()) / 1000);
-    return Math.max(0, elapsed);
-}
-function scheduleRemaining(entity, now) {
-    if (!entity.schedule)
-        return 0;
-    const duration = scheduleDuration(entity);
-    const elapsed = scheduleElapsed(entity, now);
-    return Math.max(0, duration - elapsed);
-}
-function scheduleComplete(entity, now) {
-    return hasSchedule(entity) && scheduleRemaining(entity, now) === 0;
-}
-function currentTaskIndex(entity, now) {
-    if (!entity.schedule || entity.schedule.tasks.length === 0)
-        return -1;
-    const elapsed = scheduleElapsed(entity, now);
-    let timeAccum = 0;
-    for (let i = 0; i < entity.schedule.tasks.length; i++) {
-        const taskDuration = entity.schedule.tasks[i].duration.toNumber();
-        if (elapsed < timeAccum + taskDuration) {
-            return i;
-        }
-        timeAccum += taskDuration;
-    }
-    return entity.schedule.tasks.length - 1;
-}
-function currentTask(entity, now) {
-    const index = currentTaskIndex(entity, now);
-    if (index < 0 || !entity.schedule)
-        return undefined;
-    return entity.schedule.tasks[index];
-}
-function currentTaskType(entity, now) {
-    const task = currentTask(entity, now);
-    if (!task)
-        return undefined;
-    return task.type.toNumber();
-}
-function getTaskStartTime(entity, index) {
-    if (!entity.schedule || index < 0 || index >= entity.schedule.tasks.length)
-        return 0;
-    let timeAccum = 0;
-    for (let i = 0; i < index; i++) {
-        timeAccum += entity.schedule.tasks[i].duration.toNumber();
+    return entity.schedule.tasks.length - 1;
+}
+function currentTask(entity, now) {
+    const index = currentTaskIndex(entity, now);
+    if (index < 0 || !entity.schedule)
+        return undefined;
+    return entity.schedule.tasks[index];
+}
+function currentTaskType(entity, now) {
+    const task = currentTask(entity, now);
+    if (!task)
+        return undefined;
+    return task.type.toNumber();
+}
+function getTaskStartTime(entity, index) {
+    if (!entity.schedule || index < 0 || index >= entity.schedule.tasks.length)
+        return 0;
+    let timeAccum = 0;
+    for (let i = 0; i < index; i++) {
+        timeAccum += entity.schedule.tasks[i].duration.toNumber();
     }
     return timeAccum;
 }
@@ -3267,14 +3647,32 @@ function currentTaskProgress(entity, now) {
 function scheduleProgress(entity, now) {
     const duration = scheduleDuration(entity);
     if (duration === 0)
-        return hasSchedule(entity) ? 1 : 0;
+        return hasSchedule$1(entity) ? 1 : 0;
     const elapsed = scheduleElapsed(entity, now);
     return Math.min(1, elapsed / duration);
 }
+function isTaskType(entity, taskType, now) {
+    return currentTaskType(entity, now) === taskType;
+}
+function isInFlight(entity, now) {
+    return isTaskType(entity, TaskType.TRAVEL, now);
+}
+function isRecharging(entity, now) {
+    return isTaskType(entity, TaskType.RECHARGE, now);
+}
+function isLoading(entity, now) {
+    return isTaskType(entity, TaskType.LOAD, now);
+}
+function isUnloading(entity, now) {
+    return isTaskType(entity, TaskType.UNLOAD, now);
+}
+function isExtracting(entity, now) {
+    return isTaskType(entity, TaskType.EXTRACT, now);
+}
 
 var schedule = /*#__PURE__*/Object.freeze({
     __proto__: null,
-    hasSchedule: hasSchedule,
+    hasSchedule: hasSchedule$1,
     isIdle: isIdle,
     getTasks: getTasks,
     scheduleDuration: scheduleDuration,
@@ -3290,353 +3688,654 @@ var schedule = /*#__PURE__*/Object.freeze({
     isTaskComplete: isTaskComplete,
     isTaskInProgress: isTaskInProgress,
     currentTaskProgress: currentTaskProgress,
-    scheduleProgress: scheduleProgress
+    scheduleProgress: scheduleProgress,
+    isTaskType: isTaskType,
+    isInFlight: isInFlight,
+    isRecharging: isRecharging,
+    isLoading: isLoading,
+    isUnloading: isUnloading,
+    isExtracting: isExtracting
 });
 
-class EntityInventory extends Types.cargo_item {
-    get good() {
-        if (!this._good) {
-            this._good = getGood(this.good_id);
-        }
-        return this._good;
-    }
-    get name() {
-        return this.good.name;
-    }
-    get unitMass() {
-        return this.good.mass;
+function getHullMass(entity) {
+    return UInt32.from(entity.hullmass ?? 0);
+}
+function createProjectedEntity(entity) {
+    const cargoMass = calcCargoMass(entity);
+    const shipMass = getHullMass(entity);
+    const loaders = entity.loaders;
+    const engines = entity.engines;
+    const generator = entity.generator;
+    const trade = entity.trade;
+    const capacity = entity.capacity;
+    const projected = {
+        location: Coordinates.from(entity.coordinates),
+        energy: UInt16.from(entity.energy ?? 0),
+        cargoMass,
+        shipMass,
+        capacity: capacity ? UInt64.from(capacity) : undefined,
+        engines,
+        generator,
+        loaders,
+        trade,
+        get totalMass() {
+            let mass = UInt64.from(this.shipMass).adding(this.cargoMass);
+            if (this.loaders) {
+                mass = mass.adding(this.loaders.mass.multiplying(this.loaders.quantity));
+            }
+            return mass;
+        },
+        hasMovement() {
+            return capsHasMovement(this.capabilities());
+        },
+        hasStorage() {
+            return capsHasStorage(this.capabilities());
+        },
+        hasLoaders() {
+            return capsHasLoaders(this.capabilities());
+        },
+        hasTrade() {
+            return this.trade !== undefined;
+        },
+        capabilities() {
+            return {
+                hullmass: this.shipMass,
+                capacity: this.capacity ? UInt32.from(this.capacity) : undefined,
+                engines: this.engines,
+                generator: this.generator,
+                loaders: this.loaders,
+                trade: this.trade,
+            };
+        },
+        state() {
+            return {
+                owner: entity.owner ?? Name.from(''),
+                location: Types.coordinates.from(this.location),
+                energy: this.energy,
+                cargomass: UInt32.from(this.cargoMass),
+                cargo: entity.cargo,
+            };
+        },
+    };
+    return projected;
+}
+function applyRechargeTask(projected, _task, options) {
+    if (!projected.generator)
+        return;
+    if (options.complete) {
+        projected.energy = UInt16.from(projected.generator.capacity);
     }
-    get totalMass() {
-        return UInt64.from(this.unitMass).multiplying(this.quantity);
+    else if (options.progress !== undefined) {
+        const capacity = Number(projected.generator.capacity);
+        const currentEnergy = Number(projected.energy);
+        const rechargeAmount = (capacity - currentEnergy) * options.progress;
+        projected.energy = UInt16.from(Math.min(capacity, currentEnergy + rechargeAmount));
     }
-    get totalCost() {
-        return this.unit_cost.multiplying(this.quantity);
+}
+function applyFlightTask(projected, task, options) {
+    if (!task.coordinates || !projected.engines)
+        return;
+    const origin = projected.location;
+    const destination = Coordinates.from(task.coordinates);
+    const distance = distanceBetweenCoordinates(origin, task.coordinates);
+    const energyUsage = distance.dividing(PRECISION).multiplying(projected.engines.drain);
+    if (options.complete) {
+        projected.energy = projected.energy.gt(energyUsage)
+            ? UInt16.from(projected.energy.subtracting(energyUsage))
+            : UInt16.from(0);
+        projected.location = destination;
     }
-    get hasCargo() {
-        return UInt32.from(this.quantity).gt(UInt32.from(0));
+    else if (options.progress !== undefined) {
+        const interpolated = lerp(origin, destination, options.progress);
+        projected.location = Coordinates.from({
+            x: Math.round(interpolated.x),
+            y: Math.round(interpolated.y),
+        });
+        const partialEnergy = UInt64.from(Math.floor(Number(energyUsage) * options.progress));
+        projected.energy = projected.energy.gt(partialEnergy)
+            ? UInt16.from(projected.energy.subtracting(partialEnergy))
+            : UInt16.from(0);
     }
-    get isEmpty() {
-        return UInt32.from(this.quantity).equals(UInt32.from(0));
+}
+function getGoodMass(good_id) {
+    const good = getGood(good_id);
+    return good.mass;
+}
+function applyLoadTask(projected, task) {
+    for (const item of task.cargo) {
+        const good_mass = getGoodMass(item.good_id);
+        projected.cargoMass = projected.cargoMass.adding(good_mass.multiplying(item.quantity));
     }
 }
-
-class Ship extends Types.entity_info {
-    static fromState(state) {
-        const entityInfo = Types.entity_info.from({
-            type: Name.from('ship'),
-            id: UInt64.from(state.id),
-            owner: Name.from(state.owner),
-            entity_name: state.name,
-            location: Types.coordinates.from(state.location),
-            mass: UInt32.from(state.mass),
-            capacity: UInt32.from(state.capacity),
-            energy: UInt16.from(state.energy),
-            cargomass: UInt32.from(0),
-            cargo: state.cargo || [],
-            is_idle: !state.schedule,
-            current_task_elapsed: UInt32.from(0),
-            current_task_remaining: UInt32.from(0),
-            pending_tasks: [],
-            engines: state.engines,
-            generator: state.generator,
-            loaders: state.loaders,
-            schedule: state.schedule,
-        });
-        return new Ship(entityInfo);
+function applyUnloadTask(projected, task) {
+    for (const item of task.cargo) {
+        const good_mass = getGoodMass(item.good_id);
+        const cargoMass = good_mass.multiplying(item.quantity);
+        projected.cargoMass = projected.cargoMass.gt(cargoMass)
+            ? projected.cargoMass.subtracting(cargoMass)
+            : UInt64.from(0);
     }
-    get name() {
-        return this.entity_name;
+}
+function applyExtractTask(projected, task, options) {
+    if (!options.complete)
+        return;
+    if (task.energy_cost) {
+        const energyCost = UInt16.from(task.energy_cost);
+        projected.energy = projected.energy.gt(energyCost)
+            ? UInt16.from(projected.energy.subtracting(energyCost))
+            : UInt16.from(0);
     }
-    get inventory() {
-        if (!this._inventory) {
-            this._inventory = this.cargo.map((item) => new EntityInventory(item));
-        }
-        return this._inventory;
+    for (const item of task.cargo) {
+        const good_mass = getGoodMass(item.good_id);
+        projected.cargoMass = projected.cargoMass.adding(good_mass.multiplying(item.quantity));
     }
-    get maxDistance() {
-        if (!this.generator || !this.engines)
-            return UInt32.from(0);
-        return UInt32.from(this.generator.capacity)
-            .dividing(this.engines.drain)
-            .multiplying(PRECISION);
+}
+function projectEntity(entity) {
+    const projected = createProjectedEntity(entity);
+    if (!entity.schedule) {
+        return projected;
     }
-    get hasSchedule() {
-        return hasSchedule(this);
+    for (const task of entity.schedule.tasks) {
+        switch (task.type.toNumber()) {
+            case TaskType.RECHARGE:
+                applyRechargeTask(projected, task, { complete: true });
+                break;
+            case TaskType.TRAVEL:
+                applyFlightTask(projected, task, { complete: true });
+                break;
+            case TaskType.LOAD:
+                applyLoadTask(projected, task);
+                break;
+            case TaskType.UNLOAD:
+                applyUnloadTask(projected, task);
+                break;
+            case TaskType.EXTRACT:
+                applyExtractTask(projected, task, { complete: true });
+                break;
+        }
+    }
+    return projected;
+}
+function projectEntityAt(entity, now) {
+    const projected = createProjectedEntity(entity);
+    if (!entity.schedule || entity.schedule.tasks.length === 0) {
+        return projected;
+    }
+    for (let i = 0; i < entity.schedule.tasks.length; i++) {
+        const task = entity.schedule.tasks[i];
+        const taskComplete = isTaskComplete(entity, i, now);
+        const taskInProgress = isTaskInProgress(entity, i, now);
+        if (!taskComplete && !taskInProgress) {
+            break;
+        }
+        const progress = taskInProgress
+            ? getTaskElapsed(entity, i, now) / task.duration.toNumber()
+            : undefined;
+        switch (task.type.toNumber()) {
+            case TaskType.RECHARGE:
+                applyRechargeTask(projected, task, { complete: taskComplete, progress });
+                break;
+            case TaskType.TRAVEL:
+                applyFlightTask(projected, task, { complete: taskComplete, progress });
+                break;
+            case TaskType.LOAD:
+                if (taskComplete) {
+                    applyLoadTask(projected, task);
+                }
+                break;
+            case TaskType.UNLOAD:
+                if (taskComplete) {
+                    applyUnloadTask(projected, task);
+                }
+                break;
+            case TaskType.EXTRACT:
+                if (taskComplete) {
+                    applyExtractTask(projected, task, { complete: true });
+                }
+                break;
+        }
+    }
+    return projected;
+}
+
+class Location {
+    constructor(coordinates) {
+        this.coordinates = Coordinates.from(coordinates);
+    }
+    static from(coordinates) {
+        return new Location(Coordinates.from(coordinates));
+    }
+    hasSystemAt(gameSeed) {
+        const seed = Checksum256.from(gameSeed);
+        if (this._hasSystem === undefined || !this._gameSeed?.equals(seed)) {
+            this._gameSeed = seed;
+            this._hasSystem = hasSystem(seed, this.coordinates);
+        }
+        return this._hasSystem;
+    }
+    getLocationTypeAt(gameSeed) {
+        return getLocationType(gameSeed, this.coordinates);
+    }
+    isExtractableAt(gameSeed) {
+        return isExtractableLocation(this.getLocationTypeAt(gameSeed));
+    }
+    setMarketPrices(prices) {
+        this._marketPrices = prices;
+    }
+    get marketPrices() {
+        return this._marketPrices;
+    }
+    getPrice(goodId) {
+        if (!this._marketPrices)
+            return undefined;
+        return this._marketPrices.find((p) => p.id.equals(goodId));
+    }
+    findNearby(gameSeed, maxDistance = 20) {
+        return findNearbyPlanets(Checksum256.from(gameSeed), this.coordinates, maxDistance);
+    }
+    equals(other) {
+        const otherCoords = other instanceof Location ? other.coordinates : Coordinates.from(other);
+        return this.coordinates.equals(otherCoords);
+    }
+    setLocationRows(rows, epoch) {
+        this._locationRows = rows;
+        this._epoch = epoch;
+    }
+    get locationRows() {
+        return this._locationRows;
+    }
+    getSupply(goodId) {
+        if (!this._locationRows)
+            return undefined;
+        const row = this._locationRows.find((r) => r.good_id.equals(goodId) && this._epoch && r.epoch.equals(this._epoch));
+        return row ? row.supply : undefined;
+    }
+    get availableGoods() {
+        if (!this._locationRows)
+            return undefined;
+        return this._locationRows.filter((r) => this._epoch && r.epoch.equals(this._epoch) && r.supply.gt(UInt16.from(0)));
+    }
+    hasGood(goodId) {
+        const supply = this.getSupply(goodId);
+        return supply !== undefined && supply.gt(UInt16.from(0));
+    }
+    get epoch() {
+        return this._epoch;
+    }
+    get hasCachedData() {
+        return this._marketPrices !== undefined || this._locationRows !== undefined;
+    }
+    get hasSupplyData() {
+        return this._locationRows !== undefined;
+    }
+    clearCache() {
+        this._marketPrices = undefined;
+        this._locationRows = undefined;
+        this._epoch = undefined;
+    }
+    withUpdatedSupply(goodId, quantityDelta) {
+        const newLocation = Location.from(this.coordinates);
+        if (this._marketPrices) {
+            newLocation._marketPrices = this._marketPrices.map((price) => {
+                if (price.id.equals(goodId)) {
+                    const currentSupply = UInt16.from(price.supply);
+                    const delta = UInt16.from(Math.abs(quantityDelta));
+                    const newSupply = quantityDelta < 0
+                        ? currentSupply.gte(delta)
+                            ? currentSupply.subtracting(delta)
+                            : UInt16.from(0)
+                        : currentSupply.adding(quantityDelta);
+                    return GoodPrice.from({
+                        id: price.id,
+                        good: price.good,
+                        price: price.price,
+                        supply: newSupply,
+                    });
+                }
+                return price;
+            });
+        }
+        if (this._locationRows && this._epoch) {
+            newLocation._locationRows = this._locationRows.map((row) => {
+                if (row.good_id.equals(goodId) && row.epoch.equals(this._epoch)) {
+                    const currentSupply = UInt16.from(row.supply);
+                    const delta = UInt16.from(Math.abs(quantityDelta));
+                    const newSupply = quantityDelta < 0
+                        ? currentSupply.gte(delta)
+                            ? currentSupply.subtracting(delta)
+                            : UInt16.from(0)
+                        : currentSupply.adding(quantityDelta);
+                    return Types.supply_row.from({
+                        id: row.id,
+                        coordinates: row.coordinates,
+                        epoch: row.epoch,
+                        good_id: row.good_id,
+                        supply: newSupply,
+                    });
+                }
+                return row;
+            });
+            newLocation._epoch = this._epoch;
+        }
+        newLocation._gameSeed = this._gameSeed;
+        newLocation._hasSystem = this._hasSystem;
+        return newLocation;
+    }
+}
+function toLocation(coords) {
+    if (coords instanceof Location) {
+        return coords;
+    }
+    return Location.from(coords);
+}
+
+class ScheduleAccessor {
+    constructor(entity) {
+        this.entity = entity;
+    }
+    get hasSchedule() {
+        return hasSchedule$1(this.entity);
     }
     get isIdle() {
-        return this.is_idle;
+        return isIdle(this.entity);
     }
     get tasks() {
-        return getTasks(this);
+        return getTasks(this.entity);
     }
-    scheduleDuration() {
-        return scheduleDuration(this);
+    duration() {
+        return scheduleDuration(this.entity);
     }
-    scheduleElapsed(now) {
-        return scheduleElapsed(this, now);
+    elapsed(now) {
+        return scheduleElapsed(this.entity, now);
     }
-    scheduleRemaining(now) {
-        return scheduleRemaining(this, now);
+    remaining(now) {
+        return scheduleRemaining(this.entity, now);
     }
-    scheduleComplete(now) {
-        return scheduleComplete(this, now);
+    complete(now) {
+        return scheduleComplete(this.entity, now);
     }
     currentTaskIndex(now) {
-        return currentTaskIndex(this, now);
+        return currentTaskIndex(this.entity, now);
     }
     currentTask(now) {
-        return currentTask(this, now);
+        return currentTask(this.entity, now);
     }
     currentTaskType(now) {
-        return currentTaskType(this, now);
+        return currentTaskType(this.entity, now);
     }
-    getTaskStartTime(index) {
-        return getTaskStartTime(this, index);
+    taskStartTime(index) {
+        return getTaskStartTime(this.entity, index);
     }
-    getTaskElapsed(index, now) {
-        return getTaskElapsed(this, index, now);
+    taskElapsed(index, now) {
+        return getTaskElapsed(this.entity, index, now);
     }
-    getTaskRemaining(index, now) {
-        return getTaskRemaining(this, index, now);
+    taskRemaining(index, now) {
+        return getTaskRemaining(this.entity, index, now);
     }
-    isTaskComplete(index, now) {
-        return isTaskComplete(this, index, now);
+    taskComplete(index, now) {
+        return isTaskComplete(this.entity, index, now);
     }
-    isTaskInProgress(index, now) {
-        return isTaskInProgress(this, index, now);
+    taskInProgress(index, now) {
+        return isTaskInProgress(this.entity, index, now);
     }
     currentTaskProgress(now) {
-        return currentTaskProgress(this, now);
+        return currentTaskProgress(this.entity, now);
     }
-    scheduleProgress(now) {
-        return scheduleProgress(this, now);
+    progress(now) {
+        return scheduleProgress(this.entity, now);
     }
-    getFlightOrigin(flightTaskIndex) {
-        if (!this.schedule)
-            return this.location;
-        let origin = this.location;
-        for (let i = 0; i < flightTaskIndex && i < this.schedule.tasks.length; i++) {
-            const task = this.schedule.tasks[i];
-            if (task.type.equals(TaskType.FLIGHT) && task.location) {
-                origin = task.location;
-            }
+}
+function createScheduleAccessor(entity) {
+    return new ScheduleAccessor(entity);
+}
+
+class EntityInventory extends Types.cargo_item {
+    get good() {
+        if (!this._good) {
+            this._good = getGood(this.good_id);
         }
-        return origin;
+        return this._good;
     }
-    destinationLocation() {
-        if (!this.schedule)
-            return undefined;
-        for (let i = this.schedule.tasks.length - 1; i >= 0; i--) {
-            const task = this.schedule.tasks[i];
-            if (task.type.equals(TaskType.FLIGHT) && task.location) {
-                return task.location;
-            }
+    get name() {
+        return this.good.name;
+    }
+    get unitMass() {
+        return this.good.mass;
+    }
+    get totalMass() {
+        return UInt64.from(this.unitMass).multiplying(this.quantity);
+    }
+    get totalCost() {
+        return this.unit_cost.multiplying(this.quantity);
+    }
+    get hasCargo() {
+        return UInt32.from(this.quantity).gt(UInt32.from(0));
+    }
+    get isEmpty() {
+        return UInt32.from(this.quantity).equals(UInt32.from(0));
+    }
+}
+
+class InventoryAccessor {
+    constructor(entity) {
+        this.entity = entity;
+    }
+    get items() {
+        if (!this._items) {
+            this._items = this.entity.cargo.map((item) => new EntityInventory(item));
         }
-        return undefined;
+        return this._items;
     }
-    positionAt(now) {
-        if (!this.schedule || this.schedule.tasks.length === 0) {
-            return this.location;
+    get totalMass() {
+        return this.items.reduce((sum, c) => sum.adding(c.totalMass), UInt64.from(0));
+    }
+    get totalValue() {
+        return this.items.reduce((sum, c) => sum.adding(c.totalCost), UInt64.from(0));
+    }
+    forGood(goodId) {
+        return this.items.find((c) => c.good_id.equals(goodId));
+    }
+    get sellable() {
+        return this.items.filter((c) => c.hasCargo);
+    }
+    get hasSellable() {
+        return this.items.some((c) => c.hasCargo);
+    }
+    get sellableCount() {
+        return this.items.filter((c) => c.hasCargo).length;
+    }
+}
+function createInventoryAccessor(entity) {
+    return new InventoryAccessor(entity);
+}
+
+function maxTravelDistance(entity) {
+    return UInt32.from(entity.generator.capacity)
+        .dividing(entity.engines.drain)
+        .multiplying(PRECISION);
+}
+function calcEnergyUsage(entity, distance) {
+    return distance.dividing(PRECISION).multiplying(entity.engines.drain);
+}
+function hasEnergyForDistance(entity, distance) {
+    const usage = calcEnergyUsage(entity, distance);
+    return UInt64.from(entity.energy).gte(usage);
+}
+function energyPercent(entity) {
+    return (Number(entity.energy) / Number(entity.generator.capacity)) * 100;
+}
+function needsRecharge(entity) {
+    return UInt64.from(entity.energy).lt(entity.generator.capacity);
+}
+
+function totalCargoMass(cargo) {
+    return cargo.reduce((sum, c) => {
+        return sum.adding(c.totalMass);
+    }, UInt64.from(0));
+}
+function cargoValue(cargo) {
+    return cargo.reduce((sum, c) => {
+        return sum.adding(c.totalCost);
+    }, UInt64.from(0));
+}
+function getCargoForGood(cargo, goodId) {
+    return cargo.find((c) => c.good_id.equals(goodId));
+}
+function hasSpace(currentMass, maxCapacity, goodMass, quantity) {
+    const additionalMass = goodMass.multiplying(quantity);
+    const totalMass = currentMass.adding(additionalMass);
+    return totalMass.lte(maxCapacity);
+}
+function availableCapacity(currentMass, maxCapacity) {
+    if (currentMass.gte(maxCapacity)) {
+        return UInt64.from(0);
+    }
+    return maxCapacity.subtracting(currentMass);
+}
+function isFull(currentMass, maxCapacity) {
+    return currentMass.gte(maxCapacity);
+}
+function calculateSaleValue(cargo, prices) {
+    if (cargo.length === 0) {
+        return { revenue: UInt64.from(0), profit: UInt64.from(0), cost: UInt64.from(0) };
+    }
+    let revenue = UInt64.from(0);
+    let cost = UInt64.from(0);
+    for (const item of cargo) {
+        if (UInt32.from(item.quantity).equals(UInt32.from(0)))
+            continue;
+        const goodId = Number(item.good_id);
+        const salePrice = prices.get(goodId);
+        if (salePrice) {
+            revenue = revenue.adding(salePrice.multiplying(item.quantity));
         }
-        const taskIndex = this.currentTaskIndex(now);
-        if (taskIndex < 0)
-            return this.location;
-        const task = this.schedule.tasks[taskIndex];
-        if (!task.type.equals(TaskType.FLIGHT) || !task.location) {
-            return this.getFlightOrigin(taskIndex);
+        cost = cost.adding(item.unit_cost.multiplying(item.quantity));
+    }
+    const profit = revenue.gte(cost) ? revenue.subtracting(cost) : UInt64.from(0);
+    return {
+        revenue,
+        profit,
+        cost,
+    };
+}
+function calculateSaleValueFromArray(cargo, prices) {
+    const priceMap = new Map();
+    prices.forEach((price, index) => {
+        priceMap.set(index, price);
+    });
+    return calculateSaleValue(cargo, priceMap);
+}
+function afterSellGoods(cargo, goodsToSell) {
+    if (cargo.length === 0) {
+        return [];
+    }
+    return cargo.map((item) => {
+        const saleItem = goodsToSell.find((s) => Number(item.good_id) === s.goodId);
+        if (!saleItem) {
+            return new EntityInventory(item);
         }
-        const origin = this.getFlightOrigin(taskIndex);
-        const destination = task.location;
-        const progress = this.currentTaskProgress(now);
-        const interpolated = lerp(origin, destination, progress);
-        return Coordinates.from({
-            x: Math.round(interpolated.x),
-            y: Math.round(interpolated.y),
-        });
+        const currentQty = Number(item.quantity);
+        const newQty = Math.max(0, currentQty - saleItem.quantity);
+        return new EntityInventory(Types.cargo_item.from({
+            good_id: item.good_id,
+            quantity: UInt32.from(newQty),
+            unit_cost: item.unit_cost,
+        }));
+    });
+}
+function afterSellAllGoods(cargo) {
+    if (cargo.length === 0) {
+        return [];
+    }
+    return cargo.map((item) => new EntityInventory(Types.cargo_item.from({
+        good_id: item.good_id,
+        quantity: UInt32.from(0),
+        unit_cost: item.unit_cost,
+    })));
+}
+
+var cargoUtils = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    totalCargoMass: totalCargoMass,
+    cargoValue: cargoValue,
+    getCargoForGood: getCargoForGood,
+    hasSpace: hasSpace,
+    availableCapacity: availableCapacity,
+    isFull: isFull,
+    calculateSaleValue: calculateSaleValue,
+    calculateSaleValueFromArray: calculateSaleValueFromArray,
+    afterSellGoods: afterSellGoods,
+    afterSellAllGoods: afterSellAllGoods
+});
+
+class Ship extends Types.entity_info {
+    get name() {
+        return this.entity_name;
+    }
+    get inv() {
+        return (this._inv ?? (this._inv = new InventoryAccessor(this)));
+    }
+    get inventory() {
+        return this.inv.items;
+    }
+    get sched() {
+        return (this._sched ?? (this._sched = new ScheduleAccessor(this)));
+    }
+    get maxDistance() {
+        if (!this.generator || !this.engines)
+            return UInt32.from(0);
+        return maxTravelDistance(this);
+    }
+    get isIdle() {
+        return this.is_idle;
+    }
+    getFlightOrigin(flightTaskIndex) {
+        return Coordinates.from(getFlightOrigin(this, flightTaskIndex));
+    }
+    destinationLocation() {
+        const dest = getDestinationLocation(this);
+        return dest ? Coordinates.from(dest) : undefined;
+    }
+    positionAt(now) {
+        const taskIndex = this.sched.currentTaskIndex(now);
+        const progress = this.sched.currentTaskProgress(now);
+        return Coordinates.from(getPositionAt(this, taskIndex, progress));
     }
     isInFlight(now) {
-        const taskType = this.currentTaskType(now);
-        return taskType === TaskType.FLIGHT;
+        return isInFlight(this, now);
     }
     isRecharging(now) {
-        const taskType = this.currentTaskType(now);
-        return taskType === TaskType.RECHARGE;
+        return isRecharging(this, now);
     }
     isLoading(now) {
-        const taskType = this.currentTaskType(now);
-        return taskType === TaskType.LOAD;
+        return isLoading(this, now);
     }
     isUnloading(now) {
-        const taskType = this.currentTaskType(now);
-        return taskType === TaskType.UNLOAD;
-    }
-    calcCargoMass() {
-        let mass = UInt64.from(0);
-        for (const item of this.cargo) {
-            const good = getGood(item.good_id);
-            mass = mass.adding(good.mass.multiplying(item.quantity));
-        }
-        return mass;
+        return isUnloading(this, now);
     }
-    createProjectedEntity(cargoMass) {
-        const shipMass = UInt32.from(this.mass);
-        const loaders = this.loaders;
-        return {
-            location: Coordinates.from(this.location),
-            energy: UInt16.from(this.energy),
-            cargoMass,
-            shipMass,
-            engines: this.engines,
-            generator: this.generator,
-            loaders,
-            get totalMass() {
-                let mass = UInt64.from(this.shipMass).adding(this.cargoMass);
-                if (this.loaders) {
-                    mass = mass.adding(this.loaders.mass.multiplying(this.loaders.quantity));
-                }
-                return mass;
-            },
-        };
+    isExtracting(now) {
+        return isExtracting(this, now);
+    }
+    get hasExtractor() {
+        return this.extractor !== undefined;
     }
     project() {
-        const cargoMass = this.calcCargoMass();
-        const projected = this.createProjectedEntity(cargoMass);
-        if (!this.schedule) {
-            return projected;
-        }
-        for (const task of this.schedule.tasks) {
-            switch (task.type.toNumber()) {
-                case TaskType.RECHARGE:
-                    if (projected.generator) {
-                        projected.energy = UInt16.from(projected.generator.capacity);
-                    }
-                    break;
-                case TaskType.FLIGHT: {
-                    if (task.location) {
-                        const distance = distanceBetweenCoordinates(projected.location, task.location);
-                        if (projected.engines) {
-                            const energyUsage = distance
-                                .dividing(PRECISION)
-                                .multiplying(projected.engines.drain);
-                            projected.energy = projected.energy.gt(energyUsage)
-                                ? UInt16.from(projected.energy.subtracting(energyUsage))
-                                : UInt16.from(0);
-                        }
-                        projected.location = Coordinates.from(task.location);
-                    }
-                    break;
-                }
-                case TaskType.LOAD:
-                    for (const item of task.cargo) {
-                        const good = getGood(item.good_id);
-                        projected.cargoMass = projected.cargoMass.adding(good.mass.multiplying(item.quantity));
-                    }
-                    break;
-                case TaskType.UNLOAD:
-                    for (const item of task.cargo) {
-                        const good = getGood(item.good_id);
-                        const cargoMass = good.mass.multiplying(item.quantity);
-                        projected.cargoMass = projected.cargoMass.gt(cargoMass)
-                            ? projected.cargoMass.subtracting(cargoMass)
-                            : UInt64.from(0);
-                    }
-                    break;
-            }
-        }
-        return projected;
+        return projectEntity(this);
     }
-    projectAt(now) {
-        const cargoMass = this.calcCargoMass();
-        const projected = this.createProjectedEntity(cargoMass);
-        if (!this.schedule || this.schedule.tasks.length === 0) {
-            return projected;
-        }
-        for (let i = 0; i < this.schedule.tasks.length; i++) {
-            const task = this.schedule.tasks[i];
-            const taskComplete = this.isTaskComplete(i, now);
-            const taskInProgress = this.isTaskInProgress(i, now);
-            if (!taskComplete && !taskInProgress) {
-                break;
-            }
-            switch (task.type.toNumber()) {
-                case TaskType.RECHARGE:
-                    if (projected.generator) {
-                        if (taskComplete) {
-                            projected.energy = UInt16.from(projected.generator.capacity);
-                        }
-                        else if (taskInProgress) {
-                            const progress = this.getTaskElapsed(i, now) / task.duration.toNumber();
-                            const capacity = Number(projected.generator.capacity);
-                            const currentEnergy = Number(projected.energy);
-                            const rechargeAmount = (capacity - currentEnergy) * progress;
-                            projected.energy = UInt16.from(Math.min(capacity, currentEnergy + rechargeAmount));
-                        }
-                    }
-                    break;
-                case TaskType.FLIGHT: {
-                    if (task.location && projected.engines) {
-                        const origin = projected.location;
-                        const destination = Coordinates.from(task.location);
-                        const distance = distanceBetweenCoordinates(origin, task.location);
-                        const energyUsage = distance
-                            .dividing(PRECISION)
-                            .multiplying(projected.engines.drain);
-                        if (taskComplete) {
-                            projected.energy = projected.energy.gt(energyUsage)
-                                ? UInt16.from(projected.energy.subtracting(energyUsage))
-                                : UInt16.from(0);
-                            projected.location = destination;
-                        }
-                        else if (taskInProgress) {
-                            const progress = this.getTaskElapsed(i, now) / task.duration.toNumber();
-                            const interpolated = lerp(origin, destination, progress);
-                            projected.location = Coordinates.from({
-                                x: Math.round(interpolated.x),
-                                y: Math.round(interpolated.y),
-                            });
-                            const partialEnergy = UInt64.from(Math.floor(Number(energyUsage) * progress));
-                            projected.energy = projected.energy.gt(partialEnergy)
-                                ? UInt16.from(projected.energy.subtracting(partialEnergy))
-                                : UInt16.from(0);
-                        }
-                    }
-                    break;
-                }
-                case TaskType.LOAD:
-                    if (taskComplete) {
-                        for (const item of task.cargo) {
-                            const good = getGood(item.good_id);
-                            projected.cargoMass = projected.cargoMass.adding(good.mass.multiplying(item.quantity));
-                        }
-                    }
-                    break;
-                case TaskType.UNLOAD:
-                    if (taskComplete) {
-                        for (const item of task.cargo) {
-                            const good = getGood(item.good_id);
-                            const cargoMass = good.mass.multiplying(item.quantity);
-                            projected.cargoMass = projected.cargoMass.gt(cargoMass)
-                                ? projected.cargoMass.subtracting(cargoMass)
-                                : UInt64.from(0);
-                        }
-                    }
-                    break;
-            }
-        }
-        return projected;
+    projectAt(now) {
+        return projectEntityAt(this, now);
     }
-    get currentLocation() {
-        return this.location;
+    get location() {
+        return Location.from(this.coordinates);
     }
     get totalCargoMass() {
-        return this.inventory.reduce((sum, c) => sum.adding(c.totalMass), UInt64.from(0));
+        return this.inv.totalMass;
     }
     get cargoValue() {
-        return this.inventory.reduce((sum, c) => sum.adding(c.totalCost), UInt64.from(0));
+        return this.inv.totalValue;
     }
     get totalMass() {
-        const cargoMass = this.totalCargoMass;
-        let mass = UInt64.from(this.mass ?? 0).adding(cargoMass);
+        let mass = UInt64.from(this.hullmass ?? 0).adding(this.totalCargoMass);
         if (this.loaders) {
             mass = mass.adding(UInt64.from(this.loaders.mass).multiplying(this.loaders.quantity));
         }
@@ -3646,263 +4345,146 @@ class Ship extends Types.entity_info {
         return UInt64.from(this.capacity);
     }
     hasSpace(goodMass, quantity) {
-        const additionalMass = goodMass.multiplying(quantity);
-        const newTotal = this.totalMass.adding(additionalMass);
-        return newTotal.lte(this.maxCapacity);
+        return this.totalMass.adding(goodMass.multiplying(quantity)).lte(this.maxCapacity);
     }
     get availableCapacity() {
-        if (this.totalMass.gte(this.maxCapacity)) {
-            return UInt64.from(0);
-        }
-        return this.maxCapacity.subtracting(this.totalMass);
-    }
-    get locationObject() {
-        if (!this._location) {
-            this._location = Location.from(this.location);
-        }
-        return this._location;
-    }
-    setLocation(location) {
-        this._location = location;
+        return this.totalMass.gte(this.maxCapacity)
+            ? UInt64.from(0)
+            : this.maxCapacity.subtracting(this.totalMass);
     }
     getCargoForGood(goodId) {
-        return this.inventory.find((c) => c.good_id.equals(goodId));
+        return this.inv.forGood(goodId);
     }
     get sellableCargo() {
-        return this.inventory.filter((c) => c.hasCargo);
+        return this.inv.sellable;
     }
     get hasSellableCargo() {
-        return this.inventory.some((c) => c.hasCargo);
+        return this.inv.hasSellable;
     }
     get sellableGoodsCount() {
-        return this.inventory.filter((c) => c.hasCargo).length;
+        return this.inv.sellableCount;
     }
     get isFull() {
         return this.totalMass.gte(this.maxCapacity);
     }
     get energyPercent() {
-        if (!this.generator)
+        if (!this.generator || this.energy === undefined)
             return 0;
-        return (Number(this.energy ?? 0) / Number(this.generator.capacity)) * 100;
+        return energyPercent(this);
     }
     get needsRecharge() {
-        if (!this.generator)
+        if (!this.generator || this.energy === undefined)
             return false;
-        return UInt64.from(this.energy ?? 0).lt(this.generator.capacity);
+        return needsRecharge(this);
     }
     hasEnergyFor(distance) {
-        if (!this.engines)
+        if (!this.engines || !this.generator || this.energy === undefined)
             return false;
-        const energyNeeded = distance.dividing(PRECISION).multiplying(this.engines.drain);
-        return UInt64.from(this.energy ?? 0).gte(energyNeeded);
+        return hasEnergyForDistance(this, distance);
     }
     calculateSaleValue(prices) {
-        if (this.cargo.length === 0) {
-            return { revenue: UInt64.from(0), profit: UInt64.from(0), cost: UInt64.from(0) };
-        }
-        let revenue = UInt64.from(0);
-        let cost = UInt64.from(0);
-        for (const item of this.cargo) {
-            if (UInt32.from(item.quantity).equals(UInt32.from(0)))
-                continue;
-            const goodId = Number(item.good_id);
-            const salePrice = prices.get(goodId);
-            if (salePrice) {
-                revenue = revenue.adding(salePrice.multiplying(item.quantity));
-            }
-            cost = cost.adding(item.unit_cost.multiplying(item.quantity));
-        }
-        const profit = revenue.gte(cost) ? revenue.subtracting(cost) : UInt64.from(0);
-        return {
-            revenue,
-            profit,
-            cost,
-        };
+        return calculateSaleValue(this.cargo, prices);
     }
     calculateSaleValueFromArray(prices) {
-        const priceMap = new Map();
-        prices.forEach((price, index) => {
-            priceMap.set(index, price);
-        });
-        return this.calculateSaleValue(priceMap);
+        return calculateSaleValueFromArray(this.cargo, prices);
     }
     afterSellGoods(goodsToSell) {
-        if (this.cargo.length === 0) {
-            return [];
-        }
-        return this.cargo.map((item) => {
-            const saleItem = goodsToSell.find((s) => Number(item.good_id) === s.goodId);
-            if (!saleItem) {
-                return new EntityInventory(item);
-            }
-            const currentQty = Number(item.quantity);
-            const newQty = Math.max(0, currentQty - saleItem.quantity);
-            return new EntityInventory(Types.cargo_item.from({
-                good_id: item.good_id,
-                quantity: UInt32.from(newQty),
-                unit_cost: item.unit_cost,
-            }));
-        });
+        return afterSellGoods(this.cargo, goodsToSell);
     }
     afterSellAllGoods() {
-        if (this.cargo.length === 0) {
-            return [];
-        }
-        return this.cargo.map((item) => new EntityInventory(Types.cargo_item.from({
-            good_id: item.good_id,
-            quantity: UInt32.from(0),
-            unit_cost: item.unit_cost,
-        })));
+        return afterSellAllGoods(this.cargo);
     }
 }
 
 class Warehouse extends Types.entity_info {
-    static fromState(state) {
-        const entityInfo = Types.entity_info.from({
-            type: Name.from('warehouse'),
-            id: UInt64.from(state.id),
-            owner: Name.from(state.owner),
-            entity_name: state.name,
-            location: Types.coordinates.from(state.location),
-            capacity: UInt32.from(state.capacity),
-            cargomass: UInt32.from(0),
-            cargo: state.cargo || [],
-            loaders: state.loaders,
-            is_idle: !state.schedule,
-            current_task_elapsed: UInt32.from(0),
-            current_task_remaining: UInt32.from(0),
-            pending_tasks: [],
-            schedule: state.schedule,
-            mass: UInt32.from(0),
-            energy: 0,
-            engines: Types.movement_stats.from({
-                thrust: 0,
-                drain: 0,
-                maxmass: 0,
-            }),
-            generator: Types.energy_stats.from({
-                capacity: 0,
-                recharge: 0,
-            }),
-        });
-        return new Warehouse(entityInfo);
-    }
     get name() {
         return this.entity_name;
     }
+    get inv() {
+        return (this._inv ?? (this._inv = new InventoryAccessor(this)));
+    }
     get inventory() {
-        if (!this._inventory) {
-            this._inventory = this.cargo.map((item) => new EntityInventory(item));
-        }
-        return this._inventory;
+        return this.inv.items;
     }
-    get hasSchedule() {
-        return hasSchedule(this);
+    get sched() {
+        return (this._sched ?? (this._sched = new ScheduleAccessor(this)));
     }
     get isIdle() {
         return this.is_idle;
     }
-    get tasks() {
-        return getTasks(this);
-    }
-    scheduleDuration() {
-        return scheduleDuration(this);
+    isLoading(now) {
+        return isLoading(this, now);
     }
-    scheduleElapsed(now) {
-        return scheduleElapsed(this, now);
+    isUnloading(now) {
+        return isUnloading(this, now);
     }
-    scheduleRemaining(now) {
-        return scheduleRemaining(this, now);
+    get location() {
+        return Location.from(this.coordinates);
     }
-    scheduleComplete(now) {
-        return scheduleComplete(this, now);
+    get totalCargoMass() {
+        return this.inv.totalMass;
     }
-    currentTaskIndex(now) {
-        return currentTaskIndex(this, now);
+    get cargoValue() {
+        return this.inv.totalValue;
     }
-    currentTask(now) {
-        return currentTask(this, now);
+    get maxCapacity() {
+        return UInt64.from(this.capacity);
     }
-    currentTaskType(now) {
-        return currentTaskType(this, now);
+    get availableCapacity() {
+        const cargo = this.totalCargoMass;
+        return cargo.gte(this.maxCapacity) ? UInt64.from(0) : this.maxCapacity.subtracting(cargo);
     }
-    getTaskStartTime(index) {
-        return getTaskStartTime(this, index);
+    hasSpace(goodMass, quantity) {
+        return this.totalCargoMass.adding(goodMass.multiplying(quantity)).lte(this.maxCapacity);
     }
-    getTaskElapsed(index, now) {
-        return getTaskElapsed(this, index, now);
+    get isFull() {
+        return this.totalCargoMass.gte(this.maxCapacity);
     }
-    getTaskRemaining(index, now) {
-        return getTaskRemaining(this, index, now);
+    getCargoForGood(goodId) {
+        return this.inv.forGood(goodId);
     }
-    isTaskComplete(index, now) {
-        return isTaskComplete(this, index, now);
+    get orbitalAltitude() {
+        return this.coordinates.z?.toNumber() || 0;
     }
-    isTaskInProgress(index, now) {
-        return isTaskInProgress(this, index, now);
+}
+
+class Container extends Types.entity_info {
+    get name() {
+        return this.entity_name;
     }
-    currentTaskProgress(now) {
-        return currentTaskProgress(this, now);
+    get sched() {
+        return (this._sched ?? (this._sched = new ScheduleAccessor(this)));
     }
-    scheduleProgress(now) {
-        return scheduleProgress(this, now);
+    get isIdle() {
+        return this.is_idle;
     }
     isLoading(now) {
-        const taskType = this.currentTaskType(now);
-        return taskType === TaskType.LOAD;
+        return isLoading(this, now);
     }
     isUnloading(now) {
-        const taskType = this.currentTaskType(now);
-        return taskType === TaskType.UNLOAD;
-    }
-    calcCargoMass() {
-        let mass = UInt64.from(0);
-        for (const item of this.cargo) {
-            const good = getGood(item.good_id);
-            mass = mass.adding(good.mass.multiplying(item.quantity));
-        }
-        return mass;
+        return isUnloading(this, now);
     }
-    get currentLocation() {
-        return this.location;
+    get location() {
+        return Location.from(this.coordinates);
     }
-    get totalCargoMass() {
-        return this.inventory.reduce((sum, c) => sum.adding(c.totalMass), UInt64.from(0));
-    }
-    get cargoValue() {
-        return this.inventory.reduce((sum, c) => sum.adding(c.totalCost), UInt64.from(0));
+    get totalMass() {
+        return UInt64.from(this.hullmass ?? 0).adding(this.cargomass);
     }
     get maxCapacity() {
         return UInt64.from(this.capacity);
     }
     get availableCapacity() {
-        if (this.totalCargoMass.gte(this.maxCapacity)) {
-            return UInt64.from(0);
-        }
-        return this.maxCapacity.subtracting(this.totalCargoMass);
+        const cargo = UInt64.from(this.cargomass);
+        return cargo.gte(this.maxCapacity) ? UInt64.from(0) : this.maxCapacity.subtracting(cargo);
     }
-    hasSpace(goodMass, quantity) {
-        const additionalMass = goodMass.multiplying(quantity);
-        const newTotal = this.totalCargoMass.adding(additionalMass);
-        return newTotal.lte(this.maxCapacity);
+    hasSpace(additionalMass) {
+        return UInt64.from(this.cargomass).adding(additionalMass).lte(this.maxCapacity);
     }
     get isFull() {
-        return this.totalCargoMass.gte(this.maxCapacity);
-    }
-    get locationObject() {
-        if (!this._location) {
-            this._location = Location.from(this.location);
-        }
-        return this._location;
-    }
-    setLocation(location) {
-        this._location = location;
-    }
-    getCargoForGood(goodId) {
-        return this.inventory.find((c) => c.good_id.equals(goodId));
+        return UInt64.from(this.cargomass).gte(this.maxCapacity);
     }
     get orbitalAltitude() {
-        return this.location.z?.toNumber() || 0;
+        return this.coordinates.z?.toNumber() || 0;
     }
 }
 
@@ -3938,25 +4520,37 @@ class EntitiesManager extends BaseManager {
     async getWarehouse(id) {
         return (await this.getEntity('warehouse', id));
     }
+    async getContainer(id) {
+        return (await this.getEntity('container', id));
+    }
     async getShips(owner) {
         return (await this.getEntities(owner, 'ship'));
     }
     async getWarehouses(owner) {
         return (await this.getEntities(owner, 'warehouse'));
     }
+    async getContainers(owner) {
+        return (await this.getEntities(owner, 'container'));
+    }
     async getShipSummaries(owner) {
         return this.getSummaries(owner, 'ship');
     }
     async getWarehouseSummaries(owner) {
         return this.getSummaries(owner, 'warehouse');
     }
+    async getContainerSummaries(owner) {
+        return this.getSummaries(owner, 'container');
+    }
     wrapEntity(entity) {
         if (entity.type.equals('ship')) {
             return new Ship(entity);
         }
-        else {
+        else if (entity.type.equals('warehouse')) {
             return new Warehouse(entity);
         }
+        else {
+            return new Container(entity);
+        }
     }
     resolveOwner(owner) {
         if (typeof owner === 'object' && owner !== null && 'owner' in owner) {
@@ -4096,7 +4690,7 @@ class Player extends Types.player_row {
     }
 }
 Player.MAX_LOAN = 1000000;
-Player.BASE_SHIP_COST = 100;
+Player.BASE_SHIP_COST = 500;
 Player.SHIP_COST_MULTIPLIER = 5;
 
 class PlayersManager extends BaseManager {
@@ -4253,9 +4847,10 @@ function getSupply(gameSeed, state, location, goodId) {
     const r = roll(gameSeed, seed);
     const percent = r / 65535;
     const epoch = 1 + Number(state.epoch) / 90;
-    const ship = Math.pow(Number(state.ships), 0);
+    const ship = 1;
     const goodIdNum = Number(goodId);
-    return Math.floor((128 / goodIdNum) * percent * ship * epoch);
+    const base = Math.floor(128 / goodIdNum);
+    return Math.floor(base * percent * ship * epoch);
 }
 function marketPrice(location, goodId, gameSeed, state) {
     const good = getGood(goodId);
@@ -4288,14 +4883,14 @@ class LocationsManager extends BaseManager {
         return marketPrices(location, game.config.seed, state);
     }
     async getMarketPricesWithSupply(location) {
-        const [game, state, locationRows] = await Promise.all([
+        const [game, state, supplyRows] = await Promise.all([
             this.getGame(),
             this.getState(),
-            this.getLocation(location),
+            this.getSupplyRows(location),
         ]);
         const prices = marketPrices(location, game.config.seed, state);
         const supplyMap = new Map();
-        for (const row of locationRows) {
+        for (const row of supplyRows) {
             if (UInt64.from(row.epoch).equals(state.epoch)) {
                 supplyMap.set(Number(row.good_id), Number(row.supply));
             }
@@ -4321,9 +4916,9 @@ class LocationsManager extends BaseManager {
         const game = await this.getGame();
         return findNearbyPlanets(game.config.seed, origin, maxDistance);
     }
-    async getLocation(location) {
+    async getSupplyRows(location) {
         const hash = Checksum256.hash(Bytes.from(`${location.x}-${location.y}`, 'utf8'));
-        return this.server.table('location').all({
+        return this.server.table('supply').all({
             index_position: 'secondary',
             from: hash,
             to: hash,
@@ -4338,7 +4933,7 @@ class LocationsManager extends BaseManager {
     async getLocationWithSupply(coords) {
         const location = toLocation(coords);
         const [rows, state] = await Promise.all([
-            this.getLocation(location.coordinates),
+            this.getSupplyRows(location.coordinates),
             this.getState(),
         ]);
         location.setLocationRows(rows, state.epoch);
@@ -4348,13 +4943,24 @@ class LocationsManager extends BaseManager {
         const location = toLocation(coords);
         const [prices, rows, state] = await Promise.all([
             this.getMarketPrices(location.coordinates),
-            this.getLocation(location.coordinates),
+            this.getSupplyRows(location.coordinates),
             this.getState(),
         ]);
         location.setMarketPrices(prices);
         location.setLocationRows(rows, state.epoch);
         return location;
     }
+    async getLocationEntity(id) {
+        const row = await this.server.table('location').get(UInt64.from(id));
+        return row ?? undefined;
+    }
+    async getLocationEntityAt(coords) {
+        const id = coordsToLocationId(coords);
+        return this.getLocationEntity(id);
+    }
+    async getAllLocationEntities() {
+        return this.server.table('location').all();
+    }
 }
 
 function calculateUpdatedCargoCost(currentPaid, currentOwned, purchaseCost, purchaseQuantity) {
@@ -5064,7 +5670,7 @@ class TradesManager extends BaseManager {
         this.priceCacheEpoch = undefined;
     }
     async findDeals(ship, originLocation, options = {}) {
-        const origin = originLocation || ship.currentLocation;
+        const origin = originLocation || Coordinates.from(ship.coordinates);
         const callbacks = await this.createCallbacks();
         const deals = await findDealsForShip(ship, origin, callbacks.getNearbyLocations, callbacks.getMarketPrices, options);
         return deals;
@@ -5074,7 +5680,7 @@ class TradesManager extends BaseManager {
         return deals[0];
     }
     async getCollectOptions(ship, arrivedAt, options = {}) {
-        const location = arrivedAt || ship.currentLocation;
+        const location = arrivedAt || Coordinates.from(ship.coordinates);
         const callbacks = await this.createCallbacks();
         return analyzeCollectOptions(ship, location, callbacks, options);
     }
@@ -5131,6 +5737,20 @@ class ActionsManager extends BaseManager {
             recharge,
         });
     }
+    grouptravel(entities, destination, recharge = true) {
+        const entityRefs = entities.map((e) => Types.entity_ref.from({
+            entity_type: e.entityType,
+            entity_id: UInt64.from(e.entityId),
+        }));
+        const x = Int64.from(destination.x);
+        const y = Int64.from(destination.y);
+        return this.server.action('grouptravel', {
+            entities: entityRefs,
+            x,
+            y,
+            recharge,
+        });
+    }
     resolve(entityId, entityType = EntityType.SHIP) {
         return this.server.action('resolve', {
             entity_type: entityType,
@@ -5150,32 +5770,30 @@ class ActionsManager extends BaseManager {
             id: UInt64.from(shipId),
         });
     }
-    transfer(sourceType, sourceId, destType, destId, cargo) {
-        const cargoItems = cargo.map((c) => Types.cargo_item.from({
-            good_id: UInt16.from(c.goodId),
-            quantity: UInt32.from(c.quantity),
-            unit_cost: UInt64.from(c.unitCost || 0),
-        }));
+    transfer(sourceType, sourceId, destType, destId, goodId, quantity) {
         return this.server.action('transfer', {
             source_type: sourceType,
             source_id: UInt64.from(sourceId),
             dest_type: destType,
             dest_id: UInt64.from(destId),
-            cargo: cargoItems,
+            good_id: UInt16.from(goodId),
+            quantity: UInt32.from(quantity),
         });
     }
-    buyGoods(shipId, goodId, quantity) {
+    buyGoods(entityId, goodId, quantity, entityType = EntityType.SHIP) {
         return this.server.action('buygoods', {
-            ship_id: UInt64.from(shipId),
-            good_id: UInt64.from(goodId),
-            quantity: UInt64.from(quantity),
+            entity_type: entityType,
+            id: UInt64.from(entityId),
+            good_id: UInt16.from(goodId),
+            quantity: UInt32.from(quantity),
         });
     }
-    sellGoods(shipId, goodId, quantity) {
+    sellGoods(entityId, goodId, quantity, entityType = EntityType.SHIP) {
         return this.server.action('sellgoods', {
-            ship_id: UInt64.from(shipId),
-            good_id: UInt64.from(goodId),
-            quantity: UInt64.from(quantity),
+            entity_type: entityType,
+            id: UInt64.from(entityId),
+            good_id: UInt16.from(goodId),
+            quantity: UInt32.from(quantity),
         });
     }
     buyShip(account, name) {
@@ -5191,6 +5809,13 @@ class ActionsManager extends BaseManager {
             name,
         });
     }
+    buyContainer(account, shipId, name) {
+        return this.server.action('buycontainer', {
+            account: Name.from(account),
+            ship_id: UInt64.from(shipId),
+            name,
+        });
+    }
     takeLoan(account, amount) {
         return this.server.action('takeloan', {
             account: Name.from(account),
@@ -5214,6 +5839,11 @@ class ActionsManager extends BaseManager {
             account: Name.from(account),
         });
     }
+    extract(shipId) {
+        return this.server.action('extract', {
+            ship_id: UInt64.from(shipId),
+        });
+    }
     joinGame(account, companyName) {
         return [this.foundCompany(account, companyName), this.join(account)];
     }
@@ -5231,11 +5861,7 @@ class ActionsManager extends BaseManager {
         const shipId = ship instanceof Ship ? ship.id : UInt64.from(ship);
         return shipCargo
             .filter((c) => c.hasCargo)
-            .map((c) => this.server.action('sellgoods', {
-            ship_id: shipId,
-            good_id: c.good_id,
-            quantity: c.quantity,
-        }));
+            .map((c) => this.sellGoods(shipId, c.good_id, c.quantity, EntityType.SHIP));
     }
 }
 
@@ -5382,178 +6008,118 @@ class Shipload {
     }
 }
 
-function totalCargoMass(cargo) {
-    return cargo.reduce((sum, c) => {
-        return sum.adding(c.totalMass);
-    }, UInt64.from(0));
+function makeShip(state) {
+    const entityInfo = Types.entity_info.from({
+        type: Name.from('ship'),
+        id: UInt64.from(state.id),
+        owner: Name.from(state.owner),
+        entity_name: state.name,
+        coordinates: Types.coordinates.from(state.coordinates),
+        hullmass: UInt32.from(state.hullmass),
+        capacity: UInt32.from(state.capacity),
+        energy: UInt16.from(state.energy),
+        cargomass: UInt32.from(0),
+        cargo: state.cargo || [],
+        is_idle: !state.schedule,
+        current_task_elapsed: UInt32.from(0),
+        current_task_remaining: UInt32.from(0),
+        pending_tasks: [],
+        engines: state.engines,
+        generator: state.generator,
+        loaders: state.loaders,
+        schedule: state.schedule,
+    });
+    return new Ship(entityInfo);
 }
-function cargoValue(cargo) {
-    return cargo.reduce((sum, c) => {
-        return sum.adding(c.totalCost);
-    }, UInt64.from(0));
+function makeWarehouse(state) {
+    const entityInfo = Types.entity_info.from({
+        type: Name.from('warehouse'),
+        id: UInt64.from(state.id),
+        owner: Name.from(state.owner),
+        entity_name: state.name,
+        coordinates: Types.coordinates.from(state.coordinates),
+        capacity: UInt32.from(state.capacity),
+        cargomass: UInt32.from(0),
+        cargo: state.cargo || [],
+        loaders: state.loaders,
+        is_idle: !state.schedule,
+        current_task_elapsed: UInt32.from(0),
+        current_task_remaining: UInt32.from(0),
+        pending_tasks: [],
+        schedule: state.schedule,
+    });
+    return new Warehouse(entityInfo);
 }
-function getCargoForGood(cargo, goodId) {
-    return cargo.find((c) => c.good_id.equals(goodId));
+function makeContainer(state) {
+    const entityInfo = Types.entity_info.from({
+        type: Name.from('container'),
+        id: UInt64.from(state.id),
+        owner: Name.from(state.owner),
+        entity_name: state.name,
+        coordinates: Types.coordinates.from(state.coordinates),
+        hullmass: UInt32.from(state.hullmass),
+        capacity: UInt32.from(state.capacity),
+        cargomass: UInt32.from(state.cargomass || 0),
+        cargo: [],
+        is_idle: !state.schedule,
+        current_task_elapsed: UInt32.from(0),
+        current_task_remaining: UInt32.from(0),
+        pending_tasks: [],
+        schedule: state.schedule,
+    });
+    return new Container(entityInfo);
 }
-function hasSpace(currentMass, maxCapacity, goodMass, quantity) {
-    const additionalMass = goodMass.multiplying(quantity);
-    const totalMass = currentMass.adding(additionalMass);
-    return totalMass.lte(maxCapacity);
+
+function canMove(e) {
+    return 'engines' in e && 'generator' in e && 'energy' in e;
 }
-function availableCapacity(currentMass, maxCapacity) {
-    if (currentMass.gte(maxCapacity)) {
-        return UInt64.from(0);
-    }
-    return maxCapacity.subtracting(currentMass);
+function hasEnergy(e) {
+    return 'energy' in e;
 }
-function isFull(currentMass, maxCapacity) {
-    return currentMass.gte(maxCapacity);
+function hasStorage(e) {
+    return 'capacity' in e && 'cargo' in e;
 }
-
-var cargoUtils = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    totalCargoMass: totalCargoMass,
-    cargoValue: cargoValue,
-    getCargoForGood: getCargoForGood,
-    hasSpace: hasSpace,
-    availableCapacity: availableCapacity,
-    isFull: isFull
-});
-
-function createProjectedEntity(entity) {
-    const cargoMass = entity.calcCargoMass();
-    const shipMass = UInt32.from(entity.mass);
-    const loaders = entity.loaders;
-    return {
-        location: Coordinates.from(entity.location),
-        energy: UInt16.from(entity.energy),
-        cargoMass,
-        shipMass,
-        capacity: entity.capacity,
-        engines: entity.engines,
-        generator: entity.generator,
-        loaders,
-        get totalMass() {
-            let mass = UInt64.from(this.shipMass).adding(this.cargoMass);
-            if (this.loaders) {
-                mass = mass.adding(this.loaders.mass.multiplying(this.loaders.quantity));
-            }
-            return mass;
-        },
-    };
+function hasLoaders(e) {
+    return 'loaders' in e && e.loaders !== undefined;
 }
-function applyRechargeTask(projected, _task, options) {
-    if (!projected.generator)
-        return;
-    if (options.complete) {
-        projected.energy = UInt16.from(projected.generator.capacity);
-    }
-    else if (options.progress !== undefined) {
-        const capacity = Number(projected.generator.capacity);
-        const currentEnergy = Number(projected.energy);
-        const rechargeAmount = (capacity - currentEnergy) * options.progress;
-        projected.energy = UInt16.from(Math.min(capacity, currentEnergy + rechargeAmount));
-    }
+function hasTrade(e) {
+    return 'trade' in e && e.trade !== undefined;
 }
-function applyFlightTask(projected, task, options) {
-    if (!task.location || !projected.engines)
-        return;
-    const origin = projected.location;
-    const destination = Coordinates.from(task.location);
-    const distance = distanceBetweenCoordinates(origin, task.location);
-    const energyUsage = distance.dividing(PRECISION).multiplying(projected.engines.drain);
-    if (options.complete) {
-        projected.energy = projected.energy.gt(energyUsage)
-            ? UInt16.from(projected.energy.subtracting(energyUsage))
-            : UInt16.from(0);
-        projected.location = destination;
-    }
-    else if (options.progress !== undefined) {
-        const interpolated = lerp(origin, destination, options.progress);
-        projected.location = Coordinates.from({
-            x: Math.round(interpolated.x),
-            y: Math.round(interpolated.y),
-        });
-        const partialEnergy = UInt64.from(Math.floor(Number(energyUsage) * options.progress));
-        projected.energy = projected.energy.gt(partialEnergy)
-            ? UInt16.from(projected.energy.subtracting(partialEnergy))
-            : UInt16.from(0);
-    }
+function hasMass(e) {
+    return 'hullmass' in e;
 }
-function applyLoadTask(projected, task) {
-    for (const item of task.cargo) {
-        const good = getGood(item.good_id);
-        projected.cargoMass = projected.cargoMass.adding(good.mass.multiplying(item.quantity));
-    }
+function hasSchedule(e) {
+    return 'schedule' in e;
 }
-function applyUnloadTask(projected, task) {
-    for (const item of task.cargo) {
-        const good = getGood(item.good_id);
-        const cargoMass = good.mass.multiplying(item.quantity);
-        projected.cargoMass = projected.cargoMass.gt(cargoMass)
-            ? projected.cargoMass.subtracting(cargoMass)
-            : UInt64.from(0);
-    }
+function hasExtractor(e) {
+    return 'extractor' in e && e.extractor !== undefined;
 }
-function projectEntity(entity) {
-    const projected = createProjectedEntity(entity);
-    if (!entity.schedule) {
-        return projected;
-    }
-    for (const task of entity.schedule.tasks) {
-        switch (task.type.toNumber()) {
-            case TaskType.RECHARGE:
-                applyRechargeTask(projected, task, { complete: true });
-                break;
-            case TaskType.FLIGHT:
-                applyFlightTask(projected, task, { complete: true });
-                break;
-            case TaskType.LOAD:
-                applyLoadTask(projected, task);
-                break;
-            case TaskType.UNLOAD:
-                applyUnloadTask(projected, task);
-                break;
-        }
-    }
-    return projected;
+
+function calcLoadDuration(entity, cargoMass) {
+    const totalThrust = entity.loaders.thrust.toNumber() * entity.loaders.quantity.toNumber();
+    if (totalThrust === 0)
+        return UInt32.from(0);
+    return UInt32.from(Math.ceil(Number(cargoMass) / totalThrust));
 }
-function projectEntityAt(entity, now) {
-    const projected = createProjectedEntity(entity);
-    if (!entity.schedule || entity.schedule.tasks.length === 0) {
-        return projected;
-    }
-    for (let i = 0; i < entity.schedule.tasks.length; i++) {
-        const task = entity.schedule.tasks[i];
-        const taskComplete = isTaskComplete(entity, i, now);
-        const taskInProgress = isTaskInProgress(entity, i, now);
-        if (!taskComplete && !taskInProgress) {
-            break;
-        }
-        const progress = taskInProgress
-            ? getTaskElapsed(entity, i, now) / task.duration.toNumber()
-            : undefined;
-        switch (task.type.toNumber()) {
-            case TaskType.RECHARGE:
-                applyRechargeTask(projected, task, { complete: taskComplete, progress });
-                break;
-            case TaskType.FLIGHT:
-                applyFlightTask(projected, task, { complete: taskComplete, progress });
-                break;
-            case TaskType.LOAD:
-                if (taskComplete) {
-                    applyLoadTask(projected, task);
-                }
-                break;
-            case TaskType.UNLOAD:
-                if (taskComplete) {
-                    applyUnloadTask(projected, task);
-                }
-                break;
-        }
+
+function calc_load_time_internal(loaders, shipZ, cargoMass) {
+    if (cargoMass === 0 || loaders.quantity.toNumber() === 0 || loaders.thrust.toNumber() === 0) {
+        return 0;
     }
-    return projected;
+    const totalMass = cargoMass + loaders.mass.toNumber();
+    const acceleration = (loaders.thrust.toNumber() / totalMass) * PRECISION;
+    const flightTime = Math.floor(2 * Math.sqrt(shipZ / acceleration));
+    return Math.floor(flightTime / loaders.quantity.toNumber());
+}
+function calc_extraction_duration(extractor, loaders, shipZ, batchMass) {
+    const extractionTime = Math.floor(batchMass / extractor.rate.toNumber());
+    const loadingTime = calc_load_time_internal(loaders, shipZ, batchMass);
+    return UInt32.from(Math.max(extractionTime, loadingTime));
+}
+function calc_extraction_energy(extractor, duration) {
+    const energy = Math.floor((duration * extractor.drain.toNumber()) / PRECISION);
+    return UInt16.from(energy);
 }
 
-export { ActionsManager, COMMIT_ALREADY_SET, COMMIT_CANNOT_MATCH, COMMIT_NOT_SET, COMPANY_NOT_FOUND, Coordinates, EPOCH_NON_ZERO, EPOCH_NOT_READY, ERROR_SYSTEM_ALREADY_INITIALIZED, ERROR_SYSTEM_DISABLED, ERROR_SYSTEM_NOT_INITIALIZED, EntitiesManager, EntityInventory, EntityType, EpochsManager, GAME_NOT_FOUND, GAME_SEED_NOT_SET, GOOD_DOES_NOT_EXIST, GOOD_NOT_AVAILABLE_AT_LOCATION, GameState, Good, GoodPrice, INITIAL_SHIP_MASS, INSUFFICIENT_BALANCE, INSUFFICIENT_GOOD_QUANTITY, INSUFFICIENT_GOOD_SUPPLY, INVALID_AMOUNT, Location, LocationsManager, MAX_ORBITAL_ALTITUDE, MIN_ORBITAL_ALTITUDE, NO_SCHEDULE, PLAYER_ALREADY_JOINED, PLAYER_NOT_FOUND, PRECISION, platform as PlatformContract, Player, PlayersManager, REQUIRES_MORE_THAN_ONE, REQUIRES_POSITIVE_VALUE, Rarities, SHIP_ALREADY_THERE, SHIP_ALREADY_TRAVELING, SHIP_CANNOT_BUY_TRAVELING, SHIP_CANNOT_CANCEL_TASK, SHIP_CANNOT_UPDATE_TRAVELING, SHIP_CARGO_NOT_LOADED, SHIP_CARGO_NOT_OWNED, SHIP_INVALID_CARGO, SHIP_INVALID_DESTINATION, SHIP_INVALID_TRAVEL_DURATION, SHIP_NOT_ARRIVED, SHIP_NOT_ENOUGH_ENERGY, SHIP_NOT_ENOUGH_ENERGY_CAPACITY, SHIP_NOT_FOUND, SHIP_NOT_IDLE, SHIP_NOT_OWNED, SHIP_NO_COMPLETED_TASKS, SHIP_NO_TASKS_TO_CANCEL, server as ServerContract, Ship, Shipload, TaskCancelable, TaskType, TradesManager, WAREHOUSE_ALREADY_AT_LOCATION, WAREHOUSE_CAPACITY_EXCEEDED, WAREHOUSE_NOT_FOUND, Warehouse, analyzeCargoSale, analyzeCollectOptions, calc_acceleration, calc_energyusage, calc_flighttime, calc_loader_acceleration, calc_loader_flighttime, calc_orbital_altitude, calc_rechargetime, calc_ship_acceleration, calc_ship_flighttime, calc_ship_mass, calc_ship_rechargetime, calc_transfer_duration, calculateBreakEvenPrice, calculateFlightTime, calculateLoadTimeBreakdown, calculateMaxTradeQuantity, calculateProfitPerMass, calculateProfitPerSecond, calculateROI, calculateRefuelingTime, calculateTradeProfit, calculateTransferTime, calculateUpdatedCargoCost, cargoUtils, createExploreOption, createProjectedEntity, createSellAndRepositionOption, createSellAndStayOption, createSellAndTradeOption, createTravelToSellOption, Shipload as default, distanceBetweenCoordinates, distanceBetweenPoints, estimateDealTravelTime, estimateTravelTime, findBestDeal, findBestGoodToTrade, findDealsForShip, findNearbyPlanets, getCurrentEpoch, getEpochInfo, getGood, getGoods, getRarity, getSystemName, goodIds, hasEnergyForDistance, hasSystem, hash, hash512, isProfitable, lerp, marketPrice, marketPrices, projectEntity, projectEntityAt, rotation, schedule, toLocation };
+export { ActionsManager, COMMIT_ALREADY_SET, COMMIT_CANNOT_MATCH, COMMIT_NOT_SET, COMPANY_NOT_FOUND, CONTAINER_Z, Container, Coordinates, EPOCH_NON_ZERO, EPOCH_NOT_READY, ERROR_SYSTEM_ALREADY_INITIALIZED, ERROR_SYSTEM_DISABLED, ERROR_SYSTEM_NOT_INITIALIZED, EntitiesManager, EntityInventory, EntityType, EpochsManager, GAME_NOT_FOUND, GAME_SEED_NOT_SET, GOOD_DOES_NOT_EXIST, GOOD_NOT_AVAILABLE_AT_LOCATION, GameState, Good, GoodPrice, INITIAL_CONTAINER_CAPACITY, INITIAL_CONTAINER_HULLMASS, INITIAL_EXTRACTOR_DRAIN, INITIAL_EXTRACTOR_EFFICIENCY, INITIAL_EXTRACTOR_RATE, INITIAL_LOADER_MASS, INITIAL_LOADER_QUANTITY, INITIAL_LOADER_THRUST, INITIAL_SHIP_CAPACITY, INITIAL_SHIP_DRAIN, INITIAL_SHIP_ENERGY, INITIAL_SHIP_GENERATOR_CAPACITY, INITIAL_SHIP_HULLMASS, INITIAL_SHIP_MASS, INITIAL_SHIP_RECHARGE, INITIAL_SHIP_THRUST, INITIAL_SHIP_Z, INITIAL_WAREHOUSE_CAPACITY, INSUFFICIENT_BALANCE, INSUFFICIENT_GOOD_QUANTITY, INSUFFICIENT_GOOD_SUPPLY, INVALID_AMOUNT, InventoryAccessor, Location, LocationType, LocationsManager, MAX_ORBITAL_ALTITUDE, MIN_ORBITAL_ALTITUDE, NO_SCHEDULE, PLAYER_ALREADY_JOINED, PLAYER_NOT_FOUND, PRECISION, platform as PlatformContract, Player, PlayersManager, REQUIRES_MORE_THAN_ONE, REQUIRES_POSITIVE_VALUE, Rarities, SHIP_ALREADY_THERE, SHIP_ALREADY_TRAVELING, SHIP_CANNOT_BUY_TRAVELING, SHIP_CANNOT_CANCEL_TASK, SHIP_CANNOT_UPDATE_TRAVELING, SHIP_CARGO_NOT_LOADED, SHIP_CARGO_NOT_OWNED, SHIP_INVALID_CARGO, SHIP_INVALID_DESTINATION, SHIP_INVALID_TRAVEL_DURATION, SHIP_NOT_ARRIVED, SHIP_NOT_ENOUGH_ENERGY, SHIP_NOT_ENOUGH_ENERGY_CAPACITY, SHIP_NOT_FOUND, SHIP_NOT_IDLE, SHIP_NOT_OWNED, SHIP_NO_COMPLETED_TASKS, SHIP_NO_TASKS_TO_CANCEL, ScheduleAccessor, server as ServerContract, Ship, Shipload, TRAVEL_MAX_DURATION, TaskCancelable, TaskType, TradesManager, WAREHOUSE_ALREADY_AT_LOCATION, WAREHOUSE_CAPACITY_EXCEEDED, WAREHOUSE_NOT_FOUND, WAREHOUSE_Z, Warehouse, analyzeCargoSale, analyzeCollectOptions, availableCapacity$1 as availableCapacity, availableCapacityFromMass, calcCargoMass, calcCargoValue, calcEnergyUsage, calcLoadDuration, calc_acceleration, calc_energyusage, calc_extraction_duration, calc_extraction_energy, calc_flighttime, calc_loader_acceleration, calc_loader_flighttime, calc_orbital_altitude, calc_rechargetime, calc_ship_acceleration, calc_ship_flighttime, calc_ship_mass, calc_ship_rechargetime, calc_transfer_duration, calculateBreakEvenPrice, calculateFlightTime, calculateLoadTimeBreakdown, calculateMaxTradeQuantity, calculateProfitPerMass, calculateProfitPerSecond, calculateROI, calculateRefuelingTime, calculateTradeProfit, calculateTransferTime, calculateUpdatedCargoCost, canMove, capsHasExtractor, capsHasLoaders, capsHasMass, capsHasMovement, capsHasStorage, capsHasTrade, cargoUtils, coordsToLocationId, createExploreOption, createInventoryAccessor, createProjectedEntity, createScheduleAccessor, createSellAndRepositionOption, createSellAndStayOption, createSellAndTradeOption, createTravelToSellOption, Shipload as default, deriveLocation, deriveLocationEpoch, deriveLocationMixture, deriveLocationStatic, distanceBetweenCoordinates, distanceBetweenPoints, energyPercent, estimateDealTravelTime, estimateTravelTime, findBestDeal, findBestGoodToTrade, findDealsForShip, findNearbyPlanets, getCurrentEpoch, getDestinationLocation, getEpochInfo, getFlightOrigin, getGood, getGoods, getLocationType, getPositionAt, getRarity, getSystemName, goodIds, hasEnergy, hasEnergyForDistance$1 as hasEnergyForDistance, hasExtractor, hasLoaders, hasMass, hasSchedule, hasSpace$1 as hasSpace, hasSpaceForMass, hasStorage, hasSystem, hasTrade, hash, hash512, isExtractableLocation, isFull$1 as isFull, isFullFromMass, isProfitable, lerp, makeContainer, makeShip, makeWarehouse, marketPrice, marketPrices, maxTravelDistance, needsRecharge, projectEntity, projectEntityAt, rotation, schedule, toLocation };
 //# sourceMappingURL=shipload.m.js.map