rebase upstream and bump to 0.78.100

packages/api-derive/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plugnet/api-derive",
-  "version": "0.77.102",
+  "version": "0.78.100",
   "description": "Common functions used across Plugnet, derived from RPC calls and storage queries.",
   "main": "index.js",
   "keywords": [
@@ -31,8 +31,8 @@
   "homepage": "https://github.com/plugblockchain/api.js/tree/master/packages/api-derive#readme",
   "dependencies": {
     "@babel/runtime": "^7.4.4",
-    "@plugnet/api": "^0.77.102",
-    "@plugnet/types": "^0.77.102",
+    "@plugnet/api": "^0.78.100",
+    "@plugnet/types": "^0.78.100",
     "@types/memoizee": "^0.4.2",
     "memoizee": "^0.4.14"
   }

packages/api-derive/src/contract/fees.ts

@@ -2,8 +2,8 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { ApiInterface$Rx, QueryableStorageFunctionBase } from '@polkadot/api/types';
-import { Codec } from '@polkadot/types/types';
+import { ApiInterface$Rx, QueryableStorageFunctionBase } from '@plugnet/api/types';
+import { Codec } from '@plugnet/types/types';
 import { DerivedContractFees } from '../types';
 
 import BN from 'bn.js';