Merge pull request #176 from icon-project/story/blacklist-restriction…

…-issue-in-current-implementation-#45 Story/blacklist restriction issue in current implementation #45
icon-project · Aug 4, 2022 · c734aec · c734aec
2 parents 1a148b3 + 1d14288
commit c734aec
Show file tree

Hide file tree

Showing 38 changed files with 4,081 additions and 1,937 deletions.
diff --git a/devnet/docker/icon-bsc/scripts/provision.sh b/devnet/docker/icon-bsc/scripts/provision.sh
@@ -22,7 +22,7 @@ provision() {
 
     #deploy icon
     deploy_javascore_bmc
-    deploy_javascore_bsr
+    #deploy_javascore_bsr
     deploy_javascore_bts
     deploy_javascore_irc2
     deploy_javascore_eth
@@ -43,7 +43,7 @@ provision() {
     configure_javascore_bmc_setFeeAggregator
     configure_javascore_add_bts
     configure_javascore_add_bts_owner
-    configure_javascore_set_bsr
+    #configure_javascore_set_bsr
     configure_javascore_bts_setICXFee
     #configure bsc    
     echo "CONFIGURE BSC"

diff --git a/devnet/docker/icon-bsc/scripts/token.javascore.sh b/devnet/docker/icon-bsc/scripts/token.javascore.sh
@@ -33,12 +33,12 @@ deploy_javascore_bsr() {
 deploy_javascore_bts() {
   echo "deploying javascore bts"
   cd $CONFIG_DIR
-  local irc2Tradeable_score=$(xxd -p $CONTRACTS_DIR/javascore/irc2Tradeable.jar | tr -d '\n')
   goloop rpc sendtx deploy $CONTRACTS_DIR/javascore/bts.jar \
     --content_type application/java \
     --param _name="ICX" \
     --param _bmc=$(cat btp.icon.bmc) \
-    --param _serializedIrc2="$irc2Tradeable_score" | jq -r . > tx.icon.bts
+    --param _serializedIrc2=$(xxd -p $CONTRACTS_DIR/javascore/irc2Tradeable.jar | tr -d '\n') | jq -r . > tx.icon.bts
+  sleep 2
   extract_scoreAddress tx.icon.bts btp.icon.bts
 }
 

diff --git a/docker/javascore/Dockerfile b/docker/javascore/Dockerfile
@@ -17,14 +17,14 @@ WORKDIR ${JAVASCORE_SRC}
 
 RUN gradle clean 
 RUN gradle bmc:optimizedJar
-RUN gradle bsr:optimizedJar
+#RUN gradle bsr:optimizedJar
 RUN gradle bts:optimizedJar
 #copy jars to dist
 WORKDIR ${ROOT}
 RUN mkdir /dist
 
 RUN cp ${JAVASCORE_SRC}/bmc/build/libs/bmc-0.1.0-optimized.jar ${DIST_DIR}/bmc.jar
-RUN cp ${JAVASCORE_SRC}/bsr/build/libs/restrictions-0.1.0-optimized.jar ${DIST_DIR}/bsr.jar
+#RUN cp ${JAVASCORE_SRC}/bsr/build/libs/restrictions-0.1.0-optimized.jar ${DIST_DIR}/bsr.jar
 RUN cp ${JAVASCORE_SRC}/bts/build/libs/bts-0.1.0-optimized.jar ${DIST_DIR}/bts.jar
 RUN cp ${JAVASCORE_SRC}/lib/irc2Tradeable-0.1.0-optimized.jar ${DIST_DIR}/irc2Tradeable.jar
 

diff --git a/docker/javascore/build.sh b/docker/javascore/build.sh
@@ -16,7 +16,7 @@ build_image() {
     docker cp javascore-dist:/dist/bmc.jar ${DIST_DIR}
     docker cp javascore-dist:/dist/irc2.jar ${DIST_DIR}
     docker cp javascore-dist:/dist/irc2Tradeable.jar ${DIST_DIR}
-    docker cp javascore-dist:/dist/bsr.jar ${DIST_DIR}
+    #docker cp javascore-dist:/dist/bsr.jar ${DIST_DIR}
     docker cp javascore-dist:/dist/bts.jar ${DIST_DIR}
 
     docker rm -f javascore-dist

diff --git a/javascore/bts/build.gradle b/javascore/bts/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     implementation("foundation.icon:javaee-scorex:$scorexVersion")
     implementation fileTree(dir: '../lib', include: 'score-util.jar')
     implementation fileTree(dir: '../lib', include: 'lib-0.1.0.jar')
-    implementation project(':bsr')
+    implementation("com.github.sink772:javaee-tokens:0.6.0")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:$jupiterVersion")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$jupiterVersion")
@@ -16,6 +16,14 @@ dependencies {
     testImplementation("foundation.icon:javaee-score-client:$scoreClientVersion")
     testImplementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
     testImplementation("foundation.icon:icon-sdk:$iconsdkVersion")
+    testImplementation("com.github.javafaker:javafaker:1.0.2")
+    testImplementation('org.mockito:mockito-core:4.3.1')
+    testImplementation group: 'org.mockito', name: 'mockito-inline', version: '4.3.0'
+    testImplementation 'org.bouncycastle:bcprov-jdk15on:1.60'
+}
+
+test {
+    useJUnitPlatform()
 }
 
 optimizedJar {
@@ -25,4 +33,4 @@ optimizedJar {
         configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
     } { exclude "score/*" }
     enableDebug = debugJar
-}
+}