소스 검색

internal: update web3.js to 0.18.1, embed deps with go-bindata (#3545)

Péter Szilágyi 8 년 전
부모
커밋
93077c98e4
6개의 변경된 파일257개의 추가작업 그리고 187개의 파일을 삭제
  1. 1 19
      internal/jsre/deps/bignumber.js
  2. 71 0
      internal/jsre/deps/bindata.go
  3. 20 0
      internal/jsre/deps/deps.go
  4. 159 162
      internal/jsre/deps/web3.js
  5. 6 0
      internal/jsre/jsre.go
  6. 0 6
      internal/web3ext/web3ext.go

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 19
internal/jsre/deps/bignumber.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 71 - 0
internal/jsre/deps/bindata.go


+ 20 - 0
internal/jsre/deps/deps.go

@@ -0,0 +1,20 @@
+// Copyright 2017 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
+// Package deps contains the console JavaScript dependencies Go embedded.
+package deps
+
+//go:generate go-bindata -o bindata.go bignumber.js web3.js

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 159 - 162
internal/jsre/deps/web3.js


+ 6 - 0
internal/jsre/jsre.go

@@ -27,9 +27,15 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/internal/jsre/deps"
 	"github.com/robertkrimen/otto"
 )
 
+var (
+	BigNumber_JS = deps.MustAsset("bignumber.js")
+	Web3_JS      = deps.MustAsset("web3.js")
+)
+
 /*
 JSRE is a generic JS runtime environment embedding the otto JS interpreter.
 It provides some helper functions to

+ 0 - 6
internal/web3ext/web3ext.go

@@ -535,12 +535,6 @@ web3._extend({
 			call: 'personal_importRawKey',
 			params: 2
 		}),
-		new web3._extend.Method({
-			name: 'sendTransaction',
-			call: 'personal_sendTransaction',
-			params: 2,
-			inputFormatter: [web3._extend.formatters.inputTransactionFormatter, null]
-		}),
 		new web3._extend.Method({
 			name: 'sign',
 			call: 'personal_sign',

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.