fix(token-wrapper): key Allowance storage by (owner, spender, token_id) to support multi-asset allowances (#85)

README.md

@@ -94,7 +94,7 @@ Soroban token interface, enabling the globe-wallet contract to move tokens
 on behalf of users within a session allowance.
 
 > **Important:** `approve` uses **overwrite** semantics — calling it again
-> for the same `(owner, spender)` pair **replaces** the previous allowance
+> for the same `(owner, spender, token_id)` tuple **replaces** the previous allowance
 > rather than adding to it. See the function's doc comment for details.
 >
 > See **[docs/design/architecture.md](docs/design/architecture.md)** for how
@@ -111,7 +111,7 @@ on behalf of users within a session allowance.
 | globe-wallet | `asset_removed` | (user, asset_code) |
 | globe-wallet | `spend_limit_set` | (user, asset_code, limit) |
 | globe-wallet | `spend_recorded` | (user, asset_code, amount, total, limit) |
-| token-wrapper | `approved` | (owner, spender, amount, expiry) |
+| token-wrapper | `approved` | (owner, spender, token_id, amount, expiry) |
 | token-wrapper | `transfer_from` | (spender, from, to, amount) |
 
 ## Related Repos

contracts/globe-wallet/src/lib.rs

@@ -1672,12 +1672,15 @@ mod tests {
         let user = Address::generate(&env);
         for i in 0..GlobeWallet::MAX_ASSETS {
             let code = String::from_str(&env, &std::format!("ASSET{}", i));
-            let asset = AssetInfo { code, issuer: None };
+            let asset = AssetInfo {
+                code,
+                issuer: Some(Address::generate(&env)),
+            };
             client.add_asset(&user, &asset);
         }
         let extra = AssetInfo {
             code: String::from_str(&env, "EXTRA"),
-            issuer: None,
+            issuer: Some(Address::generate(&env)),
         };
         assert_eq!(
             client.try_add_asset(&user, &extra),
@@ -1692,7 +1695,10 @@ mod tests {
         let mut assets: Vec<AssetInfo> = Vec::new(&env);
         for i in 0..GlobeWallet::MAX_ASSETS + 10 {
             let code = String::from_str(&env, &std::format!("ASSET{}", i));
-            assets.push_back(AssetInfo { code: code.clone(), issuer: None });
+            assets.push_back(AssetInfo {
+                code: code.clone(),
+                issuer: Some(Address::generate(&env)),
+            });
         }
         env.as_contract(&cid, || {
             env.storage()
@@ -1734,7 +1740,10 @@ mod tests {
         let user = Address::generate(&env);
         for i in 0..3 {
             let code = String::from_str(&env, &std::format!("ASSET{}", i));
-            let asset = AssetInfo { code, issuer: None };
+            let asset = AssetInfo {
+                code,
+                issuer: Some(Address::generate(&env)),
+            };
             client.add_asset(&user, &asset);
         }
         let removed = client.migrate_user_assets(&admin, &user);
@@ -1881,7 +1890,7 @@ mod tests {
         let never_uploaded_hash = BytesN::from_array(&env, &[42u8; 32]);
 
         // propose_upgrade should succeed even with an invalid hash
-        assert_eq!(client.try_propose_upgrade(&admin, &never_uploaded_hash, &0u32), Ok(()));
+        assert_eq!(client.try_propose_upgrade(&admin, &never_uploaded_hash, &0u32), Ok(Ok(())));
 
         // The proposal is stored
         let cid = id.clone();
@@ -2580,11 +2589,18 @@ mod tests {
 
     #[test]
     fn test_user_assets_ttl_extension_after_long_idle_period() {
-        let (env, _cid, _admin, client) = setup();
+        let (env, cid, _admin, client) = setup();
         let user = Address::generate(&env);
         client.add_asset(&user, &xlm(&env));
         client.add_asset(&user, &usdc(&env));
 
+        // Keep contract instance alive so only the persistent entry TTL is under test
+        env.as_contract(&cid, || {
+            env.storage()
+                .instance()
+                .extend_ttl(PERSISTENT_TTL_THRESHOLD, PERSISTENT_TTL_EXTEND_TO);
+        });
+
         // Jump well past the default persistent-entry TTL (4096 ledgers).
         // Without extend_ttl, the entry's default TTL would have expired
         // and the archived entry would not be readable without a restore.
@@ -2597,11 +2613,19 @@ mod tests {
 
     #[test]
     fn test_spend_limit_ttl_extension_after_long_idle_period() {
-        let (env, _cid, _admin, client) = setup();
+        let (env, cid, _admin, client) = setup();
         let user = Address::generate(&env);
         let code = String::from_str(&env, "XLM");
+        client.add_asset(&user, &xlm(&env));
         client.set_spend_limit(&user, &code, &1_000_000_i128);
 
+        // Keep contract instance alive so only the persistent entry TTL is under test
+        env.as_contract(&cid, || {
+            env.storage()
+                .instance()
+                .extend_ttl(PERSISTENT_TTL_THRESHOLD, PERSISTENT_TTL_EXTEND_TO);
+        });
+
         // Jump well past default persistent-entry TTL.
         env.ledger().with_mut(|l| l.sequence_number += 50_000);
 

contracts/globe-wallet/test_snapshots/tests/test_accept_by_wrong_address_fails.1.json

@@ -348,7 +348,7 @@
             ],
             "data": {
               "error": {
-                "contract": 3
+                "contract": 1003
               }
             }
           }
@@ -369,7 +369,7 @@
               },
               {
                 "error": {
-                  "contract": 3
+                  "contract": 1003
                 }
               }
             ],
@@ -394,7 +394,7 @@
               },
               {
                 "error": {
-                  "contract": 3
+                  "contract": 1003
                 }
               }
             ],

contracts/globe-wallet/test_snapshots/tests/test_add_and_get_assets.1.json

@@ -662,4 +662,4 @@
       "failed_call": false
     }
   ]
-}
+}

contracts/globe-wallet/test_snapshots/tests/test_add_and_list_guardians.1.json

@@ -118,6 +118,43 @@
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
                         }
                       },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "GuardianMembership"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "map": [
+                            {
+                              "key": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            },
+                            {
+                              "key": {
+                                "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
+                              },
+                              "val": {
+                                "bool": true
+                              }
+                            }
+                          ]
+                        }
+                      },
                       {
                         "key": {
                           "vec": [