update bash

DuoNetwork · Mar 11, 2019 · b2eb16a · b2eb16a
1 parent 4c1dde1
commit b2eb16a
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 51 deletions.
diff --git a/bash/aws.sh b/bash/aws.sh
@@ -3,6 +3,6 @@ rm *.log
 npm run trades assets=ETH,USD server aws &> trades.ALL.log &
 npm run commit server aws pair=ETH_USD &>> commit.log &
 npm run cleanDB server aws &>> cleanDB.log &
-npm run round contractType=Vivaldi tenor=100C-3H debug server aws &>> vivaldi-100C-3H.log &
+npm run round contractType=Vivaldi tenor=100C-1H debug server aws &>> vivaldi-100C-1H.log &
 npm run fetchPrice server aws &>> fetchPrice.log &
 npm run events server aws events=StartReset,StartPreReset $1 &>> events.log &
diff --git a/bash/azure.sh b/bash/azure.sh
@@ -3,6 +3,6 @@ rm *.log
 npm run trades assets=ETH,USD server azure &> trades.ALL.log &
 npm run commit server azure pair=ETH_USD &>> commit.log &
 npm run cleanDB server azure &>> cleanDB.log &
-npm run round contractType=Vivaldi tenor=100C-3H debug server azure &>> vivaldi-100C-3H.log &
+npm run round contractType=Vivaldi tenor=100C-1H debug server azure &>> vivaldi-100C-1H.log &
 npm run fetchPrice server azure &>> fetchPrice.log &
 npm run events server azure events=StartReset,StartPreReset $1 &>> events.log &
diff --git a/bash/gcp.sh b/bash/gcp.sh
@@ -3,6 +3,6 @@ rm *.log
 npm run trades assets=ETH,USD server gcp &> trades.ALL.log &
 npm run commit server gcp pair=ETH_USD &>> commit.log &
 npm run cleanDB server gcp &>> cleanDB.log &
-npm run round contractType=Vivaldi tenor=100C-3H debug server gcp &>> vivaldi-100C-3H.log &
+npm run round contractType=Vivaldi tenor=100C-1H debug server gcp &>> vivaldi-100C-1H.log &
 npm run fetchPrice server gcp &>> fetchPrice.log &
 npm run events server gcp events=StartReset,StartPreReset $1 &>> events.log &
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -49,7 +49,7 @@
 	},
 	"dependencies": {
 		"@babel/polyfill": "^7.2.5",
-		"@finbook/duo-contract-wrapper": "^1.3.3",
+		"@finbook/duo-contract-wrapper": "^1.3.5",
 		"@finbook/duo-market-data": "^1.0.4",
 		"@google-cloud/storage": "^2.4.1",
 		"aws-cli-js": "^2.0.4",

diff --git a/src/services/__snapshots__/ContractService.test.ts.snap b/src/services/__snapshots__/ContractService.test.ts.snap
@@ -72,7 +72,7 @@ Object {
     },
   },
   "Vivaldi": Object {
-    "100C-3H": Object {
+    "100C-1H": Object {
       "contract": "VivaldiWrapper",
     },
   },
@@ -118,18 +118,18 @@ Array [
             },
           },
           "Vivaldi": Object {
-            "100C-3H": Object {
+            "100C-1H": Object {
               "aToken": Object {
-                "address": "0x2C4bD22588af822a95Fb9D7e972A1F1C4aE28F13",
-                "code": "ETH-100C-3H",
+                "address": "0x9d26644705f993A373646E0E113b3488F21d5DC9 ",
+                "code": "ETH-100C-1H",
               },
               "bToken": Object {
-                "address": "0x9f49bb024EB176d227d4b85A58730a5dDeEF529D",
-                "code": "ETH-100P-3H",
+                "address": "0x5B312EC6D16BdC7e9Bcad2E972d9d571A505c5c1",
+                "code": "ETH-100P-1H",
               },
               "custodian": Object {
-                "address": "0x5734Fe05187857066Ed00d963D4bBBeB619797f4",
-                "code": "VIVALDI-100C-3H",
+                "address": "0xd49C2CfcA78EeCF00bD503c85225790264A176eb",
+                "code": "VIVALDI-100C-1H",
               },
             },
           },
@@ -194,18 +194,18 @@ Array [
             },
           },
           "Vivaldi": Object {
-            "100C-3H": Object {
+            "100C-1H": Object {
               "aToken": Object {
-                "address": "0x2C4bD22588af822a95Fb9D7e972A1F1C4aE28F13",
-                "code": "ETH-100C-3H",
+                "address": "0x9d26644705f993A373646E0E113b3488F21d5DC9 ",
+                "code": "ETH-100C-1H",
               },
               "bToken": Object {
-                "address": "0x9f49bb024EB176d227d4b85A58730a5dDeEF529D",
-                "code": "ETH-100P-3H",
+                "address": "0x5B312EC6D16BdC7e9Bcad2E972d9d571A505c5c1",
+                "code": "ETH-100P-1H",
               },
               "custodian": Object {
-                "address": "0x5734Fe05187857066Ed00d963D4bBBeB619797f4",
-                "code": "VIVALDI-100C-3H",
+                "address": "0xd49C2CfcA78EeCF00bD503c85225790264A176eb",
+                "code": "VIVALDI-100C-1H",
               },
             },
           },
@@ -281,18 +281,18 @@ Array [
             },
           },
           "Vivaldi": Object {
-            "100C-3H": Object {
+            "100C-1H": Object {
               "aToken": Object {
-                "address": "0x2C4bD22588af822a95Fb9D7e972A1F1C4aE28F13",
-                "code": "ETH-100C-3H",
+                "address": "0x9d26644705f993A373646E0E113b3488F21d5DC9 ",
+                "code": "ETH-100C-1H",
               },
               "bToken": Object {
-                "address": "0x9f49bb024EB176d227d4b85A58730a5dDeEF529D",
-                "code": "ETH-100P-3H",
+                "address": "0x5B312EC6D16BdC7e9Bcad2E972d9d571A505c5c1",
+                "code": "ETH-100P-1H",
               },
               "custodian": Object {
-                "address": "0x5734Fe05187857066Ed00d963D4bBBeB619797f4",
-                "code": "VIVALDI-100C-3H",
+                "address": "0xd49C2CfcA78EeCF00bD503c85225790264A176eb",
+                "code": "VIVALDI-100C-1H",
               },
             },
           },
@@ -368,18 +368,18 @@ Array [
             },
           },
           "Vivaldi": Object {
-            "100C-3H": Object {
+            "100C-1H": Object {
               "aToken": Object {
-                "address": "0x2C4bD22588af822a95Fb9D7e972A1F1C4aE28F13",
-                "code": "ETH-100C-3H",
+                "address": "0x9d26644705f993A373646E0E113b3488F21d5DC9 ",
+                "code": "ETH-100C-1H",
               },
               "bToken": Object {
-                "address": "0x9f49bb024EB176d227d4b85A58730a5dDeEF529D",
-                "code": "ETH-100P-3H",
+                "address": "0x5B312EC6D16BdC7e9Bcad2E972d9d571A505c5c1",
+                "code": "ETH-100P-1H",
               },
               "custodian": Object {
-                "address": "0x5734Fe05187857066Ed00d963D4bBBeB619797f4",
-                "code": "VIVALDI-100C-3H",
+                "address": "0xd49C2CfcA78EeCF00bD503c85225790264A176eb",
+                "code": "VIVALDI-100C-1H",
               },
             },
           },
@@ -515,27 +515,15 @@ Array [
 exports[`startCustodian, dualClass 1`] = `
 Array [
   Array [
-    "account",
+    "0x00D8d0660b243452fC2f996A892D3083A903576F",
     "0x59E6B3d43F762310626d2905148939973db2BBd3",
     "0x8A3bEca74E0E737460bDE45a09594A8D7D8c9886",
     "0x0d729B3C11b3E6Bf5792d36f640f3Be6f187Dd67",
   ],
 ]
 `;
 
-exports[`startCustodian, vivaldi 1`] = `
-Array [
-  Array [
-    "account",
-    "0x2C4bD22588af822a95Fb9D7e972A1F1C4aE28F13",
-    "0x9f49bb024EB176d227d4b85A58730a5dDeEF529D",
-    "0x0d729B3C11b3E6Bf5792d36f640f3Be6f187Dd67",
-    1,
-    true,
-    true,
-  ],
-]
-`;
+exports[`startCustodian, vivaldi 1`] = `Array []`;
 
 exports[`trigger 1`] = `
 Array [