assert spender is caller

massalabs · Jul 15, 2024 · 1224849 · 1224849
1 parent 8c0eef4
commit 1224849
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/smart-contract/assembly/contracts/main.ts b/smart-contract/assembly/contracts/main.ts
@@ -46,9 +46,11 @@ export function startScheduleSendFT(binaryArgs: StaticArray<u8>): void {
   const schedule = args
     .nextSerializable<Schedule>()
     .expect('Schedule is missing or invalid');
+  assert(Context.caller() === new Address(schedule.spender), 'Unauthorized');
   checkAllowance(
     schedule.tokenAddress,
     schedule.spender,
+    // @ts-ignore
     schedule.amount * u256.fromU64(schedule.occurrences), // TODO: use SafeMathU256
   );
   scheduleAllSendFT(schedule);

diff --git a/smart-contract/assembly/internal.ts b/smart-contract/assembly/internal.ts
@@ -78,16 +78,13 @@ const schedulesPrefix = 'SCHEDULE';
 export const idCounterKey = stringToBytes('C');
 
 function getIdCounter(): u64 {
-  if (!Storage.has(idCounterKey)) {
-    return 0;
-  }
   return bytesToU64(Storage.get(idCounterKey));
 }
 
 function incrementIdCounter(): u64 {
   const counter = getIdCounter();
   const inc = counter + 1;
-  Storage.set(idCounterKey, u64ToBytes(counter + 1));
+  Storage.set(idCounterKey, u64ToBytes(inc));
   return inc;
 }