Skip to content

Commit 5007915

Browse files
chaitanyapottichaitanyapotti
authored
Merge pull request #26 from torusresearch/feat/updates
Feat/updates
2 parents ddb01b7 + 3709e97 commit 5007915

7 files changed

Lines changed: 17 additions & 17 deletions

File tree

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
group 'org.torusresearch'
7-
version '3.2.1'
7+
version '3.2.2'
88

99
sourceCompatibility = 1.8
1010
targetCompatibility = 1.8
@@ -15,7 +15,7 @@ repositories {
1515
}
1616

1717
dependencies {
18-
implementation 'org.torusresearch:fetch-node-details-java:3.1.0'
18+
implementation 'org.torusresearch:fetch-node-details-java:4.1.1'
1919
implementation 'org.web3j:core:4.8.8-android'
2020
implementation 'com.google.code.gson:gson:2.9.0'
2121
implementation 'com.squareup.okhttp3:okhttp:4.9.3'

‎src/test/java/org/torusresearch/torusutilstest/AquaTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class AquaTest {
4949
@BeforeAll
5050
static void setup() throws ExecutionException, InterruptedException, IOException, NoSuchAlgorithmException, InvalidKeySpecException {
5151
System.out.println("Setup Starting");
52-
fetchNodeDetails = new FetchNodeDetails(TorusNetwork.AQUA, FetchNodeDetails.PROXY_ADDRESS_AQUA);
52+
fetchNodeDetails = new FetchNodeDetails(TorusNetwork.AQUA);
5353
TorusCtorOptions opts = new TorusCtorOptions("Custom", "YOUR_CLIENT_ID");
5454
opts.setNetwork("aqua");
5555
opts.setSignerHost("https://signer-polygon.tor.us/api/sign");

‎src/test/java/org/torusresearch/torusutilstest/CelesteTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class CelesteTest {
5050
@BeforeAll
5151
static void setup() throws ExecutionException, InterruptedException, IOException, NoSuchAlgorithmException, InvalidKeySpecException {
5252
System.out.println("Setup Startingg");
53-
fetchNodeDetails = new FetchNodeDetails(TorusNetwork.CELESTE, FetchNodeDetails.PROXY_ADDRESS_CELESTE);
53+
fetchNodeDetails = new FetchNodeDetails(TorusNetwork.CELESTE);
5454
TorusCtorOptions opts = new TorusCtorOptions("Custom", "YOUR_CLIENT_ID");
5555
opts.setNetwork("celeste");
5656
opts.setSignerHost("https://signer-polygon.tor.us/api/sign");
@@ -67,7 +67,7 @@ public void shouldGetPublicAddress() throws ExecutionException, InterruptedExcep
6767
VerifierArgs args = new VerifierArgs("tkey-google-celeste", TORUS_TEST_EMAIL);
6868
NodeDetails nodeDetails = fetchNodeDetails.getNodeDetails(args.getVerifier(), args.getVerifierId()).get();
6969
TorusPublicKey publicAddress = torusUtils.getPublicAddress(nodeDetails.getTorusNodeEndpoints(), nodeDetails.getTorusNodePub(), args).get();
70-
assertEquals("0xeC80FB9aB308Be1789Bd3f9317962D5505A4A242", publicAddress.getAddress());
70+
assertEquals("0xC3115b9d6FaB99739b23DA9dfcBA47A4Ec4Cd113", publicAddress.getAddress());
7171
}
7272

7373

@@ -77,21 +77,21 @@ public void shouldFetchUserTypeAndPublicAddress() throws ExecutionException, Int
7777
VerifierArgs args = new VerifierArgs("tkey-google-celeste", TORUS_TEST_EMAIL);
7878
NodeDetails nodeDetails = fetchNodeDetails.getNodeDetails(args.getVerifier(), args.getVerifierId()).get();
7979
TorusPublicKey key = torusUtils.getUserTypeAndAddress(nodeDetails.getTorusNodeEndpoints(), nodeDetails.getTorusNodePub(), args).get();
80-
assertEquals("0xeC80FB9aB308Be1789Bd3f9317962D5505A4A242", key.getAddress());
80+
assertEquals("0xC3115b9d6FaB99739b23DA9dfcBA47A4Ec4Cd113", key.getAddress());
8181
assertEquals(TypeOfUser.v1, key.getTypeOfUser());
8282

8383
String v2Verifier = "tkey-google-celeste";
8484
// 1/1 user
8585
String v2TestEmail = "somev2user@gmail.com";
8686
TorusPublicKey key2 = torusUtils.getUserTypeAndAddress(nodeDetails.getTorusNodeEndpoints(), nodeDetails.getTorusNodePub(), new VerifierArgs(v2Verifier, v2TestEmail)).get();
87-
assertEquals("0x69fB3A96016817F698a1279aE2d65F3916F3Db6F", key2.getAddress());
88-
assertEquals(TypeOfUser.v1, key2.getTypeOfUser());
87+
assertEquals("0x8d69CE354DA39413f205FdC8680dE1F3FBBb36e2", key2.getAddress());
88+
assertEquals(TypeOfUser.v2, key2.getTypeOfUser());
8989

9090
// 2/n user
9191
String v2nTestEmail = "caspertorus@gmail.com";
9292
TorusPublicKey key3 = torusUtils.getUserTypeAndAddress(nodeDetails.getTorusNodeEndpoints(), nodeDetails.getTorusNodePub(), new VerifierArgs(v2Verifier, v2nTestEmail)).get();
93-
assertEquals("0x24aCac36F8A4bD93052207dA410dA71AF92258b7", key3.getAddress());
94-
assertEquals(TypeOfUser.v1, key3.getTypeOfUser());
93+
assertEquals("0x8108c29976C458e76f797AD55A3715Ce80a3fe78", key3.getAddress());
94+
assertEquals(TypeOfUser.v2, key3.getTypeOfUser());
9595
}
9696

9797
@DisplayName("Key Assign test")

‎src/test/java/org/torusresearch/torusutilstest/CyanTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class CyanTest {
5050
@BeforeAll
5151
static void setup() throws ExecutionException, InterruptedException, IOException, NoSuchAlgorithmException, InvalidKeySpecException {
5252
System.out.println("Setup Starting");
53-
fetchNodeDetails = new FetchNodeDetails(TorusNetwork.CYAN, FetchNodeDetails.PROXY_ADDRESS_CYAN);
53+
fetchNodeDetails = new FetchNodeDetails(TorusNetwork.CYAN);
5454
TorusCtorOptions opts = new TorusCtorOptions("Custom", "YOUR_CLIENT_ID");
5555
opts.setNetwork("cyan");
5656
opts.setSignerHost("https://signer-polygon.tor.us/api/sign");
@@ -112,7 +112,7 @@ public void shouldLogin() throws ExecutionException, InterruptedException, Torus
112112
put("verifier_id", TORUS_TEST_EMAIL);
113113
}}, JwtUtils.generateIdToken(TORUS_TEST_EMAIL, algorithmRs)).get();
114114
System.out.println(retrieveSharesResponse.getPrivKey());
115-
BigInteger requiredPrivateKey = new BigInteger("1e0c955d73e73558f46521da55cc66de7b8fcb56c5b24e851616849b6a1278c8", 16);
115+
BigInteger requiredPrivateKey = new BigInteger("42385046760370370667571434468449261359414980205144543049037030193411736357576", 10);
116116
assert (requiredPrivateKey.equals(retrieveSharesResponse.getPrivKey()));
117117
assertEquals("0xC615aA03Dd8C9b2dc6F7c43cBDfF2c34bBa47Ec9", retrieveSharesResponse.getEthAddress());
118118
}

‎src/test/java/org/torusresearch/torusutilstest/MainnetTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class MainnetTest {
5050
@BeforeAll
5151
static void setup() throws IOException, NoSuchAlgorithmException, InvalidKeySpecException {
5252
System.out.println("Setup Starting");
53-
fetchNodeDetails = new FetchNodeDetails(TorusNetwork.MAINNET, FetchNodeDetails.PROXY_ADDRESS_MAINNET);
53+
fetchNodeDetails = new FetchNodeDetails(TorusNetwork.MAINNET);
5454
TorusCtorOptions opts = new TorusCtorOptions("Custom", "YOUR_CLIENT_ID");
5555
opts.setNetwork("mainnet");
5656
torusUtils = new TorusUtils(opts);

‎src/test/java/org/torusresearch/torusutilstest/OneKeyTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class OneKeyTest {
5050
@BeforeAll
5151
static void setup() throws ExecutionException, InterruptedException, IOException, NoSuchAlgorithmException, InvalidKeySpecException {
5252
System.out.println("Setup Starting");
53-
fetchNodeDetails = new FetchNodeDetails(TorusNetwork.TESTNET, FetchNodeDetails.PROXY_ADDRESS_TESTNET);
53+
fetchNodeDetails = new FetchNodeDetails(TorusNetwork.TESTNET);
5454
TorusCtorOptions opts = new TorusCtorOptions("Custom", "YOUR_CLIENT_ID");
5555
opts.setNetwork("testnet");
5656
opts.setEnableOneKey(true);

‎src/test/java/org/torusresearch/torusutilstest/TorusUtilsTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class TorusUtilsTest {
5050
@BeforeAll
5151
static void setup() throws ExecutionException, InterruptedException, IOException, NoSuchAlgorithmException, InvalidKeySpecException {
5252
System.out.println("Setup Starting");
53-
fetchNodeDetails = new FetchNodeDetails(TorusNetwork.TESTNET, FetchNodeDetails.PROXY_ADDRESS_TESTNET);
53+
fetchNodeDetails = new FetchNodeDetails(TorusNetwork.TESTNET);
5454
TorusCtorOptions opts = new TorusCtorOptions("Custom", "YOUR_CLIENT_ID");
5555
opts.setNetwork("testnet");
5656
torusUtils = new TorusUtils(opts);
@@ -65,7 +65,7 @@ public void shouldGetPublicAddress() throws ExecutionException, InterruptedExcep
6565
VerifierArgs args = new VerifierArgs("google-lrc", TORUS_TEST_EMAIL);
6666
NodeDetails nodeDetails = fetchNodeDetails.getNodeDetails(args.getVerifier(), args.getVerifierId()).get();
6767
TorusPublicKey publicAddress = torusUtils.getPublicAddress(nodeDetails.getTorusNodeEndpoints(), nodeDetails.getTorusNodePub(), args).get();
68-
assertEquals("0xFf5aDad69F4e97AF4D4567e7C333C12df6836a70", publicAddress.getAddress());
68+
assertEquals("0x872eEfa7495599A6983d396fE8dcf542457CF33f", publicAddress.getAddress());
6969
}
7070

7171

@@ -75,7 +75,7 @@ public void shouldFetchUserTypeAndPublicAddress() throws ExecutionException, Int
7575
VerifierArgs args = new VerifierArgs("google-lrc", TORUS_TEST_EMAIL);
7676
NodeDetails nodeDetails = fetchNodeDetails.getNodeDetails(args.getVerifier(), args.getVerifierId()).get();
7777
TorusPublicKey key = torusUtils.getUserTypeAndAddress(nodeDetails.getTorusNodeEndpoints(), nodeDetails.getTorusNodePub(), args).get();
78-
assertEquals("0xFf5aDad69F4e97AF4D4567e7C333C12df6836a70", key.getAddress());
78+
assertEquals("0x872eEfa7495599A6983d396fE8dcf542457CF33f", key.getAddress());
7979
assertEquals(TypeOfUser.v1, key.getTypeOfUser());
8080

8181
String v2Verifier = "tkey-google-lrc";

0 commit comments

Comments
 (0)