Merge branch 'main' into feat(frontend)/add-sol-loader-components

dfx.json

@@ -297,7 +297,18 @@
 		"rewards": {
 			"type": "custom",
 			"candid": "https://github.com/dfinity/oisy-wallet/releases/download/rc0.0.0/rewards.did",
-			"wasm": "https://github.com/dfinity/oisy-wallet/releases/download/rc0.0.0/rewards.wasm.gz"
+			"wasm": "https://github.com/dfinity/oisy-wallet/releases/download/rc0.0.0/rewards.wasm.gz",
+			"remote": {
+				"id": {
+					"ic": "nynz6-haaaa-aaaan-qzqda-cai",
+					"staging": "vi6cu-aiaaa-aaaad-aad7q-cai",
+					"test_be_1": "k2sla-fiaaa-aaaag-atvfa-cai",
+					"test_fe_1": "vi6cu-aiaaa-aaaad-aad7q-cai",
+					"test_fe_2": "vi6cu-aiaaa-aaaad-aad7q-cai",
+					"test_fe_3": "vi6cu-aiaaa-aaaad-aad7q-cai",
+					"test_fe_4": "vi6cu-aiaaa-aaaad-aad7q-cai"
+				}
+			}
 		}
 	},
 	"defaults": {

package.json

@@ -101,7 +101,7 @@
 		"prettier-plugin-organize-imports": "^4.1.0",
 		"prettier-plugin-svelte": "^3.3.2",
 		"prettier-plugin-tailwindcss": "^0.6.9",
-		"sass": "^1.83.0",
+		"sass": "^1.83.1",
 		"svelte": "^4.2.19",
 		"svelte-check": "^4.1.1",
 		"tailwindcss": "^3.4.17",

scripts/deploy.backend.sh

@@ -4,6 +4,8 @@ II_CANISTER_ID="$(dfx canister id internet_identity --network "${ENV:-local}")"
 BACKEND_CANISTER_ID="$(dfx canister id backend --network "${ENV:-local}")"
 POUH_ISSUER_CANISTER_ID="$(dfx canister id pouh_issuer --network "${ENV:-local}")"
 SIGNER_CANISTER_ID="$(dfx canister id signer --network "${ENV:-local}")"
+# Rewards canister is optional for local deployments:
+REWARDS_CANISTER_ID="$(dfx canister id rewards --network "${ENV:-local}" || [[ "${ENV:-local}" == "local" ]])"
 
 case $ENV in
 "staging")
@@ -41,6 +43,13 @@ case $ENV in
   ;;
 esac
 
+# If the rewards canister is known, it may perform priviliged actions such as find which users are eligible for rewards.
+if [[ "${REWARDS_CANISTER_ID:-}" == "" ]]; then
+  ALLOWED_CALLERS="vec {}"
+else
+  ALLOWED_CALLERS="vec{ principal \"$REWARDS_CANISTER_ID\" }"
+fi
+
 # URL used by II-issuer in the id_alias-verifiable credentials (hard-coded in II)
 # Represents more an ID than a URL
 II_VC_URL="https://identity.ic0.app"
@@ -51,7 +60,7 @@ if [ -n "${ENV+1}" ]; then
   dfx deploy backend --argument "(variant {
     Init = record {
          ecdsa_key_name = \"$ECDSA_KEY_NAME\";
-         allowed_callers = vec {};
+         allowed_callers = $ALLOWED_CALLERS;
          cfs_canister_id = opt principal \"$SIGNER_CANISTER_ID\";
          derivation_origin = opt \"$DERIVATION_ORIGIN\";
          supported_credentials = opt vec {
@@ -71,7 +80,7 @@ else
   dfx deploy backend --argument "(variant {
     Init = record {
          ecdsa_key_name = \"$ECDSA_KEY_NAME\";
-         allowed_callers = vec {};
+         allowed_callers = $ALLOWED_CALLERS;
          cfs_canister_id = opt principal \"$SIGNER_CANISTER_ID\";
          derivation_origin = opt \"$DERIVATION_ORIGIN\";
          supported_credentials = opt vec {

src/frontend/src/lib/api/reward.api.ts

@@ -0,0 +1,58 @@
+import type {
+	ClaimVipRewardResponse,
+	NewVipRewardResponse,
+	UserData,
+	VipReward
+} from '$declarations/rewards/rewards.did';
+import { RewardCanister } from '$lib/canisters/reward.canister';
+import { REWARDS_CANISTER_ID } from '$lib/constants/app.constants';
+import type { CanisterApiFunctionParams } from '$lib/types/canister';
+import { Principal } from '@dfinity/principal';
+import { assertNonNullish, isNullish, type QueryParams } from '@dfinity/utils';
+
+let canister: RewardCanister | undefined = undefined;
+
+export const getUserInfo = async ({
+	identity,
+	certified
+}: CanisterApiFunctionParams<QueryParams>): Promise<UserData> => {
+	const { getUserInfo } = await rewardCanister({ identity });
+
+	return getUserInfo({ certified });
+};
+
+export const getNewVipReward = async ({
+	identity
+}: CanisterApiFunctionParams): Promise<NewVipRewardResponse> => {
+	const { getNewVipReward } = await rewardCanister({ identity });
+
+	return getNewVipReward();
+};
+
+export const claimVipReward = async ({
+	vipReward,
+	identity
+}: CanisterApiFunctionParams<{
+	vipReward: VipReward;
+}>): Promise<ClaimVipRewardResponse> => {
+	const { claimVipReward } = await rewardCanister({ identity });
+
+	return claimVipReward(vipReward);
+};
+
+const rewardCanister = async ({
+	identity,
+	nullishIdentityErrorMessage,
+	canisterId = REWARDS_CANISTER_ID
+}: CanisterApiFunctionParams): Promise<RewardCanister> => {
+	assertNonNullish(identity, nullishIdentityErrorMessage);
+
+	if (isNullish(canister)) {
+		canister = await RewardCanister.create({
+			identity,
+			canisterId: Principal.fromText(canisterId)
+		});
+	}
+
+	return canister;
+};