crypto fixes

redstone-finance · Apr 8, 2024 · 35e7d0f · 35e7d0f
1 parent 5d2f014
commit 35e7d0f
Show file tree

Hide file tree

Showing 6 changed files with 112 additions and 12 deletions.
diff --git a/.vscode/configurationCache.log b/.vscode/configurationCache.log
@@ -1 +1 @@
-{"buildTargets":["format","test"],"launchTargets":[],"customConfigurationProvider":{"workspaceBrowse":{"browsePath":[],"compilerArgs":[]},"fileIndex":[]}}
+{"buildTargets":["build","format","test"],"launchTargets":[],"customConfigurationProvider":{"workspaceBrowse":{"browsePath":[],"compilerArgs":[]},"fileIndex":[]}}
diff --git a/.vscode/dryrun.log b/.vscode/dryrun.log
@@ -1,5 +1,5 @@
 make --dry-run --always-make --keep-going --print-directory
 make: Entering directory `/Users/lukaszkalbarczyk/Devel/redstone-fuel-sdk'
-forc-fmt
+forc fmt
 make: Leaving directory `/Users/lukaszkalbarczyk/Devel/redstone-fuel-sdk'
 
diff --git a/.vscode/targets.log b/.vscode/targets.log
@@ -10,7 +10,7 @@ make all --print-data-base --no-builtin-variables --no-builtin-rules --question
 make: *** No rule to make target `all'.  Stop.
 
 
-# Make data base, printed on Mon Apr  8 15:04:28 2024
+# Make data base, printed on Mon Apr  8 16:10:04 2024
 
 # Variables
 
@@ -155,7 +155,7 @@ MAKELEVEL := 0
 # environment
 LANG = C
 # environment
-VSCODE_PID = 19011
+VSCODE_PID = 57330
 # variable set hash-table stats:
 # Load=71/1024=7%, Rehash=0, Collisions=1/95=1%
 
@@ -195,13 +195,13 @@ format:
 #  Modification time never checked.
 #  File has not been updated.
 #  commands to execute (from `Makefile', line 4):
-	forc-fmt
+	forc fmt
 
 
 # Not a target:
 Makefile:
 #  Implicit rule search has been done.
-#  Last modified 2023-06-15 15:34:26
+#  Last modified 2024-04-08 16:07:29
 #  File has been updated.
 #  Successfully updated.
 # variable set hash-table stats:
@@ -211,18 +211,26 @@ test: format
 #  Implicit rule search has not been done.
 #  Modification time never checked.
 #  File has not been updated.
-#  commands to execute (from `Makefile', line 7):
+#  commands to execute (from `Makefile', line 10):
 	forc test
 
 
+build: format
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+#  commands to execute (from `Makefile', line 7):
+	forc build
+
+
 # Not a target:
 .DEFAULT:
 #  Implicit rule search has not been done.
 #  Modification time never checked.
 #  File has not been updated.
 
 # files hash-table stats:
-# Load=6/1024=1%, Rehash=0, Collisions=0/19=0%
+# Load=7/1024=1%, Rehash=0, Collisions=0/21=0%
 # VPATH Search Paths
 
 # No `vpath' search paths.
@@ -234,6 +242,6 @@ test: format
 # strcache size: total = 4096 / max = 4096 / min = 4096 / avg = 4096
 # strcache free: total = 4087 / max = 4087 / min = 4087 / avg = 4087
 
-# Finished Make data base on Mon Apr  8 15:04:28 2024
+# Finished Make data base on Mon Apr  8 16:10:04 2024
 
 
diff --git a/a.json b/a.json
@@ -0,0 +1,91 @@
+[
+    {
+        "LogData": {
+            "data": "af2f014c9ff62a254ee5aa0b5e91d4d3fd5d4868bc7962bf0ce7ba9d6455bc54",
+            "digest": "d2245b514ae648166d1e084cf83bbefef595c1ab84928b17ff327af29dea2e58",
+            "id": "0000000000000000000000000000000000000000000000000000000000000000",
+            "is": 10336,
+            "len": 32,
+            "pc": 35464,
+            "ptr": 225192,
+            "ra": 0,
+            "rb": 156
+        }
+    },
+    {
+        "LogData": {
+            "data": "0000000003fffdf400000000000000200000000000000020",
+            "digest": "88ba2065dc229236e6caacfb5e9f0e28ee53719a512e25346a859a574f318349",
+            "id": "0000000000000000000000000000000000000000000000000000000000000000",
+            "is": 10336,
+            "len": 24,
+            "pc": 35492,
+            "ptr": 225224,
+            "ra": 0,
+            "rb": 157
+        }
+    },
+    {
+        "LogData": {
+            "data": "c3bf80669387c2a89e419857ffb0fbd3dcd8b63667d3df1d395552834d5a4634",
+            "digest": "027a07fb877698cb3b67bac5e10d041ec917d82085b71aa7bef6cbd6235869ea",
+            "id": "0000000000000000000000000000000000000000000000000000000000000000",
+            "is": 10336,
+            "len": 32,
+            "pc": 35520,
+            "ptr": 225248,
+            "ra": 0,
+            "rb": 158
+        }
+    },
+    {
+        "LogData": {
+            "data": "0000000003fffdd300000000000000210000000000000020",
+            "digest": "64fa5d692967e1103b5fb741c18d41deb4bf16e78904e4a2277708a29940f13d",
+            "id": "0000000000000000000000000000000000000000000000000000000000000000",
+            "is": 10336,
+            "len": 24,
+            "pc": 35552,
+            "ptr": 225280,
+            "ra": 0,
+            "rb": 159
+        }
+    },
+    {
+        "Log": {
+            "id": "0000000000000000000000000000000000000000000000000000000000000000",
+            "is": 10336,
+            "pc": 35560,
+            "ra": 27,
+            "rb": 160,
+            "rc": 0,
+            "rd": 0
+        }
+    },
+    {
+        "LogData": {
+            "data": "0000000003ffff14000000000000004d000000000000004d",
+            "digest": "fc8f08b17348190aa9b2e18e19b8740911b3364569feed2f5feebad51de7cf23",
+            "id": "0000000000000000000000000000000000000000000000000000000000000000",
+            "is": 10336,
+            "len": 24,
+            "pc": 35584,
+            "ptr": 225304,
+            "ra": 0,
+            "rb": 161
+        }
+    },
+    {
+        "LogData": {
+            "data": "a78954e6ed5c4260c7f0d9cafbf952abb757b75eb26a04086607997ecb7bcb1b",
+            "digest": "96d3c4231287ff86971cfb7552abcc729829ae6be71a3f0d7ac17e41eb5473b2",
+            "id": "0000000000000000000000000000000000000000000000000000000000000000",
+            "is": 10336,
+            "len": 32,
+            "pc": 35600,
+            "ptr": 226264,
+            "ra": 0,
+            "rb": 162
+        }
+    }
+]
diff --git a/src/core/crypto.sw b/src/core/crypto.sw
@@ -13,15 +13,15 @@ use std::{
     vm::evm::ecr::ec_recover_evm_address,
     vm::evm::evm_address::EvmAddress,
 };
-use ::utils::bytes::*;
 use std::bytes_conversions::b256::*;
+use ::utils::bytes::*;
 use ::core::sample::{SAMPLE_ID_V27, SAMPLE_ID_V28, SampleDataPackage};
 
 pub fn recover_signer_address(signature_bytes: Bytes, signable_bytes: Bytes) -> EvmAddress {
     let (r_bytes, mut s_bytes) = signature_bytes.slice_tail_offset(32, 1);
     let v = signature_bytes.get(signature_bytes.len - 1).unwrap();
-    let r_number = b256::from_le_bytes(r_bytes);
-    let s_number = b256::from_le_bytes(s_bytes);
+    let r_number = b256::from_be_bytes(r_bytes);
+    let s_number = b256::from_be_bytes(s_bytes);
 
     let mut hasher = Hasher::new();
     hasher.write(signable_bytes);

diff --git a/src/core/processor.sw b/src/core/processor.sw
@@ -192,6 +192,7 @@ fn make_config(
 
     let mut signers = Vec::new();
     signers.push(SAMPLE_SIGNER_ADDRESS_0);
+
     if (with_second_signer) {
         signers.push(SAMPLE_SIGNER_ADDRESS_1);
     }