From 632a0613b00179b550a2de5e947c253c4e498620 Mon Sep 17 00:00:00 2001 From: Ludo Galabru Date: Thu, 17 Aug 2023 11:36:11 +0200 Subject: [PATCH] chore: update contract names --- Clarinet.toml | 12 ++++--- ....clar => wormhole-core-dev-preview-1.clar} | 5 +++ ...v1.clar => pyth-oracle-dev-preview-1.clar} | 6 ++-- deployments/default.devnet-plan.yaml | 32 +++++++++++++------ 4 files changed, 40 insertions(+), 15 deletions(-) rename contracts/deps/{wormhole-core-v1.clar => wormhole-core-dev-preview-1.clar} (99%) rename contracts/{pyth-oracle-v1.clar => pyth-oracle-dev-preview-1.clar} (99%) diff --git a/Clarinet.toml b/Clarinet.toml index 84dae6a..bda53dc 100644 --- a/Clarinet.toml +++ b/Clarinet.toml @@ -6,16 +6,20 @@ telemetry = false cache_dir = './.cache' requirements = [] -[contracts.pyth-oracle-v1] -path = 'contracts/pyth-oracle-v1.clar' +[contracts.pyth-oracle-dev-preview-1] +path = 'contracts/pyth-oracle-dev-preview-1.clar' clarity_version = 2 epoch = 2.4 -[contracts.wormhole-core-v1] -path = 'contracts/deps/wormhole-core-v1.clar' +[contracts.wormhole-core-dev-preview-1] +path = 'contracts/deps/wormhole-core-dev-preview-1.clar' clarity_version = 2 epoch = 2.4 +[contracts.pyth-oracle-trait] +path = 'contracts/pyth-oracle-trait.clar' +clarity_version = 2 +epoch = 2.4 [contracts.wormhole-core-trait] path = 'contracts/deps/wormhole-core-trait.clar' diff --git a/contracts/deps/wormhole-core-v1.clar b/contracts/deps/wormhole-core-dev-preview-1.clar similarity index 99% rename from contracts/deps/wormhole-core-v1.clar rename to contracts/deps/wormhole-core-dev-preview-1.clar index f6a8e40..70d22df 100644 --- a/contracts/deps/wormhole-core-v1.clar +++ b/contracts/deps/wormhole-core-dev-preview-1.clar @@ -3,6 +3,11 @@ ;; Summary: ;; Description: +;;;; Todo +;; - Check for non redundant signatures +;; - Double check the approach uncompressed / compressed / eth address +;; - Transition to new guardian sets + ;;;; Traits ;; Implements trait specified in wormhole-core-trait contract diff --git a/contracts/pyth-oracle-v1.clar b/contracts/pyth-oracle-dev-preview-1.clar similarity index 99% rename from contracts/pyth-oracle-v1.clar rename to contracts/pyth-oracle-dev-preview-1.clar index 2a8ce84..7ffbb8d 100644 --- a/contracts/pyth-oracle-v1.clar +++ b/contracts/pyth-oracle-dev-preview-1.clar @@ -3,8 +3,10 @@ ;; Summary: ;; Description: -;;;; Traits +;;;; Todo +;; - Update watched price feed ids +;;;; Traits ;;;; Constants ;; @@ -137,7 +139,7 @@ ;;;; Private functions ;; (define-private (parse-and-verify-vaa (vaa-bytes (buff 2048))) - (let ((vaa (unwrap-panic (contract-call? .wormhole-core-v1 parse-and-verify-vaa vaa-bytes)))) + (let ((vaa (unwrap-panic (contract-call? .wormhole-core-dev-preview-1 parse-and-verify-vaa vaa-bytes)))) ;; try! (get payload vaa))) (define-private (parse-price-feed-header (pf-bytes (buff 2048))) diff --git a/deployments/default.devnet-plan.yaml b/deployments/default.devnet-plan.yaml index a792347..f56ac85 100644 --- a/deployments/default.devnet-plan.yaml +++ b/deployments/default.devnet-plan.yaml @@ -16,24 +16,38 @@ plan: anchor-block-only: true clarity-version: 2 - contract-publish: - contract-name: wormhole-core-v1 + contract-name: pyth-oracle-trait expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 273780 - path: contracts/deps/wormhole-core-v1.clar + cost: 4540 + path: contracts/pyth-oracle-trait.clar anchor-block-only: true clarity-version: 2 - contract-publish: - contract-name: pyth-oracle-v1 + contract-name: wormhole-core-trait expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 146660 - path: contracts/pyth-oracle-v1.clar + cost: 6460 + path: contracts/deps/wormhole-core-trait.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: wormhole-core-dev-preview-1 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 198550 + path: contracts/deps/wormhole-core-dev-preview-1.clar + anchor-block-only: true + clarity-version: 2 + - contract-publish: + contract-name: pyth-oracle-dev-preview-1 + expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM + cost: 160310 + path: contracts/pyth-oracle-dev-preview-1.clar anchor-block-only: true clarity-version: 2 epoch: "2.4" - id: 1 transactions: - contract-call: - contract-id: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM.wormhole-core-v1 + contract-id: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM.wormhole-core-dev-preview-1 expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM method: update-guardians-set parameters: @@ -62,7 +76,7 @@ plan: 0x21f338444e96af31cf44958acf5764844efbddace3b823ed761c340c59ed2685d829818c83eebe8f00f783f1048a53515845536668a9e0c059ade7579a0f4204)' cost: 5960 - contract-call: - contract-id: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM.wormhole-core-v1 + contract-id: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM.wormhole-core-dev-preview-1 expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM method: update-guardians-set parameters: @@ -91,7 +105,7 @@ plan: 0x21f338444e96af31cf44958acf5764844efbddace3b823ed761c340c59ed2685d829818c83eebe8f00f783f1048a53515845536668a9e0c059ade7579a0f4204)' cost: 5960 - contract-call: - contract-id: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM.wormhole-core-v1 + contract-id: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM.wormhole-core-dev-preview-1 expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM method: update-guardians-set parameters: