Skip to content

Commit

Permalink
Merge pull request #118 from OpenZeppelin/fix-build-order
Browse files Browse the repository at this point in the history
enforce base package to build first
  • Loading branch information
MCarlomagno authored Oct 5, 2023
2 parents abd7126 + e986ba7 commit e19128f
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 7 deletions.
2 changes: 1 addition & 1 deletion examples/create-forked-network/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ async function main() {
name: 'MyForkedNetwork',
forkedNetwork: 'mainnet',
rpcUrl: '', // Add your RPC URL here
})
});

console.log(network);
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"nx-build-test-skip-cache": "pnpm run build-test --skip-nx-cache",
"nx-test-skip-cache": "pnpm run test --skip-nx-cache",
"build": "nx run-many -t build --parallel=1",
"build-test": "nx run-many -t style,build,test",
"build-test": "nx run-many -t style,build,test --projects=@openzeppelin/defender-base-client,* --parallel=false",
"lint:check": "eslint 'packages/**/src/**/*.{js,ts}' --quiet",
"lint:fix": "pnpm prettier:fix && pnpm lint:check && pnpm prettier:check",
"prettier:check": "prettier --check '**/*.{js,ts,tsx}'",
Expand Down
7 changes: 6 additions & 1 deletion packages/relay-signer/src/models/relayer.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import https from 'https';
import { Network } from '@openzeppelin/defender-sdk-base-client';
import { ListTransactionsRequest, PaginatedTransactionResponse, RelayerTransaction, RelayerTransactionPayload } from './transactions';
import {
ListTransactionsRequest,
PaginatedTransactionResponse,
RelayerTransaction,
RelayerTransactionPayload,
} from './transactions';
import { JsonRpcResponse, SignMessagePayload, SignTypedDataPayload, SignedMessagePayload } from './rpc';

// TODO Defender Address model for this
Expand Down
3 changes: 1 addition & 2 deletions packages/relay-signer/src/models/transactions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ export type ListTransactionsRequest = {
usePagination?: boolean;
};


export type PaginatedTransactionResponse = {
items: RelayerTransaction[];
next?: string;
}
};
11 changes: 9 additions & 2 deletions packages/relay-signer/src/relayer.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import { IRelayer, RelayerGetResponse, RelayerParams } from './models/relayer';
import { JsonRpcResponse, SignMessagePayload, SignTypedDataPayload, SignedMessagePayload } from './models/rpc';
import { ListTransactionsRequest, PaginatedTransactionResponse, RelayerTransaction, RelayerTransactionPayload } from './models/transactions';
import {
ListTransactionsRequest,
PaginatedTransactionResponse,
RelayerTransaction,
RelayerTransactionPayload,
} from './models/transactions';
import { isApiCredentials, isActionCredentials, validatePayload } from './ethers/utils';
import { RelaySignerClient } from './api';
import { DefenderRelayProvider, DefenderRelaySigner, DefenderRelaySignerOptions } from './ethers';
Expand Down Expand Up @@ -66,7 +71,9 @@ export class Relayer implements IRelayer {
return this.relayer.getTransaction(id);
}

public listTransactions(criteria?: ListTransactionsRequest): Promise<RelayerTransaction[] | PaginatedTransactionResponse> {
public listTransactions(
criteria?: ListTransactionsRequest,
): Promise<RelayerTransaction[] | PaginatedTransactionResponse> {
return this.relayer.listTransactions(criteria);
}

Expand Down

0 comments on commit e19128f

Please sign in to comment.