From af86228e5ae0213f15a9fdfc03443db410204d60 Mon Sep 17 00:00:00 2001 From: peer2 Date: Wed, 5 Nov 2025 02:57:06 +0000 Subject: [PATCH 1/3] chore: scripts for older market versions --- script/ci/v1.0.0/add-version-to-registry.sh | 42 +++++++++++++++++++ .../deploy-market-from-registry.sh | 0 .../examples/registry_add_version_args.rs | 30 ++++++++----- 3 files changed, 62 insertions(+), 10 deletions(-) create mode 100755 script/ci/v1.0.0/add-version-to-registry.sh rename script/ci/{alpha => v1.0.0}/deploy-market-from-registry.sh (100%) diff --git a/script/ci/v1.0.0/add-version-to-registry.sh b/script/ci/v1.0.0/add-version-to-registry.sh new file mode 100755 index 00000000..92b57036 --- /dev/null +++ b/script/ci/v1.0.0/add-version-to-registry.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash +set -e + +SCRIPT_DIR=$(dirname "$(readlink -f ${BASH_SOURCE[0]})") + +source "$SCRIPT_DIR/../utils.sh" + +parse_args "--account:ACCOUNT_ID,--registry:REGISTRY_ID,--version-key:VERSION_KEY,--network:NETWORK,--private-key:PRIVATE_KEY" "$@" + +if [ -z "$NETWORK" ]; then + NETWORK="testnet" +fi + +# cd "${SCRIPT_DIR}/../../contract/market" + +# echo "Building market" + +# cargo near build reproducible-wasm + + +echo "Generating Borsh arguments" + +ARGS_FILE=$(mktemp "/tmp/args-XXXXXX") +trap "rm -f $ARGS_FILE" EXIT + +cargo run --package test-utils --example registry_add_version_args -- "${VERSION_KEY}" > $ARGS_FILE + + +echo "Creating new version on registry" + +near contract call-function as-transaction "${REGISTRY_ID}" \ + add_version \ + file-args "${ARGS_FILE}" \ + prepaid-gas '300.0 Tgas' \ + attached-deposit '1 yoctoNEAR' \ + sign-as "${ACCOUNT_ID}" \ + network-config "${NETWORK}" \ + sign-with-plaintext-private-key "${PRIVATE_KEY}" \ + send + + +echo "Done" diff --git a/script/ci/alpha/deploy-market-from-registry.sh b/script/ci/v1.0.0/deploy-market-from-registry.sh similarity index 100% rename from script/ci/alpha/deploy-market-from-registry.sh rename to script/ci/v1.0.0/deploy-market-from-registry.sh diff --git a/test-utils/examples/registry_add_version_args.rs b/test-utils/examples/registry_add_version_args.rs index aba93f99..61497d98 100644 --- a/test-utils/examples/registry_add_version_args.rs +++ b/test-utils/examples/registry_add_version_args.rs @@ -3,7 +3,8 @@ use std::{fs, path::Path}; use templar_common::registry::DeployMode; pub fn main() { - let name = "templar_market_contract"; + let cliargs = std::env::args().collect::>(); + let name = &cliargs[1]; let path = Path::new(env!("CARGO_WORKSPACE_DIR")) .join("target/near/") @@ -12,14 +13,23 @@ pub fn main() { let wasm = fs::read(path).unwrap(); - let args = std::env::args().collect::>(); - let version_key = args[1].clone(); - let mode = match args[2].as_str() { - "normal" => DeployMode::Normal, - "global_hash" => DeployMode::GlobalHash, - _ => panic!("Must specify mode: (normal|global_hash)"), - }; + match &cliargs[2..] { + [version_key] => { + let args = (version_key, wasm); + near_sdk::borsh::to_writer(std::io::stdout(), &args).unwrap(); + } + [version_key, mode] => { + let mode = match mode.as_str() { + "normal" => DeployMode::Normal, + "global_hash" => DeployMode::GlobalHash, + _ => panic!("Must specify mode: (normal|global_hash)"), + }; - let args = (version_key, mode, wasm); - near_sdk::borsh::to_writer(std::io::stdout(), &args).unwrap(); + let args = (version_key, mode, wasm); + near_sdk::borsh::to_writer(std::io::stdout(), &args).unwrap(); + } + _ => { + panic!("Expects 2 or 3 arguments"); + } + } } From c6e392668937481bc713c7db2f57d55fc09781eb Mon Sep 17 00:00:00 2001 From: peer2 Date: Wed, 5 Nov 2025 08:16:57 +0000 Subject: [PATCH 2/3] chore: uncomment --- script/ci/v1.0.0/add-version-to-registry.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/script/ci/v1.0.0/add-version-to-registry.sh b/script/ci/v1.0.0/add-version-to-registry.sh index 92b57036..a8dce3d4 100755 --- a/script/ci/v1.0.0/add-version-to-registry.sh +++ b/script/ci/v1.0.0/add-version-to-registry.sh @@ -11,12 +11,11 @@ if [ -z "$NETWORK" ]; then NETWORK="testnet" fi -# cd "${SCRIPT_DIR}/../../contract/market" +cd "${SCRIPT_DIR}/../../../contract/market" -# echo "Building market" - -# cargo near build reproducible-wasm +echo "Building market" +cargo near build reproducible-wasm echo "Generating Borsh arguments" From 1ade294b2b2fc62db5a56d53ad66ddaca94f489c Mon Sep 17 00:00:00 2001 From: peer2 Date: Wed, 5 Nov 2025 08:44:31 +0000 Subject: [PATCH 3/3] fix: specify contract in add version args --- script/ci/add-version-to-registry.sh | 2 +- script/ci/v1.0.0/add-version-to-registry.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/script/ci/add-version-to-registry.sh b/script/ci/add-version-to-registry.sh index d0acdb42..315b1608 100755 --- a/script/ci/add-version-to-registry.sh +++ b/script/ci/add-version-to-registry.sh @@ -23,7 +23,7 @@ echo "Generating Borsh arguments" ARGS_FILE=$(mktemp "/tmp/args-XXXXXX") trap "rm -f $ARGS_FILE" EXIT -cargo run --package test-utils --example registry_add_version_args -- "${VERSION_KEY}" "${DEPLOY_MODE}" > $ARGS_FILE +cargo run --package test-utils --example registry_add_version_args -- templar_market_contract "${VERSION_KEY}" "${DEPLOY_MODE}" > $ARGS_FILE echo "Creating new version on registry" diff --git a/script/ci/v1.0.0/add-version-to-registry.sh b/script/ci/v1.0.0/add-version-to-registry.sh index a8dce3d4..b227e20f 100755 --- a/script/ci/v1.0.0/add-version-to-registry.sh +++ b/script/ci/v1.0.0/add-version-to-registry.sh @@ -22,7 +22,7 @@ echo "Generating Borsh arguments" ARGS_FILE=$(mktemp "/tmp/args-XXXXXX") trap "rm -f $ARGS_FILE" EXIT -cargo run --package test-utils --example registry_add_version_args -- "${VERSION_KEY}" > $ARGS_FILE +cargo run --package test-utils --example registry_add_version_args -- templar_market_contract "${VERSION_KEY}" > $ARGS_FILE echo "Creating new version on registry"