Skip to content

Commit a9538b2

Browse files
committed
fix: switch abi to js files
1 parent 6d61107 commit a9538b2

File tree

8 files changed

+19
-40
lines changed

8 files changed

+19
-40
lines changed

package-lock.json

-21
This file was deleted.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@
7272
"js-sha3": "^0.8.0",
7373
"lodash": "^4.17.4",
7474
"multihashes": "^0.4.14",
75-
"web3": "^1.3.0"
75+
"web3": "^1.2.11"
7676
}
7777
}

src/abis/arbitrable.json src/abis/arbitrable.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{
1+
export default {
22
"abi": [
33
{
44
"constant": true,

src/abis/arbitrator.json src/abis/arbitrator.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{
1+
export default {
22
"abi": [
33
{
44
"constant": true,

src/standards/Arbitrable.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import ArbitrableJSONInterface from '../abis/arbitrable.json'
1+
import ArbitrableJSONInterface from '../abis/arbitrable'
22

33
import * as errorConstants from '../constants/error'
44
import EventListener from '../utils/EventListener'
@@ -21,8 +21,10 @@ class Arbitrable extends StandardContract {
2121
* @param {string} contractAddress - Address of the Arbitrable contract.
2222
* @returns {object} web3 contract instance
2323
*/
24-
_loadContractInstance = contractAddress =>
25-
new this.web3.eth.Contract(ArbitrableJSONInterface.abi, contractAddress)
24+
_loadContractInstance = contractAddress => {
25+
console.log(ArbitrableJSONInterface.abi)
26+
return new this.web3.eth.Contract(ArbitrableJSONInterface.abi, contractAddress)
27+
}
2628

2729
/**
2830
* Fetch all Evidence submitted to the contract.

src/standards/Arbitrator.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import ArbitratorContractInterface from '../abis/arbitrator.json'
1+
import ArbitratorContractInterface from '../abis/arbitrator'
22

33
import EventListener from '../utils/EventListener'
44
import isRequired from '../utils/isRequired'

webpack.config.js

-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ module.exports = {
99
umdNamedDefine: true,
1010
library: 'Archon'
1111
},
12-
1312
devtool: 'source-map',
14-
1513
module: {
1614
rules: [
1715
{

yarn.lock

+10-10
Original file line numberDiff line numberDiff line change
@@ -681,14 +681,14 @@
681681
integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
682682

683683
"@types/node@*":
684-
version "14.14.1"
685-
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.1.tgz#b8d6e8a84b119ae51fd0593c71eb3a9dd31fea4e"
686-
integrity sha512-D2/Xwp9c49JhIWq7SIrdvoYyGdq6yXkr5FTldN4rus9XljYFBul6P2epAID8xepOpL4ffcx09C05FZGK/1AIkw==
684+
version "14.14.2"
685+
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.2.tgz#d25295f9e4ca5989a2c610754dc02a9721235eeb"
686+
integrity sha512-jeYJU2kl7hL9U5xuI/BhKPZ4vqGM/OmK6whiFAXVhlstzZhVamWhDSmHyGLIp+RVyuF9/d0dqr2P85aFj4BvJg==
687687

688688
"@types/node@^12.12.6":
689-
version "12.12.70"
690-
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.70.tgz#adf70b179c3ee17620215ee4cb5c68c95f7c37ec"
691-
integrity sha512-i5y7HTbvhonZQE+GnUM2rz1Bi8QkzxdQmEv1LKOv4nWyaQk/gdeiTApuQR3PDJHX7WomAbpx2wlWSEpxXGZ/UQ==
689+
version "12.19.0"
690+
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.0.tgz#a0f841c195bdbe0b5070da9278b3e22189e8c8f6"
691+
integrity sha512-4BVAE9yp5DU3ISqBInsaRp9J474HWNaNVs8eZ1Far3dI1MwS3Wk0EvBRMM4xBh3Oz+c05hUgJmcbtAVmG8bv7w==
692692

693693
"@types/normalize-package-data@^2.4.0":
694694
version "2.4.0"
@@ -8162,9 +8162,9 @@ nano-json-stream-parser@^0.1.2:
81628162
integrity sha1-DMj20OK2IrR5xA1JnEbWS3Vcb18=
81638163

81648164
nanoid@^3.1.12:
8165-
version "3.1.12"
8166-
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.12.tgz#6f7736c62e8d39421601e4a0c77623a97ea69654"
8167-
integrity sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A==
8165+
version "3.1.13"
8166+
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.13.tgz#7f4f0729ab8a824291deb72b0d10cf357bc7563c"
8167+
integrity sha512-oYL7jWZUdScASxYOrcwE8EvISFGzO3/1g+t56vCyR0s2nrpmBcOc7hTAFJaVf6HMyEPJrnNelnjRnMN6KZnCPA==
81688168

81698169
nanomatch@^1.2.9:
81708170
version "1.2.13"
@@ -12085,7 +12085,7 @@ [email protected]:
1208512085
underscore "1.9.1"
1208612086
utf8 "3.0.0"
1208712087

12088-
web3@^1.3.0:
12088+
web3@^1.2.11:
1208912089
version "1.3.0"
1209012090
resolved "https://registry.yarnpkg.com/web3/-/web3-1.3.0.tgz#8fe4cd6e2a21c91904f343ba75717ee4c76bb349"
1209112091
integrity sha512-4q9dna0RecnrlgD/bD1C5S+81Untbd6Z/TBD7rb+D5Bvvc0Wxjr4OP70x+LlnwuRDjDtzBwJbNUblh2grlVArw==

0 commit comments

Comments
 (0)