changed to new replay protection function, removed unused address primitive

Author: andygruening

Assets/SequenceSDK/EcosystemWallet/IntegrationTests/AddressTests.cs

@@ -31,8 +31,6 @@ internal class Server
                 ["signature_encode"] = async (parameters) => await new SignatureTests().SignatureEncode(parameters),
                 ["signature_concat"] = async (parameters) => await new SignatureTests().SignatureConcat(parameters),
                 ["signature_decode"] = async (parameters) => await new SignatureTests().SignatureDecode(parameters),
-                // ADDRESS
-                ["address_calculate"] = async (parameters) => await new AddressTests().Calculate(parameters),
                 // SESSION
                 ["session_empty"] = async (parameters) => await new SessionsTest().SessionEmpty(parameters),
                 ["session_encodeTopology"] = async (parameters) => await new SessionsTest().SessionEncodeTopology(parameters),

Assets/SequenceSDK/EcosystemWallet/IntegrationTests/AddressTests.cs.meta

@@ -102,12 +102,5 @@ public void CreateSessionImageHash(string inputJson)
 
             Debug.Log($"{imageHash}");
         }
-
-        [TestCase("0x8fee11e98795484615dcd9b86a9fbc2b62285931385baea72111101518d92dce", "0x5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72f", "0x2e234DAe75C793f67A35089C9d99245E1C58470b", null)]
-        public void CreateAddress(string imageHash, string factory, string module, string creationCode)
-        {
-            var address = AddressFactory.Create(imageHash.HexStringToByteArray(), factory, module, creationCode);
-            Debug.Log($"Sequence Address: {address}");
-        }
     }
 }

Assets/SequenceSDK/EcosystemWallet/IntegrationTests/Server/Server.cs

@@ -120,6 +120,12 @@ public byte[] Encode(Address self = null)
             return encoder.Encode();
         }
 
+        public byte[] Hash(Address wallet, BigInteger chainId)
+        {
+            var typedData = new TypedDataToSign(wallet, chainId, new Parented(Array.Empty<Address>(), this));
+            return typedData.GetSignPayload();
+        }
+
         public static Calls Decode(byte[] packed, Address self = null)
         {
             CallsDecoder decoder = new CallsDecoder(packed);

Assets/SequenceSDK/EcosystemWallet/UnitTests/SessionsUnitTests.cs

@@ -108,19 +108,21 @@ public async Task<bool> IsSupportedCall(Call call, Chain chain, SessionsTopology
             return (permissionIndex, sessionPermissions.permissions[permissionIndex]);
         }
 
-        public SessionCallSignature SignCall(Chain chain, Call call, int callIdx, SessionsTopology topology, BigInteger space, BigInteger nonce)
+        public SessionCallSignature SignCall(Chain chain, Calls payload, int callIdx, SessionsTopology topology, BigInteger space, BigInteger nonce)
         {
             var pvKey = _credentials.privateKey;
             var eoaWallet = new EOAWallet(pvKey);
 
-            var hashedCall = HashCallWithReplayProtection(chain, call, callIdx, space, nonce);
+            var hashedCall = HashCallWithReplayProtection(ParentAddress, chain, payload, callIdx, space, nonce);
             var signedCall = EthSignature.Sign(hashedCall, eoaWallet.privKey);
 
             var rsy = RSY.UnpackFrom65(signedCall.HexStringToByteArray());
 
             if (IsExplicit)
             {
+                var call = payload.calls[callIdx];
                 var permissionIndex = 0;
+                
                 if (!CheckCallForIncrementUsageLimit(call))
                 {
                     permissionIndex = FindSupportedPermission(call, topology).Index;
@@ -175,15 +177,11 @@ private bool CheckCallForIncrementUsageLimit(Call call)
                    ABI.ABI.FunctionSelector("incrementUsageLimit((bytes32,uint256)[])");
         }
 
-        private byte[] HashCallWithReplayProtection(Chain chain, Call call, BigInteger callIdx, BigInteger space, BigInteger nonce)
+        private byte[] HashCallWithReplayProtection(Address wallet, Chain chain, Calls calls, BigInteger callIdx, BigInteger space, BigInteger nonce)
         {
-            var chainBytes = BigInteger.Parse(chain.GetChainId()).ByteArrayFromNumber(32);
-            var spaceBytes = space.ByteArrayFromNumber(32);
-            var nonceBytes = nonce.ByteArrayFromNumber(32);
+            var payloadHash = calls.Hash(wallet, chain.AsBigInteger());
             var callIdxBytes = callIdx.ByteArrayFromNumber(32);
-            var callHashBytes = call.Hash().HexStringToByteArray();
-
-            var concatenated = ByteArrayExtensions.ConcatenateByteArrays(chainBytes, spaceBytes, nonceBytes, callIdxBytes, callHashBytes);
+            var concatenated = ByteArrayExtensions.ConcatenateByteArrays(payloadHash, callIdxBytes);
             return SequenceCoder.KeccakHash(concatenated);
         }
 

Packages/Sequence-Unity/Sequence/SequenceSDK/EcosystemWallet/Primitives/Address.meta

@@ -62,7 +62,7 @@ private async Task<SignatureOfSapientSignerLeaf> SignSapient(Chain chain, Envelo
             var signatures = new SessionCallSignature[_currentSigners.Length];
             for (var i = 0; i < _currentSigners.Length; i++)
             {
-                var signature = _currentSigners[i].SignCall(chain, calls[i], i, _sessions, envelope.payload.space, envelope.payload.nonce);
+                var signature = _currentSigners[i].SignCall(chain, envelope.payload, i, _sessions, envelope.payload.space, envelope.payload.nonce);
                 signatures[i] = signature;
             }