diff --git a/deploy.zsh b/deploy.zsh index a4bfc2f..fe35b32 100755 --- a/deploy.zsh +++ b/deploy.zsh @@ -20,12 +20,12 @@ then echo "production deployment ..." dfx canister --network $network create $mode ID=$(dfx canister --network $network id $mode) -dfx deploy --network $network --argument "(principal \"$ID\")" $mode +DFX_MOC_PATH="$(vessel bin)/moc" dfx deploy --network $network --argument "(principal \"$ID\")" $mode else echo "staging deployment ..." dfx canister --network $network create $mode ID=$(dfx canister --network $network id $mode) -yes yes| dfx deploy --network $network --argument "(principal \"$ID\")" --mode=reinstall $mode +yes yes| DFX_MOC_PATH="$(vessel bin)/moc" dfx deploy --network $network --argument "(principal \"$ID\")" --mode=reinstall $mode fi diff --git a/package-set.dhall b/package-set.dhall index 737ca52..0ade155 100644 --- a/package-set.dhall +++ b/package-set.dhall @@ -1,4 +1,4 @@ -let upstream = https://github.com/dfinity/vessel-package-set/releases/download/mo-0.6.21-20220215/package-set.dhall sha256:b46f30e811fe5085741be01e126629c2a55d4c3d6ebf49408fb3b4a98e37589b +let upstream = https://github.com/dfinity/vessel-package-set/releases/download/mo-0.7.5-20230118/package-set.dhall let Package = { name : Text, version : Text, repo : Text, dependencies : List Text } let additions = [ @@ -52,11 +52,6 @@ let additions = [ , version = "v0.0.4" , dependencies = ["base"] : List Text }, - { name = "base" - , repo = "https://github.com/dfinity/motoko-base.git" - , version = "moc-0.7.4" - , dependencies = [] : List Text - } ] : List Package let overrides = [] : List Package diff --git a/package.json b/package.json index 9c6e44e..8c73a5b 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,8 @@ "replica": "dfx stop && dfx start --clean --background && dfx canister create staging && dfx canister create ledger", "deploy": "npm run deploy:staging && npm run deploy:ledger", "deploy-qq": "npm run deploy:staging -- -qq && npm run deploy:ledger -- -qq", - "deploy:staging": "dfx deploy staging --mode reinstall -y --argument '(principal \"'$(dfx canister id staging)'\")'", - "deploy:ledger": "dfx deploy ledger --mode reinstall -y --argument '(record {minting_account = \"e82226d3101bd8525111e2c6501a79365f2484d82d3f2be96269b78fe200eeaa\"; initial_values = vec { record { \"8b61ff722d7e6321eb99bb607ab0cf323b3c64b43d6a13c245c8a4e197f7b38b\"; record { e8s=1_000_000_000_000_000 } }; }; send_whitelist = vec {}})'", + "deploy:staging": "DFX_MOC_PATH=\"$(vessel bin)/moc\" dfx deploy staging --mode reinstall -y --argument '(principal \"'$(dfx canister id staging)'\")'", + "deploy:ledger": "DFX_MOC_PATH=\"$(vessel bin)/moc\" dfx deploy ledger --mode reinstall -y --argument '(record {minting_account = \"e82226d3101bd8525111e2c6501a79365f2484d82d3f2be96269b78fe200eeaa\"; initial_values = vec { record { \"8b61ff722d7e6321eb99bb607ab0cf323b3c64b43d6a13c245c8a4e197f7b38b\"; record { e8s=1_000_000_000_000_000 } }; }; send_whitelist = vec {}})'", "mint": "dfx canister call staging addAsset '(record {name = \"privat\";payload = record {ctype = \"text/html\"; data = vec {blob \"hello world!\"} } })' && dfx canister call staging initMint && dfx canister call staging shuffleTokensForSale && dfx canister call staging enableSale", "enable-sale": "dfx canister call staging enableSale", "vitest": "vitest run", diff --git a/vessel.dhall b/vessel.dhall index 92d96f9..a3e281d 100644 --- a/vessel.dhall +++ b/vessel.dhall @@ -1,5 +1,5 @@ { - dependencies = [ "base", "asset-storage", "sha", "cap", "accountid", "canistergeek" ], - compiler = Some "0.7.4" + dependencies = [ "base", "cap", "accountid", "canistergeek" ], + compiler = Some "0.7.5" }