Merge pull request #5 from BitHighlander/release-canidate

Release candidate

e2e/sdk-support/abort-tx/src/index.test.ts

@@ -62,10 +62,8 @@ let BLOCKCHAIN = 'ethereum'
 let ASSET = 'ETH'
 let MIN_BALANCE = process.env['MIN_BALANCE_ETH'] || "0.0002"
 let TEST_AMOUNT = process.env['TEST_AMOUNT'] || "0.0001"
-let spec = process.env['URL_PIONEER_SPEC']
-let NO_BROADCAST = process.env['E2E_BROADCAST'] || true
-let wss = process.env['URL_PIONEER_SOCKET']
-let FAUCET_RUNE_ADDRESS = process.env['FAUCET_RUNE_ADDRESS'] || 'thor1wy58774wagy4hkljz9mchhqtgk949zdwwe80d5'
+let spec = process.env['URL_PIONEER_SPEC'] || 'https://pioneers.dev/spec/swagger.json'
+let wss = process.env['URL_PIONEER_SOCKET'] || 'wss://pioneers.dev'
 let FAUCET_BCH_ADDRESS = process.env['FAUCET_RUNE_ADDRESS'] || 'qrsggegsd2msfjaueml6n6vyx6awfg5j4qmj0u89hj'
 
 describe(' - e2e test '+TAG, function() {

e2e/sdk-support/abort-tx/src/index.ts

@@ -47,7 +47,6 @@ let midgard = require("@pioneer-platform/midgard-client")
 let coincap = require("@pioneer-platform/coincap")
 
 let {
-    supportedBlockchains,
     baseAmountToNative,
     nativeToBaseAmount,
 } = require("@pioneer-platform/pioneer-coins")
@@ -57,24 +56,17 @@ const {
     sendPairingCode,
     getContext,
     getWallets,
-    buildTransaction,
-    approveTransaction,
-    broadcastTransaction,
     cancelTransaction
 } = require('@pioneer-platform/pioneer-app-e2e')
 
 let BLOCKCHAIN = 'ethereum'
 let ASSET = 'ETH'
 let MIN_BALANCE = process.env['MIN_BALANCE_ETH'] || "0.004"
 let TEST_AMOUNT = process.env['TEST_AMOUNT'] || "0.0001"
-let spec = process.env['URL_PIONEER_SPEC']
-let NO_BROADCAST = process.env['E2E_BROADCAST'] || true
-let wss = process.env['URL_PIONEER_SOCKET']
-let FAUCET_RUNE_ADDRESS = process.env['FAUCET_RUNE_ADDRESS'] || 'thor1wy58774wagy4hkljz9mchhqtgk949zdwwe80d5'
+let spec = process.env['URL_PIONEER_SPEC'] || 'https://pioneers.dev/spec/swagger.json'
+let wss = process.env['URL_PIONEER_SOCKET'] || 'wss://pioneers.dev'
 let FAUCET_BCH_ADDRESS = process.env['FAUCET_RUNE_ADDRESS'] || 'qrsggegsd2msfjaueml6n6vyx6awfg5j4qmj0u89hj'
 
-let noBroadcast = true
-
 const test_service = async function () {
     let tag = TAG + " | test_service | "
     try {

e2e/sdk-tendermint-custom/cosmos-e2e-ibc-deposit/src/index.test.ts

@@ -414,7 +414,9 @@ describe(' - e2e test '+BLOCKCHAIN+' ibc deposit - ', function() {
             let invocationView = await app.getInvocation(invocationId)
             log(tag,"invocationView3: (VIEW) ",invocationView)
             expect(invocationView).toBeDefined();
-            expect(invocationView.state).toBe('broadcasted');
+            if(!noBroadcast){
+                expect(invocationView.state).toBe('broadcasted');
+            }
         });
 
         it('Closes Websocket ', async function() {

modules/pioneer/pioneer-invoke/package.json

@@ -15,6 +15,7 @@
   },
   "dependencies": {
     "@pioneer-platform/loggerdog": "^8.1.8",
+    "@pioneer-platform/pioneer-types": "^8.1.32",
     "@pioneer-platform/signing": "^8.1.8",
     "@types/node": "^13.13.14",
     "axios": "^0.19.2",

modules/pioneer/pioneer-sdk/package.json

@@ -22,6 +22,7 @@
   "dependencies": {
     "@pioneer-platform/pioneer-coins": "^8.1.24",
     "@pioneer-platform/pioneer-events": "^8.1.20",
+    "@pioneer-platform/pioneer-types": "^8.1.32",
     "@pioneer-platform/pioneer-xchain-client": "^8.1.26",
     "bignumber.js": "^9.0.1",
     "dotenv": "^8.2.0",

package.json

@@ -6,7 +6,8 @@
     "packages": [
       "modules/**/**/*",
       "services/**/*",
-      "apps/**/*"
+      "apps/**/*",
+      "e2e/**/*"
     ],
     "version": "independent"
   },

scripts/test.sh

@@ -11,12 +11,18 @@ coin=$3
 # DEV move (dont use jest)
 if [[ $2 = 'true' ]]
 then
-  cd e2e/sdk-transfers/thorchain-e2e-transfer && npm run dev && cd ../../../ &&/
-  cd e2e/sdk-transfers/ethereum-e2e-transfer && npm run dev && cd ../../../ &&/
-#   cd e2e/sdk-support/rbf-ethereum && npm run dev && cd ../../../ &&/
   cd e2e/sdk-support/abort-tx && npm run dev && cd ../../../ &&/
-  cd e2e/sdk-support/forget-user && npm run dev && cd ../../../ &&/
-  cd e2e/sdk-support/querykey-migration && npm run dev && cd ../../../ &&/
+  cd e2e/sdk-transfers/cosmos-e2e-transfer && npm run dev && cd ../../../ &&/
+  cd e2e/sdk-tendermint-custom/cosmos-e2e-ibc-deposit && npm run dev && cd ../../../ &&/
+  cd e2e/sdk-tendermint-custom/osmosis-e2e-swap && npm run dev && cd ../../../ &&/
+  cd e2e/sdk-tendermint-custom/osmosis-e2e-delegate && npm run dev && cd ../../../ &&/
+  cd e2e/sdk-tendermint-custom/osmosis-e2e-lp-add && npm run dev && cd ../../../
+#  cd e2e/sdk-transfers/thorchain-e2e-transfer && npm run dev && cd ../../../ &&/
+#  cd e2e/sdk-transfers/ethereum-e2e-transfer && npm run dev && cd ../../../ &&/
+##   cd e2e/sdk-support/rbf-ethereum && npm run dev && cd ../../../ &&/
+#  cd e2e/sdk-support/abort-tx && npm run dev && cd ../../../ &&/
+#  cd e2e/sdk-support/forget-user && npm run dev && cd ../../../ &&/
+#  cd e2e/sdk-support/querykey-migration && npm run dev && cd ../../../ &&/
 #  cd e2e/sdk-support/context-switching && npm run dev && cd ../../../ &&/
 #  cd e2e/sdk-swaps/bitcoincash-e2e-swap && npm run dev && cd ../../../ &&/
 #  cd e2e/sdk-swaps/etherum-e2e-swap && npm run dev && cd ../../../ &&/
@@ -31,14 +37,16 @@ else
 #  cd e2e/sdk-support/forget-user && npm run test && cd ../../../ &&/
 #  cd e2e/sdk-support/querykey-migration && npm run test && cd ../../../ &&/
 #  cd e2e/sdk-support/rbf-ethereum && npm run test && cd ../../../ &&/
-  #transfers
+
+#  #transfers
   cd e2e/sdk-transfers/cosmos-e2e-transfer && npm run test && cd ../../../ &&/
   #ibc depsoit
   cd e2e/sdk-tendermint-custom/cosmos-e2e-ibc-deposit && npm run test && cd ../../../ &&/
   #osmosis
   cd e2e/sdk-tendermint-custom/osmosis-e2e-swap && npm run test && cd ../../../ &&/
   cd e2e/sdk-tendermint-custom/osmosis-e2e-delegate && npm run test && cd ../../../ &&/
   cd e2e/sdk-tendermint-custom/osmosis-e2e-lp-add && npm run test && cd ../../../
+
 #remember last entry can NOT have &&/
 
 #thorchain offline TODO re-enable