diff --git a/Tiltfile b/Tiltfile index a4261578..d24a4652 100644 --- a/Tiltfile +++ b/Tiltfile @@ -220,7 +220,7 @@ if pyth: k8s_yaml_with_ns("devnet/p2w-terra-relay.yaml") k8s_resource( "p2w-terra-relay", - resource_deps = ["pyth", "p2w-attest", "spy", "terra-terrad"], + resource_deps = ["pyth", "p2w-attest", "spy", "terra-terrad", "wasm-gen"], port_forwards = [ port_forward(4200, name = "Rest API (Status + Query) [:4200]", host = webHost), port_forward(8081, name = "Prometheus [:8081]", host = webHost)], @@ -230,7 +230,7 @@ if pyth: k8s_yaml_with_ns("devnet/p2w-evm-relay.yaml") k8s_resource( "p2w-evm-relay", - resource_deps = ["pyth", "p2w-attest", "spy", "eth-devnet"], + resource_deps = ["pyth", "p2w-attest", "spy", "eth-devnet", "wasm-gen"], port_forwards = [ port_forward(4201, container_port = 4200, name = "Rest API (Status + Query) [:4201]", host = webHost), port_forward(8082, container_port = 8081, name = "Prometheus [:8082]", host = webHost)], @@ -246,7 +246,7 @@ if pyth: k8s_yaml_with_ns("devnet/pyth-price-service.yaml") k8s_resource( "pyth-price-service", - resource_deps = ["pyth", "p2w-attest", "spy", "eth-devnet"], + resource_deps = ["pyth", "p2w-attest", "spy", "eth-devnet", "wasm-gen"], port_forwards = [ port_forward(4202, container_port = 4200, name = "Rest API (Status + Query) [:4202]", host = webHost), port_forward(6202, container_port = 6200, name = "WSS API [:6202]", host = webHost), diff --git a/ethereum/.openzeppelin/unknown-1313161555.json b/ethereum/.openzeppelin/unknown-1313161555.json new file mode 100644 index 00000000..ec7de60c --- /dev/null +++ b/ethereum/.openzeppelin/unknown-1313161555.json @@ -0,0 +1,221 @@ +{ + "manifestVersion": "3.2", + "proxies": [ + { + "address": "0x4305FB66699C3B2702D4d05CF36551390A4c69C6", + "txHash": "0xcb2ad36f327e73f0aa55c8b18fd87881c5d5d83c324fdbfe133c471759a54825", + "kind": "uups" + } + ], + "impls": { + "5c31ffd0774368a91446d42c3ea317dd996266a4587c3c67efd448d66ae5e5c9": { + "address": "0xff1a0f4744e8582DF1aE09D5611b887B6a12925C", + "txHash": "0xa7226a94b27d1e678964cca8579f8fc6403dbcf2aedadbaac056f0bf9e391551", + "layout": { + "storage": [ + { + "contract": "Initializable", + "label": "_initialized", + "type": "t_bool", + "src": "../@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:39" + }, + { + "contract": "Initializable", + "label": "_initializing", + "type": "t_bool", + "src": "../@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:44" + }, + { + "contract": "ContextUpgradeable", + "label": "__gap", + "type": "t_array(t_uint256)50_storage", + "src": "../@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "contract": "OwnableUpgradeable", + "label": "_owner", + "type": "t_address", + "src": "../@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22" + }, + { + "contract": "OwnableUpgradeable", + "label": "__gap", + "type": "t_array(t_uint256)49_storage", + "src": "../@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:87" + }, + { + "contract": "ERC1967UpgradeUpgradeable", + "label": "__gap", + "type": "t_array(t_uint256)50_storage", + "src": "../@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "contract": "UUPSUpgradeable", + "label": "__gap", + "type": "t_array(t_uint256)50_storage", + "src": "../@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "contract": "PythState", + "label": "_state", + "type": "t_struct(State)3714_storage", + "src": "../project:/contracts/pyth/PythState.sol:21" + } + ], + "types": { + "t_struct(State)3714_storage": { + "label": "struct PythStorage.State", + "members": [ + { + "label": "wormhole", + "type": "t_address_payable" + }, + { + "label": "pyth2WormholeChainId", + "type": "t_uint16" + }, + { + "label": "pyth2WormholeEmitter", + "type": "t_bytes32" + }, + { + "label": "latestPriceInfo", + "type": "t_mapping(t_bytes32,t_struct(PriceInfo)3636_storage)" + } + ] + }, + "t_address_payable": { + "label": "address payable" + }, + "t_uint16": { + "label": "uint16" + }, + "t_bytes32": { + "label": "bytes32" + }, + "t_mapping(t_bytes32,t_struct(PriceInfo)3636_storage)": { + "label": "mapping(bytes32 => struct PythInternalStructs.PriceInfo)" + }, + "t_struct(PriceInfo)3636_storage": { + "label": "struct PythInternalStructs.PriceInfo", + "members": [ + { + "label": "attestationTime", + "type": "t_uint256" + }, + { + "label": "arrivalTime", + "type": "t_uint256" + }, + { + "label": "arrivalBlock", + "type": "t_uint256" + }, + { + "label": "priceFeed", + "type": "t_struct(PriceFeed)2228_storage" + } + ] + }, + "t_uint256": { + "label": "uint256" + }, + "t_struct(PriceFeed)2228_storage": { + "label": "struct PythStructs.PriceFeed", + "members": [ + { + "label": "id", + "type": "t_bytes32" + }, + { + "label": "productId", + "type": "t_bytes32" + }, + { + "label": "price", + "type": "t_int64" + }, + { + "label": "conf", + "type": "t_uint64" + }, + { + "label": "expo", + "type": "t_int32" + }, + { + "label": "status", + "type": "t_enum(PriceStatus)2233" + }, + { + "label": "maxNumPublishers", + "type": "t_uint32" + }, + { + "label": "numPublishers", + "type": "t_uint32" + }, + { + "label": "emaPrice", + "type": "t_int64" + }, + { + "label": "emaConf", + "type": "t_uint64" + }, + { + "label": "publishTime", + "type": "t_uint64" + }, + { + "label": "prevPrice", + "type": "t_int64" + }, + { + "label": "prevConf", + "type": "t_uint64" + }, + { + "label": "prevPublishTime", + "type": "t_uint64" + } + ] + }, + "t_int64": { + "label": "int64" + }, + "t_uint64": { + "label": "uint64" + }, + "t_int32": { + "label": "int32" + }, + "t_enum(PriceStatus)2233": { + "label": "enum PythStructs.PriceStatus", + "members": [ + "UNKNOWN", + "TRADING", + "HALTED", + "AUCTION" + ] + }, + "t_uint32": { + "label": "uint32" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]" + }, + "t_address": { + "label": "address" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]" + }, + "t_bool": { + "label": "bool" + } + } + } + } + } +} diff --git a/ethereum/networks/1313161555.json b/ethereum/networks/1313161555.json new file mode 100644 index 00000000..5a0f8e91 --- /dev/null +++ b/ethereum/networks/1313161555.json @@ -0,0 +1,11 @@ +[ + { + "contractName": "Migrations", + "address": "0x1c6Cd107fB71768FBc46F8B6180Eec155C03eEb5" + }, + { + "contractName": "PythUpgradable", + "address": "0x4305FB66699C3B2702D4d05CF36551390A4c69C6", + "transactionHash": "0xcb2ad36f327e73f0aa55c8b18fd87881c5d5d83c324fdbfe133c471759a54825" + } +] \ No newline at end of file diff --git a/ethereum/truffle-config.js b/ethereum/truffle-config.js index 4dbec043..240dc3e0 100644 --- a/ethereum/truffle-config.js +++ b/ethereum/truffle-config.js @@ -144,8 +144,8 @@ module.exports = { ) }, network_id: 0x4e454153, - gas: 70000000, - gasPrice: 8000000000, + gas: 10000000, + from: "0xC42e9476b0a458097087336e2395Dbf45B0BdC12", // public key }, fantom: { provider: () => {