Skip to content

Commit 2046f20

Browse files
committed
Merge remote-tracking branch 'origin/feat/subscription-trial-sponsorship' into feat/subscription-trial-sponsorship
2 parents 3bd5f7c + 980272c commit 2046f20

File tree

5 files changed

+137
-5
lines changed

5 files changed

+137
-5
lines changed

lavamoat/browserify/beta/policy.json

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1982,7 +1982,7 @@
19821982
"packages": {
19831983
"@metamask/controller-utils": true,
19841984
"@metamask/bridge-controller>@metamask/polling-controller": true,
1985-
"@metamask/transaction-controller": true
1985+
"@metamask/subscription-controller>@metamask/transaction-controller": true
19861986
}
19871987
},
19881988
"@metamask/seedless-onboarding-controller>@metamask/toprf-secure-backup": {
@@ -2036,6 +2036,39 @@
20362036
"uuid": true
20372037
}
20382038
},
2039+
"@metamask/subscription-controller>@metamask/transaction-controller": {
2040+
"globals": {
2041+
"clearTimeout": true,
2042+
"console.error": true,
2043+
"fetch": true,
2044+
"setTimeout": true
2045+
},
2046+
"packages": {
2047+
"@ethereumjs/tx>@ethereumjs/common": true,
2048+
"@ethereumjs/tx": true,
2049+
"@ethersproject/abi": true,
2050+
"@ethersproject/contracts": true,
2051+
"@ethersproject/providers": true,
2052+
"ethers>@ethersproject/wallet": true,
2053+
"@metamask/base-controller": true,
2054+
"@metamask/controller-utils": true,
2055+
"@metamask/controller-utils>@metamask/eth-query": true,
2056+
"@metamask/gas-fee-controller": true,
2057+
"@metamask/metamask-eth-abis": true,
2058+
"@metamask/network-controller": true,
2059+
"@metamask/transaction-controller>@metamask/nonce-tracker": true,
2060+
"@metamask/rpc-errors": true,
2061+
"@metamask/utils": true,
2062+
"@metamask/eth-qr-keyring>async-mutex": true,
2063+
"bn.js": true,
2064+
"browserify>buffer": true,
2065+
"eth-method-registry": true,
2066+
"webpack>events": true,
2067+
"fast-json-patch": true,
2068+
"lodash": true,
2069+
"uuid": true
2070+
}
2071+
},
20392072
"@metamask/user-operation-controller": {
20402073
"globals": {
20412074
"fetch": true

lavamoat/browserify/experimental/policy.json

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1982,7 +1982,7 @@
19821982
"packages": {
19831983
"@metamask/controller-utils": true,
19841984
"@metamask/bridge-controller>@metamask/polling-controller": true,
1985-
"@metamask/transaction-controller": true
1985+
"@metamask/subscription-controller>@metamask/transaction-controller": true
19861986
}
19871987
},
19881988
"@metamask/seedless-onboarding-controller>@metamask/toprf-secure-backup": {
@@ -2036,6 +2036,39 @@
20362036
"uuid": true
20372037
}
20382038
},
2039+
"@metamask/subscription-controller>@metamask/transaction-controller": {
2040+
"globals": {
2041+
"clearTimeout": true,
2042+
"console.error": true,
2043+
"fetch": true,
2044+
"setTimeout": true
2045+
},
2046+
"packages": {
2047+
"@ethereumjs/tx>@ethereumjs/common": true,
2048+
"@ethereumjs/tx": true,
2049+
"@ethersproject/abi": true,
2050+
"@ethersproject/contracts": true,
2051+
"@ethersproject/providers": true,
2052+
"ethers>@ethersproject/wallet": true,
2053+
"@metamask/base-controller": true,
2054+
"@metamask/controller-utils": true,
2055+
"@metamask/controller-utils>@metamask/eth-query": true,
2056+
"@metamask/gas-fee-controller": true,
2057+
"@metamask/metamask-eth-abis": true,
2058+
"@metamask/network-controller": true,
2059+
"@metamask/transaction-controller>@metamask/nonce-tracker": true,
2060+
"@metamask/rpc-errors": true,
2061+
"@metamask/utils": true,
2062+
"@metamask/eth-qr-keyring>async-mutex": true,
2063+
"bn.js": true,
2064+
"browserify>buffer": true,
2065+
"eth-method-registry": true,
2066+
"webpack>events": true,
2067+
"fast-json-patch": true,
2068+
"lodash": true,
2069+
"uuid": true
2070+
}
2071+
},
20392072
"@metamask/user-operation-controller": {
20402073
"globals": {
20412074
"fetch": true

lavamoat/browserify/flask/policy.json

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1982,7 +1982,7 @@
19821982
"packages": {
19831983
"@metamask/controller-utils": true,
19841984
"@metamask/bridge-controller>@metamask/polling-controller": true,
1985-
"@metamask/transaction-controller": true
1985+
"@metamask/subscription-controller>@metamask/transaction-controller": true
19861986
}
19871987
},
19881988
"@metamask/seedless-onboarding-controller>@metamask/toprf-secure-backup": {
@@ -2036,6 +2036,39 @@
20362036
"uuid": true
20372037
}
20382038
},
2039+
"@metamask/subscription-controller>@metamask/transaction-controller": {
2040+
"globals": {
2041+
"clearTimeout": true,
2042+
"console.error": true,
2043+
"fetch": true,
2044+
"setTimeout": true
2045+
},
2046+
"packages": {
2047+
"@ethereumjs/tx>@ethereumjs/common": true,
2048+
"@ethereumjs/tx": true,
2049+
"@ethersproject/abi": true,
2050+
"@ethersproject/contracts": true,
2051+
"@ethersproject/providers": true,
2052+
"ethers>@ethersproject/wallet": true,
2053+
"@metamask/base-controller": true,
2054+
"@metamask/controller-utils": true,
2055+
"@metamask/controller-utils>@metamask/eth-query": true,
2056+
"@metamask/gas-fee-controller": true,
2057+
"@metamask/metamask-eth-abis": true,
2058+
"@metamask/network-controller": true,
2059+
"@metamask/transaction-controller>@metamask/nonce-tracker": true,
2060+
"@metamask/rpc-errors": true,
2061+
"@metamask/utils": true,
2062+
"@metamask/eth-qr-keyring>async-mutex": true,
2063+
"bn.js": true,
2064+
"browserify>buffer": true,
2065+
"eth-method-registry": true,
2066+
"webpack>events": true,
2067+
"fast-json-patch": true,
2068+
"lodash": true,
2069+
"uuid": true
2070+
}
2071+
},
20392072
"@metamask/user-operation-controller": {
20402073
"globals": {
20412074
"fetch": true

lavamoat/browserify/main/policy.json

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1982,7 +1982,7 @@
19821982
"packages": {
19831983
"@metamask/controller-utils": true,
19841984
"@metamask/bridge-controller>@metamask/polling-controller": true,
1985-
"@metamask/transaction-controller": true
1985+
"@metamask/subscription-controller>@metamask/transaction-controller": true
19861986
}
19871987
},
19881988
"@metamask/seedless-onboarding-controller>@metamask/toprf-secure-backup": {
@@ -2036,6 +2036,39 @@
20362036
"uuid": true
20372037
}
20382038
},
2039+
"@metamask/subscription-controller>@metamask/transaction-controller": {
2040+
"globals": {
2041+
"clearTimeout": true,
2042+
"console.error": true,
2043+
"fetch": true,
2044+
"setTimeout": true
2045+
},
2046+
"packages": {
2047+
"@ethereumjs/tx>@ethereumjs/common": true,
2048+
"@ethereumjs/tx": true,
2049+
"@ethersproject/abi": true,
2050+
"@ethersproject/contracts": true,
2051+
"@ethersproject/providers": true,
2052+
"ethers>@ethersproject/wallet": true,
2053+
"@metamask/base-controller": true,
2054+
"@metamask/controller-utils": true,
2055+
"@metamask/controller-utils>@metamask/eth-query": true,
2056+
"@metamask/gas-fee-controller": true,
2057+
"@metamask/metamask-eth-abis": true,
2058+
"@metamask/network-controller": true,
2059+
"@metamask/transaction-controller>@metamask/nonce-tracker": true,
2060+
"@metamask/rpc-errors": true,
2061+
"@metamask/utils": true,
2062+
"@metamask/eth-qr-keyring>async-mutex": true,
2063+
"bn.js": true,
2064+
"browserify>buffer": true,
2065+
"eth-method-registry": true,
2066+
"webpack>events": true,
2067+
"fast-json-patch": true,
2068+
"lodash": true,
2069+
"uuid": true
2070+
}
2071+
},
20392072
"@metamask/user-operation-controller": {
20402073
"globals": {
20412074
"fetch": true

lavamoat/webpack/policy.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2055,7 +2055,7 @@
20552055
"packages": {
20562056
"@metamask/controller-utils": true,
20572057
"@metamask/bridge-controller>@metamask/polling-controller": true,
2058-
"@metamask/transaction-controller": true
2058+
"@metamask/subscription-controller>@metamask/transaction-controller": true
20592059
}
20602060
},
20612061
"@metamask/seedless-onboarding-controller>@metamask/toprf-secure-backup": {

0 commit comments

Comments
 (0)