Skip to content

feat: add support for wasm #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HerringtonDarkholme wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add support for wasm #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 41 additions & 22 deletions wasm/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import (
"github.com/ethereum/go-ethereum/common/hexutil"
)

var chainId uint32

func wrapErr(err error) js.Value {
if err != nil {
return js.ValueOf(map[string]interface{}{"error": fmt.Sprintf("%v", err)})
Expand All @@ -28,7 +30,7 @@ func messageToSign(info txtypes.TxInfo) string {
case *txtypes.L2ChangePubKeyTxInfo:
return tx.GetL1SignatureBody()
case *txtypes.L2TransferTxInfo:
return tx.GetL1SignatureBody()
return tx.GetL1SignatureBody(chainId)
default:
return ""
}
Expand Down Expand Up @@ -74,6 +76,13 @@ func safeUint8(v js.Value, index int) (uint8, error) {
return uint8(v.Int()), nil
}

func safeInt16(v js.Value, index int) (int16, error) {
if v.Type() == js.TypeUndefined {
return 0, fmt.Errorf("argument %d is undefined", index)
}
return int16(v.Int()), nil
}

// safeUint32 safely extracts a uint32 from a js.Value, handling undefined values
func safeUint32(v js.Value, index int) (uint32, error) {
if v.Type() == js.TypeUndefined {
Expand Down Expand Up @@ -238,7 +247,7 @@ func main() {
return wrapErr(err)
}

marketIndex, err := safeUint8(args[0], 0)
marketIndex, err := safeInt16(args[0], 0)
if err != nil {
return wrapErr(err)
}
Expand Down Expand Up @@ -319,7 +328,7 @@ func main() {
return wrapErr(err)
}

marketIndex := uint8(args[0].Int())
marketIndex := int16(args[0].Int())
orderIndex := int64(args[1].Int())
nonce := int64(args[2].Int())

Expand Down Expand Up @@ -367,19 +376,22 @@ func main() {

js.Global().Set("SignTransfer", js.FuncOf(func(this js.Value, args []js.Value) interface{} {
return recoverPanic(func() js.Value {
if len(args) < 7 {
return js.ValueOf(map[string]interface{}{"error": "SignTransfer expects 7 args: toAccount, usdcAmount, fee, memo, nonce, apiKeyIndex, accountIndex"})
if len(args) < 10 {
return js.ValueOf(map[string]interface{}{"error": "SignTransfer expects 7 args: toAccount, assetIndex, fromRouteType, toRouteType, amount, usdcFee, memo, nonce, apiKeyIndex, accountIndex"})
}
c, err := getClient(args)
if err != nil {
return wrapErr(err)
}

toAccount := int64(args[0].Int())
usdcAmount := int64(args[1].Int())
fee := int64(args[2].Int())
memoStr := args[3].String()
nonce := int64(args[4].Int())
assetIndex := int16(args[1].Int())
fromRouteType := uint8(args[2].Int())
toRouteType := uint8(args[3].Int())
amount := int64(args[4].Int())
usdcFee := int64(args[5].Int())
memoStr := args[6].String()
nonce := int64(args[7].Int())

var memoArr [32]byte
bs := []byte(memoStr)
Expand All @@ -392,8 +404,11 @@ func main() {

txInfo := &types.TransferTxReq{
ToAccountIndex: toAccount,
USDCAmount: usdcAmount,
Fee: fee,
Amount: amount,
AssetIndex: assetIndex,
FromRouteType: fromRouteType,
ToRouteType: toRouteType,
USDCFee: usdcFee,
Memo: memoArr,
}
ops := new(types.TransactOpts)
Expand All @@ -408,19 +423,23 @@ func main() {

js.Global().Set("SignWithdraw", js.FuncOf(func(this js.Value, args []js.Value) interface{} {
return recoverPanic(func() js.Value {
if len(args) < 4 {
return js.ValueOf(map[string]interface{}{"error": "SignWithdraw expects 4 args: usdcAmount, nonce, apiKeyIndex, accountIndex"})
if len(args) < 6 {
return js.ValueOf(map[string]interface{}{"error": "SignWithdraw expects 4 args: assetIndex, routeType, amount, nonce, apiKeyIndex, accountIndex"})
}
c, err := getClient(args)
if err != nil {
return wrapErr(err)
}

usdcAmount := uint64(args[0].Int())
nonce := int64(args[1].Int())
assetIndex := int16(args[0].Int())
routeType := uint8(args[1].Int())
amount := uint64(args[2].Int())
nonce := int64(args[3].Int())

txInfo := &types.WithdrawTxReq{
USDCAmount: usdcAmount,
Amount: amount,
RouteType: routeType,
AssetIndex: assetIndex,
}
ops := new(types.TransactOpts)
if nonce != -1 {
Expand All @@ -442,7 +461,7 @@ func main() {
return wrapErr(err)
}

marketIndex := uint8(args[0].Int())
marketIndex := int16(args[0].Int())
fraction := uint16(args[1].Int())
marginMode := uint8(args[2].Int())
nonce := int64(args[3].Int())
Expand Down Expand Up @@ -472,7 +491,7 @@ func main() {
return wrapErr(err)
}

marketIndex := uint8(args[0].Int())
marketIndex := int16(args[0].Int())
index := int64(args[1].Int())
baseAmount := int64(args[2].Int())
price := uint32(args[3].Int())
Expand Down Expand Up @@ -530,7 +549,7 @@ func main() {

operatorFee := int64(args[0].Int())
initialTotalShares := int64(args[1].Int())
minOperatorShareRate := int64(args[2].Int())
minOperatorShareRate := uint16(args[2].Int())
nonce := int64(args[3].Int())

txInfo := &types.CreatePublicPoolTxReq{
Expand Down Expand Up @@ -561,7 +580,7 @@ func main() {
publicPoolIndex := uint8(args[0].Int())
status := uint8(args[1].Int())
operatorFee := int64(args[2].Int())
minOperatorShareRate := int64(args[3].Int())
minOperatorShareRate := uint16(args[3].Int())
nonce := int64(args[4].Int())

txInfo := &types.UpdatePublicPoolTxReq{
Expand Down Expand Up @@ -646,7 +665,7 @@ func main() {
return wrapErr(err)
}

marketIndex := uint8(args[0].Int())
marketIndex := int16(args[0].Int())
usdcAmount := int64(args[1].Int())
direction := uint8(args[2].Int())
nonce := int64(args[3].Int())
Expand Down Expand Up @@ -698,7 +717,7 @@ func main() {
}

orders[i] = &types.CreateOrderTxReq{
MarketIndex: uint8(orderObj.Get("MarketIndex").Int()),
MarketIndex: int16(orderObj.Get("MarketIndex").Int()),
ClientOrderIndex: int64(orderObj.Get("ClientOrderIndex").Int()),
BaseAmount: int64(orderObj.Get("BaseAmount").Int()),
Price: uint32(orderObj.Get("Price").Int()),
Expand Down