Merge pull request #450 from identity-com/develop

Solana Gateway: expireToken hotfix
identity-com · Jun 27, 2023 · 05d49c7 · 05d49c7
2 parents 88f4803 + d94bfee
commit 05d49c7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 62 deletions.
diff --git a/solana/gateway-ts/scripts/burn.ts b/solana/gateway-ts/scripts/burn.ts
diff --git a/solana/program/Cargo.toml b/solana/program/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "solana-gateway"
-version = "0.3.0"
+version = "0.3.1"
 description = "OCIV Gateway Program"
 authors = ["Daniel Kelleher <[email protected]>"]
 repository = "https://github.com/identity-com/on-chain-identity-gateway"

diff --git a/solana/program/src/processor.rs b/solana/program/src/processor.rs
@@ -362,7 +362,9 @@ fn expire_token(accounts: &[AccountInfo], gatekeeper_network: Pubkey) -> Program
 
     gateway_token.set_expire_time(Clock::get()?.unix_timestamp - 120);
 
-    Ok(())
+    gateway_token
+        .serialize(&mut *gateway_token_info.data.borrow_mut())
+        .map_err(|e| e.into()) as ProgramResult
 }
 
 fn add_feature_to_network(accounts: &[AccountInfo], feature: NetworkFeature) -> ProgramResult {

diff --git a/solana/program/tests/update_gateway_token_expiry.rs b/solana/program/tests/update_gateway_token_expiry.rs
@@ -209,6 +209,13 @@ async fn expire_token_should_succeed() {
         .process_transaction(expire_tx)
         .await
         .unwrap();
+
+    let now = GatewayContext::now();
+    let gateway_token = context
+        .get_gateway_token(&context.owner.pubkey())
+        .await
+        .unwrap();
+    assert!(gateway_token.expire_time.unwrap() <= now);
 }
 
 #[tokio::test]