@dydxprotocol/v4-client-js 1.19.0 → 1.21.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +9 -2
- package/README.md +1 -1
- package/__tests__/clients/composite-client.test.ts +140 -0
- package/build/__tests__/clients/composite-client.test.d.ts +1 -0
- package/build/__tests__/clients/composite-client.test.js +130 -0
- package/build/examples/permissioned_keys_example.js +22 -8
- package/build/src/clients/composite-client.d.ts +2 -1
- package/build/src/clients/composite-client.js +38 -2
- package/build/src/clients/constants.d.ts +4 -0
- package/build/src/clients/constants.js +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/examples/permissioned_keys_example.ts +38 -12
- package/package.json +1 -1
- package/src/clients/composite-client.ts +60 -7
- package/src/clients/constants.ts +5 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,6 +1,13 @@
|
|
|
1
|
-
# [1.
|
|
1
|
+
# [1.21.0](https://github.com/dydxprotocol/v4-clients/compare/v4-client-js@1.20.0...v4-client-js@1.21.0) (2025-03-11)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* Kman/update pyv2 conditional examples ([#334](https://github.com/dydxprotocol/v4-clients/issues/334)) ([a2c7adc](https://github.com/dydxprotocol/v4-clients/commit/a2c7adcc64b33fefaf56ffb6fc1d2bb8b174601e))
|
|
7
|
+
* **noble:** dYdX<->Noble transfers seqnum, `NobleUsdc` ergonomics ([#336](https://github.com/dydxprotocol/v4-clients/issues/336)) ([1ee775d](https://github.com/dydxprotocol/v4-clients/commit/1ee775d13cd60af153ae630fd62ace1b15d54ee5))
|
|
2
8
|
|
|
3
9
|
|
|
4
10
|
### Features
|
|
5
11
|
|
|
6
|
-
*
|
|
12
|
+
* Add Authenticator flow for Permissioned Keys ([#330](https://github.com/dydxprotocol/v4-clients/issues/330)) ([09706e8](https://github.com/dydxprotocol/v4-clients/commit/09706e8885c61f48ddc8d52e3747db40009c0821)), closes [#328](https://github.com/dydxprotocol/v4-clients/issues/328)
|
|
13
|
+
* Permissioned keys ([#322](https://github.com/dydxprotocol/v4-clients/issues/322)) ([1677a41](https://github.com/dydxprotocol/v4-clients/commit/1677a414afd2529880d68c0d4364bf825ab6a614)), closes [#318](https://github.com/dydxprotocol/v4-clients/issues/318) [#320](https://github.com/dydxprotocol/v4-clients/issues/320)
|
package/README.md
CHANGED
|
@@ -45,7 +45,7 @@ git clone git@github.com:dydxprotocol/v4-clients.git
|
|
|
45
45
|
cd v4-client-js/examples
|
|
46
46
|
```
|
|
47
47
|
|
|
48
|
-
These examples by default use a test account with `DYDX_TEST_MNEMONIC` from the TS client library under `v4-client-js/examples/constants
|
|
48
|
+
These examples by default use a test account with `DYDX_TEST_MNEMONIC` from the TS client library under `v4-client-js/examples/constants`, but you can use any test address that you own.
|
|
49
49
|
|
|
50
50
|
### 3. Run the scripts with node
|
|
51
51
|
|
|
@@ -0,0 +1,140 @@
|
|
|
1
|
+
import { Authenticator, AuthenticatorType, Network } from '../../src';
|
|
2
|
+
import { CompositeClient } from '../../src/clients/composite-client'
|
|
3
|
+
|
|
4
|
+
describe('CompositeClient', () => {
|
|
5
|
+
describe('validateAuthenticators', () => {
|
|
6
|
+
const network = Network.staging();
|
|
7
|
+
|
|
8
|
+
it('Validates top level AnyOf authenticators', async () => {
|
|
9
|
+
const client = await CompositeClient.connect(network);
|
|
10
|
+
const auth: Authenticator = {
|
|
11
|
+
type: AuthenticatorType.ANY_OF,
|
|
12
|
+
config: [
|
|
13
|
+
{ type: AuthenticatorType.SIGNATURE_VERIFICATION, config: "" },
|
|
14
|
+
{ type: AuthenticatorType.SIGNATURE_VERIFICATION, config: "" },
|
|
15
|
+
],
|
|
16
|
+
}
|
|
17
|
+
expect(client.validateAuthenticator(auth)).toEqual(true);
|
|
18
|
+
});
|
|
19
|
+
|
|
20
|
+
it('Fails top level AnyOf authenticators with non-signature nested authenticator', async () => {
|
|
21
|
+
const client = await CompositeClient.connect(network);
|
|
22
|
+
const auth: Authenticator = {
|
|
23
|
+
type: AuthenticatorType.ANY_OF,
|
|
24
|
+
config: [
|
|
25
|
+
{ type: AuthenticatorType.SIGNATURE_VERIFICATION, config: "" },
|
|
26
|
+
{ type: AuthenticatorType.MESSAGE_FILTER, config: "" },
|
|
27
|
+
],
|
|
28
|
+
}
|
|
29
|
+
expect(client.validateAuthenticator(auth)).toEqual(false);
|
|
30
|
+
});
|
|
31
|
+
|
|
32
|
+
it('Validates top level AllOf authenticators', async () => {
|
|
33
|
+
const client = await CompositeClient.connect(network);
|
|
34
|
+
const auth: Authenticator = {
|
|
35
|
+
type: AuthenticatorType.ALL_OF,
|
|
36
|
+
config: [
|
|
37
|
+
{ type: AuthenticatorType.SIGNATURE_VERIFICATION, config: "" },
|
|
38
|
+
{ type: AuthenticatorType.MESSAGE_FILTER, config: "" },
|
|
39
|
+
],
|
|
40
|
+
}
|
|
41
|
+
expect(client.validateAuthenticator(auth)).toEqual(true);
|
|
42
|
+
});
|
|
43
|
+
|
|
44
|
+
it('Fails top level AllOf authenticators, without signature verification', async () => {
|
|
45
|
+
const client = await CompositeClient.connect(network);
|
|
46
|
+
const auth: Authenticator = {
|
|
47
|
+
type: AuthenticatorType.ALL_OF,
|
|
48
|
+
config: [
|
|
49
|
+
{ type: AuthenticatorType.MESSAGE_FILTER, config: "" },
|
|
50
|
+
{ type: AuthenticatorType.MESSAGE_FILTER, config: "" },
|
|
51
|
+
],
|
|
52
|
+
}
|
|
53
|
+
expect(client.validateAuthenticator(auth)).toEqual(false);
|
|
54
|
+
});
|
|
55
|
+
|
|
56
|
+
it('Validates nested anyOf authenticators', async () => {
|
|
57
|
+
const client = await CompositeClient.connect(network);
|
|
58
|
+
const nestedAnyOf = {
|
|
59
|
+
type: AuthenticatorType.ANY_OF,
|
|
60
|
+
config: [
|
|
61
|
+
{ type: AuthenticatorType.MESSAGE_FILTER, config: "" },
|
|
62
|
+
{ type: AuthenticatorType.MESSAGE_FILTER, config: "" },
|
|
63
|
+
]
|
|
64
|
+
}
|
|
65
|
+
const signatureVerification = {
|
|
66
|
+
type: AuthenticatorType.SIGNATURE_VERIFICATION,
|
|
67
|
+
config: ""
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
const auth: Authenticator = {
|
|
71
|
+
type: AuthenticatorType.ALL_OF,
|
|
72
|
+
config: [signatureVerification, nestedAnyOf],
|
|
73
|
+
};
|
|
74
|
+
expect(client.validateAuthenticator(auth)).toEqual(true);
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
it('Validates nested allOf authenticators', async () => {
|
|
78
|
+
const client = await CompositeClient.connect(network);
|
|
79
|
+
const nestedAllOf = {
|
|
80
|
+
type: AuthenticatorType.ALL_OF,
|
|
81
|
+
config: [
|
|
82
|
+
{ type: AuthenticatorType.SIGNATURE_VERIFICATION, config: "" },
|
|
83
|
+
{ type: AuthenticatorType.SIGNATURE_VERIFICATION, config: "" },
|
|
84
|
+
]
|
|
85
|
+
}
|
|
86
|
+
const messageVerification = {
|
|
87
|
+
type: AuthenticatorType.MESSAGE_FILTER,
|
|
88
|
+
config: ""
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
const auth: Authenticator = {
|
|
92
|
+
type: AuthenticatorType.ALL_OF,
|
|
93
|
+
config: [messageVerification, nestedAllOf],
|
|
94
|
+
};
|
|
95
|
+
expect(client.validateAuthenticator(auth)).toEqual(true);
|
|
96
|
+
});
|
|
97
|
+
|
|
98
|
+
it('Fails nested anyOf signatureVerification authenticators', async () => {
|
|
99
|
+
const client = await CompositeClient.connect(network);
|
|
100
|
+
const nestedAnyOf = {
|
|
101
|
+
type: AuthenticatorType.ANY_OF,
|
|
102
|
+
config: [
|
|
103
|
+
{ type: AuthenticatorType.MESSAGE_FILTER, config: "" },
|
|
104
|
+
{ type: AuthenticatorType.SIGNATURE_VERIFICATION, config: "" },
|
|
105
|
+
]
|
|
106
|
+
}
|
|
107
|
+
const messageVerification = {
|
|
108
|
+
type: AuthenticatorType.MESSAGE_FILTER,
|
|
109
|
+
config: ""
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
const auth: Authenticator = {
|
|
113
|
+
type: AuthenticatorType.ALL_OF,
|
|
114
|
+
config: [messageVerification, nestedAnyOf],
|
|
115
|
+
};
|
|
116
|
+
expect(client.validateAuthenticator(auth)).toEqual(false);
|
|
117
|
+
});
|
|
118
|
+
|
|
119
|
+
it('Fails nested anyOf authenticators', async () => {
|
|
120
|
+
const client = await CompositeClient.connect(network);
|
|
121
|
+
const nestedAnyOf = {
|
|
122
|
+
type: AuthenticatorType.ANY_OF,
|
|
123
|
+
config: [
|
|
124
|
+
{ type: AuthenticatorType.MESSAGE_FILTER, config: "" },
|
|
125
|
+
{ type: AuthenticatorType.SIGNATURE_VERIFICATION, config: "" },
|
|
126
|
+
]
|
|
127
|
+
}
|
|
128
|
+
const messageVerification = {
|
|
129
|
+
type: AuthenticatorType.MESSAGE_FILTER,
|
|
130
|
+
config: ""
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
const auth: Authenticator = {
|
|
134
|
+
type: AuthenticatorType.ANY_OF,
|
|
135
|
+
config: [messageVerification, nestedAnyOf],
|
|
136
|
+
};
|
|
137
|
+
expect(client.validateAuthenticator(auth)).toEqual(false);
|
|
138
|
+
});
|
|
139
|
+
});
|
|
140
|
+
});
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,130 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const src_1 = require("../../src");
|
|
4
|
+
const composite_client_1 = require("../../src/clients/composite-client");
|
|
5
|
+
describe('CompositeClient', () => {
|
|
6
|
+
describe('validateAuthenticators', () => {
|
|
7
|
+
const network = src_1.Network.staging();
|
|
8
|
+
it('Validates top level AnyOf authenticators', async () => {
|
|
9
|
+
const client = await composite_client_1.CompositeClient.connect(network);
|
|
10
|
+
const auth = {
|
|
11
|
+
type: src_1.AuthenticatorType.ANY_OF,
|
|
12
|
+
config: [
|
|
13
|
+
{ type: src_1.AuthenticatorType.SIGNATURE_VERIFICATION, config: "" },
|
|
14
|
+
{ type: src_1.AuthenticatorType.SIGNATURE_VERIFICATION, config: "" },
|
|
15
|
+
],
|
|
16
|
+
};
|
|
17
|
+
expect(client.validateAuthenticator(auth)).toEqual(true);
|
|
18
|
+
});
|
|
19
|
+
it('Fails top level AnyOf authenticators with non-signature nested authenticator', async () => {
|
|
20
|
+
const client = await composite_client_1.CompositeClient.connect(network);
|
|
21
|
+
const auth = {
|
|
22
|
+
type: src_1.AuthenticatorType.ANY_OF,
|
|
23
|
+
config: [
|
|
24
|
+
{ type: src_1.AuthenticatorType.SIGNATURE_VERIFICATION, config: "" },
|
|
25
|
+
{ type: src_1.AuthenticatorType.MESSAGE_FILTER, config: "" },
|
|
26
|
+
],
|
|
27
|
+
};
|
|
28
|
+
expect(client.validateAuthenticator(auth)).toEqual(false);
|
|
29
|
+
});
|
|
30
|
+
it('Validates top level AllOf authenticators', async () => {
|
|
31
|
+
const client = await composite_client_1.CompositeClient.connect(network);
|
|
32
|
+
const auth = {
|
|
33
|
+
type: src_1.AuthenticatorType.ALL_OF,
|
|
34
|
+
config: [
|
|
35
|
+
{ type: src_1.AuthenticatorType.SIGNATURE_VERIFICATION, config: "" },
|
|
36
|
+
{ type: src_1.AuthenticatorType.MESSAGE_FILTER, config: "" },
|
|
37
|
+
],
|
|
38
|
+
};
|
|
39
|
+
expect(client.validateAuthenticator(auth)).toEqual(true);
|
|
40
|
+
});
|
|
41
|
+
it('Fails top level AllOf authenticators, without signature verification', async () => {
|
|
42
|
+
const client = await composite_client_1.CompositeClient.connect(network);
|
|
43
|
+
const auth = {
|
|
44
|
+
type: src_1.AuthenticatorType.ALL_OF,
|
|
45
|
+
config: [
|
|
46
|
+
{ type: src_1.AuthenticatorType.MESSAGE_FILTER, config: "" },
|
|
47
|
+
{ type: src_1.AuthenticatorType.MESSAGE_FILTER, config: "" },
|
|
48
|
+
],
|
|
49
|
+
};
|
|
50
|
+
expect(client.validateAuthenticator(auth)).toEqual(false);
|
|
51
|
+
});
|
|
52
|
+
it('Validates nested anyOf authenticators', async () => {
|
|
53
|
+
const client = await composite_client_1.CompositeClient.connect(network);
|
|
54
|
+
const nestedAnyOf = {
|
|
55
|
+
type: src_1.AuthenticatorType.ANY_OF,
|
|
56
|
+
config: [
|
|
57
|
+
{ type: src_1.AuthenticatorType.MESSAGE_FILTER, config: "" },
|
|
58
|
+
{ type: src_1.AuthenticatorType.MESSAGE_FILTER, config: "" },
|
|
59
|
+
]
|
|
60
|
+
};
|
|
61
|
+
const signatureVerification = {
|
|
62
|
+
type: src_1.AuthenticatorType.SIGNATURE_VERIFICATION,
|
|
63
|
+
config: ""
|
|
64
|
+
};
|
|
65
|
+
const auth = {
|
|
66
|
+
type: src_1.AuthenticatorType.ALL_OF,
|
|
67
|
+
config: [signatureVerification, nestedAnyOf],
|
|
68
|
+
};
|
|
69
|
+
expect(client.validateAuthenticator(auth)).toEqual(true);
|
|
70
|
+
});
|
|
71
|
+
it('Validates nested allOf authenticators', async () => {
|
|
72
|
+
const client = await composite_client_1.CompositeClient.connect(network);
|
|
73
|
+
const nestedAllOf = {
|
|
74
|
+
type: src_1.AuthenticatorType.ALL_OF,
|
|
75
|
+
config: [
|
|
76
|
+
{ type: src_1.AuthenticatorType.SIGNATURE_VERIFICATION, config: "" },
|
|
77
|
+
{ type: src_1.AuthenticatorType.SIGNATURE_VERIFICATION, config: "" },
|
|
78
|
+
]
|
|
79
|
+
};
|
|
80
|
+
const messageVerification = {
|
|
81
|
+
type: src_1.AuthenticatorType.MESSAGE_FILTER,
|
|
82
|
+
config: ""
|
|
83
|
+
};
|
|
84
|
+
const auth = {
|
|
85
|
+
type: src_1.AuthenticatorType.ALL_OF,
|
|
86
|
+
config: [messageVerification, nestedAllOf],
|
|
87
|
+
};
|
|
88
|
+
expect(client.validateAuthenticator(auth)).toEqual(true);
|
|
89
|
+
});
|
|
90
|
+
it('Fails nested anyOf signatureVerification authenticators', async () => {
|
|
91
|
+
const client = await composite_client_1.CompositeClient.connect(network);
|
|
92
|
+
const nestedAnyOf = {
|
|
93
|
+
type: src_1.AuthenticatorType.ANY_OF,
|
|
94
|
+
config: [
|
|
95
|
+
{ type: src_1.AuthenticatorType.MESSAGE_FILTER, config: "" },
|
|
96
|
+
{ type: src_1.AuthenticatorType.SIGNATURE_VERIFICATION, config: "" },
|
|
97
|
+
]
|
|
98
|
+
};
|
|
99
|
+
const messageVerification = {
|
|
100
|
+
type: src_1.AuthenticatorType.MESSAGE_FILTER,
|
|
101
|
+
config: ""
|
|
102
|
+
};
|
|
103
|
+
const auth = {
|
|
104
|
+
type: src_1.AuthenticatorType.ALL_OF,
|
|
105
|
+
config: [messageVerification, nestedAnyOf],
|
|
106
|
+
};
|
|
107
|
+
expect(client.validateAuthenticator(auth)).toEqual(false);
|
|
108
|
+
});
|
|
109
|
+
it('Fails nested anyOf authenticators', async () => {
|
|
110
|
+
const client = await composite_client_1.CompositeClient.connect(network);
|
|
111
|
+
const nestedAnyOf = {
|
|
112
|
+
type: src_1.AuthenticatorType.ANY_OF,
|
|
113
|
+
config: [
|
|
114
|
+
{ type: src_1.AuthenticatorType.MESSAGE_FILTER, config: "" },
|
|
115
|
+
{ type: src_1.AuthenticatorType.SIGNATURE_VERIFICATION, config: "" },
|
|
116
|
+
]
|
|
117
|
+
};
|
|
118
|
+
const messageVerification = {
|
|
119
|
+
type: src_1.AuthenticatorType.MESSAGE_FILTER,
|
|
120
|
+
config: ""
|
|
121
|
+
};
|
|
122
|
+
const auth = {
|
|
123
|
+
type: src_1.AuthenticatorType.ANY_OF,
|
|
124
|
+
config: [messageVerification, nestedAnyOf],
|
|
125
|
+
};
|
|
126
|
+
expect(client.validateAuthenticator(auth)).toEqual(false);
|
|
127
|
+
});
|
|
128
|
+
});
|
|
129
|
+
});
|
|
130
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcG9zaXRlLWNsaWVudC50ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vX190ZXN0c19fL2NsaWVudHMvY29tcG9zaXRlLWNsaWVudC50ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsbUNBQXNFO0FBQ3RFLHlFQUFvRTtBQUVwRSxRQUFRLENBQUMsaUJBQWlCLEVBQUUsR0FBRyxFQUFFO0lBQy9CLFFBQVEsQ0FBQyx3QkFBd0IsRUFBRSxHQUFHLEVBQUU7UUFDdEMsTUFBTSxPQUFPLEdBQUcsYUFBTyxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBRWxDLEVBQUUsQ0FBQywwQ0FBMEMsRUFBRSxLQUFLLElBQUksRUFBRTtZQUN4RCxNQUFNLE1BQU0sR0FBRyxNQUFNLGtDQUFlLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQ3RELE1BQU0sSUFBSSxHQUFrQjtnQkFDMUIsSUFBSSxFQUFFLHVCQUFpQixDQUFDLE1BQU07Z0JBQzlCLE1BQU0sRUFBRTtvQkFDTixFQUFFLElBQUksRUFBRSx1QkFBaUIsQ0FBQyxzQkFBc0IsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFO29CQUM5RCxFQUFFLElBQUksRUFBRSx1QkFBaUIsQ0FBQyxzQkFBc0IsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFO2lCQUMvRDthQUNGLENBQUE7WUFDRCxNQUFNLENBQUMsTUFBTSxDQUFDLHFCQUFxQixDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzNELENBQUMsQ0FBQyxDQUFDO1FBRUgsRUFBRSxDQUFDLDhFQUE4RSxFQUFFLEtBQUssSUFBSSxFQUFFO1lBQzVGLE1BQU0sTUFBTSxHQUFHLE1BQU0sa0NBQWUsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDdEQsTUFBTSxJQUFJLEdBQWtCO2dCQUMxQixJQUFJLEVBQUUsdUJBQWlCLENBQUMsTUFBTTtnQkFDOUIsTUFB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
|
|
@@ -44,23 +44,37 @@ async function removeAuthenticator(client, subaccount, id) {
|
|
|
44
44
|
await client.removeAuthenticator(subaccount, id);
|
|
45
45
|
}
|
|
46
46
|
async function addAuthenticator(client, subaccount, authedPubKey) {
|
|
47
|
-
const
|
|
47
|
+
const subAuth = [{
|
|
48
48
|
type: constants_1.AuthenticatorType.SIGNATURE_VERIFICATION,
|
|
49
49
|
config: authedPubKey,
|
|
50
50
|
},
|
|
51
51
|
{
|
|
52
|
-
type: constants_1.AuthenticatorType.
|
|
53
|
-
config:
|
|
54
|
-
|
|
52
|
+
type: constants_1.AuthenticatorType.ANY_OF,
|
|
53
|
+
config: [
|
|
54
|
+
{
|
|
55
|
+
type: constants_1.AuthenticatorType.MESSAGE_FILTER,
|
|
56
|
+
config: (0, encoding_1.toBase64)(new util_1.TextEncoder().encode('/dydxprotocol.clob.MsgPlaceOrder')),
|
|
57
|
+
},
|
|
58
|
+
{
|
|
59
|
+
type: constants_1.AuthenticatorType.MESSAGE_FILTER,
|
|
60
|
+
config: (0, encoding_1.toBase64)(new util_1.TextEncoder().encode('/dydxprotocol.clob.MsgPlaceOrder')),
|
|
61
|
+
},
|
|
62
|
+
]
|
|
63
|
+
}
|
|
55
64
|
];
|
|
56
|
-
const jsonString = JSON.stringify(
|
|
65
|
+
const jsonString = JSON.stringify(subAuth);
|
|
57
66
|
const encodedData = new util_1.TextEncoder().encode(jsonString);
|
|
58
|
-
|
|
67
|
+
try {
|
|
68
|
+
await client.addAuthenticator(subaccount, constants_1.AuthenticatorType.ALL_OF, encodedData);
|
|
69
|
+
}
|
|
70
|
+
catch (error) {
|
|
71
|
+
console.log(error.message);
|
|
72
|
+
}
|
|
59
73
|
}
|
|
60
74
|
async function placeOrder(client, fromAccount, forAccount, authenticatorId) {
|
|
61
75
|
try {
|
|
62
76
|
const side = constants_1.OrderSide.BUY;
|
|
63
|
-
const price = Number(
|
|
77
|
+
const price = Number('1000');
|
|
64
78
|
const currentBlock = await client.validatorClient.get.latestBlockHeight();
|
|
65
79
|
const nextValidBlockHeight = currentBlock + 5;
|
|
66
80
|
const goodTilBlock = nextValidBlockHeight + 10;
|
|
@@ -82,4 +96,4 @@ test()
|
|
|
82
96
|
.catch((error) => {
|
|
83
97
|
console.log(error.message);
|
|
84
98
|
});
|
|
85
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
99
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGVybWlzc2lvbmVkX2tleXNfZXhhbXBsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2V4YW1wbGVzL3Blcm1pc3Npb25lZF9rZXlzX2V4YW1wbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSwrQkFBbUM7QUFFbkMsK0NBQTRDO0FBQzVDLHNGQUErRjtBQUUvRixnQ0FBdUM7QUFDdkMsc0VBQWtFO0FBQ2xFLHdEQUFtRztBQUNuRyx1RkFBOEQ7QUFDOUQsMERBQTJEO0FBQzNELDJDQUF1RTtBQUV2RSxLQUFLLFVBQVUsSUFBSTtJQUNqQixNQUFNLE9BQU8sR0FBRyxNQUFNLHNCQUFXLENBQUMsWUFBWSxDQUFDLDhCQUFrQixFQUFFLG1CQUFhLENBQUMsQ0FBQztJQUNsRixNQUFNLE9BQU8sR0FBRyxNQUFNLHNCQUFXLENBQUMsWUFBWSxDQUFDLGdDQUFvQixFQUFFLG1CQUFhLENBQUMsQ0FBQztJQUVwRixNQUFNLE9BQU8sR0FBRyxtQkFBTyxDQUFDLE9BQU8sRUFBRSxDQUFDO0lBQ2xDLE1BQU0sTUFBTSxHQUFHLE1BQU0sa0NBQWUsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDdEQsTUFBTSxDQUFDLG1CQUFtQixDQUFDLDRCQUFnQixDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBRXBELE9BQU8sQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLENBQUM7SUFDMUIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUVwQixNQUFNLFdBQVcsR0FBRyxJQUFJLDJCQUFjLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQ25ELE1BQU0sV0FBVyxHQUFHLElBQUksMkJBQWMsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFFbkQsOEJBQThCO0lBQzlCLHdEQUF3RDtJQUN4RCxPQUFPLENBQUMsR0FBRyxDQUFDLDRCQUE0QixDQUFDLENBQUM7SUFDMUMsTUFBTSxnQkFBZ0IsQ0FBQyxNQUFNLEVBQUUsV0FBVyxFQUFFLE9BQU8sQ0FBQyxNQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7SUFFbkUsTUFBTSxjQUFjLEdBQUcsTUFBTSxNQUFNLENBQUMsaUJBQWlCLENBQUMsT0FBTyxDQUFDLE9BQVEsQ0FBQyxDQUFDO0lBQ3hFLG9FQUFvRTtJQUNwRSxNQUFNLFdBQVcsR0FBRyxjQUFjLENBQUMscUJBQXFCLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQztJQUNwRSxNQUFNLGVBQWUsR0FBRyxjQUFjLENBQUMscUJBQXFCLENBQUMsV0FBVyxDQUFDLENBQUMsRUFBRSxDQUFDO0lBRTdFLDJEQUEyRDtJQUMzRCxPQUFPLENBQUMsR0FBRyxDQUFDLHdDQUF3QyxDQUFDLENBQUM7SUFDdEQsTUFBTSxVQUFVLENBQUMsTUFBTSxFQUFFLFdBQVcsRUFBRSxXQUFXLEVBQUUsZUFBZSxDQUFDLENBQUM7SUFFcEUsdUJBQXVCO0lBQ3ZCLE9BQU8sQ0FBQyxHQUFHLENBQUMsOEJBQThCLENBQUMsQ0FBQztJQUM1QyxNQUFNLG1CQUFtQixDQUFDLE1BQU0sRUFBRSxXQUFXLEVBQUUsZUFBZSxDQUFDLENBQUM7SUFFaEUsbURBQW1EO0lBQ25ELE9BQU8sQ0FBQyxHQUFHLENBQUMsNERBQTRELENBQUMsQ0FBQztJQUMxRSxNQUFNLFVBQVUsQ0FBQyxNQUFNLEVBQUUsV0FBVyxFQUFFLFdBQVcsRUFBRSxlQUFlLENBQUMsQ0FBQztBQUN0RSxDQUFDO0FBRUQsS0FBSyxVQUFVLG1CQUFtQixDQUNoQyxNQUF1QixFQUN2QixVQUEwQixFQUMxQixFQUFRO0lBRVIsTUFBTSxNQUFNLENBQUMsbUJBQW1CLENBQUMsVUFBVSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0FBQ25ELENBQUM7QUFFRCxLQUFLLFVBQVUsZ0JBQWdCLENBQzdCLE1BQXVCLEVBQ3ZCLFVBQTBCLEVBQzFCLFlBQW9CO0lBRXBCLE1BQU0sT0FBTyxHQUFHLENBQUU7WUFDaEIsSUFBSSxFQUFFLDZCQUFpQixDQUFDLHNCQUFzQjtZQUM5QyxNQUFNLEVBQUUsWUFBWTtTQUNyQjtRQUNEO1lBQ0UsSUFBSSxFQUFFLDZCQUFpQixDQUFDLE1BQU07WUFDOUIsTUFBTSxFQUFFO2dCQUNSO29CQUNFLElBQUksRUFBRSw2QkFBaUIsQ0FBQyxjQUFjO29CQUN0QyxNQUFNLEVBQUUsSUFBQSxtQkFBUSxFQUFDLElBQUksa0JBQVcsRUFBRSxDQUFDLE1BQU0sQ0FBQyxrQ0FBa0MsQ0FBQyxDQUFDO2lCQUMvRTtnQkFDRDtvQkFDRSxJQUFJLEVBQUUsNkJBQWlCLENBQUMsY0FBYztvQkFDdEMsTUFBTSxFQUFFLElBQUEsbUJBQVEsRUFBQyxJQUFJLGtCQUFXLEVBQUUsQ0FBQyxNQUFNLENBQUMsa0NBQWtDLENBQUMsQ0FBQztpQkFDL0U7YUFDQTtTQUNGO0tBQ0YsQ0FBQztJQUVBLE1BQU0sVUFBVSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDM0MsTUFBTSxXQUFXLEdBQUcsSUFBSSxrQkFBVyxFQUFFLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBRXpELElBQUk7UUFDRixNQUFNLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxVQUFVLEVBQUUsNkJBQWlCLENBQUMsTUFBTSxFQUFFLFdBQVcsQ0FBQyxDQUFDO0tBQ2xGO0lBQUMsT0FBTyxLQUFLLEVBQUU7UUFDZCxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztLQUM1QjtBQUNILENBQUM7QUFFRCxLQUFLLFVBQVUsVUFBVSxDQUN2QixNQUF1QixFQUN2QixXQUEyQixFQUMzQixVQUEwQixFQUMxQixlQUFxQjtJQUVyQixJQUFJO1FBQ0YsTUFBTSxJQUFJLEdBQUcscUJBQVMsQ0FBQyxHQUFHLENBQUM7UUFDM0IsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQzdCLE1BQU0sWUFBWSxHQUFHLE1BQU0sTUFBTSxDQUFDLGVBQWUsQ0FBQyxHQUFHLENBQUMsaUJBQWlCLEVBQUUsQ0FBQztRQUMxRSxNQUFNLG9CQUFvQixHQUFHLFlBQVksR0FBRyxDQUFDLENBQUM7UUFDOUMsTUFBTSxZQUFZLEdBQUcsb0JBQW9CLEdBQUcsRUFBRSxDQUFDO1FBRS9DLE1BQU0sV0FBVyxHQUFHLHlCQUFpQixDQUFDLHlCQUF5QixDQUFDO1FBRWhFLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxHQUFHLEtBQUssQ0FBQyxDQUFDO1FBRW5ELE1BQU0sRUFBRSxHQUFHLE1BQU0sTUFBTSxDQUFDLG1CQUFtQixDQUN6QyxXQUFXLEVBQ1gsU0FBUyxFQUNULElBQUksRUFDSixLQUFLLEVBQ0wsSUFBSSxFQUNKLFFBQVEsRUFDUixZQUFZLEVBQ1osV0FBVyxFQUNYLEtBQUssRUFDTCxTQUFTLEVBQ1Q7WUFDRSxjQUFjLEVBQUUsQ0FBQyxlQUFlLENBQUM7WUFDakMsZUFBZSxFQUFFLFVBQVU7U0FDNUIsQ0FDRixDQUFDO1FBQ0YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsQ0FBQztRQUM1QixPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO0tBQ25EO0lBQUMsT0FBTyxLQUFLLEVBQUU7UUFDZCxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztLQUM1QjtBQUNILENBQUM7QUFFRCxJQUFJLEVBQUU7S0FDSCxJQUFJLENBQUMsR0FBRyxFQUFFLEdBQUUsQ0FBQyxDQUFDO0tBQ2QsS0FBSyxDQUFDLENBQUMsS0FBSyxFQUFFLEVBQUU7SUFDZixPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQztBQUM3QixDQUFDLENBQUMsQ0FBQyJ9
|
|
@@ -5,7 +5,7 @@ import { GetAuthenticatorsResponse } from '@dydxprotocol/v4-proto/src/codegen/dy
|
|
|
5
5
|
import { Order_TimeInForce } from '@dydxprotocol/v4-proto/src/codegen/dydxprotocol/clob/order';
|
|
6
6
|
import Long from 'long';
|
|
7
7
|
import { GovAddNewMarketParams, OrderFlags } from '../types';
|
|
8
|
-
import { AuthenticatorType, Network, OrderExecution, OrderSide, OrderTimeInForce, OrderType, SelectedGasDenom } from './constants';
|
|
8
|
+
import { Authenticator, AuthenticatorType, Network, OrderExecution, OrderSide, OrderTimeInForce, OrderType, SelectedGasDenom } from './constants';
|
|
9
9
|
import { IndexerClient } from './indexer-client';
|
|
10
10
|
import LocalWallet from './modules/local-wallet';
|
|
11
11
|
import { SubaccountInfo } from './subaccount';
|
|
@@ -371,4 +371,5 @@ export declare class CompositeClient {
|
|
|
371
371
|
addAuthenticator(subaccount: SubaccountInfo, authenticatorType: AuthenticatorType, data: Uint8Array): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx>;
|
|
372
372
|
removeAuthenticator(subaccount: SubaccountInfo, id: Long): Promise<BroadcastTxAsyncResponse | BroadcastTxSyncResponse | IndexedTx>;
|
|
373
373
|
getAuthenticators(address: string): Promise<GetAuthenticatorsResponse>;
|
|
374
|
+
validateAuthenticator(authenticator: Authenticator): boolean;
|
|
374
375
|
}
|
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.CompositeClient = void 0;
|
|
7
|
+
const util_1 = require("util");
|
|
7
8
|
const tendermint_rpc_1 = require("@cosmjs/tendermint-rpc");
|
|
8
9
|
const order_1 = require("@dydxprotocol/v4-proto/src/codegen/dydxprotocol/clob/order");
|
|
9
10
|
const ethers_1 = require("ethers");
|
|
@@ -197,7 +198,9 @@ class CompositeClient {
|
|
|
197
198
|
async placeShortTermOrder(subaccount, marketId, side, price, size, clientId, goodTilBlock, timeInForce, reduceOnly, memo, permissionedKeysAccountAuth) {
|
|
198
199
|
// For permissioned orders, use the permissioning account details instead of the subaccount
|
|
199
200
|
// This allows placing orders on behalf of another account when using permissioned keys
|
|
200
|
-
const accountForOrder = permissionedKeysAccountAuth
|
|
201
|
+
const accountForOrder = permissionedKeysAccountAuth
|
|
202
|
+
? permissionedKeysAccountAuth.accountForOrder
|
|
203
|
+
: subaccount;
|
|
201
204
|
const msgs = new Promise((resolve, reject) => {
|
|
202
205
|
const msg = this.placeShortTermOrderMessage(accountForOrder, marketId, side, price, size, clientId, goodTilBlock, timeInForce, reduceOnly);
|
|
203
206
|
msg
|
|
@@ -701,6 +704,14 @@ class CompositeClient {
|
|
|
701
704
|
return this.validatorClient.post.createMarketPermissionless(ticker, subaccount, broadcastMode, gasAdjustment, memo);
|
|
702
705
|
}
|
|
703
706
|
async addAuthenticator(subaccount, authenticatorType, data) {
|
|
707
|
+
// Validate the provided authenticators before sending to the validator
|
|
708
|
+
const authenticator = {
|
|
709
|
+
type: authenticatorType,
|
|
710
|
+
config: JSON.parse(new util_1.TextDecoder().decode(data)),
|
|
711
|
+
};
|
|
712
|
+
if (!this.validateAuthenticator(authenticator)) {
|
|
713
|
+
throw new Error('Invalid authenticator, please ensure the authenticator permissions are correct');
|
|
714
|
+
}
|
|
704
715
|
return this.validatorClient.post.addAuthenticator(subaccount, authenticatorType, data);
|
|
705
716
|
}
|
|
706
717
|
async removeAuthenticator(subaccount, id) {
|
|
@@ -709,6 +720,31 @@ class CompositeClient {
|
|
|
709
720
|
async getAuthenticators(address) {
|
|
710
721
|
return this.validatorClient.get.getAuthenticators(address);
|
|
711
722
|
}
|
|
723
|
+
validateAuthenticator(authenticator) {
|
|
724
|
+
function checkAuthenticator(auth) {
|
|
725
|
+
if (auth.type === constants_1.AuthenticatorType.SIGNATURE_VERIFICATION) {
|
|
726
|
+
return true; // A SignatureVerification authenticator is safe.
|
|
727
|
+
}
|
|
728
|
+
if (!Array.isArray(auth.config)) {
|
|
729
|
+
return false; // Unsafe case: a non-array config for a composite authenticator
|
|
730
|
+
}
|
|
731
|
+
if (auth.type === constants_1.AuthenticatorType.ANY_OF) {
|
|
732
|
+
// ANY_OF is safe only if ALL sub-authenticators return true
|
|
733
|
+
return auth.config.every((nestedAuth) => checkAuthenticator(nestedAuth));
|
|
734
|
+
}
|
|
735
|
+
if (auth.type === constants_1.AuthenticatorType.ALL_OF) {
|
|
736
|
+
// ALL_OF is safe if at least one sub-authenticator returns true
|
|
737
|
+
return auth.config.some((nestedAuth) => checkAuthenticator(nestedAuth));
|
|
738
|
+
}
|
|
739
|
+
// If it's a base-case authenticator but not SignatureVerification, it's unsafe
|
|
740
|
+
return false;
|
|
741
|
+
}
|
|
742
|
+
// The top-level authenticator must pass validation
|
|
743
|
+
if (!checkAuthenticator(authenticator)) {
|
|
744
|
+
return false;
|
|
745
|
+
}
|
|
746
|
+
return true;
|
|
747
|
+
}
|
|
712
748
|
}
|
|
713
749
|
exports.CompositeClient = CompositeClient;
|
|
714
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"composite-client.js","sourceRoot":"","sources":["../../../src/clients/composite-client.ts"],"names":[],"mappings":"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"}
|
|
750
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"composite-client.js","sourceRoot":"","sources":["../../../src/clients/composite-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -127,6 +127,10 @@ export declare enum AuthenticatorType {
|
|
|
127
127
|
CLOB_PAIR_ID_FILTER = "ClobPairIdFilter",
|
|
128
128
|
SUBACCOUNT_FILTER = "SubaccountFilter"
|
|
129
129
|
}
|
|
130
|
+
export interface Authenticator {
|
|
131
|
+
type: AuthenticatorType;
|
|
132
|
+
config: string | Authenticator[];
|
|
133
|
+
}
|
|
130
134
|
export declare enum TradingRewardAggregationPeriod {
|
|
131
135
|
DAILY = "DAILY",
|
|
132
136
|
WEEKLY = "WEEKLY",
|