chore: simplify admin_add_supported_payment API

zensh · zensh · commit ec755aca0352 · 2025-11-11T08:20:53.000+08:00
diff --git a/declarations/anda_x402_canister/anda_x402_canister.did b/declarations/anda_x402_canister/anda_x402_canister.did
@@ -27,13 +27,13 @@ type PaymentLogInfo = record {
 };
 type Result = variant { Ok; Err : text };
 type Result_1 = variant { Ok : nat; Err : text };
-type Result_2 = variant { Ok : State; Err : text };
+type Result_2 = variant { Ok : StateInfo; Err : text };
 type Result_3 = variant { Ok : PayerStateInfo; Err : text };
 type Result_4 = variant { Ok : vec PaymentLogInfo; Err : text };
 type Result_5 = variant { Ok : nat64; Err : text };
 type Result_6 = variant { Ok : text; Err : text };
 type Scheme = variant { Exact; Upto };
-type State = record {
+type StateInfo = record {
   total_withdrawn_fees : vec record { principal; nat };
   supported_payments : vec SupportedPaymentKind;
   total_collected_fees : vec record { principal; nat };
@@ -53,18 +53,18 @@ type UpgradeArgs = record {
 };
 type X402Version = variant { V1 };
 service : (opt CanisterArgs) -> {
-  admin_add_supported_payment : (X402Version, Scheme) -> (Result);
+  admin_add_supported_payment : (nat8, text) -> (Result);
   admin_collect_fees : (principal, principal, nat) -> (Result_1);
   admin_remove_supported_asset : (principal) -> (Result);
-  admin_remove_supported_payment : (X402Version, Scheme) -> (Result);
+  admin_remove_supported_payment : (nat8, text) -> (Result);
   admin_update_supported_asset : (principal, nat) -> (Result);
   info : () -> (Result_2) query;
   my_info : () -> (Result_3) query;
   my_payment_logs : (nat32, opt nat64) -> (Result_4) query;
   next_nonce : () -> (Result_5) query;
-  validate_admin_add_supported_payment : (X402Version, Scheme) -> (Result_6);
+  validate_admin_add_supported_payment : (nat8, text) -> (Result_6);
   validate_admin_collect_fees : (principal, principal, nat) -> (Result_6);
-  validate_admin_remove_supported_payment : (X402Version, Scheme) -> (Result_6);
+  validate_admin_remove_supported_payment : (nat8, text) -> (Result_6);
   validate_admin_update_supported_asset : (principal, nat) -> (Result_6);
   validate_remove_update_supported_asset : (principal) -> (Result_6);
 }
diff --git a/declarations/anda_x402_canister/anda_x402_canister.did.d.ts b/declarations/anda_x402_canister/anda_x402_canister.did.d.ts
@@ -37,7 +37,7 @@ export type Result = { 'Ok' : null } |
   { 'Err' : string };
 export type Result_1 = { 'Ok' : bigint } |
   { 'Err' : string };
-export type Result_2 = { 'Ok' : State } |
+export type Result_2 = { 'Ok' : StateInfo } |
   { 'Err' : string };
 export type Result_3 = { 'Ok' : PayerStateInfo } |
   { 'Err' : string };
@@ -49,7 +49,7 @@ export type Result_6 = { 'Ok' : string } |
   { 'Err' : string };
 export type Scheme = { 'Exact' : null } |
   { 'Upto' : null };
-export interface State {
+export interface StateInfo {
   'total_withdrawn_fees' : Array<[Principal, bigint]>,
   'supported_payments' : Array<SupportedPaymentKind>,
   'total_collected_fees' : Array<[Principal, bigint]>,
@@ -69,25 +69,25 @@ export interface UpgradeArgs {
 }
 export type X402Version = { 'V1' : null };
 export interface _SERVICE {
-  'admin_add_supported_payment' : ActorMethod<[X402Version, Scheme], Result>,
+  'admin_add_supported_payment' : ActorMethod<[number, string], Result>,
   'admin_collect_fees' : ActorMethod<[Principal, Principal, bigint], Result_1>,
   'admin_remove_supported_asset' : ActorMethod<[Principal], Result>,
-  'admin_remove_supported_payment' : ActorMethod<[X402Version, Scheme], Result>,
+  'admin_remove_supported_payment' : ActorMethod<[number, string], Result>,
   'admin_update_supported_asset' : ActorMethod<[Principal, bigint], Result>,
   'info' : ActorMethod<[], Result_2>,
   'my_info' : ActorMethod<[], Result_3>,
   'my_payment_logs' : ActorMethod<[number, [] | [bigint]], Result_4>,
   'next_nonce' : ActorMethod<[], Result_5>,
   'validate_admin_add_supported_payment' : ActorMethod<
-    [X402Version, Scheme],
+    [number, string],
     Result_6
   >,
   'validate_admin_collect_fees' : ActorMethod<
     [Principal, Principal, bigint],
     Result_6
   >,
   'validate_admin_remove_supported_payment' : ActorMethod<
-    [X402Version, Scheme],
+    [number, string],
     Result_6
   >,
   'validate_admin_update_supported_asset' : ActorMethod<
diff --git a/declarations/anda_x402_canister/anda_x402_canister.did.js b/declarations/anda_x402_canister/anda_x402_canister.did.js
@@ -11,10 +11,10 @@ export const idlFactory = ({ IDL }) => {
     'Upgrade' : UpgradeArgs,
     'Init' : InitArgs,
   });
-  const X402Version = IDL.Variant({ 'V1' : IDL.Null });
-  const Scheme = IDL.Variant({ 'Exact' : IDL.Null, 'Upto' : IDL.Null });
   const Result = IDL.Variant({ 'Ok' : IDL.Null, 'Err' : IDL.Text });
   const Result_1 = IDL.Variant({ 'Ok' : IDL.Nat, 'Err' : IDL.Text });
+  const Scheme = IDL.Variant({ 'Exact' : IDL.Null, 'Upto' : IDL.Null });
+  const X402Version = IDL.Variant({ 'V1' : IDL.Null });
   const SupportedPaymentKind = IDL.Record({
     'scheme' : Scheme,
     'network' : IDL.Text,
@@ -28,7 +28,7 @@ export const idlFactory = ({ IDL }) => {
     'payment_fee' : IDL.Nat,
     'symbol' : IDL.Text,
   });
-  const State = IDL.Record({
+  const StateInfo = IDL.Record({
     'total_withdrawn_fees' : IDL.Vec(IDL.Tuple(IDL.Principal, IDL.Nat)),
     'supported_payments' : IDL.Vec(SupportedPaymentKind),
     'total_collected_fees' : IDL.Vec(IDL.Tuple(IDL.Principal, IDL.Nat)),
@@ -37,7 +37,7 @@ export const idlFactory = ({ IDL }) => {
     'supported_assets' : IDL.Vec(IDL.Tuple(IDL.Principal, AssetInfo)),
     'key_name' : IDL.Text,
   });
-  const Result_2 = IDL.Variant({ 'Ok' : State, 'Err' : IDL.Text });
+  const Result_2 = IDL.Variant({ 'Ok' : StateInfo, 'Err' : IDL.Text });
   const PayerStateInfo = IDL.Record({
     'next_nonce' : IDL.Nat64,
     'logs' : IDL.Vec(IDL.Nat64),
@@ -64,7 +64,7 @@ export const idlFactory = ({ IDL }) => {
   const Result_6 = IDL.Variant({ 'Ok' : IDL.Text, 'Err' : IDL.Text });
   return IDL.Service({
     'admin_add_supported_payment' : IDL.Func(
-        [X402Version, Scheme],
+        [IDL.Nat8, IDL.Text],
         [Result],
         [],
       ),
@@ -75,7 +75,7 @@ export const idlFactory = ({ IDL }) => {
       ),
     'admin_remove_supported_asset' : IDL.Func([IDL.Principal], [Result], []),
     'admin_remove_supported_payment' : IDL.Func(
-        [X402Version, Scheme],
+        [IDL.Nat8, IDL.Text],
         [Result],
         [],
       ),
@@ -93,7 +93,7 @@ export const idlFactory = ({ IDL }) => {
       ),
     'next_nonce' : IDL.Func([], [Result_5], ['query']),
     'validate_admin_add_supported_payment' : IDL.Func(
-        [X402Version, Scheme],
+        [IDL.Nat8, IDL.Text],
         [Result_6],
         [],
       ),
@@ -103,7 +103,7 @@ export const idlFactory = ({ IDL }) => {
         [],
       ),
     'validate_admin_remove_supported_payment' : IDL.Func(
-        [X402Version, Scheme],
+        [IDL.Nat8, IDL.Text],
         [Result_6],
         [],
       ),
diff --git a/declarations/anda_x402_canister/anda_x402_canister.mo b/declarations/anda_x402_canister/anda_x402_canister.mo
@@ -31,13 +31,13 @@ module {
   };
   public type Result = { #Ok; #Err : Text };
   public type Result_1 = { #Ok : Nat; #Err : Text };
-  public type Result_2 = { #Ok : State; #Err : Text };
+  public type Result_2 = { #Ok : StateInfo; #Err : Text };
   public type Result_3 = { #Ok : PayerStateInfo; #Err : Text };
   public type Result_4 = { #Ok : [PaymentLogInfo]; #Err : Text };
   public type Result_5 = { #Ok : Nat64; #Err : Text };
   public type Result_6 = { #Ok : Text; #Err : Text };
   public type Scheme = { #Exact; #Upto };
-  public type State = {
+  public type StateInfo = {
     total_withdrawn_fees : [(Principal, Nat)];
     supported_payments : [SupportedPaymentKind];
     total_collected_fees : [(Principal, Nat)];
@@ -54,30 +54,27 @@ module {
   public type UpgradeArgs = { governance_canister : ?Principal; name : ?Text };
   public type X402Version = { #V1 };
   public type Self = ?CanisterArgs -> async actor {
-    admin_add_supported_payment : shared (X402Version, Scheme) -> async Result;
+    admin_add_supported_payment : shared (Nat8, Text) -> async Result;
     admin_collect_fees : shared (Principal, Principal, Nat) -> async Result_1;
     admin_remove_supported_asset : shared Principal -> async Result;
-    admin_remove_supported_payment : shared (
-        X402Version,
-        Scheme,
-      ) -> async Result;
+    admin_remove_supported_payment : shared (Nat8, Text) -> async Result;
     admin_update_supported_asset : shared (Principal, Nat) -> async Result;
     info : shared query () -> async Result_2;
     my_info : shared query () -> async Result_3;
     my_payment_logs : shared query (Nat32, ?Nat64) -> async Result_4;
     next_nonce : shared query () -> async Result_5;
     validate_admin_add_supported_payment : shared (
-        X402Version,
-        Scheme,
+        Nat8,
+        Text,
       ) -> async Result_6;
     validate_admin_collect_fees : shared (
         Principal,
         Principal,
         Nat,
       ) -> async Result_6;
     validate_admin_remove_supported_payment : shared (
-        X402Version,
-        Scheme,
+        Nat8,
+        Text,
       ) -> async Result_6;
     validate_admin_update_supported_asset : shared (
         Principal,
diff --git a/rs/anda_x402_canister/anda_x402_canister.did b/rs/anda_x402_canister/anda_x402_canister.did
@@ -27,13 +27,13 @@ type PaymentLogInfo = record {
 };
 type Result = variant { Ok; Err : text };
 type Result_1 = variant { Ok : nat; Err : text };
-type Result_2 = variant { Ok : State; Err : text };
+type Result_2 = variant { Ok : StateInfo; Err : text };
 type Result_3 = variant { Ok : PayerStateInfo; Err : text };
 type Result_4 = variant { Ok : vec PaymentLogInfo; Err : text };
 type Result_5 = variant { Ok : nat64; Err : text };
 type Result_6 = variant { Ok : text; Err : text };
 type Scheme = variant { Exact; Upto };
-type State = record {
+type StateInfo = record {
   total_withdrawn_fees : vec record { principal; nat };
   supported_payments : vec SupportedPaymentKind;
   total_collected_fees : vec record { principal; nat };
@@ -53,18 +53,18 @@ type UpgradeArgs = record {
 };
 type X402Version = variant { V1 };
 service : (opt CanisterArgs) -> {
-  admin_add_supported_payment : (X402Version, Scheme) -> (Result);
+  admin_add_supported_payment : (nat8, text) -> (Result);
   admin_collect_fees : (principal, principal, nat) -> (Result_1);
   admin_remove_supported_asset : (principal) -> (Result);
-  admin_remove_supported_payment : (X402Version, Scheme) -> (Result);
+  admin_remove_supported_payment : (nat8, text) -> (Result);
   admin_update_supported_asset : (principal, nat) -> (Result);
   info : () -> (Result_2) query;
   my_info : () -> (Result_3) query;
   my_payment_logs : (nat32, opt nat64) -> (Result_4) query;
   next_nonce : () -> (Result_5) query;
-  validate_admin_add_supported_payment : (X402Version, Scheme) -> (Result_6);
+  validate_admin_add_supported_payment : (nat8, text) -> (Result_6);
   validate_admin_collect_fees : (principal, principal, nat) -> (Result_6);
-  validate_admin_remove_supported_payment : (X402Version, Scheme) -> (Result_6);
+  validate_admin_remove_supported_payment : (nat8, text) -> (Result_6);
   validate_admin_update_supported_asset : (principal, nat) -> (Result_6);
   validate_remove_update_supported_asset : (principal) -> (Result_6);
 }
diff --git a/rs/anda_x402_canister/src/api_admin.rs b/rs/anda_x402_canister/src/api_admin.rs
@@ -1,21 +1,22 @@
 use anda_cloud_cdk::x402::{Scheme, SupportedPaymentKind, X402Version};
 use candid::{Nat, Principal};
 use icrc_ledger_types::icrc1::account::Account;
+use std::str::FromStr;
 
 use crate::{
     helper::{pretty_format, token_info, transfer_token_to},
     store,
 };
 
 #[ic_cdk::update(guard = "is_controller")]
-fn admin_add_supported_payment(x402_version: X402Version, scheme: Scheme) -> Result<(), String> {
+fn admin_add_supported_payment(x402_version: u8, scheme: String) -> Result<(), String> {
     let payment = SupportedPaymentKind {
-        x402_version,
-        scheme,
+        x402_version: X402Version::try_from(x402_version).map_err(|err| err.to_string())?,
+        scheme: Scheme::from_str(&scheme).map_err(|err| err.to_string())?,
         network: "icp".to_string(),
     };
 
-    if scheme == Scheme::Upto {
+    if payment.scheme == Scheme::Upto {
         return Err("Scheme::Upto is not supported".to_string());
     }
     store::state::with_mut(|s| {
@@ -26,33 +27,31 @@ fn admin_add_supported_payment(x402_version: X402Version, scheme: Scheme) -> Res
 
 #[ic_cdk::update]
 fn validate_admin_add_supported_payment(
-    x402_version: X402Version,
-    scheme: Scheme,
+    x402_version: u8,
+    scheme: String,
 ) -> Result<String, String> {
-    if scheme == Scheme::Upto {
+    if scheme == Scheme::Upto.to_string() {
         return Err("Scheme::Upto is not supported".to_string());
     }
 
     pretty_format(&(x402_version, scheme))
 }
 
 #[ic_cdk::update(guard = "is_controller")]
-fn admin_remove_supported_payment(x402_version: X402Version, scheme: Scheme) -> Result<(), String> {
-    let payment = SupportedPaymentKind {
-        x402_version,
-        scheme,
-        network: "icp".to_string(),
-    };
+fn admin_remove_supported_payment(x402_version: u8, scheme: String) -> Result<(), String> {
+    let x402_version = X402Version::try_from(x402_version).map_err(|err| err.to_string())?;
+    let scheme = Scheme::from_str(&scheme).map_err(|err| err.to_string())?;
     store::state::with_mut(|s| {
-        s.supported_payments.retain(|p| p != &payment);
+        s.supported_payments
+            .retain(|p| p.x402_version != x402_version || p.scheme != scheme);
         Ok(())
     })
 }
 
 #[ic_cdk::update]
 fn validate_admin_remove_supported_payment(
-    x402_version: X402Version,
-    scheme: Scheme,
+    x402_version: u8,
+    scheme: String,
 ) -> Result<String, String> {
     pretty_format(&(x402_version, scheme))
 }
diff --git a/rs/anda_x402_canister/src/lib.rs b/rs/anda_x402_canister/src/lib.rs
@@ -1,4 +1,3 @@
-use anda_cloud_cdk::x402::{Scheme, X402Version};
 use candid::{Nat, Principal};
 
 use crate::api_init::CanisterArgs;
diff --git a/ts/anda_cloud_website/src/routes/+layout.ts b/ts/anda_cloud_website/src/routes/+layout.ts
@@ -1 +1,3 @@
-export const prerender = true
+export const prerender = 'auto'
+export const ssr = false
+export const trailingSlash = 'never'

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-use anda_cloud_cdk::x402::{Scheme, X402Version};`
`2`	`1`	`use candid::{Nat, Principal};`
`3`	`2`
`4`	`3`	`use crate::api_init::CanisterArgs;`