uint512 -> uint256 for ecdsa opcodes

algorandfoundation · Nov 13, 2023 · 46eb1f3 · 46eb1f3
1 parent 73f71d3
commit 46eb1f3
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 26 deletions.
diff --git a/src/lib/compiler.ts b/src/lib/compiler.ts
@@ -776,16 +776,16 @@ export default class Compiler {
 
         this.pushLines(
           node,
-          `byte 0x${'FF'.repeat(64)}`,
+          `byte 0x${'FF'.repeat(32)}`,
           'b&',
           'swap',
-          `byte 0x${'FF'.repeat(64)}`,
+          `byte 0x${'FF'.repeat(32)}`,
           'b&',
           'swap',
           'concat'
         );
 
-        this.lastType = '[uint512,uint512]';
+        this.lastType = '[uint256,uint256]';
       },
     },
     ecdsa_pk_recover: {
@@ -824,16 +824,16 @@ export default class Compiler {
 
         this.pushLines(
           node,
-          `byte 0x${'FF'.repeat(64)}`,
+          `byte 0x${'FF'.repeat(32)}`,
           'b&',
           'swap',
-          `byte 0x${'FF'.repeat(64)}`,
+          `byte 0x${'FF'.repeat(32)}`,
           'b&',
           'swap',
           'concat'
         );
 
-        this.lastType = '[uint512,uint512]';
+        this.lastType = '[uint256,uint256]';
       },
     },
     // Global methods

diff --git a/tests/contracts/artifacts/GeneralTest.approval.teal b/tests/contracts/artifacts/GeneralTest.approval.teal
@@ -732,9 +732,9 @@ scratchSlot:
 	assert
 	retsub
 
-// ecdsa()(uint512,uint512)
+// ecdsa()(uint256,uint256)
 abi_route_ecdsa:
-	// execute ecdsa()(uint512,uint512)
+	// execute ecdsa()(uint256,uint256)
 	callsub ecdsa
 	int 1
 	return
@@ -755,10 +755,10 @@ ecdsa:
 	// ecdsa_pk_decompress('Secp256k1', '' as StaticArray<byte, 33>)
 	byte 0x000000000000000000000000000000000000000000000000000000000000000000 // ""
 	ecdsa_pk_decompress Secp256k1
-	byte 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+	byte 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 	b&
 	swap
-	byte 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+	byte 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 	b&
 	swap
 	concat
@@ -770,10 +770,10 @@ ecdsa:
 	byte 0x02
 	byte 0x03
 	ecdsa_pk_recover Secp256k1
-	byte 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+	byte 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 	b&
 	swap
-	byte 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+	byte 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
 	b&
 	swap
 	concat
@@ -816,7 +816,7 @@ call_NoOp:
 	method "stringSubstring()void"
 	method "idProperty()void"
 	method "scratchSlot()void"
-	method "ecdsa()(uint512,uint512)"
+	method "ecdsa()(uint256,uint256)"
 	txna ApplicationArgs 0
 	match abi_route_txnTypeEnum abi_route_txnGroupLength abi_route_asserts abi_route_verifyTxnFromArg abi_route_verifyTxnFromTxnGroup abi_route_verifyTxnCondition abi_route_verifyTxnIncludedIn abi_route_verifyTxnNotIncludedIn abi_route_submitPendingGroup abi_route_methodWithTxnArgs abi_route_shift abi_route_fromBytes abi_route_fromID abi_route_bzeroFunction abi_route_events abi_route_letOptimization abi_route_staticContractProperties abi_route_numberToString abi_route_methodOnParens abi_route_stringSubstring abi_route_idProperty abi_route_scratchSlot abi_route_ecdsa
 	err

diff --git a/tests/contracts/artifacts/GeneralTest.arc32.json b/tests/contracts/artifacts/GeneralTest.arc32.json
diff --git a/tests/contracts/artifacts/GeneralTest.arc4.json b/tests/contracts/artifacts/GeneralTest.arc4.json
@@ -228,7 +228,7 @@
       "args": [],
       "desc": "",
       "returns": {
-        "type": "(uint512,uint512)",
+        "type": "(uint256,uint256)",
         "desc": ""
       }
     },

diff --git a/tests/contracts/general.algo.ts b/tests/contracts/general.algo.ts
@@ -147,7 +147,7 @@ class GeneralTest extends Contract {
     assert(this.scratch.value === 1337);
   }
 
-  ecdsa(): [uint<512>, uint<512>] {
+  ecdsa(): [uint<256>, uint<256>] {
     ecdsa_verify('Secp256k1', '' as StaticArray<byte, 32>, 1, 2, 3, 4);
     ecdsa_pk_decompress('Secp256k1', '' as StaticArray<byte, 33>);
     return ecdsa_pk_recover('Secp256k1', '' as StaticArray<byte, 32>, 1, 2, 3);

diff --git a/types/global.d.ts b/types/global.d.ts
@@ -857,10 +857,10 @@ declare function sha3_256(data: BytesLike): StaticArray<byte, 32>;
 declare function ecdsa_verify(
   curve: 'Secp256k1' | 'Secp256r1',
   data: StaticArray<byte, 32>,
-  sSignatureComponent: uint<512>,
-  rSignatureComponent: uint<512>,
-  xPubkeyComponent: uint<512>,
-  yPubkeyComponent: uint<512>
+  sSignatureComponent: uint<256>,
+  rSignatureComponent: uint<256>,
+  xPubkeyComponent: uint<256>,
+  yPubkeyComponent: uint<256>
 ): boolean;
 
 /**
@@ -873,7 +873,7 @@ declare function ecdsa_verify(
 declare function ecdsa_pk_decompress(
   curve: 'Secp256k1' | 'Secp256r1',
   pubKey: StaticArray<byte, 33>
-): [uint<512>, uint<512>];
+): [uint<256>, uint<256>];
 
 /**
  *
@@ -889,9 +889,9 @@ declare function ecdsa_pk_recover(
   curve: 'Secp256k1' | 'Secp256r1',
   data: StaticArray<byte, 32>,
   recoveryID: uint64,
-  sSignatureComponent: uint<512>,
-  rSignatureComponent: uint<512>
-): [uint<512>, uint<512>];
+  sSignatureComponent: uint<256>,
+  rSignatureComponent: uint<256>
+): [uint<256>, uint<256>];
 
 /**
  * Returns zero bytes of the given size.